SOURCES: kdepim-branch.diff - updated

[arekm]

Author: arekm                        Date: Fri Oct 13 19:23:39 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdepim-branch.diff (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.26 SOURCES/kdepim-branch.diff:1.27
--- SOURCES/kdepim-branch.diff:1.26	Wed Oct 11 11:53:10 2006
+++ SOURCES/kdepim-branch.diff	Fri Oct 13 21:23:33 2006
@@ -1,7 +1,7 @@
 Index: akregator/src/librss/loader.h
 ===================================================================
---- akregator/src/librss/loader.h	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ akregator/src/librss/loader.h	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- akregator/src/librss/loader.h	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ akregator/src/librss/loader.h	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -227,7 +227,7 @@
  	 * 'OutputRetriever' will make it execute the script
  	 * '/home/myself/some-script.py' and assume whatever that script prints to
@@ -13,8 +13,8 @@
  	 * 'slotLoadingComplete' method might look like this:
 Index: akregator/src/eventsrc
 ===================================================================
---- akregator/src/eventsrc	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ akregator/src/eventsrc	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- akregator/src/eventsrc	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ akregator/src/eventsrc	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -15,7 +15,7 @@
  Name[es]=Origen aĂąadido
  Name[et]=Kanal lisatud
@@ -26,8 +26,8 @@
  Name[ga]=Cuireadh fotha leis
 Index: kmobile/devices/gammu/libkmobile_gammu.desktop
 ===================================================================
---- kmobile/devices/gammu/libkmobile_gammu.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kmobile/devices/gammu/libkmobile_gammu.desktop	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kmobile/devices/gammu/libkmobile_gammu.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kmobile/devices/gammu/libkmobile_gammu.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -14,7 +14,7 @@
  Name[es]=TelĂŠfono mĂłvil u organizador (gammu)
  Name[et]=Mobiiltelefon vĂľi Organizer (gammu)
@@ -39,8 +39,8 @@
  Name[ga]=FĂłn PĂłca nĂł EagraĂ­ (gammu)
 Index: certmanager/lib/libkleopatrarc.desktop
 ===================================================================
---- certmanager/lib/libkleopatrarc.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ certmanager/lib/libkleopatrarc.desktop	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- certmanager/lib/libkleopatrarc.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ certmanager/lib/libkleopatrarc.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -99,7 +99,7 @@
  Name[es]=Clave revocada
  Name[et]=TĂźhistatud vĂľti
@@ -52,8 +52,8 @@
  Name[he]=מפתח לא קביל
 Index: kmail/application_octetstream.desktop
 ===================================================================
---- kmail/application_octetstream.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kmail/application_octetstream.desktop	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kmail/application_octetstream.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kmail/application_octetstream.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -39,7 +39,7 @@
  Comment[es]=Un accesorio de formato para el cuerpo de application/octet-stream
  Comment[et]=Pþhiosa vormindamisplugin (MIME tßßbile application/octet-stream)
@@ -65,8 +65,8 @@
  Comment[hu]=FormĂĄzĂłmodul application/octet-stream tĂ­pusĂş adatfolyamokhoz
 Index: kmail/kmail_config_composer.desktop
 ===================================================================
---- kmail/kmail_config_composer.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kmail/kmail_config_composer.desktop	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kmail/kmail_config_composer.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kmail/kmail_config_composer.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -70,7 +70,7 @@
  Comment[es]=Frases y comportamiento general
  Comment[et]=Väljendid ja ßldine käitumine
@@ -78,9 +78,89 @@
  Comment[gl]=Frases e comportamento xeral
 Index: kmail/kmkernel.cpp
 ===================================================================
---- kmail/kmkernel.cpp	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kmail/kmkernel.cpp	(.../branches/KDE/3.5/kdepim)	(revision 594434)
-@@ -2247,9 +2247,15 @@
+--- kmail/kmkernel.cpp	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kmail/kmkernel.cpp	(.../branches/KDE/3.5/kdepim)	(revision 595263)
+@@ -192,6 +192,7 @@
+ bool KMKernel::handleCommandLine( bool noArgsOpensReader )
+ {
+   QString to, cc, bcc, subj, body;
++  QCStringList customHeaders;
+   KURL messageFile;
+   KURL::List attachURLs;
+   bool mailto = false;
+@@ -252,6 +253,8 @@
+          attachURLs += KURL( QString::fromLocal8Bit( *it ) );
+   }
+ 
++  customHeaders = args->getOptionList("header");
++
+   if (args->isSet("composer"))
+     mailto = true;
+ 
+@@ -302,7 +305,7 @@
+     viewMessage( messageFile );
+   else
+     action( mailto, checkMail, to, cc, bcc, subj, body, messageFile,
+-            attachURLs );
++            attachURLs, customHeaders );
+   return true;
+ }
+ 
+@@ -366,7 +369,8 @@
+                             const QString &bcc, const QString &subject,
+                             const QString &body, int hidden,
+                             const KURL &messageFile,
+-                            const KURL::List &attachURLs)
++                            const KURL::List &attachURLs,
++                            const QCStringList &customHeaders)
+ {
+   kdDebug(5006) << "KMKernel::openComposer called" << endl;
+   KMMessage *msg = new KMMessage;
+@@ -389,6 +393,23 @@
+   else if (!body.isEmpty())
+     msg->setBody(body.utf8());
+ 
++  if (!customHeaders.isEmpty())
++  {
++    for ( QCStringList::ConstIterator it = customHeaders.begin() ; it != customHeaders.end() ; ++it )
++      if ( !(*it).isEmpty() )
++      {
++        const int pos = (*it).find( ':' );
++        if ( pos > 0 )
++        {
++          QCString header, value;
++          header = (*it).left( pos ).stripWhiteSpace();
++          value = (*it).mid( pos+1 ).stripWhiteSpace();
++          if ( !header.isEmpty() && !value.isEmpty() )
++            msg->setHeaderField( header, value );
++        }
++      }
++  }
++
+   KMail::Composer * cWin = KMail::makeComposer( msg );
+   cWin->setCharset("", TRUE);
+   for ( KURL::List::ConstIterator it = attachURLs.begin() ; it != attachURLs.end() ; ++it )
+@@ -1802,14 +1823,15 @@
+                       const QString &cc, const QString &bcc,
+                       const QString &subj, const QString &body,
+                       const KURL &messageFile,
+-                      const KURL::List &attachURLs)
++                      const KURL::List &attachURLs,
++                      const QCStringList &customHeaders)
+ {
+-  if (mailto)
+-    openComposer (to, cc, bcc, subj, body, 0, messageFile, attachURLs);
++  if ( mailto )
++    openComposer( to, cc, bcc, subj, body, 0, messageFile, attachURLs, customHeaders );
+   else
+     openReader( check );
+ 
+-  if (check)
++  if ( check )
+     checkMail();
+   //Anything else?
+ }
+@@ -2247,9 +2269,15 @@
    if ( !Wallet::isEnabled() || walletOpenFailed )
      return 0;
  
