[Pkg-kde-commits] rev 1646 -
branches/kde-3.4.0/packages/kdepim/debian/patches
Daniel Schepler
schepler at costa.debian.org
Thu Sep 1 22:49:27 UTC 2005
Author: schepler
Date: 2005-09-01 22:49:26 +0000 (Thu, 01 Sep 2005)
New Revision: 1646
Added:
branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050901.diff
Removed:
branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050829.diff
Log:
Update branch pull.
Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050829.diff
Copied: branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050901.diff (from rev 1640, branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050829.diff)
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050829.diff 2005-09-01 21:14:22 UTC (rev 1640)
+++ branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050901.diff 2005-09-01 22:49:26 UTC (rev 1646)
@@ -0,0 +1,2058 @@
+Index: akregator/ChangeLog
+===================================================================
+--- akregator/ChangeLog (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ akregator/ChangeLog (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -2,6 +2,14 @@
+ ===================
+ (c) 2004, 2005 the Akregator authors.
+
++Changes after 1.1.2
++-----------------------------
++
++Changes:
++ - unbreak parsing for Atom 1.0 -fo
++ - enable interval fetching (every 30 minutes) by default -fo
++ - switch quick filter behaviour back to 3.4.0 style (donÃn't reset the filter when switching feeds-fo
++
+ Changes after 1.1
+ -----------------------------
+
+Index: akregator/src/pageviewer.cpp
+===================================================================
+--- akregator/src/pageviewer.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ akregator/src/pageviewer.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -361,7 +361,7 @@
+ if (copylinkaddress)
+ {
+ copylinkaddress->plug( &popup);
+- popup.insertSeparator();
++ //popup.insertSeparator();
+ }
+ }
+ else // we are not on a link
+Index: akregator/src/trayicon.h
+===================================================================
+--- akregator/src/trayicon.h (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ akregator/src/trayicon.h (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -32,7 +32,7 @@
+
+ namespace Akregator
+ {
+- class TrayIcon : public KSystemTray
++ class KDE_EXPORT TrayIcon : public KSystemTray
+ {
+ Q_OBJECT
+ public:
+Index: akregator/src/akregator.kcfg
+===================================================================
+--- akregator/src/akregator.kcfg (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ akregator/src/akregator.kcfg (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -107,7 +107,7 @@
+ <entry key="Use Interval Fetch" type="Bool" >
+ <label>Use interval fetching</label>
+ <whatsthis>Fetch all feeds every %1 minutes.</whatsthis>
+- <default>false</default>
++ <default>true</default>
+ </entry>
+ <entry key="Auto Fetch Interval" type="Int" >
+ <label>Interval for autofetching</label>
+Index: akregator/src/aboutdata.h
+===================================================================
+--- akregator/src/aboutdata.h (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ akregator/src/aboutdata.h (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -28,7 +28,7 @@
+ #include <kaboutdata.h>
+ #include <kdepimmacros.h>
+
+-#define AKREGATOR_VERSION "1.1.2"
++#define AKREGATOR_VERSION "1.1.3"
+
+ namespace Akregator {
+ /**
+Index: akregator/src/librss/global.h
+===================================================================
+--- akregator/src/librss/global.h (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ akregator/src/librss/global.h (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -34,7 +34,8 @@
+ v2_0, /// RSS v2.0
+ vAtom_0_1, /// Atom v0.1
+ vAtom_0_2, /// Atom v0.2
+- vAtom_0_3 /// Atom v0.3
++ vAtom_0_3, /// Atom v0.3
++ vAtom_1_0 /// Atom v1.0
+ };
+
+ /**
+Index: akregator/src/librss/document.cpp
+===================================================================
+--- akregator/src/librss/document.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ akregator/src/librss/document.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -22,6 +22,8 @@
+ #include <qdom.h>
+ #include <qptrlist.h>
+
++#include <kdebug.h>
++
+ using namespace RSS;
+
+ struct Document::Private : public Shared
+@@ -85,33 +87,34 @@
+ d->valid=true;
+
+ attr = rootNode.toElement().attribute(QString::fromLatin1("version"), QString::null);
+- if (!attr.isNull()) {
+- if (rootNode.toElement().tagName()=="feed")
+- {
+- d->format=AtomFeed;
+- if (attr == QString::fromLatin1("0.3"))
+- d->version = vAtom_0_3;
+- else if (attr == QString::fromLatin1("0.2")) /* smt -> review */
+- d->version = vAtom_0_2;
+- else if (attr == QString::fromLatin1("0.1")) /* smt -> review */
+- d->version = vAtom_0_1;
++ if (rootNode.toElement().tagName()==QString::fromLatin1("feed"))
++ {
++ d->format=AtomFeed;
++ if (attr == QString::fromLatin1("0.3"))
++ d->version = vAtom_0_3;
++ else if (attr == QString::fromLatin1("0.2")) /* smt -> review */
++ d->version = vAtom_0_2;
++ else if (attr == QString::fromLatin1("0.1")) /* smt -> review */
++ d->version = vAtom_0_1;
++ else if (attr.isEmpty())
++ d->version = vAtom_1_0;
+ }
+- else
+- {
+- d->format=RSSFeed;
+- if (attr == QString::fromLatin1("0.91"))
+- d->version = v0_91;
+- else if (attr == QString::fromLatin1("0.92"))
+- d->version = v0_92;
+- else if (attr == QString::fromLatin1("0.93"))
+- d->version = v0_93;
+- else if (attr == QString::fromLatin1("0.94"))
+- d->version = v0_94;
+- else if (attr.startsWith("2.0") || attr == QString::fromLatin1("2")) // http://www.breuls.org/rss puts 2.00 in version (BR #0000016)
+- d->version = v2_0;
+- }
++ else
++ {
++ d->format=RSSFeed;
++ if (attr == QString::fromLatin1("0.91"))
++ d->version = v0_91;
++ else if (attr == QString::fromLatin1("0.92"))
++ d->version = v0_92;
++ else if (attr == QString::fromLatin1("0.93"))
++ d->version = v0_93;
++ else if (attr == QString::fromLatin1("0.94"))
++ d->version = v0_94;
++ else if (attr.startsWith("2.0") || attr == QString::fromLatin1("2")) // http://www.breuls.org/rss puts 2.00 in version (BR #0000016)
++ d->version = v2_0;
+ }
+-
++
++
+ if (d->format==UnknownFormat)
+ {
+ attr = rootNode.toElement().attribute(QString::fromLatin1("xmlns"), QString::null);
+@@ -134,7 +137,7 @@
+ }
+ }
+ }
+-
++
+ QDomNode channelNode;
+
+ if (d->format == AtomFeed)
+@@ -184,7 +187,7 @@
+ for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
+ const QDomElement e = n.toElement();
+ if (e.tagName() == tagName)
+- d->articles.append(Article(e, d->format));
++ d->articles.append(Article(e, d->format, d->version));
+ }
+
+ if (!(elemText = extractNode(channelNode, QString::fromLatin1("copyright"))).isNull())
+@@ -506,6 +509,7 @@
+ case vAtom_0_3: return QString::fromLatin1("0.3");
+ case vAtom_0_2: return QString::fromLatin1("0.2");
+ case vAtom_0_1: return QString::fromLatin1("0.1");
++ case vAtom_1_0: return QString::fromLatin1("1.0");
+ }
+ return QString::null;
+ }
+Index: akregator/src/librss/article.cpp
+===================================================================
+--- akregator/src/librss/article.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ akregator/src/librss/article.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -48,7 +48,7 @@
+ *this = other;
+ }
+
+-Article::Article(const QDomNode &node, Format format) : d(new Private)
++Article::Article(const QDomNode &node, Format format, Version version) : d(new Private)
+ {
+ QString elemText;
+
+@@ -99,9 +99,13 @@
+
+ if (format == AtomFeed)
+ {
++ if (version == vAtom_1_0)
++ elemText = extractNode(node, QString::fromLatin1("updated"));
++ else
+ elemText = extractNode(node, QString::fromLatin1("issued"));
+- if (!elemText.isNull())
+- time = parseISO8601Date(elemText);
++
++ if (!elemText.isNull())
++ time = parseISO8601Date(elemText);
+ }
+ else
+ {
+Index: akregator/src/librss/article.h
+===================================================================
+--- akregator/src/librss/article.h (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ akregator/src/librss/article.h (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -55,7 +55,7 @@
+ * @param node A QDomNode which references the DOM leaf to be used
+ * for constructing the Article.
+ */
+- Article(const QDomNode &node, Format format);
++ Article(const QDomNode &node, Format format, Version version);
+
+ /**
+ * Assignment operator.
+Index: akregator/src/akregator_view.cpp
+===================================================================
+--- akregator/src/akregator_view.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ akregator/src/akregator_view.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -248,9 +248,6 @@
+ m_feedSplitter->setSizes( Settings::splitter1Sizes() );
+ m_articleSplitter->setSizes( Settings::splitter2Sizes() );
+
+- m_searchCombo->setCurrentItem(Settings::quickFilter());
+- slotSearchComboChanged(Settings::quickFilter());
+-
+ switch (Settings::viewMode())
+ {
+ case CombinedView:
+@@ -269,6 +266,9 @@
+ m_tabs->setTitle(i18n("About"), m_mainTab);
+ m_displayingAboutPage = true;
+
++ m_searchCombo->setCurrentItem(Settings::quickFilter());
++ slotSearchComboChanged(Settings::quickFilter());
++
+ m_fetchTimer=new QTimer(this);
+ connect( m_fetchTimer, SIGNAL(timeout()), this, SLOT(slotDoIntervalFetches()) );
+ m_fetchTimer->start(1000*60);
+@@ -843,7 +843,7 @@
+
+ m_tabs->showPage(m_mainTab);
+
+- slotClearFilter();
++ //slotClearFilter();
+
+ if (m_viewMode == CombinedView)
+ m_articleViewer->slotShowNode(node);
+@@ -1344,11 +1344,8 @@
+
+ void View::slotSearchComboChanged(int index)
+ {
+- if (index != Settings::quickFilter())
+- {
+- Settings::setQuickFilter( index );
+- updateSearch();
+- }
++ Settings::setQuickFilter( index );
++ updateSearch();
+ }
+
+ // from klistviewsearchline
+Index: kode/kxml_compiler/kxml_compiler.cpp
+===================================================================
+--- kode/kxml_compiler/kxml_compiler.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kode/kxml_compiler/kxml_compiler.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -167,7 +167,7 @@
+
+ KODE::Printer printer;
+ printer.setCreationWarning( true );
+- printer.setGenerator( "kxml_compiler" );
++ printer.setGenerator( KCmdLineArgs::cwd() + KCmdLineArgs::appName() );
+ printer.setOutputDirectory( baseDir );
+ printer.setSourceFile( args->url( 0 ).fileName() );
+
+Index: kresources/egroupware/kabc_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/kabc_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/egroupware/kabc_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -11,6 +11,7 @@
+ Name[et]=eGroupware server (XML-RPC vahendusel)
+ Name[eu]=eGroupware zerbitzaria (XML-RPC bidez)
+ Name[fr]=Serveur eGroupware (via XML-RPC)
++Name[ga]=Freastalaà eGroupware (via XML-RPC)
+ Name[hu]=eGroupware-kiszolgáló (XML-RPC-n keresztül)
+ Name[is]=eGroupware þjónn (gegnum XML-RPC)
+ Name[it]=Server eGroupware (via XML-RPC)
+Index: kresources/egroupware/knotes_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/knotes_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/egroupware/knotes_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -11,6 +11,7 @@
+ Name[et]=eGroupware server (XML-RPC vahendusel)
+ Name[eu]=eGroupware zerbitzaria (XML-RPC bidez)
+ Name[fr]=Serveur eGroupware (via XML-RPC)
++Name[ga]=Freastalaà eGroupware (via XML-RPC)
+ Name[hu]=eGroupware-kiszolgáló (XML-RPC-n keresztül)
+ Name[is]=eGroupware þjónn (gegnum XML-RPC)
+ Name[it]=Server eGroupware (via XML-RPC)
+Index: kresources/egroupware/kcal_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/kcal_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/egroupware/kcal_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -11,6 +11,7 @@
+ Name[et]=eGroupware server (XML-RPC vahendusel)
+ Name[eu]=eGroupware zerbitzaria (XML-RPC bidez)
+ Name[fr]=Serveur eGroupware (via XML-RPC)
++Name[ga]=Freastalaà eGroupware (via XML-RPC)
+ Name[hu]=eGroupware-kiszolgáló (XML-RPC-n keresztül)
+ Name[is]=eGroupware þjónn (gegnum XML-RPC)
+ Name[it]=Server eGroupware (via XML-RPC)
+Index: kresources/exchange/exchange.desktop
+===================================================================
+--- kresources/exchange/exchange.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/exchange/exchange.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -17,6 +17,7 @@
+ Name[et]=Exchange 2000 server
+ Name[eu]=Exchange 2000 zerbitzaria
+ Name[fr]=Serveur Exchange2000
++Name[ga]=Freastalaà Exchange 2000
+ Name[hi]=à¤à¤•à¥à¤¸à¤šà¥‡à¤‚ज2000 सरà¥à¤µà¤°
+ Name[hu]=Exchange 2000-kiszolgáló
+ Name[is]=Exchange 2000 þjónn
+Index: kresources/slox/kcal_slox.desktop
+===================================================================
+--- kresources/slox/kcal_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/slox/kcal_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -11,6 +11,7 @@
+ Name[et]=SUSE LINUX Openexchange server
+ Name[eu]=SUSE LINUX Openexchange zerbitzaria
+ Name[fr]=Serveur SUSE Linux Openexchange
++Name[ga]=Freastalaà Openexchange SUSE LINUX
+ Name[hu]=SUSE LINUX Openexchange-kiszolgáló
+ Name[is]=SUSE LINUX Openexchange þjónn
+ Name[it]=Server SUSE LINUX Openexchange
+Index: kresources/slox/webdavhandler.cpp
+===================================================================
+--- kresources/slox/webdavhandler.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/slox/webdavhandler.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -28,6 +28,8 @@
+ #endif
+ #endif
+
++#include <stdlib.h>
++
+ #include <libkcal/incidence.h>
+
+ #include <libkdepim/kpimprefs.h>
+@@ -150,7 +152,16 @@
+ {
+ QDateTime utc = KPimPrefs::localTimeToUtc( dt, timeZoneId );
+
+- uint ticks = -utc.secsTo( QDateTime( QDate( 1970, 1, 1 ), QTime( 0, 0 ) ) );
++ // secsTo and toTime_t etc also perform a timezone conversion using the system timezone,
++ // but we want to use the calendar timezone, so we have to convert ourself and spoof the tz to UTC before
++ // converting to ticks to prevent this
++ QCString origTz = getenv("TZ");
++ setenv( "TZ", "UTC", 1 );
++ uint ticks = utc.toTime_t();
++ if ( origTz.isNull() )
++ unsetenv( "TZ" );
++ else
++ setenv( "TZ", origTz, 1 );
+
+ return QString::number( ticks ) + "000";
+ }
+Index: kresources/slox/kabc_slox.desktop
+===================================================================
+--- kresources/slox/kabc_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/slox/kabc_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -11,6 +11,7 @@
+ Name[et]=SUSE LINUX Openexchange server
+ Name[eu]=SUSE LINUX Openexchange zerbitzaria
+ Name[fr]=Serveur SUSE Linux Openexchange
++Name[ga]=Freastalaà Openexchange SUSE LINUX
+ Name[hu]=SUSE LINUX Openexchange-kiszolgáló
+ Name[is]=SUSE LINUX Openexchange þjónn
+ Name[it]=Server SUSE LINUX Openexchange
+Index: kresources/groupdav/kabc_groupdav.desktop
+===================================================================
+--- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -12,6 +12,7 @@
+ Name[et]=GroupDAV server (nt. OpenGroupware)
+ Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware)
+ Name[fr]=GroupDAV Serveur (ex. OpenGroupware)
++Name[ga]=Freastalaà GroupDAV (m.sh. OpenGroupware)
+ Name[hu]=GroupDAV-kiszolgáló (pl. OpenGroupware)
+ Name[is]=GroupDAV þjónn (t.d. OpenGroupware)
+ Name[it]=Server GroupDAV (per es. OpenGroupware)
+Index: kresources/groupdav/kcal_groupdav.desktop
+===================================================================
+--- kresources/groupdav/kcal_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/groupdav/kcal_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -12,6 +12,7 @@
+ Name[et]=GroupDAV server (nt. OpenGroupware)
+ Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware)
+ Name[fr]=GroupDAV Serveur (ex. OpenGroupware)
++Name[ga]=Freastalaà GroupDAV (m.sh. OpenGroupware)
+ Name[hu]=GroupDAV-kiszolgáló (pl. OpenGroupware)
+ Name[is]=GroupDAV þjónn (t.d. OpenGroupware)
+ Name[it]=Server GroupDAV (per es. OpenGroupware)
+Index: kresources/kolab/kabc/kolab.desktop
+===================================================================
+--- kresources/kolab/kabc/kolab.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/kolab/kabc/kolab.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -12,6 +12,7 @@
+ Name[et]=Aadressiraamat IMAP-serveril (KMaili vahendusel)
+ Name[eu]=Helbide-liburua IMAP zerbitzarian KMail-en bidez
+ Name[fr]=Carnet d'adresse sur serveur IMAP (via KMail)
++Name[ga]=Leabhar Seoltaà ar Fhreastalaà IMAP via KMail
+ Name[hu]=IMAP-kiszolgálón tárolt cÃmjegyzék a KMailen keresztül
+ Name[is]=Vistfangaskrá á IMAP þjóni gegnum KMail
+ Name[it]=Rubrica indirizzi su server IMAP via KMail
+Index: kresources/kolab/knotes/kolabresource.desktop
+===================================================================
+--- kresources/kolab/knotes/kolabresource.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/kolab/knotes/kolabresource.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -12,6 +12,7 @@
+ Name[et]=IMAP-server (KMaili vahendusel)
+ Name[eu]=IMAP zerbitzaria KMail-en bidez
+ Name[fr]=Serveur IMAP (via KMail)
++Name[ga]=Freastalaà IMAP via KMail
+ Name[hu]=IMAP-kiszolgáló a KMailen keresztül
+ Name[is]=IMAP þjónn gegnum KMail
+ Name[it]=Server IMAP via KMail
+Index: kresources/kolab/kcal/kolab.desktop
+===================================================================
+--- kresources/kolab/kcal/kolab.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/kolab/kcal/kolab.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -12,6 +12,7 @@
+ Name[et]=Kalender IMAP-serveril (KMaili vahendusel)
+ Name[eu]=Egutegia IMAP zerbitzarian KMail-en bidez
+ Name[fr]=Agenda sur serveur IMAP (via KMail)
++Name[ga]=Féilire ar Fhreastalaà IMAP via KMail
+ Name[hu]=IMAP-kiszolgálón tárolt naptár a KMailen keresztül
+ Name[is]=Dagatal á IMAP þjóni gegnum KMail
+ Name[it]=Calendario su server IMAP via KMail
+Index: kresources/kolab/kcal/resourcekolab.cpp
+===================================================================
+--- kresources/kolab/kcal/resourcekolab.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -487,10 +487,18 @@
+ mUidMap[ uid ] = StorageReference( subResource, sernum );
+ } else {
+ /* This is a real add, from KMail, we didn't trigger this ourselves.
+- If this uid already exists in this folder, do conflict resolution */
++ * If this uid already exists in this folder, do conflict resolution,
++ * unless the folder is read-only, in which case the user should not be
++ * offered a means of putting mails in a folder she'll later be unable to
++ * upload. Skip the incidence, in this case. */
+ if ( mUidMap.contains( uid )
+ && ( mUidMap[ uid ].resource() == subResource ) ) {
+- resolveConflict( incidence, subResource, sernum );
++ if ( (*map)[ subResource ].writable() ) {
++ resolveConflict( incidence, subResource, sernum );
++ } else {
++ kdWarning( 5650 ) << "Duplicate event in a read-only folder detected! "
++ "Please inform the owner of the folder. " << endl;
++ }
+ return true;
+ }
+ /* Add to the cache if the add didn't come from KOrganizer, in which case
+Index: kresources/groupware/kabc_groupware.desktop
+===================================================================
+--- kresources/groupware/kabc_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/groupware/kabc_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -10,6 +10,7 @@
+ Name[et]=Grupitöö server
+ Name[eu]=Groupware zerbitzaria
+ Name[fr]=Serveur de travail collaboratif
++Name[ga]=Freastalaà Groupware
+ Name[hi]=गà¥à¤°à¥à¤ªà¤µà¥‡à¤¯à¤° सरà¥à¤µà¤°
+ Name[hu]=Groupware kiszolgáló
+ Name[is]=Groupware þjónn
+Index: kresources/groupware/kcal_groupware.desktop
+===================================================================
+--- kresources/groupware/kcal_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/groupware/kcal_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -10,6 +10,7 @@
+ Name[et]=Grupitöö server
+ Name[eu]=Groupware zerbitzaria
+ Name[fr]=Serveur de travail collaboratif
++Name[ga]=Freastalaà Groupware
+ Name[hi]=गà¥à¤°à¥à¤ªà¤µà¥‡à¤¯à¤° सरà¥à¤µà¤°
+ Name[hu]=Groupware kiszolgáló
+ Name[is]=Groupware þjónn
+Index: kresources/remote/remote.desktop
+===================================================================
+--- kresources/remote/remote.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/remote/remote.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -15,6 +15,7 @@
+ Name[eu]=Egutegia urruneko fitxategi batean
+ Name[fi]=Kalenteri etätiedostossa
+ Name[fr]=Calendrier dans un fichier distant
++Name[ga]=Féilire i gCianchomhad
+ Name[hi]=रिमोट फ़ाइल में कैलेनà¥à¤¡à¤°
+ Name[hu]=Távoli fájlban tárolt naptár
+ Name[is]=Dagatal à fjarlægri skrá
+Index: kresources/newexchange/kcal_newexchange_final.desktop
+===================================================================
+--- kresources/newexchange/kcal_newexchange_final.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kresources/newexchange/kcal_newexchange_final.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -13,6 +13,7 @@
+ Name[et]=Kalender Exchange-serveril
+ Name[eu]=Egutegia Exchange zerbitzari batean
+ Name[fr]=Agenda sur un serveur Exchange
++Name[ga]=Féilire ar Fhreastalaà Exchange
+ Name[hu]=Exchange 2000-kiszolgáló naptára
+ Name[is]=Dagatal á Exchange þjóni
+ Name[it]=Calendario su un server Exchange
+Index: karm/taskview.h
+===================================================================
+--- karm/taskview.h (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ karm/taskview.h (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -188,7 +188,6 @@
+ void autoSavePeriodChanged( int period );
+ void minuteUpdate();
+ void itemStateChanged( QListViewItem *item );
+- void deleteItemState( QListViewItem *item );
+ void iCalFileModified(ResourceCalendar *);
+ };
+
+Index: karm/taskview.cpp
+===================================================================
+--- karm/taskview.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ karm/taskview.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -183,15 +183,6 @@
+ if( _preferences ) _preferences->writeEntry( t->uid(), t->isOpen() );
+ }
+
+-void TaskView::deleteItemState( QListViewItem *item )
+-{
+- if ( !item ) return;
+- Task *t = (Task *)item;
+- kdDebug(5970) << "TaskView:deleteItemState()"
+- << " uid=" << t->uid() << endl;
+- if( _preferences ) _preferences->deleteEntry( t->uid() );
+-}
+-
+ void TaskView::closeStorage() { _storage->closeStorage( this ); }
+
+ void TaskView::iCalFileModified(ResourceCalendar *rc)
+@@ -628,9 +619,10 @@
+ }
+ else
+ {
++ QString uid = task->uid();
+ task->remove(activeTasks, _storage);
+ task->removeFromView();
+- deleteItemState( task );
++ if ( _preferences ) _preferences->deleteEntry( uid ); // forget if the item was expanded or collapsed
+ save();
+ }
+
+Index: kmail/kmailicalifaceimpl.cpp
+===================================================================
+--- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -848,7 +848,7 @@
+ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
+ Q_UINT32 sernum )
+ {
+- if( !mUseResourceIMAP )
++ if( mResourceQuiet || !mUseResourceIMAP )
+ return;
+
+ // kdDebug(5006) << "KMailICalIfaceImpl::slotIncidenceAdded" << endl;
+Index: kmail/kmail_config_composer.desktop
+===================================================================
+--- kmail/kmail_config_composer.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmail/kmail_config_composer.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -109,7 +109,7 @@
+ Keywords[he]=kmail,כתבן
+ Keywords[hi]=के-मेल,कमà¥à¤ªà¥‹à¤œà¤¼à¤°
+ Keywords[hu]=kmail,szerkesztő
+-Keywords[is]=kmail,composer,ritill
++Keywords[is]=kmail,ritill
+ Keywords[it]=kmail,compositore
+ Keywords[lt]=kmail,composer,redaktorius
+ Keywords[nb]=kmail,komposer
+Index: kmail/partNode.cpp
+===================================================================
+--- kmail/partNode.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmail/partNode.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -36,6 +36,7 @@
+ #include "kmmimeparttree.h"
+ #include <mimelib/utility.h>
+ #include <qregexp.h>
++#include <kasciistricmp.h>
+
+ /*
+ ===========================================================================
+@@ -414,7 +415,7 @@
+ partNode* partNode::findNodeForDwPart( DwBodyPart* part )
+ {
+ partNode* found = 0;
+- if( dwPart()->partId() == part->partId() )
++ if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 )
+ return this;
+ if( mChild )
+ found = mChild->findNodeForDwPart( part );
+Index: kmail/eventsrc
+===================================================================
+--- kmail/eventsrc (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmail/eventsrc (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -10,6 +10,7 @@
+ [new-mail-arrived]
+ Name=New Mail Arrived
+ Name[bg]=Имате ново пиÑмо
++Name[br]=Deuet eo ur postel nevez
+ Name[bs]=Stigla vam je nova pošta
+ Name[ca]=Ha arribat correu nou
+ Name[cs]=Přišla nová pošta
+Index: kmail/avscripts/kmail_sav.sh
+===================================================================
+--- kmail/avscripts/kmail_sav.sh (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmail/avscripts/kmail_sav.sh (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -28,7 +28,7 @@
+ # your version.
+ #
+ TEMPFILE=`mktemp`
+-if [ $? ] ; then
++if [ $? != 0 ] ; then
+ TEMPFILE=`mktemp /tmp/kmail.XXXXXX`
+ fi
+ export TEMPFILE
+Index: kmail/avscripts/kmail_fprot.sh
+===================================================================
+--- kmail/avscripts/kmail_fprot.sh (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmail/avscripts/kmail_fprot.sh (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -28,7 +28,7 @@
+ # your version.
+ #
+ TEMPFILE=`mktemp`
+-if [ $? ] ; then
++if [ $? != 0 ] ; then
+ TEMPFILE=`mktemp /tmp/kmail.XXXXXX`
+ fi
+ export TEMPFILE
+Index: kmail/avscripts/kmail_antivir.sh
+===================================================================
+--- kmail/avscripts/kmail_antivir.sh (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmail/avscripts/kmail_antivir.sh (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -28,7 +28,7 @@
+ # your version.
+ #
+ TEMPFILE=`mktemp`
+-if [ $? ] ; then
++if [ $? != 0 ] ; then
+ TEMPFILE=`mktemp /tmp/kmail.XXXXXX`
+ fi
+ export TEMPFILE
+Index: kmail/avscripts/kmail_clamav.sh
+===================================================================
+--- kmail/avscripts/kmail_clamav.sh (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmail/avscripts/kmail_clamav.sh (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -28,7 +28,7 @@
+ # your version.
+ #
+ TEMPFILE=`mktemp`
+-if [ $? ] ; then
++if [ $? != 0 ] ; then
+ TEMPFILE=`mktemp /tmp/kmail.XXXXXX`
+ fi
+ export TEMPFILE
+Index: kmail/keyresolver.cpp
+===================================================================
+--- kmail/keyresolver.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmail/keyresolver.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -1171,6 +1171,17 @@
+ for ( uint i = 0; i < items.size(); ++i ) {
+ ContactPreferences& pref = lookupContactPreferences( items[i].address );
+ pref.encryptionPreference = items[i].pref;
++ pref.pgpKeyFingerprints.clear();
++ pref.smimeCertFingerprints.clear();
++ for ( std::vector<GpgME::Key>::const_iterator it = items[i].keys.begin(), end = items[i].keys.end() ; it != end ; ++it ) {
++ if ( it->protocol() == GpgME::Context::OpenPGP ) {
++ if ( const char * fpr = it->primaryFingerprint() )
++ pref.pgpKeyFingerprints.push_back( fpr );
++ } else if ( it->protocol() == GpgME::Context::CMS ) {
++ if ( const char * fpr = it->primaryFingerprint() )
++ pref.smimeCertFingerprints.push_back( fpr );
++ }
++ }
+ saveContactPreference( items[i].address, pref );
+ }
+ }
+Index: kmail/kmsender.cpp
+===================================================================
+--- kmail/kmsender.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmail/kmsender.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -519,8 +519,10 @@
+ .arg(mCurrentMsg->subject()));
+ if (!mSendProc->send(mCurrentMsg))
+ {
+- mCurrentMsg->setTransferInProgress( false );
+- mOutboxFolder->unGetMsg( mFailedMessages );
++ if ( mCurrentMsg )
++ mCurrentMsg->setTransferInProgress( false );
++ if ( mOutboxFolder )
++ mOutboxFolder->unGetMsg( mFailedMessages );
+ mCurrentMsg = 0;
+ cleanup();
+ setStatusMsg(i18n("Failed to send (some) queued messages."));
+@@ -596,7 +598,8 @@
+ // sending of message aborted
+ if ( mCurrentMsg ) {
+ mCurrentMsg->setTransferInProgress( false );
+- mOutboxFolder->unGetMsg( mFailedMessages );
++ if ( mOutboxFolder )
++ mOutboxFolder->unGetMsg( mFailedMessages );
+ mCurrentMsg = 0;
+ }
+ msg = i18n("Sending aborted:\n%1\n"
+@@ -610,8 +613,10 @@
+ setStatusMsg( i18n( "Sending aborted." ) );
+ } else {
+ if (!mSendProc->sendOk()) {
+- mCurrentMsg->setTransferInProgress( false );
+- mOutboxFolder->unGetMsg( mFailedMessages );
++ if ( mCurrentMsg )
++ mCurrentMsg->setTransferInProgress( false );
++ if ( mOutboxFolder )
++ mOutboxFolder->unGetMsg( mFailedMessages );
+ mCurrentMsg = 0;
+ mFailedMessages++;
+ // Sending of message failed.
+Index: knode/knode_config_identity.desktop
+===================================================================
+--- knode/knode_config_identity.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ knode/knode_config_identity.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -58,6 +58,7 @@
+ Comment=Personal Information
+ Comment[be]=ПÑÑ€ÑÐ°Ð½Ð°Ð»ÑŒÐ½Ð°Ñ Ñ–Ð½Ñ„Ð°Ñ€Ð¼Ð°Ñ†Ñ‹Ñ
+ Comment[bg]=Управление на личната информациÑ
++Comment[br]=Titouroù diouzhin
+ Comment[bs]=LiÄne informacije
+ Comment[ca]=Informació personal
+ Comment[cs]=Osobnà informace
+Index: knode/knode_config_cleanup.desktop
+===================================================================
+--- knode/knode_config_cleanup.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ knode/knode_config_cleanup.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -25,6 +25,7 @@
+ Name[eu]=Garbiketa
+ Name[fi]=Siivoaminen
+ Name[fr]=Nettoyage
++Name[ga]=Glan
+ Name[gl]=Limpeza
+ Name[hi]=साफ़-सफाई
+ Name[hu]=TisztÃtás
+Index: knode/knarticlewidget.cpp
+===================================================================
+--- knode/knarticlewidget.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ knode/knarticlewidget.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -16,6 +16,7 @@
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <cstdlib>
+ #include <unistd.h>
+
+ #include <qaccel.h>
+Index: kalarm/alarmcalendar.h
+===================================================================
+--- kalarm/alarmcalendar.h (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kalarm/alarmcalendar.h (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -46,7 +46,7 @@
+ void startUpdate();
+ void endUpdate();
+ KCal::Event* event(const QString& uniqueID) { return mCalendar ? mCalendar->event(uniqueID) : 0; }
+- KCal::Event::List events() { return mCalendar->events(); }
++ KCal::Event::List events() { return mCalendar->rawEvents(); }
+ KCal::Event::List events(const QDate& d, bool sorted = false) { return mCalendar->events(d, sorted); }
+ KCal::Event::List eventsWithAlarms(const QDateTime& from, const QDateTime& to);
+ KCal::Event* addEvent(const KAEvent&, bool useEventID = false);
+Index: Makefile.cvs
+===================================================================
+--- Makefile.cvs (.../tags/KDE/3.4.2/kdepim) (revision 0)
++++ Makefile.cvs (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -0,0 +1,16 @@
++
++all:
++ @echo "This Makefile is only for the CVS repository"
++ @echo "This will be deleted before making the distribution"
++ @echo ""
++ @if test ! -d admin; then \
++ echo "Please recheckout this module!" ;\
++ echo "for cvs: use checkout once and after that update again" ;\
++ echo "for cvsup: checkout kde-common from cvsup and" ;\
++ echo " link kde-common/admin to ./admin" ;\
++ exit 1 ;\
++ fi
++ $(MAKE) -f admin/Makefile.common cvs
++
++.SILENT:
++
+
+Property changes on: Makefile.cvs
+___________________________________________________________________
+Name: svn:keywords
+ + Author Date Id Revision
+
+Index: libemailfunctions/email.cpp
+===================================================================
+--- libemailfunctions/email.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ libemailfunctions/email.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -697,14 +697,24 @@
+ // and outside of quoted text behind the trailing '>'.
+ bInComment = false;
+ bInQuotesOutsideOfEmail = false;
++ int parenthesesNesting = 0;
+ for( i = iAd+1; len > i; ++i ) {
+ c = aStr[i];
+ if( bInComment ){
+ if( ')' == c ){
+- if( !name.isEmpty() )
+- name.append( ' ' );
+- bInComment = false;
+- }else{
++ if ( --parenthesesNesting == 0 ) {
++ bInComment = false;
++ if( !name.isEmpty() )
++ name.append( ' ' );
++ } else {
++ // nested ")", add it
++ name.append( ')' ); // name can't be empty here
++ }
++ } else {
++ if( '(' == c ) {
++ // nested "("
++ ++parenthesesNesting;
++ }
+ name.append( c ); // all comment stuff is part of the name
+ }
+ }else if( bInQuotesOutsideOfEmail ){
+@@ -730,7 +740,8 @@
+ case '(':
+ if( !name.isEmpty() )
+ name.append( ' ' );
+- bInComment = true;
++ if ( ++parenthesesNesting > 0 )
++ bInComment = true;
+ break;
+ default:
+ if( ' ' != c )
+Index: korn/KOrn.desktop
+===================================================================
+--- korn/KOrn.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korn/KOrn.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -16,6 +16,7 @@
+ GenericName[eu]=Mail abisua
+ GenericName[fi]=Saapuneen sähköpostin ilmoitus
+ GenericName[fr]=Surveillance du courrier électronique
++GenericName[ga]=Fógairt RÃomhphoist
+ GenericName[gl]=Alerta de Correo-e
+ GenericName[hi]=डाक सतरà¥à¤•
+ GenericName[hr]=Upozorenje na nove poruke
+Index: kmailcvt/filters.hxx
+===================================================================
+--- kmailcvt/filters.hxx (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmailcvt/filters.hxx (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -85,6 +85,57 @@
+ };
+
+
++
++/**
++* Glorified QString[N] for (a) understandability (b) older gcc compatibility.
++*/
++template <unsigned int size> class FolderStructureBase
++{
++public:
++ typedef QString NString[size];
++ /** Constructor. Need a default constructor for QValueList. */
++ FolderStructureBase() {} ;
++
++ /** Constructor. Turn N QStrings into a folder structure
++ * description.
++ */
++ FolderStructureBase(const NString &s)
++ {
++ for(unsigned int i=0; i<size; i++) d[i]=s[i];
++ } ;
++
++ /** Copy Constructor. */
++ FolderStructureBase(const FolderStructureBase &s)
++ {
++ for(unsigned int i=0; i<size; i++) d[i]=s[i];
++ } ;
++
++ /** Assignment operator. Does the same thing as
++ * the copy constructor.
++ */
++ FolderStructureBase &operator =(const FolderStructureBase &s)
++ {
++ for(unsigned int i=0; i<size; i++) d[i]=s[i];
++ return *this;
++ } ;
++
++ /** Access the different fields. There doesn't seem to
++ * be a real semantics for the fields.
++ */
++ const QString operator [](unsigned int i) const
++ {
++ if (i<size) return d[i]; else return QString::null;
++ } ;
++
++ /** Access the different fields, for writing. */
++ QString &operator [](unsigned int i)
++ {
++ Q_ASSERT(i<size);
++ if (i<size) return d[i]; else return d[0];
++ } ;
++private:
++ QString d[size];
++} ;
++
+ #endif
+
+-// vim: ts=2 sw=2 et
+Index: kmailcvt/filter_thunderbird.cxx
+===================================================================
+--- kmailcvt/filter_thunderbird.cxx (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmailcvt/filter_thunderbird.cxx (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -198,7 +198,7 @@
+ tmp.close();
+ first_msg = false;
+
+- QString destFolder = "";
++ QString destFolder;
+ QString _targetDir = targetDir;
+ if(!targetDir.isNull()){
+ if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd");
+Index: kmailcvt/filter_evolution_v2.cxx
+===================================================================
+--- kmailcvt/filter_evolution_v2.cxx (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmailcvt/filter_evolution_v2.cxx (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -201,7 +201,7 @@
+ tmp.close();
+ first_msg = false;
+
+- QString destFolder = "";
++ QString destFolder;
+ QString _targetDir = targetDir;
+ if(!targetDir.isNull()){
+ if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd");
+Index: kmailcvt/filter_outlook.cxx
+===================================================================
+--- kmailcvt/filter_outlook.cxx (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmailcvt/filter_outlook.cxx (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -52,7 +52,7 @@
+ info->addLog(i18n("Importing new mail files..."));
+ info->addLog(i18n("No files found for import."));
+
+- QString outlookDir = "";
++ QString outlookDir;
+ outlookDir = KFileDialog::getExistingDirectory(QDir::homeDirPath(), info->parent());
+ QDir importDir (outlookDir);
+ QStringList files = importDir.entryList("*.[pP][sS][tT]", QDir::Files, QDir::Name);
+Index: kmailcvt/filter_pmail.cxx
+===================================================================
+--- kmailcvt/filter_pmail.cxx (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmailcvt/filter_pmail.cxx (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -320,13 +320,13 @@
+ QString FilterPMail::getFolderName(QString ID)
+ {
+ bool found = false;
+- QString folder = "";
++ QString folder;
+ QString search = ID;
+
+ while (!found)
+ {
+- for ( QValueList<QString[5]>::Iterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
+- QString tmp[5] = *it;
++ for ( FolderStructureIterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
++ FolderStructure tmp = *it;
+
+ QString _ID = tmp[2];
+ if(_ID == search) {
+Index: kmailcvt/filter_oe.cxx
+===================================================================
+--- kmailcvt/filter_oe.cxx (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmailcvt/filter_oe.cxx (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -138,7 +138,7 @@
+ folderName = "OE-" + mailfileinfo.baseName(TRUE);
+ if(parsedFolder) {
+ QString _tmpFolder = getFolderName(_nameOfFile);
+- if(_tmpFolder != "") folderName = "OE" + _tmpFolder;
++ if(!_tmpFolder.isEmpty()) folderName = "OE" + _tmpFolder;
+ }
+ info->addLog(i18n("Importing OE5+ Mailbox %1").arg( "../" + _nameOfFile));
+ info->setTo(folderName);
+@@ -368,7 +368,7 @@
+ QString FilterOE::parseFolderString( QDataStream& ds, int filePos )
+ {
+ char tmp;
+- QString returnString = "";
++ QString returnString;
+ int wasAt = ds.device()->at();
+ ds.device()->at(filePos);
+
+@@ -389,15 +389,15 @@
+ {
+ bool found = false;
+ bool foundFilename = false;
+- QString folder = "";
++ QString folder;
+ // we must do this because folder with more than one upper letter
+ // at start have maybe not a file named like the folder !!!
+ QString search = filename.lower();
+
+ while (!found)
+ {
+- for ( QValueList<QString[4]>::Iterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
+- QString tmp[4] = *it;
++ for ( FolderStructureIterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
++ FolderStructure tmp = *it;
+ if(foundFilename == false) {
+ QString _tmpFileName = tmp[1];
+ _tmpFileName = _tmpFileName.lower();
+@@ -410,7 +410,7 @@
+ QString _currentID = tmp[2];
+ QString _parentID = tmp[3];
+ if(_currentID == search) {
+- if(_parentID == "") { // this is the root of the folder
++ if(_parentID.isEmpty()) { // this is the root of the folder
+ found = true;
+ break;
+ } else {
+@@ -421,7 +421,7 @@
+ }
+ }
+ // need to break the while loop maybe in some cases
+- if((foundFilename == false) && (folder == "")) return folder;
++ if((foundFilename == false) && (folder.isEmpty())) return folder;
+ }
+ return folder;
+ }
+Index: kmailcvt/filter_mbox.cxx
+===================================================================
+--- kmailcvt/filter_mbox.cxx (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmailcvt/filter_mbox.cxx (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -69,8 +69,9 @@
+
+ while ( ! mbox.atEnd() ) {
+ KTempFile tmp;
++ QIODevice::Offset filepos = 0;
+ /* comment by Danny:
+- * Don't use QTextStream to read from mbox, etter use QDataStream. QTextStream only
++ * Don't use QTextStream to read from mbox, better use QDataStream. QTextStream only
+ * support Unicode/Latin1/Locale. So you lost information from emails with
+ * charset!=Unicode/Latin1/Locale (e.g. KOI8-R) and Content-Transfer-Encoding != base64
+ * (e.g. 8Bit). It also not help to convert the QTextStream to Unicode. By this you
+@@ -83,7 +84,14 @@
+ tmp.file()->writeBlock( input, l );
+
+ while ( ! mbox.atEnd() && (l = mbox.readLine(input.data(),MAX_LINE)) && ((seperate = input.data()).left(5) != "From ")) {
+- tmp.file()->writeBlock( input, l );
++ tmp.file()->writeBlock( input, l );
++
++ // workaround to fix hang if a corrupted mbox contains some
++ // binary data, for more see bug #106796
++ if (mbox.at() == filepos)
++ mbox.at(mbox.size());
++ else
++ filepos = mbox.at();
+ }
+ tmp.close();
+ first_msg = false;
+Index: kmailcvt/filter_pmail.hxx
+===================================================================
+--- kmailcvt/filter_pmail.hxx (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmailcvt/filter_pmail.hxx (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -50,8 +50,18 @@
+ QDir dir;
+ /** pointer to the info */
+ FilterInfo * inf;
+- /** QStringList with the foldernames, First String contains the ID, the second the folder */
+- QValueList<QString[5]> folderMatrix;
++
++ /** Folder structure here has 5 entries. */
++ typedef FolderStructureBase<5> FolderStructure;
++ /** List with the folder matrix, which contains following strings:
++ 1. type (2 for root-folder, 1 for folder, 0 for mailarchiv)
++ 2. type (1 for root-folder, 3 for folder, 0 for mailarchiv)
++ 3. "ID:flag:filename" of folder/archiv
++ 4. "ID:name" of parent folder
++ 5. name of folder/archiv
++ */
++ QValueList<FolderStructure> folderMatrix;
++ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
+
+ /** true, if the folderfile is parsed **/
+ bool folderParsed;
+Index: kmailcvt/filter_oe.hxx
+===================================================================
+--- kmailcvt/filter_oe.hxx (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kmailcvt/filter_oe.hxx (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -61,8 +61,17 @@
+ bool parsedFolder;
+ /** true if the current parsing file is the folder file */
+ bool currentIsFolderFile;
++
++ /** Folder structure with following 4 entries:
++ 1. descriptive folder name
++ 2. filename
++ 3. ID of current folder
++ 4. ID of parent folder
++ */
++ typedef FolderStructureBase<4> FolderStructure;
+ /** matrix with information about the folder structure*/
+- QValueList<QString[4]> folderStructure;
++ QValueList<FolderStructure> folderStructure;
++ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
+
+ /** name of the current folder */
+ QString folderName;
+Index: kaddressbook/interfaces/kaddressbook_xxport.desktop
+===================================================================
+--- kaddressbook/interfaces/kaddressbook_xxport.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kaddressbook/interfaces/kaddressbook_xxport.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -21,7 +21,7 @@
+ Comment[he]=תוסף ייבו×/×™×¦×•× ×¢×‘×•×¨ ×¤× ×§×¡ הכתובות
+ Comment[hi]=के-à¤à¤¡à¥à¤°à¥‡à¤¸-बà¥à¤• आयात/निरà¥à¤¯à¤¾à¤¤ पà¥à¤²à¤—इन
+ Comment[hu]=KAddressBook importálási/exportálási bÅ‘vÃtÅ‘modul
+-Comment[is]=Ãforrit til að færa inn Ã/út úr KAddressbook
++Comment[is]=KAddressbook flytja inn/út Ãforrit
+ Comment[it]=Plugin importa/esporta di KAddressbook
+ Comment[ja]=KAddressbook インãƒãƒ¼ãƒˆ/エクスãƒãƒ¼ãƒˆãƒ—ラグイン
+ Comment[lt]=KAddressBook importo/eksporto priedas
+Index: kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop
+===================================================================
+--- kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -17,7 +17,7 @@
+ Comment[fr]=Module d'édition de contacts de KAddressBook
+ Comment[hi]=के-à¤à¤¡à¥à¤°à¥‡à¤¸-बà¥à¤• समà¥à¤ªà¤°à¥à¤• संपादक विजेट पà¥à¤²à¤—इन
+ Comment[hu]=KAddressBook névjegyszerkesztÅ‘ bÅ‘vÃtÅ‘modul
+-Comment[is]=KAddressbook tengiliðaritils-Ãforrit
++Comment[is]=KAddressbook tengiliðaritils Ãforrit
+ Comment[it]=Plugin editor dei contatti di KAddressbook
+ Comment[ja]=KAddressbook コンタクト エディタ ウィジェット プラグイン
+ Comment[lt]=KAddressBook kontaktų redaktoriaus valdiklių priedas
+Index: kaddressbook/csv-templates/yahoo.desktop
+===================================================================
+--- kaddressbook/csv-templates/yahoo.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kaddressbook/csv-templates/yahoo.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -25,7 +25,7 @@
+ Name[he]=×¤× ×§×¡ כתובת של Yahoo!
+ Name[hi]=याहू! पता पà¥à¤¸à¥à¤¤à¤¿à¤•à¤¾
+ Name[hu]=Yahoo! cÃmjegyzék
+-Name[is]=Yahoo! Póstfangaskrá
++Name[is]=Yahoo! póstfangaskrá
+ Name[it]=Rubrica indirizzi Yahoo!
+ Name[ja]=Yahoo! アドレス帳
+ Name[lt]=Yahoo! Adresų knygutė
+Index: kaddressbook/editors/protocols/smsprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/smsprotocol.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kaddressbook/editors/protocols/smsprotocol.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -19,6 +19,7 @@
+ Comment[eu]=SMS protokoloa
+ Comment[fi]=SMS-protokolla
+ Comment[fr]=Protocole SMS
++Comment[ga]=Prótacal SMS
+ Comment[gl]=Protocolo SMS
+ Comment[he]=פרוטוקול SMS
+ Comment[hi]=à¤à¤¸à¤à¤®à¤à¤¸ पà¥à¤°à¥‹à¤Ÿà¥‹à¤•à¥‰à¤²
+Index: kaddressbook/features/distributionlist.desktop
+===================================================================
+--- kaddressbook/features/distributionlist.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kaddressbook/features/distributionlist.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -4,6 +4,7 @@
+ Name=KAB Distribution List Plugin
+ Name[ar]=ملØÙ‚ قائمة توزيع KAB
+ Name[be]=Дапаўненьне KAB "Ð¡ÑŒÐ¿Ñ–Ñ Ñ€Ð°ÑпаўÑюджваньнÑ"
++Name[br]=Lugent roll ingaladur evit KAB
+ Name[bs]=KAB dodatak za distribucione liste
+ Name[ca]=Endollable de la llista de distribució KAB
+ Name[cs]=Modul distribuÄnÃho seznamu
+Index: libkdepim/komposer/plugins/default/defaulteditor.desktop
+===================================================================
+--- libkdepim/komposer/plugins/default/defaulteditor.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ libkdepim/komposer/plugins/default/defaulteditor.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -28,6 +28,7 @@
+ Name[et]=Komposeri redaktor
+ Name[eu]=Komposer editorea
+ Name[fr]=Éditeur Komposer
++Name[ga]=Eagarthóir Komposer
+ Name[hi]=कमà¥à¤ªà¥‹à¤œà¤¼à¤° à¤à¤¡à¤¿à¤Ÿà¤°
+ Name[hu]=Komposer szerkesztő
+ Name[is]=Komposer ritill
+@@ -57,6 +58,7 @@
+ Comment[et]=Komposeri vaikeredaktor
+ Comment[eu]=Komposer editore lehenetsia
+ Comment[fr]=Éditeur Komposer par défaut
++Comment[ga]=Eagarthóir réamhshocraithe Komposer
+ Comment[he]=עורך ברירת מחדל של Kompoer
+ Comment[hi]=कमà¥à¤ªà¥‹à¤œà¤¼à¤° डिफ़ॉलà¥à¤Ÿ संपादक
+ Comment[hu]=A Komposer alapértelmezett szerkesztője
+Index: libkdepim/komposer/core/komposerplugin.desktop
+===================================================================
+--- libkdepim/komposer/core/komposerplugin.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ libkdepim/komposer/core/komposerplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -17,6 +17,7 @@
+ Name[eu]=Komposer plugin-a
+ Name[fi]=Komposer-liitännäinen
+ Name[fr]=Module de Komposer
++Name[ga]=Breiseán Komposer
+ Name[gl]=Extensión Komposer
+ Name[he]=תןסף Kompoer
+ Name[hi]=कमà¥à¤ªà¥‹à¤œà¤¼à¤° पà¥à¤²à¤—इन
+Index: libkdepim/komposer/core/komposereditor.desktop
+===================================================================
+--- libkdepim/komposer/core/komposereditor.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ libkdepim/komposer/core/komposereditor.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -16,6 +16,7 @@
+ Comment[eu]=Komposer editorea
+ Comment[fi]=Komposer-editori
+ Comment[fr]=Éditeur Komposer
++Comment[ga]=Eagarthóir Komposer
+ Comment[gl]=Editor Komposer
+ Comment[he]=עורך של Komposer
+ Comment[hi]=कमà¥à¤ªà¥‹à¤œà¤¼à¤° à¤à¤¡à¤¿à¤Ÿà¤°
+Index: libkcal/localdir.desktop
+===================================================================
+--- libkcal/localdir.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ libkcal/localdir.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -16,6 +16,7 @@
+ Name[eu]=Egutegia direktorio lokalean
+ Name[fi]=Kalenteri paikallisessa hakemistossa
+ Name[fr]=Calendrier dans un dossier local
++Name[ga]=Féilire i gComhadlann Logánta
+ Name[hi]=सà¥à¤¥à¤¾à¤¨à¥€à¤¯ डिरेकà¥à¤Ÿà¥à¤°à¥€ में कैलेनà¥à¤¡à¤°
+ Name[hu]=Helyi könyvtárban tárolt naptár
+ Name[is]=Dagatal à staðbundinni möppu
+Index: libkcal/local.desktop
+===================================================================
+--- libkcal/local.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ libkcal/local.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -16,6 +16,7 @@
+ Name[eu]=Egutegia fitxategi lokalean
+ Name[fi]=Kalenteri paikallisessa tiedostossa
+ Name[fr]=Calendrier dans un fichier local
++Name[ga]=Féilire i gComhad Logánta
+ Name[hi]=सà¥à¤¥à¤¾à¤¨à¥€à¤¯ फ़ाइल में कैलेनà¥à¤¡à¤°
+ Name[hu]=Helyi fájlban tárolt naptár
+ Name[is]=Dagatal à staðbundinni skrá
+Index: libkcal/kabc.desktop
+===================================================================
+--- libkcal/kabc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ libkcal/kabc.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -16,6 +16,7 @@
+ Name[eu]=Urtebetetzeak KAddressBook-etik
+ Name[fi]=Syntymäpäivät KDE:n osoitekirjasta
+ Name[fr]=Dates de naissance de KAddressBook
++Name[ga]=Breithlaethanta ó KAddressBook
+ Name[gl]=Cumpreanos de KAddressBook
+ Name[he]=ימי הולדת מתוך KAddressBook
+ Name[hi]=के-à¤à¤¡à¥à¤°à¥‡à¤¸-बà¥à¤• से जनà¥à¤®à¤¤à¤¿à¤¥à¤¿
+Index: libkcal/icalformatimpl.cpp
+===================================================================
+--- libkcal/icalformatimpl.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ libkcal/icalformatimpl.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -2107,7 +2107,7 @@
+
+ icaltimetype ICalFormatImpl::writeICalDate(const QDate &date)
+ {
+- icaltimetype t;
++ icaltimetype t = icaltime_null_time();
+
+ t.year = date.year();
+ t.month = date.month();
+@@ -2128,7 +2128,7 @@
+
+ icaltimetype ICalFormatImpl::writeICalDateTime(const QDateTime &datetime)
+ {
+- icaltimetype t;
++ icaltimetype t = icaltime_null_time();
+
+ t.year = datetime.date().year();
+ t.month = datetime.date().month();
+Index: kpilot/ChangeLog
+===================================================================
+--- kpilot/ChangeLog (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/ChangeLog (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -13,6 +13,22 @@
+ TODO: give the knotes conduit a decent test mode.
+ TODO: only re-write a local database if it is changed.
+
++2005-08-03 Jason 'vanRijn' Kasper
++* Bumping version number to 4.5.4 in case there's a KDE 3.4.3 release
++
++2005-07-20 Jason 'vanRijn' Kasper
++* D'oh! Version number should change from 4.5.2 to 4.5.3 since we actually
++ did do stuff since KDE 3.4.1, and being that 3.4.2 just got tagged 8
++ hours ago, here's hoping we can get this fixed before 3.4.2 is declared
++ officially official. =:/
++
++2005-05-26 Jason 'vanRijn' Kasper
++* Fixing nasty little bug (#106324) causing data loss in memofile conduit
++* isFirstSync() is true for both copyHHtoPC and copyPCtoHH. memofile
++ conduit only wants to do copyHHtoPC if we're either told to, or we don't
++ have any local memos in the filesystem
++
++
+ 2005-05-22 Adriaan de Groot
+ * Gratuitously update the version number, call this one "kind" (Dutch for
+ "child", or otherwise short for "kind of liable to eat your data").
+Index: kpilot/conduits/perlconduit/perl-conduit.desktop
+===================================================================
+--- kpilot/conduits/perlconduit/perl-conduit.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/conduits/perlconduit/perl-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -13,6 +13,7 @@
+ Name[et]=Perl (näidis)
+ Name[eu]=Perl (adibidea)
+ Name[fr]=Perl (exemple)
++Name[ga]=Perl (Sampla)
+ Name[gl]=Perl (Mostra)
+ Name[hi]=परà¥à¤² (सेंपल)
+ Name[hu]=Perl (példa)
+@@ -50,6 +51,7 @@
+ Comment[et]=See näidiskanal käivitab Perli interpretaatori.
+ Comment[eu]=Adibide honek Perl interpretatzaile bat exekutatzen du.
+ Comment[fr]=Cet exemple de canal lance un interpréteur Perl.
++Comment[ga]=Ritheann an seoladán samplach seo léirmhÃnitheoir Perl.
+ Comment[hi]=यह सेंपल कनà¥à¤¡à¥à¤¯à¥‚इट परà¥à¤² इंटरपà¥à¤°à¥‡à¤Ÿà¤° चलाता है.
+ Comment[hu]=Ez a mintacsatoló a Perl-értelmezőt futtatja
+ Comment[is]=Þessi sýnishornarás keyrir Perl túlk.
+Index: kpilot/conduits/malconduit/mal_conduit.desktop
+===================================================================
+--- kpilot/conduits/malconduit/mal_conduit.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/conduits/malconduit/mal_conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -13,6 +13,7 @@
+ Name[eu]=MAL (AvantGo) kanala
+ Name[fi]=MAL (AvantGo) yhdyskäytävä
+ Name[fr]=MAL (AvantGo) Canal
++Name[ga]=Seoladán MAL (AvantGo)
+ Name[he]=ממשק AvantGo) MAL)
+ Name[hi]=à¤à¤®à¤à¤à¤² (AvantGo) कनà¥à¤¡à¥à¤¯à¥‚इट
+ Name[hu]=MAL- (AvantGo) csatoló
+Index: kpilot/conduits/knotes/knotes-conduit.desktop
+===================================================================
+--- kpilot/conduits/knotes/knotes-conduit.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/conduits/knotes/knotes-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -49,6 +49,7 @@
+ Name[et]=KNotes / memod
+ Name[eu]=KNotes / Oharrak
+ Name[fr]=KNotes / Mémos
++Name[ga]=KNotes / Meamraim
+ Name[hi]=के-नोटà¥à¤¸ / मेमो
+ Name[hu]=KNotes / memók
+ Name[is]=KNotes / minnisblöð
+Index: kpilot/conduits/pythonconduit/python-conduit.desktop
+===================================================================
+--- kpilot/conduits/pythonconduit/python-conduit.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/conduits/pythonconduit/python-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -13,6 +13,7 @@
+ Name[et]=Python (näidis)
+ Name[eu]=Python (adibidea)
+ Name[fr]=Python (exemple)
++Name[ga]=Python (Sampla)
+ Name[gl]=Python (Mostra)
+ Name[hi]=पायथन (सेमà¥à¤ªà¤²)
+ Name[hu]=Python (példa)
+@@ -50,6 +51,7 @@
+ Comment[et]=See näidiskanal käivitab Pythoni interpretaatori.
+ Comment[eu]=Adibide honek Python interpretatzaile bat exekutatzen du.
+ Comment[fr]=Cet exemple de canal lance un interpréteur Python.
++Comment[ga]=Ritheann an seoladán samplach seo léirmhÃnitheoir Python.
+ Comment[hi]=यह सेंपल कनà¥à¤¡à¥à¤¯à¥‚इट पायथन इंटरपà¥à¤°à¥‡à¤Ÿà¤° चलाता है.
+ Comment[hu]=Ez a mintacsatoló a Python-értelmezőt futtatja
+ Comment[is]=Þessi sýnishornarás keyrir Python túlk.
+Index: kpilot/conduits/null/null-conduit.desktop
+===================================================================
+--- kpilot/conduits/null/null-conduit.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/conduits/null/null-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -20,6 +20,7 @@
+ Comment[eu]=Kanal honek ez du ezer egiten.
+ Comment[fi]=Tämä yhdyskäytävä ei tee mitään.
+ Comment[fr]=Ce canal ne fait rien.
++Comment[ga]=Nà dhéanann an seoladán seo faic.
+ Comment[hi]=यह कनà¥à¤¡à¥à¤¯à¥‚इट कà¥à¤› नहीं करता है.
+ Comment[hu]=Ez a csatoló üres, csak tesztelési célokat szolgál
+ Comment[is]=Þessi rás gerir ekki neitt.
+Index: kpilot/conduits/vcalconduit/todo-conduit.desktop
+===================================================================
+--- kpilot/conduits/vcalconduit/todo-conduit.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/conduits/vcalconduit/todo-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -50,6 +50,7 @@
+ Name[et]=Ãœlesanded (KOrganizer)
+ Name[eu]=Egitekoak (KOrganizer)
+ Name[fr]=Tâches (KOrganizer)
++Name[ga]=Tascanna (KOrganizer)
+ Name[gl]=Pendentes (KOrganizer)
+ Name[hi]=कारà¥à¤¯ सूची (के-आरà¥à¤—ेनाइज़र)
+ Name[hu]=Feladatok (KOrganizer)
+Index: kpilot/conduits/vcalconduit/vcal-conduit.desktop
+===================================================================
+--- kpilot/conduits/vcalconduit/vcal-conduit.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/conduits/vcalconduit/vcal-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -15,6 +15,7 @@
+ Name[eu]=Egutegia (KOrganizer)
+ Name[fi]=Kalenteri (KOrganizer)
+ Name[fr]=Agenda (KOrganizer)
++Name[ga]=Féilire (KOrganizer)
+ Name[gl]=Calendario (KOrganizer)
+ Name[hi]=कैलेणà¥à¤¡à¤° (के-आरà¥à¤—ेनाइज़र)
+ Name[hu]=Naptár (KOrganizer)
+Index: kpilot/kpilot/memoWidget.cc
+===================================================================
+--- kpilot/kpilot/memoWidget.cc (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/kpilot/memoWidget.cc (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -410,7 +410,7 @@
+ void MemoWidget::updateWidget()
+ {
+ FUNCTIONSETUP;
+- if (!shown) return;
++ if (!shown || !d->fMemoAppInfo ) return;
+
+ if (fCatList->currentItem() == -1)
+ {
+@@ -608,7 +608,7 @@
+ void MemoWidget::slotImportMemo()
+ {
+ FUNCTIONSETUP;
+- if (!shown) return;
++ if (!shown || !d->fMemoAppInfo) return;
+
+ int currentCatID = findSelectedCategory(fCatList,
+ d->fMemoAppInfo->categoryInfo(), true);
+Index: kpilot/kpilot/todoWidget.cc
+===================================================================
+--- kpilot/kpilot/todoWidget.cc (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/kpilot/todoWidget.cc (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -294,7 +294,7 @@
+ void TodoWidget::updateWidget()
+ {
+ FUNCTIONSETUP;
+- if (!shown) return;
++ if (!shown || !fTodoAppInfo ) return;
+
+ int listIndex = 0;
+
+Index: kpilot/kpilot/kpilot_config.desktop
+===================================================================
+--- kpilot/kpilot/kpilot_config.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/kpilot/kpilot_config.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -25,6 +25,7 @@
+ Name[eu]=KPilot-en konfigurazioa
+ Name[fi]=KPilot-asetukset
+ Name[fr]=Configuration de KPilot
++Name[ga]=CumraÃocht KPilot
+ Name[gl]=Configuración de KPilot
+ Name[hi]=के-पायलट कॉनà¥à¤«à¤¼à¤¿à¤—रेशन
+ Name[hu]=A KPilot beállÃtásai
+@@ -63,6 +64,7 @@
+ Comment[eu]=KPilot-en konfigurazio nagusia
+ Comment[fi]=KPilotin pääasetukset
+ Comment[fr]=Configuration principale de KPilot
++Comment[ga]=PrÃomhchumraÃocht KPilot
+ Comment[gl]=Configuración Principal de KPilot
+ Comment[hi]=के-पायलट मà¥à¤–à¥à¤¯ कॉनà¥à¤«à¤¼à¤¿à¤—रेशन
+ Comment[hu]=A KPilot legfontosabb beállÃtásai
+@@ -99,6 +101,7 @@
+ Keywords[eu]=kpilot,nagusia
+ Keywords[fi]=kpilot
+ Keywords[fr]=kpilot,principal
++Keywords[ga]=kpilot,prÃomh
+ Keywords[gl]=kpilot,principal
+ Keywords[hi]=के-पायलट,मà¥à¤–à¥à¤¯
+ Keywords[hu]=kpilot,alap
+Index: kpilot/kpilot/kpilot.desktop
+===================================================================
+--- kpilot/kpilot/kpilot.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/kpilot/kpilot.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -31,6 +31,7 @@
+ GenericName[eu]=PalmPilot tresna
+ GenericName[fi]=Palm Pilot -työkalu
+ GenericName[fr]=Outil pour le Palm Pilot
++GenericName[ga]=Uirlis PalmPilot
+ GenericName[gl]=Ferramenta de PalmPilot
+ GenericName[he]=כלי פ×ל×-פיילוט
+ GenericName[hi]=पाम-पायलट औज़ार
+Index: kpilot/kpilot/addressWidget.cc
+===================================================================
+--- kpilot/kpilot/addressWidget.cc (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/kpilot/addressWidget.cc (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -295,6 +295,8 @@
+ {
+ FUNCTIONSETUP;
+
++ if( !fAddressAppInfo )
++ return;
+ int addressDisplayMode = KPilotSettings::addressDisplayMode();
+
+ int listIndex = 0;
+@@ -675,7 +677,7 @@
+ void AddressWidget::slotExport()
+ {
+ FUNCTIONSETUP;
+-
++ if(!fAddressAppInfo) return;
+ int currentCatID = findSelectedCategory(fCatList,
+ fAddressAppInfo->categoryInfo());
+
+Index: kpilot/kpilot/kpilotconduit.desktop
+===================================================================
+--- kpilot/kpilot/kpilotconduit.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/kpilot/kpilotconduit.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -20,6 +20,7 @@
+ Comment[eu]=KPilot kanala
+ Comment[fi]=KPilot yhdyskäytävä
+ Comment[fr]=Canal de KPilot
++Comment[ga]=Seoladán KPilot
+ Comment[gl]=Conducto de KPilot
+ Comment[he]=ממשק של KPilot
+ Comment[hi]=के-पायलट कनà¥à¤¡à¥à¤¯à¥‚इट
+Index: kpilot/lib/options.h
+===================================================================
+--- kpilot/lib/options.h (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/lib/options.h (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -224,7 +224,7 @@
+ #define FUNCTIONSETUPL(a) const int fname = a; Q_UNUSED(fname);
+ #endif
+
+-#define KPILOT_VERSION "4.5.2 (kind)"
++#define KPILOT_VERSION "4.5.4 (dreumes)"
+
+
+ // Function to expand newlines in rich text to <br>\n
+Index: kpilot/lib/kpilotlink.cc
+===================================================================
+--- kpilot/lib/kpilotlink.cc (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kpilot/lib/kpilotlink.cc (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -399,7 +399,8 @@
+ if (ret >= 0)
+ {
+ fLinkStatus = DeviceOpen;
+- fOpenTimer->stop();
++ if(fOpenTimer)
++ fOpenTimer->stop();
+
+ KPilotDeviceLinkPrivate::self()->bindDevice( fRealPilotPath );
+ fSocketNotifier = new QSocketNotifier(fPilotMasterSocket,
+@@ -447,9 +448,9 @@
+ }
+ e = errno;
+ msg = i18n("Cannot open Pilot port \"%1\". ");
++ if( fOpenTimer )
++ fOpenTimer->stop();
+
+- fOpenTimer->stop();
+-
+ // goto errInit;
+ }
+
+Index: kontact/plugins/multisynk/multisynk.desktop
+===================================================================
+--- kontact/plugins/multisynk/multisynk.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/multisynk/multisynk.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -24,6 +24,7 @@
+ Comment[et]=MultiSynki plugin
+ Comment[eu]=MultiSynk plugin-a
+ Comment[fr]=Module MultiSynk
++Comment[ga]=Breiseán MultiSynk
+ Comment[hi]=मलà¥à¤Ÿà¥€-सिंक पà¥à¤²à¤—इन
+ Comment[hu]=MultiSynk bÅ‘vÃtÅ‘modul
+ Comment[is]=MultiSynk Ãforrit
+Index: kontact/plugins/weather/weatherplugin.desktop
+===================================================================
+--- kontact/plugins/weather/weatherplugin.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/weather/weatherplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -73,6 +73,7 @@
+ Name[eu]=Eguraldia
+ Name[fi]=Sää
+ Name[fr]=Météo
++Name[ga]=Aimsir
+ Name[gl]=O Tempo
+ Name[hi]=वेदर
+ Name[hu]=Időjárás
+Index: kontact/plugins/knode/knodeplugin.desktop
+===================================================================
+--- kontact/plugins/knode/knodeplugin.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/knode/knodeplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -30,6 +30,7 @@
+ Comment[eu]=Kontact-en KNode plugin-a
+ Comment[fi]=Kontactin KNode-liitännäinen
+ Comment[fr]=Module KNode pour Kontact
++Comment[ga]=Breiseán KNode le haghaidh Kontact
+ Comment[gl]=Extensión de KNode para Kontact
+ Comment[hi]=कॉनà¥à¤Ÿà¥‡à¤•à¥à¤Ÿ के-नोड पà¥à¤²à¤—इन
+ Comment[hu]=Kontact KNode-bÅ‘vÃtÅ‘modul
+Index: kontact/plugins/specialdates/kcmsdsummary.desktop
+===================================================================
+--- kontact/plugins/specialdates/kcmsdsummary.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/specialdates/kcmsdsummary.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -12,6 +12,7 @@
+ X-KDE-CfgDlgHierarchy=KontactSummary
+
+ Name=Special Dates
++Name[br]=Deiziadoù dibar
+ Name[ca]=Dates especials
+ Name[cs]=Speciálnà datumy
+ Name[da]=Særlige datoer
+@@ -22,6 +23,7 @@
+ Name[eu]=Data bereziak
+ Name[fi]=Erikoispäivät
+ Name[fr]=Date particulières
++Name[ga]=Dátaà Speisialta
+ Name[hi]=विशिषà¥à¤Ÿ तारीख़
+ Name[hu]=Fontos dátumok
+ Name[is]=Sérstakir dagar
+@@ -86,7 +88,7 @@
+ Keywords[hu]=születésnap,évforduló,szabadság,konfigurálás,beállÃtások
+ Keywords[is]=afmæli, frÃdagar, stillingar, stilla
+ Keywords[it]=compleanno, anniversario, vacanze, configura, impostazioni
+-Keywords[lt]=birthday, anniversary, holiday, configure, settings, konfigūruoti, nustatymai, gimtadieniai, išeiginės, jubiliejai
++Keywords[lt]=birthday, anniversary, holiday, configure, settings, konfigūruoti, nustatymai, gimtadieniai, išeiginės,sukaktys
+ Keywords[nb]=fødselsdag, jubileum, ferie, sette opp, innstillinger
+ Keywords[nl]=verjaardag,jubileum,vakantie,instellingen,configuratie,feestdag
+ Keywords[nn]=fødselsdag,bursdag,gebursdag,jubileum,ferie,helgedag,merkedag,oppsett,innstillingar
+Index: kontact/plugins/specialdates/specialdatesplugin.desktop
+===================================================================
+--- kontact/plugins/specialdates/specialdatesplugin.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/specialdates/specialdatesplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -15,6 +15,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+
+ Name=Special Dates
++Name[br]=Deiziadoù dibar
+ Name[ca]=Dates especials
+ Name[cs]=Speciálnà datumy
+ Name[da]=Særlige datoer
+@@ -25,6 +26,7 @@
+ Name[eu]=Data bereziak
+ Name[fi]=Erikoispäivät
+ Name[fr]=Date particulières
++Name[ga]=Dátaà Speisialta
+ Name[hi]=विशिषà¥à¤Ÿ तारीख़
+ Name[hu]=Fontos dátumok
+ Name[is]=Sérstakir dagar
+Index: kontact/plugins/kpilot/kpilotplugin.desktop
+===================================================================
+--- kontact/plugins/kpilot/kpilotplugin.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/kpilot/kpilotplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -30,6 +30,7 @@
+ Comment[eu]=Kontact-en KPilot plugin-a
+ Comment[fi]=Kontactin KPilot-laajennus
+ Comment[fr]=Module KPilot pour Kontact
++Comment[ga]=Breiseán KPilot le haghaidh Kontact
+ Comment[gl]=Extensión de KPilot para Kontact
+ Comment[hi]=कॉनà¥à¤Ÿà¥‡à¤•à¥à¤Ÿ के-पायलट पà¥à¤²à¤—इन
+ Comment[hu]=Kontact KPilot-bÅ‘vÃtÅ‘modul
+@@ -69,6 +70,7 @@
+ Name[eu]=KPilot-en konfigurazioa
+ Name[fi]=KPilot-asetukset
+ Name[fr]=Configuration de KPilot
++Name[ga]=CumraÃocht KPilot
+ Name[gl]=Configuración de KPilot
+ Name[hi]=के-पायलट कॉनà¥à¤«à¤¼à¤¿à¤—रेशन
+ Name[hu]=A KPilot beállÃtásai
+Index: kontact/plugins/knotes/knotesplugin.desktop
+===================================================================
+--- kontact/plugins/knotes/knotesplugin.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/knotes/knotesplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -30,6 +30,7 @@
+ Comment[eu]=Kontact-en KNotes plugin-a
+ Comment[fi]=Kontactin KNotes-liitännäinen
+ Comment[fr]=Module KNotes pour Kontact
++Comment[ga]=Breiseán KNotes le haghaidh Kontact
+ Comment[gl]=Extensión de KNotes para Kontact
+ Comment[hi]=कॉनà¥à¤Ÿà¥‡à¤•à¥à¤Ÿ के-नोटà¥à¤¸ पà¥à¤²à¤—इन
+ Comment[hu]=Kontact KNotes-bÅ‘vÃtÅ‘modul
+Index: kontact/plugins/kaddressbook/kcmkabsummary.desktop
+===================================================================
+--- kontact/plugins/kaddressbook/kcmkabsummary.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/kaddressbook/kcmkabsummary.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -107,7 +107,7 @@
+ Keywords[is]=afmæli, stillingar, stilla
+ Keywords[it]=compleanno, anniversario, configura, impostazioni
+ Keywords[ja]=誕生日,記念日,è¨å®š,è¨å®š
+-Keywords[lt]=birthday, anniversary, configure, settings, gimtadienis, jubiliejus, konfigūruoti, nustatymai
++Keywords[lt]=birthday, anniversary, configure, settings, gimtadienis,sukaktys, konfigūruoti, nustatymai
+ Keywords[nb]=fødselsdag, jubileum, sette opp, innstillinger
+ Keywords[nl]=verjaardag,instellingen,configuratie
+ Keywords[nn]=fødselsdag,bursdag,gebursdag,jubileum,oppsett,innstillingar
+Index: kontact/plugins/korganizer/kcmkorgsummary.desktop
+===================================================================
+--- kontact/plugins/korganizer/kcmkorgsummary.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/korganizer/kcmkorgsummary.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -103,10 +103,11 @@
+ Keywords[eu]=egutegia, egitekoak, konfiguratu, ezarpenak
+ Keywords[fi]=kalenteri, tehtävät, muokkaa, asetukset
+ Keywords[fr]=calendrier,agenda,tâches,configurer,paramètres,paramètre
++Keywords[ga]=féilire, tascanna, cumraigh, socruithe
+ Keywords[gl]=calendario, pendentes, configurar, opcións
+ Keywords[hi]=कैलेणà¥à¤¡à¤°, औज़ार, कॉनà¥à¤«à¤¼à¤¿à¤—र, विनà¥à¤¯à¤¾à¤¸
+ Keywords[hu]=naptár,feladatok,konfigurálás,beállÃtások
+-Keywords[is]=dagatal, tossalisti, stillingar, stilla
++Keywords[is]=dagatal, verkþættir, stillingar, stilla
+ Keywords[it]=calendario, cose da fare, configura, impostazioni
+ Keywords[ja]=スケジュール,todos,è¨å®š,è¨å®š
+ Keywords[lt]=calendar, todos, configure, settings, kalendorius, darbai, konfigūruoti, nustatymai
+Index: kontact/plugins/korganizer/todoplugin.desktop
+===================================================================
+--- kontact/plugins/korganizer/todoplugin.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/korganizer/todoplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -26,11 +26,12 @@
+ Comment[et]=Kontacti KOrganizeri ülesannete nimekirja plugin
+ Comment[eu]=Kontact-en KOrganizer-en egitekoen plugin-a
+ Comment[fr]=Module de liste des tâches de KOrganizer pour Kontact
++Comment[ga]=Breiseán Tascliosta KOrganizer le haghaidh Kontact
+ Comment[hi]=कॉनà¥à¤Ÿà¥‡à¤•à¥à¤Ÿ के-आरà¥à¤—ेनाइज़र कारà¥à¤¯ सूची पà¥à¤²à¤—इन
+ Comment[hu]=Kontact-bÅ‘vÃtÅ‘modul a KOrganizer feladatlistához
+-Comment[is]=Kontact KOrganizer tossalista Ãforrit
++Comment[is]=Kontact KOrganizer verkþátta Ãforrit
+ Comment[it]=Plugin Kontact per le cose da fare di KOrganizer
+-Comment[lt]=Kontact KOrganizer užduoÄių sÄ…raÅ¡o priedas
++Comment[lt]=Kontact KOrganizer darbų sąrašo priedas
+ Comment[nb]=Kontact programtillegg for KOrganizer gjøreliste
+ Comment[nl]=Kontact KOrganizer takenlijstplugin
+ Comment[nn]=Kontact-programtillegg for KOrganizer-hugselister
+@@ -57,12 +58,13 @@
+ Name[et]=Ãœlesanded
+ Name[eu]=Egitekoen zerrenda
+ Name[fr]=Liste de tâches
++Name[ga]=Tascliosta
+ Name[he]=רשימת מטלות
+ Name[hi]=कारà¥à¤¯-सूची
+ Name[hu]=Feladatok
+-Name[is]=Tossalisti
++Name[is]=Verkþættir
+ Name[it]=Cose da fare
+-Name[lt]=UžduoÄių sÄ…raÅ¡as
++Name[lt]=Darbų sąrašas
+ Name[nb]=Gjøreliste
+ Name[nl]=Takenlijst
+ Name[nn]=Hugseliste
+Index: kontact/plugins/korganizer/korganizerplugin.desktop
+===================================================================
+--- kontact/plugins/korganizer/korganizerplugin.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/korganizer/korganizerplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -32,6 +32,7 @@
+ Comment[eu]=Kontact-en KOrganizer plugin-a
+ Comment[fi]=Kontactin KOrganizer-liitännäinen
+ Comment[fr]=Module KOrganizer pour Kontact
++Comment[ga]=Breiseán KOrganizer le haghaidh Kontact
+ Comment[gl]=Extensión de KOrganizer para Kontact
+ Comment[hi]=कॉनà¥à¤Ÿà¥‡à¤•à¥à¤Ÿ के-आरà¥à¤—ेनाइज़र पà¥à¤²à¤—इन
+ Comment[hu]=Kontact KOrganizer-bÅ‘vÃtÅ‘modul
+Index: kontact/plugins/kmail/kmailplugin.desktop
+===================================================================
+--- kontact/plugins/kmail/kmailplugin.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/kmail/kmailplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -33,6 +33,7 @@
+ Comment[eu]=Kontact-en KMail plugin-a
+ Comment[fi]=Kontactin KMail-liitännäinen
+ Comment[fr]=Module KMail pour Kontact
++Comment[ga]=Breiseán KMail le haghaidh Kontact
+ Comment[gl]=Extensión de KMail para Kontact
+ Comment[he]=תוסף KMail ל-Kontact
+ Comment[hi]=कॉनà¥à¤Ÿà¥‡à¤•à¥à¤Ÿ के-मेल पà¥à¤²à¤—इन
+Index: kontact/plugins/kmail/kcmkmailsummary.desktop
+===================================================================
+--- kontact/plugins/kmail/kcmkmailsummary.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/kmail/kcmkmailsummary.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -102,6 +102,7 @@
+ Keywords[eu]=eposta, laburpena, konfiguratu, ezarpenak
+ Keywords[fi]=sähköposti, yhteenveto, asetukset
+ Keywords[fr]=message,messagerie,courrier,résumé,vue,configurer,paramètres,paramètre
++Keywords[ga]=rÃomhphost, achoimre, cumraigh, socruithe
+ Keywords[gl]=email, resumo, configurar, opcións
+ Keywords[hi]=ई-मेल, सारांश, कॉनà¥à¤«à¤¼à¤¿à¤—र, विनà¥à¤¯à¤¾à¤¸
+ Keywords[hu]=e-mail,áttekintés,konfigurálás,beállÃtások
+Index: kontact/plugins/newsticker/newstickerplugin.desktop
+===================================================================
+--- kontact/plugins/newsticker/newstickerplugin.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/plugins/newsticker/newstickerplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -27,6 +27,7 @@
+ Comment[eu]=Kontact-en NewsTicker plugin-a
+ Comment[fi]=Kontactin uutisnäyttäjä
+ Comment[fr]=Module NewsTicker pour Kontact
++Comment[ga]=Breiseán NewsTicker le haghaidh Kontact
+ Comment[gl]=Extensión de NewsTicker para Kontact
+ Comment[hi]=कॉनà¥à¤Ÿà¥‡à¤•à¥à¤Ÿ नà¥à¤¯à¥‚ज़-टिकर पà¥à¤²à¤—इन
+ Comment[hu]=Kontact KNewsTicker-bÅ‘vÃtÅ‘modul
+Index: kontact/src/kontact.setdlg
+===================================================================
+--- kontact/src/kontact.setdlg (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ kontact/src/kontact.setdlg (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -471,6 +471,7 @@
+ Name[eu]=Eguraldia
+ Name[fi]=Sää
+ Name[fr]=Météo
++Name[ga]=Aimsir
+ Name[gl]=O Tempo
+ Name[hi]=वेदर
+ Name[hu]=Időjárás
+@@ -522,7 +523,7 @@
+ Comment[nl]=Het weer
+ Comment[nn]=Vêrinformasjon
+ Comment[pl]=Informacje o pogodzie
+-Comment[pt]=Informações Metereológicas
++Comment[pt]=Informações Meteorológicas
+ Comment[pt_BR]=Informações sobre o Clima
+ Comment[ru]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ погоде
+ Comment[sl]=Podatki o vremenu
+Index: korganizer/korganizer_configfonts.desktop
+===================================================================
+--- korganizer/korganizer_configfonts.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/korganizer_configfonts.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -121,6 +121,7 @@
+ Keywords[eu]=korganizer,letra-tipoak
+ Keywords[fi]=korganizer,kirjasimet
+ Keywords[fr]=KOrganizer,polices
++Keywords[ga]=korganizer,clónna,clófhoirne
+ Keywords[gl]=korganizer,fontes
+ Keywords[hi]=के-आरà¥à¤—ेनाइज़र,फ़ॉनà¥à¤Ÿà¥à¤¸
+ Keywords[hu]=korganizer,betűtÃpusok
+Index: korganizer/korganizer_configplugins.desktop
+===================================================================
+--- korganizer/korganizer_configplugins.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/korganizer_configplugins.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -86,6 +86,7 @@
+ Keywords[et]=korganizer,plugin,moodul
+ Keywords[eu]=korganizer,plugin-a,modulua
+ Keywords[fr]=KOrganizer,module
++Keywords[ga]=korganizer,breiseán,modúl
+ Keywords[hi]=के-आरà¥à¤—ेनाइज़र,पà¥à¤²à¤—इन,मॉडà¥à¤¯à¥‚ल
+ Keywords[hu]=korganizer,bÅ‘vÃtÅ‘modul,modul
+ Keywords[is]=korganizer,Ãforrit,eining
+Index: korganizer/korganizer_configtime.desktop
+===================================================================
+--- korganizer/korganizer_configtime.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/korganizer_configtime.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -29,6 +29,7 @@
+ Name[eu]=Ordua eta data
+ Name[fi]=Aika ja päiväys
+ Name[fr]=Date et heure
++Name[ga]=Am & Dáta
+ Name[gl]=Hora e Data
+ Name[hi]=तारीख़ व समय
+ Name[hu]=Dátum és idő
+@@ -113,6 +114,7 @@
+ Keywords[eu]=korganizer,ordua,data
+ Keywords[fi]=korganizer,aika
+ Keywords[fr]=KOrganizer,date
++Keywords[ga]=korganizer,am
+ Keywords[gl]=korganizer,hora
+ Keywords[hi]=के-आरà¥à¤—ेनाइज़र,समय
+ Keywords[hu]=korganizer,idő
+Index: korganizer/Makefile.am
+===================================================================
+--- korganizer/Makefile.am (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/Makefile.am (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -47,8 +47,8 @@
+ timezone_SOURCES = timezone.cpp
+ timezone_COMPILE_FIRST = koprefs_base.h
+
+-lib_LTLIBRARIES = libkorganizer.la libkorganizer_eventviewer.la \
+- libkorganizer_calendar.la
++lib_LTLIBRARIES = libkorganizer_eventviewer.la \
++ libkorganizer_calendar.la libkorganizer.la
+
+ libkorganizer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+ libkorganizer_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KNEWSTUFF) \
+Index: korganizer/plugins/projectview/projectview.desktop
+===================================================================
+--- korganizer/plugins/projectview/projectview.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/plugins/projectview/projectview.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -6,6 +6,7 @@
+ Name[ar]=ملØÙ‚ عرض المشاريع للمنظم
+ Name[az]=KOrganizer LayihÉ™ NümayiÅŸ ÆlavÉ™si
+ Name[bg]=ПриÑтавка на организатора за преглед на проекти
++Name[br]=Lugent gwell raktres evit KOrganizer
+ Name[bs]=Preglednik projekata, dodatak za KOrganizer
+ Name[ca]=Endollable de vista de projectes per a KOrganizer
+ Name[cs]=Modul projektového pohledu pro KOrganizer
+@@ -67,7 +68,7 @@
+ Comment[hu]=Ezzel a modullal projekttervezÅ‘ nézet alakÃtható ki a KOrganizerben (például a feladatokhoz vagy a havi nézetekhez). Ha aktiválja ezt a modult, átválthat projektnézetbe, hogy a feladatok projekttervként legyenek megtekinthetÅ‘k.
+ Comment[is]=Þetta Ãforrit veitir verkskipulagssýn fyrir KOrganizer (svipað og verkþátta eða mánaðarsýn). Ef þú virkjar þetta Ãforrit, getur þú á einfaldan hátt skipt yfir à verkefnasýn og skoðað verkþáttalistann þinn à skipuleggjara.
+ Comment[it]=Questo plugin fornisce una vista di pianificazione progetto per KOrganizer (come la vista delle cose da fare o quella mensile). Se abiliti questo plugin, puoi passare dalla vista progetto alla vista delle cose da fare come in un pianificatore di progetti.
+-Comment[lt]=Å is priedas pateikia KOrganizaer projekto planavimo vaizdÄ… (panaÅ¡iai kaip užduoÄių ar mÄ—nesio vaizdai). Jei įjungsite šį įskiepį, galÄ—site perÅ¡okti į projekto vaizdÄ… ir peržiÅ«rÄ—ti savo užduoÄių sÄ…raÅ¡Ä… kaip projektÄ….
++Comment[lt]=Šis priedas pateikia KOrganizaer projekto planavimo vaizdą (panašiai kaip darbų ar mėnesio vaizdai). Jei įjungsite šį įskiepį, galėsite peršokti į projekto vaizdą ir peržiūrėti savo darbų sąrašą kaip projektą.
+ Comment[nb]=Dette tilleggsprogrammet lager en prosjektplan-visning for KOrganizer (som i gjørelister og månedsvisninger). Slår du på dette tilleggsprogrammet kan du bytte til prosjektvisning og se på gjørelista som i en prosjektplan.
+ Comment[nl]=Deze plugin biedt een projectweergave voor KOrganizer (net zoals een takenlijst of maandweergave). Wanneer u deze plugin aanzet, kunt u deze weergave aanzetten om uw takenlijst te bekijken als een projectplanner.
+ Comment[pl]=Ta wtyczka tworzy widok planowania projektu w KOrganizerze (tak jak widok zadań do zrobienia lub widok miesiąca). Po włączeniu tej wtyczki możliwe jest przełączenie się na widok projektu zadań do zrobienia.
+Index: korganizer/plugins/exchange/exchange.desktop
+===================================================================
+--- korganizer/plugins/exchange/exchange.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/plugins/exchange/exchange.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -15,6 +15,7 @@
+ Name[eu]=KOrganizer-en Microsoft Exchange 2000 plugin-a
+ Name[fi]=KOrganizerin Microsoft Exchange 2000 -laajennus
+ Name[fr]=Module Microsoft Exchange 2000 pour KOrganizer
++Name[ga]=Breiseán Microsoft Exchange 2000 le haghaidh KOrganizer
+ Name[gl]=Extensión de Microsoft Exchange 2000 para KOrganizer
+ Name[hi]=के-आरà¥à¤—ेनाइज़र के लिठमाइकà¥à¤°à¥‹à¤¸à¥‰à¤«à¥à¤Ÿ à¤à¤•à¥à¤¸à¤šà¥‡à¤‚ज 2000 पà¥à¤²à¤—इन
+ Name[hu]=Microsoft Exchange 2000-bÅ‘vÃtÅ‘modul a KOrganizerhez
+Index: korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
+===================================================================
+--- korganizer/plugins/printing/whatsnext/whatsnextprint.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/plugins/printing/whatsnext/whatsnextprint.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -41,7 +41,7 @@
+ Comment[hu]=Ezzel a modullal kinyomtathatók a rövidesen aktuálissá váló feladatok és események.
+ Comment[is]=Þetta Ãforrit gerir þér kleyft að prenta út lista yfir alla væntanlega atburði og verkþætti.
+ Comment[it]=Questo plugin vi permette di stampare una lista dei prossimi eventi e cose da fare.
+-Comment[lt]=Å is priedas leidžia spausdinti sÄ…raÅ¡Ä… visų artÄ—janÄių įvykių ir užduoÄių.
++Comment[lt]=Å is priedas leidžia spausdinti sÄ…raÅ¡Ä… visų artÄ—janÄių įvykių ir darbų.
+ Comment[nb]=Med dette tilleggsprogrammet kan du skrive ut en liste over kommende hendelser og ting som skal gjøres.
+ Comment[nl]=Deze plugin maakt het mogelijk om een lijst van alle komende evenementen en taken uit te printen.
+ Comment[nn]=Dette programtillegget lèt deg skriva ut ei liste over alle dei komande hendingane og oppføringane i hugselista.
+Index: korganizer/plugins/printing/list/listprint.desktop
+===================================================================
+--- korganizer/plugins/printing/list/listprint.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/plugins/printing/list/listprint.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -43,7 +43,7 @@
+ Comment[hu]=Ezzel a modullal listaként kinyomtathatók a feladatok és események.
+ Comment[is]=Þetta Ãforrit gerir þér kleyft að prenta út lista með atburðum og verkþáttum.
+ Comment[it]=Questo plugin ti permette di stampare eventi e cose da fare in modalità elenco.
+-Comment[lt]=Šis priedas leidžia spausdinti įvykius ir užduotis sąrašo forma.
++Comment[lt]=Šis priedas leidžia spausdinti įvykius ir darbus sąrašo forma.
+ Comment[nb]=Med dette tilleggsprogrammet kan du skrive ut hendelser og gjørelister på liste-form.
+ Comment[nl]=Deze plugin maakt het mogelijk om evenementen en taken in lijstvorm uit te printen.
+ Comment[nn]=Dette programtillegget lèt deg skriva ut hendingar og hugselister på listeform.
+Index: korganizer/plugins/timespanview/timespanview.desktop
+===================================================================
+--- korganizer/plugins/timespanview/timespanview.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/plugins/timespanview/timespanview.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -40,7 +40,7 @@
+ Comment[hu]=Ezzel modullal egy időszakot lehet áttekinteni a KOrganizerben (például a feladatokat vagy a havi nézeteket). Ha aktiválja ezt a modult, átválthat időszakos nézetbe, hogy az események Gantt-diagramon legyenek megtekinthetők.
+ Comment[is]=Þetta Ãforrit veitir tÃmabilssýn fyrir KOrganizer (svipað og verkþátta eða mánaðarsýn). Ef þú virkjar þetta Ãforrit getur þú skipt yfir à tÃmabilssýn og skoðað atburðina þÃna eins og á Gantt skýringarmynd.
+ Comment[it]=Questo plugin fornisce una vista a intervalli temporali. Se abiliti questo plugin, potrai passare alla vista a intervalli temporali e vedere i tuoi eventi come in un diagramma di Gantt.
+-Comment[lt]=Å is priedas korganizer programoje sudaro galimybÄ™ apžvelgti laiko tarpÄ… (pvz., užduoÄių arba mÄ—nesio peržiÅ«ra). Ä®galinus šį priedÄ… galÄ—site persijungti į laiko tarpo peržiÅ«rÄ… ir žiÅ«rÄ—ti įvykius tarsi Gantt diagramoje.
++Comment[lt]=Šis priedas korganizer programoje sudaro galimybę apžvelgti laiko tarpą (pvz., darbų arba mėnesio peržiūra). Įgalinus šį priedą galėsite persijungti į laiko tarpo peržiūrą ir žiūrėti įvykius tarsi Gantt diagramoje.
+ Comment[nb]=Dette tilleggsprogrammet lager en periodevisning for korganizer (slik som gjøreliste og månedsvisning). Hvis du slår på dette tilleggsprogrammet kan du bytte til periodevisning og se hendelser som i et Gantt-diagram.
+ Comment[nl]=Deze plugin biedt een weergave voor KOrganizer (zoals de takenlijst en de maandweergave). Wanneer u deze plugin inschakelt kunt u kiezen voor een weergave waarin u uw evenementen in een Gantt-diagram kunt bekijken.
+ Comment[pl]=Ta wtyczka tworzy widok zakresu czasu w KOrganizerze (tak jak widok zadań do zrobienia lub widok miesiąca). Po włączeniu tej wtyczki możliwe jest przełączenie się na widok zakresu czasu i przeglądanie zdarzeń jak na diagramie Gantta.
+Index: korganizer/korganizer_configcolors.desktop
+===================================================================
+--- korganizer/korganizer_configcolors.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/korganizer_configcolors.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -127,6 +127,7 @@
+ Keywords[eu]=korganizer,koloreak
+ Keywords[fi]=korganizer,värit
+ Keywords[fr]=KOrganizer,couleurs
++Keywords[ga]=korganizer,dathanna
+ Keywords[gl]=korganizer,cores
+ Keywords[hi]=के-आरà¥à¤—ेनाइज़र,रंग
+ Keywords[hu]=korganizer,szÃnek
+Index: korganizer/korganizer_configdesignerfields.desktop
+===================================================================
+--- korganizer/korganizer_configdesignerfields.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/korganizer_configdesignerfields.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -102,6 +102,7 @@
+ Keywords[et]=korganizer, seadistamine, seadistused, omaloodud väljad
+ Keywords[eu]=korganizer, konfiguratu, ezarpenak, eremu pertsonalizatuak
+ Keywords[fr]=KOrganizer, configuration, configurer, champs personnalisés
++Keywords[ga]=korganizer, cumraigh, socruithe, réimsà saincheaptha
+ Keywords[hi]=केऑरà¥à¤—ेनाइज़र, कॉनà¥à¤«à¤¼à¤¿à¤—र, विनà¥à¤¯à¤¾à¤¸, मनपसंद फ़ीलà¥à¤¡à¥à¤¸
+ Keywords[hu]=korganizer,beállÃtás,beállÃtások,egyéni mezÅ‘k
+ Keywords[is]=korganizer, stillingar, stilla, sérsniðnir reitir
+Index: korganizer/korganizer_configviews.desktop
+===================================================================
+--- korganizer/korganizer_configviews.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/korganizer_configviews.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -112,6 +112,7 @@
+ Keywords[eu]=korganizer,ikuspegia
+ Keywords[fi]=korganizer,näkymä
+ Keywords[fr]=KOrganizer,vues
++Keywords[ga]=korganizer,amharc
+ Keywords[gl]=korganizer,vista
+ Keywords[hi]=के-आरà¥à¤—ेनाइज़र,दृशà¥à¤¯
+ Keywords[hu]=korganizer,nézet
+Index: korganizer/korganizer-import.desktop
+===================================================================
+--- korganizer/korganizer-import.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/korganizer-import.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -21,6 +21,7 @@
+ Name[et]=Kalendri import
+ Name[eu]=Inportatu egutegia
+ Name[fr]=Importer un calendrier
++Name[ga]=Iompórtáil Féilire
+ Name[hi]=कैलेनà¥à¤¡à¤° आयात करें
+ Name[hu]=Naptár importálása
+ Name[is]=Flytja inn dagatal
+Index: korganizer/korganizer_configmain.desktop
+===================================================================
+--- korganizer/korganizer_configmain.desktop (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ korganizer/korganizer_configmain.desktop (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -16,6 +16,7 @@
+ Name[ar]=شخصي
+ Name[be]=ПÑÑ€ÑанальныÑ
+ Name[bg]=ПерÑоналноÑÑ‚
++Name[br]=Diouzhoc'h
+ Name[bs]=LiÄno
+ Name[cs]=OsobnÃ
+ Name[cy]=Personol
+@@ -55,6 +56,7 @@
+ Name[zh_CN]=个人
+ Comment=KOrganizer Main Configuration
+ Comment[bg]=Главни наÑтройки за KOrganizer
++Comment[br]=Kefluniadur kentañ KOrganizer
+ Comment[bs]=KOrganizer glavno podešavanje
+ Comment[ca]=Configuració principal a KOrganizer
+ Comment[cs]=Hlavnà nastavenà KOrganizeru
+@@ -67,6 +69,7 @@
+ Comment[eu]=KOrganizer-en konfigurazio nagusia
+ Comment[fi]=KOrganizerin pääasetukset
+ Comment[fr]=Configuration principale de KOrganizer
++Comment[ga]=PrÃomhchumraÃocht KOrganizer
+ Comment[gl]=Configuración Principal de KOrganizer
+ Comment[hi]=के-आरà¥à¤—ेनाइज़र मà¥à¤–à¥à¤¯ कॉनà¥à¤«à¤¼à¤¿à¤—रेशन
+ Comment[hu]=A KOrganizer alapbeállÃtásai
+Index: konsolekalendar/konsolekalendar.cpp
+===================================================================
+--- konsolekalendar/konsolekalendar.cpp (.../tags/KDE/3.4.2/kdepim) (revision 456035)
++++ konsolekalendar/konsolekalendar.cpp (.../branches/KDE/3.4/kdepim) (revision 456035)
+@@ -157,7 +157,8 @@
+
+ Event::List sortedList =
+ m_variables->getCalendar()->events( EventSortStartDate );
+-
++ if( sortedList.count() > 0)
++ {
+ QDate dt, firstdate, lastdate;
+ firstdate = sortedList.first()->dtStart().date();
+ lastdate = sortedList.last()->dtStart().date();
+@@ -167,6 +168,7 @@
+ Event::List events = m_variables->getCalendar()->events( dt, true );
+ status = printEventList( &ts, &events, dt );
+ }
++ }
+
+ } else if ( m_variables->isUID() ) {
+ kdDebug() << "konsolekalendar.cpp::showInstance() | "
+
+Property changes on: .
+___________________________________________________________________
+Name: svn:externals
+ + admin https://svn.kde.org/home/kde/branches/KDE/3.4/kde-common/admin
+
+
More information about the pkg-kde-commits
mailing list