Author: arekm Date: Mon Dec 7 14:45:04 2009 GMT Module: packages Tag: HEAD ---- Log message: - qt4.6 fix
---- Files affected: packages/kde4-kdepim: kde4-kdepim-branch.diff (1.15 -> 1.16) ---- Diffs: ================================================================ Index: packages/kde4-kdepim/kde4-kdepim-branch.diff diff -u packages/kde4-kdepim/kde4-kdepim-branch.diff:1.15 packages/kde4-kdepim/kde4-kdepim-branch.diff:1.16 --- packages/kde4-kdepim/kde4-kdepim-branch.diff:1.15 Wed Nov 25 11:02:54 2009 +++ packages/kde4-kdepim/kde4-kdepim-branch.diff Mon Dec 7 15:44:58 2009 @@ -1,1852 +1,321 @@ -Index: kmail/stringutil.h +Index: akregator/src/aboutdata.h =================================================================== ---- kmail/stringutil.h (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kmail/stringutil.h (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -20,6 +20,7 @@ - #define KMAIL_STRINGUTIL_H - - #include <QString> -+#include <QMap> - - class KUrl; - namespace KMime -@@ -157,10 +158,9 @@ - QString smartQuote( const QString &msg, int maxLineLength ); - - /** -- * Parses a mailto: url and extracts the information about to, cc, subject and body out into -- * the QStrings given as argument. -+ * Parses a mailto: url and extracts the information in the QMap (field name as key). - */ -- void parseMailtoUrl( const KUrl &url, QString &to, QString &cc, QString &subject, QString &body ); -+ QMap<QString, QString> parseMailtoUrl( const KUrl &url ); - } +--- akregator/src/aboutdata.h (.../tags/KDE/4.3.4/kdepim) (wersja 1059841) ++++ akregator/src/aboutdata.h (.../branches/KDE/4.3/kdepim) (wersja 1059841) +@@ -28,7 +28,7 @@ + #include "akregator_export.h" + #include <kaboutdata.h> - } -Index: kmail/stringutil.cpp -=================================================================== ---- kmail/stringutil.cpp (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kmail/stringutil.cpp (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -997,15 +997,14 @@ - } +-#define AKREGATOR_VERSION "1.5.3" ++#define AKREGATOR_VERSION "1.5.4" - #ifndef KMAIL_UNITTESTS --void parseMailtoUrl ( const KUrl& url, QString& to, QString& cc, QString& subject, QString& body ) -+QMap<QString, QString> parseMailtoUrl ( const KUrl& url ) - { - kDebug() << url.pathOrUrl(); -- to = decodeMailtoUrl( url.path() ); - QMap<QString, QString> values = url.queryItems( KUrl::CaseInsensitiveKeys ); -- to += ", " + values.value( "to" ); -- body = values.value( "body" ); -- subject = values.value( "subject" ); -- cc = values.value( "cc" ); -+ QString to = decodeMailtoUrl( url.path() ); -+ to = to.isEmpty() ? values.value( "to" ) : to + QString( ", " ) + values.value( "to" ); -+ values.insert( "to", to ); -+ return values; - } - #endif - -Index: kmail/kmcommands.cpp -=================================================================== ---- kmail/kmcommands.cpp (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kmail/kmcommands.cpp (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -2294,16 +2294,15 @@ - msg->initHeader(mIdentity); - msg->setCharset("utf-8"); - -- QString to, body, subject, cc; -- KMail::StringUtil::parseMailtoUrl( mUrl, to, cc, subject, body ); -+ QMap<QString, QString> fields = KMail::StringUtil::parseMailtoUrl( mUrl ); - -- msg->setTo( to ); -- if ( !subject.isEmpty() ) -- msg->setSubject( subject ); -- if ( !body.isEmpty() ) -- msg->setBodyFromUnicode( body ); -- if ( !cc.isEmpty() ) -- msg->setCc( cc ); -+ msg->setTo( fields.value( "to" ) ); -+ if ( !fields.value( "subject" ).isEmpty() ) -+ msg->setSubject( fields.value( "subject" ) ); -+ if ( !fields.value( "body" ).isEmpty() ) -+ msg->setBodyFromUnicode( fields.value( "body" ) ); -+ if ( !fields.value( "cc" ).isEmpty() ) -+ msg->setCc( fields.value( "cc" ) ); - - KMail::Composer * win = KMail::makeComposer( msg, mIdentity ); - win->setCharset("", true); -Index: kmail/kmkernel.cpp -=================================================================== ---- kmail/kmkernel.cpp (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kmail/kmkernel.cpp (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -307,16 +307,17 @@ - for(int i= 0; i < args->count(); i++) - { - if ( args->arg(i).startsWith( QLatin1String( "mailto:" ), Qt::CaseInsensitive ) ) { -- QString mailtoTo, mailtoBody, mailtoSubject, mailtoCC; -- KMail::StringUtil::parseMailtoUrl( args->url( i ), mailtoTo, mailtoCC, mailtoSubject, mailtoBody ); -- if ( !mailtoTo.isEmpty() ) -- to += mailtoTo + ", "; -- if ( !mailtoCC.isEmpty() ) -- cc += mailtoCC + ", "; -- if ( !mailtoSubject.isEmpty() ) -- subj = mailtoSubject; -- if ( !mailtoBody.isEmpty() ) -- body = mailtoBody; -+ QMap<QString, QString> values = KMail::StringUtil::parseMailtoUrl( args->url( i ) ); -+ if ( !values.value( "to" ).isEmpty() ) -+ to += values.value( "to" ) + ", "; -+ if ( !values.value( "cc" ).isEmpty() ) -+ cc += values.value( "cc" ) + ", "; -+ if ( !values.value( "subject" ).isEmpty() ) -+ subj = values.value( "subject" ); -+ if ( !values.value( "body" ).isEmpty() ) -+ body = values.value( "body" ); -+ if ( !values.value( "in-reply-to" ).isEmpty() ) -+ customHeaders << "In-Reply-To:" + values.value( "in-reply-to" ); - } - else { - QString tmpArg = args->arg(i); -Index: kmail/mailsourceviewer.cpp -=================================================================== ---- kmail/mailsourceviewer.cpp (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kmail/mailsourceviewer.cpp (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -78,6 +78,7 @@ - setAttribute( Qt::WA_DeleteOnClose ); - setLineWrapMode( QTextEdit::NoWrap ); - setTextInteractionFlags( Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard ); -+ setLayoutDirection( Qt::LeftToRight ); - - // combining the shortcuts in one qkeysequence() did not work... - QShortcut* shortcut = new QShortcut( this ); -Index: kmail/kmacctimap.cpp + namespace Akregator { + /** +Index: kresources/slox/sloxbase.h =================================================================== ---- kmail/kmacctimap.cpp (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kmail/kmacctimap.cpp (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -179,11 +179,17 @@ - (*it).progressItem->setComplete(); - } - } -- if (mSlave && mapJobData.begin() != mapJobData.end()) -- { -- mSlave->kill(); -+ -+ if ( slave() ) { -+ if ( disconnectSlave ) { -+ KIO::Scheduler::disconnectSlave( slave() ); -+ } -+ if ( mapJobData.begin() != mapJobData.end() ) { -+ mSlave->kill(); -+ } - mSlave = 0; - } +--- kresources/slox/sloxbase.h (.../tags/KDE/4.3.4/kdepim) (wersja 1059841) ++++ kresources/slox/sloxbase.h (.../branches/KDE/4.3/kdepim) (wersja 1059841) +@@ -34,6 +34,7 @@ + ClientId, + FolderId, + LastSync, ++ LastModified, + ObjectType, + ObjectStatus, + CreatedBy, +Index: kresources/slox/kcalresourceslox.cpp +=================================================================== +--- kresources/slox/kcalresourceslox.cpp (.../tags/KDE/4.3.4/kdepim) (wersja 1059841) ++++ kresources/slox/kcalresourceslox.cpp (.../branches/KDE/4.3/kdepim) (wersja 1059841) +@@ -334,6 +334,11 @@ + WebdavHandler::addSloxElement( this, doc, prop, fieldName( ClientId ), + mUploadedIncidence->uid() ); + ++ if ( type() == "ox" ) { ++ const QString lastModified = mUploadedIncidence->customProperty( "SLOX", "LastModified" ); ++ WebdavHandler::addSloxElement( this, doc, prop, fieldName( LastModified ), lastModified ); ++ } + - // remove the jobs - mapJobData.clear(); - KMAccount::deleteFolderJobs(); -@@ -198,10 +204,6 @@ - checkDone( false, CheckOK ); // returned 0 new messages - mCountRemainChecks = 0; + if ( mUploadIsDelete ) { + if ( mUploadedIncidence->type() == "Event" ) { + url.setPath( "/servlet/webdav.calendar/" + sloxId ); +@@ -347,6 +352,10 @@ + + if ( type() == "ox" ) { + WebdavHandler::addSloxElement( this, doc, prop, "method", "DELETE" ); ++ if ( mUploadedIncidence->type() == "Event" ) ++ WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->calendarFolderId() ); ++ else if ( mUploadedIncidence->type() == "Todo" ) ++ WebdavHandler::addSloxElement( this, doc, prop, fieldName( FolderId ), mPrefs->taskFolderId() ); + } else { + QDomElement remove = WebdavHandler::addElement( doc, pu, "D:remove" ); + QDomElement prop = WebdavHandler::addElement( doc, remove, "D:prop" ); +@@ -694,6 +703,8 @@ + parseReadRightsAttribute( e, incidence ); + } else if ( tag == fieldName( Categories ) ) { + incidence->setCategories( text.split( QRegExp(",\\s*") ) ); ++ } else if ( tag == fieldName( LastModified ) && type() == "ox" ) { ++ incidence->setCustomProperty( "SLOX", "LastModified", text ); } -- if ( disconnectSlave && slave() ) { -- KIO::Scheduler::disconnectSlave( slave() ); -- mSlave = 0; -- } - } - - //----------------------------------------------------------------------------- -Index: kmail/objecttreeparser.cpp -=================================================================== ---- kmail/objecttreeparser.cpp (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kmail/objecttreeparser.cpp (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -1179,7 +1179,7 @@ - // here. - // Do this only when prefering HTML mail, though, since otherwise the attachments are hidden - // when displaying plain text. -- if ( !dataHtml && mReader->htmlMail() ) { -+ if ( !dataHtml && mReader && mReader->htmlMail() ) { - dataHtml = child->findType( DwMime::kTypeMultipart, DwMime::kSubtypeMixed, false, true ); - } - } -Index: kmail/kmversion.h -=================================================================== ---- kmail/kmversion.h (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kmail/kmversion.h (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -3,6 +3,6 @@ - #ifndef kmversion_h - #define kmversion_h - --#define KMAIL_VERSION "1.12.3" -+#define KMAIL_VERSION "1.12.4" - - #endif /*kmversion_h*/ -Index: kalarm/kalarm.h -=================================================================== ---- kalarm/kalarm.h (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kalarm/kalarm.h (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -23,7 +23,7 @@ - - #undef QT3_SUPPORT - --#define KALARM_VERSION "2.2.9" -+#define KALARM_VERSION "2.2.10" - #define KALARM_NAME "KAlarm" - #define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application - -Index: kalarm/editdlg.h -=================================================================== ---- kalarm/editdlg.h (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kalarm/editdlg.h (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -90,6 +90,7 @@ - void init(const KAEvent* event, bool newAlarm); - virtual void resizeEvent(QResizeEvent*); - virtual void showEvent(QShowEvent*); -+ virtual void closeEvent(QCloseEvent*); - virtual QString type_caption(bool newAlarm) const = 0; - virtual void type_init(QWidget* parent, QVBoxLayout* frameLayout) = 0; - virtual void type_initValues(const KAEvent*) = 0; -Index: kalarm/Changelog -=================================================================== ---- kalarm/Changelog (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kalarm/Changelog (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -1,5 +1,15 @@ - KAlarm Change Log - -+=== Version 2.2.10 --- 23 November 2009 === -+- If dual screens, show alarm in other screen if any full screen window exists. -+- Fix crash if editing alarm from alarm window Edit button, and window changes -+ from reminder to normal, or window changes from at-login to final at-login -+ trigger time, or window auto-closes. -+- Prevent infinite loop if NEXTRECUR time in alarm is before alarm start time. -+- Fix error saving the alarm after editing a repeat-at-login alarm. -+- Don't set reminder/late-cancel/show-in-KOrganizer when saving repeat-at-login -+ alarms. -+ - === Version 2.2.9 (KDE 4.3.3) --- 29 October 2009 === - - Fix recurring date-only alarm triggering repeatedly and eating up CPU, if the - start-of-day time is after midnight and the alarm is due, but current UTC time -@@ -11,7 +21,6 @@ - - Interpret '~' properly in entered file names. - - Prevent sound file configuration dialogue closing after showing error message. - - Fix crash if calendar formats are updated at login, during session restoration. --- If dual screens, show alarm in other screen if active window is full screen. - - === Version 2.2.8 (KDE 4.3.2) --- 28 September 2009 === - - Use KDE system settings to determine default working days in the week. -Index: kalarm/kalarmapp.cpp -=================================================================== ---- kalarm/kalarmapp.cpp (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kalarm/kalarmapp.cpp (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -212,7 +212,7 @@ - { - --mActiveCount; - quitIf(1, true); // error opening the main calendar - quit -- return true; -+ return false; - } - MainWindow* trayParent = 0; - for (int i = 1; KMainWindow::canBeRestored(i); ++i) -@@ -254,7 +254,8 @@ - } - - --mActiveCount; -- quitIf(0); // quit if no windows are open -+ if (quitIf(0)) // quit if no windows are open -+ return false; // quitIf() can sometimes return, despite calling exit() - - startProcessQueue(); // start processing the execution queue - return true; -@@ -1357,6 +1358,9 @@ - // It's not a reminder or a deferred alarm, and there is no message window - // (other than a reminder window) currently displayed for this alarm, - // and we need to execute a command before displaying the new window. -+ // -+ // NOTE: The pre-action is not executed for a recurring alarm if an -+ // alarm message window for a previous occurrence is still visible. - if (!ShellProcess::authorised()) - setEventCommandError(event, KAEvent::CMD_ERROR_PRE); - else -@@ -1392,22 +1396,32 @@ - // Display the message even though it failed - } - } -- if (!win -- || (!win->hasDefer() && !alarm.repeatAtLogin()) -- || replaceReminder) -+ -+ if (!win) - { -- // Either there isn't already a message for this event, -- // or there is a repeat-at-login message with no Defer -- // button, which needs to be replaced with a new message, -- // or the caption needs to be changed from "Reminder" to "Message". -- if (win) -- win->setRecreating(); // prevent post-alarm actions -- delete win; -+ // There isn't already a message for this event - int flags = (reschedule ? 0 : MessageWin::NO_RESCHEDULE) | (allowDefer ? 0 : MessageWin::NO_DEFER); - (new MessageWin(&event, alarm, flags))->show(); - } -+ else if (replaceReminder) -+ { -+ // The caption needs to be changed from "Reminder" to "Message" -+ win->cancelReminder(event, alarm); -+ } -+ else if (!win->hasDefer() && !alarm.repeatAtLogin()) -+ { -+ // It's a repeat-at-login message with no Defer button, -+ // which has now reached its final trigger time and needs -+ // to be replaced with a new message. -+ win->showDefer(); -+ win->showDateTime(event, alarm); -+ } - else - { -+ // Use the existing message window -+ } -+ if (win) -+ { - // Raise the existing message window and replay any sound - win->repeat(alarm); // N.B. this reschedules the alarm - } -Index: kalarm/lib/desktop.cpp -=================================================================== ---- kalarm/lib/desktop.cpp (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kalarm/lib/desktop.cpp (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -1,7 +1,7 @@ - /* - * desktop.cpp - desktop functions - * Program: kalarm -- * Copyright © 2008 by David Jarvie <djar...@kde.org> -+ * Copyright © 2008,2009 by David Jarvie <djar...@kde.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -21,23 +21,23 @@ - #include "desktop.h" - #ifdef Q_WS_X11 - #include <kwindowsystem.h> --#else -+#endif - #include <QApplication> - #include <QDesktopWidget> --#endif - - namespace KAlarm { - - /****************************************************************************** --* Return the size of the usable area of the desktop. -+* Return the size of the usable area of the desktop, optionally for a specific -+* screen in a multi-head setup. - */ --QRect desktopWorkArea() -+QRect desktopWorkArea(int screen) - { - #ifdef Q_WS_X11 -- return KWindowSystem::workArea(); --#else -- return qApp->desktop()->availableGeometry(); -+ if (screen < 0) -+ return KWindowSystem::workArea(); - #endif -+ return qApp->desktop()->availableGeometry(screen); - } - - } // namespace KAlarm -Index: kalarm/lib/pushbutton.cpp -=================================================================== ---- kalarm/lib/pushbutton.cpp (.../tags/KDE/4.3.3/kdepim) (wersja 1053999) -+++ kalarm/lib/pushbutton.cpp (.../branches/KDE/4.3/kdepim) (wersja 1053999) -@@ -1,7 +1,7 @@ - /* - * pushbutton.cpp - push button with read-only option - * Program: kalarm -- * Copyright (c) 2002, 2005 by David Jarvie <softw...@astrojar.org.uk> -+ * Copyright © 2002,2005,2009 by David Jarvie <djar...@kde.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -25,25 +25,36 @@ - - - PushButton::PushButton(QWidget* parent) -- : QPushButton(parent), -+ : KPushButton(parent), - mFocusPolicy(focusPolicy()), -- mReadOnly(false) -+ mReadOnly(false), -+ mNoHighlight(false) - { } - -+PushButton::PushButton(const KGuiItem& text, QWidget* parent) -+ : KPushButton(text, parent), -+ mFocusPolicy(focusPolicy()), -+ mReadOnly(false), -+ mNoHighlight(false) -+{ } -+ - PushButton::PushButton(const QString& text, QWidget* parent) -- : QPushButton(text, parent), -+ : KPushButton(text, parent), - mFocusPolicy(focusPolicy()), -- mReadOnly(false) -+ mReadOnly(false), -+ mNoHighlight(false) - { } - --PushButton::PushButton(const QIcon& icon, const QString& text, QWidget* parent) -- : QPushButton(icon, text, parent), -+PushButton::PushButton(const KIcon& icon, const QString& text, QWidget* parent) -+ : KPushButton(icon, text, parent), - mFocusPolicy(focusPolicy()), -- mReadOnly(false) -+ mReadOnly(false), -+ mNoHighlight(false) - { } - --void PushButton::setReadOnly(bool ro) -+void PushButton::setReadOnly(bool ro, bool noHighlight) - { -+ mNoHighlight = noHighlight; - if ((int)ro != (int)mReadOnly) - { - mReadOnly = ro; -@@ -61,7 +72,7 @@ - if (e->button() == Qt::LeftButton) - return; - } -- QPushButton::mousePressEvent(e); -+ KPushButton::mousePressEvent(e); } - void PushButton::mouseReleaseEvent(QMouseEvent* e) -@@ -72,13 +83,13 @@ - if (e->button() == Qt::LeftButton) - return; - } -- QPushButton::mouseReleaseEvent(e); -+ KPushButton::mouseReleaseEvent(e); - } - - void PushButton::mouseMoveEvent(QMouseEvent* e) - { - if (!mReadOnly) -- QPushButton::mouseMoveEvent(e); -+ KPushButton::mouseMoveEvent(e); - } - - void PushButton::keyPressEvent(QKeyEvent* e) -@@ -95,11 +106,22 @@ - default: - return; - } -- QPushButton::keyPressEvent(e); -+ KPushButton::keyPressEvent(e); - } - - void PushButton::keyReleaseEvent(QKeyEvent* e) - { - if (!mReadOnly) -- QPushButton::keyReleaseEvent(e); -+ KPushButton::keyReleaseEvent(e); - } +@@ -1162,6 +1173,16 @@ + i->setUid( uid ); + i->setCustomProperty( "SLOX", "ID", sloxId ); + ++ if ( type() == "ox" ) { ++ // Update the last_modified property ++ const QDomNode lastModifiedNode = prop.namedItem( fieldName( LastModified ) ); ++ if ( !lastModifiedNode.isNull() ) { ++ const QDomElement lastModifiedElement = lastModifiedNode.toElement(); ++ const QString lastModified = lastModifiedElement.text(); ++ i->setCustomProperty( "SLOX", "LastModified", lastModified ); ++ } ++ } + -+bool PushButton::event(QEvent* e) -+{ -+ if (mReadOnly && mNoHighlight) -+ { -+ // Don't highlight the button on mouse hover -+ if (e->type() == QEvent::HoverEnter) -+ return true; -+ } -+ return KPushButton::event(e); -+} -Index: kalarm/lib/synchtimer.cpp + disableChangeNotification(); + calendar()->deleteIncidence( mUploadedIncidence ); + calendar()->addIncidence( i ); +Index: kresources/slox/sloxbase.cpp +=================================================================== +--- kresources/slox/sloxbase.cpp (.../tags/KDE/4.3.4/kdepim) (wersja 1059841) ++++ kresources/slox/sloxbase.cpp (.../branches/KDE/4.3/kdepim) (wersja 1059841) +@@ -29,6 +29,7 @@ + {"clientid", "client_id"}, + {"folderid", "folder_id"}, + {"lastsync", "lastsync"}, ++ {"n/a", "last_modified"}, + {"objecttype", "objectmode"}, + {"sloxstatus", "object_status"}, + {"createfrom", "created_by"}, +Index: kalarm/lib/lineedit.cpp +=================================================================== +--- kalarm/lib/lineedit.cpp (.../tags/KDE/4.3.4/kdepim) (wersja 1059841) ++++ kalarm/lib/lineedit.cpp (.../branches/KDE/4.3/kdepim) (wersja 1059841) +@@ -88,8 +88,8 @@ + QString LineEdit::text() const + { + if (mType == Url) +- return KShell::tildeExpand(QLineEdit::text()); +- return QLineEdit::text(); ++ return KShell::tildeExpand(KLineEdit::text()); ++ return KLineEdit::text(); + } + + void LineEdit::setText(const QString& text) +Index: kaddressbook/xxport/gmx_xxport.desktop +=================================================================== +--- kaddressbook/xxport/gmx_xxport.desktop (.../tags/KDE/4.3.4/kdepim) (wersja 1059841) ++++ kaddressbook/xxport/gmx_xxport.desktop (.../branches/KDE/4.3/kdepim) (wersja 1059841) +@@ -68,6 +68,7 @@ + Comment[pl]=Wtyczka do importu i eksportu wizytówek w formacie książki adresowej GMX + Comment[pt]=Um 'plugin' para importar e exportar os contactos no formato GMX + Comment[pt_BR]=Plug-in para importar e exportar contatos no formato de livro de endereços do GMX ++Comment[ru]=Импорт и экспорт контактов в формате GMX + Comment[sv]=Insticksprogram för import och export av kontakter med GMX-adressboksformat + Comment[tr]=GMX'in adres defteri biçimini içeriye ya da dışarıya aktarma eklentisi + Comment[uk]=Втулок для імпорту та експорту контактів у форматі адресних книг GMX +Index: kaddressbook/xxport/vcard_xxport.desktop +=================================================================== +--- kaddressbook/xxport/vcard_xxport.desktop (.../tags/KDE/4.3.4/kdepim) (wersja 1059841) ++++ kaddressbook/xxport/vcard_xxport.desktop (.../branches/KDE/4.3/kdepim) (wersja 1059841) +@@ -93,7 +93,7 @@ + Comment[pl]=Wtyczka do importu i eksportu wizytówek w formacie vCard + Comment[pt]=Um 'plugin' para importar e exportar os contactos no formato vCard + Comment[pt_BR]=Plug-in para importar e exportar contatos no formato vCard +-Comment[ru]=Импорта и экспорт контактов в формате vCard ++Comment[ru]=Импорт и экспорт контактов в формате vCard + Comment[sk]=Plugin pre import a export kontaktov v vCard formáte + Comment[sl]=Vstavek za uvoz in izvoz stikov v obliki vCard + Comment[sv]=Insticksprogram för import och export av kontakter med vCard-format +Index: kaddressbook/xxport/pab_xxport.desktop +=================================================================== +--- kaddressbook/xxport/pab_xxport.desktop (.../tags/KDE/4.3.4/kdepim) (wersja 1059841) ++++ kaddressbook/xxport/pab_xxport.desktop (.../branches/KDE/4.3/kdepim) (wersja 1059841) <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim/kde4-kdepim-branch.diff?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit