[Pkg-kde-commits] rev 1605 - in branches/kde-3.4.0/packages/kdepim/debian: . patches po

Tue Aug 30 01:14:04 UTC 2005

Author: schepler
Date: 2005-08-30 01:14:02 +0000 (Tue, 30 Aug 2005)
New Revision: 1605

Added:
   branches/kde-3.4.0/packages/kdepim/debian/libkcal2b.install
   branches/kde-3.4.0/packages/kdepim/debian/libkdepim1a.install
   branches/kde-3.4.0/packages/kdepim/debian/libkmime2.install
   branches/kde-3.4.0/packages/kdepim/debian/libmimelib1c102.install
   branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050829.diff
   branches/kde-3.4.0/packages/kdepim/debian/po/vi.po
Removed:
   branches/kde-3.4.0/packages/kdepim/debian/libkcal2a.install
   branches/kde-3.4.0/packages/kdepim/debian/libkdepim1.install
   branches/kde-3.4.0/packages/kdepim/debian/libmimelib1a.install
   branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050601.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/10_korganizer_makefile.diff
Modified:
   branches/kde-3.4.0/packages/kdepim/debian/changelog
   branches/kde-3.4.0/packages/kdepim/debian/control
   branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install
   branches/kde-3.4.0/packages/kdepim/debian/libmimelib1-dev.install
   branches/kde-3.4.0/packages/kdepim/debian/rules
Log:
kdepim 3.4.2-1 packaging.


Modified: branches/kde-3.4.0/packages/kdepim/debian/changelog
===================================================================

--- branches/kde-3.4.0/packages/kdepim/debian/changelog	2005-08-29 18:40:02 UTC (rev 1604)
+++ branches/kde-3.4.0/packages/kdepim/debian/changelog	2005-08-30 01:14:02 UTC (rev 1605)
@@ -1,5 +1,25 @@
-kdepim (4:3.4.1-2) experimental; urgency=low
+kdepim (4:3.4.2-1) experimental; urgency=low
 
+  * New upstream release.
+  * Reenable gnokii support since the license issues have now been
+    resolved.
+  * Yet more ABI breakages:
+    + libkdepim1 -> libkdepim1a.  Closes: #312310.
+    + libkcal2a -> libkcal2b.  Closes: #312318.
+  * C++ transition:
+    + Tighten Build-Depends on kdelibs4-dev to new enough version.
+    + Rename libmimelib1a -> libmimelib1c102 in order not to break
+      lurker.  Also split out libkmime2 from this package while I'm
+      at it so that lurker users don't have to install kdelibs4.
+  * Add Vietnamese debconf translation.  Closes: #312159.
+  * Remove 10_korganizer_makefile.diff, which has been applied in
+    upstream SVN and thus is included in the kdepim_branch patch.
+  * Remove obsolete Conflicts and Replaces on packages not in sarge.
+
+ -- Daniel Schepler <schepler at debian.org>  Mon, 29 Aug 2005 16:07:45 -0700
+
+kdepim (4:3.4.1-2) UNRELEASED; urgency=low
+
   * Move libraries for egroupware, kolab, slox wizards to kdepim-wizards
     where they belong.  Thanks to Reinhold Kainhofer for reporting the
     issue.

Modified: branches/kde-3.4.0/packages/kdepim/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/control	2005-08-29 18:40:02 UTC (rev 1604)
+++ branches/kde-3.4.0/packages/kdepim/debian/control	2005-08-30 01:14:02 UTC (rev 1605)
@@ -3,15 +3,14 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Daniel Schepler <schepler at debian.org>
-Build-Depends: autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.1), libbluetooth1-dev, libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline4-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, sharutils, texinfo
+Build-Depends: autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.2), libbluetooth1-dev, libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
 Build-Depends-Indep: doxygen, qt3-doc, kdelibs4-doc
-Build-Conflicts: libgnokii2-dev, libgnokii2
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.2
 
 Package: kdepim
 Section: kde
 Architecture: all
-Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libkcal2a (>= ${Source-Version}), libkdepim1 (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1a (>= ${Source-Version})
+Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c102 (>= ${Source-Version})
 Suggests: kdepim-doc-html
 Description: KDE Personal Information Management metapackage
  kdepim is a collection of Personal Information Management (PIM) tools for the
@@ -24,8 +23,7 @@
 Section: devel
 Architecture: any
 Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra0-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
-Conflicts: libkdenetwork1 (<< 4:3.0.0), libkdenetwork2-dev (<< 4:3.2.0)
-Replaces: kmail (<< 4:3.2.0), knotes (<< 4:3.0.0), korganizer (<< 4:3.2.0), libkdenetwork1 (<< 4:3.0.0), libkdenetwork2-dev (<< 4:3.2.0), libkcal2-dev (<< 4:3.4.1)
+Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2)
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile kdepim applications.
  .
@@ -67,7 +65,6 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
 Suggests: kdepim-kresources
 Description: KDE NG addressbook application
  KAddressBook is the main address book application for KDE; it enables you
@@ -184,9 +181,6 @@
 Section: net
 Architecture: any
 Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11
-Conflicts: kgpgcertmanager
-Replaces: kgpgcertmanager
-Provides: kgpgcertmanager
 Description: KDE Certificate Manager
  Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm
  keybox and for retrieving certificates from LDAP servers.
@@ -199,7 +193,7 @@
 Depends: ${shlibs:Depends}, ${perl:Depends}, kdepim-kio-plugins | kdebase-kio-plugins
 Recommends: kdepim-kio-plugins, kdebase-kio-plugins, procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter, clamav | f-prot-installer
-Replaces: libkdenetwork2 (<< 4:3.2.92), kdepim-dev (<< 4:3.4.0), kdebase-data (<< 4:3.4.0)
+Replaces: kdepim-dev (<< 4:3.4.0), kdebase-data (<< 4:3.4.0)
 Provides: imap-client, mail-reader
 Description: KDE Email client
  KMail is a fully-featured email client that fits nicely into the KDE
@@ -215,7 +209,6 @@
 Section: mail
 Architecture: any
 Depends: ${shlibs:Depends}, kmail
-Replaces: kmail (<< 4:3.0.0)
 Description: KDE KMail mail folder converter
  Converts mail folders to KMail format.  Formats supported for import
  include Outlook Express, Evolution, and plain mbox.
@@ -226,7 +219,7 @@
 Section: news
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: libkdenetwork2 (<< 4:3.2.92), kdepim-dev (<< 4:3.4.0)
+Replaces: kdepim-dev (<< 4:3.4.0)
 Provides: news-reader
 Description: KDE news reader
  KNode is an easy-to-use, convenient newsreader. It is intended to be usable
@@ -240,7 +233,6 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: kontact (<< 4:3.2.92)
 Suggests: kdepim-kresources
 Description: KDE sticky notes
  KNotes is a program that lets you write sticky notes. The notes are saved
@@ -262,7 +254,6 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: korganizer (<< 4:3.2.0)
 Description: KDE konsole personal organizer
  To support console-based calendaring with KDE, the konsolekalendar
  complements the KDE KOrganizer with an according frontend to manage
@@ -276,8 +267,8 @@
 Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}, kitchensync, kmail, knode, knotes
 Suggests: ${shlibs:Suggests}, akregator, knewsticker, kweather
-Replaces: kontact-plugins (<< 4:3.2.92), akregator (<< 4:3.4.0), akregator-kontact-plugin
-Conflicts: kontact-plugins (<< 4:3.2.92), akregator-kontact-plugin
+Replaces: akregator (<< 4:3.4.0), akregator-kontact-plugin
+Conflicts: akregator-kontact-plugin
 Description: KDE pim application
  Kontact is the integrated solution to your personal information management
  needs. It combines KDE applications like KMail, KOrganizer, and
