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

Daniel Schepler schepler at costa.debian.org
Fri Dec 2 09:58:04 UTC 2005


Author: schepler
Date: 2005-12-02 09:58:03 +0000 (Fri, 02 Dec 2005)
New Revision: 2496

Added:
   branches/kde-3.4.0/packages/kdepim/debian/libmimelib1c2a.install
   branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20051201.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/13_mimelib_self_contained.diff
Removed:
   branches/kde-3.4.0/packages/kdepim/debian/libmimelib1c2.install
   branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050901.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/po/vi.po
   branches/kde-3.4.0/packages/kdepim/debian/rules
Log:
kdepim-3.4.3-1 packaging


Modified: branches/kde-3.4.0/packages/kdepim/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/changelog	2005-12-02 08:56:03 UTC (rev 2495)
+++ branches/kde-3.4.0/packages/kdepim/debian/changelog	2005-12-02 09:58:03 UTC (rev 2496)
@@ -1,3 +1,20 @@
+kdepim (4:3.4.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Apply changes from SVN 3.4 branch.
+    + Fixes a FTBFS with newer versions of g++-4.0.
+  * Rename libmimelib1c2 to libmimelib1c2a due to C++ allocator changes.
+  * New patch 13_mimelib_self_contained.diff:
+    + Link against libkdefakes_pic.a instead of -lkdefakes to
+      eliminate mimelib's dependency on kdelibs.
+    + Fix mimelib/config.h not to require the KDE or QT headers again.
+      This allows dropping the libkdepim-dev dependency from
+      libmimelib1-dev.
+  * Adjust Build-Depends to ensure a version of kdelibs with the
+    allocator changes.
+
+ -- Daniel Schepler <schepler at debian.org>  Thu,  1 Dec 2005 19:59:09 +0100
+
 kdepim (4:3.4.2-2) unstable; urgency=medium
 
   +++ Changes by Adeodato Simó:

Modified: branches/kde-3.4.0/packages/kdepim/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/control	2005-12-02 08:56:03 UTC (rev 2495)
+++ branches/kde-3.4.0/packages/kdepim/debian/control	2005-12-02 09:58:03 UTC (rev 2496)
@@ -3,14 +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: g++-3.4 [arm m68k hppa], 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: g++-3.4 [arm m68k hppa], autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.3-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
 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}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2 (>= ${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}), libmimelib1c2a (>= ${Source-Version})
 Suggests: kdepim-doc-html
 Description: KDE Personal Information Management metapackage
  kdepim is a collection of Personal Information Management (PIM) tools for the
@@ -554,12 +554,12 @@
  .
  This package is part of the official KDE pim module.
 
-Package: libmimelib1c2
+Package: libmimelib1c2a
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libmimelib1a
-Replaces: libmimelib1a
+Conflicts: libmimelib1a, libmimelib1c2
+Replaces: libmimelib1a, libmimelib1c2
 Description: KDE mime library
  This library is used by several KDE applications to handle mime types.
  .
@@ -570,7 +570,7 @@
 Package: libmimelib1-dev
 Section: libdevel
 Architecture: any
-Depends: libmimelib1c2 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Depends: libmimelib1c2a (= ${Source-Version})
 Description: KDE mime library [development]
  This library is used by several KDE applications to handle mime types.
  .

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

Copied: branches/kde-3.4.0/packages/kdepim/debian/libmimelib1c2a.install (from rev 2009, branches/kde-3.4.0/packages/kdepim/debian/libmimelib1c2.install)

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

