3 files changed, 10 insertions, 7 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 792cb91..5e2180f 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -824,13 +824,13 @@
 { "On day ","Am Tag " },
 { "%1 of ","%1 des Monats" },
 { "%1 of the year","%1 des Jahres" },
 { "Anonymous","Anonymo" },
 { "nobody@nowhere","niemand@nirgendwo" },
 { "calendar.html","calendar.html" },
-{ " Local Time"," Locale Zeit" },
+{ " Local Time"," Lokale Zeit" },
 { "Unknown Name","Unbekannter Name" },
 { "unknown@nowhere","unbekannt@nirgendwo" },
 { "Beam via IR!","Beam via IR!" },
 { "Next Month","Nächster Monat" },
 { "Prio","Prio" },
 { "Reparent Todo","Mache Sub-Todo" },
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index 7bb8bd8..2f794d6 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -23,12 +23,13 @@
 
 #include <qtooltip.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qprogressbar.h>
+#include <qprogressdialog.h>
 #include <qwidgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qregexp.h>
 #include <qapplication.h>
 #include <qhbox.h>
@@ -215,19 +216,19 @@ void KAImportOLdialog::readContactData( DWORD folder )
   mf.m_lpDispatch->AddRef();
   _Items folderItems;
   _variant_t indx((long)0);
   LPDISPATCH itm;
   int i;
   folderItems = mf.GetItems(); 
-  QProgressBar bar( folderItems.GetCount(),0 );
-  bar.setCaption (i18n("Importing - close to abort!") );
+  QProgressDialog bar( i18n("Importing contact data"),i18n("Abort"), folderItems.GetCount(),this);
+  bar.setCaption (i18n("Importing!") );
   int h = bar.sizeHint().height() ;
   int w = 300;
   int dw = QApplication::desktop()->width();
   int dh = QApplication::desktop()->height();
-  bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+  //bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
   bar.show();
   for(i=1; i <= folderItems.GetCount(); ++i)
     {
       qApp->processEvents();
       if ( ! bar.isVisible() )
             return ;
diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 7aa6076..2af436c 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -23,12 +23,13 @@
 
 #include <qtooltip.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qprogressbar.h>
+#include <qprogressdialog.h>
 #include <qwidgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qapplication.h>
 #include <qhbox.h>
 #include <qregexp.h>
@@ -208,26 +209,27 @@ void KOImportOLdialog::readCalendarData( DWORD folder )
   mf.m_lpDispatch->AddRef();
   _Items folderItems;
   _variant_t indx((long)0);
   LPDISPATCH itm;
   int i;
   folderItems = mf.GetItems(); 
-  QProgressBar bar( folderItems.GetCount(),0 );
-  bar.setCaption (i18n("Importing - close to abort!") );
+  QProgressDialog bar( i18n("Importing calendar data"),i18n("Abort"), folderItems.GetCount(),this );
+  bar.setCaption (i18n("Importing!") );
   int h = bar.sizeHint().height() ;
   int w = 300;
   int dw = QApplication::desktop()->width();
   int dh = QApplication::desktop()->height();
-  bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+  //bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
   bar.show();
   for(i=1; i <= folderItems.GetCount(); ++i)
     {
       qApp->processEvents();
       if ( ! bar.isVisible() )
             return ;
       bar.setProgress( i );
+      bar.raise();
       indx = (long)i;
       itm = folderItems.Item(indx.Detach());
       _AppointmentItem * pItem = (_AppointmentItem *)&itm;
       ol2kopiCalendar( pItem );
       itm->Release();
     }