@@ -291,7 +282,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: kghostview
-Replaces: kalarm (<< 4:3.2.0)
 Description: KDE personal organizer
  A complete calendar and scheduling program. KOrganizer supports information
  interchange with other calendar applications through the industry standard
@@ -332,7 +322,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: knotes, korganizer
-Replaces: korganizer (<< 4:3.0.0)
 Description: KDE Palm Pilot hot-sync tool
  KPilot is an application that synchronizes your Palm Pilot or similar device
  (like the Handspring Visor) with your KDE desktop, much like the Palm HotSync
@@ -374,12 +363,12 @@
  .
  This package is part of the official KDE pim module.
 
-Package: libkcal2a
+Package: libkcal2b
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: kdepim-libs (<< 4:3.2.0), libkcal2
-Replaces: kdepim-libs (<< 4:3.2.0)
+Conflicts: libkcal2, libkcal2a
+Replaces: libkcal2a
 Suggests: kdepim-kresources
 Description: KDE calendaring library
  This library provides a C++ API for handling the vCalendar and iCalendar
@@ -392,9 +381,7 @@
 Package: libkcal2-dev
 Section: libdevel
 Architecture: any
-Depends: libkcal2a (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version})
-Conflicts: kdepim-libs (<< 4:3.0.0)
-Replaces: kdepim-dev (<< 4:3.2.0), kdepim-libs (<< 4:3.0.0)
+Depends: libkcal2b (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version})
 Description: KDE calendaring library [development]
  This library provides a C++ API for handling the vCalendar and iCalendar
  formats.
@@ -404,12 +391,12 @@
  .
  This package is part of the official KDE pim module.
 
-Package: libkdepim1
+Package: libkdepim1a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: kdepim-libs (<< 4:3.2.0)
-Replaces: kdepim-libs (<< 4:3.2.0), akregator (<< 4:3.4.0)
+Conflicts: libkdepim1
+Replaces: akregator (<< 4:3.4.0), libkdepim1
 Description: KDE PIM library
  This is the runtime package for programs that use the libkdepim library.
  .
@@ -418,7 +405,7 @@
 Package: libkdepim1-dev
 Section: libdevel
 Architecture: any
-Depends: libkdepim1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.4.1)
+Depends: libkdepim1a (= ${Source-Version}), kdelibs4-dev (>= 4:3.4.1)
 Replaces: kdepim-dev (<< 4:3.4.1)
 Description: KDE PIM library [development]
  This is the development package which contains the headers for the libkdepim
@@ -430,8 +417,6 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: kdepim-libs (<< 4:3.2.0)
-Replaces: kdepim-libs (<< 4:3.2.0)
 Description: KDE gantt charting library
  This is the runtime package for programs that use the libkgantt library.
  .
@@ -441,8 +426,6 @@
 Section: libdevel
 Architecture: any
 Depends: libkgantt0 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
-Conflicts: kdepim-libs (<< 4:3.0.0)
-Replaces: kdepim-dev (<< 4:3.2.0), kdepim-libs (<< 4:3.0.0)
 Description: KDE gantt charting library [development]
  This is the development package which contains the headers for the libkgantt
  library.
@@ -476,12 +459,22 @@
  .
  This package is part of the official KDE pim module.
 
+Package: libkmime2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libmimelib1a
+Replaces: libmimelib1a
+Description: KDE MIME interface library
+ This library provides a C++ interface to MIME messages, parsing them into
+ an object tree.
+ .
+ This package is part of the official KDE pim module.
+
 Package: libkpimexchange1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: kdepim-libs (<< 4:3.2.0)
-Replaces: kdepim-libs (<< 4:3.2.0)
 Description: KDE PIM Exchange library
  This is the runtime package for programs that use the libkpimexchange
  library. 
@@ -492,7 +485,6 @@
 Section: libdevel
 Architecture: any
 Depends: libkpimexchange1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
