SOURCES: kdepim-branch.diff - updated
arekm
arekm at pld-linux.org
Fri Aug 26 11:43:27 CEST 2005
Author: arekm Date: Fri Aug 26 09:43:27 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdepim-branch.diff (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.8 SOURCES/kdepim-branch.diff:1.9
--- SOURCES/kdepim-branch.diff:1.8 Tue Aug 2 08:09:29 2005
+++ SOURCES/kdepim-branch.diff Fri Aug 26 11:43:22 2005
@@ -1,7 +1,56 @@
+Index: akregator/src/pageviewer.cpp
+===================================================================
+--- akregator/src/pageviewer.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ akregator/src/pageviewer.cpp (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -361,7 +361,7 @@
+ if (copylinkaddress)
+ {
+ copylinkaddress->plug( &popup);
+- popup.insertSeparator();
++ //popup.insertSeparator();
+ }
+ }
+ else // we are not on a link
+Index: kresources/egroupware/kabc_xmlrpc.desktop
+===================================================================
+--- kresources/egroupware/kabc_xmlrpc.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/egroupware/kabc_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kresources/egroupware/knotes_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kresources/egroupware/kcal_xmlrpc.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 442272)
-+++ kresources/exchange/exchange.desktop (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kresources/exchange/exchange.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/exchange/exchange.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -17,6 +17,7 @@
Name[et]=Exchange 2000 server
Name[eu]=Exchange 2000 zerbitzaria
@@ -12,8 +61,8 @@
Name[is]=Exchange 2000 ĂžjĂłnn
Index: kresources/slox/kcal_slox.desktop
===================================================================
---- kresources/slox/kcal_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kresources/slox/kcal_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kresources/slox/kcal_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/slox/kcal_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -11,6 +11,7 @@
Name[et]=SUSE LINUX Openexchange server
Name[eu]=SUSE LINUX Openexchange zerbitzaria
@@ -24,8 +73,8 @@
Name[it]=Server SUSE LINUX Openexchange
Index: kresources/slox/webdavhandler.cpp
===================================================================
---- kresources/slox/webdavhandler.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kresources/slox/webdavhandler.cpp (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kresources/slox/webdavhandler.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/slox/webdavhandler.cpp (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -28,6 +28,8 @@
#endif
#endif
@@ -55,8 +104,8 @@
}
Index: kresources/slox/kabc_slox.desktop
===================================================================
---- kresources/slox/kabc_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kresources/slox/kabc_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kresources/slox/kabc_slox.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/slox/kabc_slox.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -11,6 +11,7 @@
Name[et]=SUSE LINUX Openexchange server
Name[eu]=SUSE LINUX Openexchange zerbitzaria
@@ -67,8 +116,8 @@
Name[it]=Server SUSE LINUX Openexchange
Index: kresources/groupdav/kabc_groupdav.desktop
===================================================================
---- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -12,6 +12,7 @@
Name[et]=GroupDAV server (nt. OpenGroupware)
Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware)
@@ -79,8 +128,8 @@
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 442272)
-+++ kresources/groupdav/kcal_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kresources/groupdav/kcal_groupdav.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/groupdav/kcal_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -12,6 +12,7 @@
Name[et]=GroupDAV server (nt. OpenGroupware)
Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware)
@@ -89,10 +138,46 @@
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 453465)
++++ kresources/kolab/kabc/kolab.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kresources/kolab/knotes/kolabresource.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kresources/kolab/kcal/kolab.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 442272)
-+++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kresources/kolab/kcal/resourcekolab.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/kolab/kcal/resourcekolab.cpp (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -487,10 +487,18 @@
mUidMap[ uid ] = StorageReference( subResource, sernum );
} else {
@@ -116,8 +201,8 @@
/* 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 442272)
-+++ kresources/groupware/kabc_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kresources/groupware/kabc_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/groupware/kabc_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -10,6 +10,7 @@
Name[et]=GrupitÜÜ server
Name[eu]=Groupware zerbitzaria
@@ -128,8 +213,8 @@
Name[is]=Groupware ĂžjĂłnn
Index: kresources/groupware/kcal_groupware.desktop
===================================================================
---- kresources/groupware/kcal_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kresources/groupware/kcal_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kresources/groupware/kcal_groupware.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/groupware/kcal_groupware.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -10,6 +10,7 @@
Name[et]=GrupitÜÜ server
Name[eu]=Groupware zerbitzaria
@@ -140,8 +225,8 @@
Name[is]=Groupware ĂžjĂłnn
Index: kresources/remote/remote.desktop
===================================================================
---- kresources/remote/remote.desktop (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kresources/remote/remote.desktop (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kresources/remote/remote.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kresources/remote/remote.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -15,6 +15,7 @@
Name[eu]=Egutegia urruneko fitxategi batean
Name[fi]=Kalenteri etätiedostossa
@@ -150,10 +235,22 @@
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 453465)
++++ kresources/newexchange/kcal_newexchange_final.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 442272)
-+++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -848,7 +848,7 @@
void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
Q_UINT32 sernum )
@@ -163,10 +260,23 @@
return;
// kdDebug(5006) << "KMailICalIfaceImpl::slotIncidenceAdded" << endl;
+Index: kmail/kmail_config_composer.desktop
+===================================================================
+--- kmail/kmail_config_composer.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmail/kmail_config_composer.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 442272)
-+++ kmail/partNode.cpp (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmail/partNode.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmail/partNode.cpp (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -36,6 +36,7 @@
#include "kmmimeparttree.h"
#include <mimelib/utility.h>
@@ -184,10 +294,74 @@
return this;
if( mChild )
found = mChild->findNodeForDwPart( part );
+Index: kmail/eventsrc
+===================================================================
+--- kmail/eventsrc (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmail/eventsrc (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kmail/avscripts/kmail_sav.sh (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kmail/avscripts/kmail_fprot.sh (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kmail/avscripts/kmail_antivir.sh (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kmail/avscripts/kmail_clamav.sh (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 442272)
-+++ kmail/keyresolver.cpp (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmail/keyresolver.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmail/keyresolver.cpp (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -1171,6 +1171,17 @@
for ( uint i = 0; i < items.size(); ++i ) {
ContactPreferences& pref = lookupContactPreferences( items[i].address );
@@ -208,8 +382,8 @@
}
Index: kmail/kmsender.cpp
===================================================================
---- kmail/kmsender.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kmail/kmsender.cpp (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmail/kmsender.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmail/kmsender.cpp (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -519,8 +519,10 @@
.arg(mCurrentMsg->subject()));
if (!mSendProc->send(mCurrentMsg))
@@ -246,10 +420,46 @@
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 453465)
++++ knode/knode_config_identity.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ knode/knode_config_cleanup.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ knode/knarticlewidget.cpp (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 442272)
-+++ kalarm/alarmcalendar.h (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kalarm/alarmcalendar.h (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kalarm/alarmcalendar.h (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -46,7 +46,7 @@
void startUpdate();
void endUpdate();
@@ -262,7 +472,7 @@
Index: Makefile.cvs
===================================================================
--- Makefile.cvs (.../tags/KDE/3.4.2/kdepim) (revision 0)
-+++ Makefile.cvs (.../branches/KDE/3.4/kdepim) (revision 442272)
++++ Makefile.cvs (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -0,0 +1,16 @@
+
+all:
@@ -288,8 +498,8 @@
Index: libemailfunctions/email.cpp
===================================================================
---- libemailfunctions/email.cpp (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ libemailfunctions/email.cpp (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- libemailfunctions/email.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ libemailfunctions/email.cpp (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -697,14 +697,24 @@
// and outside of quoted text behind the trailing '>'.
bInComment = false;
@@ -329,10 +539,22 @@
break;
default:
if( ' ' != c )
+Index: korn/KOrn.desktop
+===================================================================
+--- korn/KOrn.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ korn/KOrn.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 442272)
-+++ kmailcvt/filters.hxx (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmailcvt/filters.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmailcvt/filters.hxx (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -85,6 +85,57 @@
};
@@ -394,8 +616,8 @@
-// vim: ts=2 sw=2 et
Index: kmailcvt/filter_thunderbird.cxx
===================================================================
---- kmailcvt/filter_thunderbird.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kmailcvt/filter_thunderbird.cxx (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmailcvt/filter_thunderbird.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmailcvt/filter_thunderbird.cxx (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -198,7 +198,7 @@
tmp.close();
first_msg = false;
@@ -407,8 +629,8 @@
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 442272)
-+++ kmailcvt/filter_evolution_v2.cxx (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmailcvt/filter_evolution_v2.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmailcvt/filter_evolution_v2.cxx (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -201,7 +201,7 @@
tmp.close();
first_msg = false;
@@ -420,8 +642,8 @@
if(_targetDir.contains(".sbd")) _targetDir.remove(".sbd");
Index: kmailcvt/filter_outlook.cxx
===================================================================
---- kmailcvt/filter_outlook.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kmailcvt/filter_outlook.cxx (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmailcvt/filter_outlook.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmailcvt/filter_outlook.cxx (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -52,7 +52,7 @@
info->addLog(i18n("Importing new mail files..."));
info->addLog(i18n("No files found for import."));
@@ -433,8 +655,8 @@
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 442272)
-+++ kmailcvt/filter_pmail.cxx (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmailcvt/filter_pmail.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmailcvt/filter_pmail.cxx (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -320,13 +320,13 @@
QString FilterPMail::getFolderName(QString ID)
{
@@ -454,8 +676,8 @@
if(_ID == search) {
Index: kmailcvt/filter_oe.cxx
===================================================================
---- kmailcvt/filter_oe.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kmailcvt/filter_oe.cxx (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmailcvt/filter_oe.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmailcvt/filter_oe.cxx (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -138,7 +138,7 @@
folderName = "OE-" + mailfileinfo.baseName(TRUE);
if(parsedFolder) {
@@ -513,8 +735,8 @@
}
Index: kmailcvt/filter_mbox.cxx
===================================================================
---- kmailcvt/filter_mbox.cxx (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kmailcvt/filter_mbox.cxx (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmailcvt/filter_mbox.cxx (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmailcvt/filter_mbox.cxx (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -69,8 +69,9 @@
while ( ! mbox.atEnd() ) {
@@ -544,8 +766,8 @@
first_msg = false;
Index: kmailcvt/filter_pmail.hxx
===================================================================
---- kmailcvt/filter_pmail.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kmailcvt/filter_pmail.hxx (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmailcvt/filter_pmail.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmailcvt/filter_pmail.hxx (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -50,8 +50,18 @@
QDir dir;
/** pointer to the info */
@@ -569,8 +791,8 @@
bool folderParsed;
Index: kmailcvt/filter_oe.hxx
===================================================================
---- kmailcvt/filter_oe.hxx (.../tags/KDE/3.4.2/kdepim) (revision 442272)
-+++ kmailcvt/filter_oe.hxx (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- kmailcvt/filter_oe.hxx (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ kmailcvt/filter_oe.hxx (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -61,8 +61,17 @@
bool parsedFolder;
/** true if the current parsing file is the folder file */
@@ -590,10 +812,73 @@
/** 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 453465)
++++ kaddressbook/interfaces/kaddressbook_xxport.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kaddressbook/csv-templates/yahoo.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kaddressbook/editors/protocols/smsprotocol.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 453465)
++++ kaddressbook/features/distributionlist.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
+@@ -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 442272)
-+++ libkdepim/komposer/plugins/default/defaulteditor.desktop (.../branches/KDE/3.4/kdepim) (revision 442272)
+--- libkdepim/komposer/plugins/default/defaulteditor.desktop (.../tags/KDE/3.4.2/kdepim) (revision 453465)
++++ libkdepim/komposer/plugins/default/defaulteditor.desktop (.../branches/KDE/3.4/kdepim) (revision 453465)
@@ -28,6 +28,7 @@
Name[et]=Komposeri redaktor
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.8&r2=1.9&f=u
More information about the pld-cvs-commit
mailing list