Added: branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20051201.diff
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20051201.diff	2005-12-02 08:56:03 UTC (rev 2495)
+++ branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20051201.diff	2005-12-02 09:58:03 UTC (rev 2496)
@@ -0,0 +1,1183 @@
+Index: akregator/src/akregator.desktop
+===================================================================
+--- akregator/src/akregator.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ akregator/src/akregator.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -22,6 +22,7 @@
+ GenericName[hu]=RSS hírolvasó
+ GenericName[is]=RSS fréttaforrit
+ GenericName[it]=Lettore Fonti RSS
++GenericName[ja]=RSS ニュースリーダ
+ GenericName[lt]=RSS kanalų skaityklė
+ GenericName[nb]=Leser for RSS-kanal
+ GenericName[nl]=RSS-feedlezer
+@@ -51,6 +52,7 @@
+ Comment[hu]=KDE-s hírolvasó RSS hírcsatornákhoz
+ Comment[is]=RSS fréttaforrit fyrir KDE
+ Comment[it]=Un concentratore KDE per RSS
++Comment[ja]=KDE 用 RSS アグレゲータ
+ Comment[nb]=En RSS-oppsamler for KDE
+ Comment[nl]=Een RSS-agregator voor KDE
+ Comment[nn]=Ein RSS-lesar for KDE
+Index: akregator/src/eventsrc
+===================================================================
+--- akregator/src/eventsrc	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ akregator/src/eventsrc	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -22,6 +22,7 @@
+ Name[hu]=Hírforrás felvéve
+ Name[is]=Þjóni bætt við
+ Name[it]=Aggiunta fonte
++Name[ja]=フィード追加
+ Name[lt]=Kanalas pridėtas
+ Name[nb]=Kanal lagt til
+ Name[nl]=Feed toegevoegd
+@@ -52,6 +53,7 @@
+ Comment[hu]=Egy hírforrást távolról felvettek az Akregatorba
+ Comment[is]=Nýjum þjóni var bætt við Akregator
+ Comment[it]=Una nuova fonte è stata aggiunta ad Akregator da remoto
++Comment[ja]=新規フィードがリモートで Akregator に追加されました
+ Comment[lt]=Naujas nutolęs naujienų kanalas buvo įdėtas į Akregator
+ Comment[nb]=En ny kanal ble lagt til Akgregator utenfra 
+ Comment[nl]=Er was extern een nieuwe feed toegevoegd aan Akregator
+@@ -87,6 +89,7 @@
+ Name[hu]=Hírekk
+ Name[is]=Nýjar greinar
+ Name[it]=Nuovi articoli
++Name[ja]=新規記事
+ Name[lt]=Nauji straipsniai
+ Name[nb]=Nye artikler
+ Name[nl]=Nieuwe artikelen
+@@ -118,6 +121,7 @@
+ Comment[hu]=Új hírek lettek letöltve
+ Comment[is]=Nýjar greinar voru sóttar
+ Comment[it]=I nuovi articoli sono stati recuperati
++Comment[ja]=新規記事が取得されました
+ Comment[lt]=Nauji straipsniai parsiųsti
+ Comment[nb]=Nye artikler ble hentet
+ Comment[nl]=Nieuw artikelen zijn opgehaald
+Index: akregator/src/trayicon.cpp
+===================================================================
+--- akregator/src/trayicon.cpp	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ akregator/src/trayicon.cpp	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -117,9 +117,9 @@
+     m_unread=unread;
+     
+     QToolTip::remove(this);
+-    QToolTip::add(this, i18n("Akregator - 1 unread article", "Akregator - %n unread articles", unread));
++    QToolTip::add(this, i18n("Akregator - 1 unread article", "Akregator - %n unread articles", unread > 0 ? unread : 0));
+     
+-    if (unread == 0)
++    if (unread <= 0)
+     {    
+         setPixmap(m_defaultIcon);
+     }
+Index: kresources/egroupware/xmlrpciface.h
+===================================================================
+--- kresources/egroupware/xmlrpciface.h	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/egroupware/xmlrpciface.h	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -159,7 +159,7 @@
+   for ( ; it != end; ++it )
+     args << QVariant( *it );
+ 
+-  return call( method, args, id );
++  return call( method, args, faultObj, faultSlot, msgObj, messageSlot, id );
+ }
+ 
+ #endif
+Index: kresources/egroupware/kabc_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/kabc_xmlrpc.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/egroupware/kabc_xmlrpc.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ 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)
++Name[ja]=Name=eGroupware サーバ (XML-RPC 経由)
+ Name[lt]=eGroupware serveris (per XML-RPC)
+ Name[nb]=eGroupware-tjener (via XML-RPPC)
+ Name[nl]=eGroupware-server (via XML-RPC)
+Index: kresources/egroupware/knotes_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/knotes_xmlrpc.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/egroupware/knotes_xmlrpc.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ 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)
++Name[ja]=Name=eGroupware サーバ (XML-RPC 経由)
+ Name[lt]=eGroupware serveris (per XML-RPC)
+ Name[nb]=eGroupware-tjener (via XML-RPPC)
+ Name[nl]=eGroupware-server (via XML-RPC)
+Index: kresources/egroupware/kcal_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/kcal_xmlrpc.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/egroupware/kcal_xmlrpc.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ 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)
++Name[ja]=Name=eGroupware サーバ (XML-RPC 経由)
+ Name[lt]=eGroupware serveris (per XML-RPC)
+ Name[nb]=eGroupware-tjener (via XML-RPPC)
+ Name[nl]=eGroupware-server (via XML-RPC)
+Index: kresources/exchange/exchange.desktop
+===================================================================
+--- kresources/exchange/exchange.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/exchange/exchange.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -22,6 +22,7 @@
+ Name[hu]=Exchange 2000-kiszolgáló
+ Name[is]=Exchange 2000 þjónn
+ Name[it]=Server Exchange 2000
++Name[ja]=Exchange 2000 サーバ
+ Name[lt]=Exchange 2000 serveris
+ Name[nb]=Exchange 2000-tjener
+ Name[nl]=Exchange2000-server
+Index: kresources/exchange/exchange_deprecated.desktop
+===================================================================
+--- kresources/exchange/exchange_deprecated.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/exchange/exchange_deprecated.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ Name[hu]=Exchange 2000-kiszolgáló (elavult)
+ Name[is]=Exchange 2000 þjónn (úrelt)
+ Name[it]=Server Exchange 2000 (deprecato)
++Name[ja]=Exchange 2000 サーバ (不賛成)
+ Name[lt]=Exchange 2000 serveris (deprecated)
+ Name[nb]=Exchange 2000-tjener (frarådet)
+ Name[nl]=Exchange 2000-server (afgeraden)
+Index: kresources/groupwise/kcal_groupwise.desktop
+===================================================================
+--- kresources/groupwise/kcal_groupwise.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/groupwise/kcal_groupwise.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ Name[hu]=Novell GroupWise kiszolgáló
+ Name[is]=Novell GroupWise þjónn
+ Name[it]=Server Novell GroupWise
++Name[ja]=Novell GroupWise サーバ
+ Name[lt]=Novell GroupWise serveris
+ Name[nb]=Novell GroupWise-tjener
+ Name[nl]=Novell GroupWise-server
+Index: kresources/groupwise/kabc_groupwise.desktop
+===================================================================
+--- kresources/groupwise/kabc_groupwise.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/groupwise/kabc_groupwise.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ Name[hu]=Novell GroupWise kiszolgáló
+ Name[is]=Novell GroupWise þjónn
+ Name[it]=Server Novell GroupWise
++Name[ja]=Novell GroupWise サーバ
+ Name[lt]=Novell GroupWise serveris
+ Name[nb]=Novell GroupWise-tjener
+ Name[nl]=Novell GroupWise-server
+Index: kresources/slox/kcal_slox.desktop
+===================================================================
+--- kresources/slox/kcal_slox.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/slox/kcal_slox.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ Name[hu]=SUSE LINUX Openexchange-kiszolgáló
+ Name[is]=SUSE LINUX Openexchange þjónn
+ Name[it]=Server SUSE LINUX Openexchange
++Name[ja]=SUSE LINUX Openexchange サーバ
+ Name[lt]=SUSE LINUX Openexchange serveris
+ Name[nb]=SUSE LINUX Openexchange-tjener
+ Name[nl]=SUSE LINUX Openexchange-server
+Index: kresources/slox/kabc_slox.desktop
+===================================================================
+--- kresources/slox/kabc_slox.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/slox/kabc_slox.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ Name[hu]=SUSE LINUX Openexchange-kiszolgáló
+ Name[is]=SUSE LINUX Openexchange þjónn
+ Name[it]=Server SUSE LINUX Openexchange
++Name[ja]=SUSE LINUX Openexchange サーバ
+ Name[lt]=SUSE LINUX Openexchange serveris
+ Name[nb]=SUSE LINUX Openexchange-tjener
+ Name[nl]=SUSE LINUX Openexchange-server
+Index: kresources/groupdav/kabc_groupdav.desktop
+===================================================================
+--- kresources/groupdav/kabc_groupdav.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/groupdav/kabc_groupdav.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ Name[hu]=GroupDAV-kiszolgáló (pl. OpenGroupware)
+ Name[is]=GroupDAV þjónn (t.d. OpenGroupware)
+ Name[it]=Server GroupDAV (per es. OpenGroupware)
++Name[ja]=GroupDAV サーバ (例えば OpenGroupware)
+ Name[lt]=GroupDAV serveris (pvz.: OpenGroupware)
+ Name[nb]=GroupDAV-tjener (f.eks. OpenGroupware)
+ Name[nl]=GroupDAV-server (OpenGroupware)
+Index: kresources/groupdav/kcal_groupdav.desktop
+===================================================================
+--- kresources/groupdav/kcal_groupdav.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/groupdav/kcal_groupdav.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ Name[hu]=GroupDAV-kiszolgáló (pl. OpenGroupware)
+ Name[is]=GroupDAV þjónn (t.d. OpenGroupware)
+ Name[it]=Server GroupDAV (per es. OpenGroupware)
++Name[ja]=GroupDAV サーバ (例えば OpenGroupware)
+ Name[lt]=GroupDAV serveris (pvz.: OpenGroupware)
+ Name[nb]=GroupDAV-tjener (f.eks. OpenGroupware)
+ Name[nl]=GroupDAV-server (OpenGroupware)
+Index: kresources/blogging/blogging.desktop
+===================================================================
+--- kresources/blogging/blogging.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/blogging/blogging.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -11,6 +11,7 @@
+ Name[hi]=सर्वर पर ब्लॉग के रूप में जर्नल्स
+ Name[hu]=Naplók blogként tárolása a kiszolgálón
+ Name[it]=Diari come blog su un server
++Name[ja]=サーバ上のブログとしての Journals
+ Name[lt]=Dienynai kaip Blog'ai serveryje
+ Name[nb]=Dagbok som blogg på en tjener
+ Name[nl]=Journalen als blogs op een server
+Index: kresources/kolab/kabc/kolab.desktop
+===================================================================
+--- kresources/kolab/kabc/kolab.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/kolab/kabc/kolab.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ 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
++Name[ja]=KMail 経由 IMAP サーバのアドレス帳
+ Name[lt]=Adresų knygelė IMAP serveryje per KMail
+ Name[nb]=Adressebok på IMAP-tjener via KMail
+ Name[nl]=Adresboek op IMAP-server via KMail
+Index: kresources/kolab/knotes/kolabresource.desktop
+===================================================================
+--- kresources/kolab/knotes/kolabresource.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/kolab/knotes/kolabresource.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ Name[hu]=IMAP-kiszolgáló a KMailen keresztül
+ Name[is]=IMAP þjónn gegnum KMail
+ Name[it]=Server IMAP via KMail
++Name[ja]=KMail 経由 IMAP サーバ
+ Name[lt]=IMAP serveris per KMail
+ Name[nb]=IMAP-tjener via KMail
+ Name[nl]=IMAP-server via KMail
+Index: kresources/kolab/kcal/kolab.desktop
+===================================================================
+--- kresources/kolab/kcal/kolab.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/kolab/kcal/kolab.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ 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
++Name[ja]==KMail 経由 IMAP サーバのカレンダー
+ Name[lt]=Kalendorius IMAP serveryje per KMail
+ Name[nb]=Kalender på IMAP-tjener via KMail
+ Name[nl]=Agenda op IMAP-server via KMail
+Index: kresources/groupware/kabc_groupware.desktop
+===================================================================
+--- kresources/groupware/kabc_groupware.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/groupware/kabc_groupware.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ Name[hu]=Groupware kiszolgáló
+ Name[is]=Groupware þjónn
+ Name[it]=Server Groupware
++Name[ja]=グループウェアサーバ
+ Name[lt]=Grupinio darbo serveris
+ Name[nb]=Groupware-tjener
+ Name[nl]=Groupware-server
+Index: kresources/groupware/kcal_groupware.desktop
+===================================================================
+--- kresources/groupware/kcal_groupware.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/groupware/kcal_groupware.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ Name[hu]=Groupware kiszolgáló
+ Name[is]=Groupware þjónn
+ Name[it]=Server Groupware
++Name[ja]=グループウェアサーバ
+ Name[lt]=Grupinio darbo serveris
+ Name[nb]=Groupware-tjener
+ Name[nl]=Groupware-server
+Index: kresources/newexchange/kabc_newexchange.desktop
+===================================================================
+--- kresources/newexchange/kabc_newexchange.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/newexchange/kabc_newexchange.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -14,6 +14,7 @@
+ Name[hu]=Exchange-kiszolgáló címjegyzéke (kísérleti)
+ Name[is]=Vistfangaskrá Exchange þjóni (á tilraunarstigi)
+ Name[it]=Rubrica indirizzi su un server Exchange (sperimentale)
++Name[ja]=Exchange サーバのアドレス帳 (実験版)
+ Name[lt]=Adresų knygelė Exchange serveryje (eksperimentine tvarka)
+ Name[nb]=Adressebok på en Exchange-tjener (forsøksvis)
+ Name[nl]=Adresboek op een Exchange-server (experimenteel)
+Index: kresources/newexchange/kabc_newexchange_final.desktop
+===================================================================
+--- kresources/newexchange/kabc_newexchange_final.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/newexchange/kabc_newexchange_final.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ Name[hu]=Exchange-kiszolgáló címjegyzéke
+ Name[is]=Vistfangaskrá á Exchange þjóni
+ Name[it]=Rubrica indirizzi su un server Exchange
++Name[ja]==Exchange サーバのアドレス帳
+ Name[lt]=Adresų knygelė Exchange serveryje
+ Name[nb]=Adressebok på en Exchange-tjener
+ Name[nl]=Adresboek op een Exchange-server
+Index: kresources/newexchange/kcal_newexchange.desktop
+===================================================================
+--- kresources/newexchange/kcal_newexchange.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/newexchange/kcal_newexchange.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -14,6 +14,7 @@
+ Name[hu]=Exchange 2000-kiszolgáló naptára (kísérleti)
+ Name[is]=Dagatal á Exchange þjóni (á tilraunarstigi)
+ Name[it]=Calendario su un server Exchange (sperimentale)
++Name[ja]=Exchange サーバのカレンダー (実験版)
+ Name[lt]=Kalendorius Exchange serveryje (eksperimentine tvarka)
+ Name[nb]=Kalender på en Exchange-tjener (forsøksvis)
+ Name[nl]=Agenda op een Exchange-server (experimenteel)
+Index: kresources/newexchange/kcal_newexchange_final.desktop
+===================================================================
+--- kresources/newexchange/kcal_newexchange_final.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kresources/newexchange/kcal_newexchange_final.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -17,6 +17,7 @@
+ Name[hu]=Exchange 2000-kiszolgáló naptára
+ Name[is]=Dagatal á Exchange þjóni
+ Name[it]=Calendario su un server Exchange
++Name[ja]=Exchange サーバのカレンダー
+ Name[lt]=Kalendorius Exchange serveryje
+ Name[nb]=Kalender på en Exchange-tjener
+ Name[nl]=Agenda op een Exchange-server
+Index: certmanager/kwatchgnupg/aboutdata.cpp
+===================================================================
+--- certmanager/kwatchgnupg/aboutdata.cpp	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ certmanager/kwatchgnupg/aboutdata.cpp	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -51,6 +51,7 @@
+ 
+ static const about_data credits[] = {
+   // PENDING(steffen) add stuff
++  ""
+ };
+ 
+ AboutData::AboutData()
+Index: certmanager/lib/libkleopatrarc.desktop
+===================================================================
+--- certmanager/lib/libkleopatrarc.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ certmanager/lib/libkleopatrarc.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ Name[hu]=Nem ellenőrzött kulcs
+ Name[is]=Ekki staðfestur lykill
+ Name[it]=Chiave non validata
++Name[ja]=有効な鍵がありません
+ Name[lt]=Nevaliduotas raktas
+ Name[nb]=Nøkkel ikke sjekket for gyldighet
+ Name[nl]=Geen gevalideerde sleutel
+@@ -53,6 +54,7 @@
+ Name[hu]=Lejárt kulcs
+ Name[is]=Útrunninn lykill
+ Name[it]=Chiave scaduta
++Name[ja]=有効期限切れな鍵
+ Name[lt]=Baigęs galioti raktas
+ Name[nb]=Utgått nøkkel
+ Name[nl]=Verlopen sleutel
+@@ -87,6 +89,7 @@
+ Name[hu]=Visszavont kulcs
+ Name[is]=Afturkallaður lykill
+ Name[it]=Chiave revocata
++Name[ja]=無効化された鍵
+ Name[lt]=Atšauktas raktas
+ Name[nb]=Tilbakekalt nøkkel
+ Name[nl]=Ingetrokken sleutel
+@@ -121,6 +124,7 @@
+ Name[hu]=Megbízható gyökértanúsítvány
+ Name[is]=Treyst rótarskilríki
+ Name[it]=Certificato radice affidabile
++Name[ja]=信頼された Root 証明書
+ Name[lt]=Patikimas root sertifikatas
+ Name[nb]=Tiltrodd rot-sertifikat
+ Name[nl]=Vertrouwd hoofdcertificaat
+@@ -155,6 +159,7 @@
+ Name[hu]=Nem megbízható gyökértanúsítvány
+ Name[is]=Ekki traust rótarskilríki
+ Name[it]=Certificato radice non affidabile
++Name[ja]=信頼されてない Root 証明書
+ Name[lt]=Nepatikimas root sertifikatas
+ Name[nb]=Ikke tiltrodd rot-sertifikat
+ Name[nl]=Niet vertrouwd hoofdcertificaat
+@@ -190,6 +195,7 @@
+ Name[hu]=Egyéb kulcsok
+ Name[is]=Aðrir lyklar
+ Name[it]=Altre chiavi
++Name[ja]=他の鍵
+ Name[lt]=Kiti raktai
+ Name[nb]=Andre nøkler
+ Name[nl]=Andere sleutels
+Index: networkstatus/networkstatus.desktop
+===================================================================
+--- networkstatus/networkstatus.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ networkstatus/networkstatus.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -14,6 +14,7 @@
+ Name[hu]=Hálózati állapotjelző szolgáltatás
+ Name[is]=Netstöðupúki
+ Name[it]=Demone dello stato della rete
++Name[ja]=ネットワークステータスデーモン
+ Name[lt]=Tinklo statuso tarnyba
+ Name[nb]=Statusnisse for nettverket
+ Name[nl]=Netwerkstatusdaemon
+@@ -41,6 +42,7 @@
+ Comment[hu]=Figyeli a hálózati csatolók állapotát és értesítési lehetőséget biztosít hálózati alkalmazások számára.
+ Comment[is]=Fylgist með stöðu netkorta og sendir tilkynningar til forrita sem nota netið.
+ Comment[it]=Controlla lo stato delle interfacce di rete e fornisce notifiche alle applicazioni che usano al rete.
++Comment[ja]=ネットワークインターフェイスの状態を追跡し、ネットワークを用いるアプリケーションに通知する。
+ Comment[lt]=Seka tinklo sąsajų būseną ir informuoja apie jas programas, naudojančias tinklą
+ Comment[nb]=Overvåker status for nettverksgrensesnitt og varsler programmer som bruker nettverket.
+ Comment[nl]=Houdt de status bij van de netwerkinterfaces en houdt daar de toepassingen van op de hoogte.
+Index: kalarm/kamail.cpp
+===================================================================
+--- kalarm/kamail.cpp	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kalarm/kamail.cpp	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -794,7 +794,7 @@
+ */
+ int KAMail::checkAttachment(QString& attachment, KURL* url)
+ {
+-	attachment.stripWhiteSpace();
++	attachment = attachment.stripWhiteSpace();
+ 	if (attachment.isEmpty())
+ 	{
+ 		if (url)
+Index: kalarm/editdlg.cpp
+===================================================================
+--- kalarm/editdlg.cpp	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kalarm/editdlg.cpp	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -1808,7 +1808,7 @@
+ 			result = mCmdScriptEdit->text();
+ 		else
+ 			result = mCmdCommandEdit->text();
+-		result.stripWhiteSpace();
++		result = result.stripWhiteSpace();
+ 	}
+ 	else if (mFileRadio->isOn())
+ 	{
+Index: kalarm/kalarmd/kalarmd.desktop
+===================================================================
+--- kalarm/kalarmd/kalarmd.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kalarm/kalarmd/kalarmd.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -20,6 +20,7 @@
+ Name[hu]=KAlarm szolgáltatás
+ Name[is]=KAlarm þjónn
+ Name[it]=Demone degli avvisi
++Name[ja]=KAlarm デーモン
+ Name[lt]=KAlarm tarnyba
+ Name[nb]=KAlarm-nisse
+ Name[nn]=KAlarm-nisse
+Index: kalarm/kalarmd/kalarmd.autostart.desktop
+===================================================================
+--- kalarm/kalarmd/kalarmd.autostart.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kalarm/kalarmd/kalarmd.autostart.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -20,6 +20,7 @@
+ Name[hu]=KAlarm szolgáltatás
+ Name[is]=KAlarm þjónn
+ Name[it]=Demone degli avvisi
++Name[ja]=KAlarm デーモン
+ Name[lt]=KAlarm tarnyba
+ Name[nb]=KAlarm-nisse
+ Name[nn]=KAlarm-nisse
+@@ -54,6 +55,7 @@
+ Comment[hu]=A KAlarm emlékeztető szolgáltatás automatikus elindítása
+ Comment[is]=Ræsa KAlarm áminningaþjónn sjálfkrafa við byrjun setu
+ Comment[it]=Avvio automatico del demone degli avvisi
++Comment[ja]=KAlarm アラームデーモンのログイン時の自動起動
+ Comment[lt]=KOrganizer/KAlarm priminimų tarnybos automatinis paleidimas prisiregistruojant
+ Comment[nb]=start alarmnisse ved innlogging
+ Comment[nl]=KAlarm alarmdaemon automatisch starten bij login
+Index: kaddressbook/kaddressbook.desktop
+===================================================================
+--- kaddressbook/kaddressbook.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kaddressbook/kaddressbook.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -29,6 +29,7 @@
+ GenericName[hu]=Címjegyzékkezelő
+ GenericName[is]=Vistfangastjóri
+ GenericName[it]=Gestore degli indirizzi
++GenericName[ja]=アドレスマネージャ
+ GenericName[lt]=Adresų tvarkyklė
+ GenericName[nb]=Addressehåndterer
+ GenericName[nl]=Adresboekbeheerder
+Index: kaddressbook/editors/protocols/meanwhileprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/meanwhileprotocol.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kaddressbook/editors/protocols/meanwhileprotocol.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -21,6 +21,7 @@
+ Comment[hu]=Meanwhile protokoll
+ Comment[is]=Meanwhile samskiptamátinn
+ Comment[it]=Protocollo Meanwhile
++Comment[ja]=Meanwhile プロトコル
+ Comment[lt]=Meanwhile protokolas
+ Comment[nb]=Meanwhile-protokoll
+ Comment[nl]=Meanwhile-protocol
+Index: kaddressbook/editors/protocols/groupwiseprotocol.desktop
+===================================================================
+--- kaddressbook/editors/protocols/groupwiseprotocol.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kaddressbook/editors/protocols/groupwiseprotocol.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -13,6 +13,7 @@
+ Comment[eu]=Novell GroupWise mezularia
+ Comment[fr]=Messagerie GroupWise de Novell
+ Comment[he]=מסנג'ר של Novell GroupWise
++Comment[ja]=Novell GroupWiseメッセンジャ
+ Comment[lt]=Novell GroupWise momentinių žinučių klientas
+ Comment[nl]=Novell GroupWise-messenger
+ Comment[pl]=Komunikator Novell GroupWise
+Index: kaddressbook/editors/imaddresseditor.desktop
+===================================================================
+--- kaddressbook/editors/imaddresseditor.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kaddressbook/editors/imaddresseditor.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ Name[hi]=इंस्टैंट मैसेजिंग
+ Name[hu]=Azonnali üzenetküldés (IM)
+ Name[it]=Messaggistica istantanea
++Name[ja]=インスタントメッセージ
+ Name[lt]=Momentinės žinutės
+ Name[nb]=Lynmelding
+ Name[nn]=Lynmelding
+Index: kaddressbook/kcmconfigs/kabconfig.desktop
+===================================================================
+--- kaddressbook/kcmconfigs/kabconfig.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kaddressbook/kcmconfigs/kabconfig.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -31,6 +31,7 @@
+ Name[hu]=Általános
+ Name[is]=Almennt
+ Name[it]=Generale
++Name[ja]=一般
+ Name[lt]=Bendras
+ Name[nb]=Generelt
+ Name[nl]=Algemeen
+Index: plugins/kmail/bodypartformatter/text_xdiff.desktop
+===================================================================
+--- plugins/kmail/bodypartformatter/text_xdiff.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ plugins/kmail/bodypartformatter/text_xdiff.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -37,6 +37,7 @@
+ Comment[hi]=पाठ/एक्स-डिफ़ के लिए बॉडीपार्ट फ़ॉर्मेटर प्लगइन
+ Comment[hu]=Formázómodul text/x-diff adatok kezeléséhez
+ Comment[it]=Un plugin per formattare il corpo di text/x-diff
++Comment[ja]=text/x-diff 用の bodypart フォーマッタプラグイン
+ Comment[nb]=Et programtilllegg for text/x-diff for brødtekst-formatering
+ Comment[nl]=Een opmaakplugin voor text/x-diff
+ Comment[pl]=Wtyczka formatująca dla text/x-diff
+Index: kitchensync/multisynk/multisynk.desktop
+===================================================================
+--- kitchensync/multisynk/multisynk.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kitchensync/multisynk/multisynk.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -20,6 +20,7 @@
+ GenericName[hu]=Szinkronizáció
+ GenericName[is]=Samstilling
+ GenericName[it]=Sincronizzazione
++GenericName[ja]=同期
+ GenericName[lt]=Sinchronizacija
+ GenericName[nb]=Synkronisering
+ GenericName[nl]=Synchronisatie
+Index: kitchensync/kitchensync/plucker/kitchensync-pluck-rdf.desktop
+===================================================================
+--- kitchensync/kitchensync/plucker/kitchensync-pluck-rdf.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kitchensync/kitchensync/plucker/kitchensync-pluck-rdf.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -17,6 +17,7 @@
+ Name[hu]=Hozzáadás a KitchenSync Plucker bővítőmodulhoz
+ Name[is]=Bæta við KitchenSync Plucker íforritið
+ Name[it]=Aggiungi al plugin KitchenSync Plucker
++Name[ja]=KitchenSync Plucker プラグインに追加
+ Name[lt]=KitchenSync Plucker priedo pridėlis
+ Name[nb]=Programtillegg for KitchenSync-plukking
+ Name[nl]=Toevoegen aan KitchenSync Plucker Plugin
+Index: kitchensync/kitchensync/plucker/kitchensync-pluck.desktop
+===================================================================
+--- kitchensync/kitchensync/plucker/kitchensync-pluck.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kitchensync/kitchensync/plucker/kitchensync-pluck.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -17,6 +17,7 @@
+ Name[hu]=Hozzáadás a KitchenSync Plucker bővítőmodulhoz
+ Name[is]=Bæta við KitchenSync Plucker íforritið
+ Name[it]=Aggiungi al plugin KitchenSync Plucker
++Name[ja]=KitchenSync Plucker プラグインに追加
+ Name[lt]=KitchenSync Plucker priedo pridėlis
+ Name[nb]=Programtillegg for KitchenSync-plukking
+ Name[nl]=Toevoegen aan KitchenSync Plucker Plugin
+Index: kitchensync/kitchensync/plucker/plucker.desktop
+===================================================================
+--- kitchensync/kitchensync/plucker/plucker.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kitchensync/kitchensync/plucker/plucker.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -11,6 +11,7 @@
+ Name[hi]=प्लकर पार्ट
+ Name[hu]=Plucker objektum
+ Name[is]=Plucker hluti
++Name[ja]=Plucker パート
+ Name[lt]=Plucker komponentas
+ Name[nb]=Plucker-del
+ Name[nl]=Plucker part
+Index: kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop
+===================================================================
+--- kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -17,6 +17,7 @@
+ Name[hu]=Demókonnektor többszálú megvalósításra
+ Name[is]=Prufu Konnector fyrir fjölþráða útfærslu
+ Name[it]=Connettore demo per un'implementazione basata su thread
++Name[ja]=スレッド化された実装のための Demo Konnector
+ Name[nb]=Demo konnector for en trådet implementering
+ Name[nl]=Demo-Konnector voor 'threaded' implementatie
+ Name[pl]=Przykładowy Konnector dla implementacji wielowątkowej
+Index: kitchensync/libkonnector2/filter.desktop
+===================================================================
+--- kitchensync/libkonnector2/filter.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kitchensync/libkonnector2/filter.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ Comment[hu]=Szűrő a KitchenSync-csatolóhoz
+ Comment[is]=Sía fyrir KitchenSync Konnector
+ Comment[it]=Filtro per il Konnector KitchenSync
++Comment[ja]=KitchenSync Konnector 用フィルタ
+ Comment[lt]=Filtras, skirtas KitchenSync Konnector
+ Comment[nb]=Programtillegg for KitchenSync Konnector
+ Comment[nl]=Filter voor KitchenSync Konnector
+Index: kitchensync/libksync/merger.h
+===================================================================
+--- kitchensync/libksync/merger.h	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kitchensync/libksync/merger.h	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -23,6 +23,7 @@
+ #define KITCHENSYNC_KSYNC_MERGER_H
+ 
+ #include "syncentry.h"
++#include "syncee.h"
+ 
+ #include <qbitarray.h>
+ #include <qstring.h>
+Index: libkdepim/komposer/plugins/default/defaulteditor.desktop
+===================================================================
+--- libkdepim/komposer/plugins/default/defaulteditor.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ libkdepim/komposer/plugins/default/defaulteditor.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -33,6 +33,7 @@
+ Name[hu]=Komposer szerkesztő
+ Name[is]=Komposer ritill
+ Name[it]=Editor Komposer
++Name[ja]=Komposer エディタ
+ Name[lt]=Komposer redaktorius
+ Name[nb]=Komposer-redigering
+ Name[nl]=Komposer-editor
+@@ -64,6 +65,7 @@
+ Comment[hu]=A Komposer alapértelmezett szerkesztője
+ Comment[is]=Sjálfgefinn ritill Komposer
+ Comment[it]=Editor di default per Komposer
++Comment[ja]=Komposer 標準エディタ
+ Comment[lt]=Komposer numatytasis redaktorius
+ Comment[nb]=Komposer standard-redigerer
+ Comment[nl]=Komposer standaardeditor
+Index: kpilot/conduits/notepadconduit/notepad-conduit.desktop
+===================================================================
+--- kpilot/conduits/notepadconduit/notepad-conduit.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kpilot/conduits/notepadconduit/notepad-conduit.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -33,6 +33,7 @@
+ Comment[hu]=Bővítőmodul NotePad-rajzok helyi könyvtárba való lementéséhez.
+ Comment[is]=Þessi rás afritar NotePad teikningar í staðbundna möppu.
+ Comment[it]=Questo conduit archivia i disegni NotePad drawings in una cartella locale.
++Comment[ja]=このコンジットは NotePad の絵をローカルのフォルダにバックアップする。
+ Comment[lt]=Šis kanalas padaro NotePad piešinių atsargines kopijas į vietinį aplanką.
+ Comment[nb]=Denne kanalen tar sikkerhetskopi av NotePad tegninger til en lokal mappe.
+ Comment[nl]=Dit conduit maakt een backup van de notitie-aantekeningen naar een lokale map.
+Index: kpilot/conduits/memofileconduit/memofile-conduit.desktop
+===================================================================
+--- kpilot/conduits/memofileconduit/memofile-conduit.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kpilot/conduits/memofileconduit/memofile-conduit.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -15,6 +15,7 @@
+ Name[hu]=Memófájl
+ Name[is]=Minnismiðaskrá
+ Name[it]=File appunti
++Name[ja]=メモファイル
+ Name[lt]=Memo byla
+ Name[nb]=Notatfil
+ Name[nl]=Memobestand
+@@ -42,6 +43,7 @@
+ Comment[hu]=Ezzel a csatolóval egy kézi számítógép memóit lehet szinkronizálni a helyi címjegyzékkel.
+ Comment[is]=Þessi rás samstillir minnismiða lófatölvunnar þinnar við staðbundna möppu.
+ Comment[it]=Questo condotto sincronizza gli appunti del tuo palmare con una cartella locale.
++Comment[ja]=このコンジットはハンドヘルドのメモとローカルのディレクトリを同期させます。
+ Comment[lt]=Šis kanalas sinchronizuoja Jūsų užrašus su vietiniu aplanku.
+ Comment[nb]=Denne kanalen synkroniserer PDA-ens notater med en lokal mappe.
+ Comment[nl]=Dit conduit synchroniseert de memo's van uw handheld met een lokale map.
+Index: kpilot/conduits/docconduit/doc_conduit.desktop
+===================================================================
+--- kpilot/conduits/docconduit/doc_conduit.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kpilot/conduits/docconduit/doc_conduit.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ Comment[hu]=Szöveges fájlok hozzáadása a kézi számítógéphez, DOC-olvasók számára.
+ Comment[is]=Bætir textaskrám, sem hægt er að lesa í DOC lesara, við lófatölvuna þína.
+ Comment[it]=Aggiunge file di testo al tuo Pilot, adatti per lettori DOC.
++Comment[ja]=テキストファイルを DOC リーダに適した形式でハンドヘルドに追加する。
+ Comment[lt]=Prideda teksto bylas prie Jūsų nešiojamos knygelės, tinka DOC skaityklėms.
+ Comment[nb]=Legger til tekstfiler på PDA-en, som passer for DOC-lesere.
+ Comment[nl]=Voegt tekstvelden toe aan uw handheld, geschikt voor DOC-lezers.
+Index: kpilot/conduits/malconduit/mal_conduit.desktop
+===================================================================
+--- kpilot/conduits/malconduit/mal_conduit.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kpilot/conduits/malconduit/mal_conduit.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -45,7 +45,7 @@
+ Comment[cs]=Synchronizace AvantGo (nebo obecně obsahu MAL serverů) s PDA. To umožňuje offline prohlížení stránek v PDA např. TV programů, programů kin a mnoha dalších stránek.
+ Comment[da]=Synkronisér AvantGo (eller mere alment indholdet på en MAL-server) med den håndholdte. Det lader dig kigge på nedsider offline på den håndholdte, såsom biografer eller tv-programmer, eller en hvilken som helst anden netside.
+ Comment[de]=Synchronisiert AvantGo (oder allgemein den Inhalt eines MAL Servers) mit dem Taschencomputer. So können Sie Internetseiten ohne Netzverbindung auf dem Taschencomputer lesen, zum Beispiel einen Kinoplan oder die aktuelle Programmzeitschrift.
+-Comment[el]=Συγχρονισμός ενός AvantGo (ή γενικότερα τα περιεχόμενα ενός εξυπηρετητή MAL) με τον υπολογιστή παλάμης. Αυτό σας επιτρέπει να βλέπετε ιστοσελίδες στον υπολογιστή παλάμης χωρίς να είστε συνδεμένοι, όπως το πρόγραμμα των κινηματογράφων ή της τηλεόρασης, ή οποιαδήποτε άλλη ιστοσελίδα.
++Comment[el]=Συγχρονισμός ενός AvantGo (ή γενικότερα τα περιεχόμενα ενός εξυπηρετητή MAL) με τον υπολογιστή παλάμης. Αυτό σας επιτρέπει να βλέπετε ιστοσελίδες στον υπολογιστή παλάμης χωρίς να είστε συνδεδεμένοι, όπως το πρόγραμμα των κινηματογράφων ή της τηλεόρασης, ή οποιαδήποτε άλλη ιστοσελίδα.
+ Comment[en_GB]=Syncronise AvantGo (or generally a MAL server's content) to the handheld. This allows you to view web-pages offline on the handheld, like your cinema or TV schedule, or any other web page.
+ Comment[es]=Sincroniza AvantGo (o más genéricamente, el contenido de un servidor MAL) con la agenda electrónica. Le permite ver páginas web en la agenda electrónica sin estar conectado, como la programación de televisión o la cartelera de cine, o cualquier otra página web.
+ Comment[et]=See kanal sünkroniseerib AvantGo (või üldisemalt MAL serveri sisu) pihuarvutiga. See võimaldab vaadata veebilehekülgi pihuseadmelt ilma võrguühendusega, näiteks uurida kino- või telekava või mis tahes muud huvipakkuvat veebilehekülge.
+@@ -54,6 +54,7 @@
+ Comment[hu]=AvantGo (vagy MAL-kiszolgáló) adatainak szinkronizálása a kézi számítógéppel. Lehetővé teszi weboldalak offline módban való megtekintését, például a mozi- vagy tévéműsort, vagy bármi mást.
+ Comment[is]=Samstillir AvantGo (eða venjulega innihald MAL þjóns) við lófatölvuna. Þetta gerir þér kleyft að skoða vefsíður þegar þú ert ótengd(ur) vefnum, t.d. kvikmynda eða sjónvarpsdagskrá.
+ Comment[it]=Sincronizza AvantGo (o il contenuto di un generico server MAL) con il palmare. In questo modo potrai visualizzare le pagine web offline sul palmare come per esempio la programmazione di un cinema o una TV o qualsiasi altra pagina web.
++Comment[ja]=AvantGo (又は一般に MAL サーバのコンテンツ) をハンドヘルドと同期させる。これにより、ハンドヘルドで、映画や TV 番組表や他のウェブページのようなウェブページをオフラインで閲覧可能になる。
+ Comment[lt]=Sinchronizuoti AvantGo (ar MAL serverio turinį apskritai) su nešiojamu įrenginiu. Tai leis jums peržiūrėti žiniatinklio puslapius nešiojamame įrenginyje, tokius kaip kino teatro ar TV programas, bei bet kokį kitą puslapį, neprisijungus prie Interneto.
+ Comment[nb]=Synkroniser AvantGo (eller generelt innholdet i en MAL-tjener) til PDA-en. På denne måten kan du se nettsider frakoblet på PDA-en. slik som TV-programlister, kinoprogrammer eller andre nettsider.
+ Comment[nl]=Avantgo met de handheld synchroniseren (of eigenlijk met de inhoud van een MAL-server). Dit maakt het mogelijk om een webpagina offline op uw handheld te bekijken. Dit is handig voor allerlei zaken als bijvoorbeeld de TV-gids.
+Index: kpilot/conduits/popmail/popmail-conduit.desktop
+===================================================================
+--- kpilot/conduits/popmail/popmail-conduit.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kpilot/conduits/popmail/popmail-conduit.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -16,6 +16,7 @@
+ Comment[hu]=Ezzel a csatolóval kézi számítógépről lehet levelet küldeni a KMailen keresztül.
+ Comment[is]=Sendu tölvupóst frá lófatölvunni þinni gegnum KMail.
+ Comment[it]=Invia la posta dal tuo palmare tramite KMail.
++Comment[ja]=KMail 経由ハンドヘルドからメールを送信
+ Comment[lt]=Siųsti paštą iš nešiojamo įrenginio per KMail.
+ Comment[nb]=Send e-post fra PDA-en gjennom KMail.
+ Comment[nl]=Dit conduit verzendt mail van uw handheld met behulp van KMail.
+Index: kpilot/conduits/vcalconduit/vcal-conduit.desktop
+===================================================================
+--- kpilot/conduits/vcalconduit/vcal-conduit.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kpilot/conduits/vcalconduit/vcal-conduit.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -57,6 +57,7 @@
+ Comment[hu]=Ezzel a csatolóval szinkronizálhatók a kézi számítógép és a KOrganizer dátumai.
+ Comment[is]=Þessi rás samstillir lófatölvuna þína við dagbók KOrganizer.
+ Comment[it]=Questo conduit sincronizza il tuo palmare con il calendario di KOrganizer.
++Comment[ja]=このコンジットはハンドヘルドと KOrganizer のデータブックを同期させます。
+ Comment[nb]=Denne kanalen synkroniserer PDA-en med KOrganizers almanakk.
+ Comment[nl]=Dit conduit synchroniseert uw handheld met KOrganizer's datumboek.
+ Comment[pl]=Ten łącznik synchronizuje palmtopa z terminarzem KOrganizera.
+Index: kontact/plugins/akregator/akregatorplugin.desktop
+===================================================================
+--- kontact/plugins/akregator/akregatorplugin.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kontact/plugins/akregator/akregatorplugin.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -31,6 +31,7 @@
+ Comment[hu]=Akregator bővítőmodul
+ Comment[is]=Akregator íforrit
+ Comment[it]=Plugin aKregator
++Comment[ja]=Akregator プラグイン
+ Comment[lt]=Akregator priedas
+ Comment[nb]=Akgregator-programtillegg
+ Comment[nl]=Akregatorplugin
+@@ -62,6 +63,7 @@
+ Name[hu]=Hírforrások
+ Name[is]=Fréttastraumar
+ Name[it]=Fonti
++Name[ja]=フィード
+ Name[lt]=Kanalai
+ Name[nb]=Kanaler
+ Name[nn]=Kanalar
+Index: kontact/plugins/akregator/akregatorplugin3.2.desktop
+===================================================================
+--- kontact/plugins/akregator/akregatorplugin3.2.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kontact/plugins/akregator/akregatorplugin3.2.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -30,6 +30,7 @@
+ Comment[hu]=Akregator bővítőmodul
+ Comment[is]=Akregator íforrit
+ Comment[it]=Plugin aKregator
++Comment[ja]=Akregator プラグイン
+ Comment[lt]=Akregator priedas
+ Comment[nb]=Akgregator-programtillegg
+ Comment[nl]=Akregatorplugin
+@@ -61,6 +62,7 @@
+ Name[hu]=Hírforrások
+ Name[is]=Fréttastraumar
+ Name[it]=Fonti
++Name[ja]=フィード
+ Name[lt]=Kanalai
+ Name[nb]=Kanaler
+ Name[nn]=Kanalar
+Index: kontact/plugins/multisynk/multisynk.desktop
+===================================================================
+--- kontact/plugins/multisynk/multisynk.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kontact/plugins/multisynk/multisynk.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -30,6 +30,7 @@
+ Comment[hu]=MultiSynk bővítőmodul
+ Comment[is]=MultiSynk íforrit
+ Comment[it]=Plugin MultiSync
++Comment[ja]=MultiSynk プラグイン
+ Comment[lt]=MultiSynk priedas
+ Comment[nb]=Programtillegg for MultiSynk
+ Comment[nl]=MultiSynk-plugin
+Index: kontact/plugins/specialdates/kcmsdsummary.desktop
+===================================================================
+--- kontact/plugins/specialdates/kcmsdsummary.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kontact/plugins/specialdates/kcmsdsummary.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -29,6 +29,7 @@
+ Name[hu]=Fontos dátumok
+ Name[is]=Sérstakir dagar
+ Name[it]=Date speciali
++Name[ja]=特別な日
+ Name[lt]=Ypatingos datos
+ Name[nb]=Spesielle datoer
+ Name[nl]=Speciale data
+@@ -60,6 +61,7 @@
+ Comment[hu]=A fontos dátumok áttekintőjének beállításai
+ Comment[is]=Yfirlitsuppsetning sérstakra daga
+ Comment[it]=Impostazioni per le date speciali
++Comment[ja]=特別な日の要約設定
+ Comment[lt]=Ypatingų datų santraukos sąranka
+ Comment[nb]=Sammendragsoppsett for spesielle datoer
+ Comment[nl]=Instellingen voor speciale data in overzicht
+@@ -91,6 +93,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[ja]=誕生日,記念日,休日,設定,設定
+ 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
+Index: kontact/plugins/specialdates/specialdatesplugin.desktop
+===================================================================
+--- kontact/plugins/specialdates/specialdatesplugin.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kontact/plugins/specialdates/specialdatesplugin.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -32,6 +32,7 @@
+ Name[hu]=Fontos dátumok
+ Name[is]=Sérstakir dagar
+ Name[it]=Date speciali
++Name[ja]=特別な日
+ Name[lt]=Ypatingos datos
+ Name[nb]=Spesielle datoer
+ Name[nl]=Speciale data
+@@ -63,6 +64,7 @@
+ Comment[hu]=Fontos dátumok bővítőmodul
+ Comment[is]=Sérstakir dagar íforrit
+ Comment[it]=Plugin per le date speciali
++Comment[ja]=特別な日プラグイン
+ Comment[lt]=Ypatingų dienų priedas
+ Comment[nb]=Programtillegg for spesielle datoer
+ Comment[nl]=Plugin voor speciale data
+Index: kontact/plugins/korganizer/todoplugin.desktop
+===================================================================
+--- kontact/plugins/korganizer/todoplugin.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kontact/plugins/korganizer/todoplugin.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -31,6 +31,7 @@
+ Comment[hu]=Kontact-bővítőmodul a KOrganizer feladatlistához
+ Comment[is]=Kontact KOrganizer verkþátta íforrit
+ Comment[it]=Plugin Kontact per le cose da fare di KOrganizer
++Comment[ja]=Kontact KOrganizer To-do リストプラグイン
+ Comment[lt]=Kontact KOrganizer darbų sąrašo priedas
+ Comment[nb]=Kontact programtillegg for KOrganizer gjøreliste
+ Comment[nl]=Kontact KOrganizer takenlijstplugin
+@@ -64,6 +65,7 @@
+ Name[hu]=Feladatok
+ Name[is]=Verkþættir
+ Name[it]=Cose da fare
++Name[ja]=To-do リスト
+ Name[lt]=Darbai
+ Name[nb]=Gjøreliste
+ Name[nl]=Takenlijst
+Index: kontact/plugins/korganizer/journalplugin.desktop
+===================================================================
+--- kontact/plugins/korganizer/journalplugin.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kontact/plugins/korganizer/journalplugin.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -33,6 +33,7 @@
+ Comment[hu]=Kontact-bővítőmodul a KOrganizer-naplóhoz
+ Comment[is]=Kontact KOrganizer dagbókar íforrit
+ Comment[it]=Plugin Kontact per il diario di KOrganizer
++Comment[ja]=Kontact KAddressbook プラグイン
+ Comment[lt]=Kontact KOrganizer dienyno priedas
+ Comment[nb]=Kontact programtillegg for KOrganizer dagbok
+ Comment[nl]=Kontact KOrganizer Journaalplugin
+Index: kontact/plugins/summary/kcmkontactsummary.desktop
+===================================================================
+--- kontact/plugins/summary/kcmkontactsummary.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kontact/plugins/summary/kcmkontactsummary.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -28,6 +28,7 @@
+ Name[hu]=Komponensek
+ Name[is]=Einingar
+ Name[it]=Componenti
++Name[ja]=コンポーネント
+ Name[lt]=Komponentai
+ Name[nb]=Komponenter
+ Name[nl]=Componenten
+Index: kontact/src/kontact.setdlg
+===================================================================
+--- kontact/src/kontact.setdlg	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kontact/src/kontact.setdlg	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -59,6 +59,7 @@
+ Comment[hu]=Áttekintő nézet
+ Comment[is]=Yfirlitssýn
+ Comment[it]=Vista sommario
++Comment[ja]=サマリビュー
+ Comment[lt]=Santraukos vaizdas
+ Comment[nb]=Sammendragsvisning
+ Comment[nl]=Overzichtsweergave
+@@ -125,6 +126,7 @@
+ Comment=Mail Component
+ Comment[be]=Кампанэнт "Пошта"
+ Comment[bg]=Модул за е-поща
++Comment[br]=Perzh postel
+ Comment[ca]=Component de correu
+ Comment[cs]=Poštovní komponenta
+ Comment[da]=Post-komponent
+@@ -140,6 +142,7 @@
+ Comment[hu]=Levelezőkomponens
+ Comment[is]=Pósthluti
+ Comment[it]=Componente posta
++Comment[ja]=メールコンポーネント
+ Comment[lt]=Pašto komponentas
+ Comment[nb]=E-postkomponent
+ Comment[nl]=E-mailcomponent
+@@ -220,6 +223,7 @@
+ Comment[hu]=Címjegyzék-komponens
+ Comment[is]=Vistfangahluti
+ Comment[it]=Componente rubrica indirizzi
++Comment[ja]=アドレス帳コンポーネント
+ Comment[lt]=Adresų knygelės komponentas
+ Comment[nb]=Adressebok-komponent
+ Comment[nl]=Adresboekcomponent
+@@ -255,6 +259,7 @@
+ Name[hu]=A fontos dátumok áttekintője
+ Name[is]=Yfirlit sérstakra daga
+ Name[it]=Sommario date speciali
++Name[ja]=特別な日の要約
+ Name[lt]=Ypatingų dienų santrauka
+ Name[nb]=Sammendrag av spesielle datoer
+ Name[nl]=Overzicht voor speciale data
+@@ -286,6 +291,7 @@
+ Comment[hu]=A fontos dátumok áttekintő komponense
+ Comment[is]=Yfirlitshluti sérstakra daga
+ Comment[it]=Componente sommario per le date speciali
++Comment[ja]=特別な日の要約コンポーネント
+ Comment[lt]=Ypatingų dienų santraukos komponentas
+ Comment[nb]=Komponent for sammendrag av spesielle datoer
+ Comment[nl]=Component voor overzicht van speciale data
+@@ -366,6 +372,7 @@
+ Comment[hu]=Naptárkezelő komponens
+ Comment[is]=Dagatalshluti
+ Comment[it]=Componente calendario
++Comment[ja]=カレンダーコンポーネント
+ Comment[lt]=Kalendoriaus komponentas
+ Comment[nb]=Calendar-komponent
+ Comment[nl]=Agendacomponent
+@@ -444,6 +451,7 @@
+ Comment[hu]=Hírkezelő komponens
+ Comment[is]=Fréttahluti
+ Comment[it]=Componente news
++Comment[ja]=ニュースコンポーネント
+ Comment[lt]=Naujienų komponentas
+ Comment[nb]=Njus-komponent
+ Comment[nl]=Nieuwscomponent
+@@ -527,6 +535,7 @@
+ Comment[hu]=Időjárási adatok
+ Comment[is]=Veðurupplýsingar
+ Comment[it]=Informazioni meteorologiche
++Comment[ja]=気象情報
+ Comment[lt]=Orų informacija
+ Comment[nb]=Værinformasjon
+ Comment[nl]=Het weer
+@@ -605,6 +614,7 @@
+ Comment[hu]=Hírmegjelenítő komponens
+ Comment[is]=Fréttastrimilshluti
+ Comment[it]=Ticker notizie
++Comment[ja]=ニュース ティッカー コンポーネント
+ Comment[lt]=Naujienų pranešėjo komponentas
+ Comment[nb]=Komponent for Nyhetstelegraf
+ Comment[nl]=Newstickercomponent
+Index: ktnef/gui/ktnef.desktop
+===================================================================
+--- ktnef/gui/ktnef.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ ktnef/gui/ktnef.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -17,6 +17,7 @@
+ GenericName[hu]=TNEF-fájlnézegető
+ GenericName[is]=TNEF skráarskoðari
+ GenericName[it]=Visualizzatore file TNEF
++GenericName[ja]=TNEF ファイルビュー
+ GenericName[lt]=TNEF bylų žiūryklė
+ GenericName[nb]=TNEF-filvisning
+ GenericName[nl]=TNEF-bestandsweergave
+Index: kfile-plugins/ics/kfile_ics.desktop
+===================================================================
+--- kfile-plugins/ics/kfile_ics.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ kfile-plugins/ics/kfile_ics.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -19,6 +19,7 @@
+ Name[hu]=ICS-jellemzők
+ Name[is]=ICS upplýsingar
+ Name[it]=Informazioni ICS
++Name[ja]=ICS 情報
+ Name[lt]=ICS informacija
+ Name[nb]=ICS-informasjon
+ Name[nl]=ICS-informatie
+Index: korganizer/korganizer_configplugins.desktop
+===================================================================
+--- korganizer/korganizer_configplugins.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/korganizer_configplugins.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -30,6 +30,7 @@
+ Name[hi]=प्लगइन्स
+ Name[hu]=Bővítőmodulok
+ Name[is]=Íforrit
++Name[ja]=プラグイン
+ Name[lt]=Priedai
+ Name[nb]=Programtillegg
+ Name[nn]=Programtillegg
+@@ -61,6 +62,7 @@
+ Comment[hu]=A KOrganizer bővítőmodul beállításai
+ Comment[is]=Stillingar KOrganizer íforrita
+ Comment[it]=Configurazione plugin KOrganizer
++Comment[ja]=KOrganizer プラグイン設定
+ Comment[lt]=KOrganizer priedų konfigūravimas
+ Comment[nb]=KOrganizer oppsett for programtillegg
+ Comment[nl]=KOrganizer plugininstellingen
+@@ -94,6 +96,7 @@
+ Keywords[hu]=korganizer,bővítőmodul,modul
+ Keywords[is]=korganizer,íforrit,eining
+ Keywords[it]=korganizer,plugin,modulo
++Keywords[ja]=korganizer,プラグイン,モジュール
+ Keywords[lt]=korganizer,plugin,module,modulis,priedas
+ Keywords[nb]=korganizer,programtillegg,modul
+ Keywords[nn]=korganizer,programtillegg,modul
+Index: korganizer/plugins/datenums/datenums.desktop
+===================================================================
+--- korganizer/plugins/datenums/datenums.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/plugins/datenums/datenums.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -52,6 +52,7 @@
+ Comment[hu]=Megjeleníti az év elejétől eltelt napok számát az áttekintő nézet tetején. Például február elseje az év 32. napja.
+ Comment[is]=Þetta íforrit sýnir efst í fundarskránni númer hvers dags í árinu. T.d. er 1. febrúar 32. dagurinn í árinu.
+ Comment[it]=Per ciascun giorno, questo plugin mostra la data giuliana (numero progressivo a partire dal primo gennaio dell'anno corrente). Per esempio al primo di febbraio corrisponde il numero 32.
++Comment[ja]=各日付について本プラグインはアジェンダビューの先頭にその年の何日目であるかを表示します。例えば、2 月 1 日はその年の 32 日目です。
+ Comment[lt]=Kiekvienai dienai šis priedas rodo metų dienos numerį tvarkyklės viršuje. Pvz., Vasario 1 yra32 metų diena.
+ Comment[nb]=For hver dag viser dette programtillegget dagens nummer i året øverst på dagsvisningen. 1. februar er f.eks. dag nr. 32 i året.
+ Comment[nl]=Deze plugin zorgt ervoor dat het dagnummer boven de agendaweergave wordt geplaatst. Bijvoorbeeld, bij 1 februari hoort dagnummer 32.
+Index: korganizer/plugins/projectview/projectview.desktop
+===================================================================
+--- korganizer/plugins/projectview/projectview.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/plugins/projectview/projectview.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -68,6 +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[ja]=本プラグインは (to-do 又は月ごとのビューのような) KOrganizer 用のプロジェクト計画ビューを供給します。本プラグインを有効にすると、プロジェクトビューに切替え、プロジェクトプランナにあるような to-do リストを閲覧できます。
+ 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.
+Index: korganizer/plugins/exchange/exchange.desktop
+===================================================================
+--- korganizer/plugins/exchange/exchange.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/plugins/exchange/exchange.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -56,6 +56,7 @@
+ Comment[hu]=Ez a modul lehetővé teszi KOrganizer-felhasználóknak Microsoft Exchange 2000-kiszolgálón tárolt csoportmunka-adatok elérését.
+ Comment[is]=Þetta íforrit gerir KOrganizer kleyft að vinna með Microsoft Exchange 2000 hópvinnuþjónum.
+ Comment[it]=Questo plugin pemette agli utenti di korganizer di lavorare con i server groupware Microsoft Exchange 2000.
++Comment[ja]=本プラグインにより、korganizer のユーザは Microsoft Exchange 2000 グループウェアサーバとの同期が可能となります。
+ Comment[lt]=Šis priedas leidžia korganizer dirbti su Microsoft Exchange 2000 groupware serveriais.
+ Comment[nb]=Med dette programtillegget kan korganizer-brukere arbeide med gruppevare-tjenere fra Microsoft Exchange 2000.i
+ Comment[nl]=Deze plugin maakt het mogelijk om Microsoft Exchange 2000 te gebruiken in KOrganizer.
+Index: korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
+===================================================================
+--- korganizer/plugins/printing/whatsnext/whatsnextprint.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/plugins/printing/whatsnext/whatsnextprint.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -13,6 +13,7 @@
+ Name[hu]=A közeljövő eseményeinek kinyomtatása
+ Name[is]=Hvað er næst prentstíll
+ Name[it]=Stile di stampa "cosa viene dopo"
++Name[ja]=次の印刷スタイル
+ Name[lt]=Ateinančių įvykių spausdinimo stilius
+ Name[nb]=Utskriftsstil for Hva Nå
+ Name[nl]=Printstijl voor Wat komt er nu
+@@ -41,6 +42,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[ja]=本プラグインにより、将来の全てのイベントや to-do のリストを印刷できるようになります。
+ 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.
+Index: korganizer/plugins/printing/journal/journalprint.desktop
+===================================================================
+--- korganizer/plugins/printing/journal/journalprint.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/plugins/printing/journal/journalprint.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -13,6 +13,7 @@
+ Name[hu]=Naplónyomtatási stílus
+ Name[is]=Dagbókarprentstíll
+ Name[it]=Stile di stampa a diario
++Name[ja]=Journal 印刷スタイル
+ Name[lt]=Dienyno spausdinimo stilius
+ Name[nb]=Utskriftsstil for dagbok
+ Name[nl]=Printstijl voor journaals
+@@ -40,6 +41,7 @@
+ Comment[hu]=Ez a modul naplóbejegyzések kinyomtatását teszi lehetővé.
+ Comment[is]=Þetta íforrit gerir þér kleyft að prenta út dagbókarfærslur.
+ Comment[it]=Questo plugin ti permette di stampare le registrazioni del diario.
++Comment[ja]=本プラグインにより Journal のエントリ (日記のエントリ)を印刷可能となります。
+ Comment[lt]=Šis priedas leidžia spausdinti dienyno įrašus.
+ Comment[nb]=Med dette tilleggsprogrammet kan du skrive ut oppføringer i dagboka.
+ Comment[nl]=Deze plugin maakt het mogelijk om journalen uit te printen (dagboekitems).
+Index: korganizer/plugins/printing/list/listprint.desktop
+===================================================================
+--- korganizer/plugins/printing/list/listprint.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/plugins/printing/list/listprint.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -14,6 +14,7 @@
+ Name[hu]=Eseménylista kinyomtatása
+ Name[is]=Listaprentstíll
+ Name[it]=Stile di stampa ad elenco
++Name[ja]=印刷スタイルのリスト
+ Name[lt]=Sąrašo spausdinimo stilius
+ Name[nb]=Utskriftsstil for liste
+ Name[nl]=Printstijl voor lijsten
+@@ -43,6 +44,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[ja]=本プラグインにより、リストフォーム内のイベントや to-do を印刷できるようになります。
+ 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.
+Index: korganizer/plugins/timespanview/timespanview.desktop
+===================================================================
+--- korganizer/plugins/timespanview/timespanview.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/plugins/timespanview/timespanview.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -13,6 +13,7 @@
+ Name[hu]=Időszakáttekintő bővítőmodul a KOrganizerhez
+ Name[is]=Tímabilsskoðunar íforrit fyrir KOrganizer
+ Name[it]=Plugin vista intervalli temporali per KOrganizer
++Name[ja]=KOrganizer 用 Timespan View プラグイン
+ Name[lt]=Laiko tarpsnio vaizdo KOrganizer priedas
+ Name[nb]=Programtilllegg for periodevisning i KOrganizer
+ Name[nl]=Tijdspanneplugin voor KOrganizer
+@@ -40,6 +41,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[ja]=本プラグインは (to-do や month view のような) korganizer 用の timespan view を供給します。本プラグインを有効にすると、ガントチャートのように timespan view を切替え、イベントを表示できます。
+ 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.
+Index: korganizer/plugins/hebrew/hebrew.desktop
+===================================================================
+--- korganizer/plugins/hebrew/hebrew.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/plugins/hebrew/hebrew.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -54,6 +54,7 @@
+ Comment[hu]=A KOrganizer dátumait kiírja a hagyományos zsidó naptár szerint is.
+ Comment[is]=Sýna alla dagsetningar í KOrganizer sem eru einnig í dagatali gyðinga.
+ Comment[it]=Mostra tutte le date in korganizer secondo il calendario ebraico.
++Comment[ja]=korganizer の全ての日付をユダヤ暦でも表示する。
+ Comment[lt]=Rodo visas dienas kalendoriuje taip pat ir žydų kalendoriaus sistema.
+ Comment[nb]=Viser alle datoer i korganizer også i det jødiske kalendersystemet. 
+ Comment[nl]=Toont alle data in KOrganizer ook in het Joodse kalendersysteem.
+Index: korganizer/korganizer_configdesignerfields.desktop
+===================================================================
+--- korganizer/korganizer_configdesignerfields.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/korganizer_configdesignerfields.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -111,6 +111,7 @@
+ Keywords[hu]=korganizer,beállítás,beállítások,egyéni mezők
+ Keywords[is]=korganizer, stillingar, stilla, sérsniðnir reitir
+ Keywords[it]=korganizer, configura, impostazioni, campi personalizzati
++Keywords[ja]=korganizer、設定、設定,カスタムフィールド
+ Keywords[lt]=korganizer, configure, settings, custom fields, konfigūruoti, nustatymai, pasirinkti laukai
+ Keywords[nb]=kaddressbook, sette opp, innstillinger, tilpassede felter
+ Keywords[nl]=korganizer, configuratie, instellingen, aangepaste velden
+Index: korganizer/korganizer-import.desktop
+===================================================================
+--- korganizer/korganizer-import.desktop	(.../tags/KDE/3.4.3/kdepim)	(révision 484695)
++++ korganizer/korganizer-import.desktop	(.../branches/KDE/3.4/kdepim)	(révision 484695)
+@@ -27,6 +27,7 @@
+ Name[hu]=Naptár importálása
+ Name[is]=Flytja inn dagatal
+ Name[it]=Importa calendario
++Name[ja]=カレンダーをインポート
+ Name[lt]=Importuoti kalendorių
+ Name[nb]=Importer kalender
+ Name[nl]=Agenda importeren
+
+Modification de propriétés sur .
+___________________________________________________________________
+Nom : svn:externals
+   + admin https://svn.kde.org/home/kde/branches/KDE/3.4/kde-common/admin
+
+

Added: branches/kde-3.4.0/packages/kdepim/debian/patches/13_mimelib_self_contained.diff
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/patches/13_mimelib_self_contained.diff	2005-12-02 08:56:03 UTC (rev 2495)
+++ branches/kde-3.4.0/packages/kdepim/debian/patches/13_mimelib_self_contained.diff	2005-12-02 09:58:03 UTC (rev 2496)
@@ -0,0 +1,25 @@
+diff -urN kdepim-3.4.3.old/mimelib/Makefile.am kdepim-3.4.3/mimelib/Makefile.am
+--- kdepim-3.4.3.old/mimelib/Makefile.am	2005-12-01 20:44:15.000000000 +0100
++++ kdepim-3.4.3/mimelib/Makefile.am	2005-12-01 20:01:45.000000000 +0100
+@@ -57,7 +57,7 @@
+     uuencode.cpp \
+     binhex.cpp
+ 
+-libmimelib_la_LDFLAGS = -L$(kde_libraries) -lkdefakes -version-info 1:1 -no-undefined
++libmimelib_la_LDFLAGS = -L$(kde_libraries) -lkdefakes_pic -version-info 1:1 -no-undefined
+ 
+ check_PROGRAMS = test_boyermor
+ 
+diff -urN kdepim-3.4.3.old/mimelib/mimelib/config.h kdepim-3.4.3/mimelib/mimelib/config.h
+--- kdepim-3.4.3.old/mimelib/mimelib/config.h	2005-10-05 15:37:00.000000000 +0200
++++ kdepim-3.4.3/mimelib/mimelib/config.h	2005-12-01 20:46:32.000000000 +0100
+@@ -125,8 +125,7 @@
+ #      define DW_EXPORT __declspec(dllimport)
+ #   endif
+ #else
+-#   include <kdepimmacros.h>
+-#   define DW_EXPORT KDE_EXPORT
++#   define DW_EXPORT /* empty */
+ #endif
+ 
+ //-----------------------------------------------------------------------------

Modified: branches/kde-3.4.0/packages/kdepim/debian/po/vi.po
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/po/vi.po	2005-12-02 08:56:03 UTC (rev 2495)
+++ branches/kde-3.4.0/packages/kdepim/debian/po/vi.po	2005-12-02 09:58:03 UTC (rev 2496)
@@ -15,41 +15,47 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#.Type: select
-#.choices
-#:../kpilot.templates:3
+#. 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
+#. 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
+#. 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."
+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
+#. 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"
+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
+#. 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ó."
+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-12-02 08:56:03 UTC (rev 2495)
+++ branches/kde-3.4.0/packages/kdepim/debian/rules	2005-12-02 09:58:03 UTC (rev 2496)
@@ -38,7 +38,7 @@
 
 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.2
+shlibs_ver=4:3.4.3
 DEB_DH_MAKESHLIBS_ARGS_libkcal2b := -V'libkcal2b (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2 := -V'libkdenetwork2 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkdepim1a := -V'libkdepim1a (>= $(shlibs_ver))'
@@ -49,13 +49,13 @@
 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_libmimelib1c102 := -V'libmimelib1c102 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libmimelib1c2a := -V'libmimelib1c2a (>= $(shlibs_ver))'
 
 PACKAGES_WITH_LIBS := akregator kaddressbook kalarm kdepim-kresources \
 	kdepim-wizards kitchensync kleopatra kmail knode knotes kode kontact \
 	korganizer kpilot ksync ktnef libkcal2b libkdenetwork2 libkdepim1a \
 	libkgantt0 libkleopatra0a libkmime2 libkpimexchange1 \
-	libkpimidentities1 libksieve0 libktnef1 libmimelib1c102
+	libkpimidentities1 libksieve0 libktnef1 libmimelib1c2a
 
 # kontact starts fine without korganizer or kpilot dependencies
 # specialdates is only in recommends to get the kaddressbook dependency there




More information about the pkg-kde-commits mailing list