-Replaces: kdepim-dev (<< 4:3.2.0)
 Description: KDE PIM Exchange library [development]
  This is the development package which contains the headers for the
  libkpimexchange library.
@@ -562,11 +554,12 @@
  .
  This package is part of the official KDE pim module.
 
-Package: libmimelib1a
+Package: libmimelib1c102
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libmimelib1
+Conflicts: libmimelib1a
+Replaces: libmimelib1a
 Description: KDE mime library
  This library is used by several KDE applications to handle mime types.
  .
@@ -577,9 +570,7 @@
 Package: libmimelib1-dev
 Section: libdevel
 Architecture: any
-Depends: libmimelib1a (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
-Conflicts: libmimelib-dev (<< 4:3.0.0)
-Replaces: libmimelib-dev (<< 4:3.0.0)
+Depends: libmimelib1c102 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
 Description: KDE mime library [development]
  This library is used by several KDE applications to handle mime types.
  .

Modified: branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install	2005-08-29 18:40:02 UTC (rev 1604)
+++ branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install	2005-08-30 01:14:02 UTC (rev 1605)
@@ -50,6 +50,8 @@
 /usr/lib/libkgroupwaredav.so
 /usr/lib/libkitchensyncui.la
 /usr/lib/libkitchensyncui.so
+/usr/lib/libkmime.la
+/usr/lib/libkmime.so
 /usr/lib/libknoteskolab.la
 /usr/lib/libknoteskolab.so
 /usr/lib/libknotes_xmlrpc.la

Deleted: branches/kde-3.4.0/packages/kdepim/debian/libkcal2a.install

Copied: branches/kde-3.4.0/packages/kdepim/debian/libkcal2b.install (from rev 1604, branches/kde-3.4.0/packages/kdepim/debian/libkcal2a.install)

Deleted: branches/kde-3.4.0/packages/kdepim/debian/libkdepim1.install

Copied: branches/kde-3.4.0/packages/kdepim/debian/libkdepim1a.install (from rev 1604, branches/kde-3.4.0/packages/kdepim/debian/libkdepim1.install)

Added: branches/kde-3.4.0/packages/kdepim/debian/libkmime2.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkmime2.install	2005-08-29 18:40:02 UTC (rev 1604)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkmime2.install	2005-08-30 01:14:02 UTC (rev 1605)
@@ -0,0 +1,2 @@
+/usr/lib/libkmime.so.2
+/usr/lib/libkmime.so.2.2.0

Modified: branches/kde-3.4.0/packages/kdepim/debian/libmimelib1-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libmimelib1-dev.install	2005-08-29 18:40:02 UTC (rev 1604)
+++ branches/kde-3.4.0/packages/kdepim/debian/libmimelib1-dev.install	2005-08-30 01:14:02 UTC (rev 1605)
@@ -1,5 +1,3 @@
 /usr/include/kde/mimelib
-/usr/lib/libkmime.la
-/usr/lib/libkmime.so
 /usr/lib/libmimelib.la
 /usr/lib/libmimelib.so

Deleted: branches/kde-3.4.0/packages/kdepim/debian/libmimelib1a.install

Copied: branches/kde-3.4.0/packages/kdepim/debian/libmimelib1c102.install (from rev 1604, branches/kde-3.4.0/packages/kdepim/debian/libmimelib1a.install)
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libmimelib1a.install	2005-08-29 18:40:02 UTC (rev 1604)
+++ branches/kde-3.4.0/packages/kdepim/debian/libmimelib1c102.install	2005-08-30 01:14:02 UTC (rev 1605)
@@ -0,0 +1,2 @@
+/usr/lib/libmimelib.so.1
+/usr/lib/libmimelib.so.1.0.1

Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050601.diff

Added: 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-08-29 18:40:02 UTC (rev 1604)
+++ branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050829.diff	2005-08-30 01:14:02 UTC (rev 1605)
@@ -0,0 +1,1988 @@
+Index: akregator/ChangeLog
+===================================================================
+--- akregator/ChangeLog	(.../tags/KDE/3.4.2/kdepim)	(revision 454791)
++++ akregator/ChangeLog	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ akregator/src/pageviewer.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -361,7 +361,7 @@
+         if (copylinkaddress)
+         {
+             copylinkaddress->plug( &popup);
+-            popup.insertSeparator();
++            //popup.insertSeparator();
+         }
+     }
+     else // we are not on a link
+Index: akregator/src/akregator.kcfg
+===================================================================
+--- akregator/src/akregator.kcfg	(.../tags/KDE/3.4.2/kdepim)	(revision 454791)
++++ akregator/src/akregator.kcfg	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ akregator/src/aboutdata.h	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ akregator/src/librss/global.h	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ akregator/src/librss/document.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ akregator/src/librss/article.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ akregator/src/librss/article.h	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ akregator/src/akregator_view.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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: kresources/egroupware/kabc_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/kabc_xmlrpc.desktop	(.../tags/KDE/3.4.2/kdepim)	(revision 454791)
++++ kresources/egroupware/kabc_xmlrpc.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/egroupware/knotes_xmlrpc.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/egroupware/kcal_xmlrpc.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/exchange/exchange.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/slox/kcal_slox.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/slox/webdavhandler.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/slox/kabc_slox.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/groupdav/kabc_groupdav.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/groupdav/kcal_groupdav.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/kolab/kabc/kolab.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/kolab/knotes/kolabresource.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/kolab/kcal/kolab.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/kolab/kcal/resourcekolab.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/groupware/kabc_groupware.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/groupware/kcal_groupware.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/remote/remote.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kresources/newexchange/kcal_newexchange_final.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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: kmail/kmailicalifaceimpl.cpp
+===================================================================
+--- kmail/kmailicalifaceimpl.cpp	(.../tags/KDE/3.4.2/kdepim)	(revision 454791)
++++ kmail/kmailicalifaceimpl.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmail/kmail_config_composer.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmail/partNode.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmail/eventsrc	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmail/avscripts/kmail_sav.sh	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmail/avscripts/kmail_fprot.sh	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmail/avscripts/kmail_antivir.sh	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmail/avscripts/kmail_clamav.sh	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmail/keyresolver.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmail/kmsender.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ knode/knode_config_identity.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ knode/knode_config_cleanup.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ knode/knarticlewidget.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kalarm/alarmcalendar.h	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
+@@ -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 454791)
++++ libemailfunctions/email.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korn/KOrn.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmailcvt/filters.hxx	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmailcvt/filter_thunderbird.cxx	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmailcvt/filter_evolution_v2.cxx	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmailcvt/filter_outlook.cxx	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmailcvt/filter_pmail.cxx	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmailcvt/filter_oe.cxx	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmailcvt/filter_mbox.cxx	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmailcvt/filter_pmail.hxx	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kmailcvt/filter_oe.hxx	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kaddressbook/interfaces/kaddressbook_xxport.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kaddressbook/csv-templates/yahoo.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kaddressbook/editors/protocols/smsprotocol.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kaddressbook/features/distributionlist.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ libkdepim/komposer/plugins/default/defaulteditor.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ libkdepim/komposer/core/komposerplugin.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ libkdepim/komposer/core/komposereditor.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ libkcal/localdir.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ libkcal/local.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ libkcal/kabc.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ libkcal/icalformatimpl.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/ChangeLog	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/conduits/perlconduit/perl-conduit.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/conduits/malconduit/mal_conduit.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/conduits/knotes/knotes-conduit.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/conduits/pythonconduit/python-conduit.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/conduits/null/null-conduit.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/conduits/vcalconduit/todo-conduit.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/conduits/vcalconduit/vcal-conduit.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/kpilot/memoWidget.cc	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/kpilot/todoWidget.cc	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/kpilot/kpilot_config.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/kpilot/kpilot.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/kpilot/addressWidget.cc	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/kpilot/kpilotconduit.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/lib/options.h	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kpilot/lib/kpilotlink.cc	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/multisynk/multisynk.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/weather/weatherplugin.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/knode/knodeplugin.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/specialdates/kcmsdsummary.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/specialdates/specialdatesplugin.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/kpilot/kpilotplugin.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/knotes/knotesplugin.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/kaddressbook/kcmkabsummary.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/korganizer/kcmkorgsummary.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/korganizer/todoplugin.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/korganizer/korganizerplugin.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/kmail/kmailplugin.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/kmail/kcmkmailsummary.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/plugins/newsticker/newstickerplugin.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ kontact/src/kontact.setdlg	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/korganizer_configfonts.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/korganizer_configplugins.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/korganizer_configtime.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/Makefile.am	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/plugins/projectview/projectview.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/plugins/exchange/exchange.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/plugins/printing/whatsnext/whatsnextprint.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/plugins/printing/list/listprint.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/plugins/timespanview/timespanview.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/korganizer_configcolors.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/korganizer_configdesignerfields.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/korganizer_configviews.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/korganizer-import.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ korganizer/korganizer_configmain.desktop	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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 454791)
++++ konsolekalendar/konsolekalendar.cpp	(.../branches/KDE/3.4/kdepim)	(revision 454791)
+@@ -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
+
+

Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/10_korganizer_makefile.diff

Added: branches/kde-3.4.0/packages/kdepim/debian/po/vi.po
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/po/vi.po	2005-08-29 18:40:02 UTC (rev 1604)
+++ branches/kde-3.4.0/packages/kdepim/debian/po/vi.po	2005-08-30 01:14:02 UTC (rev 1605)
@@ -0,0 +1,55 @@
+# Vietnamese Translation for kdepim.
+# Copyright Â© 2005 Free Software Foundation, Inc.
+# Clytie Siddall <clytie at riverland.net.au>, 2005.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: kdepim 4/3.3.2-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-26 22:44-0500\n"
+"PO-Revision-Date: 2005-06-06 11:45+0930\n"
+"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#.Type: select
+#.choices
+#:../kpilot.templates:3
+msgid "None, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+msgstr "KhÃ´ng cÃ³, ttyS0, ttyS1, ttyS2, ttyS3, ircomm0, ttyUSB0, ttyUSB1"
+
+#.Type: select
+#.description
+#:../kpilot.templates:4
+msgid "Which communication port to use with the Palm?"
+msgstr "NÃªn dÃ¹ng cá»•ng liÃªn láº¡c nÃ o vá»›i thiáº¿t bá»‹ Palm?"
+
+#.Type: select
+#.description
+#:../kpilot.templates:4
+msgid ""
+"A symbolic file /dev/pilot may be created to the port use to talk to the "
+"Palm."
+msgstr "CÃ³ thá»ƒ táº¡o má»™t liÃªn káº¿t tÆ°á»£ng trÆ°ng Ä‘áº¿n cá»•ng sáº½ dÃ¹ng Ä‘á»ƒ liÃªn láº¡c vá»›i thiáº¿t bá»‹ Palm."
+
+#.Type: select
+#.description
+#:../kpilot.templates:4
+msgid ""
+"ttyS? are the four serial ports, ircomm0 is the IrDA (infra red) port, "
+"ttyUSB? are the USB ports."
+msgstr "â€¢ ttySx lÃ  cá»•ng ná»‘i tiáº¿p"
+"â€¢ ircommx lÃ  cá»•ng IrDA (há»“ng ngoáº¡i)"
+"â€¢ ttyUSBx lÃ  cá»•ng USB"
+
+#.Type: select
+#.description
+#:../kpilot.templates:4
+msgid ""
+"To ease the use of the Palm connected to the port its access rights will be "
+"lowered to allow access to any user.  If it is a security problem for you, "
+"select \"None\" and manage the link and its access rights yourself."
+msgstr "Äá»ƒ lÃ m cho dá»… dÃ ng sá» dá»¥ng thiáº¿t bá»‹ Palm Ä‘Æ°á»£c káº¿t ná»‘i Ä‘áº¿n cá»•ng nÃ y, Ä‘Ã£ má»Ÿ rá»™ng quyá»n háº¡n Ä‘á»ƒ cho phÃ©p má»i ngÆ°á»i truy cáºp nÃ³. Náº¿u lÃ m nhÆ° tháº¿ rá»§i rÃµ báº£o máºt trÃªn mÃ¡y tÃnh báº¡n, cÃ³ thá»ƒ chá»n Â«khÃ´ng cÃ³Â» táº¡i Ä‘Ã¢y, vÃ  tá»± quáº£n lÃ½ liÃªn káº¿t nÃ y vÃ  quyá»n háº¡n truy cáºp nÃ³."

