[Pkg-kde-commits] rev 714 - in trunk/packages/kdepim/debian: . patches
Daniel Schepler
schepler@costa.debian.org
Sun, 06 Mar 2005 07:06:11 +0100
Author: schepler
Date: 2005-03-06 07:06:07 +0100 (Sun, 06 Mar 2005)
New Revision: 714
Modified:
trunk/packages/kdepim/debian/changelog
trunk/packages/kdepim/debian/control
trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff
Log:
Commit kdepim 4:3.3.2-2 packaging, a bit belatedly.
Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog 2005-03-06 04:55:32 UTC (rev 713)
+++ trunk/packages/kdepim/debian/changelog 2005-03-06 06:06:07 UTC (rev 714)
@@ -1,3 +1,17 @@
+kdepim (4:3.3.2-2) unstable; urgency=low
+
+ * Disable gnokii support again until bug #266566 is resolved.
+ * Update from KDE_3_3_BRANCH.
+ * Fixed the kmailcvt description to refer to mail folders instead of
+ address books. Closes: #252668.
+ Also expanded the description a bit to list some supported import
+ formats.
+ * Kontact conflicts with obsolete kontact-plugins package.
+ Closes: #292997.
+ * Add Build-Depends on graphviz to get class hierarchy graphs.
+
+ -- Daniel Schepler <schepler@debian.org> Tue, 1 Mar 2005 05:20:08 -0800
+
kdepim (4:3.3.2-1) unstable; urgency=low
* Uploading to unstable.
Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control 2005-03-06 04:55:32 UTC (rev 713)
+++ trunk/packages/kdepim/debian/control 2005-03-06 06:06:07 UTC (rev 714)
@@ -3,8 +3,9 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Christopher L Cheney <ccheney@debian.org>, Daniel Schepler <schepler@debian.org>
-Build-Depends: autoconf, automake1.9, bison, byacc, cdbs, debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>> 4:3.3.2), libbluetooth1-dev, libgnokii2-dev (>= 0.6.4), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline4-dev, libtool, libxpm-dev, sharutils, texinfo
-Build-Depends-Indep: doxygen, qt3-doc, kdelibs4-doc
+Build-Depends: autoconf, automake1.9, bison, byacc, cdbs, debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.3.2-3), libbluetooth1-dev, libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline4-dev, libtool, libxpm-dev, sharutils, texinfo
+Build-Depends-Indep: doxygen, graphviz, qt3-doc, kdelibs4-doc
+Build-Conflicts: libgnokii2-dev, libgnokii2
Standards-Version: 3.6.1.0
Package: kdepim
@@ -182,8 +183,9 @@
Architecture: any
Depends: ${shlibs:Depends}, kmail
Replaces: kmail (<< 4:3.0.0)
-Description: KDE KMail addressbook converter
- Converts addressbooks to KMail format.
+Description: KDE KMail mail folder converter
+ Converts mail folders to KMail format. Formats supported for import
+ include Outlook Express, Evolution, and plain mbox.
.
This package is part of the official KDE pim module.
@@ -232,6 +234,7 @@
Recommends: ${shlibs:Recommends}, kaddressbook, kitchensync, kmail, knode, knotes
Suggests: ${shlibs:Suggests}, knewsticker, kweather
Replaces: kontact-plugins (<< 4:3.2.92)
+Conflicts: kontact-plugins (<< 4:3.2.92)
Description: KDE pim application
Kontact is the integrated solution to your personal information management
needs. It combines KDE applications like KMail, KOrganizer, and
Modified: trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff 2005-03-06 04:55:32 UTC (rev 713)
+++ trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff 2005-03-06 06:06:07 UTC (rev 714)
@@ -24,14 +24,50 @@
])
AC_DEFUN([KDE_CHECK_STL],
+Index: certmanager/certmanager.cpp
+===================================================================
+RCS file: /home/kde/kdepim/certmanager/certmanager.cpp,v
+retrieving revision 1.106.2.2
+retrieving revision 1.106.2.3
+diff -u -r1.106.2.2 -r1.106.2.3
+--- certmanager/certmanager.cpp 19 Oct 2004 20:41:55 -0000 1.106.2.2
++++ certmanager/certmanager.cpp 27 Jan 2005 15:57:48 -0000 1.106.2.3
+@@ -58,6 +58,7 @@
+ #include <kleo/keyfiltermanager.h>
+ #include <kleo/hierarchicalkeylistjob.h>
+ #include <kleo/refreshkeysjob.h>
++#include <kleo/cryptoconfig.h>
+
+ #include <ui/progressdialog.h>
+ #include <ui/progressbar.h>
+@@ -380,7 +381,18 @@
+ Kleo::CryptoConfig* config = Kleo::CryptoBackendFactory::instance()->config();
+ if ( config ) {
+ Kleo::CryptoConfigDialog dlg( config );
+- dlg.exec();
++
++ int result = dlg.exec();
++
++ // Forget all data parsed from gpgconf, so that we show updated information
++ // when reopening the configuration dialog.
++ config->clear();
++
++ if ( result == QDialog::Accepted )
++ {
++ // Tell other apps (e.g. kmail) that the gpgconf data might have changed
++ kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", QByteArray() );
++ }
+ }
+ }
+
Index: certmanager/conf/kleopatra_config_appear.desktop
===================================================================
RCS file: /home/kde/kdepim/certmanager/conf/kleopatra_config_appear.desktop,v
retrieving revision 1.36.2.11
-retrieving revision 1.36.2.13
-diff -u -r1.36.2.11 -r1.36.2.13
+retrieving revision 1.36.2.14
+diff -u -r1.36.2.11 -r1.36.2.14
--- certmanager/conf/kleopatra_config_appear.desktop 26 Nov 2004 08:05:18 -0000 1.36.2.11
-+++ certmanager/conf/kleopatra_config_appear.desktop 29 Dec 2004 21:44:48 -0000 1.36.2.13
++++ certmanager/conf/kleopatra_config_appear.desktop 26 Jan 2005 08:10:27 -0000 1.36.2.14
@@ -14,6 +14,7 @@
X-KDE-CfgDlgHierarchy=Kleopatra
@@ -72,7 +108,14 @@
Keywords[be]=колер, шрыфт, канфігурацыя, color, font, configuration
Keywords[bg]=цвят, шрифт, конфигуриране, настройки color, font, configuration
Keywords[br]=liv,nodrezh, kefluniadur
-@@ -110,6 +115,7 @@
+@@ -104,12 +109,14 @@
+ Keywords[et]=värv, font, seadistamine
+ Keywords[fi]=värit,kirjasimet, asetukset
+ Keywords[fr]=couleur,police,configuration,paramètres,réglages,couleurs,polices
++Keywords[ga]=dath,cló,cumraíocht
+ Keywords[gl]=cor,fonte, configuración
+ Keywords[he]=צבע,צבעים, גופנים, גופן, תצורה, הגדרה
+ Keywords[hu]=szín,betűtípus,beállítások
Keywords[is]=litir,letur, stillingar
Keywords[it]=colori, font, caratteri, configurazione
Keywords[ja]=色 フォント 設定
@@ -148,10 +191,10 @@
===================================================================
RCS file: /home/kde/kdepim/certmanager/lib/libkleopatrarc.desktop,v
retrieving revision 1.45.2.8
-retrieving revision 1.45.2.10
-diff -u -r1.45.2.8 -r1.45.2.10
+retrieving revision 1.45.2.12
+diff -u -r1.45.2.8 -r1.45.2.12
--- certmanager/lib/libkleopatrarc.desktop 13 Nov 2004 07:20:47 -0000 1.45.2.8
-+++ certmanager/lib/libkleopatrarc.desktop 10 Jan 2005 09:02:03 -0000 1.45.2.10
++++ certmanager/lib/libkleopatrarc.desktop 23 Feb 2005 09:00:23 -0000 1.45.2.12
@@ -1,6 +1,7 @@
[Key Filter #0]
was-validated=false
@@ -194,14 +237,25 @@
Name[bg]=Ненадеждно удостоверение
Name[bs]=Nepovjerljiv korijenski certifikat
Name[ca]=Certificat arrel sense confiança
-@@ -185,6 +191,7 @@
+@@ -185,8 +191,10 @@
[Key Filter #5]
was-validated=true
Name=Other keys
+Name[ar]=مفاتيح أخرى
Name[be]=Іншыя ключы
Name[bg]=Други ключове
++Name[br]=Alc'hwezioù all
Name[bs]=Ostali ključevi
+ Name[ca]=Altres claus
+ Name[cs]=Ostatní klíče
+@@ -196,6 +204,7 @@
+ Name[et]=Muud võtmed
+ Name[fi]=Muut avaimet
+ Name[fr]=Autres clés
++Name[ga]=Eochracha eile
+ Name[gl]=Outras chaves
+ Name[he]=מפתחות אחרים
+ Name[hu]=Egyéb kulcsok
Index: certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
===================================================================
RCS file: /home/kde/kdepim/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp,v
@@ -221,15 +275,54 @@
else {
if ( mCurrentGroup && !mCurrentGroup->mEntries.isEmpty() ) // only add non-empty groups
mGroups.insert( mCurrentGroupName, mCurrentGroup );
+Index: certmanager/lib/ui/backendconfigwidget.cpp
+===================================================================
+RCS file: /home/kde/kdepim/certmanager/lib/ui/backendconfigwidget.cpp,v
+retrieving revision 1.6
+retrieving revision 1.6.2.1
+diff -u -r1.6 -r1.6.2.1
+--- certmanager/lib/ui/backendconfigwidget.cpp 9 Jun 2004 14:56:35 -0000 1.6
++++ certmanager/lib/ui/backendconfigwidget.cpp 27 Jan 2005 15:57:49 -0000 1.6.2.1
+@@ -45,6 +45,8 @@
+ #include <klocale.h>
+ #include <kdebug.h>
+ #include <kmessagebox.h>
++#include <kapplication.h>
++#include <dcopclient.h>
+
+ #include <qpushbutton.h>
+ #include <qlayout.h>
+@@ -303,7 +305,12 @@
+ const CryptoBackend* backend = d->listView->currentBackend();
+ if ( backend && backend->config() ) {
+ Kleo::CryptoConfigDialog dlg( backend->config() );
+- dlg.exec();
++ int result = dlg.exec();
++ if ( result == QDialog::Accepted )
++ {
++ // Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed
++ kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", QByteArray() );
++ }
+ }
+ else // shouldn't happen, button is disabled
+ kdWarning(5150) << "Can't configure backend, no config object available" << endl;
Index: kaddressbook/kaddressbook.desktop
===================================================================
RCS file: /home/kde/kdepim/kaddressbook/kaddressbook.desktop,v
retrieving revision 1.139.2.4
-retrieving revision 1.139.2.5
-diff -u -r1.139.2.4 -r1.139.2.5
+retrieving revision 1.139.2.6
+diff -u -r1.139.2.4 -r1.139.2.6
--- kaddressbook/kaddressbook.desktop 28 Nov 2004 08:33:53 -0000 1.139.2.4
-+++ kaddressbook/kaddressbook.desktop 12 Dec 2004 08:32:43 -0000 1.139.2.5
-@@ -26,6 +26,7 @@
++++ kaddressbook/kaddressbook.desktop 23 Feb 2005 09:00:23 -0000 1.139.2.6
+@@ -17,6 +17,7 @@
+ Name[et]=Aadressihaldur
+ Name[fi]=Osoitekirja
+ Name[fr]=Carnet d'adresses
++Name[ga]=Bainisteoir na Seoltaí
+ Name[gl]=Xestor de Enderezos
+ Name[he]=מנהל הכתובות
+ Name[hi]=पता प्रबंधक
+@@ -26,6 +27,7 @@
Name[it]=Gestore degli indirizzi
Name[ja]=アドレスマネージャ
Name[lt]=Adresų tvarkyklė
@@ -445,18 +538,20 @@
===================================================================
RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/msnprotocol.desktop,v
retrieving revision 1.6.2.4
-retrieving revision 1.6.2.5
-diff -u -r1.6.2.4 -r1.6.2.5
+retrieving revision 1.6.2.6
+diff -u -r1.6.2.4 -r1.6.2.6
--- kaddressbook/editors/protocols/msnprotocol.desktop 10 Nov 2004 07:37:26 -0000 1.6.2.4
-+++ kaddressbook/editors/protocols/msnprotocol.desktop 29 Dec 2004 21:44:50 -0000 1.6.2.5
-@@ -5,6 +5,7 @@
++++ kaddressbook/editors/protocols/msnprotocol.desktop 23 Feb 2005 09:00:24 -0000 1.6.2.6
+@@ -5,7 +5,9 @@
ServiceTypes=KABC/IMProtocol,KPluginInfo
X-KDE-InstantMessagingKABCField=messaging/msn
Comment=MSN Messenger
+Comment[ar]=MSN Messenger إم إس إن ماسنجر
Comment[bg]=Протокол MSN
++Comment[cy]=Negesydd MSN
Comment[fr]=Messagerie MSN
Comment[ja]=MSN メッセンジャー
+ Comment[ta]=MSN மெசஞ்சர்
Index: kaddressbook/editors/protocols/smsprotocol.desktop
===================================================================
RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/smsprotocol.desktop,v
@@ -554,27 +649,79 @@
===================================================================
RCS file: /home/kde/kdepim/kaddressbook/interfaces/kaddressbook_xxport.desktop,v
retrieving revision 1.30.2.4
-retrieving revision 1.30.2.5
-diff -u -r1.30.2.4 -r1.30.2.5
+retrieving revision 1.30.2.6
+diff -u -r1.30.2.4 -r1.30.2.6
--- kaddressbook/interfaces/kaddressbook_xxport.desktop 28 Nov 2004 08:33:54 -0000 1.30.2.4
-+++ kaddressbook/interfaces/kaddressbook_xxport.desktop 29 Dec 2004 21:44:51 -0000 1.30.2.5
-@@ -3,6 +3,7 @@
++++ kaddressbook/interfaces/kaddressbook_xxport.desktop 26 Jan 2005 08:10:27 -0000 1.30.2.6
+@@ -3,8 +3,10 @@
Type=ServiceType
X-KDE-ServiceType=KAddressBook/XXPort
Comment=KAddressBook Import/Export Plugin
+Comment[ar]=أداة إضافية لتصدير و استيراد kAddressBook
Comment[be]=Дапаўненьне K Адраснай кнігі "Імпарт/Экспарт"
Comment[bg]=Приставка за импорт/експорт на данни от адресника
++Comment[br]=Lugent enporzh/ezporzh evit KAddressBook
Comment[bs]=KAddressBook dodatak za uvoz/izvoz
+ Comment[ca]=Endollable d'importació/exportació per a la llibreta d'adreces
+ Comment[cs]=Modul knihy adres pro import/export
+Index: kaddressbook/interfaces/xxport.h
+===================================================================
+RCS file: /home/kde/kdepim/kaddressbook/interfaces/xxport.h,v
+retrieving revision 1.2
+retrieving revision 1.2.2.1
+diff -u -r1.2 -r1.2.2.1
+--- kaddressbook/interfaces/xxport.h 20 Jun 2004 10:10:55 -0000 1.2
++++ kaddressbook/interfaces/xxport.h 4 Feb 2005 23:40:03 -0000 1.2.2.1
+@@ -33,6 +33,32 @@
+
+ class KApplication;
+
++/**
++ K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG() creates the stub for a KAddressbook import/export filter.
++ @libname filename of the shared library, e.g. libkaddrbk_bookmark_xxport
++ @XXPortClass the import/export class - derived from the XXPort class
++ @catalog catalog file to search for translation lookup (NULL if no catalog needed)
++ @see: K_EXPORT_COMPONENT_FACTORY()
++ */
++#define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \
++ class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \
++ KAB::XXPort *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name ) \
++ { const char *cat = catalog; \
++ if (cat) KGlobal::locale()->insertCatalogue(cat); \
++ return new XXPortClass( ab, parent, name ); \
++ } \
++ }; \
++ K_EXPORT_COMPONENT_FACTORY( libname, localXXPortFactory )
++
++/**
++ K_EXPORT_KADDRESSBOOK_XXFILTER() creates the stub for a KAddressbook import/export filter.
++ @libname filename of the shared library, e.g. libkaddrbk_bookmark_xxport
++ @XXPortClass the import/export class - derived from the XXPort class
++ @see: K_EXPORT_COMPONENT_FACTORY()
++ */
++#define K_EXPORT_KADDRESSBOOK_XXFILTER( libname, XXPortClass ) \
++ K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, NULL )
++
+ namespace KAB {
+
+ class XXPort : public QObject, virtual public KXMLGUIClient
Index: kaddressbook/kcmconfigs/kabconfig.desktop
===================================================================
RCS file: /home/kde/kdepim/kaddressbook/kcmconfigs/kabconfig.desktop,v
retrieving revision 1.81.2.5
-retrieving revision 1.81.2.8
-diff -u -r1.81.2.5 -r1.81.2.8
+retrieving revision 1.81.2.10
+diff -u -r1.81.2.5 -r1.81.2.10
--- kaddressbook/kcmconfigs/kabconfig.desktop 28 Nov 2004 08:33:54 -0000 1.81.2.5
-+++ kaddressbook/kcmconfigs/kabconfig.desktop 5 Jan 2005 07:50:29 -0000 1.81.2.8
-@@ -39,7 +39,6 @@
++++ kaddressbook/kcmconfigs/kabconfig.desktop 23 Feb 2005 09:00:24 -0000 1.81.2.10
+@@ -29,6 +29,7 @@
+ Name[et]=Aadressiraamat
+ Name[fi]=Osoitekirja
+ Name[fr]=Carnet d'adresses
++Name[ga]=Leabhar Seoltaí
+ Name[gl]=Libro de Enderezos
+ Name[he]=פנקס כתובות
+ Name[hi]=पता पुस्तिका
+@@ -39,7 +40,6 @@
Name[it]=Rubrica indirizzi
Name[ja]=アドレス帳
Name[lt]=Adresų knygutė
@@ -582,39 +729,54 @@
Name[ms]=Buku Alamat
Name[nb]=Addressebok
Name[nl]=Adresboek
-@@ -62,6 +61,7 @@
+@@ -62,8 +62,10 @@
Name[uz]=Манзиллар дафтари
Name[zh_CN]=地址簿
Comment=Configure the Address Book
+Comment[ar]=اعداد دفتر العناوين
Comment[be]=Настроіць адрасную кнігу
Comment[bg]=Настройки на адресника
++Comment[br]=Kefluniañ ar c'harned chomlec'hioù
Comment[bs]=Podesite Adresar
+ Comment[ca]=Configura la Llibreta d'adreces
+ Comment[cs]=Nastavit knihu adres
Index: kaddressbook/kcmconfigs/kabcustomfields.desktop
===================================================================
RCS file: /home/kde/kdepim/kaddressbook/kcmconfigs/kabcustomfields.desktop,v
retrieving revision 1.26.2.10
-retrieving revision 1.26.2.11
-diff -u -r1.26.2.10 -r1.26.2.11
+retrieving revision 1.26.2.14
+diff -u -r1.26.2.10 -r1.26.2.14
--- kaddressbook/kcmconfigs/kabcustomfields.desktop 28 Nov 2004 08:33:54 -0000 1.26.2.10
-+++ kaddressbook/kcmconfigs/kabcustomfields.desktop 29 Dec 2004 21:44:51 -0000 1.26.2.11
-@@ -13,6 +13,7 @@
++++ kaddressbook/kcmconfigs/kabcustomfields.desktop 26 Jan 2005 08:10:28 -0000 1.26.2.14
+@@ -13,7 +13,9 @@
X-KDE-CfgDlgHierarchy=KAB
Name=Custom Pages
+Name[ar]=صفحات مخصصة
Name[bg]=Потребителски полета
++Name[br]=Pajennoù dre ziouer
Name[bs]=Vlastite stranice
Name[ca]=Pàgines a mida
-@@ -47,6 +48,7 @@
+ Name[cs]=Vlastní stránky
+@@ -47,7 +49,9 @@
Name[uk]=Нетипові сторінки
Name[zh_CN]=定制页
Comment=Configure the Custom Pages
+Comment[ar]=اعدادات صفحات مخصصة
Comment[bg]=Настройки на потребителските полета
++Comment[br]=Kefluniañ ar pajennoù diouzhoc'h
Comment[bs]=Podesite vlastite stranice
Comment[ca]=Configura les pàgines a mida
-@@ -81,6 +83,7 @@
+ Comment[cs]=Nastavení vlastních stránek
+@@ -63,6 +67,7 @@
+ Comment[is]=Stilla sérsniðnu síðurnar
+ Comment[it]=Configura le pagine personalizzate
+ Comment[ja]=カスタム ページの設定
++Comment[lt]=Konfigūruoti darbastalių skaičių ir pavadinimus
+ Comment[nb]=Konfigurere de tilpassede sidene
+ Comment[nl]=Hier kunt u de aangepaste pagina's instellen
+ Comment[nn]=Set opp dei tilpassa sidene
+@@ -81,6 +86,7 @@
Comment[uk]=Налаштування нетипових сторінок
Comment[zh_CN]=配置定制页
Keywords=kaddressbook, configure, settings, custom fields
@@ -680,10 +842,19 @@
===================================================================
RCS file: /home/kde/kdepim/kaddressbook/views/iconview.desktop,v
retrieving revision 1.38.2.5
-retrieving revision 1.38.2.6
-diff -u -r1.38.2.5 -r1.38.2.6
+retrieving revision 1.38.2.7
+diff -u -r1.38.2.5 -r1.38.2.7
--- kaddressbook/views/iconview.desktop 28 Nov 2004 08:33:55 -0000 1.38.2.5
-+++ kaddressbook/views/iconview.desktop 12 Dec 2004 08:32:44 -0000 1.38.2.6
++++ kaddressbook/views/iconview.desktop 23 Feb 2005 09:00:24 -0000 1.38.2.7
+@@ -19,7 +19,7 @@
+ Name[et]=Ikoonivaade
+ Name[fi]=Kuvakenäkymä
+ Name[fr]=Icônes
+-Name[ga]=Amharc le Deilbhíní
++Name[ga]=Amharc Deilbhíní
+ Name[gl]=Vista en iconas
+ Name[he]=תצוגת סמלים
+ Name[hi]=प्रतीक दृश्य
@@ -31,7 +31,6 @@
Name[ja]=アイコンビュー
Name[lt]=Rodyti piktogramas
@@ -963,18 +1134,20 @@
===================================================================
RCS file: /home/kde/kdepim/kalarm/Changelog,v
retrieving revision 1.73.2.12
-retrieving revision 1.73.2.17
-diff -u -r1.73.2.12 -r1.73.2.17
+retrieving revision 1.73.2.19
+diff -u -r1.73.2.12 -r1.73.2.19
--- kalarm/Changelog 27 Nov 2004 12:30:33 -0000 1.73.2.12
-+++ kalarm/Changelog 18 Jan 2005 22:21:42 -0000 1.73.2.17
-@@ -1,6 +1,13 @@
++++ kalarm/Changelog 6 Feb 2005 22:51:11 -0000 1.73.2.19
+@@ -1,6 +1,15 @@
KAlarm
-=== Version 1.1.7 --- 27 November 2004 ===
-+=== Version 1.1.8 --- 9 January 2005 ===
++=== Version 1.1.8 --- 6 February 2005 ===
++Prevent multiple "Failed to start Alarm Daemon" error messages at startup.
+Fix random limit on expired alarm discard time if stepping with spinbox buttons.
+Fix dialog layouts for right-to-left languages.
+Fix time spin box layout for right-to-left languages.
++Pop up message windows far from cursor to avoid accidental acknowledgement.
+Display correct controls after loading a template in alarm edit dialog.
+Fix missing left border for time spinboxes in Plastik style.
+
@@ -1023,10 +1196,10 @@
===================================================================
RCS file: /home/kde/kdepim/kalarm/birthdaydlg.cpp,v
retrieving revision 1.26
-retrieving revision 1.26.2.1
-diff -u -r1.26 -r1.26.2.1
+retrieving revision 1.26.2.2
+diff -u -r1.26 -r1.26.2.2
--- kalarm/birthdaydlg.cpp 19 Jul 2004 21:27:07 -0000 1.26
-+++ kalarm/birthdaydlg.cpp 5 Dec 2004 18:03:41 -0000 1.26.2.1
++++ kalarm/birthdaydlg.cpp 7 Feb 2005 00:41:00 -0000 1.26.2.2
@@ -143,7 +143,7 @@
// Sound checkbox and file selector
mSoundPicker = new SoundPicker(group);
@@ -1036,7 +1209,13 @@
// How much to advance warning to give
mReminder = new Reminder(i18n("&Reminder"),
-@@ -159,7 +159,7 @@
+@@ -154,12 +154,12 @@
+ mReminder->setFixedSize(mReminder->sizeHint());
+ mReminder->setMaximum(0, 364);
+ mReminder->setMinutes(0, true);
+- groupLayout->addWidget(mReminder);
++ groupLayout->addWidget(mReminder, 0, Qt::AlignAuto);
+
// Acknowledgement confirmation required - default = no confirmation
mConfirmAck = EditAlarmDlg::createConfirmAckCheckbox(group);
mConfirmAck->setFixedSize(mConfirmAck->sizeHint());
@@ -1045,6 +1224,44 @@
// Late display checkbox - default = allow late display
layout = new QHBoxLayout(groupLayout, 2*spacingHint());
+Index: kalarm/daemon.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/daemon.cpp,v
+retrieving revision 1.9
+retrieving revision 1.9.2.1
+diff -u -r1.9 -r1.9.2.1
+--- kalarm/daemon.cpp 6 Jul 2004 23:46:07 -0000 1.9
++++ kalarm/daemon.cpp 22 Jan 2005 00:07:17 -0000 1.9.2.1
+@@ -212,13 +212,15 @@
+ void Daemon::checkIfStarted()
+ {
+ updateRegisteredStatus();
++ bool err = false;
+ switch (mStatus)
+ {
+ case STOPPED:
+ if (--mStartTimeout > 0)
+ return; // wait a bit more to check again
+- kdError(5950) << "Daemon::checkIfStarted(): failed to start daemon" << endl;
+- KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(QString::fromLatin1(DAEMON_APP_NAME)));
++ // Output error message, but delete timer first to prevent
++ // multiple messages.
++ err = true;
+ break;
+ case RUNNING:
+ case READY:
+@@ -227,6 +229,11 @@
+ }
+ delete mStartTimer;
+ mStartTimer = 0;
++ if (err)
++ {
++ kdError(5950) << "Daemon::checkIfStarted(): failed to start daemon" << endl;
++ KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(QString::fromLatin1(DAEMON_APP_NAME)));
++ }
+ }
+
+ /******************************************************************************
Index: kalarm/editdlg.cpp
===================================================================
RCS file: /home/kde/kdepim/kalarm/editdlg.cpp,v
@@ -1252,6 +1469,303 @@
Comment[bg]=Аларма: стартиране като икона в системния панел
Comment[bs]=Lični alarm: pokreni kao ikonu u panelu
Comment[ca]=Planificador d'alarma personal; s'inicia com a una icona a la safata del sistema
+Index: kalarm/messagewin.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/messagewin.cpp,v
+retrieving revision 1.92.2.1
+retrieving revision 1.92.2.3
+diff -u -r1.92.2.1 -r1.92.2.3
+--- kalarm/messagewin.cpp 18 Aug 2004 12:31:53 -0000 1.92.2.1
++++ kalarm/messagewin.cpp 7 Feb 2005 11:29:00 -0000 1.92.2.3
+@@ -1,7 +1,7 @@
+ /*
+ * messagewin.cpp - displays an alarm message
+ * Program: kalarm
+- * (C) 2001 - 2004 by David Jarvie <software@astrojar.org.uk>
++ * (C) 2001 - 2005 by David Jarvie <software@astrojar.org.uk>
+ *
+ * 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
+@@ -51,6 +51,7 @@
+ #include <kio/netaccess.h>
+ #include <knotifyclient.h>
+ #include <kpushbutton.h>
++#include <kglobalsettings.h>
+ #ifdef WITHOUT_ARTS
+ #include <kaudioplayer.h>
+ #else
+@@ -148,6 +149,7 @@
+ mBeep(event.beep()),
+ mRescheduleEvent(reschedule_event),
+ mShown(false),
++ mPositioning(false),
+ mDeferClosing(false),
+ mDeferDlgShowing(false)
+ {
+@@ -182,6 +184,7 @@
+ mRecreating(false),
+ mRescheduleEvent(false),
+ mShown(false),
++ mPositioning(false),
+ mDeferClosing(false),
+ mDeferDlgShowing(false)
+ {
+@@ -204,6 +207,7 @@
+ mRecreating(false),
+ mRescheduleEvent(false),
+ mShown(false),
++ mPositioning(false),
+ mDeferClosing(false),
+ mDeferDlgShowing(false)
+ {
+@@ -454,14 +458,14 @@
+ int gridIndex = 1;
+
+ // Close button
+- KPushButton* okButton = new KPushButton(KStdGuiItem::close(), topWidget);
++ mOkButton = new KPushButton(KStdGuiItem::close(), topWidget);
+ // Prevent accidental acknowledgement of the message if the user is typing when the window appears
+- okButton->clearFocus();
+- okButton->setFocusPolicy(QWidget::ClickFocus); // don't allow keyboard selection
+- okButton->setFixedSize(okButton->sizeHint());
+- connect(okButton, SIGNAL(clicked()), SLOT(close()));
+- grid->addWidget(okButton, 0, gridIndex++, AlignHCenter);
+- QWhatsThis::add(okButton, i18n("Acknowledge the alarm"));
++ mOkButton->clearFocus();
++ mOkButton->setFocusPolicy(QWidget::ClickFocus); // don't allow keyboard selection
++ mOkButton->setFixedSize(mOkButton->sizeHint());
++ connect(mOkButton, SIGNAL(clicked()), SLOT(close()));
++ grid->addWidget(mOkButton, 0, gridIndex++, AlignHCenter);
++ QWhatsThis::add(mOkButton, i18n("Acknowledge the alarm"));
+
+ if (!mNoDefer)
+ {
+@@ -496,14 +500,21 @@
+ // KAlarm button
+ KIconLoader iconLoader;
+ QPixmap pixmap = iconLoader.loadIcon(QString::fromLatin1(kapp->aboutData()->appName()), KIcon::MainToolbar);
+- QPushButton* button = new QPushButton(topWidget);
+- button->setPixmap(pixmap);
+- button->setFixedSize(button->sizeHint());
+- connect(button, SIGNAL(clicked()), SLOT(displayMainWindow()));
+- grid->addWidget(button, 0, gridIndex++, AlignHCenter);
++ mKAlarmButton = new QPushButton(topWidget);
++ mKAlarmButton->setPixmap(pixmap);
++ mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint());
++ connect(mKAlarmButton, SIGNAL(clicked()), SLOT(displayMainWindow()));
++ grid->addWidget(mKAlarmButton, 0, gridIndex++, AlignHCenter);
+ QString actKAlarm = i18n("Activate %1").arg(kapp->aboutData()->programName());
+- QToolTip::add(button, actKAlarm);
+- QWhatsThis::add(button, actKAlarm);
++ QToolTip::add(mKAlarmButton, actKAlarm);
++ QWhatsThis::add(mKAlarmButton, actKAlarm);
++
++ // Disable all buttons initially, to prevent accidental clicking on if they happento be
++ // under the mouse just as the window appears.
++ mOkButton->setEnabled(false);
++ if (mDeferButton)
++ mDeferButton->setEnabled(false);
++ mKAlarmButton->setEnabled(false);
+
+ topLayout->activate();
+ setMinimumSize(QSize(grid->sizeHint().width() + 2*KDialog::marginHint(), sizeHint().height()));
+@@ -835,6 +846,19 @@
+ }
+
+ /******************************************************************************
++ * * Display the window.
++ * * If windows are being positioned away from the mouse cursor, it is initially
++ * * positioned at the top left to slightly reduce the number of times the
++ * * windows need to be moved in showEvent().
++ * */
++void MessageWin::show()
++{
++ if (Preferences::instance()->messageButtonDelay() == 0)
++ move(0, 0);
++ MainWindowBase::show();
++}
++
++/******************************************************************************
+ * Called when the window is shown.
+ * The first time, output any required audio notification, and reschedule or
+ * delete the event from the calendar file.
+@@ -842,20 +866,94 @@
+ void MessageWin::showEvent(QShowEvent* se)
+ {
+ MainWindowBase::showEvent(se);
+- if (!mShown && !mErrorWindow)
++ if (!mShown)
+ {
+- QSize s = sizeHint(); // fit the window round the message
+- if (mAction == KAEvent::FILE && !mErrorMsgs.count())
+- KAlarm::readConfigWindowSize("FileMessage", s);
+- resize(s);
+- playAudio();
+- if (mRescheduleEvent)
+- theApp()->alarmShowing(mEvent, mAlarmType, mDateTime);
++ if (mErrorWindow)
++ enableButtons(); // don't bother repositioning error messages
++ else
++ {
++ QSize s = sizeHint(); // fit the window round the message
++ if (mAction == KAEvent::FILE && !mErrorMsgs.count())
++ KAlarm::readConfigWindowSize("FileMessage", s);
++ resize(s);
++
++ if (Preferences::instance()->messageButtonDelay() == 0)
++ {
++ /* Try to ensure that the window can't accidentally be acknowledged
++ * by the user clicking the mouse just as it appears.
++ * To achieve this, move the window so that the OK button is as far away
++ * from the cursor as possible.
++ * N.B. This can't be done in show(), since the geometry of the window
++ * is not known until it is displayed. Unfortunately by moving the
++ * window in showEvent(), a flicker is unavoidable.
++ * See the Qt documentation on window geometry for more details.
++ */
++ QRect desk = KGlobalSettings::desktopGeometry(this);
++ QPoint cursor = QCursor::pos();
++ QRect frame = frameGeometry();
++ QRect rect = geometry();
++ // Find the offsets from the outside of the frame to the edges of the OK button
++ QRect button(mOkButton->mapToParent(QPoint(0, 0)), mOkButton->mapToParent(mOkButton->rect().bottomRight()));
++ int buttonLeft = button.left() + rect.left() - frame.left();
++ int buttonRight = width() - button.right() + frame.right() - rect.right();
++ int buttonTop = button.top() + rect.top() - frame.top();
++ int buttonBottom = height() - button.bottom() + frame.bottom() - rect.bottom();
++
++ int centrex = (desk.width() + buttonLeft - buttonRight) / 2;
++ int centrey = (desk.height() + buttonTop - buttonBottom) / 2;
++ int x = (cursor.x() < centrex) ? desk.right() - frame.width() : desk.left();
++ int y = (cursor.y() < centrey) ? desk.bottom() - frame.height() : desk.top();
++ if (x != frame.left() || y != frame.top())
++ {
++ mPositioning = true;
++ move(x, y);
++ }
++ }
++ if (!mPositioning)
++ displayComplete(); // play audio, etc.
++ }
+ mShown = true;
+ }
+ }
+
+ /******************************************************************************
++* Called when the window has been moved.
++*/
++void MessageWin::moveEvent(QMoveEvent* e)
++{
++ MainWindowBase::moveEvent(e);
++ if (mPositioning)
++ {
++ // The window has just been initially positioned
++ mPositioning = false;
++ displayComplete(); // play audio, etc.
++ }
++}
++
++/******************************************************************************
++* Called when the window has been displayed properly (in its correct position),
++* to play sounds and reschedule the event.
++*/
++void MessageWin::displayComplete()
++{
++ playAudio();
++ if (mRescheduleEvent)
++ theApp()->alarmShowing(mEvent, mAlarmType, mDateTime);
++ enableButtons();
++}
++
++/******************************************************************************
++ * * Enable the window's buttons.
++ * */
++void MessageWin::enableButtons()
++{
++ mOkButton->setEnabled(true);
++ mKAlarmButton->setEnabled(true);
++ if (mDeferButton)
++ mDeferButton->setEnabled(true);
++}
++
++/******************************************************************************
+ * Called when the window's size has changed (before it is painted).
+ */
+ void MessageWin::resizeEvent(QResizeEvent* re)
+Index: kalarm/messagewin.h
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/messagewin.h,v
+retrieving revision 1.42.2.1
+retrieving revision 1.42.2.2
+diff -u -r1.42.2.1 -r1.42.2.2
+--- kalarm/messagewin.h 18 Aug 2004 12:31:53 -0000 1.42.2.1
++++ kalarm/messagewin.h 6 Feb 2005 22:47:54 -0000 1.42.2.2
+@@ -1,7 +1,7 @@
+ /*
+ * messagewin.h - displays an alarm message
+ * Program: kalarm
+- * (C) 2001 - 2004 by David Jarvie <software@astrojar.org.uk>
++ * (C) 2001 - 2005 by David Jarvie <software@astrojar.org.uk>
+ *
+ * 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
+@@ -35,6 +35,7 @@
+ #include "alarmevent.h"
+
+ class QPushButton;
++class KPushButton;
+ class QLabel;
+ class QTimer;
+ class AlarmTimeWidget;
+@@ -58,11 +59,13 @@
+ KAAlarm::Type alarmType() const { return mAlarmType; }
+ bool hasDefer() const { return !!mDeferButton; }
+ bool isValid() const { return !mInvalid; }
++ virtual void show();
+ static int instanceCount() { return mWindowList.count(); }
+ static MessageWin* findEvent(const QString& eventID);
+
+ protected:
+ virtual void showEvent(QShowEvent*);
++ virtual void moveEvent(QMoveEvent*);
+ virtual void resizeEvent(QResizeEvent*);
+ virtual void closeEvent(QCloseEvent*);
+ virtual void saveProperties(KConfig*);
+@@ -74,6 +77,7 @@
+ void slotPlayAudio();
+ void checkAudioPlay();
+ void stopPlay();
++ void enableButtons();
+ void setRemainingTextDay();
+ void setRemainingTextMinute();
+
+@@ -82,6 +86,7 @@
+ #ifndef WITHOUT_ARTS
+ void initAudio(bool firstTime);
+ #endif
++ void displayComplete();
+ void playAudio();
+
+ static QPtrList<MessageWin> mWindowList; // list of existing message windows
+@@ -114,8 +119,10 @@
+ // Miscellaneous
+ KAEvent mEvent; // the whole event, for updating the calendar file
+ QLabel* mRemainingText; // the remaining time (for a reminder window)
++ KPushButton* mOkButton;
+ QPushButton* mDeferButton;
+ QPushButton* mSilenceButton;
++ QPushButton* mKAlarmButton;
+ int mFlags;
+ bool mErrorWindow; // the window is simply an error message
+ bool mNoPostAction; // don't execute any post-alarm action
+@@ -123,6 +130,7 @@
+ bool mBeep;
+ bool mRescheduleEvent; // true to delete event after message has been displayed
+ bool mShown; // true once the window has been displayed
++ bool mPositioning; // true when the window is being positioned initially
+ bool mDeferClosing; // the Defer button is closing the dialog
+ bool mDeferDlgShowing; // the defer dialog is being displayed
+ };
Index: kalarm/prefdlg.cpp
===================================================================
RCS file: /home/kde/kdepim/kalarm/prefdlg.cpp,v
@@ -1459,6 +1973,96 @@
mIgnoreToggle = true;
mListShowTime->setChecked(time);
mListShowTimeTo->setChecked(timeTo);
+Index: kalarm/preferences.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/preferences.cpp,v
+retrieving revision 1.21.2.1
+retrieving revision 1.21.2.2
+diff -u -r1.21.2.1 -r1.21.2.2
+--- kalarm/preferences.cpp 1 Oct 2004 06:38:34 -0000 1.21.2.1
++++ kalarm/preferences.cpp 6 Feb 2005 22:47:54 -0000 1.21.2.2
+@@ -1,7 +1,7 @@
+ /*
+ * preferences.cpp - program preference settings
+ * Program: kalarm
+- * (C) 2001 - 2004 by David Jarvie <software@astrojar.org.uk>
++ * (C) 2001 - 2005 by David Jarvie <software@astrojar.org.uk>
+ *
+ * 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
+@@ -43,6 +43,7 @@
+ const bool Preferences::default_autostartTrayIcon = true;
+ const bool Preferences::default_confirmAlarmDeletion = true;
+ const bool Preferences::default_modalMessages = true;
++const int Preferences::default_messageButtonDelay = 0;
+ const bool Preferences::default_showExpiredAlarms = false;
+ const bool Preferences::default_showAlarmTime = true;
+ const bool Preferences::default_showTimeToAlarm = false;
+@@ -91,6 +92,7 @@
+ static const QString AUTOSTART_TRAY = QString::fromLatin1("AutostartTray");
+ static const QString FEB29_RECUR_TYPE = QString::fromLatin1("Feb29Recur");
+ static const QString MODAL_MESSAGES = QString::fromLatin1("ModalMessages");
++static const QString MESSAGE_BUTTON_DELAY = QString::fromLatin1("MessageButtonDelay");
+ static const QString SHOW_EXPIRED_ALARMS = QString::fromLatin1("ShowExpiredAlarms");
+ static const QString SHOW_ALARM_TIME = QString::fromLatin1("ShowAlarmTime");
+ static const QString SHOW_TIME_TO_ALARM = QString::fromLatin1("ShowTimeToAlarm");
+@@ -174,6 +176,7 @@
+ QCString feb29 = config->readEntry(FEB29_RECUR_TYPE, defaultFeb29RecurType).local8Bit();
+ mFeb29RecurType = (feb29 == "Mar1") ? FEB29_MAR1 : (feb29 == "Feb28") ? FEB29_FEB28 : FEB29_NONE;
+ mModalMessages = config->readBoolEntry(MODAL_MESSAGES, default_modalMessages);
++ mMessageButtonDelay = config->readNumEntry(MESSAGE_BUTTON_DELAY, default_messageButtonDelay);
+ mShowExpiredAlarms = config->readBoolEntry(SHOW_EXPIRED_ALARMS, default_showExpiredAlarms);
+ mShowTimeToAlarm = config->readBoolEntry(SHOW_TIME_TO_ALARM, default_showTimeToAlarm);
+ mShowAlarmTime = !mShowTimeToAlarm ? true : config->readBoolEntry(SHOW_ALARM_TIME, default_showAlarmTime);
+@@ -255,6 +258,7 @@
+ config->writeEntry(AUTOSTART_TRAY, mAutostartTrayIcon);
+ config->writeEntry(FEB29_RECUR_TYPE, (mFeb29RecurType == FEB29_MAR1 ? "Mar1" : mFeb29RecurType == FEB29_FEB28 ? "Feb28" : "None"));
+ config->writeEntry(MODAL_MESSAGES, mModalMessages);
++ config->writeEntry(MESSAGE_BUTTON_DELAY, mMessageButtonDelay);
+ config->writeEntry(SHOW_EXPIRED_ALARMS, mShowExpiredAlarms);
+ config->writeEntry(SHOW_ALARM_TIME, mShowAlarmTime);
+ config->writeEntry(SHOW_TIME_TO_ALARM, mShowTimeToAlarm);
+Index: kalarm/preferences.h
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/preferences.h,v
+retrieving revision 1.17.2.1
+retrieving revision 1.17.2.2
+diff -u -r1.17.2.1 -r1.17.2.2
+--- kalarm/preferences.h 1 Oct 2004 06:38:34 -0000 1.17.2.1
++++ kalarm/preferences.h 6 Feb 2005 22:47:54 -0000 1.17.2.2
+@@ -1,7 +1,7 @@
+ /*
+ * preferences.h - program preference settings
+ * Program: kalarm
+- * (C) 2001 - 2004 by David Jarvie <software@astrojar.org.uk>
++ * (C) 2001 - 2005 by David Jarvie <software@astrojar.org.uk>
+ *
+ * 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
+@@ -60,6 +60,7 @@
+ void setConfirmAlarmDeletion(bool);
+ Feb29Type feb29RecurType() const { return mFeb29RecurType; }
+ bool modalMessages() const { return mModalMessages; }
++ int messageButtonDelay() const { return mMessageButtonDelay; }
+ bool showExpiredAlarms() const { return mShowExpiredAlarms; }
+ bool showAlarmTime() const { return mShowAlarmTime; }
+ bool showTimeToAlarm() const { return mShowTimeToAlarm; }
+@@ -120,6 +121,7 @@
+ static const bool default_confirmAlarmDeletion;
+ static const Feb29Type default_feb29RecurType;
+ static const bool default_modalMessages;
++ static const int default_messageButtonDelay;
+ static const bool default_showExpiredAlarms;
+ static const bool default_showAlarmTime;
+ static const bool default_showTimeToAlarm;
+@@ -185,6 +187,7 @@
+ bool mAutostartTrayIcon;
+ Feb29Type mFeb29RecurType;
+ bool mModalMessages;
++ int mMessageButtonDelay; // 0 = scatter; -1 = no scatter
+ bool mShowExpiredAlarms;
+ bool mShowAlarmTime;
+ bool mShowTimeToAlarm;
Index: kalarm/recurrenceedit.cpp
===================================================================
RCS file: /home/kde/kdepim/kalarm/recurrenceedit.cpp,v
@@ -1541,6 +2145,39 @@
mPostAction = new KLineEdit(this);
label->setBuddy(mPostAction);
+Index: kalarm/traywindow.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/traywindow.cpp,v
+retrieving revision 1.50.2.1
+retrieving revision 1.50.2.2
+diff -u -r1.50.2.1 -r1.50.2.2
+--- kalarm/traywindow.cpp 27 Nov 2004 12:28:37 -0000 1.50.2.1
++++ kalarm/traywindow.cpp 7 Feb 2005 00:50:09 -0000 1.50.2.2
+@@ -81,12 +81,8 @@
+ i18n("KAlarm Error", "%1 Error").arg(kapp->aboutData()->programName()));
+ setAcceptDrops(true); // allow drag-and-drop onto this window
+
+- // Replace the default handler for the Quit context menu item
+- KActionCollection* actcol = actionCollection();
+- actcol->remove(actcol->action(KStdAction::stdName(KStdAction::Quit)));
+- actcol->insert(KStdAction::quit(this, SLOT(slotQuit()), actcol));
+-
+ // Set up the context menu
++ KActionCollection* actcol = actionCollection();
+ DaemonGuiHandler* daemonGui = theApp()->daemonGuiHandler();
+ AlarmEnableAction* a = daemonGui->createAlarmEnableAction(actcol, "tAlarmEnable");
+ a->plug(contextMenu());
+@@ -95,6 +91,10 @@
+ Daemon::createControlAction(actcol, "tControlDaemon")->plug(contextMenu());
+ KStdAction::preferences(this, SLOT(slotPreferences()), actcol)->plug(contextMenu());
+
++ // Replace the default handler for the Quit context menu item
++ actcol->remove(actcol->action(KStdAction::stdName(KStdAction::Quit)));
++ actcol->insert(KStdAction::quit(this, SLOT(slotQuit()), actcol));
++
+ // Set icon to correspond with the alarms enabled menu status
+ daemonGui->checkStatus();
+ setEnabledStatus(daemonGui->monitoringAlarms());
Index: kalarm/widgets/spinbox.cpp
===================================================================
RCS file: /home/kde/kdepim/kalarm/widgets/spinbox.cpp,v
@@ -1691,6 +2328,219 @@
int mMinValue;
int mMaxValue;
+Index: kalarmd/adcalendar.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarmd/Attic/adcalendar.cpp,v
+retrieving revision 1.13
+retrieving revision 1.13.8.1
+diff -u -r1.13 -r1.13.8.1
+--- kalarmd/adcalendar.cpp 7 Mar 2003 22:09:26 -0000 1.13
++++ kalarmd/adcalendar.cpp 22 Feb 2005 21:12:45 -0000 1.13.8.1
+@@ -2,7 +2,7 @@
+ KDE Alarm Daemon.
+
+ This file is part of the KDE alarm daemon.
+- Copyright (c) 2001 David Jarvie <software@astrojar.org.uk>
++ Copyright (c) 2001, 2005 David Jarvie <software@astrojar.org.uk>
+
+ 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
+@@ -46,8 +46,8 @@
+ */
+ bool ADCalendar::eventHandled(const Event* event, const QValueList<QDateTime>& alarmtimes)
+ {
+- EventsMap::ConstIterator it = eventsHandled_.find(event->uid());
+- if (it == eventsHandled_.end())
++ EventsMap::ConstIterator it = mEventsHandled.find(EventKey(event->uid(), urlIndex()));
++ if (it == mEventsHandled.end())
+ return false;
+
+ int oldCount = it.data().alarmTimes.count();
+@@ -73,17 +73,16 @@
+ if (event)
+ {
+ kdDebug(5900) << "ADCalendar::setEventHandled(" << event->uid() << ")\n";
+- EventsMap::Iterator it = eventsHandled_.find(event->uid());
+- if (it != eventsHandled_.end())
++ EventKey key(event->uid(), urlIndex());
++ EventsMap::Iterator it = mEventsHandled.find(key);
++ if (it != mEventsHandled.end())
+ {
+ // Update the existing entry for the event
+ it.data().alarmTimes = alarmtimes;
+ it.data().eventSequence = event->revision();
+ }
+ else
+- eventsHandled_.insert(event->uid(),EventItem(urlString(),
+- event->revision(),
+- alarmtimes));
++ mEventsHandled.insert(key, EventItem(event->revision(), alarmtimes));
+ }
+ }
+
+@@ -92,15 +91,19 @@
+ */
+ void ADCalendar::clearEventsHandled(const QString& calendarURL)
+ {
+- for (EventsMap::Iterator it = eventsHandled_.begin(); it != eventsHandled_.end(); )
++ int urlIndex = mCalendarUrls.findIndex(calendarURL); // get unique index for the calendar
++ if (urlIndex >= 0)
+ {
+- if (it.data().calendarURL == calendarURL)
++ for (EventsMap::Iterator it = mEventsHandled.begin(); it != mEventsHandled.end(); )
+ {
+- EventsMap::Iterator i = it;
+- ++it; // prevent iterator becoming invalid with remove()
+- eventsHandled_.remove(i);
++ if (it.key().calendarIndex == urlIndex)
++ {
++ EventsMap::Iterator i = it;
++ ++it; // prevent iterator becoming invalid with remove()
++ mEventsHandled.remove(i);
++ }
++ else
++ ++it;
+ }
+- else
+- ++it;
+ }
+ }
+Index: kalarmd/adcalendarbase.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarmd/Attic/adcalendarbase.cpp,v
+retrieving revision 1.21
+retrieving revision 1.21.6.1
+diff -u -r1.21 -r1.21.6.1
+--- kalarmd/adcalendarbase.cpp 26 Nov 2003 12:37:50 -0000 1.21
++++ kalarmd/adcalendarbase.cpp 22 Feb 2005 21:12:45 -0000 1.21.6.1
+@@ -2,7 +2,7 @@
+ Calendar access for KDE Alarm Daemon.
+
+ This file is part of the KDE alarm daemon.
+- Copyright (c) 2001 David Jarvie <software@astrojar.org.uk>
++ Copyright (c) 2001, 2005 David Jarvie <software@astrojar.org.uk>
+
+ 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
+@@ -38,7 +38,8 @@
+ #include "adcalendarbase.h"
+ #include "adcalendarbase.moc"
+
+-ADCalendarBase::EventsMap ADCalendarBase::eventsHandled_;
++ADCalendarBase::EventsMap ADCalendarBase::mEventsHandled;
++QStringList ADCalendarBase::mCalendarUrls; // never delete or reorder anything in this list!
+
+ ADCalendarBase::ADCalendarBase(const QString& url, const QCString& appname, Type type)
+ : mUrlString(url),
+@@ -49,6 +50,12 @@
+ mLoadedConnected(false),
+ mUnregistered(false)
+ {
++ mUrlIndex = mCalendarUrls.findIndex(url); // get unique index for this URL
++ if (mUrlIndex < 0)
++ {
++ mUrlIndex = static_cast<int>(mCalendarUrls.count());
++ mCalendarUrls.append(url);
++ }
+ if (mAppName == "korgac")
+ {
+ KConfig cfg( locate( "config", "korganizerrc" ) );
+@@ -128,14 +135,14 @@
+ else
+ {
+ // Remove all now non-existent events from the handled list
+- for (EventsMap::Iterator it = eventsHandled_.begin(); it != eventsHandled_.end(); )
++ for (EventsMap::Iterator it = mEventsHandled.begin(); it != mEventsHandled.end(); )
+ {
+- if (it.data().calendarURL == mUrlString && !event(it.key()))
++ if (it.key().calendarIndex == mUrlIndex && !event(it.key().eventID))
+ {
+ // Event belonged to this calendar, but can't find it any more
+ EventsMap::Iterator i = it;
+ ++it; // prevent iterator becoming invalid with remove()
+- eventsHandled_.remove(i);
++ mEventsHandled.remove(i);
+ }
+ else
+ ++it;
+Index: kalarmd/adcalendarbase.h
+===================================================================
+RCS file: /home/kde/kdepim/kalarmd/Attic/adcalendarbase.h,v
+retrieving revision 1.15
+retrieving revision 1.15.2.1
+diff -u -r1.15 -r1.15.2.1
+--- kalarmd/adcalendarbase.h 11 Jul 2004 12:22:29 -0000 1.15
++++ kalarmd/adcalendarbase.h 22 Feb 2005 21:12:45 -0000 1.15.2.1
+@@ -2,7 +2,7 @@
+ Calendar access for KDE Alarm Daemon and KDE Alarm Daemon GUI.
+
+ This file is part of the KDE alarm daemon.
+- Copyright (c) 2001 David Jarvie <software@astrojar.org.uk>
++ Copyright (c) 2001, 2005 David Jarvie <software@astrojar.org.uk>
+
+ 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
+@@ -26,6 +26,7 @@
+ #ifndef ADCALENDARBASE_H
+ #define ADCALENDARBASE_H
+
++#include <qstringlist.h>
+ #include <libkcal/calendarlocal.h>
+ namespace KIO {
+ class Job;
+@@ -44,6 +45,7 @@
+ ~ADCalendarBase() { }
+
+ const QString& urlString() const { return mUrlString; }
++ int urlIndex() const { return mUrlIndex; }
+ const QCString& appName() const { return mAppName; }
+ int rcIndex() const { return mRcIndex; }
+ const QDateTime& lastCheck() const { return mLastCheck; }
+@@ -91,19 +93,29 @@
+ void slotDownloadJobResult( KIO::Job * );
+
+ protected:
++ struct EventKey
++ {
++ EventKey() : calendarIndex(-1) { }
++ EventKey(const QString& id, int cal) : eventID(id), calendarIndex(cal) { }
++ bool operator<(const EventKey& k) const
++ { return (calendarIndex == k.calendarIndex)
++ ? (eventID < k.eventID) : (calendarIndex < k.calendarIndex);
++ }
++ QString eventID;
++ int calendarIndex;
++ };
+ struct EventItem
+ {
+ EventItem() : eventSequence(0) { }
+- EventItem(const QString& url, int seqno, const QValueList<QDateTime>& alarmtimes)
+- : calendarURL(url), eventSequence(seqno), alarmTimes(alarmtimes) {}
+-
+- QString calendarURL;
+- int eventSequence;
++ EventItem(int seqno, const QValueList<QDateTime>& alarmtimes)
++ : eventSequence(seqno), alarmTimes(alarmtimes) {}
++ int eventSequence;
+ QValueList<QDateTime> alarmTimes;
+ };
+
+- typedef QMap<QString, EventItem> EventsMap; // event ID, calendar URL/event sequence num
+- static EventsMap eventsHandled_; // IDs of displayed KALARM type events
++ typedef QMap<EventKey, EventItem> EventsMap; // event ID, calendar URL/event sequence num
++ static EventsMap mEventsHandled; // IDs of displayed KALARM type events
++ static QStringList mCalendarUrls; // URLs of all calendars ever opened
+
+ private:
+ QString mUrlString; // calendar file URL
+@@ -111,6 +123,7 @@
+ Type mActionType; // action to take on event
+ QDateTime mLastCheck; // time at which calendar was last checked for alarms
+ QString mTempFileName; // temporary file used if currently downloading, else null
++ int mUrlIndex; // unique index to URL in mCalendarUrls
+ int mRcIndex; // index within 'clients' RC file for this calendar's entry
+ bool mLoaded; // true if calendar file is currently loaded
+ bool mLoadedConnected; // true if the loaded() signal has been connected to AlarmDaemon
Index: kalarmd/kalarmd.autostart.desktop
===================================================================
RCS file: /home/kde/kdepim/kalarmd/Attic/kalarmd.autostart.desktop,v
@@ -1758,6 +2608,32 @@
Name[ms]=Daemon Jam Loceng
Name[mt]=Programm tal-allarmi
Name[nb]=Alarmnisse
+Index: kalarmd/main.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarmd/Attic/main.cpp,v
+retrieving revision 1.13
+retrieving revision 1.13.2.1
+diff -u -r1.13 -r1.13.2.1
+--- kalarmd/main.cpp 20 Jun 2004 13:19:59 -0000 1.13
++++ kalarmd/main.cpp 22 Feb 2005 21:12:45 -0000 1.13.2.1
+@@ -23,7 +23,7 @@
+ without including the source code for Qt in the source distribution.
+ */
+
+-// $Id: main.cpp,v 1.13 2004/06/20 13:19:59 djarvie Exp $
++// $Id: main.cpp,v 1.13.2.1 2005/02/22 21:12:45 djarvie Exp $
+ //
+ // KOrganizer/KAlarm alarm daemon main program
+ //
+@@ -38,7 +38,7 @@
+
+ #include "alarmapp.h"
+
+-static const char kalarmdVersion[] = "3.3";
++static const char kalarmdVersion[] = "3.3.3";
+ static const KCmdLineOptions options[] =
+ {
+ { "login", I18N_NOOP("Application is being auto-started at KDE session start"), 0L },
Index: kandy/src/kandy.desktop
===================================================================
RCS file: /home/kde/kdepim/kandy/src/kandy.desktop,v
@@ -2340,10 +3216,10 @@
===================================================================
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop,v
retrieving revision 1.33.2.1
-retrieving revision 1.33.2.2
-diff -u -r1.33.2.1 -r1.33.2.2
+retrieving revision 1.33.2.3
+diff -u -r1.33.2.1 -r1.33.2.3
--- kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop 24 Aug 2004 06:32:08 -0000 1.33.2.1
-+++ kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop 29 Dec 2004 21:44:57 -0000 1.33.2.2
++++ kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop 26 Jan 2005 08:10:28 -0000 1.33.2.3
@@ -5,6 +5,7 @@
X-KDE-Library=libdummykonnector
@@ -2352,6 +3228,14 @@
Name[bs]=Testni Konnector
Name[ca]=Konnector de prova
Name[cy]=Kysylltydd Ffug
+@@ -14,6 +15,7 @@
+ Name[et]=Fiktiivne Konnector
+ Name[fi]=Tyhjä Konnector
+ Name[fr]=Konnector factice
++Name[ga]=Caochadán Konnector
+ Name[he]=Konnector טיפש
+ Name[hi]=डमी कनेक्टर
+ Name[hu]=Üres konnektor
Index: kitchensync/libkonnector2/plugins/kabc/kabckonnector.desktop
===================================================================
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/kabc/kabckonnector.desktop,v
@@ -2404,10 +3288,10 @@
===================================================================
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop,v
retrieving revision 1.18.2.8
-retrieving revision 1.18.2.9
-diff -u -r1.18.2.8 -r1.18.2.9
+retrieving revision 1.18.2.10
+diff -u -r1.18.2.8 -r1.18.2.10
--- kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop 13 Nov 2004 07:20:51 -0000 1.18.2.8
-+++ kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop 29 Dec 2004 21:44:58 -0000 1.18.2.9
++++ kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop 26 Jan 2005 08:10:28 -0000 1.18.2.10
@@ -5,6 +5,7 @@
X-KDE-Library=libremotekonnector
@@ -2416,6 +3300,14 @@
Name[bs]=Udaljeni Konnector
Name[ca]=Konnector remot
Name[cs]=Vzdálený konektor
+@@ -13,6 +14,7 @@
+ Name[es]=Konnector remoto
+ Name[et]=Kaug-Konnector
+ Name[fr]=Konnector distant
++Name[ga]=Konnector Cianda
+ Name[he]=Konnector מרוחק
+ Name[hu]=Távoli konnektor
+ Name[it]=Konnector remoto
Index: kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop
===================================================================
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop,v
@@ -2594,6 +3486,31 @@
Comment[sk]=Prišla nová pošta
Comment[sl]=Prispela je nova pošta
Comment[sr]=Стигла је нова пошта
+Index: kmail/headerlistquicksearch.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kmail/headerlistquicksearch.cpp,v
+retrieving revision 1.5
+retrieving revision 1.5.2.1
+diff -u -r1.5 -r1.5.2.1
+--- kmail/headerlistquicksearch.cpp 31 Jul 2004 13:26:40 -0000 1.5
++++ kmail/headerlistquicksearch.cpp 24 Jan 2005 20:56:19 -0000 1.5.2.1
+@@ -73,6 +73,16 @@
+ this, SLOT( slotStatusChanged( int ) ) );
+
+ label->setBuddy( mStatusCombo );
++
++ /* Disable the signal connected by KListViewSearchLine since it will call
++ * itemAdded during KMHeaders::readSortOrder() which will in turn result
++ * in getMsgBaseForItem( item ) wanting to access items which are no longer
++ * there. Rather rely on KMHeaders::msgAdded and its signal. */
++ disconnect(listView, SIGNAL(itemAdded(QListViewItem *)),
++ this, SLOT(itemAdded(QListViewItem *)));
++ KMHeaders *headers = static_cast<KMHeaders*>( listView );
++ connect( headers, SIGNAL( msgAddedToListView( QListViewItem * ) ),
++ this, SLOT( itemAdded( QListViewItem* ) ) );
+ }
+
+ HeaderListQuickSearch::~HeaderListQuickSearch()
Index: kmail/imapjob.h
===================================================================
RCS file: /home/kde/kdepim/kmail/imapjob.h,v
@@ -2663,11 +3580,19 @@
===================================================================
RCS file: /home/kde/kdepim/kmail/kmail_config_composer.desktop,v
retrieving revision 1.24.2.10
-retrieving revision 1.24.2.12
-diff -u -r1.24.2.10 -r1.24.2.12
+retrieving revision 1.24.2.13
+diff -u -r1.24.2.10 -r1.24.2.13
--- kmail/kmail_config_composer.desktop 13 Nov 2004 07:20:51 -0000 1.24.2.10
-+++ kmail/kmail_config_composer.desktop 9 Jan 2005 07:49:20 -0000 1.24.2.12
-@@ -36,6 +36,7 @@
++++ kmail/kmail_config_composer.desktop 26 Jan 2005 08:10:29 -0000 1.24.2.13
+@@ -25,6 +25,7 @@
+ Name[et]=Koostaja
+ Name[fi]=Kirjoittaminen
+ Name[fr]=Éditeur
++Name[ga]=Ceapadóir
+ Name[gl]=Compositor
+ Name[he]=עורך
+ Name[hu]=Szerkesztő
+@@ -36,6 +37,7 @@
Name[pt]=Compositor
Name[pt_BR]=Editor de Mensagens
Name[ru]=Редактор писем
@@ -2675,7 +3600,7 @@
Name[sk]=Editor správ
Name[sl]=Sestavljalnik
Name[sr]=Састављач
-@@ -46,6 +47,7 @@
+@@ -46,6 +48,7 @@
Name[uk]=Редактор листів
Name[zh_CN]=编写器
Comment=Phrases & General Behavior
@@ -2683,7 +3608,7 @@
Comment[bg]=Настройки на редактора
Comment[bs]=Fraze i opšte ponašanje
Comment[ca]=Frases i comportament general
-@@ -69,6 +71,7 @@
+@@ -69,6 +72,7 @@
Comment[pt]=Frases e Comportamento Geral
Comment[pt_BR]=Frases & Comportamento Geral
Comment[ru]=Фразы и общие параметры
@@ -2691,7 +3616,7 @@
Comment[sk]=Frázy a všeobecné chovanie
Comment[sl]=Fraze in splošno obnašanje
Comment[sr]=Фразе и опште понашање
-@@ -79,6 +82,7 @@
+@@ -79,6 +83,7 @@
Comment[uk]=Фрази і загальні параметри
Comment[zh_CN]=短语和一般行为
Keywords=kmail,composer
@@ -2703,10 +3628,10 @@
===================================================================
RCS file: /home/kde/kdepim/kmail/kmail_config_identity.desktop,v
retrieving revision 1.23.2.11
-retrieving revision 1.23.2.13
-diff -u -r1.23.2.11 -r1.23.2.13
+retrieving revision 1.23.2.14
+diff -u -r1.23.2.11 -r1.23.2.14
--- kmail/kmail_config_identity.desktop 13 Nov 2004 07:20:51 -0000 1.23.2.11
-+++ kmail/kmail_config_identity.desktop 9 Jan 2005 07:49:20 -0000 1.23.2.13
++++ kmail/kmail_config_identity.desktop 26 Jan 2005 08:10:29 -0000 1.23.2.14
@@ -13,8 +13,10 @@
X-KDE-CfgDlgHierarchy=KMail
@@ -2718,7 +3643,15 @@
Name[bs]=Identiteti
Name[ca]=Identitats
Name[cs]=Identity
-@@ -38,6 +40,7 @@
+@@ -25,6 +27,7 @@
+ Name[et]=Identiteedid
+ Name[fi]=Henkilöllisyydet
+ Name[fr]=Identités
++Name[ga]=Aitheantais
+ Name[gl]=Identidades
+ Name[he]=זהויות
+ Name[hu]=Azonosítók
+@@ -38,6 +41,7 @@
Name[pt]=Identidades
Name[pt_BR]=Identidades
Name[ru]=Профили
@@ -2726,7 +3659,7 @@
Name[sk]=Identity
Name[sl]=Identitete
Name[sr]=Идентитети
-@@ -48,8 +51,10 @@
+@@ -48,8 +52,10 @@
Name[uk]=Профілі
Name[zh_CN]=身份
Comment=Manage Identities
@@ -2737,7 +3670,7 @@
Comment[bs]=Upravljaj identitetima
Comment[ca]=Gestiona les identitats
Comment[cs]=Správa identit
-@@ -73,6 +78,7 @@
+@@ -73,6 +79,7 @@
Comment[pt]=Gerir Identidades
Comment[pt_BR]=Gerenciar Identidades
Comment[ru]=Управление профилями
@@ -2745,7 +3678,7 @@
Comment[sk]=Správa identít
Comment[sl]=Upravljanje z identitetami
Comment[sr]=Управљање идентитетима
-@@ -83,6 +89,7 @@
+@@ -83,6 +90,7 @@
Comment[uk]=Керування профілями
Comment[zh_CN]=管理身份
Keywords=kmail,identity
@@ -2757,10 +3690,10 @@
===================================================================
RCS file: /home/kde/kdepim/kmail/kmail_config_misc.desktop,v
retrieving revision 1.25.2.13
-retrieving revision 1.25.2.15
-diff -u -r1.25.2.13 -r1.25.2.15
+retrieving revision 1.25.2.16
+diff -u -r1.25.2.13 -r1.25.2.16
--- kmail/kmail_config_misc.desktop 26 Nov 2004 08:05:19 -0000 1.25.2.13
-+++ kmail/kmail_config_misc.desktop 9 Jan 2005 07:49:20 -0000 1.25.2.15
++++ kmail/kmail_config_misc.desktop 23 Jan 2005 08:20:13 -0000 1.25.2.16
@@ -13,6 +13,7 @@
X-KDE-CfgDlgHierarchy=KMail
@@ -2785,7 +3718,15 @@
Comment[bg]=Разни настройки
Comment[bs]=Postavke koje ne spadaju nigdje drugo
Comment[ca]=Opcions que no van bé enlloc
-@@ -75,6 +78,7 @@
+@@ -68,6 +71,7 @@
+ Comment[is]=Stillingar sem passa ekki annars staðar
+ Comment[it]=Impostazioni che non rientrano in altre categorie
+ Comment[ja]=ほかのところに適合しない設定
++Comment[lt]=Kiti nustatymai
+ Comment[nb]=Instillinger som ikke passer andre steder
+ Comment[nl]=Instellingen die nergens echt passen
+ Comment[nn]=Innstillingar som ikkje passar andre stader
+@@ -75,6 +79,7 @@
Comment[pt]=Outras configurações
Comment[pt_BR]=Preferências que não se encaixam em outros lugares
Comment[ru]=Другие настройки
@@ -2793,7 +3734,7 @@
Comment[sk]=Nastavenie, ktoré sa inam nehodí
Comment[sl]=Nastavitve, ki ne spadajo drugam
Comment[sr]=Поставке које не припадају другде
-@@ -85,6 +89,7 @@
+@@ -85,6 +90,7 @@
Comment[uk]=Інші параметри
Comment[zh_CN]=其它设置
Keywords=kmail,misc
@@ -2805,10 +3746,10 @@
===================================================================
RCS file: /home/kde/kdepim/kmail/Attic/kmail_config_network.desktop,v
retrieving revision 1.34.2.13
-retrieving revision 1.34.2.18
-diff -u -r1.34.2.13 -r1.34.2.18
+retrieving revision 1.34.2.19
+diff -u -r1.34.2.13 -r1.34.2.19
--- kmail/kmail_config_network.desktop 26 Nov 2004 08:05:19 -0000 1.34.2.13
-+++ kmail/kmail_config_network.desktop 13 Jan 2005 08:02:45 -0000 1.34.2.18
++++ kmail/kmail_config_network.desktop 26 Jan 2005 08:10:29 -0000 1.34.2.19
@@ -13,6 +13,7 @@
X-KDE-CfgDlgHierarchy=KMail
@@ -2817,7 +3758,15 @@
Name[az]=Şəbəkə
Name[be]=Сетка
Name[bg]=Мрежа
-@@ -42,7 +43,6 @@
+@@ -31,6 +32,7 @@
+ Name[fa]=شبکه
+ Name[fi]=Verkko
+ Name[fr]=Réseau
++Name[ga]=Líonra
+ Name[gl]=Rede
+ Name[he]=רשת
+ Name[hr]=Mreža
+@@ -42,7 +44,6 @@
Name[lt]=Tinklas
Name[lv]=Tīkls
Name[mi]=Hao
@@ -2825,7 +3774,7 @@
Name[nb]=Nettverk
Name[nl]=Netwerk
Name[nn]=Nettverk
-@@ -52,6 +52,7 @@
+@@ -52,6 +53,7 @@
Name[pt]=Rede
Name[pt_BR]=Rede
Name[ru]=Сеть
@@ -2833,7 +3782,7 @@
Name[sk]=Sieť
Name[sl]=Omrežje
Name[sq]=Rrjeta
-@@ -70,6 +71,7 @@
+@@ -70,6 +72,7 @@
Name[zh_CN]=网络
Name[zu]=Umsebenzi wokuxhumanisa
Comment=Setup for Sending and Receiving Messages
@@ -2841,7 +3790,7 @@
Comment[bg]=Настройки на мрежата, сървърите и сметките
Comment[bs]=Postavke za slanje i prijem poruka
Comment[ca]=Configuració per enviar i rebre missatges
-@@ -92,6 +94,7 @@
+@@ -92,6 +95,7 @@
Comment[pt]=Configuração de Envio e Recepção de Mensagens
Comment[pt_BR]=Configura o Envio e Recebimento de Mensagens
Comment[ru]=Настройка отправки и получения сообщений
@@ -2849,7 +3798,7 @@
Comment[sk]=Nastavenie príjmu a odosielania správ
Comment[sl]=Nastavitve za pošiljanje in prejemanje sporočil
Comment[sr]=Подешавање слања и примања порука
-@@ -102,8 +105,10 @@
+@@ -102,8 +106,10 @@
Comment[uk]=Налаштування для надсилання і отримання повідомлень
Comment[zh_CN]=收发邮件设置
Keywords=kmail,network
@@ -3005,19 +3954,21 @@
===================================================================
RCS file: /home/kde/kdepim/kmail/kmheaders.cpp,v
retrieving revision 1.658.2.8
-retrieving revision 1.658.2.9
-diff -u -r1.658.2.8 -r1.658.2.9
+retrieving revision 1.658.2.10
+diff -u -r1.658.2.8 -r1.658.2.10
--- kmail/kmheaders.cpp 19 Nov 2004 11:46:04 -0000 1.658.2.8
-+++ kmail/kmheaders.cpp 12 Dec 2004 12:08:36 -0000 1.658.2.9
-@@ -1251,7 +1251,6 @@
++++ kmail/kmheaders.cpp 24 Jan 2005 20:56:19 -0000 1.658.2.10
+@@ -1251,7 +1251,8 @@
connect( this, SIGNAL(currentChanged(QListViewItem*)),
this, SLOT(highlightMessage(QListViewItem*)));
- emit messageListUpdated();
++ emit msgAddedToListView( hi );
++
END_TIMER(msgAdded);
SHOW_TIMER(msgAdded);
}
-@@ -2188,7 +2187,7 @@
+@@ -2188,7 +2189,7 @@
if (mReaderWindowActive)
{
KMMessage *msg = mFolder->getMsg(idx);
@@ -3026,6 +3977,40 @@
{
emit selected( 0 );
mPrevCurrent = 0;
+Index: kmail/kmheaders.h
+===================================================================
+RCS file: /home/kde/kdepim/kmail/kmheaders.h,v
+retrieving revision 1.157
+retrieving revision 1.157.2.1
+diff -u -r1.157 -r1.157.2.1
+--- kmail/kmheaders.h 5 Jul 2004 17:00:49 -0000 1.157
++++ kmail/kmheaders.h 24 Jan 2005 20:56:19 -0000 1.157.2.1
+@@ -169,14 +169,21 @@
+ signals:
+ /** emitted when the list view item corresponding to this message
+ has been selected */
+- virtual void selected(KMMessage *);
++ void selected(KMMessage *);
+ /** emitted when the list view item corresponding to this message
+ has been double clicked */
+- virtual void activated(KMMessage *);
++ void activated(KMMessage *);
+ /** emitted when we might be about to delete messages */
+- virtual void maybeDeleting();
++ void maybeDeleting();
+ /** emitted when the list of messages has been completely rebuilt */
+- virtual void messageListUpdated();
++ void messageListUpdated();
++
++ /** emitted after a new item has been fully built and added to the
++ * list view. We can't use KListView::itemAdded, as that is emitted
++ * from the ctor of the item, at which point the building of the item
++ * is not yet far enough along to update the quick search, which is
++ * what is connected to this signal. */
++ void msgAddedToListView( QListViewItem* );
+
+ public slots:
+ /** For when a list view item has been double clicked */
Index: kmail/kmsender.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/kmsender.cpp,v
@@ -3075,17 +4060,405 @@
public:
MboxJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 );
MboxJob( QPtrList<KMMessage>& msgList, const QString& sets,
+Index: kmail/messagecomposer.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kmail/messagecomposer.cpp,v
+retrieving revision 1.28.2.6
+retrieving revision 1.28.2.8
+diff -u -r1.28.2.6 -r1.28.2.8
+--- kmail/messagecomposer.cpp 30 Oct 2004 21:25:25 -0000 1.28.2.6
++++ kmail/messagecomposer.cpp 5 Feb 2005 21:34:31 -0000 1.28.2.8
+@@ -182,6 +182,27 @@
+ calling mComposer->doNextJob().
+ */
+
++/*
++ Test plan:
++
++ For each message format (e.g. openPGP/MIME)
++ 1. Body signed
++ 2. Body encrypted
++ 3. Body signed and encrypted
++ 4. Body encrypted, attachments encrypted (they must be encrypted together, mEarlyAddAttachments)
++ 5. Body encrypted, attachments not encrypted
++ 6. Body encrypted, attachment encrypted and signed (separately)
++ 7. Body not encrypted, one attachment encrypted+signed, one attachment encrypted only, one attachment signed only
++ (https://intevation.de/roundup/aegypten/issue295)
++ (this is the reason attachments can't be encrypted together)
++ 8. Body and attachments encrypted+signed (they must be encrypted+signed together, mEarlyAddAttachments)
++ 9. Body encrypted+signed, attachments encrypted
++ 10. Body encrypted+signed, one attachment signed, one attachment not encrypted nor signed
++ ...
++
++ I recorded a KDExecutor script sending all of the above (David)
++*/
++
+ static QString mErrorProcessingStructuringInfo =
+ i18n("<qt><p>Structuring information returned by the Crypto plug-in "
+ "could not be processed correctly; the plug-in might be damaged.</p>"
+@@ -343,8 +364,10 @@
+ // Copy necessary attributes over
+ mDisableBreaking = false;
+
+- mSigningRequested = mComposeWin->mSignAction->isChecked();
+- mEncryptionRequested = mComposeWin->mEncryptAction->isChecked();
++ mSignBody = mComposeWin->mSignAction->isChecked();
++ mSigningRequested = mSignBody; // for now; will be adjusted depending on attachments
++ mEncryptBody = mComposeWin->mEncryptAction->isChecked();
++ mEncryptionRequested = mEncryptBody; // for now; will be adjusted depending on attachments
+
+ mAutoCharset = mComposeWin->mAutoCharset;
+ mCharset = mComposeWin->mCharset;
+@@ -783,11 +806,13 @@
+ }
+
+ void MessageComposer::markAllAttachmentsForSigning( bool sign ) {
++ mSignBody = sign;
+ for ( QValueVector<Attachment>::iterator it = mAttachments.begin() ; it != mAttachments.end() ; ++it )
+ it->sign = sign;
+ }
+
+ void MessageComposer::markAllAttachmentsForEncryption( bool enc ) {
++ mEncryptBody = enc;
+ for ( QValueVector<Attachment>::iterator it = mAttachments.begin() ; it != mAttachments.end() ; ++it )
+ it->encrypt = enc;
+ }
+@@ -1133,9 +1158,13 @@
+ // this is the boundary depth of the surrounding MIME part
+ mPreviousBoundaryLevel = 0;
+
++ // whether the body must be signed/encrypted
++ const bool doEncryptBody = doEncrypt && mEncryptBody;
++ const bool doSignBody = doSign && mSignBody;
++
+ // create temporary bodyPart for editor text
+ // (and for all attachments, if mail is to be signed and/or encrypted)
+- mEarlyAddAttachments = !mAttachments.empty() && ( doSign || doEncrypt );
++ mEarlyAddAttachments = !mAttachments.empty() && ( doSignBody || doEncryptBody );
+
+ mAllAttachmentsAreInBody = mEarlyAddAttachments;
+
+@@ -1143,7 +1172,7 @@
+ if( mEarlyAddAttachments ) {
+ bool someOk = false;
+ for ( QValueVector<Attachment>::const_iterator it = mAttachments.begin() ; it != mAttachments.end() ; ++it ) {
+- if ( it->encrypt == doEncrypt && it->sign == doSign )
++ if ( it->encrypt == doEncryptBody && it->sign == doSignBody )
+ someOk = true;
+ else
+ mAllAttachmentsAreInBody = false;
+@@ -1152,6 +1181,8 @@
+ mEarlyAddAttachments = false;
+ }
+
++ kdDebug(5006) << "mEarlyAddAttachments=" << mEarlyAddAttachments << " mAllAttachmentsAreInBody=" << mAllAttachmentsAreInBody << endl;
++
+ // if an html message is to be generated, make a text/plain and text/html part
+ if ( mComposeWin->mEditor->textFormat() == Qt::RichText ) {
+ mOldBodyPart.setTypeStr( "multipart");
+@@ -1224,6 +1255,29 @@
+ mSaveBoundary = tmpCT.Boundary();
+ }
+
++ // Prepare attachments that will be signed/encrypted
++ for ( QValueVector<Attachment>::const_iterator it = mAttachments.begin() ; it != mAttachments.end() ; ++it ) {
++ // signed/encrypted body parts must be either QP or base64 encoded
++ // Why not 7 bit? Because the LF->CRLF canonicalization would render
++ // e.g. 7 bit encoded shell scripts unusable because of the CRs.
++ //
++ // (marc) this is a workaround for the KMail bug that doesn't
++ // respect the CRLF->LF de-canonicalisation. We should
++ // eventually get rid of this:
++ if( it->sign || it->encrypt ) {
++ QCString cte = it->part->cteStr().lower();
++ if( ( "8bit" == cte )
++ || ( ( it->part->type() == DwMime::kTypeText )
++ && ( "7bit" == cte ) ) ) {
++ const QByteArray body = it->part->bodyDecodedBinary();
++ QValueList<int> dummy;
++ it->part->setBodyAndGuessCte(body, dummy, false, it->sign);
++ kdDebug(5006) << "Changed encoding of message part from "
++ << cte << " to " << it->part->cteStr() << endl;
++ }
++ }
++ }
++
+ if( mEarlyAddAttachments ) {
+ // calculate a boundary string
+ ++mPreviousBoundaryLevel;
+@@ -1269,26 +1323,7 @@
+ // add all matching Attachments
+ // NOTE: This code will be changed when KMime is complete.
+ for ( QValueVector<Attachment>::iterator it = mAttachments.begin() ; it != mAttachments.end() ; ++it ) {
+- if ( it->encrypt == doEncrypt && it->sign == doSign ) {
+- // signed/encrypted body parts must be either QP or base64 encoded
+- // Why not 7 bit? Because the LF->CRLF canonicalization would render
+- // e.g. 7 bit encoded shell scripts unusable because of the CRs.
+- //
+- // (marc) this is a workaround for the KMail bug that doesn't
+- // respect the CRLF->LF de-canonicalisation. We should
+- // eventually get rid of this:
+- if( it->sign || it->encrypt ) {
+- QCString cte = it->part->cteStr().lower();
+- if( ( "8bit" == cte )
+- || ( ( it->part->type() == DwMime::kTypeText )
+- && ( "7bit" == cte ) ) ) {
+- const QByteArray body = it->part->bodyDecodedBinary();
+- QValueList<int> dummy;
+- it->part->setBodyAndGuessCte(body, dummy, false, it->sign);
+- kdDebug(5006) << "Changed encoding of message part from "
+- << cte << " to " << it->part->cteStr() << endl;
+- }
+- }
++ if ( it->encrypt == doEncryptBody && it->sign == doSignBody ) {
+ innerDwPart = theMessage.createDWBodyPart( it->part );
+ innerDwPart->Assemble();
+ body += "\n--" + boundaryCStr + "\n" + innerDwPart->AsString().c_str();
+@@ -1308,7 +1343,7 @@
+ // create S/MIME body part for signing and/or encrypting
+ mOldBodyPart.setBodyEncoded( body );
+
+- if( doSign || doEncrypt ) {
++ if( doSignBody || doEncryptBody ) {
+ // get string representation of body part (including the attachments)
+
+ DwBodyPart* dwPart;
+@@ -1344,11 +1379,11 @@
+
+ // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+ // according to RfC 2633, 3.1.1 Canonicalization
+- kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
++ //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
+ mEncodedBody = KMMessage::lf2crlf( mEncodedBody );
+ }
+
+- if ( doSign ) {
++ if ( doSignBody ) {
+ pgpSignedMsg( mEncodedBody, format );
+
+ if ( mSignature.isEmpty() ) {
+@@ -1422,10 +1457,13 @@
+ doEncrypt = false;
+ }
+
+- // encrypt message
+- if ( doEncrypt ) {
++ const bool doEncryptBody = doEncrypt && mEncryptBody;
++ const bool doSignBody = doSign && mSignBody;
++
++ if ( doEncryptBody ) {
+ QCString innerContent;
+- if ( doSign ) {
++ if ( doSignBody ) {
++ // extract signed body from newBodyPart
+ DwBodyPart* dwPart = msg->createDWBodyPart( &newBodyPart );
+ dwPart->Assemble();
+ innerContent = dwPart->AsString().c_str();
+@@ -1437,13 +1475,13 @@
+ // now do the encrypting:
+ // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+ // according to RfC 2633, 3.1.1 Canonicalization
+- kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
++ //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
+ innerContent = KMMessage::lf2crlf( innerContent );
+- kdDebug(5006) << " done." << endl;
++ //kdDebug(5006) << " done." << endl;
+
+ QByteArray encryptedBody;
+ Kpgp::Result result = pgpEncryptedMsg( encryptedBody, innerContent,
+- splitInfo.keys, format );
++ splitInfo.keys, format );
+ if ( result != Kpgp::Ok ) {
+ mRc = false;
+ return;
+@@ -1464,8 +1502,9 @@
+
+ // process the attachments that are not included into the body
+ if( mRc ) {
++ const bool useNewBodyPart = doSignBody || doEncryptBody;
+ addBodyAndAttachments( msg, splitInfo, doSign, doEncrypt,
+- (doSign || doEncrypt) ? newBodyPart : mOldBodyPart, format );
++ useNewBodyPart ? newBodyPart : mOldBodyPart, format );
+ }
+ }
+
+@@ -1475,6 +1514,9 @@
+ const KMMessagePart& ourFineBodyPart,
+ Kleo::CryptoMessageFormat format )
+ {
++ const bool doEncryptBody = doEncrypt && mEncryptBody;
++ const bool doSignBody = doSign && mSignBody;
++
+ if( !mAttachments.empty()
+ && ( !mEarlyAddAttachments || !mAllAttachmentsAreInBody ) ) {
+ // set the content type header
+@@ -1482,9 +1524,7 @@
+ msg->headers().ContentType().SetSubtype( DwMime::kSubtypeMixed );
+ msg->headers().ContentType().CreateBoundary( 0 );
+ kdDebug(5006) << "MessageComposer::addBodyAndAttachments() : set top level Content-Type to Multipart/Mixed" << endl;
+- // msg->setBody( "This message is in MIME format.\n"
+- // "Since your mail reader does not understand this format,\n"
+- // "some or all parts of this message may not be legible." );
++
+ // add our Body Part
+ DwBodyPart* tmpDwPart = msg->createDWBodyPart( &ourFineBodyPart );
+ DwHeaders& headers = tmpDwPart->Headers();
+@@ -1502,37 +1542,23 @@
+ KMMessagePart newAttachPart;
+ for ( QValueVector<Attachment>::iterator it = mAttachments.begin() ; it != mAttachments.end() ; ++it ) {
+
+- const bool cryptFlagsDifferent = format != Kleo::InlineOpenPGPFormat
+- && ( it->encrypt != doEncrypt || it->sign != doSign ) ;
+-
+- // CONTROVERSIAL
+- const bool encryptThisNow = doEncrypt && cryptFlagsDifferent && it->encrypt ;
+- const bool signThisNow = doSign && cryptFlagsDifferent && it->sign ;
++ const bool cryptFlagsDifferent = ( it->encrypt != doEncryptBody || it->sign != doSignBody ) ;
+
+ if ( !cryptFlagsDifferent && mEarlyAddAttachments )
+ continue;
+
++ const bool encryptThisNow = doEncrypt && cryptFlagsDifferent && it->encrypt ;
++ const bool signThisNow = doSign && cryptFlagsDifferent && it->sign ;
++
+ if ( !encryptThisNow && !signThisNow ) {
+ msg->addBodyPart( it->part );
+ // I DON'T KNOW WHY, BUT THIS FIXES THE VANISHING BOUNDARY PARAMTER
+- (void)msg->asString();
++ msg->getTopLevelPart()->Assemble();
+ continue;
+ }
+
+ KMMessagePart& rEncryptMessagePart( *it->part );
+
+- // prepare the attachment's content
+- // signed/encrypted body parts must be either QP or base64 encoded
+- QCString cte = it->part->cteStr().lower();
+- if( ( "8bit" == cte )
+- || ( ( it->part->type() == DwMime::kTypeText )
+- && ( "7bit" == cte ) ) ) {
+- QByteArray body = it->part->bodyDecodedBinary();
+- QValueList<int> dummy;
+- it->part->setBodyAndGuessCte(body, dummy, false, true);
+- kdDebug(5006) << "Changed encoding of message part from "
+- << cte << " to " << it->part->cteStr() << endl;
+- }
+ DwBodyPart* innerDwPart = msg->createDWBodyPart( it->part );
+ innerDwPart->Assemble();
+ QCString encodedAttachment = innerDwPart->AsString().c_str();
+@@ -1541,7 +1567,7 @@
+
+ // replace simple LFs by CRLFs for all MIME supporting CryptPlugs
+ // according to RfC 2633, 3.1.1 Canonicalization
+- kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
++ //kdDebug(5006) << "Converting LF to CRLF (see RfC 2633, 3.1.1 Canonicalization)" << endl;
+ encodedAttachment = KMMessage::lf2crlf( encodedAttachment );
+
+ // sign this attachment
+@@ -1601,6 +1627,7 @@
+ mRc = false;
+ }
+ msg->addBodyPart( &newAttachPart );
++ msg->getTopLevelPart()->Assemble(); // see above comment about vanishing boundary parameter...
+ }
+ } else { // no attachments in the final message
+ if( ourFineBodyPart.originalContentTypeStr() ) {
+@@ -1630,16 +1657,16 @@
+ }
+ if ( !ourFineBodyPart.body().isNull() )
+ msg->setBody(ourFineBodyPart.body() );
+-
+- if ( mDebugComposerCrypto ) {
+- kdDebug(5006) << "MessageComposer::addBodyAndAttachments():\n Final message:\n|||" << msg->asString() << "|||\n\n" << endl;
+- msg->headers().Assemble();
+- kdDebug(5006) << "\n\n\nMessageComposer::addBodyAndAttachments():\n Final headers:\n\n" << msg->headerAsString() << "|||\n\n\n\n\n" << endl;
+- }
+ }
+
+ msg->setHeaderField( "X-KMail-Recipients",
+ splitInfo.recipients.join(", ") );
++
++ if ( mDebugComposerCrypto ) {
++ kdDebug(5006) << "MessageComposer::addBodyAndAttachments():\n Final message:\n|||" << msg->asString() << "|||\n\n" << endl;
++ msg->headers().Assemble();
++ kdDebug(5006) << "\n\n\nMessageComposer::addBodyAndAttachments():\n Final headers:\n\n" << msg->headerAsString() << "|||\n\n\n\n\n" << endl;
++ }
+ }
+
+ //-----------------------------------------------------------------------------
+@@ -1694,6 +1721,8 @@
+ }
+ }
+
++ //kdDebug(5006) << "processStructuringInfo: mainHeader=" << mainHeader << endl;
++
+ DwString mainDwStr;
+ mainDwStr = mainHeader + "\n\n";
+ DwBodyPart mainDwPa( mainDwStr, 0 );
+@@ -1707,7 +1736,7 @@
+ resultingPart.setBodyEncoded( bodyText );
+ } else
+ resultingPart.setBodyEncodedBinary( ciphertext );
+- } else { // OF if( !makeMultiMime )
++ } else {
+ // Build the encapsulated MIME parts.
+ // Build a MIME part holding the version information
+ // taking the body contents returned in
+@@ -1749,11 +1778,12 @@
+ mainStr += "\n" + codeCStr + "\n--" + boundaryCStr;
+ mainStr += "--\n";
+
++ //kdDebug(5006) << "processStructuringInfo: mainStr=" << mainStr << endl;
+ resultingPart.setBodyEncoded( mainStr );
+ } // OF if( !makeMultiMime ) .. else
+- } else { // OF makeMimeObject
+- // Build a plain message body
+- // based on the values returned in structInf.
++
++ } else { // not making a mime object
++ // Build a plain message body based on the values returned in structInf.
+ // Note: We do _not_ insert line breaks between the parts since
+ // it is the plugin job to provide us with ready-to-use
+ // texts containing all necessary line breaks.
+@@ -1795,7 +1825,7 @@
+ resultingBody += structuring.data.flatTextPostfix;
+ #endif
+ resultingPart.setBodyEncoded( resultingBody );
+- } // OF if( structuring.data.makeMimeObject ) .. else
++ }
+
+ // No need to free the memory that was allocated for the ciphertext
+ // since this memory is freed by it's QCString destructor.
+Index: kmail/messagecomposer.h
+===================================================================
+RCS file: /home/kde/kdepim/kmail/messagecomposer.h,v
+retrieving revision 1.4.2.1
+retrieving revision 1.4.2.2
+diff -u -r1.4.2.1 -r1.4.2.2
+--- kmail/messagecomposer.h 7 Oct 2004 11:05:00 -0000 1.4.2.1
++++ kmail/messagecomposer.h 26 Jan 2005 17:12:05 -0000 1.4.2.2
+@@ -221,6 +221,7 @@
+
+ QString mPGPSigningKey, mSMIMESigningKey;
+ bool mUseOpportunisticEncryption;
++ bool mSignBody, mEncryptBody;
+ bool mSigningRequested, mEncryptionRequested;
+ bool mDoSign, mDoEncrypt;
+ unsigned int mAllowedCryptoMessageFormats;
Index: kmail/profiles/profile-default-rc.desktop
===================================================================
RCS file: /home/kde/kdepim/kmail/profiles/profile-default-rc.desktop,v
retrieving revision 1.99.2.3
-retrieving revision 1.99.2.5
-diff -u -r1.99.2.3 -r1.99.2.5
+retrieving revision 1.99.2.6
+diff -u -r1.99.2.3 -r1.99.2.6
--- kmail/profiles/profile-default-rc.desktop 26 Nov 2004 08:05:19 -0000 1.99.2.3
-+++ kmail/profiles/profile-default-rc.desktop 9 Jan 2005 07:49:20 -0000 1.99.2.5
-@@ -31,7 +31,6 @@
++++ kmail/profiles/profile-default-rc.desktop 29 Jan 2005 08:00:56 -0000 1.99.2.6
+@@ -29,9 +29,8 @@
+ Name[is]=Sjálfgefið
+ Name[it]=Predefinito
Name[ja]=標準
- Name[lt]=Nutylima
+-Name[lt]=Nutylima
++Name[lt]=Numatytasis
Name[lv]=Noklusētais
-Name[mk]=Вообичаено
Name[mt]=Normali
@@ -3111,10 +4484,10 @@
===================================================================
RCS file: /home/kde/kdepim/kmail/profiles/profile-high-contrast-rc.desktop,v
retrieving revision 1.121.2.3
-retrieving revision 1.121.2.4
-diff -u -r1.121.2.3 -r1.121.2.4
+retrieving revision 1.121.2.5
+diff -u -r1.121.2.3 -r1.121.2.5
--- kmail/profiles/profile-high-contrast-rc.desktop 29 Sep 2004 14:06:30 -0000 1.121.2.3
-+++ kmail/profiles/profile-high-contrast-rc.desktop 29 Dec 2004 21:44:59 -0000 1.121.2.4
++++ kmail/profiles/profile-high-contrast-rc.desktop 26 Jan 2005 08:10:29 -0000 1.121.2.5
@@ -1,5 +1,6 @@
[KMail Profile]
Name=High Contrast
@@ -3122,6 +4495,14 @@
Name[bg]=Висок контраст
Name[bs]=Visoki kontrast
Name[ca]=Alt contrast
+@@ -12,6 +13,7 @@
+ Name[et]=Suur kontrast
+ Name[fi]=Korkea kontrasti
+ Name[fr]=Contraste élevé
++Name[ga]=Ardchodarsnacht
+ Name[gl]=Alto contraste
+ Name[he]=ניגודיות גבוהה
+ Name[hi]=उच्च कंट्रास्ट
Index: kmail/profiles/profile-purist-rc.desktop
===================================================================
RCS file: /home/kde/kdepim/kmail/profiles/profile-purist-rc.desktop,v
@@ -3221,11 +4602,19 @@
===================================================================
RCS file: /home/kde/kdepim/kmobile/devices/digicam/libkmobile_digicam.desktop,v
retrieving revision 1.52.2.2
-retrieving revision 1.52.2.4
-diff -u -r1.52.2.2 -r1.52.2.4
+retrieving revision 1.52.2.5
+diff -u -r1.52.2.2 -r1.52.2.5
--- kmobile/devices/digicam/libkmobile_digicam.desktop 10 Nov 2004 07:37:27 -0000 1.52.2.2
-+++ kmobile/devices/digicam/libkmobile_digicam.desktop 9 Jan 2005 07:49:21 -0000 1.52.2.4
-@@ -32,6 +32,7 @@
++++ kmobile/devices/digicam/libkmobile_digicam.desktop 26 Jan 2005 08:10:29 -0000 1.52.2.5
+@@ -15,6 +15,7 @@
+ Name[eu]=Kamara Digitala
+ Name[fi]=digitaalikamera
+ Name[fr]=Appareil photo numérique
++Name[ga]=Ceamara Digiteach
+ Name[gl]=Cámara dixital
+ Name[he]=מצלמה דיגיטאלית
+ Name[hi]=डिजिटल कैमरा
+@@ -32,6 +33,7 @@
Name[pt_BR]=Câmera Digital
Name[ro]=Aparat foto digital
Name[ru]=Цифровая камера
@@ -3233,7 +4622,7 @@
Name[sk]=Digitálny fotoaparát
Name[sl]=Digitalna kamera
Name[sr]=Дигитална камера
-@@ -44,6 +45,7 @@
+@@ -44,6 +46,7 @@
Name[uz]=Рақамли камера
Name[zh_CN]=数码相机
Comment=This driver supports many digital cameras
@@ -3392,10 +4781,10 @@
===================================================================
RCS file: /home/kde/kdepim/knode/KNode.desktop,v
retrieving revision 1.178.2.3
-retrieving revision 1.178.2.5
-diff -u -r1.178.2.3 -r1.178.2.5
+retrieving revision 1.178.2.6
+diff -u -r1.178.2.3 -r1.178.2.6
--- knode/KNode.desktop 10 Nov 2004 07:37:28 -0000 1.178.2.3
-+++ knode/KNode.desktop 9 Jan 2005 07:49:22 -0000 1.178.2.5
++++ knode/KNode.desktop 26 Jan 2005 08:10:29 -0000 1.178.2.6
@@ -9,7 +9,6 @@
Name[ar]=قارئ الأخبار
Name[eo]=Diskutrondoj
@@ -3404,7 +4793,15 @@
Name[ro]=Ştiri Internet
Name[sv]=Knode
Name[ta]=Kநோடு
-@@ -43,7 +42,6 @@
+@@ -32,6 +31,7 @@
+ GenericName[eu]=Berri Irakurlea
+ GenericName[fi]=Uutisryhmien lukuohjelma
+ GenericName[fr]=Lecteur de forums de discussion
++GenericName[ga]=Léitheoir Nuachta
+ GenericName[gl]=Lector de Noticias
+ GenericName[he]=קורא חדשות
+ GenericName[hi]=समाचार वाचक
+@@ -43,7 +43,6 @@
GenericName[ja]=ニュースリーダ
GenericName[lt]=Naujienų skaityklė
GenericName[lv]=Ziņu Lasītājs
@@ -3412,7 +4809,7 @@
GenericName[mt]=Qarrej tal-aħbarijiet (news)
GenericName[nb]=Njusleser
GenericName[nl]=Nieuwslezer
-@@ -53,6 +51,7 @@
+@@ -53,6 +52,7 @@
GenericName[pt_BR]=Leitor de Notícias
GenericName[ro]=Cititor de ştiri USENET
GenericName[ru]=Программа для чтения новостей
@@ -3424,10 +4821,10 @@
===================================================================
RCS file: /home/kde/kdepim/knode/knode_config_accounts.desktop,v
retrieving revision 1.25.2.10
-retrieving revision 1.25.2.12
-diff -u -r1.25.2.10 -r1.25.2.12
+retrieving revision 1.25.2.13
+diff -u -r1.25.2.10 -r1.25.2.13
--- knode/knode_config_accounts.desktop 13 Nov 2004 07:20:52 -0000 1.25.2.10
-+++ knode/knode_config_accounts.desktop 9 Jan 2005 07:49:22 -0000 1.25.2.12
++++ knode/knode_config_accounts.desktop 26 Jan 2005 08:10:29 -0000 1.25.2.13
@@ -13,6 +13,7 @@
X-KDE-CfgDlgHierarchy=KNode
@@ -3436,7 +4833,15 @@
Name[be]=Рахункі
Name[bg]=Сметки
Name[br]=Kontoù
-@@ -38,6 +39,7 @@
+@@ -26,6 +27,7 @@
+ Name[et]=Kontod
+ Name[fi]=Tilit
+ Name[fr]=Comptes
++Name[ga]=Cuntais
+ Name[gl]=Contas
+ Name[he]=חשבונות
+ Name[hu]=Fiókok
+@@ -38,6 +40,7 @@
Name[pt]=Contas
Name[pt_BR]=Contas
Name[ru]=Учётные записи
@@ -3444,7 +4849,7 @@
Name[sk]=Účty
Name[sl]=Računi
Name[sr]=Налози
-@@ -50,6 +52,7 @@
+@@ -50,6 +53,7 @@
Name[wa]=Contes
Name[zh_CN]=账户
Comment=Setup for Newsgroup and Mail Servers
@@ -3452,7 +4857,7 @@
Comment[bg]=Настройки на групите и пощенските сървъри
Comment[bs]=Postavke za newsgrupe i mail servere
Comment[ca]=Configuració dels grups de notícies i servidors de correu
-@@ -72,6 +75,7 @@
+@@ -72,6 +76,7 @@
Comment[pt]=Configuração de Servidores de Notícias e de E-mail
Comment[pt_BR]=Configura Grupos de Discussão e Servidores de E-mails
Comment[ru]=Учётные записи на почтовых серверах и серверах телеконференций
@@ -3540,10 +4945,10 @@
===================================================================
RCS file: /home/kde/kdepim/knode/knode_config_identity.desktop,v
retrieving revision 1.24.2.11
-retrieving revision 1.24.2.13
-diff -u -r1.24.2.11 -r1.24.2.13
+retrieving revision 1.24.2.14
+diff -u -r1.24.2.11 -r1.24.2.14
--- knode/knode_config_identity.desktop 19 Nov 2004 07:37:43 -0000 1.24.2.11
-+++ knode/knode_config_identity.desktop 9 Jan 2005 07:49:22 -0000 1.24.2.13
++++ knode/knode_config_identity.desktop 26 Jan 2005 08:10:29 -0000 1.24.2.14
@@ -13,6 +13,7 @@
X-KDE-CfgDlgHierarchy=KNode
@@ -3552,7 +4957,15 @@
Name[be]=Увасабленьне
Name[bg]=Самоличност
Name[br]=Anvelezh
-@@ -38,6 +39,7 @@
+@@ -25,6 +26,7 @@
+ Name[et]=Identiteet
+ Name[fi]=Henkilöllisyys
+ Name[fr]=Identité
++Name[ga]=Aitheantas
+ Name[gl]=Identidade
+ Name[he]=זהות
+ Name[hu]=Azonosító
+@@ -38,6 +40,7 @@
Name[pt]=Identidade
Name[pt_BR]=Identidade
Name[ru]=Профиль
@@ -3560,7 +4973,15 @@
Name[sk]=Identita
Name[sl]=Identiteta
Name[sr]=Идентитет
-@@ -74,6 +76,7 @@
+@@ -61,6 +64,7 @@
+ Comment[et]=Personaalne info
+ Comment[fi]=Omat tiedot
+ Comment[fr]=Informations personnelles
++Comment[ga]=Eolas Pearsanta
+ Comment[gl]=Información Persoal
+ Comment[he]=מידע איש
+ Comment[hu]=Személyi adatok
+@@ -74,6 +78,7 @@
Comment[pt]=Informação Pessoal
Comment[pt_BR]=Informações Pessoais
Comment[ru]=Персональная информация
@@ -3668,10 +5089,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/interfaces/kontactplugin.desktop,v
retrieving revision 1.80.2.3
-retrieving revision 1.80.2.5
-diff -u -r1.80.2.3 -r1.80.2.5
+retrieving revision 1.80.2.6
+diff -u -r1.80.2.3 -r1.80.2.6
--- kontact/interfaces/kontactplugin.desktop 28 Nov 2004 08:34:00 -0000 1.80.2.3
-+++ kontact/interfaces/kontactplugin.desktop 9 Jan 2005 07:49:22 -0000 1.80.2.5
++++ kontact/interfaces/kontactplugin.desktop 15 Feb 2005 10:16:44 -0000 1.80.2.6
@@ -2,6 +2,7 @@
Type=ServiceType
X-KDE-ServiceType=Kontact/Plugin
@@ -3680,7 +5101,15 @@
Name[be]=Дапаўненьне Кантакту
Name[bg]=Приставка на Kontact
Name[br]=Lugent Kontact
-@@ -30,6 +31,7 @@
+@@ -16,6 +17,7 @@
+ Name[et]=Kontacti plugin
+ Name[fi]=Kontact-liitännäinen
+ Name[fr]=Module Kontact
++Name[ga]=Breiseán Kontact
+ Name[gl]=Extensión de Kontact
+ Name[he]=תוסף Kontact
+ Name[hi]=कॉन्टेक्ट प्लगइन
+@@ -30,6 +32,7 @@
Name[pt_BR]=Plug-in do Kontact
Name[ro]=Modul Kontact
Name[ru]=Модуль Kontact
@@ -3692,10 +5121,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/kaddressbook/kaddressbookplugin.desktop,v
retrieving revision 1.46.2.4
-retrieving revision 1.46.2.6
-diff -u -r1.46.2.4 -r1.46.2.6
+retrieving revision 1.46.2.7
+diff -u -r1.46.2.4 -r1.46.2.7
--- kontact/plugins/kaddressbook/kaddressbookplugin.desktop 28 Nov 2004 08:34:00 -0000 1.46.2.4
-+++ kontact/plugins/kaddressbook/kaddressbookplugin.desktop 9 Jan 2005 07:49:22 -0000 1.46.2.6
++++ kontact/plugins/kaddressbook/kaddressbookplugin.desktop 26 Jan 2005 08:10:30 -0000 1.46.2.7
@@ -17,8 +17,10 @@
X-KDE-PluginInfo-EnabledByDefault=true
@@ -3725,7 +5154,15 @@
Name[bs]=Kontakti
Name[ca]=Contactes
Name[cs]=Kontakty
-@@ -81,6 +86,7 @@
+@@ -67,6 +72,7 @@
+ Name[es]=Contactos
+ Name[et]=Kontaktid
+ Name[fi]=Kontaktit
++Name[ga]=Teagmhálacha
+ Name[gl]=Contactos
+ Name[he]=אנשי קשר
+ Name[hi]=सम्पर्कों
+@@ -81,6 +87,7 @@
Name[pt_BR]=Contatos
Name[ro]=Contacte
Name[ru]=Контакты
@@ -3737,10 +5174,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/kaddressbook/kcmkabsummary.desktop,v
retrieving revision 1.27.2.7
-retrieving revision 1.27.2.9
-diff -u -r1.27.2.7 -r1.27.2.9
+retrieving revision 1.27.2.10
+diff -u -r1.27.2.7 -r1.27.2.10
--- kontact/plugins/kaddressbook/kcmkabsummary.desktop 13 Nov 2004 07:20:53 -0000 1.27.2.7
-+++ kontact/plugins/kaddressbook/kcmkabsummary.desktop 9 Jan 2005 07:49:22 -0000 1.27.2.9
++++ kontact/plugins/kaddressbook/kcmkabsummary.desktop 26 Jan 2005 08:10:30 -0000 1.27.2.10
@@ -12,6 +12,7 @@
X-KDE-CfgDlgHierarchy=KAddressBook
@@ -3749,7 +5186,15 @@
Name[bg]=Обобщение на адресника
Name[bs]=Sažetak za adresar
Name[ca]=Resum de la llibreta d'adreces
-@@ -33,6 +34,7 @@
+@@ -21,6 +22,7 @@
+ Name[es]=Resumen de la libreta de direcciones
+ Name[et]=Aadressiraamatu kokkuvõte
+ Name[fr]=Résumé de carnet d'adresses
++Name[ga]=Leabhar Seoltaí: Achoimre
+ Name[gl]=Sumario do Caderno de Enderezos
+ Name[he]=תמצית פנקס כתובות
+ Name[hu]=Címjegyzék-áttekintés
+@@ -33,6 +35,7 @@
Name[pt]=Sumário do Livro de Endereços
Name[pt_BR]=Resumo do Livro de Endereços
Name[ru]=Контакты
@@ -3757,7 +5202,7 @@
Name[sk]=Súhrn adresára
Name[sl]=Povzetek Adresarja
Name[sr]=Сажетак адресара
-@@ -43,6 +45,7 @@
+@@ -43,6 +46,7 @@
Name[uk]=Підсумок адресної книги
Name[zh_CN]=地址簿摘要
Comment=Address Book Summary Setup
@@ -3765,7 +5210,7 @@
Comment[bg]=Настройки на обобщението на адресника
Comment[bs]=Podešavanje sažetka za Adresar
Comment[ca]=Configuració del resum de la llibreta d'adreces
-@@ -64,6 +67,7 @@
+@@ -64,6 +68,7 @@
Comment[pt]=Configuração do Sumário do Livro de Endereços
Comment[pt_BR]=Configuração do Resumo do Livro de Endereços
Comment[ru]=Модуль дайджеста контактов
@@ -3773,7 +5218,7 @@
Comment[sk]=Nastavenie súhrnu adresára
Comment[sl]=Nastavitve povzetka Adresarja
Comment[sr]=Подешавање сажетка адресара
-@@ -74,6 +78,7 @@
+@@ -74,6 +79,7 @@
Comment[uk]=Налаштування підсумку адресної книги
Comment[zh_CN]=地址簿摘要设置
Keywords=birthday, anniversary, configure, settings
@@ -3785,10 +5230,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/kitchensync/kitchensync.desktop,v
retrieving revision 1.54.2.4
-retrieving revision 1.54.2.6
-diff -u -r1.54.2.4 -r1.54.2.6
+retrieving revision 1.54.2.7
+diff -u -r1.54.2.4 -r1.54.2.7
--- kontact/plugins/kitchensync/kitchensync.desktop 28 Nov 2004 08:34:00 -0000 1.54.2.4
-+++ kontact/plugins/kitchensync/kitchensync.desktop 9 Jan 2005 07:49:22 -0000 1.54.2.6
++++ kontact/plugins/kitchensync/kitchensync.desktop 26 Jan 2005 08:10:30 -0000 1.54.2.7
@@ -14,7 +14,9 @@
X-KDE-PluginInfo-EnabledByDefault=false
@@ -3807,7 +5252,15 @@
Comment[sk]=Modul pre KitchenSync
Comment[sl]=Vstavek KitchenSync
Comment[sr]=Прикључак KitchenSync-а
-@@ -80,6 +83,7 @@
+@@ -65,6 +68,7 @@
+ Name[et]=Sünkroniseerimine
+ Name[fi]=Synkronointi
+ Name[fr]=Synchronisation
++Name[ga]=Sioncronú
+ Name[gl]=Sincronización
+ Name[he]=סינכרון
+ Name[hi]=सिंक्रोनाइजेशन
+@@ -80,6 +84,7 @@
Name[pt_BR]=Sincronização
Name[ro]=Sincronizare
Name[ru]=Синхронизация
@@ -3867,10 +5320,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/kmail/kmailplugin.desktop,v
retrieving revision 1.62.2.5
-retrieving revision 1.62.2.7
-diff -u -r1.62.2.5 -r1.62.2.7
+retrieving revision 1.62.2.8
+diff -u -r1.62.2.5 -r1.62.2.8
--- kontact/plugins/kmail/kmailplugin.desktop 28 Nov 2004 08:34:01 -0000 1.62.2.5
-+++ kontact/plugins/kmail/kmailplugin.desktop 9 Jan 2005 07:49:23 -0000 1.62.2.7
++++ kontact/plugins/kmail/kmailplugin.desktop 26 Jan 2005 08:10:30 -0000 1.62.2.8
@@ -18,8 +18,10 @@
X-KDE-PluginInfo-EnabledByDefault=true
@@ -3898,7 +5351,15 @@
Name[be]=Пошта
Name[br]=Lizher
Name[ca]=Correu
-@@ -85,6 +89,7 @@
+@@ -68,6 +72,7 @@
+ Name[et]=E-post
+ Name[fi]=Sähköposti
+ Name[fr]=Messages
++Name[ga]=Ríomhphost
+ Name[gl]=Correo-e
+ Name[he]=דואר
+ Name[hi]=डाक
+@@ -85,6 +90,7 @@
Name[pt_BR]=Correio
Name[ro]=E-Mail
Name[ru]=Почта
@@ -3910,10 +5371,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/knode/knodeplugin.desktop,v
retrieving revision 1.48.2.5
-retrieving revision 1.48.2.7
-diff -u -r1.48.2.5 -r1.48.2.7
+retrieving revision 1.48.2.8
+diff -u -r1.48.2.5 -r1.48.2.8
--- kontact/plugins/knode/knodeplugin.desktop 28 Nov 2004 08:34:01 -0000 1.48.2.5
-+++ kontact/plugins/knode/knodeplugin.desktop 9 Jan 2005 07:49:23 -0000 1.48.2.7
++++ kontact/plugins/knode/knodeplugin.desktop 26 Jan 2005 08:10:31 -0000 1.48.2.8
@@ -15,8 +15,10 @@
X-KDE-PluginInfo-EnabledByDefault=false
@@ -3941,7 +5402,15 @@
Name[be]=Навіны
Name[br]=Keleier
Name[bs]=Usenet
-@@ -80,6 +84,7 @@
+@@ -67,6 +71,7 @@
+ Name[et]=Uudised
+ Name[fi]=Uutiset
+ Name[fr]=Nouvelles
++Name[ga]=Nuacht
+ Name[gl]=Novas
+ Name[he]=חדשות
+ Name[hi]=समाचार
+@@ -80,6 +85,7 @@
Name[pt_BR]=Notícias
Name[ro]=Ştiri
Name[ru]=Новости
@@ -3953,10 +5422,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/knotes/knotesplugin.desktop,v
retrieving revision 1.41.2.4
-retrieving revision 1.41.2.6
-diff -u -r1.41.2.4 -r1.41.2.6
+retrieving revision 1.41.2.7
+diff -u -r1.41.2.4 -r1.41.2.7
--- kontact/plugins/knotes/knotesplugin.desktop 28 Nov 2004 08:34:01 -0000 1.41.2.4
-+++ kontact/plugins/knotes/knotesplugin.desktop 9 Jan 2005 07:49:23 -0000 1.41.2.6
++++ kontact/plugins/knotes/knotesplugin.desktop 26 Jan 2005 08:10:31 -0000 1.41.2.7
@@ -15,8 +15,10 @@
X-KDE-PluginInfo-EnabledByDefault=true
@@ -3984,7 +5453,15 @@
Name[be]=Нататкі
Name[br]=Notennoù
Name[bs]=Bilješke
-@@ -78,6 +82,7 @@
+@@ -65,6 +69,7 @@
+ Name[es]=Notas
+ Name[et]=Märkmed
+ Name[fi]=Muistio
++Name[ga]=Nótaí
+ Name[gl]=Notas
+ Name[he]=פתקים
+ Name[hi]=टीप
+@@ -78,6 +83,7 @@
Name[pt_BR]=Notas
Name[ro]=Notiţe
Name[ru]=Заметки
@@ -3996,10 +5473,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/korganizer/kcmkorgsummary.desktop,v
retrieving revision 1.25.2.10
-retrieving revision 1.25.2.12
-diff -u -r1.25.2.10 -r1.25.2.12
+retrieving revision 1.25.2.13
+diff -u -r1.25.2.10 -r1.25.2.13
--- kontact/plugins/korganizer/kcmkorgsummary.desktop 13 Nov 2004 07:20:54 -0000 1.25.2.10
-+++ kontact/plugins/korganizer/kcmkorgsummary.desktop 9 Jan 2005 07:49:24 -0000 1.25.2.12
++++ kontact/plugins/korganizer/kcmkorgsummary.desktop 26 Jan 2005 08:10:31 -0000 1.25.2.13
@@ -12,6 +12,7 @@
X-KDE-CfgDlgHierarchy=KOrganizer
@@ -4008,7 +5485,15 @@
Name[be]=Расклад
Name[bg]=Разписание
Name[bs]=Raspored
-@@ -36,6 +37,7 @@
+@@ -24,6 +25,7 @@
+ Name[et]=Ajakavad
+ Name[fi]=Kalenteri
+ Name[fr]=Planification
++Name[ga]=Sceideal
+ Name[gl]=Axenda
+ Name[he]=תזמון
+ Name[hu]=Szervezés
+@@ -36,6 +38,7 @@
Name[pt]=Escalonamento
Name[pt_BR]=Agenda
Name[ru]=Календарь
@@ -4016,7 +5501,7 @@
Name[sk]=Plánovanie
Name[sl]=Razpored
Name[sr]=Закажи
-@@ -46,6 +48,7 @@
+@@ -46,6 +49,7 @@
Name[uk]=Розклад
Name[zh_CN]=日程安排
Comment=Schedule Setup
@@ -4024,7 +5509,7 @@
Comment[bg]=Настройки на разписанието
Comment[bs]=Podešavanje rasporeda
Comment[ca]=Configuració de la planificació
-@@ -67,6 +70,7 @@
+@@ -67,6 +71,7 @@
Comment[pt]=Configuração do Escalonamento
Comment[pt_BR]=Configurações da Agenda
Comment[ru]=Настройка календаря
@@ -4032,7 +5517,7 @@
Comment[sk]=Nastavenie plánovania
Comment[sl]=nastavitve razporeda
Comment[sr]=Подешавање заказивања
-@@ -77,6 +81,7 @@
+@@ -77,6 +82,7 @@
Comment[uk]=Налаштування розкладу
Comment[zh_CN]=日程安排设置
Keywords=calendar, todos, configure, settings
@@ -4044,10 +5529,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/korganizer/korganizerplugin.desktop,v
retrieving revision 1.49.2.5
-retrieving revision 1.49.2.7
-diff -u -r1.49.2.5 -r1.49.2.7
+retrieving revision 1.49.2.8
+diff -u -r1.49.2.5 -r1.49.2.8
--- kontact/plugins/korganizer/korganizerplugin.desktop 28 Nov 2004 08:34:01 -0000 1.49.2.5
-+++ kontact/plugins/korganizer/korganizerplugin.desktop 9 Jan 2005 07:49:24 -0000 1.49.2.7
++++ kontact/plugins/korganizer/korganizerplugin.desktop 26 Jan 2005 08:10:31 -0000 1.49.2.8
@@ -17,8 +17,10 @@
X-KDE-PluginInfo-EnabledByDefault=true
@@ -4075,7 +5560,15 @@
Name[be]=Каляндар
Name[br]=Deiziadur
Name[bs]=Kalendar
-@@ -83,6 +87,7 @@
+@@ -69,6 +73,7 @@
+ Name[et]=Kalender
+ Name[fi]=Kalenteri
+ Name[fr]=Calendrier
++Name[ga]=Féilire
+ Name[gl]=Calendario
+ Name[he]=לוח שנה
+ Name[hi]=कैलेन्डर
+@@ -83,6 +88,7 @@
Name[pt]=Calendário
Name[pt_BR]=Calendário
Name[ru]=Календарь
@@ -4166,10 +5659,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/newsticker/kcmkontactknt.desktop,v
retrieving revision 1.49.2.10
-retrieving revision 1.49.2.12
-diff -u -r1.49.2.10 -r1.49.2.12
+retrieving revision 1.49.2.13
+diff -u -r1.49.2.10 -r1.49.2.13
--- kontact/plugins/newsticker/kcmkontactknt.desktop 13 Nov 2004 07:20:54 -0000 1.49.2.10
-+++ kontact/plugins/newsticker/kcmkontactknt.desktop 9 Jan 2005 07:49:24 -0000 1.49.2.12
++++ kontact/plugins/newsticker/kcmkontactknt.desktop 26 Jan 2005 08:10:31 -0000 1.49.2.13
@@ -12,6 +12,7 @@
X-KDE-CfgDlgHierarchy=NewsTicker
@@ -4194,7 +5687,15 @@
Comment[bs]=Podešavanje izvora vijesti
Comment[ca]=Configuració de les fonts de notícies
Comment[cs]=Nastavení zdrojů novinek
-@@ -68,6 +71,7 @@
+@@ -55,6 +58,7 @@
+ Comment[et]=Uudisteallikate seadistamine
+ Comment[fi]=Uutislähteiden asetukset
+ Comment[fr]=Configuration des sources de nouvelles
++Comment[ga]=Cumraíocht na bhFoinsí Nuachta
+ Comment[gl]=Configuración de Fontes de Novas
+ Comment[he]=הגדרת מקורות חדשות
+ Comment[hu]=A hírforrások beállításai
+@@ -68,6 +72,7 @@
Comment[pt]=Configuração de Fontes de Notícias
Comment[pt_BR]=Configurar Fontes de Notícias
Comment[ru]=Настройка источников новостей
@@ -4202,7 +5703,7 @@
Comment[sk]=Nastavenie zdrojov správ
Comment[sl]=Nastavitve virov novic
Comment[sr]=Подешавање извора вести
-@@ -78,6 +82,7 @@
+@@ -78,6 +83,7 @@
Comment[uk]=Налаштування джерел новин
Comment[zh_CN]=新闻来源设置
Keywords=news ticker, configure, settings
@@ -4238,10 +5739,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/summary/kcmkontactsummary.desktop,v
retrieving revision 1.42.2.10
-retrieving revision 1.42.2.12
-diff -u -r1.42.2.10 -r1.42.2.12
+retrieving revision 1.42.2.13
+diff -u -r1.42.2.10 -r1.42.2.13
--- kontact/plugins/summary/kcmkontactsummary.desktop 13 Nov 2004 07:20:54 -0000 1.42.2.10
-+++ kontact/plugins/summary/kcmkontactsummary.desktop 9 Jan 2005 07:49:24 -0000 1.42.2.12
++++ kontact/plugins/summary/kcmkontactsummary.desktop 26 Jan 2005 08:10:32 -0000 1.42.2.13
@@ -12,6 +12,7 @@
X-KDE-CfgDlgHierarchy=KontactSummary
@@ -4250,7 +5751,15 @@
Name[br]=Diverrañ
Name[bs]=Sažetak
Name[ca]=Resum
-@@ -39,6 +40,7 @@
+@@ -24,6 +25,7 @@
+ Name[et]=Kokkuvõte
+ Name[fi]=Yhteenveto
+ Name[fr]=Résumé
++Name[ga]=Achoimre
+ Name[gl]=Resumo
+ Name[he]=תקציר
+ Name[hi]=सारांश
+@@ -39,6 +41,7 @@
Name[pt_BR]=Resumo
Name[ro]=Sumar
Name[ru]=Дайджест
@@ -4258,7 +5767,7 @@
Name[sk]=Súhrn
Name[sl]=Povzetek
Name[sr]=Сажетак
-@@ -51,6 +53,7 @@
+@@ -51,6 +54,7 @@
Name[uz]=Ҳисобот
Name[zh_CN]=概览
Comment=General Configuration of Kontact's Summary View
@@ -4270,10 +5779,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/plugins/summary/summaryplugin.desktop,v
retrieving revision 1.43.2.5
-retrieving revision 1.43.2.7
-diff -u -r1.43.2.5 -r1.43.2.7
+retrieving revision 1.43.2.8
+diff -u -r1.43.2.5 -r1.43.2.8
--- kontact/plugins/summary/summaryplugin.desktop 28 Nov 2004 08:34:02 -0000 1.43.2.5
-+++ kontact/plugins/summary/summaryplugin.desktop 9 Jan 2005 07:49:24 -0000 1.43.2.7
++++ kontact/plugins/summary/summaryplugin.desktop 26 Jan 2005 08:10:32 -0000 1.43.2.8
@@ -13,6 +13,7 @@
X-KDE-PluginInfo-EnabledByDefault=true
@@ -4298,7 +5807,15 @@
Name[br]=Diverrañ
Name[bs]=Sažetak
Name[ca]=Resum
-@@ -77,6 +80,7 @@
+@@ -62,6 +65,7 @@
+ Name[et]=Kokkuvõte
+ Name[fi]=Yhteenveto
+ Name[fr]=Résumé
++Name[ga]=Achoimre
+ Name[gl]=Resumo
+ Name[he]=תקציר
+ Name[hi]=सारांश
+@@ -77,6 +81,7 @@
Name[pt_BR]=Resumo
Name[ro]=Sumar
Name[ru]=Дайджест
@@ -4430,10 +5947,10 @@
===================================================================
RCS file: /home/kde/kdepim/kontact/src/kontact.setdlg,v
retrieving revision 1.61.2.5
-retrieving revision 1.61.2.8
-diff -u -r1.61.2.5 -r1.61.2.8
+retrieving revision 1.61.2.10
+diff -u -r1.61.2.5 -r1.61.2.10
--- kontact/src/kontact.setdlg 24 Oct 2004 07:06:02 -0000 1.61.2.5
-+++ kontact/src/kontact.setdlg 9 Jan 2005 07:49:25 -0000 1.61.2.8
++++ kontact/src/kontact.setdlg 23 Feb 2005 09:00:25 -0000 1.61.2.10
@@ -1,5 +1,6 @@
[KMail]
Name=Mail
@@ -4441,7 +5958,15 @@
Name[be]=Пошта
Name[br]=Lizher
Name[ca]=Correu
-@@ -28,6 +29,7 @@
+@@ -11,6 +12,7 @@
+ Name[et]=E-post
+ Name[fi]=Sähköposti
+ Name[fr]=Messages
++Name[ga]=Ríomhphost
+ Name[gl]=Correo-e
+ Name[he]=דואר
+ Name[hi]=डाक
+@@ -28,6 +30,7 @@
Name[pt_BR]=Correio
Name[ro]=E-Mail
Name[ru]=Почта
@@ -4449,7 +5974,7 @@
Name[sk]=Pošta
Name[sl]=Pošta
Name[sr]=Пошта
-@@ -40,12 +42,15 @@
+@@ -40,12 +43,15 @@
Name[uz]=Хат-хабар
Name[zh_CN]=邮件
Comment=
@@ -4465,7 +5990,15 @@
Name[bs]=Kontakti
Name[ca]=Contactes
Name[cs]=Kontakty
-@@ -70,6 +75,7 @@
+@@ -56,6 +62,7 @@
+ Name[es]=Contactos
+ Name[et]=Kontaktid
+ Name[fi]=Kontaktit
++Name[ga]=Teagmhálacha
+ Name[gl]=Contactos
+ Name[he]=אנשי קשר
+ Name[hi]=सम्पर्कों
+@@ -70,6 +77,7 @@
Name[pt_BR]=Contatos
Name[ro]=Contacte
Name[ru]=Контакты
@@ -4473,7 +6006,7 @@
Name[sk]=Kontakty
Name[sl]=Stiki
Name[sr]=Контакти
-@@ -82,11 +88,13 @@
+@@ -82,11 +90,13 @@
Name[uz]=Алоқалар
Name[zh_CN]=联系人
Comment=
@@ -4487,7 +6020,15 @@
Name[be]=Арганізатар
Name[cs]=Organizér
Name[cy]=Trefnydd
-@@ -107,6 +115,7 @@
+@@ -94,6 +104,7 @@
+ Name[es]=Organizador
+ Name[fi]=Organisoija
+ Name[fr]=Organiseur
++Name[ga]=Eagraí
+ Name[gl]=Organizador
+ Name[he]=ארגונית
+ Name[hi]=आर्गेनाइज़र
+@@ -107,6 +118,7 @@
Name[pt_BR]=Organizador
Name[ro]=Organizator
Name[ru]=Органайзер
@@ -4495,7 +6036,7 @@
Name[sk]=Organizér
Name[sl]=Organizator
Name[ta]=அமைப்பாளர்
-@@ -114,11 +123,13 @@
+@@ -114,11 +126,13 @@
Name[uk]=Тижневик
Name[uz]=Органайзер
Comment=
@@ -4509,7 +6050,15 @@
Name[be]=Навіны
Name[br]=Keleier
Name[bs]=Usenet
-@@ -144,6 +155,7 @@
+@@ -131,6 +145,7 @@
+ Name[et]=Uudised
+ Name[fi]=Uutiset
+ Name[fr]=Nouvelles
++Name[ga]=Nuacht
+ Name[gl]=Novas
+ Name[he]=חדשות
+ Name[hi]=समाचार
+@@ -144,6 +159,7 @@
Name[pt_BR]=Notícias
Name[ro]=Ştiri
Name[ru]=Новости
@@ -4517,7 +6066,7 @@
Name[sk]=Diskusné skupiny
Name[sl]=Novice
Name[sr]=Вести
-@@ -160,6 +172,7 @@
+@@ -160,6 +176,7 @@
[KWeather]
Name=Weather
@@ -4525,7 +6074,7 @@
Name[be]=Надвор'е
Name[br]=Amzer
Name[bs]=Vrijeme
-@@ -188,6 +201,7 @@
+@@ -188,6 +205,7 @@
Name[pt_BR]=Tempo
Name[ro]=Vreme
Name[ru]=Погода
@@ -4533,7 +6082,7 @@
Name[sk]=Počasie
Name[sl]=Vreme
Name[sr]=Време
-@@ -200,6 +214,7 @@
+@@ -200,6 +218,7 @@
Name[uz]=Об-ҳаво
Name[zh_CN]=天气
Comment=
@@ -4541,7 +6090,7 @@
Weight=60
Icon=kweather
-@@ -250,5 +265,6 @@
+@@ -250,5 +269,6 @@
Name[zh_CN]=新闻点点通
Name[zu]=Umlungiseleli Wezindaba
Comment=
@@ -4798,10 +6347,10 @@
===================================================================
RCS file: /home/kde/kdepim/korganizer/Attic/configprinting.desktop,v
retrieving revision 1.47.2.3
-retrieving revision 1.47.2.5
-diff -u -r1.47.2.3 -r1.47.2.5
+retrieving revision 1.47.2.6
+diff -u -r1.47.2.3 -r1.47.2.6
--- korganizer/configprinting.desktop 29 Sep 2004 14:06:36 -0000 1.47.2.3
-+++ korganizer/configprinting.desktop 9 Jan 2005 07:49:26 -0000 1.47.2.5
++++ korganizer/configprinting.desktop 23 Feb 2005 09:00:26 -0000 1.47.2.6
@@ -13,6 +13,7 @@
X-KDE-CfgDlgHierarchy=KOrganizer
@@ -4810,7 +6359,15 @@
Name[be]=Друк
Name[bg]=Печат
Name[br]=O voullañ
-@@ -42,6 +43,7 @@
+@@ -27,6 +28,7 @@
+ Name[et]=Trükkimine
+ Name[fi]=Tulostaminen
+ Name[fr]=Impression
++Name[ga]=Priontáil
+ Name[gl]=Impresión
+ Name[he]=הדפסה
+ Name[hi]=छपाई
+@@ -42,6 +44,7 @@
Name[pt_BR]=Impressão
Name[ro]=Tipărire
Name[ru]=Печать
@@ -4818,7 +6375,7 @@
Name[sk]=Tlač
Name[sl]=Tiskanje
Name[sr]=Штампање
-@@ -54,6 +56,7 @@
+@@ -54,6 +57,7 @@
Name[uz]=Босиб чиқариш
Name[zh_CN]=打印
Comment=KOrganizer Printing Configuration
@@ -4826,7 +6383,7 @@
Comment[be]=Канфігурацыя друку "K Арганізатара"
Comment[bg]=Настройки на печат за KOrganizer
Comment[bs]=KOrganizer podešavanje štampe
-@@ -93,6 +96,7 @@
+@@ -93,6 +97,7 @@
Comment[uk]=Налаштування друку в KOrganizer
Comment[zh_CN]=KOrganizer 打印配置
Keywords=korganizer,printing
@@ -5206,10 +6763,10 @@
===================================================================
RCS file: /home/kde/kdepim/korganizer/Attic/korganizer_configprinting.desktop,v
retrieving revision 1.15.2.3
-retrieving revision 1.15.2.5
-diff -u -r1.15.2.3 -r1.15.2.5
+retrieving revision 1.15.2.6
+diff -u -r1.15.2.3 -r1.15.2.6
--- korganizer/korganizer_configprinting.desktop 29 Sep 2004 14:06:37 -0000 1.15.2.3
-+++ korganizer/korganizer_configprinting.desktop 9 Jan 2005 07:49:26 -0000 1.15.2.5
++++ korganizer/korganizer_configprinting.desktop 23 Feb 2005 09:00:26 -0000 1.15.2.6
@@ -13,6 +13,7 @@
X-KDE-CfgDlgHierarchy=KOrganizer
@@ -5218,7 +6775,15 @@
Name[be]=Друк
Name[bg]=Печат
Name[br]=O voullañ
-@@ -42,6 +43,7 @@
+@@ -27,6 +28,7 @@
+ Name[et]=Trükkimine
+ Name[fi]=Tulostaminen
+ Name[fr]=Impression
++Name[ga]=Priontáil
+ Name[gl]=Impresión
+ Name[he]=הדפסה
+ Name[hi]=छपाई
+@@ -42,6 +44,7 @@
Name[pt_BR]=Impressão
Name[ro]=Tipărire
Name[ru]=Печать
@@ -5226,7 +6791,7 @@
Name[sk]=Tlač
Name[sl]=Tiskanje
Name[sr]=Штампање
-@@ -54,6 +56,7 @@
+@@ -54,6 +57,7 @@
Name[uz]=Босиб чиқариш
Name[zh_CN]=打印
Comment=KOrganizer Printing Configuration
@@ -5234,7 +6799,7 @@
Comment[be]=Канфігурацыя друку "K Арганізатара"
Comment[bg]=Настройки на печат за KOrganizer
Comment[bs]=KOrganizer podešavanje štampe
-@@ -93,6 +96,7 @@
+@@ -93,6 +97,7 @@
Comment[uk]=Налаштування друку в KOrganizer
Comment[zh_CN]=KOrganizer 打印配置
Keywords=korganizer,printing
@@ -5552,10 +7117,10 @@
===================================================================
RCS file: /home/kde/kdepim/kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop,v
retrieving revision 1.152.2.2
-retrieving revision 1.152.2.5
-diff -u -r1.152.2.2 -r1.152.2.5
+retrieving revision 1.152.2.6
+diff -u -r1.152.2.2 -r1.152.2.6
--- kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop 24 Oct 2004 07:06:06 -0000 1.152.2.2
-+++ kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop 9 Jan 2005 07:49:27 -0000 1.152.2.5
++++ kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop 26 Jan 2005 08:10:32 -0000 1.152.2.6
@@ -2,6 +2,7 @@
Encoding=UTF-8
Type=Service
@@ -5564,7 +7129,15 @@
Comment[bg]=Синхронизация на адресника на КДЕ с мобилни устройства
Comment[bs]=Ovaj conduit sinhronizuje adresar ručnog računara sa KDEovim adresarom.
Comment[ca]=Aquest conducte sincronitza la llibreta d'adreces de la vostra agenda electrònica amb la llibreta d'adreces de KDE.
-@@ -62,7 +63,6 @@
+@@ -52,6 +53,7 @@
+ Name[eu]=Helbide Liburuxka
+ Name[fi]=Osoitekirja
+ Name[fr]=Carnet d'adresses
++Name[ga]=Leabhar Seoltaí
+ Name[gl]=Libro de enderezos
+ Name[he]=פנקס כתובות
+ Name[hi]=पता-पुस्तिका
+@@ -62,7 +64,6 @@
Name[it]=Rubrica degli indirizzi
Name[ja]=アドレス帳
Name[lt]=Adresų Knyga
@@ -5572,7 +7145,7 @@
Name[nb]=Addressebok
Name[nl]=Adresboek
Name[nn]=Adressebok
-@@ -71,6 +71,7 @@
+@@ -71,6 +72,7 @@
Name[pt_BR]=Livro de Endereços
Name[ro]=Carte de adrese
Name[ru]=Адресная книга
@@ -5745,10 +7318,10 @@
===================================================================
RCS file: /home/kde/kdepim/kpilot/conduits/popmail/popmail-conduit.desktop,v
retrieving revision 1.136.2.3
-retrieving revision 1.136.2.5
-diff -u -r1.136.2.3 -r1.136.2.5
+retrieving revision 1.136.2.6
+diff -u -r1.136.2.3 -r1.136.2.6
--- kpilot/conduits/popmail/popmail-conduit.desktop 24 Oct 2004 07:06:07 -0000 1.136.2.3
-+++ kpilot/conduits/popmail/popmail-conduit.desktop 9 Jan 2005 07:49:27 -0000 1.136.2.5
++++ kpilot/conduits/popmail/popmail-conduit.desktop 26 Jan 2005 08:10:32 -0000 1.136.2.6
@@ -2,6 +2,7 @@
Encoding=UTF-8
Type=Service
@@ -5757,7 +7330,15 @@
Name[be]=Пошта
Name[br]=Lizher
Name[ca]=Correu
-@@ -30,6 +31,7 @@
+@@ -13,6 +14,7 @@
+ Name[et]=E-post
+ Name[fi]=Sähköposti
+ Name[fr]=Messages
++Name[ga]=Ríomhphost
+ Name[gl]=Correo-e
+ Name[he]=דואר
+ Name[hi]=डाक
+@@ -30,6 +32,7 @@
Name[pt_BR]=Correio
Name[ro]=E-Mail
Name[ru]=Почта
@@ -6146,10 +7727,10 @@
===================================================================
RCS file: /home/kde/kdepim/ktnef/gui/ktnef.desktop,v
retrieving revision 1.55.2.4
-retrieving revision 1.55.2.5
-diff -u -r1.55.2.4 -r1.55.2.5
+retrieving revision 1.55.2.6
+diff -u -r1.55.2.4 -r1.55.2.6
--- ktnef/gui/ktnef.desktop 24 Oct 2004 07:06:09 -0000 1.55.2.4
-+++ ktnef/gui/ktnef.desktop 29 Dec 2004 21:45:12 -0000 1.55.2.5
++++ ktnef/gui/ktnef.desktop 23 Feb 2005 09:00:26 -0000 1.55.2.6
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=TNEF File Viewer
@@ -6157,7 +7738,15 @@
Name[bg]=Преглед на файлове TNEF
Name[bs]=Preglednik TNEF datoteka
Name[ca]=Visor fitxer TNEF
-@@ -41,6 +42,7 @@
+@@ -12,6 +13,7 @@
+ Name[et]=TNEF failide näitaja
+ Name[fi]=TNEF-tiedostonäyttäjä
+ Name[fr]=Afficheur de fichiers TNEF
++Name[ga]=Amharcán Comhad TNEF
+ Name[he]=מציג קבצי TNEF
+ Name[hi]=टीएनईएफ फ़ाइल प्रदर्शक
+ Name[hr]=Preglednik TNEF datoteka
+@@ -41,6 +43,7 @@
Type=Application
DocPath=ktnef/index.html
Comment=A viewer/extractor for TNEF files
@@ -6169,10 +7758,10 @@
===================================================================
RCS file: /home/kde/kdepim/ktnef/gui/ms-tnef.desktop,v
retrieving revision 1.41.2.3
-retrieving revision 1.41.2.4
-diff -u -r1.41.2.3 -r1.41.2.4
+retrieving revision 1.41.2.5
+diff -u -r1.41.2.3 -r1.41.2.5
--- ktnef/gui/ms-tnef.desktop 22 Nov 2004 08:35:08 -0000 1.41.2.3
-+++ ktnef/gui/ms-tnef.desktop 29 Dec 2004 21:45:12 -0000 1.41.2.4
++++ ktnef/gui/ms-tnef.desktop 26 Jan 2005 08:10:33 -0000 1.41.2.5
@@ -4,6 +4,7 @@
Icon=tar
Patterns=*.tnf;
@@ -6181,6 +7770,14 @@
Comment[be]=TNEF файл
Comment[bg]=Файл TNEF
Comment[br]=Restr TNEF
+@@ -17,6 +18,7 @@
+ Comment[et]=TNEF fail
+ Comment[fi]=TNEF-tiedosto
+ Comment[fr]=Fichier TNEF
++Comment[ga]=Comhad TNEF
+ Comment[he]=קובץ TNEF
+ Comment[hi]=टीएनईएफ फ़ाइल
+ Comment[hr]=TNEF datoteka
Index: libical/src/libicalss/icalclassify.c
===================================================================
RCS file: /home/kde/kdepim/libical/src/libicalss/Attic/icalclassify.c,v
@@ -8657,6 +10254,35 @@
enum LexMode {
L_NORMAL,
+Index: libkdenetwork/kpgp.cpp
+===================================================================
+RCS file: /home/kde/kdepim/libkdenetwork/Attic/kpgp.cpp,v
+retrieving revision 1.68
+retrieving revision 1.68.2.1
+diff -u -r1.68 -r1.68.2.1
+--- libkdenetwork/kpgp.cpp 28 Jun 2004 17:33:27 -0000 1.68
++++ libkdenetwork/kpgp.cpp 10 Feb 2005 13:42:23 -0000 1.68.2.1
+@@ -110,7 +110,10 @@
+ storePass = config->readBoolEntry("storePass", false);
+ showEncryptionResult = config->readBoolEntry("showEncryptionResult", true);
+ mShowKeyApprovalDlg = config->readBoolEntry( "showKeysForApproval", true );
+- pgpType = (Module::PGPType) config->readNumEntry("pgpType", tAuto);
++ // We have no config GUI for this key anymore, and the KPGP backend isn't ported,
++ // so let's just use Auto all the time. See #92619.
++ ///pgpType = (Module::PGPType) config->readNumEntry("pgpType", tAuto);
++ pgpType = tAuto;
+ flagEncryptToSelf = config->readBoolEntry("encryptToSelf", true);
+ }
+
+@@ -120,7 +123,7 @@
+ config->writeEntry("storePass", storePass);
+ config->writeEntry("showEncryptionResult", showEncryptionResult);
+ config->writeEntry( "showKeysForApproval", mShowKeyApprovalDlg );
+- config->writeEntry("pgpType", (int) pgpType);
++ //config->writeEntry("pgpType", (int) pgpType);
+ config->writeEntry("encryptToSelf", flagEncryptToSelf);
+
+ if(sync)
Index: libkdepim/addresseelineedit.cpp
===================================================================
RCS file: /home/kde/kdepim/libkdepim/addresseelineedit.cpp,v
@@ -8984,6 +10610,22 @@
// I don't like QPtrList much, but it has compareItems, which QValueList doesn't
class CompletionItemList : public QPtrList<CompletionItem>
+Index: libkdepim/komposer/core/komposerconfig.desktop
+===================================================================
+RCS file: /home/kde/kdepim/libkdepim/komposer/core/komposerconfig.desktop,v
+retrieving revision 1.25.2.1
+retrieving revision 1.25.2.2
+diff -u -r1.25.2.1 -r1.25.2.2
+--- libkdepim/komposer/core/komposerconfig.desktop 24 Aug 2004 06:32:56 -0000 1.25.2.1
++++ libkdepim/komposer/core/komposerconfig.desktop 26 Jan 2005 08:10:33 -0000 1.25.2.2
+@@ -25,6 +25,7 @@
+ Comment[da]=KDE Brevskriver
+ Comment[de]=KDE-Komposer
+ Comment[fr]=Komposer KDE
++Comment[ga]=Komposer KDE
+ Comment[hi]=केडीई कम्पोज़र
+ Comment[nn]=KDE, tekstredigerar for e-post
+ Comment[pl]=Komposer dla KDE
Index: libkdepim/komposer/core/komposereditor.desktop
===================================================================
RCS file: /home/kde/kdepim/libkdepim/komposer/core/komposereditor.desktop,v