@@ -100,8 +180,8 @@
      walletOpenFailed = true;
 Index: kmail/kmcomposewin.h
 ===================================================================
---- kmail/kmcomposewin.h	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kmail/kmcomposewin.h	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kmail/kmcomposewin.h	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kmail/kmcomposewin.h	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -398,8 +398,8 @@
    void slotAttachRemove();
    void slotAttachSave();
@@ -135,8 +215,8 @@
    bool mLastSignActionState, mLastEncryptActionState;
 Index: kmail/kmcomposewin.cpp
 ===================================================================
---- kmail/kmcomposewin.cpp	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kmail/kmcomposewin.cpp	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kmail/kmcomposewin.cpp	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kmail/kmcomposewin.cpp	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -333,7 +333,7 @@
  
    connect( mAtmListView,
@@ -198,10 +278,45 @@
      if ( ( !KRun::displayOpenWithDialog( url, autoDelete ) ) && autoDelete ) {
        QFile::remove(url.path());
      }
+Index: kmail/kmkernel.h
+===================================================================
+--- kmail/kmkernel.h	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kmail/kmkernel.h	(.../branches/KDE/3.5/kdepim)	(revision 595263)
+@@ -96,10 +96,19 @@
+   /** returns id of composer if more are opened */
+   int openComposer (const QString &to, const QString &cc, const QString &bcc,
+                     const QString &subject, const QString &body, int hidden,
+-                    const KURL &messageFile, const KURL::List &attachURLs);
++                    const KURL &messageFile, const KURL::List &attachURLs,
++                    const QCStringList &customHeaders);
+   /** For backward compatibility */
+   int openComposer (const QString &to, const QString &cc, const QString &bcc,
+                     const QString &subject, const QString &body, int hidden,
++                    const KURL &messageFile, const KURL::List &attachURLs)
++  {
++    QCStringList noCustomHeaders;
++    return openComposer(to, cc, bcc, subject, body, hidden, messageFile, attachURLs, noCustomHeaders);
++  }
++  /** For backward compatibility */
++  int openComposer (const QString &to, const QString &cc, const QString &bcc,
++                    const QString &subject, const QString &body, int hidden,
+                     const KURL &messageFile, const KURL& attachURL)
+   {
+     return openComposer(to, cc, bcc, subject, body, hidden, messageFile, KURL::List(attachURL));
+@@ -245,7 +254,8 @@
+   void setFirstInstance(bool value) { the_firstInstance = value; }
+   void action (bool mailto, bool check, const QString &to, const QString &cc,
+                const QString &bcc, const QString &subj, const QString &body,
+-	       const KURL &messageFile, const KURL::List &attach);
++               const KURL &messageFile, const KURL::List &attach,
++               const QCStringList &customHeaders);
+   void byteArrayToRemoteFile(const QByteArray&, const KURL&,
+ 			     bool overwrite = FALSE);
+   bool folderIsDraftOrOutbox(const KMFolder *);
 Index: kmail/Mainpage.dox
 ===================================================================