Modified: branches/kde-3.4.0/packages/kdepim/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/rules	2005-08-29 18:40:02 UTC (rev 1604)
+++ branches/kde-3.4.0/packages/kdepim/debian/rules	2005-08-30 01:14:02 UTC (rev 1605)
@@ -12,6 +12,8 @@
 DEB_KDE_ENABLE_FINAL := yes
 DEB_KDE_APIDOX := yes
 
+DEB_CONFIGURE_SCRIPT_ENV += KMIX=/usr/bin/kmix
+
 DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
 
 post-patches:: debian/stamp-libtool-update
@@ -21,7 +23,7 @@
 	cp -f /usr/share/libtool/ltmain.sh $(DEB_SRCDIR)/admin/ltmain.sh
 	for f in /usr/share/automake-1.9/*; do \
 		if test -f $$f && ! test -L $$f && \
-			test $(DEB_SRCDIR)/admin/`basename $$f`; then \
+			test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
 			cp -f $$f $(DEB_SRCDIR)/admin/; \
 		fi; \
 	done
@@ -36,23 +38,24 @@
 
 DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
 
-shlibs_ver=4:3.4.0
-DEB_DH_MAKESHLIBS_ARGS_libkcal2a := -V'libkcal2a (>= 4:3.4.1)'
+shlibs_ver=4:3.4.2
+DEB_DH_MAKESHLIBS_ARGS_libkcal2b := -V'libkcal2b (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2 := -V'libkdenetwork2 (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libkdepim1 := -V'libkdepim1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkdepim1a := -V'libkdepim1a (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkgantt0 := -V'libkgantt0 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkleopatra0 := -V'libkleopatra0 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkmime2 := -V'libkmime2 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkpimexchange1 := -V'libkpimexchange1 (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libkpimidentities1 := -V'libkpimidentities1 (>= 4:3.4.1)'
+DEB_DH_MAKESHLIBS_ARGS_libkpimidentities1 := -V'libkpimidentities1 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libksieve0 := -V'libksieve0 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libktnef1 := -V'libktnef1 (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libmimelib1 := -V'libmimelib1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libmimelib1c102 := -V'libmimelib1c102 (>= $(shlibs_ver))'
 
 PACKAGES_WITH_LIBS := akregator kaddressbook kalarm kdepim-kresources \
 	kdepim-wizards kitchensync kleopatra kmail knode knotes kode kontact \
-	korganizer kpilot ksync ktnef libkcal2a libkdenetwork2 libkdepim1 \
-	libkgantt0 libkleopatra0a libkpimexchange1 libkpimidentities1 \
-	libksieve0 libktnef1 libmimelib1a
+	korganizer kpilot ksync ktnef libkcal2b libkdenetwork2 libkdepim1a \
+	libkgantt0 libkleopatra0a libkmime2 libkpimexchange1 \
+	libkpimidentities1 libksieve0 libktnef1 libmimelib1c102
 
 # kontact starts fine without korganizer or kpilot dependencies
 # specialdates is only in recommends to get the kaddressbook dependency there


