Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at Wed Jul 27 17:05:46 CEST 2011. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2011-07-21 15:01:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2011-07-22 20:20:52.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jul 22 20:20:50 CEST 2011 - dmueller@suse.de + +- update to 4.7.0 + * Small fixes over KDE 4.7 RC2 + * see http://kde.org/announcements/4.7 for details + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepimlibs-4.6.95.tar.bz2 New: ---- kdepimlibs-4.7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.WpgR2U/_old 2011-07-27 17:04:17.000000000 +0200 +++ /var/tmp/diff_new_pack.WpgR2U/_new 2011-07-27 17:04:17.000000000 +0200 @@ -18,7 +18,7 @@ Name: kdepimlibs4 -Version: 4.6.95 +Version: 4.7.0 Release: 1 License: LGPLv2.1+ Summary: KDE PIM Libraries @@ -32,6 +32,7 @@ BuildRequires: libassuan-devel BuildRequires: libical-devel BuildRequires: libkde4-devel >= %{version} +BuildRequires: libprison-devel BuildRequires: openldap2-devel Requires: kdelibs4 >= %( echo `rpm -q --queryformat '%{VERSION}' libkde4-devel`) Requires: libkdepimlibs4 = %{version} @@ -55,7 +56,7 @@ %install cd build -%make_install + %make_install %kde_post_install %post @@ -86,40 +87,38 @@ %files -n libkdepimlibs4 %defattr(-,root,root) %doc COPYING COPYING.BSD COPYING.LIB +%_kde4_libdir/libgpgme++-pth.so.* +%_kde4_libdir/libgpgme++-pthread.so.* +%_kde4_libdir/libgpgme++.so.* %_kde4_libdir/libkabc.so.* %_kde4_libdir/libkabc_file_core.so.* +%_kde4_libdir/libkblog.so.* %_kde4_libdir/libkcal.so.* +%_kde4_libdir/libkcalcore.so.* +%_kde4_libdir/libkcalutils.so.* +%_kde4_libdir/libkholidays.so.* +%_kde4_libdir/libkimap.so.* %_kde4_libdir/libkldap.so.* +%_kde4_libdir/libkmbox.so.* %_kde4_libdir/libkmime.so.* +%_kde4_libdir/libkontactinterface.so.* +%_kde4_libdir/libkpimidentities.so.* +%_kde4_libdir/libkpimtextedit.so.* +%_kde4_libdir/libkpimutils.so.* %_kde4_libdir/libkresources.so.* %_kde4_libdir/libktnef.so.* %_kde4_libdir/libkxmlrpcclient.so.* -%_kde4_libdir/libsyndication.so.* -%_kde4_libdir/libkimap.so.* -%_kde4_libdir/libkblog.so.* -%_kde4_libdir/libkpimutils.so.* %_kde4_libdir/libmailtransport.so.* -%_kde4_libdir/libgpgme++.so.* -%_kde4_libdir/libgpgme++-pthread.so.* -%_kde4_libdir/libkcalcore.so.* -%_kde4_libdir/libkcalutils.so.* -%_kde4_libdir/libkmbox.so.* -%if 0%{?suse_version} > 1020 -%_kde4_libdir/libgpgme++-pth.so.* -%endif -%_kde4_libdir/libkpimidentities.so.* -%_kde4_libdir/libqgpgme.so.* -%_kde4_libdir/libkholidays.so.* %_kde4_libdir/libmicroblog.so.* -%_kde4_libdir/libkpimtextedit.so.* -%_kde4_libdir/libkontactinterface.so.* +%_kde4_libdir/libqgpgme.so.* +%_kde4_libdir/libsyndication.so.* %package -n libakonadi4 License: LGPLv2.1+ Summary: PIM Storage Service Libraries Group: System/GUI/KDE -Requires: libkdepimlibs4 = %{version} Requires: libakonadiprotocolinternals1 >= 1.6.0 +Requires: libkdepimlibs4 = %{version} %requires_ge libqt4-x11 %description -n libakonadi4 @@ -133,24 +132,26 @@ %files -n libakonadi4 %defattr(-,root,root) %doc COPYING COPYING.LIB -%_kde4_libdir/libakonadi-kde.so* -%_kde4_libdir/libakonadi-kmime.so* -%_kde4_libdir/libakonadi-kabc.so* -%_kde4_libdir/libakonadi-contact.so* -%_kde4_libdir/libakonadi-kcal.so* -%_kde4_libdir/libakonadi-calendar.so* +%_kde4_libdir/libakonadi-calendar.so.* +%_kde4_libdir/libakonadi-contact.so.* +%_kde4_libdir/libakonadi-kabc.so.* +%_kde4_libdir/libakonadi-kcal.so.* +%_kde4_libdir/libakonadi-kde.so.* +%_kde4_libdir/libakonadi-kmime.so.* %package -n libkdepimlibs4-devel License: LGPLv2.1+ Summary: KDE PIM Libraries: Build Environment -Group: System/GUI/KDE +Group: Development/Libraries/KDE Requires: boost-devel Requires: cyrus-sasl-devel Requires: kdepimlibs4 = %{version} +Requires: libkdepimlibs4 = %{version} Requires: libakonadi4 = %{version} Requires: libakonadiprotocolinternals-devel Requires: libical-devel Requires: libkde4-devel +Requires: libprison-devel Requires: openldap2-devel %description -n libkdepimlibs4-devel @@ -160,41 +161,44 @@ %files -n libkdepimlibs4-devel %defattr(-,root,root) %doc COPYING COPYING.BSD COPYING.LIB -# move this one to cmake ? +%_kde4_appsdir/cmake +%_kde4_includedir/* %dir %_kde4_libdir/cmake %_kde4_libdir/cmake/KdepimLibs -%{_includedir}/* -%_kde4_appsdir/cmake +%dir %_kde4_libdir/gpgmepp +%_kde4_libdir/gpgmepp/GpgmeppConfig.cmake +%_kde4_libdir/gpgmepp/GpgmeppLibraryDepends.cmake +%_kde4_libdir/libakonadi-calendar.so +%_kde4_libdir/libakonadi-contact.so +%_kde4_libdir/libakonadi-kabc.so +%_kde4_libdir/libakonadi-kcal.so +%_kde4_libdir/libakonadi-kde.so +%_kde4_libdir/libakonadi-kmime.so +%_kde4_libdir/libgpgme++-pth.so +%_kde4_libdir/libgpgme++-pthread.so +%_kde4_libdir/libgpgme++.so %_kde4_libdir/libkabc.so %_kde4_libdir/libkabc_file_core.so +%_kde4_libdir/libkblog.so %_kde4_libdir/libkcal.so +%_kde4_libdir/libkcalcore.so +%_kde4_libdir/libkcalutils.so +%_kde4_libdir/libkholidays.so +%_kde4_libdir/libkimap.so %_kde4_libdir/libkldap.so +%_kde4_libdir/libkmbox.so %_kde4_libdir/libkmime.so +%_kde4_libdir/libkontactinterface.so +%_kde4_libdir/libkpimidentities.so +%_kde4_libdir/libkpimtextedit.so +%_kde4_libdir/libkpimutils.so %_kde4_libdir/libkresources.so %_kde4_libdir/libktnef.so %_kde4_libdir/libkxmlrpcclient.so -%_kde4_libdir/libsyndication.so -%_kde4_libdir/libkimap.so -%_kde4_libdir/libkblog.so -%_kde4_libdir/libkpimutils.so %_kde4_libdir/libmailtransport.so -%_kde4_libdir/libgpgme++.so -%_kde4_libdir/libgpgme++-pthread.so -%if 0%{?suse_version} > 1020 -%_kde4_libdir/libgpgme++-pth.so -%endif -%_kde4_libdir/libkpimidentities.so -%_kde4_libdir/libqgpgme.so -%_kde4_libdir/libkholidays.so %_kde4_libdir/libmicroblog.so -%_kde4_libdir/libkpimtextedit.so -%dir %_kde4_libdir/gpgmepp -%_kde4_libdir/gpgmepp/GpgmeppConfig.cmake -%_kde4_libdir/gpgmepp/GpgmeppLibraryDepends.cmake -%_kde4_libdir/libkontactinterface.so -%_kde4_libdir/libkcalcore.so -%_kde4_libdir/libkcalutils.so -%_kde4_libdir/libkmbox.so +%_kde4_libdir/libqgpgme.so +%_kde4_libdir/libsyndication.so %files %defattr(-,root,root) @@ -202,15 +206,15 @@ %exclude %_kde4_appsdir/cmake %doc %lang(en) %_kde4_htmldir/en/kcontrol %doc %lang(en) %_kde4_htmldir/en/kioslave -%_kde4_libdir/kde4 -%_kde_share_dir/apps -%{_datadir}/dbus-1/*/* -%_kde_share_dir/services -%_kde_share_dir/servicetypes -%_kde_share_dir/config.kcfg/resourcebase.kcfg -%_kde_share_dir/config.kcfg/mailtransport.kcfg -%_kde_share_dir/config.kcfg/recentcontactscollections.kcfg -%_kde_share_dir/config.kcfg/specialmailcollections.kcfg +%_kde4_modulesdir +%_kde4_appsdir +%_kde4_configkcfgdir/mailtransport.kcfg +%_kde4_configkcfgdir/recentcontactscollections.kcfg +%_kde4_configkcfgdir/resourcebase.kcfg +%_kde4_configkcfgdir/specialmailcollections.kcfg +%_kde4_servicesdir +%_kde4_servicetypesdir +%{_datadir}/dbus-1/ %{_datadir}/mime/packages/kdepimlibs-mime.xml %changelog ++++++ kdepimlibs-4.6.95.tar.bz2 -> kdepimlibs-4.7.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/CMakeLists.txt new/kdepimlibs-4.7.0/CMakeLists.txt --- old/kdepimlibs-4.6.95/CMakeLists.txt 2011-07-07 18:14:26.000000000 +0200 +++ new/kdepimlibs-4.7.0/CMakeLists.txt 2011-07-19 23:36:16.000000000 +0200 @@ -6,8 +6,8 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) -set(KDEPIMLIBS_VERSION_MINOR 6) -set(KDEPIMLIBS_VERSION_PATCH 95) +set(KDEPIMLIBS_VERSION_MINOR 7) +set(KDEPIMLIBS_VERSION_PATCH 00) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/CTestCustom.cmake new/kdepimlibs-4.7.0/CTestCustom.cmake --- old/kdepimlibs-4.6.95/CTestCustom.cmake 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/CTestCustom.cmake 2011-07-19 23:33:39.000000000 +0200 @@ -16,6 +16,7 @@ "qlist.h.*increases required alignment of target type" "qmap.h.*increases required alignment of target type" "qhash.h.*increases required alignment of target type" + ".*warning.* is deprecated" ) # Errors that will be ignored diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/CMakeLists.txt new/kdepimlibs-4.7.0/akonadi/CMakeLists.txt --- old/kdepimlibs-4.6.95/akonadi/CMakeLists.txt 2011-06-22 16:28:23.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/CMakeLists.txt 2011-07-22 14:46:51.000000000 +0200 @@ -17,6 +17,9 @@ add_definitions( -DQT_NO_CAST_FROM_ASCII ) add_definitions( -DQT_NO_CAST_TO_ASCII ) +# Set the resources and agents version +configure_file(kdepimlibs-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepimlibs-version.h) + add_subdirectory( kabc ) add_subdirectory( kcal ) add_subdirectory( kmime ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/agentbase.cpp new/kdepimlibs-4.7.0/akonadi/agentbase.cpp --- old/kdepimlibs-4.6.95/akonadi/agentbase.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/agentbase.cpp 2011-07-22 14:46:51.000000000 +0200 @@ -27,6 +27,7 @@ #include "controladaptor.h" #include "dbusconnectionpool.h" #include "itemfetchjob.h" +#include "kdepimlibs-version.h" #include "monitor_p.h" #include "servermanager_p.h" #include "session.h" @@ -514,12 +515,12 @@ kDebug() << "Identifier argument missing"; exit( 1 ); } - + const QFileInfo fi( QString::fromLocal8Bit( argv[0] ) ); // strip off full path and possible .exe suffix const QByteArray catalog = fi.baseName().toLatin1(); - KCmdLineArgs::init( argc, argv, identifier.toLatin1(), catalog, ki18n( "Akonadi Agent" ), "0.1", + KCmdLineArgs::init( argc, argv, identifier.toLatin1(), catalog, ki18n( "Akonadi Agent" ), KDEPIMLIBS_VERSION, ki18n( "Akonadi Agent" ) ); KCmdLineOptions options; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/calendar/standardcalendaractionmanager.cpp new/kdepimlibs-4.7.0/akonadi/calendar/standardcalendaractionmanager.cpp --- old/kdepimlibs-4.6.95/akonadi/calendar/standardcalendaractionmanager.cpp 2011-06-22 16:28:23.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/calendar/standardcalendaractionmanager.cpp 2011-07-22 14:46:51.000000000 +0200 @@ -44,7 +44,7 @@ mItemSelectionModel( 0 ), mParent( parent ) { - KGlobal::locale()->insertCatalog("libakonadi-calendar"); + KGlobal::locale()->insertCatalog(QLatin1String("libakonadi-calendar")); mGenericManager = new StandardActionManager( actionCollection, parentWidget ); mParent->connect( mGenericManager, SIGNAL( actionStateUpdated() ), mParent, SIGNAL( actionStateUpdated() ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/CMakeLists.txt new/kdepimlibs-4.7.0/akonadi/contact/CMakeLists.txt --- old/kdepimlibs-4.6.95/akonadi/contact/CMakeLists.txt 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/CMakeLists.txt 2011-07-19 23:33:39.000000000 +0200 @@ -13,7 +13,7 @@ ) endif (Soprano_FOUND) -macro_optional_find_package(Prison) +macro_optional_find_package(Prison QUIET) macro_log_feature(PRISON_FOUND "Prison" "Prison library" "http://projects.kde.org/prison" FALSE "" "Needed to show mobile barcodes of your contacts") if (PRISON_FOUND) add_definitions(-DHAVE_PRISON) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/kaddressbookimprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/kaddressbookimprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/kaddressbookimprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/kaddressbookimprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -25,6 +25,7 @@ Name[nds]=KAddressbook-Kortnarichten-Protokoll Name[nl]=KAddressbook Instant Messaging-protocol Name[nn]=Lynmeldingsprotokoll for KDE-adresseboka +Name[pl]=Protokół komunikatora internetowego KAddressbook Name[pt]=Protocolo de Mensagens Instantâneas do KAddressbook Name[pt_BR]=Protocolo de Mensagens Instantâneas do KAddressbook Name[ro]=Protocol de mesagerie instantanee a cărții de adrese diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/aimprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/aimprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/aimprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/aimprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ Comment[nds]=AIM-Protokoll Comment[nl]=AIM-protocol Comment[nn]=AIM-protokoll +Comment[pl]=Protokół AIM Comment[pt]=Protocolo AIM Comment[pt_BR]=Protocolo do AIM Comment[ro]=Protocol AIM @@ -67,6 +68,7 @@ Name[nds]=AIM Name[nl]=AIM Name[nn]=AIM +Name[pl]=AIM Name[pt]=AIM Name[pt_BR]=AIM Name[ro]=AIM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/gaduprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/gaduprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/gaduprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/gaduprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ Comment[nds]=Gadu-Gadu-Protokoll Comment[nl]=Gadu-Gadu-protocol Comment[nn]=Gadu-Gadu-protokoll +Comment[pl]=Protokół Gadu-Gadu Comment[pt]=Protocolo Gadu-Gadu Comment[pt_BR]=Protocolo do Gadu-Gadu Comment[ro]=Protocol Gadu-Gadu @@ -67,6 +68,7 @@ Name[nds]=Gadu-Gadu Name[nl]=Gadu-Gadu Name[nn]=Gadu-Gadu +Name[pl]=Gadu-Gadu Name[pt]=Gadu-Gadu Name[pt_BR]=Gadu-Gadu Name[ro]=Gadu-Gadu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -26,6 +26,7 @@ Comment[nds]=Novell-GroupWise-Kortnarichtenmaker Comment[nl]=Protocol voor Novell GroupWise Messenger Comment[nn]=Lynmeldingstenesta Novell GroupWise +Comment[pl]=Komunikator Novell GroupWise Comment[pt]=Novell GroupWise Messenger Comment[pt_BR]=Mensageiro do GroupWise da Novell Comment[ro]=Mesagerul Novell GroupWise @@ -66,6 +67,7 @@ Name[nds]=GroupWise Name[nl]=GroupWise Name[nn]=GroupWise +Name[pl]=GroupWise Name[pt]=GroupWise Name[pt_BR]=GroupWise Name[ro]=GroupWise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/icqprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/icqprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/icqprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/icqprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ Comment[nds]=ICQ-Protokoll Comment[nl]=ICQ-protocol Comment[nn]=ICQ-protokoll +Comment[pl]=Protokół ICQ Comment[pt]=Protocolo ICQ Comment[pt_BR]=Protocolo do ICQ Comment[ro]=Protocol ICQ @@ -68,6 +69,7 @@ Name[nds]=ICQ Name[nl]=ICQ Name[nn]=ICQ +Name[pl]=ICQ Name[pt]=ICQ Name[pt_BR]=ICQ Name[ro]=ICQ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/ircprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/ircprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ Comment[nds]=Klöönsnack (Internet Relay Chat) Comment[nl]=Internet Relay Chat Comment[nn]=Internet Relay Chat +Comment[pl]=Internet Relay Chat Comment[pt]=Internet Relay Chat Comment[pt_BR]=Bate-papo via Internet (IRC) Comment[ro]=Internet Relay Chat @@ -67,6 +68,7 @@ Name[nds]=IRC Name[nl]=IRC Name[nn]=IRC +Name[pl]=IRC Name[pt]=IRC Name[pt_BR]=IRC Name[ro]=IRC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/jabberprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/jabberprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/jabberprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/jabberprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ Comment[nds]=Jabber-Protokoll Comment[nl]=Jabber-protocol Comment[nn]=Jabber-protokoll +Comment[pl]=Protokół Jabber Comment[pt]=Protocolo Jabber Comment[pt_BR]=Protocolo do Jabber Comment[ro]=Protocol Jabber @@ -68,6 +69,7 @@ Name[nds]=Jabber Name[nl]=Jabber Name[nn]=Jabber +Name[pl]=Jabber Name[pt]=Jabber Name[pt_BR]=Jabber Name[ro]=Jabber diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ Comment[nds]=Meanwhile-Protokoll Comment[nl]=Meanwhile-protocol Comment[nn]=Meanwhile-protokoll +Comment[pl]=Protokół Meanwhile Comment[pt]=Protocolo Meanwhile Comment[pt_BR]=Protocolo do Meanwhile Comment[ro]=Protocol Meanwhile @@ -67,6 +68,7 @@ Name[nds]=Meanwhile Name[nl]=Meanwhile Name[nn]=Meanwhile +Name[pl]=Meanwhile Name[pt]=Meanwhile Name[pt_BR]=Meanwhile Name[ro]=Meanwhile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/msnprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/msnprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/msnprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/msnprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ Comment[nds]=MSN-Kortnarichtenmaker Comment[nl]=MSN Messenger Comment[nn]=MSN Messenger +Comment[pl]=MSN Messenger Comment[pt]=MSN Messenger Comment[pt_BR]=MSN Messenger Comment[ro]=Mesagerul MSN @@ -66,6 +67,7 @@ Name[nds]=MSN-Kortnarichtenmaker Name[nl]=MSN Messenger Name[nn]=MSN Messenger +Name[pl]=MSN Messenger Name[pt]=MSN Messenger Name[pt_BR]=MSN Messenger Name[ro]=Mesagerul MSN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/skypeprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/skypeprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/skypeprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/skypeprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ Comment[nds]=Internet-Telefoneren mit Skype Comment[nl]=Skype internet-telefonie Comment[nn]=Skype Internett-telefoni +Comment[pl]=Internetowa telefonia Skype Comment[pt]=Telefonia Internet Skype Comment[pt_BR]=Telefonia Internet Skype Comment[ro]=Telefonie prin internet Skype @@ -66,6 +67,7 @@ Name[nds]=Skype Name[nl]=Skype Name[nn]=Skype +Name[pl]=Skype Name[pt]=Skype Name[pt_BR]=Skype Name[ro]=Skype diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/smsprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/smsprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/smsprotocol.desktop 2011-06-22 16:28:23.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/smsprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ Comment[nds]=SMS-Protokoll Comment[nl]=SMS-protocol Comment[nn]=SMS-protokoll +Comment[pl]=Protokół SMS Comment[pt]=Protocolo SMS Comment[pt_BR]=Protocolo SMS Comment[ro]=Protocol SMS @@ -68,6 +69,7 @@ Name[nds]=SMS Name[nl]=SMS Name[nn]=SMS +Name[pl]=SMS Name[pt]=SMS Name[pt_BR]=SMS Name[ro]=SMS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/yahooprotocol.desktop new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/yahooprotocol.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/editor/im/protocols/yahooprotocol.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/yahooprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ Comment[nds]=Yahoo-Protokoll Comment[nl]=Yahoo-protocol Comment[nn]=Yahoo!-protokoll +Comment[pl]=Protokół Yahoo Comment[pt]=Protocolo Yahoo Comment[pt_BR]=Protocolo do Yahoo Comment[ro]=Protocol Yahoo @@ -67,6 +68,7 @@ Name[nds]=Yahoo Name[nl]=Yahoo Name[nn]=Yahoo +Name[pl]=Yahoo Name[pt]=Yahoo Name[pt_BR]=Yahoo Name[ro]=Yahoo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/contact/kcm/akonadicontact_actions.desktop new/kdepimlibs-4.7.0/akonadi/contact/kcm/akonadicontact_actions.desktop --- old/kdepimlibs-4.6.95/akonadi/contact/kcm/akonadicontact_actions.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/contact/kcm/akonadicontact_actions.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -35,6 +35,7 @@ Name[nl]=Contactpersoon-acties Name[nn]=Kontakthandlingar Name[pa]=ਸੰਪਰਕ ਐਕਸ਼ਨ +Name[pl]=Działania kontaktu Name[pt]=Acções do Contacto Name[pt_BR]=Ações dos contatos Name[ro]=Acțiuni contacte @@ -77,6 +78,7 @@ Comment[nl]=De contactpersoon-actie configureren Comment[nn]=Set opp kontakthandlingar Comment[pa]=ਸੰਪਰਕ ਐਕਸ਼ਨ ਸੰਰਚਨਾ +Comment[pl]=Konfiguruj działania kontaktu Comment[pt]=Configurar as Acções do Contacto Comment[pt_BR]=Configura as ações do contato Comment[ro]=Configurează acțiunile contact diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/entitylistview.cpp new/kdepimlibs-4.7.0/akonadi/entitylistview.cpp --- old/kdepimlibs-4.6.95/akonadi/entitylistview.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/entitylistview.cpp 2011-07-19 23:33:40.000000000 +0200 @@ -183,7 +183,7 @@ void EntityListView::dropEvent( QDropEvent * event ) { - if ( qobject_cast<Akonadi::FavoriteCollectionsModel*>( model() ) || d->mDragDropManager->processDropEvent( event ) ) { + if ( d->mDragDropManager->processDropEvent( event ) || qobject_cast<Akonadi::FavoriteCollectionsModel*>( model() ) ) { QListView::dropEvent( event ); } } @@ -221,4 +221,20 @@ d->mDragDropManager->startDrag( supportedActions ); } +void EntityListView::setDropActionMenuEnabled( bool enabled ) +{ +#ifndef QT_NO_DRAGANDDROP + d->mDragDropManager->setShowDropActionMenu( enabled ); +#endif +} + +bool EntityListView::isDropActionMenuEnabled() const +{ +#ifndef QT_NO_DRAGANDDROP + return d->mDragDropManager->showDropActionMenu(); +#else + return false; +#endif +} + #include "entitylistview.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/entitylistview.h new/kdepimlibs-4.7.0/akonadi/entitylistview.h --- old/kdepimlibs-4.6.95/akonadi/entitylistview.h 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/entitylistview.h 2011-07-19 23:33:40.000000000 +0200 @@ -113,6 +113,22 @@ */ virtual void setModel( QAbstractItemModel * model ); + /** + * Sets whether the drop action menu is @p enabled and will + * be shown on drop operation. + * + * @since 4.7 + */ + void setDropActionMenuEnabled( bool enabled ); + + /** + * Returns whether the drop action menu is enabled and will + * be shown on drop operation. + * + * @since 4.7 + */ + bool isDropActionMenuEnabled() const; + Q_SIGNALS: /** * This signal is emitted whenever the user has clicked diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/entitytreemodel.cpp new/kdepimlibs-4.7.0/akonadi/entitytreemodel.cpp --- old/kdepimlibs-4.6.95/akonadi/entitytreemodel.cpp 2011-06-22 16:28:23.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/entitytreemodel.cpp 2011-07-19 23:33:40.000000000 +0200 @@ -181,7 +181,7 @@ } if ( !collection.name().isEmpty() ) return collection.name(); - return QString::fromLatin1( "Loading ..." ); + return i18n( "Loading..." ); } break; case Qt::DecorationRole: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/favoritecollectionsmodel.cpp new/kdepimlibs-4.7.0/akonadi/favoritecollectionsmodel.cpp --- old/kdepimlibs-4.6.95/akonadi/favoritecollectionsmodel.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/favoritecollectionsmodel.cpp 2011-07-19 23:33:40.000000000 +0200 @@ -25,8 +25,11 @@ #include <kconfiggroup.h> #include <klocale.h> +#include <KJob> #include "entitytreemodel.h" +#include "mimetypechecker.h" +#include "pastehelper_p.h" using namespace Akonadi; @@ -246,13 +249,43 @@ Q_UNUSED( action ); Q_UNUSED( row ); Q_UNUSED( column ); - Q_UNUSED( parent ); if ( data->hasFormat( QLatin1String( "text/uri-list" ) ) ) { const KUrl::List urls = KUrl::List::fromMimeData( data ); + + const QModelIndex sourceIndex = mapToSource( parent ); + const Collection destCollection = sourceModel()->data( sourceIndex, EntityTreeModel::CollectionRole ).value<Collection>(); + + MimeTypeChecker mimeChecker; + mimeChecker.setWantedMimeTypes( destCollection.contentMimeTypes() ); + foreach ( const KUrl &url, urls ) { const Collection col = Collection::fromUrl( url ); - if ( col.isValid() ) + if ( col.isValid() ) { addCollection( col ); + } else { + const Item item = Item::fromUrl( url ); + if ( item.isValid() ) + { + if ( item.parentCollection().id() == destCollection.id() && action != Qt::CopyAction ) { + kDebug() << "Error: source and destination of move are the same."; + return false; + } +#if 0 + if ( !mimeChecker.isWantedItem( item ) ) { + kDebug() << "unwanted item" << mimeChecker.wantedMimeTypes() << item.mimeType(); + return false; + } +#endif + KJob *job = PasteHelper::pasteUriList( data, destCollection, action ); + if ( !job ) + return false; + connect( job, SIGNAL( result( KJob* ) ), SLOT( pasteJobDone( KJob* ) ) ); + // Accept the event so that it doesn't propagate. + return true; + + } + } + } return true; } @@ -275,4 +308,11 @@ return fs; } +void FavoriteCollectionsModel::pasteJobDone( KJob *job ) +{ + if ( job->error() ) { + kDebug()<< job->errorString(); + } +} + #include "favoritecollectionsmodel.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/favoritecollectionsmodel.h new/kdepimlibs-4.7.0/akonadi/favoritecollectionsmodel.h --- old/kdepimlibs-4.6.95/akonadi/favoritecollectionsmodel.h 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/favoritecollectionsmodel.h 2011-07-19 23:33:40.000000000 +0200 @@ -27,6 +27,7 @@ #include <akonadi/collection.h> class KConfigGroup; +class KJob; namespace Akonadi { @@ -146,6 +147,9 @@ */ void setFavoriteLabel( const Collection &collection, const QString &label ); + private Q_SLOTS: + void pasteJobDone( KJob *job ); + private: //@cond PRIVATE using KSelectionProxyModel::setSourceModel; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/kdepimlibs-version.h.cmake new/kdepimlibs-4.7.0/akonadi/kdepimlibs-version.h.cmake --- old/kdepimlibs-4.6.95/akonadi/kdepimlibs-version.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-4.7.0/akonadi/kdepimlibs-version.h.cmake 2011-07-22 14:46:51.000000000 +0200 @@ -0,0 +1,26 @@ +/* + This file is part of kdepimlibs. + Copyright (C) 2011 Christophe Giboudeaux <cgiboudeaux@gmx.com> + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef KDEPIMLIBS_VERSION_H +#define KDEPIMLIBS_VERSION_H + +#define KDEPIMLIBS_VERSION "@KDEPIMLIBS_VERSION_MAJOR@.@KDEPIMLIBS_VERSION_MINOR@" + +#endif // KDEPIMLIBS_VERSION_H \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/kmime/removeduplicatescommand.cpp new/kdepimlibs-4.7.0/akonadi/kmime/removeduplicatescommand.cpp --- old/kdepimlibs-4.6.95/akonadi/kmime/removeduplicatescommand.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/kmime/removeduplicatescommand.cpp 2011-07-19 23:33:40.000000000 +0200 @@ -19,11 +19,11 @@ #include "removeduplicatescommand_p.h" -#include "movetotrashcommand_p.h" #include "util_p.h" #include "akonadi/itemfetchjob.h" #include "akonadi/itemfetchscope.h" +#include "akonadi/itemdeletejob.h" #include "kmime/kmime_message.h" RemoveDuplicatesCommand::RemoveDuplicatesCommand( const QAbstractItemModel* model, const Akonadi::Collection::List& folders, QObject* parent ) : @@ -101,9 +101,8 @@ job->fetchScope().fetchFullPayload(); connect( job, SIGNAL( result( KJob* ) ), this, SLOT( slotFetchDone( KJob* ) ) ); } else { - MoveToTrashCommand *trashCmd = new MoveToTrashCommand( mModel, mDuplicateItems, parent() ); - connect( trashCmd, SIGNAL(result(Result)), this, SLOT(emitResult(Result)) ); - trashCmd->execute(); + Akonadi::ItemDeleteJob *delCmd = new Akonadi::ItemDeleteJob( mDuplicateItems, parent() ); + connect( delCmd, SIGNAL(result(Result)), this, SLOT(emitResult(Result)) ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/kmime/standardmailactionmanager.cpp new/kdepimlibs-4.7.0/akonadi/kmime/standardmailactionmanager.cpp --- old/kdepimlibs-4.6.95/akonadi/kmime/standardmailactionmanager.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/kmime/standardmailactionmanager.cpp 2011-07-19 23:33:40.000000000 +0200 @@ -301,13 +301,14 @@ bool enableMarkAllAsRead = false; bool enableMarkAllAsUnread = false; + bool canDeleteItem = true; if ( collectionIsSelected ) { const Collection collection = selectedCollections.first(); if ( collection.isValid() ) { const Akonadi::CollectionStatistics stats = collection.statistics(); enableMarkAllAsRead = (stats.unreadCount() > 0); enableMarkAllAsUnread = (stats.count() != stats.unreadCount()); - + canDeleteItem = collection.rights() & Akonadi::Collection::CanDeleteItem; const bool isSystemFolder = (collection == SpecialMailCollections::self()->defaultCollection( SpecialMailCollections::Inbox ) || collection == SpecialMailCollections::self()->defaultCollection( SpecialMailCollections::Outbox ) || collection == SpecialMailCollections::self()->defaultCollection( SpecialMailCollections::SentMail ) || @@ -324,7 +325,9 @@ } if ( mActions.contains( Akonadi::StandardMailActionManager::MoveToTrash ) ) - mActions.value( Akonadi::StandardMailActionManager::MoveToTrash )->setEnabled( itemIsSelected ); + mActions.value( Akonadi::StandardMailActionManager::MoveToTrash )->setEnabled( itemIsSelected && canDeleteItem ); + if ( mActions.contains( Akonadi::StandardMailActionManager::RemoveDuplicates ) ) + mActions.value( Akonadi::StandardMailActionManager::RemoveDuplicates )->setEnabled( canDeleteItem ); QAction *action = mActions.value( Akonadi::StandardMailActionManager::MarkAllMailAsRead ); if ( action ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/resourcebase.cpp new/kdepimlibs-4.7.0/akonadi/resourcebase.cpp --- old/kdepimlibs-4.6.95/akonadi/resourcebase.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/resourcebase.cpp 2011-07-22 14:46:51.000000000 +0200 @@ -26,6 +26,7 @@ #include "collectionsync_p.h" #include "dbusconnectionpool.h" #include "itemsync.h" +#include "kdepimlibs-version.h" #include "resourcescheduler_p.h" #include "tracerinterface.h" #include "xdgbasedirs_p.h" @@ -374,7 +375,7 @@ const QByteArray catalog = fi.baseName().toLatin1(); KCmdLineArgs::init( argc, argv, identifier.toLatin1(), catalog, - ki18nc( "@title application name", "Akonadi Resource" ), "0.1", + ki18nc( "@title application name", "Akonadi Resource" ), KDEPIMLIBS_VERSION, ki18nc( "@title application description", "Akonadi Resource" ) ); KCmdLineOptions options; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/akonadi/subscriptiondialog.cpp new/kdepimlibs-4.7.0/akonadi/subscriptiondialog.cpp --- old/kdepimlibs-4.6.95/akonadi/subscriptiondialog.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/akonadi/subscriptiondialog.cpp 2011-07-19 23:33:40.000000000 +0200 @@ -132,12 +132,18 @@ filterTreeViewModel->setSourceModel( d->model ); filterTreeViewModel->setFilterCaseSensitivity( Qt::CaseInsensitive ); - RecursiveCollectionFilterProxyModel *filterRecursiveCollectionFilter + d->collectionView = new QTreeView( mainWidget ); + d->collectionView->header()->hide(); + + if ( !mimetypes.isEmpty() ) { + RecursiveCollectionFilterProxyModel *filterRecursiveCollectionFilter = new Akonadi::RecursiveCollectionFilterProxyModel( this ); - if ( !mimetypes.isEmpty() ) filterRecursiveCollectionFilter->addContentMimeTypeInclusionFilters( mimetypes ); - - filterRecursiveCollectionFilter->setSourceModel( filterTreeViewModel ); + filterRecursiveCollectionFilter->setSourceModel( filterTreeViewModel ); + d->collectionView->setModel( filterRecursiveCollectionFilter ); + } else { + d->collectionView->setModel( filterTreeViewModel ); + } QHBoxLayout *filterBarLayout = new QHBoxLayout; @@ -148,10 +154,6 @@ filterTreeViewModel, SLOT( setFilterFixedString( const QString& ) ) ); filterBarLayout->addWidget( lineEdit ); mainLayout->addLayout( filterBarLayout ); - - d->collectionView = new QTreeView( mainWidget ); - d->collectionView->header()->hide(); - d->collectionView->setModel( filterRecursiveCollectionFilter ); mainLayout->addWidget( d->collectionView ); #else Files old/kdepimlibs-4.6.95/doc/kcontrol/kresources/index.cache.bz2 and new/kdepimlibs-4.7.0/doc/kcontrol/kresources/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/kabc/plugins/dir/dir.desktop new/kdepimlibs-4.7.0/kabc/plugins/dir/dir.desktop --- old/kdepimlibs-4.6.95/kabc/plugins/dir/dir.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/kabc/plugins/dir/dir.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -70,7 +70,7 @@ Comment[lv]=Nodrošina pieeju kontaktiem, kas katrs saglabāts individuālā failā norādītajā mapē. Atbalsta standarta VCard failus un citus formātus, atkarībā no pieejamajiem spraudņiem. Comment[nb]=Gir tilgang til kontakter, lagret hver for seg i en enkelt fil, i en gitt mappe. Støtter standard vCard og andre formater avhengig av tilgjengelige programtillegg. Comment[nds]=Stellt Togriep op Kontakten praat, elkeen binnen een Datei binnen en angeven Orner. Ünnerstütt VCard-Dateien un anner Formaten na de verföögboren Modulen. -Comment[nl]=Geeft toegang tot contactpersonen, elk opgeslagen in een enkel bestand in een opgegeven map. Ondersteunt standaard VCard-bestand en andere van beschikbare plugins afhankelijke formaten +Comment[nl]=Geeft toegang tot contactpersonen, elk opgeslagen in een enkel bestand in een opgegeven map. Ondersteunt standaard VCard-bestand en andere van beschikbare plug-ins afhankelijke formaten Comment[nn]=Gjev tilgang til kontaktar i ei viss mappe, der dei er lagra i kvar sine filer. Standard vCard-filer er støtta, i tillegg til andre format, avhengig av kva programtillegg som er i bruk. Comment[pl]=Daje dostęp do kontaktów, z których każdy jest przechowywany w oddzielnym pliku, w podanym katalogu. Obsługuje pliki zgodne ze standardem VCard i inne, jeśli są dostępne odpowiednie wtyczki. Comment[pt]=Oferece o acesso aos contactos, estando cada um guardado num único ficheiro de uma dada pasta. Suporta os ficheiros VCard normais, assim como outros formatos, dependendo da disponibilidade dos 'plugins'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/kabc/plugins/file/file.desktop new/kdepimlibs-4.7.0/kabc/plugins/file/file.desktop --- old/kdepimlibs-4.6.95/kabc/plugins/file/file.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/kabc/plugins/file/file.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -76,7 +76,7 @@ Comment[lv]=Nodrošina piekļuvi kontaktiem, kas glabājas vienā lokālā failā. Atbalsta standarta VCard failus un citus formātus, atkarībā no pieejamajiem spraudņiem. Comment[nb]=Gir tilgang til kontakter, lagret i en enkelt lokal fil. Støtter standard vCard og andre formater avhengig av tilgjengelige programtillegg. Comment[nds]=Stellt Togriep op Kontakten praat, de in een enkel lokaal Datei wohrt warrt. Ünnerstütt VCard-Dateien un anner Formaten na de 'verföögboren Modulen. -Comment[nl]=Geeft toegang tot in een enkel lokaal bestand opgeslagen contactpersonen. Ondersteunt standaard VCard-bestanden en andere van beschikbare plugins afhankelijke formaten. +Comment[nl]=Geeft toegang tot in een enkel lokaal bestand opgeslagen contactpersonen. Ondersteunt standaard VCard-bestanden en andere van beschikbare plug-ins afhankelijke formaten. Comment[nn]=Gjev tilgang til kontaktar lagra i ei einskild lokal fil. Standard vCard-filer er støtta, i tillegg til andre format, avhengig av kva programtillegg som er i bruk. Comment[pl]=Daje dostęp do kontaktów przechowywanych w jednym pliku lokalnym. Obsługuje pliki zgodne ze standardem VCard i inne, jeśli są dostępne odpowiednie wtyczki. Comment[pt]=Oferece o acesso aos contactos, estando todos guardados num único ficheiro local. Suporta os ficheiros VCard normais, assim como outros formatos, dependendo da disponibilidade dos 'plugins'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/kabc/plugins/net/net.desktop new/kdepimlibs-4.7.0/kabc/plugins/net/net.desktop --- old/kdepimlibs-4.6.95/kabc/plugins/net/net.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.0/kabc/plugins/net/net.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -76,7 +76,7 @@ Comment[lv]=Nodrošina piekļuvi kontaktiem attālinātos failus, izmantojot KDE tīklošanas ietvaru KIO. Atbalsta standarta VCard failus un citus formātus, atkarībā no pieejamajiem spraudņiem. Comment[nb]=Gir tilgang til kontakter i nettverksfiler, ved bruk av KDEs rammeverk KIO for nettverk. Støtter standard vCard og andre formater avhengig av tilgjengelige programtillegg. Comment[nds]=Stellt Togriep op Kontakten binnen feern Dateien praat, bruukt KDE sien Nettwark-Rahmenwark KIO. Ünnerstütt VCard-Dateien un anner Formaten na de verföögboren Modulen. -Comment[nl]=Geeft toegang tot contactpersonen in externe bestanden gebruikmakend van KIO, een netwerkonderdeel van KDE. Ondersteunt standaard VCard-bestanden en andere van beschikbare plugins afhankelijke formaten. +Comment[nl]=Geeft toegang tot contactpersonen in externe bestanden gebruikmakend van KIO, een netwerkonderdeel van KDE. Ondersteunt standaard VCard-bestanden en andere van beschikbare plug-ins afhankelijke formaten. Comment[nn]=Gjev tilgang til kontaktar i nettverksfiler ved å bruka KIO, nettverksrammeverket frå KDE. Standard vCard-filer er støtta, i tillegg til andre format, avhengig av kva programtillegg som er i bruk. Comment[pl]=Daje dostęp do kontaktów w zdalnym pliku przy użyciu modułu sieciowego KIO. Obsługuje pliki zgodne ze standardem VCard oraz inne, jeśli dostępne są odpowiednie wtyczki. Comment[pt]=Oferece o acesso aos contactos em ficheiros remotos, disponíveis através de um KIO da plataforma de rede do KDE. Suporta os ficheiros VCard normais, assim como outros formatos, dependendo da disponibilidade dos 'plugins'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/kioslave/mbox/readmbox.cpp new/kdepimlibs-4.7.0/kioslave/mbox/readmbox.cpp --- old/kdepimlibs-4.6.95/kioslave/mbox/readmbox.cpp 2011-05-20 22:31:23.000000000 +0200 +++ new/kdepimlibs-4.7.0/kioslave/mbox/readmbox.cpp 2011-07-19 23:33:40.000000000 +0200 @@ -190,6 +190,9 @@ delete m_file; m_file = 0; if( m_prev_time ) + { utime( QFile::encodeName( m_info->filename() ), m_prev_time ); + delete m_prev_time; + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/kontactinterface/kontactplugin.desktop new/kdepimlibs-4.7.0/kontactinterface/kontactplugin.desktop --- old/kdepimlibs-4.6.95/kontactinterface/kontactplugin.desktop 2011-05-20 22:31:23.000000000 +0200 +++ new/kdepimlibs-4.7.0/kontactinterface/kontactplugin.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -24,9 +24,10 @@ Name[lv]=Kontact spraudnis Name[nb]=Kontact-programtillegg Name[nds]=Kontact-Moduul -Name[nl]=Kontact-plugin +Name[nl]=Kontact-plug-in Name[nn]=Kontakt-tillegg Name[pa]=ਕੇਸੰਪਰਕ ਪਲੱਗਇਨ +Name[pl]=Wtyczka Kontact Name[pt]='Plugin' do Kontact Name[pt_BR]=Plug-in do Kontact Name[ro]=Modul Kontact diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/kresources/kresources_plugin.desktop new/kdepimlibs-4.7.0/kresources/kresources_plugin.desktop --- old/kdepimlibs-4.6.95/kresources/kresources_plugin.desktop 2011-05-20 22:31:23.000000000 +0200 +++ new/kdepimlibs-4.7.0/kresources/kresources_plugin.desktop 2011-07-19 23:33:40.000000000 +0200 @@ -24,7 +24,7 @@ Name[lv]=KResources spraudnis Name[nb]=Programtillegg for KResources Name[nds]=KResources-Moduul -Name[nl]=KResource-plugin +Name[nl]=KResource-plug-in Name[nn]=Programtillegg for KResource-rammeverket Name[pa]=ਕੇਸਰੋਤ ਪਲੱਗਇਨ Name[pl]=Wtyczka KResource @@ -75,7 +75,7 @@ Comment[lv]=KResource karkasa spraudnis Comment[nb]=Programtillegg for KResources-rammeverket Comment[nds]=Rahmenwark-Moduul för KResources -Comment[nl]=KResource-raamwerkplugin +Comment[nl]=KResource-raamwerkplug-in Comment[nn]=Programtillegg for KResource-rammeverket Comment[pa]=ਕੇਸਰੋਤ ਫਰੇਮਵਰਕ ਪਲੱਗਇਨ Comment[pl]=Wtyczka modułu KResource diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.6.95/mailtransport/smtpsettings_desktop.ui new/kdepimlibs-4.7.0/mailtransport/smtpsettings_desktop.ui --- old/kdepimlibs-4.6.95/mailtransport/smtpsettings_desktop.ui 2011-05-20 22:31:23.000000000 +0200 +++ new/kdepimlibs-4.7.0/mailtransport/smtpsettings_desktop.ui 2011-07-19 23:33:40.000000000 +0200 @@ -403,6 +403,24 @@ <header>knuminput.h</header> </customwidget> </customwidgets> + <tabstops> + <tabstop>tabWidget</tabstop> + <tabstop>kcfg_host</tabstop> + <tabstop>kcfg_requiresAuthentication</tabstop> + <tabstop>kcfg_userName</tabstop> + <tabstop>password</tabstop> + <tabstop>kcfg_storePassword</tabstop> + <tabstop>checkCapabilities</tabstop> + <tabstop>none</tabstop> + <tabstop>ssl</tabstop> + <tabstop>tls</tabstop> + <tabstop>authCombo</tabstop> + <tabstop>kcfg_specifyHostname</tabstop> + <tabstop>kcfg_localHostname</tabstop> + <tabstop>kcfg_specifySenderOverwriteAddress</tabstop> + <tabstop>kcfg_senderOverwriteAddress</tabstop> + <tabstop>kcfg_precommand</tabstop> + </tabstops> <resources/> <connections> <connection> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org