---- kmail/Mainpage.dox	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kmail/Mainpage.dox	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kmail/Mainpage.dox	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kmail/Mainpage.dox	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -793,7 +793,7 @@
  
    - @em BodyPartFormatter
@@ -213,8 +328,8 @@
  	some default processor. BodyPartFormatters are meant to be
 Index: knode/articlewidget.h
 ===================================================================
---- knode/articlewidget.h	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ knode/articlewidget.h	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- knode/articlewidget.h	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ knode/articlewidget.h	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -145,7 +145,7 @@
        FancyFormatting = 2,
        AllowROT13 = 4
@@ -226,8 +341,8 @@
      static QString imgToDataUrl( const QImage &image, const char* fmt );
 Index: kaddressbook/features/distributionlistwidget.cpp
 ===================================================================
---- kaddressbook/features/distributionlistwidget.cpp	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kaddressbook/features/distributionlistwidget.cpp	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kaddressbook/features/distributionlistwidget.cpp	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kaddressbook/features/distributionlistwidget.cpp	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -327,6 +327,7 @@
  #else
    KABC::DistributionList *list = mManager->list( oldName );
@@ -236,10 +351,23 @@
    updateNameCombo();
  #endif
  
+Index: libkholidays/holidays/Makefile.am
+===================================================================
+--- libkholidays/holidays/Makefile.am	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ libkholidays/holidays/Makefile.am	(.../branches/KDE/3.5/kdepim)	(revision 595263)
+@@ -11,7 +11,7 @@
+                 holiday_nl \
+                 holiday_no holiday_nz holiday_pl holiday_pt holiday_py \
+                 holiday_quebec \
+-                holiday_ro holiday_ru \ 
++                holiday_ro holiday_ru \
+ 		holiday_se holiday_si holiday_th holiday_us \
+                 holiday_uy holiday_ie \
+                 holiday_Suedtirol
 Index: libkdepim/categoryeditdialog.cpp
 ===================================================================
---- libkdepim/categoryeditdialog.cpp	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ libkdepim/categoryeditdialog.cpp	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- libkdepim/categoryeditdialog.cpp	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ libkdepim/categoryeditdialog.cpp	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -76,6 +76,7 @@
    }
    mWidget->mButtonRemove->setEnabled( categoriesExist );
@@ -250,8 +378,8 @@
  void CategoryEditDialog::slotTextChanged(const QString &text)
 Index: libkcal/libical/src/libical/sspm.c
 ===================================================================
---- libkcal/libical/src/libical/sspm.c	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ libkcal/libical/src/libical/sspm.c	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- libkcal/libical/src/libical/sspm.c	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ libkcal/libical/src/libical/sspm.c	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -1171,7 +1171,7 @@
  			     char *src,
  			     size_t *size)
@@ -263,8 +391,8 @@
      int valid_data = 0;
 Index: libkcal/htmlexport.h
 ===================================================================
---- libkcal/htmlexport.h	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ libkcal/htmlexport.h	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- libkcal/htmlexport.h	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ libkcal/htmlexport.h	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -37,7 +37,7 @@
  namespace KCal {
  
@@ -276,8 +404,8 @@
  {
 Index: kpilot/conduits/sysinfoconduit/sysinfo-setup_dialog.ui
 ===================================================================
---- kpilot/conduits/sysinfoconduit/sysinfo-setup_dialog.ui	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kpilot/conduits/sysinfoconduit/sysinfo-setup_dialog.ui	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kpilot/conduits/sysinfoconduit/sysinfo-setup_dialog.ui	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kpilot/conduits/sysinfoconduit/sysinfo-setup_dialog.ui	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -99,7 +99,7 @@
                                      <bool>true</bool>
                                  </property>
@@ -289,8 +417,8 @@
                              <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
 Index: kpilot/conduits/memofileconduit/memofile-conduit.desktop
 ===================================================================
---- kpilot/conduits/memofileconduit/memofile-conduit.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kpilot/conduits/memofileconduit/memofile-conduit.desktop	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kpilot/conduits/memofileconduit/memofile-conduit.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kpilot/conduits/memofileconduit/memofile-conduit.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -47,7 +47,7 @@
  Comment[es]=Este conducto sincroniza las notas de su agenda electrĂłnica con el directorio local.
  Comment[et]=See kanal sĂźnkroniseerib pihuarvutis ja arvutis olevad memod.
@@ -302,8 +430,8 @@
  Comment[hu]=Ezzel a csatolĂłval egy kĂŠzi szĂĄmĂ­tĂłgĂŠp memĂłit lehet szinkronizĂĄlni a helyi cĂ­mjegyzĂŠkkel.
 Index: kontact/plugins/akregator/akregatorplugin.desktop
 ===================================================================
---- kontact/plugins/akregator/akregatorplugin.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kontact/plugins/akregator/akregatorplugin.desktop	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kontact/plugins/akregator/akregatorplugin.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kontact/plugins/akregator/akregatorplugin.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -65,7 +65,7 @@
  Name[es]=OrĂ­genes
  Name[et]=Kanalid
@@ -315,8 +443,8 @@
  Name[ga]=FothaĂ­
 Index: kontact/plugins/akregator/akregatorplugin3.2.desktop
 ===================================================================
---- kontact/plugins/akregator/akregatorplugin3.2.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kontact/plugins/akregator/akregatorplugin3.2.desktop	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kontact/plugins/akregator/akregatorplugin3.2.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kontact/plugins/akregator/akregatorplugin3.2.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -64,7 +64,7 @@
  Name[es]=OrĂ­genes
  Name[et]=Kanalid
@@ -328,8 +456,8 @@
  Name[ga]=FothaĂ­
 Index: kontact/interfaces/kontactplugin.desktop
 ===================================================================
---- kontact/interfaces/kontactplugin.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ kontact/interfaces/kontactplugin.desktop	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- kontact/interfaces/kontactplugin.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ kontact/interfaces/kontactplugin.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -15,7 +15,7 @@
  Name[es]=Plugin Kontact
  Name[et]=Kontacti plugin
@@ -341,8 +469,8 @@
  Name[ga]=BreiseĂĄn Kontact
 Index: ktnef/gui/ktnef.desktop
 ===================================================================
---- ktnef/gui/ktnef.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ ktnef/gui/ktnef.desktop	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- ktnef/gui/ktnef.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ ktnef/gui/ktnef.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -57,7 +57,7 @@
  Comment[es]=A visor/extractor para archivos TNEF
  Comment[et]=TNEF-failide näitaja/ekstraktija
@@ -352,10 +480,23 @@
  Comment[fi]=Näytin/purkaja TNEF-tiedostoille
  Comment[fr]=Pour afficher / extraire des fichiers TNEF
  Comment[hi]=ŕ¤ŸŕĽ€ŕ¤ŕ¤¨ŕ¤ˆŕ¤ŕ¤Ť ऍटञइल་ं क༇ लिए ŕ¤ŕ¤• ŕ¤ŞŕĽŕ¤°ŕ¤Śŕ¤°ŕĽŕ¤śŕ¤•/ŕ¤ŕ¤•ŕĽŕ¤¸ŕ¤ŸŕĽŕ¤°ŕĽ‡ŕ¤•ŕĽŕ¤Ÿŕ¤°
+Index: korganizer/Makefile.am
+===================================================================
+--- korganizer/Makefile.am	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ korganizer/Makefile.am	(.../branches/KDE/3.5/kdepim)	(revision 595263)
+@@ -171,7 +171,7 @@
+ 	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/korganizer.pot
+ 	rm -f tips.cpp
+ 
+-xdg_apps_DATA = korganizer.desktop
++xdg_apps_DATA = korganizer.desktop korganizer-import.desktop
+ 
+ kde_kcfg_DATA = korganizer.kcfg
+ 
 Index: korganizer/korganizer.kcfg
 ===================================================================
---- korganizer/korganizer.kcfg	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ korganizer/korganizer.kcfg	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- korganizer/korganizer.kcfg	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ korganizer/korganizer.kcfg	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -74,7 +74,7 @@
  
      <entry type="Bool" key="Html With Save">
@@ -373,10 +514,30 @@
 Makefile.in
 
 
+Index: korganizer/korganizer.desktop
+===================================================================
+--- korganizer/korganizer.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ korganizer/korganizer.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-MimeType=text/calendar;text/x-vcalendar;
+ Comment=Calendar and Scheduling Program
+ Comment[af]=Kalender en Skedulering Program
+ Comment[ar]=بعناŮ
ŘŹ Ř§Ů„ŘŹŘŻŮˆŮ„ŘŠ ŮˆŘ§Ů„ŘŞŮ‚ŮˆŮŠŮ

+@@ -61,7 +60,7 @@
+ Comment[zh_CN]=ć—ĽĺŽ†ĺ’Œć—Ľç¨‹ĺŽ‰ćŽ’ç¨‹ĺş
+ Comment[zh_TW]=čĄŒäş‹ć›†čˆ‡ćŽ’ç¨‹čťŸéŤ”
+ Comment[zu]=Ikhalenda kanye Neprogramu Yokugcina isikhathi
+-Exec=korganizer --import %u
++Exec=korganizer
+ Icon=korganizer
+ Path=
+ DocPath=korganizer/index.html
 Index: korganizer/korganizer_configgroupautomation.desktop
 ===================================================================
---- korganizer/korganizer_configgroupautomation.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 594434)
-+++ korganizer/korganizer_configgroupautomation.desktop	(.../branches/KDE/3.5/kdepim)	(revision 594434)
+--- korganizer/korganizer_configgroupautomation.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 595263)
++++ korganizer/korganizer_configgroupautomation.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
 @@ -25,7 +25,7 @@
  Name[es]=AutomatizaciĂłn del grupo
  Name[et]=GrupitÜÜ
@@ -386,6 +547,148 @@
  Name[fi]=Ryhmän automatisointi
  Name[fr]=Automatisation des groupes
  Name[gl]=AutomatizaciĂłn de Grupo
+Index: korganizer/korganizer-import.desktop
+===================================================================
+--- korganizer/korganizer-import.desktop	(.../tags/KDE/3.5.5/kdepim)	(revision 0)
++++ korganizer/korganizer-import.desktop	(.../branches/KDE/3.5/kdepim)	(revision 595263)
+@@ -0,0 +1,137 @@
++[Desktop Entry]
++Encoding=UTF-8
++MimeType=text/calendar;text/x-vcalendar;
++Comment=Calendar and Scheduling Program
++Comment[af]=Kalender en Skedulering Program
++Comment[ar]=بعناŮ
ŘŹ Ř§Ů„ŘŹŘŻŮˆŮ„ŘŠ ŮˆŘ§Ů„ŘŞŮ‚ŮˆŮŠŮ

++Comment[bg]=ĐŸŃ€ĐžĐłŃ€Đ°ĐźĐ° Са каНондар и раСписанио
++Comment[bs]=Kalendar i rokovnik
++Comment[ca]=Un programa de calendari i planificaciĂł
++Comment[cs]=Kalendåřový a plånovací program
++Comment[cy]=Rhaglen Galendr a Drefnlennu
++Comment[da]=Kalender- og planlĂŚgningsprogram
++Comment[de]=Ein Kalender und Zeitplaner
++Comment[el]=Î ĎĎŒÎłĎÎąÎźÎźÎą ΡΟξροΝογίοĎ
 κιΚ Ď€ĎÎżÎłĎÎąÎźÎźÎąĎ„ÎšĎƒÎźÎżĎ
++Comment[eo]=Kalendara kaj plana programo
++Comment[es]=Calendario y planificador
++Comment[et]=Kalendri ja ajakava haldamise rakendus
++Comment[eu]=Egutegi eta antolaketa progrmaa
++Comment[fa]=ŘŞŮ‚ŮˆŰŒŮ
 Ůˆ بعناŮ
Ű€ زŮ
Ř§Ů†â€ŒŘ¨Ů†ŘŻŰŒ
++Comment[fi]=Kalenteri ja ajanhallintaohjelma
++Comment[fr]=Calendrier et agenda personnel
++Comment[gl]=Programa de Calendario e Axenda
++Comment[he]=×Ş×•×›× ×™×•×Ş לוח ×Š× ×” ×•×Ş×–×ž×•×Ÿ מ׊ימות
++Comment[hi]=ŕ¤•ŕĽˆŕ¤˛ŕĽ‡ŕ¤¨ŕĽŕ¤Ąŕ¤° त़ञ सऎय-सञरणༀ ŕ¤ŞŕĽŕ¤°ŕĽ‹ŕ¤—ŕĽŕ¤°ŕ¤žŕ¤Ž
++Comment[hr]=Kalendar i rokovnik
++Comment[hu]=Hatåridőnapló Ês esemÊnyszervező
++Comment[is]=DagbĂłk og skipulag
++Comment[it]=Programma di calendario e di agenda
++Comment[ja]=ă‚ŤăƒŹăƒłăƒ€ăƒźă¨ă‚šă‚ąă‚¸ăƒĽăƒźăƒŤçŽĄç†ăƒ—ăƒ­ă‚°ăƒŠăƒ 
++Comment[km]=áž€áž˜áŸ’áž˜ážœážˇáž’áž¸â€‹áž”áŸ’ážšážážˇáž‘ážˇáž“ នឡង áž€ážśáž›ážœážˇáž—ážśáž‚
++Comment[lt]=Kalendoriaus ir planavimo programa
++Comment[lv]=Kalendāra un Plānoťanas Programma
++Comment[mk]=КаНондар и рОкОвник
++Comment[ms]=Kalendar dan Program Penjadualan 
++Comment[mt]=Programm b' kalendarju w skeda
++Comment[nb]=Et kalender- og tidsplanleggingsprogram
++Comment[nds]=Kalenner un Tietplaner
++Comment[nl]=Agenda- en afsprakenprogramma
++Comment[nn]=Kalender- og planleggingsprogram
++Comment[nso]=Lenaneo la Peakanyo ya Tshupamabaka
++Comment[pl]=Kalendarz i terminarz
++Comment[pt]=CalendĂĄrio e Programa de Escalonamento
++Comment[pt_BR]=Programa de CalendĂĄrio e Agenda
++Comment[ro]=Program de planificare ĹŸi calendar
++Comment[ru]=ĐšĐ°ĐťĐľĐ˝Đ´Đ°Ń€ŃŒ и НичнОо расписанио
++Comment[se]=Kaleandar- ja plĂĄnenprogrĂĄmma
++Comment[sk]=KalendĂĄr a plĂĄnovacĂ­ program
++Comment[sl]=Program za koledar in razporejanje
++Comment[sr]=КаНондарски и пНанорски прОграП
++Comment[sr at Latn]=Kalendarski i planerski program
++Comment[sv]=Kalender- och schemaläggningsprogram
++Comment[ta]=ŕŽ¨ŕŽžŕŽłŕŻŕŽ•ŕŽžŕŽŸŕŻŕŽŸŕŽż மற்றும் ŕŽ¤ŕŽżŕŽŸŕŻŕŽŸ நிரல்
++Comment[tg]=ТақвиПОт ва ҡадваНи ŃˆĐ°Ń
сӣ
++Comment[th]=ŕš‚ŕ¸›ŕ¸Łŕšŕ¸ŕ¸Łŕ¸Ąŕ¸ˆŕ¸ąŕ¸”ŕ¸ŕ¸˛ŕ¸Łŕ¸›ŕ¸ŕ¸´ŕ¸—ŕ¸´ŕ¸™ŕšŕ¸Ľŕ¸°ŕ¸•ŕ¸˛ŕ¸Łŕ¸˛ŕ¸‡ŕ¸ŕ¸˛ŕ¸Łŕ¸™ŕ¸ąŕ¸”ŕ¸Ťŕ¸Ąŕ¸˛ŕ¸˘
++Comment[tr]=Takvim ve Zamanlama ProgramÄą
++Comment[uk]=ĐŸŃ€ĐžĐłŃ€Đ°ĐźĐ° ĐşĐ°ĐťĐľĐ˝Đ´Đ°Ń€Ń Ń‚Đ° Ń€ĐžĐˇĐşĐťĐ°Đ´Ńƒ
++Comment[uz]=КаНондар ва Ń€ĐľĐśĐ°ĐťĐ°ŃˆŃ‚Đ¸Ń€Đ¸Ńˆ Đ´Đ°ŃŃ‚ŃƒŃ€Đ¸
++Comment[ven]=Khalenda na mbekanyamushumo ya u shedula
++Comment[vi]=Chưƥng trÏnh lᝋch và kế hoấch
++Comment[xh]=Ikhalenda no Dweliso lwenkqubo Yokucwangcisa
++Comment[zh_CN]=ć—ĽĺŽ†ĺ’Œć—Ľç¨‹ĺŽ‰ćŽ’ç¨‹ĺş
++Comment[zh_TW]=čĄŒäş‹ć›†čˆ‡ćŽ’ç¨‹čťŸéŤ”
++Comment[zu]=Ikhalenda kanye Neprogramu Yokugcina isikhathi
++Exec=korganizer --import %u
++Icon=korganizer
++Path=
++DocPath=korganizer/index.html
++Type=Application
++Terminal=false
++Name=KOrganizer
++Name[af]=Korganizer
++Name[ar]=Ů
نظŮ
 ŮƒŮŠŘŻŮŠ
++Name[be]=K АрганіСатар
++Name[cy]=KTrefnydd
++Name[eo]=Organizilo
++Name[hi]=क༇-ŕ¤†ŕ¤°ŕĽŕ¤—ŕĽ‡ŕ¤¨ŕ¤žŕ¤‡ŕ¤œŕ¤źŕ¤°
++Name[lv]=KOrganaizers
++Name[mk]=ОрганиСатОр
++Name[nso]=KMokopanyi
++Name[pl]=Organizator
++Name[sv]=Korganizer
++Name[ta]=ŕŽ•ŕŻ‡ŕŽ
ŕŽŽŕŻˆŕŽŞŕŻŕŽŞŕŽžŕŽłŕŽ°ŕŻ
++Name[ven]=Mulugisi wa K
++Name[zh_TW]=KOrganizer čĄŒäş‹ć›†
++GenericName=Personal Organizer
++GenericName[be]=ĐŸŃŃ€ŃĐ°Đ˝Đ°ĐťŃŒĐ˝Ń‹ арганіСатар
++GenericName[bg]=ОрганиСатОр
++GenericName[bs]=Lični organizer
++GenericName[ca]=Organitzador personal
++GenericName[cs]=OsobnĂ­ organizĂŠr
++GenericName[cy]=Trefnydd Personol
++GenericName[da]=Personlig organisering
++GenericName[de]=PersĂśnliche Daten organisieren
++GenericName[el]=Î ĎÎżĎƒĎ‰Ď€ÎšÎşĎŒĎ‚ οργινωτΎς
++GenericName[en_GB]=Personal Organiser
++GenericName[es]=Organizador personal
++GenericName[et]=Personaalne ajaarvestus
++GenericName[eu]=Antolatzaile pertsonala
++GenericName[fa]=سازŮ
Ř§Ů†â€ŒŘŻŮ‡Ů†ŘŻŰ€ Ř´ŘŽŘľŰŒâ€Œ
++GenericName[fi]=HenkilĂśkohtainen ajanhallintaohjelma
++GenericName[fr]=Organiseur personnel
++GenericName[gl]=Organizador Persoal
++GenericName[he]=×ž× ×”×œ זמן אי׊י
++GenericName[hi]=ŕ¤¨ŕ¤żŕ¤œŕĽ€ ŕ¤ŞŕĽŕ¤°ŕ¤Źŕ¤‚ŕ¤§ŕ¤•
++GenericName[hu]=Hatåridőnapló
++GenericName[is]=PersĂłnuleg skipulagsbĂłk
++GenericName[it]=Organizzatore personale
++GenericName[ja]=ĺ€‹äşşĺ‘ă‘ă‚šă‚ąă‚¸ăƒĽăƒźăƒŤçŽĄç†
++GenericName[km]=áž€áž˜áŸ’áž˜ážœážˇáž’áž¸â€‹ážšáŸ€áž”áž
áŸ†â€‹áž•áŸ’áž‘ážśáž›áŸ‹â€‹ážáŸ’áž›áž˝áž“
++GenericName[lt]=AsmeninÄ—s informacijos tvarkyklÄ—
++GenericName[ms]=Penyusun Peribadi
++GenericName[nb]=Personlig planlegger
++GenericName[nds]=PersÜÜnlich MÜtenkalenner
++GenericName[nl]=Persoonlijke organizer
++GenericName[nn]=Personleg organiserar
++GenericName[pl]=Osobisty organizator
++GenericName[pt]=Organizador Pessoal
++GenericName[pt_BR]=Organizador Pessoal
++GenericName[ro]=Organizator personal
++GenericName[ru]=ĐŸĐľŃ€ŃĐžĐ˝Đ°ĐťŃŒĐ˝Ń‹Đš ОрганаКСор
++GenericName[sk]=Osobný plánovač
++GenericName[sl]=Osebni organizator
++GenericName[sr]=Лични пНанор
++GenericName[sr at Latn]=Lični planer
++GenericName[sv]=Filofax
++GenericName[ta]=தனிப்பயன் ŕŽ
ŕŽŽŕŻˆŕŽŞŕŻŕŽŞŕŽžŕŽłŕŽ°ŕŻ
++GenericName[tg]=ОрганаКСори инфирОдӣ
++GenericName[tr]=KiĹŸisel Bilgi YĂśneticisi
++GenericName[uk]=ĐŸĐľŃ€ŃĐžĐ˝Đ°ĐťŃŒĐ˝Đ¸Đš тиМновик
++GenericName[uz]=ШаŃ
сиК ОрганаКСор
++GenericName[zh_CN]=个人旼程厉排
++GenericName[zh_TW]=ĺ€‹äşşčĄŒç¨‹çľ„çš”čťŸéŤ”
++ServiceTypes=Browser/View,DCOP/Organizer
++X-KDE-Library=libkorganizerpart
++X-KDE-StartupNotify=true
++X-DCOP-ServiceType=Unique
++X-DCOP-ServiceName=korganizer
 
 Property changes on: .
 ___________________________________________________________________
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.26&r2=1.27&f=u