VINklumpen

author: zautrix <zautrix> 2004-10-22 22:49:12 (UTC)
committer: zautrix <zautrix> 2004-10-22 22:49:12 (UTC)
commit: 0f0dc54f0edc8c4ec5b320118c82fa5150591fed (patch) (unidiff)
tree: 2dfc23bdd2fa71ee54a501e5109be6346e9044c3
parent: 1d8ed9298d8c201184d0a941f0d45e7f42201fd4 (diff)
download: kdepimpi-0f0dc54f0edc8c4ec5b320118c82fa5150591fed.zip
kdepimpi-0f0dc54f0edc8c4ec5b320118c82fa5150591fed.tar.gz
kdepimpi-0f0dc54f0edc8c4ec5b320118c82fa5150591fed.tar.bz2
7 files changed, 3 insertions, 100 deletions
diff --git a/Makefile b/Makefile
index 8c6110c..da5feba 100644
--- a/Makefile
+++ b/Makefile
@@ -42,321 +42,321 @@ SUBDIRS_MICROMAIL = \
   kmicromail/libmailwrapper \
   kmicromail
 SUBDIRS_GAMMU = \
   gammu/emb/common \
   gammu/emb/gammu
 SUBDIRS_PWMANAGER = \
   pwmanager/libcrypt/mpi  \
   pwmanager/libcrypt/error  \
   pwmanager/libcrypt/cipher  \
   pwmanager/libcrypt/zlib \
   pwmanager/pwmanager
 SUBDIRS = \
   $(SUBDIRS_MICROKDE) \
   $(SUBDIRS_QTOPIA_PLUGIN) \
   $(SUBDIRS_OPIE_PLUGIN) \
   $(SUBDIRS_SHARP_PLUGIN) \
   $(SUBDIRS_LDAP_PLUGIN) \
   $(SUBDIRS_MICROMAIL) \
   $(SUBDIRS_GAMMU) \
   $(SUBDIRS_PWMANAGER) 
 all: build_microkde \
     build_qtopia_plugin \
     build_opie_plugin \
     build_sharp_plugin \
     build_ldap_plugin \
     build_micromail \
     build_gammu \
     build_pwmanager
 build_microkde: variable_test tmake
        for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
 build_qtopia_plugin: build_microkde
  ifdef BUILD_NO_QTOPIA_PLUGIN
        @echo == qtopia plugin not build.
  else
        for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 build_opie_plugin: build_microkde
  ifdef BUILD_NO_OPIE_PLUGIN
        @echo == opie plugin not build.
  else
        for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 build_sharp_plugin: build_microkde
  ifdef BUILD_NO_SHARP_PLUGIN
        @echo == ldap plugin not build.
  else
        for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
  
 build_ldap_plugin: build_microkde
  ifdef BUILD_NO_LDAP_PLUGIN
        @echo == ldap plugin not build.
  else
          for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
            make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 build_micromail: build_microkde
  ifdef BUILD_NO_MICROMAIL
        @echo == kmicromail not build.
  else
        for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 build_gammu: variable_test tmake
  ifdef BUILD_NO_GAMMU
        @echo == gammu not build.
  else
        for i in $(SUBDIRS_GAMMU); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 build_pwmanager: build_microkde
  ifdef BUILD_NO_PWMANAGER
        @echo == pwmanager not build.
  else
        for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 variable_info:
        @echo --------------------------------------
        @echo KDEPIM buildsystem, variableinfo...
        @echo KDEPIMDIR=$(KDEPIMDIR)
        @echo QTDIR=$(QTDIR)
        @echo QPEDIR=$(QPEDIR)
        @echo OPIEDIR=$(OPIEDIR)
        @echo PLATFORM=$(PLATFORM)
        @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
        @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
        @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
        @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
        @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
        @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
        ifndef BUILD_NO_SHARP_PLUGIN
        @echo SHARPDTMSDK=$(SHARPDTMSDK)
        endif
        @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
        @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
        @echo --------------------------------------
 variable_test: variable_info
        @echo KDEPIM buildsystem, variablecheck...
  ifndef KDEPIMDIR
        @echo KDEPIMDIR is not defined.
        $(error KDEPIMDIR is not defined)
  endif
  ifndef PLATFORM
        @echo PLATFORM is not defined.
        $(error PLATFORM is not defined)
  endif
  ifdef BUILD_NO_LDAP_PLUGIN
        @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
  endif
  ifdef BUILD_NO_OPIE_PLUGIN
        @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
  endif
  ifdef BUILD_NO_QTOPIA_PLUGIN
        @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
  endif
  ifdef BUILD_NO_MICROMAIL
        @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
  endif
  ifdef BUILD_NO_SHARP_PLUGIN
        @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
  else
  ifndef SHARPDTMSDK
        @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
        $(error SHARPDTMSDK is not defined)
  endif
  endif
  ifdef BUILD_NO_GAMMU
        @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
  endif
  ifdef BUILD_NO_PWMANAGER
        @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
  endif
        @echo --------------------------------------
 objects:
        for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
        for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
        mkdir -p libical/lib/$(PLATFORM)
        mkdir -p pwmanager/libcrypt/$(PLATFORM)
 clean:
        rm -rf libical/lib/$(PLATFORM)/*;
        rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
        for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
          done 
 install:
        cd bin/kdepim; make install
        cp -r Pim $(QPEDIR)/apps
        cp db2file/db2file $(QPEDIR)/bin/db2file
        cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
        cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
        cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
    
 dist: 
        @echo Dont forget to do "make install" before "make dist"
        rm -f *arm.ipk
        rm -f *~
-        cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
+        cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
        mkipks kmicrokdelibs.control
        mkipks korganizer.control
        mkipks kaddressbook.control
  ifndef BUILD_NO_MICROMAIL
        mkipks kopiemail.control
  endif
        mkipks korganizer-alarm.control
  ifndef BUILD_NO_GAMMU
        mkipks phoneaccess.control
  endif
  ifndef BUILD_NO_PWMANAGER
        mkipks pwmanager.control
  endif
        mkipks pim_TAB_icon.control
 tmake: objects \
       qtcompat/Makefile$(PLATFORM) \
       microkde/Makefile$(PLATFORM) \
       libkcal/Makefile$(PLATFORM) \
       libkdepim/Makefile$(PLATFORM) \
       korganizer/Makefile$(PLATFORM) \
       kalarmd/Makefile$(PLATFORM) \
       libical/src/libical/Makefile$(PLATFORM) \
       libical/src/libicalss/Makefile$(PLATFORM) \
       kabc/Makefile$(PLATFORM) \
       kabc/formats/binary/Makefile$(PLATFORM) \
       kabc/plugins/file/Makefile$(PLATFORM) \
       kabc/plugins/dir/Makefile$(PLATFORM) \
       kabc/plugins/ldap/Makefile$(PLATFORM) \
       kabc/plugins/opie/Makefile$(PLATFORM) \
       kabc/plugins/qtopia/Makefile$(PLATFORM) \
       kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
       kaddressbook/Makefile$(PLATFORM) \
       kmicromail/Makefile$(PLATFORM) \
       kmicromail/libetpan/Makefile$(PLATFORM) \
       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
       gammu/emb/common/Makefile$(PLATFORM) \
       gammu/emb/gammu/Makefile$(PLATFORM) \
       pwmanager/pwmanager/Makefile$(PLATFORM) \
       pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
       pwmanager/libcrypt/error/Makefile$(PLATFORM) \
       pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
       pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
        cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
 microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
        cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
 libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
        cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
 libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
        cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
 kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
        cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
 korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
        cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
 libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
        cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
 libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
        cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
 kabc/Makefile$(PLATFORM): kabc/kabcE.pro
        cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
 kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
        cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
 kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
        cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
 kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
        cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
 kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
        cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
 kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
        cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
 kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
        cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
 kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
        cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
 kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
        cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
 kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
        cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
 kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
        cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
 kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
        cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
 gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
        cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
 gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
        cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
 pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
        cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
        cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
        cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
        cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
        cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 8c6110c..da5feba 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -42,321 +42,321 @@ SUBDIRS_MICROMAIL = \
   kmicromail/libmailwrapper \
   kmicromail
 SUBDIRS_GAMMU = \
   gammu/emb/common \
   gammu/emb/gammu
 SUBDIRS_PWMANAGER = \
   pwmanager/libcrypt/mpi  \
   pwmanager/libcrypt/error  \
   pwmanager/libcrypt/cipher  \
   pwmanager/libcrypt/zlib \
   pwmanager/pwmanager
 SUBDIRS = \
   $(SUBDIRS_MICROKDE) \
   $(SUBDIRS_QTOPIA_PLUGIN) \
   $(SUBDIRS_OPIE_PLUGIN) \
   $(SUBDIRS_SHARP_PLUGIN) \
   $(SUBDIRS_LDAP_PLUGIN) \
   $(SUBDIRS_MICROMAIL) \
   $(SUBDIRS_GAMMU) \
   $(SUBDIRS_PWMANAGER) 
 all: build_microkde \
     build_qtopia_plugin \
     build_opie_plugin \
     build_sharp_plugin \
     build_ldap_plugin \
     build_micromail \
     build_gammu \
     build_pwmanager
 build_microkde: variable_test tmake
        for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
 build_qtopia_plugin: build_microkde
  ifdef BUILD_NO_QTOPIA_PLUGIN
        @echo == qtopia plugin not build.
  else
        for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 build_opie_plugin: build_microkde
  ifdef BUILD_NO_OPIE_PLUGIN
        @echo == opie plugin not build.
  else
        for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 build_sharp_plugin: build_microkde
  ifdef BUILD_NO_SHARP_PLUGIN
        @echo == ldap plugin not build.
  else
        for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
  
 build_ldap_plugin: build_microkde
  ifdef BUILD_NO_LDAP_PLUGIN
        @echo == ldap plugin not build.
  else
          for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
            make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 build_micromail: build_microkde
  ifdef BUILD_NO_MICROMAIL
        @echo == kmicromail not build.
  else
        for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 build_gammu: variable_test tmake
  ifdef BUILD_NO_GAMMU
        @echo == gammu not build.
  else
        for i in $(SUBDIRS_GAMMU); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 build_pwmanager: build_microkde
  ifdef BUILD_NO_PWMANAGER
        @echo == pwmanager not build.
  else
        for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
          make -f Makefile$(PLATFORM) || exit 1; popd; \
          done
  endif
 variable_info:
        @echo --------------------------------------
        @echo KDEPIM buildsystem, variableinfo...
        @echo KDEPIMDIR=$(KDEPIMDIR)
        @echo QTDIR=$(QTDIR)
        @echo QPEDIR=$(QPEDIR)
        @echo OPIEDIR=$(OPIEDIR)
        @echo PLATFORM=$(PLATFORM)
        @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
        @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
        @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
        @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
        @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
        @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
        ifndef BUILD_NO_SHARP_PLUGIN
        @echo SHARPDTMSDK=$(SHARPDTMSDK)
        endif
        @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
        @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
        @echo --------------------------------------
 variable_test: variable_info
        @echo KDEPIM buildsystem, variablecheck...
  ifndef KDEPIMDIR
        @echo KDEPIMDIR is not defined.
        $(error KDEPIMDIR is not defined)
  endif
  ifndef PLATFORM
        @echo PLATFORM is not defined.
        $(error PLATFORM is not defined)
  endif
  ifdef BUILD_NO_LDAP_PLUGIN
        @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
  endif
  ifdef BUILD_NO_OPIE_PLUGIN
        @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
  endif
  ifdef BUILD_NO_QTOPIA_PLUGIN
        @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
  endif
  ifdef BUILD_NO_MICROMAIL
        @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
  endif
  ifdef BUILD_NO_SHARP_PLUGIN
        @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
  else
  ifndef SHARPDTMSDK
        @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
        $(error SHARPDTMSDK is not defined)
  endif
  endif
  ifdef BUILD_NO_GAMMU
        @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
  endif
  ifdef BUILD_NO_PWMANAGER
        @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
  endif
        @echo --------------------------------------
 objects:
        for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
        for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
        mkdir -p libical/lib/$(PLATFORM)
        mkdir -p pwmanager/libcrypt/$(PLATFORM)
 clean:
        rm -rf libical/lib/$(PLATFORM)/*;
        rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
        for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
          done 
 install:
        cd bin/kdepim; make install
        cp -r Pim $(QPEDIR)/apps
        cp db2file/db2file $(QPEDIR)/bin/db2file
        cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
        cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
        cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
    
 dist: 
        @echo Dont forget to do "make install" before "make dist"
        rm -f *arm.ipk
        rm -f *~
-        cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
+        cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
        mkipks kmicrokdelibs.control
        mkipks korganizer.control
        mkipks kaddressbook.control
  ifndef BUILD_NO_MICROMAIL
        mkipks kopiemail.control
  endif
        mkipks korganizer-alarm.control
  ifndef BUILD_NO_GAMMU
        mkipks phoneaccess.control
  endif
  ifndef BUILD_NO_PWMANAGER
        mkipks pwmanager.control
  endif
        mkipks pim_TAB_icon.control
 tmake: objects \
       qtcompat/Makefile$(PLATFORM) \
       microkde/Makefile$(PLATFORM) \
       libkcal/Makefile$(PLATFORM) \
       libkdepim/Makefile$(PLATFORM) \
       korganizer/Makefile$(PLATFORM) \
       kalarmd/Makefile$(PLATFORM) \
       libical/src/libical/Makefile$(PLATFORM) \
       libical/src/libicalss/Makefile$(PLATFORM) \
       kabc/Makefile$(PLATFORM) \
       kabc/formats/binary/Makefile$(PLATFORM) \
       kabc/plugins/file/Makefile$(PLATFORM) \
       kabc/plugins/dir/Makefile$(PLATFORM) \
       kabc/plugins/ldap/Makefile$(PLATFORM) \
       kabc/plugins/opie/Makefile$(PLATFORM) \
       kabc/plugins/qtopia/Makefile$(PLATFORM) \
       kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
       kaddressbook/Makefile$(PLATFORM) \
       kmicromail/Makefile$(PLATFORM) \
       kmicromail/libetpan/Makefile$(PLATFORM) \
       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
       gammu/emb/common/Makefile$(PLATFORM) \
       gammu/emb/gammu/Makefile$(PLATFORM) \
       pwmanager/pwmanager/Makefile$(PLATFORM) \
       pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
       pwmanager/libcrypt/error/Makefile$(PLATFORM) \
       pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
       pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
        cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
 microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
        cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
 libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
        cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
 libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
        cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
 kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
        cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
 korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
        cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
 libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
        cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
 libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
        cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
 kabc/Makefile$(PLATFORM): kabc/kabcE.pro
        cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
 kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
        cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
 kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
        cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
 kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
        cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
 kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
        cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
 kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
        cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
 kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
        cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
 kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
        cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
 kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
        cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
 kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
        cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
 kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
        cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
 kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
        cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
 gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
        cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
 gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
        cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
 pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
        cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
        cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
        cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
        cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
        cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index d7e9d0a..a5ba794 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -1,281 +1,257 @@
 { "file","file" },
 { "Choose one file","Choose one file" },
 { "dir","dir" },
 { "Choose a directory with may files","Choose a directory with may files" },
 { "ldap","ldap" },
 { "No description available","No description available" },
 { "Library files for "%1" not found in paths","Library files for "%1" not found in paths" },
 { "qtopia","qtopia" },
 { "Qtopia PIM Addressbook.","Qtopia PIM Addressbook." },
 { "vCard","vCard" },
 { "vCard Format","vCard Format" },
 { "microkabcformat_binary","microkabcformat_binary" },
 { "Binary","Binary" },
 { "No description available.","No description available." },
 { "Department","Department" },
 { "Profession","Profession" },
 { "Assistant's Name","Assistant's Name" },
 { "Manager's Name","Manager's Name" },
 { "Spouse's Name","Spouse's Name" },
 { "Office","Office" },
 { "IM Address","IM Address" },
 { "Anniversary","Anniversary" },
 { "Gender","Gender" },
 { "Children","Children" },
 { "FreeBusyUrl","FreeBusyUrl" },
 { "ExternalID","ExternalID" },
 { "Resource loaded: '%1'","Resource loaded: '%1'" },
 { "Select View","Select View" },
 { "Modify View...","Modify View..." },
 { "Add View...","Add View..." },
 { "Delete View","Delete View" },
 { "Refresh View","Refresh View" },
 { "Edit &Filters...","Edit &Filters..." },
 { "Select Filter","Select Filter" },
 { "Style:","Style:" },
 { "HTML table style.","HTML table style." },
 { "Default Table View","Default Table View" },
-{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
 { "Show Extension Bar","Show Extension Bar" },
 { "None","None" },
 { "Name...","Name..." },
 { "Role:","Role:" },
 { "Organization:","Organization:" },
 { "Formatted name:","Formatted name:" },
 { "Edit Phone Numbers...","Edit Phone Numbers..." },
 { "Categories","Categories" },
 { "Public","Public" },
 { "Private","Private" },
 { "Confidential","Confidential" },
 { "&General","&General" },
 { "&Edit Addresses...","&Edit Addresses..." },
 { "Edit Email Addresses...","Edit Email Addresses..." },
 { "Email:","Email:" },
 { "URL:","URL:" },
 { "&IM address:","&IM address:" },
 { "&Address","&Address" },
 { "Department:","Department:" },
 { "Office:","Office:" },
 { "Profession:","Profession:" },
 { "Manager's name:","Manager's name:" },
 { "Assistant's name:","Assistant's name:" },
 { "Nick name:","Nick name:" },
 { "Spouse's name:","Spouse's name:" },
 { "Children's names:","Children's names:" },
 { "Birthday:","Birthday:" },
 { " Local Time"," Local Time" },
-{ "+12:00 Asia/Kamchatka","+12:00 Asia/Kamchatka" },
-{ "+11:00 Asia/Magadan","+11:00 Asia/Magadan" },
-{ "+10:00 Asia/Vladivostok","+10:00 Asia/Vladivostok" },
-{ "+09:00 Asia/Tokyo","+09:00 Asia/Tokyo" },
-{ "+08:00 Asia/Hongkong","+08:00 Asia/Hongkong" },
-{ "+07:00 Asia/Bangkok","+07:00 Asia/Bangkok" },
-{ "+06:00 Indian/Chagos","+06:00 Indian/Chagos" },
-{ "+05:00 Indian/Maldives","+05:00 Indian/Maldives" },
-{ "+04:00 Indian/Mauritius","+04:00 Indian/Mauritius" },
-{ "+03:00 Europe/Moscow","+03:00 Europe/Moscow" },
-{ "+02:00 Europe/Helsinki","+02:00 Europe/Helsinki" },
-{ " 00:00 Europe/London(UTC)"," 00:00 Europe/London(UTC)" },
-{ "-01:00 Atlantic/Azores","-01:00 Atlantic/Azores" },
-{ "-02:00 Brazil/DeNoronha","-02:00 Brazil/DeNoronha" },
-{ "-03:00 Brazil/East","-03:00 Brazil/East" },
-{ "-04:00 Brazil/West","-04:00 Brazil/West" },
-{ "-05:00 US/Eastern","-05:00 US/Eastern" },
-{ "-06:00 US/Central","-06:00 US/Central" },
-{ "-07:00 US/Mountain","-07:00 US/Mountain" },
-{ "-08:00 US/Pacific","-08:00 US/Pacific" },
-{ "-09:00 US/Alaska","-09:00 US/Alaska" },
-{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
-{ "-11:00 US/Samoa","-11:00 US/Samoa" },
 { "Mon","Mon" },
 { "Tue","Tue" },
 { "Wed","Wed" },
 { "Thu","Thu" },
 { "Fri","Fri" },
 { "Sat","Sat" },
 { "Sun","Sun" },
 { "January","January" },
 { "February","February" },
 { "March","March" },
 { "April","April" },
 { "May","May" },
 { "June","June" },
 { "July","July" },
 { "August","August" },
 { "September","September" },
 { "October","October" },
 { "November","November" },
 { "December","December" },
 { "tomorrow","tomorrow" },
 { "today","today" },
 { "yesterday","yesterday" },
 { "Monday","Monday" },
 { "Tuesday","Tuesday" },
 { "Wednesday","Wednesday" },
 { "Thursday","Thursday" },
 { "Friday","Friday" },
 { "Saturday","Saturday" },
 { "Sunday","Sunday" },
 { "Anniversary:","Anniversary:" },
 { "Gender:","Gender:" },
 { "ALIEN (gender undefined)","ALIEN (gender undefined)" },
 { "female","female" },
 { "male","male" },
 { "&Details","&Details" },
 { "Note:","Note:" },
 { "&Notes","&Notes" },
 { "Use geo data","Use geo data" },
 { "Latitude:","Latitude:" },
 { "Longitude:","Longitude:" },
 { "Edit Geo Data...","Edit Geo Data..." },
 { "Keys:","Keys:" },
 { "Add","Add" },
 { "Remove","Remove" },
 { "Export","Export" },
 { "&Misc","&Misc" },
 { "Photo","Photo" },
 { "Store as URL","Store as URL" },
 { "Logo","Logo" },
 { "&Images","&Images" },
 { "Home","Home" },
 { "Work","Work" },
 { "Mobile","Mobile" },
 { "Fax","Fax" },
 { "Contact Editor","Contact Editor" },
 { "&Mail...","&Mail..." },
 { "&Print...","&Print..." },
 { "&Save","&Save" },
 { "&New Contact...","&New Contact..." },
 { "Mail &vCard...","Mail &vCard..." },
 { "Selected to phone","Selected to phone" },
 { "Beam selected v&Card(s)","Beam selected v&Card(s)" },
 { "&Beam personal vCard","&Beam personal vCard" },
 { "&Edit Contact...","&Edit Contact..." },
 { "&Exit","&Exit" },
 { "&Copy","&Copy" },
 { "Cu&t","Cu&t" },
 { "&Paste","&Paste" },
 { "Select &All","Select &All" },
 { "&Undo","&Undo" },
 { "Re&do","Re&do" },
 { "&Delete Contact","&Delete Contact" },
 { "Configure &Resources...","Configure &Resources..." },
 { "&Configure %1...","&Configure %1..." },
 { "Configure S&hortcuts...","Configure S&hortcuts..." },
 { "Show Jump Bar","Show Jump Bar" },
 { "Show Details","Show Details" },
 { "Beam receice enabled","Beam receice enabled" },
 { "Set Who Am I","Set Who Am I" },
 { "Set Categories","Set Categories" },
 { "Remove "voice"...","Remove "voice"..." },
 { "Import from Outlook...","Import from Outlook..." },
 { "Licence","Licence" },
 { "Faq","Faq" },
 { "What's New?","What's New?" },
 { "Sync HowTo","Sync HowTo" },
 { "&About KAddressBook","&About KAddressBook" },
 { "Select Incremental Search Field","Select Incremental Search Field" },
 { "Synchronize","Synchronize" },
 { "Configure...","Configure..." },
 { "Enable Pi-Sync","Enable Pi-Sync" },
 { "Multiple sync","Multiple sync" },
 { "Import CSV List...","Import CSV List..." },
 { "Export CSV List...","Export CSV List..." },
 { "Import KDE 2 Addressbook...","Import KDE 2 Addressbook..." },
 { "Import vCard...","Import vCard..." },
 { "Export vCard 3.0...","Export vCard 3.0..." },
 { "Import Qtopia...","Import Qtopia..." },
 { "Export Qtopia...","Export Qtopia..." },
 { "Edit Contact","Edit Contact" },
 { "Ok","Ok" },
 { "Apply","Apply" },
 { "Cancel","Cancel" },
 { "KAddressbook/Pi","KAddressbook/Pi" },
 { "No Filter","No Filter" },
 { "Given Name","Given Name" },
 { "Family Name","Family Name" },
 { "Email Address","Email Address" },
 { "All Fields","All Fields" },
 { "Question","Question" },
 { "After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as "other".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?","After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as "other".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?" },
 { "No","No" },
 { "Yes","Yes" },
 { "Synchronization Preferences","Synchronization Preferences" },
 { "Local device name:","Local device name:" },
 { "New profile","New profile" },
 { "Clone profile","Clone profile" },
 { "Delete profile","Delete profile" },
 { "Profile:","Profile:" },
 { "Include in multiple ","Include in multiple " },
 { "calendar  ","calendar  " },
 { "addressbook  ","addressbook  " },
 { "pwmanager","pwmanager" },
 { " sync"," sync" },
 { "Ask for preferences before sync","Ask for preferences before sync" },
 { "Sync preferences","Sync preferences" },
 { "Take local entry on conflict","Take local entry on conflict" },
 { "Take remote entry on conflict","Take remote entry on conflict" },
 { "Take newest entry on conflict","Take newest entry on conflict" },
 { "Ask for every entry on conflict","Ask for every entry on conflict" },
 { "Force: Take local entry always","Force: Take local entry always" },
 { "Force: Take remote entry always","Force: Take remote entry always" },
 { "Show summary after sync","Show summary after sync" },
 { "Write back synced data","Write back synced data" },
 { "-- Write back (on remote) existing entries only","-- Write back (on remote) existing entries only" },
 { "-- Write back (calendar) entries in future only","-- Write back (calendar) entries in future only" },
 { "---- Max. weeks in future: ","---- Max. weeks in future: " },
 { "Profile kind","Profile kind" },
 { "Local file","Local file" },
 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direct Kx/Pi to Kx/Pi sync )" },
 { "Remote file (w down/upload command)","Remote file (w down/upload command)" },
 { "Mobile device (cell phone)","Mobile device (cell phone)" },
 { "I/O device: ","I/O device: " },
 { "Help...","Help..." },
 { "Connection: ","Connection: " },
 { "Model(opt.): ","Model(opt.): " },
 { "Local file Cal:","Local file Cal:" },
 { "Local file ABook:","Local file ABook:" },
 { "Local file PWMgr:","Local file PWMgr:" },
 { "Choose...","Choose..." },
 { "Addressbook file (*.vcf) is used by KA/Pi","Addressbook file (*.vcf) is used by KA/Pi" },
 { "Calendar:","Calendar:" },
 { "AddressBook:","AddressBook:" },
 { "PWManager:","PWManager:" },
 { "Pre sync (download) command:","Pre sync (download) command:" },
 { "Local temp file:","Local temp file:" },
 { "Post sync (upload) command:","Post sync (upload) command:" },
 { "Addressbook file is used by KA/Pi","Addressbook file is used by KA/Pi" },
 { "Fill in default values for:","Fill in default values for:" },
 { "ssh/scp","ssh/scp" },
 { "ftp","ftp" },
 { "Hint: Use $PWD$ for placeholder of password!","Hint: Use $PWD$ for placeholder of password!" },
 { "Password for remote access: (could be the same for each)","Password for remote access: (could be the same for each)" },
 { "Remote IP address: (could be the same for each)","Remote IP address: (could be the same for each)" },
 { "Remote port number: (should be different for each)","Remote port number: (should be different for each)" },
 { "command for downloading remote file to local device","command for downloading remote file to local device" },
 { "command for uploading local temp file to remote device","command for uploading local temp file to remote device" },
 { "Insert device where\nphone is connected. E.g.:\n","Insert device where\nphone is connected. E.g.:\n" },
 { "KDE-Pim sync config","KDE-Pim sync config" },
 { "Insert kind of connection,e.g.:\n","Insert kind of connection,e.g.:\n" },
 { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n" },
 { "KO/Pi config error","KO/Pi config error" },
 { "Local device name undefined!\nPlease define device name!","Local device name undefined!\nPlease define device name!" },
 { "Edit Address Book Filters","Edit Address Book Filters" },
 { "&Add...","&Add..." },
 { "&Edit...","&Edit..." },
 { "&Remove","&Remove" },
 { "Modify View: ","Modify View: " },
 { "Fields","Fields" },
 { "Select Fields to Display","Select Fields to Display" },
 { "All","All" },
 { "Frequent","Frequent" },
 { "Address","Address" },
 { "Email","Email" },
 { "Personal","Personal" },
 { "Organization","Organization" },
 { "Custom","Custom" },
 { "&Selected\nfields:","&Selected\nfields:" },
 { "Formatted Name","Formatted Name" },
 { "Additional Names","Additional Names" },
 { "Honorific Prefixes","Honorific Prefixes" },
 { "Honorific Suffixes","Honorific Suffixes" },
diff --git a/bin/kdepim/kaddressbook/usertranslation.txt b/bin/kdepim/kaddressbook/usertranslation.txt
index d7e9d0a..a5ba794 100644
--- a/bin/kdepim/kaddressbook/usertranslation.txt
+++ b/bin/kdepim/kaddressbook/usertranslation.txt
@@ -1,281 +1,257 @@
 { "file","file" },
 { "Choose one file","Choose one file" },
 { "dir","dir" },
 { "Choose a directory with may files","Choose a directory with may files" },
 { "ldap","ldap" },
 { "No description available","No description available" },
 { "Library files for "%1" not found in paths","Library files for "%1" not found in paths" },
 { "qtopia","qtopia" },
 { "Qtopia PIM Addressbook.","Qtopia PIM Addressbook." },
 { "vCard","vCard" },
 { "vCard Format","vCard Format" },
 { "microkabcformat_binary","microkabcformat_binary" },
 { "Binary","Binary" },
 { "No description available.","No description available." },
 { "Department","Department" },
 { "Profession","Profession" },
 { "Assistant's Name","Assistant's Name" },
 { "Manager's Name","Manager's Name" },
 { "Spouse's Name","Spouse's Name" },
 { "Office","Office" },
 { "IM Address","IM Address" },
 { "Anniversary","Anniversary" },
 { "Gender","Gender" },
 { "Children","Children" },
 { "FreeBusyUrl","FreeBusyUrl" },
 { "ExternalID","ExternalID" },
 { "Resource loaded: '%1'","Resource loaded: '%1'" },
 { "Select View","Select View" },
 { "Modify View...","Modify View..." },
 { "Add View...","Add View..." },
 { "Delete View","Delete View" },
 { "Refresh View","Refresh View" },
 { "Edit &Filters...","Edit &Filters..." },
 { "Select Filter","Select Filter" },
 { "Style:","Style:" },
 { "HTML table style.","HTML table style." },
 { "Default Table View","Default Table View" },
-{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
 { "Show Extension Bar","Show Extension Bar" },
 { "None","None" },
 { "Name...","Name..." },
 { "Role:","Role:" },
 { "Organization:","Organization:" },
 { "Formatted name:","Formatted name:" },
 { "Edit Phone Numbers...","Edit Phone Numbers..." },
 { "Categories","Categories" },
 { "Public","Public" },
 { "Private","Private" },
 { "Confidential","Confidential" },
 { "&General","&General" },
 { "&Edit Addresses...","&Edit Addresses..." },
 { "Edit Email Addresses...","Edit Email Addresses..." },
 { "Email:","Email:" },
 { "URL:","URL:" },
 { "&IM address:","&IM address:" },
 { "&Address","&Address" },
 { "Department:","Department:" },
 { "Office:","Office:" },
 { "Profession:","Profession:" },
 { "Manager's name:","Manager's name:" },
 { "Assistant's name:","Assistant's name:" },
 { "Nick name:","Nick name:" },
 { "Spouse's name:","Spouse's name:" },
 { "Children's names:","Children's names:" },
 { "Birthday:","Birthday:" },
 { " Local Time"," Local Time" },
-{ "+12:00 Asia/Kamchatka","+12:00 Asia/Kamchatka" },
-{ "+11:00 Asia/Magadan","+11:00 Asia/Magadan" },
-{ "+10:00 Asia/Vladivostok","+10:00 Asia/Vladivostok" },
-{ "+09:00 Asia/Tokyo","+09:00 Asia/Tokyo" },
-{ "+08:00 Asia/Hongkong","+08:00 Asia/Hongkong" },
-{ "+07:00 Asia/Bangkok","+07:00 Asia/Bangkok" },
-{ "+06:00 Indian/Chagos","+06:00 Indian/Chagos" },
-{ "+05:00 Indian/Maldives","+05:00 Indian/Maldives" },
-{ "+04:00 Indian/Mauritius","+04:00 Indian/Mauritius" },
-{ "+03:00 Europe/Moscow","+03:00 Europe/Moscow" },
-{ "+02:00 Europe/Helsinki","+02:00 Europe/Helsinki" },
-{ " 00:00 Europe/London(UTC)"," 00:00 Europe/London(UTC)" },
-{ "-01:00 Atlantic/Azores","-01:00 Atlantic/Azores" },
-{ "-02:00 Brazil/DeNoronha","-02:00 Brazil/DeNoronha" },
-{ "-03:00 Brazil/East","-03:00 Brazil/East" },
-{ "-04:00 Brazil/West","-04:00 Brazil/West" },
-{ "-05:00 US/Eastern","-05:00 US/Eastern" },
-{ "-06:00 US/Central","-06:00 US/Central" },
-{ "-07:00 US/Mountain","-07:00 US/Mountain" },
-{ "-08:00 US/Pacific","-08:00 US/Pacific" },
-{ "-09:00 US/Alaska","-09:00 US/Alaska" },
-{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
-{ "-11:00 US/Samoa","-11:00 US/Samoa" },
 { "Mon","Mon" },
 { "Tue","Tue" },
 { "Wed","Wed" },
 { "Thu","Thu" },
 { "Fri","Fri" },
 { "Sat","Sat" },
 { "Sun","Sun" },
 { "January","January" },
 { "February","February" },
 { "March","March" },
 { "April","April" },
 { "May","May" },
 { "June","June" },
 { "July","July" },
 { "August","August" },
 { "September","September" },
 { "October","October" },
 { "November","November" },
 { "December","December" },
 { "tomorrow","tomorrow" },
 { "today","today" },
 { "yesterday","yesterday" },
 { "Monday","Monday" },
 { "Tuesday","Tuesday" },
 { "Wednesday","Wednesday" },
 { "Thursday","Thursday" },
 { "Friday","Friday" },
 { "Saturday","Saturday" },
 { "Sunday","Sunday" },
 { "Anniversary:","Anniversary:" },
 { "Gender:","Gender:" },
 { "ALIEN (gender undefined)","ALIEN (gender undefined)" },
 { "female","female" },
 { "male","male" },
 { "&Details","&Details" },
 { "Note:","Note:" },
 { "&Notes","&Notes" },
 { "Use geo data","Use geo data" },
 { "Latitude:","Latitude:" },
 { "Longitude:","Longitude:" },
 { "Edit Geo Data...","Edit Geo Data..." },
 { "Keys:","Keys:" },
 { "Add","Add" },
 { "Remove","Remove" },
 { "Export","Export" },
 { "&Misc","&Misc" },
 { "Photo","Photo" },
 { "Store as URL","Store as URL" },
 { "Logo","Logo" },
 { "&Images","&Images" },
 { "Home","Home" },
 { "Work","Work" },
 { "Mobile","Mobile" },
 { "Fax","Fax" },
 { "Contact Editor","Contact Editor" },
 { "&Mail...","&Mail..." },
 { "&Print...","&Print..." },
 { "&Save","&Save" },
 { "&New Contact...","&New Contact..." },
 { "Mail &vCard...","Mail &vCard..." },
 { "Selected to phone","Selected to phone" },
 { "Beam selected v&Card(s)","Beam selected v&Card(s)" },
 { "&Beam personal vCard","&Beam personal vCard" },
 { "&Edit Contact...","&Edit Contact..." },
 { "&Exit","&Exit" },
 { "&Copy","&Copy" },
 { "Cu&t","Cu&t" },
 { "&Paste","&Paste" },
 { "Select &All","Select &All" },
 { "&Undo","&Undo" },
 { "Re&do","Re&do" },
 { "&Delete Contact","&Delete Contact" },
 { "Configure &Resources...","Configure &Resources..." },
 { "&Configure %1...","&Configure %1..." },
 { "Configure S&hortcuts...","Configure S&hortcuts..." },
 { "Show Jump Bar","Show Jump Bar" },
 { "Show Details","Show Details" },
 { "Beam receice enabled","Beam receice enabled" },
 { "Set Who Am I","Set Who Am I" },
 { "Set Categories","Set Categories" },
 { "Remove "voice"...","Remove "voice"..." },
 { "Import from Outlook...","Import from Outlook..." },
 { "Licence","Licence" },
 { "Faq","Faq" },
 { "What's New?","What's New?" },
 { "Sync HowTo","Sync HowTo" },
 { "&About KAddressBook","&About KAddressBook" },
 { "Select Incremental Search Field","Select Incremental Search Field" },
 { "Synchronize","Synchronize" },
 { "Configure...","Configure..." },
 { "Enable Pi-Sync","Enable Pi-Sync" },
 { "Multiple sync","Multiple sync" },
 { "Import CSV List...","Import CSV List..." },
 { "Export CSV List...","Export CSV List..." },
 { "Import KDE 2 Addressbook...","Import KDE 2 Addressbook..." },
 { "Import vCard...","Import vCard..." },
 { "Export vCard 3.0...","Export vCard 3.0..." },
 { "Import Qtopia...","Import Qtopia..." },
 { "Export Qtopia...","Export Qtopia..." },
 { "Edit Contact","Edit Contact" },
 { "Ok","Ok" },
 { "Apply","Apply" },
 { "Cancel","Cancel" },
 { "KAddressbook/Pi","KAddressbook/Pi" },
 { "No Filter","No Filter" },
 { "Given Name","Given Name" },
 { "Family Name","Family Name" },
 { "Email Address","Email Address" },
 { "All Fields","All Fields" },
 { "Question","Question" },
 { "After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as "other".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?","After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as "other".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?" },
 { "No","No" },
 { "Yes","Yes" },
 { "Synchronization Preferences","Synchronization Preferences" },
 { "Local device name:","Local device name:" },
 { "New profile","New profile" },
 { "Clone profile","Clone profile" },
 { "Delete profile","Delete profile" },
 { "Profile:","Profile:" },
 { "Include in multiple ","Include in multiple " },
 { "calendar  ","calendar  " },
 { "addressbook  ","addressbook  " },
 { "pwmanager","pwmanager" },
 { " sync"," sync" },
 { "Ask for preferences before sync","Ask for preferences before sync" },
 { "Sync preferences","Sync preferences" },
 { "Take local entry on conflict","Take local entry on conflict" },
 { "Take remote entry on conflict","Take remote entry on conflict" },
 { "Take newest entry on conflict","Take newest entry on conflict" },
 { "Ask for every entry on conflict","Ask for every entry on conflict" },
 { "Force: Take local entry always","Force: Take local entry always" },
 { "Force: Take remote entry always","Force: Take remote entry always" },
 { "Show summary after sync","Show summary after sync" },
 { "Write back synced data","Write back synced data" },
 { "-- Write back (on remote) existing entries only","-- Write back (on remote) existing entries only" },
 { "-- Write back (calendar) entries in future only","-- Write back (calendar) entries in future only" },
 { "---- Max. weeks in future: ","---- Max. weeks in future: " },
 { "Profile kind","Profile kind" },
 { "Local file","Local file" },
 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direct Kx/Pi to Kx/Pi sync )" },
 { "Remote file (w down/upload command)","Remote file (w down/upload command)" },
 { "Mobile device (cell phone)","Mobile device (cell phone)" },
 { "I/O device: ","I/O device: " },
 { "Help...","Help..." },
 { "Connection: ","Connection: " },
 { "Model(opt.): ","Model(opt.): " },
 { "Local file Cal:","Local file Cal:" },
 { "Local file ABook:","Local file ABook:" },
 { "Local file PWMgr:","Local file PWMgr:" },
 { "Choose...","Choose..." },
 { "Addressbook file (*.vcf) is used by KA/Pi","Addressbook file (*.vcf) is used by KA/Pi" },
 { "Calendar:","Calendar:" },
 { "AddressBook:","AddressBook:" },
 { "PWManager:","PWManager:" },
 { "Pre sync (download) command:","Pre sync (download) command:" },
 { "Local temp file:","Local temp file:" },
 { "Post sync (upload) command:","Post sync (upload) command:" },
 { "Addressbook file is used by KA/Pi","Addressbook file is used by KA/Pi" },
 { "Fill in default values for:","Fill in default values for:" },
 { "ssh/scp","ssh/scp" },
 { "ftp","ftp" },
 { "Hint: Use $PWD$ for placeholder of password!","Hint: Use $PWD$ for placeholder of password!" },
 { "Password for remote access: (could be the same for each)","Password for remote access: (could be the same for each)" },
 { "Remote IP address: (could be the same for each)","Remote IP address: (could be the same for each)" },
 { "Remote port number: (should be different for each)","Remote port number: (should be different for each)" },
 { "command for downloading remote file to local device","command for downloading remote file to local device" },
 { "command for uploading local temp file to remote device","command for uploading local temp file to remote device" },
 { "Insert device where\nphone is connected. E.g.:\n","Insert device where\nphone is connected. E.g.:\n" },
 { "KDE-Pim sync config","KDE-Pim sync config" },
 { "Insert kind of connection,e.g.:\n","Insert kind of connection,e.g.:\n" },
 { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n" },
 { "KO/Pi config error","KO/Pi config error" },
 { "Local device name undefined!\nPlease define device name!","Local device name undefined!\nPlease define device name!" },
 { "Edit Address Book Filters","Edit Address Book Filters" },
 { "&Add...","&Add..." },
 { "&Edit...","&Edit..." },
 { "&Remove","&Remove" },
 { "Modify View: ","Modify View: " },
 { "Fields","Fields" },
 { "Select Fields to Display","Select Fields to Display" },
 { "All","All" },
 { "Frequent","Frequent" },
 { "Address","Address" },
 { "Email","Email" },
 { "Personal","Personal" },
 { "Organization","Organization" },
 { "Custom","Custom" },
 { "&Selected\nfields:","&Selected\nfields:" },
 { "Formatted Name","Formatted Name" },
 { "Additional Names","Additional Names" },
 { "Honorific Prefixes","Honorific Prefixes" },
 { "Honorific Suffixes","Honorific Suffixes" },
diff --git a/bin/kdepim/korganizer/usertranslation.txt b/bin/kdepim/korganizer/usertranslation.txt
index a693fa2..0236b92 100644
--- a/bin/kdepim/korganizer/usertranslation.txt
+++ b/bin/kdepim/korganizer/usertranslation.txt
@@ -649,409 +649,384 @@
 {"Travel","Reise" },
 {"TV","TV" },
 {"Germany","Deutschland" },
 {"Sweden","Schweden" },
 {"Forest","Wald" },
 { "Desert","W�ste" },
 { "Kitchen","K�che" },
 { "Lake","See" },
 {"University","Universit�t"},
 {"Vacation","Urlaub" },
 {"VIP","VIP" },
 { "Import Sharp Calendar","Importiere Sharp Kalender" },
 { "This todo has been cancelled!","Dieses Todo wurde gecancelt!" },
 { "This event has been cancelled!","Dieser Termin wurde gecancelt!" },
 { "Cancelled","Gecancelt" },
 { "Multiple sync","Mehrfach Sync" },
 { "Local file","Lokale Datei" },
 { "Last file","Letzte Datei" },
 { "Keys + Colors...","Tasten + Farben..." },
 { "Mini icons in toolbar(nr)","Mini Icons in ToolBar(bn)" },
 { "Quick save(w/o Unicode)","Schnelles Speichern (o Unicode)" },
 { "Choose...","W�hle..." },
 { "Use colors for application:","Setze Farben f�r Programm:" },
 { "Buttons, menus, etc.:","Kn�pfe, Menu, etc.:" },
 { "Frames, labels, etc.:","Rahmen, Label, etc.:" },
 { "Show parent To-Do's in What's Next view","Zeige Ober-Todo in What's Next Anz." },
 { "Show location in What's Next view","Zeige Ort in What's Next Anz." },
 { "Show events that recur ","Zeige Termine, die sich wiederholen:" },
 { "Show in every cell ","Zeige in jeder Zelle " },
 { "short month","kurzen Monat" },
 { "icons","Icons" },
 { "Show Sat/Sun together","Zeige Sam/Son zusammen" },
 { "Categorie colors are applied to text","Kategorie Farben f�rben Text" },
 { "Month view uses day colors","Monatsansicht zeigt Tagesfarben" },
 { "Day color odd months","Tagesfarbe ungerade Monate" },
 { "Day color even months","Tagesfarbe gerade Monate" },
 { "Color for Sundays + category \"Holiday\"","Farbe f�r Sonntag + Kateg.\" Feiertag\"" },
 { "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" },
 { "Small To-do view uses smaller font","Kleine To-do Ansicht nutzt kleineren Font" },
 { "Colors are applied to text","Farben werden auf Text angewendet" },
 { "Use internal alarm notification","Nutze interne Alarm Benachrichtigung" },
 { "Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n","Achtung: KO/Pi mu� ausgef�hrt werden damit die Benachrichtigung funktioniert. Empfehlung f�r Zaurus: Diese Option nicht w�hlen und KO/Pi Alarm Applet installieren.\n" },
 { "Play beeps count:","Anzahl der Alarmpiepse: " },
 { "Beeps interval in sec:","Zeitintervall der Alarmpiepse: " },
 { "Default suspend time in min:","Standard Supendierungs Zeit: " },
 { "Auto suspend count:","Anzahl der auto Suspendierungen" },
 { "Alarm *.wav file for newly created alarm:","Alarm *.wav Datei f�r neu angelegte Alarme:" },
 { "New profile","Neues Profil" },
 { "Clone profile","Klone Profil" },
 { "Delete profile","L�sche Profil" },
 { "Profile:","Profil:" },
 { "Include in multiple sync","Beziehe Profil in mehrfach Sync mit ein" },
 { "Force: Take local entry always","Erzwinge: Nimm immer lokalen Eintrag" },
 { "Force: Take remote entry always","Erzwinge: Nimm immer fernen Eintrag" },
 { "Show summary after sync","Zeige Zusammenfassung nach dem Synchronisieren" },
 { "Write back file","Schreibe Datei zur�ck" },
 { "Remote file (w down/upload command)","Entfernte Datei (via down/upload Kommando)" },
 { "Pre sync (download) command:","Bevor Sync (download) Kommando:" },
 { "Local device name:","Name dieses Ger�tes:" },
 { "Ask for preferences before sync","Frage nach Synchronisationseinstellungen vor dem Syncen" },
 { "Sync preferences","Synchronisations Einstellungen" },
 { "Profile kind","Profil Art" },
 { "Local file","Lokale Datei" },
 { "Local file:","Lokale Datei:" },
 { "Post sync (upload) command:","Nach Sync (upload) Kommando:" },
 { "Fill in default values for:","Setze Beispiel Werte ein f�r:" },
 { "Hint: Use $PWD$ for placeholder of password!","Hinweis: Benutze $PWD$ als Platzhalter f�r ein Passwort!" },
 { "Synchronization Preferences","Einstellungen der Synchronisationsprofile"},
 { "Device","Ger�t:" },
 { "Sync with file \n...%1\nfrom:\n%2\n","Sync mit Datei \n...%1\nvom:\n%2\n" },
 { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n","Synchronisations�bersicht:\n\n %d items lokal hinzugef�gt\n %d items entfernt hinzugef�gt\n %d items lokal ge�ndert\n %d items entfernt ge�ndert\n %d items lokal gel�scht\n %d items entfernt gel�scht\n" },
 { "Synchronization successful","Synchronisation erfolgreich" },
 { "Sync cancelled or failed. Nothing synced.","Sync abgebrochen oder fehlgeschlagen. Nichts wurde gesynced." },
 { "Sync file \n...%1\ndoes not exist!\nNothing synced!\n","Sync Datei \n...%1\nexistiert nicht!\nNichts wurde gesynced!\n" },
 { "Sync filename(*.ics/*.vcs)","Sync Dateiname(*.ics/*.vcs)" },
 { "Enter password","Passwort eingeben" },
 { "Do you really want\nto remote sync\nwith profile \n","Wollen Sie wirklich\nmit dem entfernten\nProfil syncen: \n" },
 { "Copy remote file to local machine...","Kopiere entfernte Datei auf lokalen Rechner..." },
 { "Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n","Sorry, das Kopierkommando schlug fehl!\nKommando war:\n%1\n \nVersuche Kommando von Kosole um\nDetails f�r das Fehlschlagen\nzu erfahren.\n" },
 { "Writing back file result: ","Resultat des Dateizur�ckschreibens: " },
 { "Syncronization sucessfully completed","Synchronisation erfolgreich abgeschlossen" },
 { "Edit Calendar Filters","Editiere Kalendar Filter" },
 { "Enter filter name:","Neuer Filter Name:" },
 { "Add Filter","Filter hinzuf�gen" },
 { "Question","Frage" },
 { "Filter position: ","Filter Position: " },
 { "Month View","Monatsansicht" },
 { "This profil cannot be deleted!\n","Dieses Profil kann\nnicht gel�scht werden!" },
 { "KO/Pi config error","KO/Pi Konfig. Fehler" },
 { "Local device name undefined!\nPlease define device name!","Name dieses Ger�tes undefiniert!\nBitte Namen angeben!" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile haben denselben Namen!\nBitte unterschiedliche Namen w�hlen!" },
 { "Access: ","Zugriff: " },
 { "Needs Action","Aktion notwendig" },
 { "Accepted","Akzeptiert" },
 { "Declined","Abgelehnt" },
 { "Tentative","Vorl�ufig" },
 { "Delegated","Beauftragt" },
 { "Completed","Vollst�ndig" },
 { "In Process","In Bearbeitung" },
 { "Participant","Teilnehmer" },
 { "Optional Participant","M�glicher Teilnehmer" },
 { "Observer","Beobachter" },
 { "Chair","Vorsitzender" },
 { "Not supported \non desktop!\n","" },
 { "Nothing selected!\n\nThis prints the full width of the Agenda view as you see it!\n\nTo determine the vertical range of the printing, please select\na vertical range (with the left mouse button down) in one column. ","Es ist nichts selektiert!\nDieses druckt die volle Breite der Agenda View, so wie man sie sieht.\nUm die verticale Auswahl zum Drucken zu bestimmen,\nbitte einen verticalen Zeitraum (mit gedr�ckter linker Maustaste)\nin einer Spalte ausw�hlen. " },
 { "Date range: ","Datums Zeitspanne: " },
 { "Not supported \non  PDA!\n","Nicht verf�gbar\nauf dem PDA. " },
 { "Syncing - close to abort!","Syncing-schlie�e um abzubrechen." },
 { "Add / remove events","Add./entferne Termine" },
 { "File does not exist:\n '%1'.","Datei existiert nicht:\n '%1'." },
 { "Couldn't load calendar\n '%1'.","Kann Kalender nicht laden:\n '%1'." },
 { "\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie gepeicherte Datei wurde ver�ndert!\nDatei Gr�sse: %1 Bytes.\nZuletzt ge�ndert: %2\nM�chten Sie:\n\n - Speichern und die Datei �berschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
 { "Overwrite","�berschreiben" },
 { "Sync+save","Syncen+speichern" },
 { "Default","Standard" },
 { " Categories added to list! "," Kategorien zur Liste hinzugef�gt! " },
 { "  %d items?","  %d Eintr�ge?" },
 { "\nThis event recurs\nover multiple dates.\nAre you sure you want\nto delete this event\nand all its recurrences?","\nDieses ist ein\nwiederholender Termin!.\nSind Sie sicher, dass Sie\ndiesen Termin und alle\nWiederholungen l�schen m�chten?" },
 { " ?\n\nDelete:\n"," ?\n\nL�sche:\n" },
 { "Current","Aktuelle" },
 { "\nThis event recurs\nover multiple dates.\nDo you want to delete\nall it's recurrences,\nor only the current one on:\n","\nDieses ist ein\nwiederholender Termin!\nM�chten sie alle Wiederholungen\nl�schen, oder nur die aktuelle am:\n" }, 
 { "All","Alle" },
 { "Data Loss Warning","Datenverlust Warnung" },
 { "Proceed","Weitermachen" },
 { "The journal entries can not be\nexported to a vCalendar file.","Die Journal Eintr�ge k�nnen\nnicht in eine vCalendar\nDatei exportiert werden!" },
 { "Filter disabled ","Filter abgeschaltet" },
 { "Filter selected: ","Gew�hlter Filter: " },
 { "Toggle Cancel","Gecancelt �ndern" },
 { "&Toggle Cancel","Gecancel&t �ndern" },
 { "Configure Toolbar","Konfiguriere Toolbar" },
 { "Stretched TB","Gedehnte TB" },
 { "Import file \n...%1\ndoes not exist!\nNothing imported!\n","Import Datei \n...%1\nexistiert nicht!\nNichts importiert!\n" },
 { "Import filename(*.ics/*.vcs)","Import Dateiname(*.ics/*.vcs)" },
 { "When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing","Wenn ein Kalender doppelt importiert\nwird, werden doppelte Eintr�ge ignoriert!\nSie k�nnen eine Backup Datei anlegen unter\nDatei - Speichere Kalender Backup\num den Import r�ckg�ngig machen zu k�nnen.\n" },
 { "Not supported \non desktop!\n","Nur verf�gbar auf PDA!" },
 { "Imported file successfully","Datei erfolgreich importiert" },
 { "Error importing file","Fehler beim Importieren der Datei" },
 { "Export vcal filename(*.vcs)","Export vcal Dateiname(*.vcs)" },
 { "Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n","Zu speichernde Datei\existiert bereits!\nExist. Datei vom:\n%1\n�berschreiben?\n" },
 { "Overwrite!","�berschreiben!" },
 { "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n","Import Datei \n...%1\nvom:\n%2\nDuplizierte Eintr�ge\nwerden nicht importiert!\n" },
 { "Load backup filename","Lade Backup Dateiname" },
 { "Backup file\ndoes not exist!\nNothing loaded!","Backup Datei\nexistiert nicht!\nNichts geladen!" },
 { "KO/Pi:Loaded %1","KO/Pi:Geladen %1" },
 { "Save backup filename","Speichere Backup Dateiname" },
 { "Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n","Backup Datei\nexistiert bereits!\nAlte Backup Datei vom:\n%1\n�berschreiben?\n" },
 { "KO/Pi:Saved %1","KO/Pi:Gespeichert %1" },
 { "Details of attendee","Teilnehmerdetails" },
 { "Work phone:\n","Telefon Arbeit:\n" },
 { "Work mobile phone:\n","Mobiltelefon Arbeit:\n" },
 { "Home phone:\n","Telefon privat:\n" },
 { "Mobile home phone:\n","Mobiltelefon privat:\n" },
 { "Email:\n","Email:\n" },
 { "Alarm disabled","Alarm deaktiviert" },
 { "Audio.Al.: ","Audio Al.: " },
 { "Proc.Al.: ","Proc.Al.: " },
 { "No sound set","Kein Sound definiert" },
 { "*.wav|Wav Files","*.wav|Wav Dateien" },
 { "No program set","Kein Programm definiert" },
 { "Running '%1'","Ausf�hren '%1'" },
 { "Playing '%1'","Abspielen '%1'" },
 { "Show Sync Events in WN/Agenda view","Zeige Sync Events in WN/Agenda Ansicht" },
 { "User defined (usertranslation.txt)","File usertranslation.txt loaded" },
 { "Load!","Laden!" },
 { "Backup file from:\n%1\nLoading  backup\nfile will delete\nyour current Data!\n","Backup Datei vom:\n%1\nDas Laden der Backup Datei\nl�scht die aktuellen Daten!\n" },
 { "KO/Pi Features and hints","KO/Pi Eigenschaften und Tipps" },
 { "KO/Pi User translation HowTo","KO/Pi Benutzer-�bersetzung HowTo" },
 { "KO/Pi Synchronization HowTo","KO/Pi Synchronisation HowTo" },
 { "Features + hints...","Eigenschaften + Tipps..." },
 { "User translation...","Benutzer �bersetzung..." },
 { "Sync HowTo...","Synchronisation HowTo..." },
 { "Print calendar...","Drucke Kalender..." },
 { "Anniversary","Jahrestag" },
 { "When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n","Wenn Geburtstage mehrfach importiert\nwerden, werden doppelte Eintr�ge ignoriert\nwenn sie nicht ver�ndert wurden.\n" },
 { "Import Birthdays (KA/Pi)","Importiere Geburtstage (KA/Pi)" },
 { "Next recurrence is on: ","N�chste Wiederholung ist am:" },
 { "<b>Alarm on:  </b>","<b>Alarm am:  </b>" },
 { "<b>Access: </b>","<b>Zugriff: </b>" },
 { "(%1 min before)","(%1 min vorher)" },
 { "<b>Categories: </b>","<b>Kategorien: </b>" },
 { "Save Journal/Description...","Speichere Journal/Details..." },
 { "This saves the text/details of selected\nJournals and Events/Todos\nto a text file.","Das speichert den Text bzw.\ndie Details von selektierten\nJournalen und Events/Todos\nin eine Textdatei." },
 { "Continue","Weitermachen" },
 { " birthdays/anniversaries added!"," Geburts-/Jahrestage hinzugef�gt" },
 { "Attendee:","Teilnehmer:" },
 { "Click OK to search ->","Klicke zum Suchen auf OK ->" },
 { "On day ","Am Tag " },
 { "%1 of ","%1 des Monats" },
 { "%1 of the year","%1 des Jahres" },
 { "Anonymous","Anonym" },
 { "nobody@nowhere","niemand@nirgendwo" },
 { "calendar.html","calendar.html" },
-{ "+01:00 Europe/Oslo(CET)","+01:00 Europa/Oslo(CET)" },
-{ " Local Time"," Locale Zeit" },
-{ "+12:00 Asia/Kamchatka","+12:00 Asien/Kamchatka" },
-{ "+11:00 Asia/Magadan","+11:00 Asien/Magadan" },
-{ "+10:00 Asia/Vladivostok","+10:00 Asien/Vladivostok" },
-{ "+09:00 Asia/Tokyo","+09:00 Asien/Tokyo" },
-{ "+08:00 Asia/Hongkong","+08:00 Asien/Hongkong" },
-{ "+07:00 Asia/Bangkok","+07:00 Asien/Bangkok" },
-{ "+06:00 Indian/Chagos","+06:00 Indien/Chagos" },
-{ "+05:00 Indian/Maldives","+05:00 Indien/Maldiven" },
-{ "+04:00 Indian/Mauritius","+04:00 Indien/Mauritius" },
-{ "+03:00 Europe/Moscow","+03:00 Europa/Moskau" },
-{ "+02:00 Europe/Helsinki","+02:00 Europa/Helsinki" },
-{ " 00:00 Europe/London(UTC)"," 00:00 Europa/London(UTC)" },
-{ "-01:00 Atlantic/Azores","-01:00 Atlantik/Azoren" },
-{ "-02:00 Brazil/DeNoronha","-02:00 Brasilien/DeNoronha" },
-{ "-03:00 Brazil/East","-03:00 Brasilien/Ost" },
-{ "-04:00 Brazil/West","-04:00 Brasilien/West" },
-{ "-05:00 US/Eastern","-05:00 US/Eastern" },
-{ "-06:00 US/Central","-06:00 US/Central" },
-{ "-07:00 US/Mountain","-07:00 US/Mountain" },
-{ "-08:00 US/Pacific","-08:00 US/Pacific" },
-{ "-09:00 US/Alaska","-09:00 US/Alaska" },
-{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
-{ "-11:00 US/Samoa","-11:00 US/Samoa" },
 { "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" },
 { "tomorrow","morgen" },
 { "today","heute" },
 { "yesterday","gestern" },
 { "Ok","Ok" },
 { "Ok+Agenda","Ok+Agenda" },
 { "Email","Email" },
 { "RSVP","RSVP" },
 { "Email:","Email:" },
 { "Appointment Time ","Termin Zeit " },
 { "2","2" },
 { "3","3" },
 { "4","4" },
 { "  0 %","  0 %" },
 { " 20 %"," 20 %" },
 { " 40 %"," 40 %" },
 { " 60 %"," 60 %" },
 { " 80 %"," 80 %" },
 { "100 %","100 %" },
 { "Filter","Filter" },
 { "Configure","Konfiguriere" },
 { "What's Next","What's Next" },
 { "Complete calendar...","Kompletten Kalender..." },
 { "Filtered calendar...","Gefilterten Kalender..." },
 { "Export to phone","Exportiere zum Handy" },
 { "Beam receice enabled","Beam Empfang an" },
 { "What's new?","Was ist neu?" },
 { "FAQ...","FAQ..." },
 { "Licence...","Licence..." },
 { "What's This?","What's This?" },
 { "&Edit...","&Editiere..." },
 { "Oktober","Oktober" },
 { "Title","Titel" },
 { "%1 %","%1 %" },
 { "Enable Pi-Sync","Schalte Pi-Sync an" },
 { "Import!","Importiere!" },
 { "inserting birthdays - close to abort!","Burzeltage werden eingef�gt - schlie�e um abzubrechen!" },
 { "Export to phone options","Export ans Handy Optionen" },
 { "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." },
 { "I/O device: ","I/O device: " },
 { "Connection: ","Connection: " },
 { "Model(opt.): ","Model(opt.): " },
 { "Write back events in future only","Schreibe nur zuk�nftige Termine zur�ck" },
 { "Max. weeks in future: ","Max. Wochen in der Zukunft: " },
 { "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das l�scht alle alten\nToDo/Kalender Daten auf dem Handy!" },
 { "Export to mobile phone!","Exportiere auf das Handy!" },
 { "Export complete calendar","Exportiere kompletten Kalender" },
 { "Writing to phone...","Sende Daten ans Handy..." },
 { " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" },
 { "Retry","Nochmal versuchen" },
 { "KDE/Pim phone access","KDE/Pim Handy Zugriff" },
 { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Ger�t!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" },
 { "Error exporting to phone!","Fehler beim Export auf das Handy!" },
 { "Export filtered calendar","Exportiere gefilterten Kalender" },
 { "Preferences","Vorlieben" },
 { "Global","Global" },
 { "Phone","Phone" },
 { "SMS","SMS" },
 { "Fax","Fax" },
 { "Pager","Pager" },
 { "SIP","SIP" },
 { "Italian","Italienisch" },
 { "24:00","24:00" },
 { "12:00am","12:00am" },
 { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },
 { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },
 { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },
 { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },
 { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" },
 { "Add 30 min (+00:30)  to selected Timezone","Addiere 30 min zur selektierten Zeitzone" },
 { "Used Mail Client","Benutzter Mail Client" },
 { "Channel:","Channel:" },
 { "Message:","Message:" },
 { "Parameters:","Parameter:" },
 { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" },
 { "extra Message:","extra Message:" },
 { "extra Parameters:","extra Parameter:" },
 { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },
 { "External Apps.","Externe Appl." },
 { "24 hours","24 Std." },
 { "3 hours","3 Std." },
 { "1 hour","1 Std." },
 { "15 minutes","15 Min." },
 { "5 minutes","5 Min." },
 { "1 minute","1 Min." },
 { "23","23" },
 { "Mon 15","Mon 15" },
 { "Configure KO","Konfiguriere KO" },
 { "Event text","Termin Text" },
 { "ToDo","ToDo" },
 { "Today","Heute" },
 { "What's Next View","What's Next Ansicht" },
 { "Show Sync Events in \nWhat's Next/Agenda view","Zeige Sync Termine in \nWhat's Next/Agenda view" },
 { "Use short date in \nWhat's Next/Event view","Zeige Kurzdatum in \nWhat's Next/Event view" },
 { "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" },
 { "Alarm","Alarm" },
 { "Used %1 Client","Benutzter %1 Client" },
 { "No email client installed","Kein Email Klient installiert" },
 { "Userdefined email client","Benutzerdef. Email Klient" },
 { "OM/Pi email client","OM/Pi Email Klient" },
 { "Include in multiple ","Beziehe in multiple " },
 { "calendar  ","Kalender  " },
 { "addressbook  ","Adressbuch  " },
 { "pwmanager","PWmanager" },
 { " sync"," Sync ein" },
 { "Write back synced data","Schreibe gesyncte Daten zur�ck" },
 { "-- Write back (on remote) existing entries only","-- Schreibe nur existierende (entfernte) Eintr�ge zur�ck" },
 { "-- Write back (calendar) entries in future only","-- Schreibe nur zuk�nftige Kalender-Eintr�ge zur�ck" },
 { "---- Max. weeks in future: ","---- Max. wochen in der Zukunft: " },
 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" },
 { "Mobile device (cell phone)","Mobiles Ger�t (Handy)" },
 { "Help...","Hilfe..." },
 { "Local file Cal:","Lokale Datei Kal:" },
 { "Local file ABook:","Lokale Datei ABuch:" },
 { "Local file PWMgr:","Lokale Datei PWMgr:" },
 { "Addressbook file (*.vcf) is used by KA/Pi","Adressbuch Datei (*.vcf) wird von KA/Pi genutzt" },
 { "Calendar:","Kalender:" },
 { "AddressBook:","AdressBuch:" },
 { "PWManager:","PWManager:" },
 { "Addressbook file is used by KA/Pi","Adressbuch Datei wird von KA/Pi genutzt" },
 { "ssh/scp","ssh/scp" },
 { "ftp","ftp" },
 { "Password for remote access: (could be the same for each)","Passwort f�r entfernten Zugriff: (kann dasselbe sein f�r alle)" },
 { "Remote IP address: (could be the same for each)","Entfernte IP Adresse: (kann dasselbe sein f�r alle)" },
 { "Remote port number: (should be different for each)","Entfernte Port Nummer: (Sollte f�r alle unterschiedlich sein)" },
 { "command for downloading remote file to local device","Kommando zum Download der entfernten Datei zum lokalen Ger�t" },
 { "command for uploading local temp file to remote device","Kommando zum Upload der lokalen temp. Datei zum entfernten Ger�t" },
 { "Insert device where\nphone is connected. E.g.:\n","F�ge Device ein, an dem\ndas Handy angeschlossen ist. Z.B.:\n" },
 { "KDE-Pim sync config","KDE-Pim sync Konfig" },
 { "Insert kind of connection,e.g.:\n","F�ge Art der Verbindung ein,z.B.:\n" },
 { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Model\nautomatisch erkannt\nwerden kann)\nOder f�ge Model Name ein:\n" },
 { "Port number (Default: %1)","Port Nummer (Default: %1)" },
 { "Password to enable\naccess from remote:","Passwort um entfernten\nZugriff zuzulassen:" },
 { "Automatically start\nat application startup","Starte automatisch\nbeim Programmstart" },
 { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" },
 { "Enter port for Pi-Sync","Gib Port f�r Pi-Sync ein" },
 { "Disable Pi-Sync","Schalte Pi-Sync ab" },
 { "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen \"Multi-Syncen\"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
 { "KDE-Pim Sync","KDE-Pim Sync" },
 { "Multiple profiles","Multi-Sync Profile" },
 { "Device: ","Ger�t: " },
 { "Multiple sync started.","Multi-Sync gestartet." },
 { "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile\nselektiert f�r Multi-Sync" },
 { "Turn filter on","Schalte Filter an" },
 { "Turn filter off","Schalte Filter ab" },
 { "Key bindings  KOrganizer/Pi","Tastatur Belegung KOrganizer/Pi" },
 { "<p><b>White</b>: Item readonly</p>\n","<p><b>Weiss</b>: Eintrag schreibgesch�tzt</p>\n" },
 { "<p><b>Dark yellow</b>:  Event/todo with attendees.</p>\n","<p><b>Dunkelgelb</b>:  Termin/Todo mit Teilnehmern.</p>\n" },
 { "<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n","<p><b>Schwarz</b>: Termin/Todo mit Teilnehmern. Sie sind der Organisator!</p>\n" },
 { "<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n","<p><b>Dunkelgr�n</b>: Information(Beschreibung) verf�gbar.([i] in WN Anzeige)</p>\n" },
 { "<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n","<p><b>Blau</b>: Wiederholender Termin.([r] in Whats'Next Anzeige)</p>\n" },
 { "<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n","<p><b>Rot</b>: Alarm gesetzt.([a] in Whats'Next Anzeige)</p>\n" },
 { "<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n","<p><b>Kreuz</b>:  Eintrag gecancelt.([c] in Whats'Next Anzeige)</p>\n" },
 { "<p><b>(for square icons in agenda and month view)</b></p>\n","<p><b>(f�r quadratische Icons in Agenda und Monats Anzeige)</b></p>\n" },
 { "<p><h2>KO/Pi icon colors:</h2></p>\n","<p><h2>KO/Pi Icon Farben:</h2></p>\n" },
 { "<p><b>E</b>:  Edit item</p>\n","<p><b>E</b>:  Editiere Eintrag</p>\n" },
 { "<p><b>A</b>: Show agenda view.</p>\n","<p><b>A</b>: Zeige Agenda Anzeige.</p>\n" },
 { "<p><b>I,C</b>: Close dialog.</p>\n","<p><b>I,C</b>: Schlie�e Dialog.</p>\n" },
 { "<p><h3>In event/todo viewer:</h3></p>\n","<p><h3>In Termin/Todo Detail-Anzeige:</h3></p>\n" },
 { "<p><b>shift+up/down</b>: Goto first/last item</p>\n","<p><b>shift+up/down</b>: Gehe zum ersten/letzten Eintrag</p>\n" },
 { "<p><b>ctrl+up/down</b>:  Goto up/down by 20% of items</p>\n","<p><b>ctrl+up/down</b>:  Gehe hoch/runter 20% aller Eintr�ge</p>\n" },
 { "<p><b>up/down</b>: Next/prev item</p>\n","<p><b>up/down</b>: N�chster/vorheriger Eintrag</p>\n" },
 { "<p><b>return+shift</b>: Deselect item+one step down</p>\n","<p><b>return+shift</b>: Deselektiere Item+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>return</b>: Select item+one step down</p>\n","<p><b>return</b>: Selektiere Item+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>I</b>: Show info of current item+one step down.</p>\n","<p><b>I</b>: Zeige Detail-Ansicht vom sel.Eintrag+Cursor einen Eintrag runter.</p>\n" },
 { "<p><h3>In list view:</h3></p>\n","<p><h3>In Listen Anzeige:</h3></p>\n" },
 { "<p><b>return+shift</b>:  Mark item as not completed+one step down</p>\n","<p><b>return+shift</b>:  Markiere Todo als nicht erledigt+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>return</b>: Mark item as completed+one step down.</p>\n","<p><b>return</b>: Markiere Todo als erledigt+Cursor einen Eintrag runter.</p>\n" },
 { "<p><b>Q</b>: Toggle quick todo line edit.</p>\n","<p><b>Q</b>: Zeige/verstecke Quick Todo Eingabe Zeile.</p>\n" },
 { "<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n","<p><b>shift+P</b>: Mache Todo zum neuen <b>P</b>arent Todo f�r das Todo, welches mit shift+Sselektiert wurde.</p>\n" },
 { "<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n","<p><b>shift+S</b>: Mache Todo zum <b>S</b>ubtodo</p>\n" },
 { "<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n","<p><b>shift+U</b>: <b>U</b>nparent Todo (Mache Sub-Todo zum Toplevel Todo)</p>\n" },
 { "<p><h3>In todo view:</h3></p>\n","<p><h3>In Todo Anzige:</h3></p>\n" },
 { "<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n","<p><b>ctrl+up/down</b>: Scrolle kleine Todo Anzeige</p>\n" },
 { "<p><b>up/down</b>: Scroll agenda view</p>\n","<p><b>up/down</b>: Scrolle Agenda Anzeige</p>\n" },
 { "<p><h3>In agenda view:</h3></p>\n","<p><h3>In Agenda Anzeige:</h3></p>\n" },
 { "<p><b>del,backspace</b>: Delete selected item</p>\n","<p><b>del,backspace</b>: L�sche selektiertes Item</p>\n" },
 { "<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n","<p><b>left</b>: Vorh. Woche | <b>left+ctrl</b>: Vorh. Monat</p>\n" },
 { "<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n","<p><b>right</b>: N�chste Woche | <b>right+ctrl</b>: N�chste Woche</p>\n" },
 { "<p><b>B</b>: Edit description (details) of selected item</p>\n","<p><b>B</b>: Editiere Beschreibung (Details) des selektierten Items</p>\n" },
 { "<p><b>C</b>: Show current time in agenda view</p>\n","<p><b>C</b>: Zeige aktuelle Zeit in Agenda Anzeige</p>\n" },
 { "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda H�he</p>\n" },
 { "<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: F�ge Sub-Todo hinzu | <b>X</b>: Zeige/verstecke Datenavigator</p>\n" },
 { "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
 { "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
 { "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monats Ansicht</p>\n" },
 { "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochen Ansicht | <b>U</b>: Wochen Ansicht</p>\n" },
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index 82d3c02..b2651d4 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -649,409 +649,385 @@
 {"Travel","Reise" },
 {"TV","TV" },
 {"Germany","Deutschland" },
 {"Sweden","Schweden" },
 {"Forest","Wald" },
 { "Desert","W�ste" },
 { "Kitchen","K�che" },
 { "Lake","See" },
 {"University","Universit�t"},
 {"Vacation","Urlaub" },
 {"VIP","VIP" },
 { "Import Sharp Calendar","Importiere Sharp Kalender" },
 { "This todo has been cancelled!","Dieses Todo wurde gecancelt!" },
 { "This event has been cancelled!","Dieser Termin wurde gecancelt!" },
 { "Cancelled","Gecancelt" },
 { "Multiple sync","Mehrfach Sync" },
 { "Local file","Lokale Datei" },
 { "Last file","Letzte Datei" },
 { "Keys + Colors...","Tasten + Farben..." },
 { "Mini icons in toolbar(nr)","Mini Icons in ToolBar(bn)" },
 { "Quick load/save (w/o Unicode)","Schnelles Laden/Speichern (o Unicode)" },
 { "Choose...","W�hle..." },
 { "Use colors for application:","Setze Farben f�r Programm:" },
 { "Buttons, menus, etc.:","Kn�pfe, Menu, etc.:" },
 { "Frames, labels, etc.:","Rahmen, Label, etc.:" },
 { "Show parent To-Do's in What's Next view","Zeige Ober-Todo in What's Next Anz." },
 { "Show location in What's Next view","Zeige Ort in What's Next Anz." },
 { "Show events that recur ","Zeige Termine, die sich wiederholen:" },
 { "Show in every cell ","Zeige in jeder Zelle " },
 { "short month","kurzen Monat" },
 { "icons","Icons" },
 { "Show Sat/Sun together","Zeige Sam/Son zusammen" },
 { "Categorie colors are applied to text","Kategorie Farben f�rben Text" },
 { "Month view uses day colors","Monatsansicht zeigt Tagesfarben" },
 { "Day color odd months","Tagesfarbe ungerade Monate" },
 { "Day color even months","Tagesfarbe gerade Monate" },
 { "Color for Sundays + category \"Holiday\"","Farbe f�r Sonntag + Kateg.\" Feiertag\"" },
 { "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" },
 { "Small To-do view uses smaller font","Kleine To-do Ansicht nutzt kleineren Font" },
 { "Colors are applied to text","Farben werden auf Text angewendet" },
 { "Use internal alarm notification","Nutze interne Alarm Benachrichtigung" },
 { "Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n","Achtung: KO/Pi mu� ausgef�hrt werden damit die Benachrichtigung funktioniert. Empfehlung f�r Zaurus: Diese Option nicht w�hlen und KO/Pi Alarm Applet installieren.\n" },
 { "Play beeps count:","Anzahl der Alarmpiepse: " },
 { "Beeps interval in sec:","Zeitintervall der Alarmpiepse: " },
 { "Default suspend time in min:","Standard Supendierungs Zeit: " },
 { "Auto suspend count:","Anzahl der auto Suspendierungen" },
 { "Alarm *.wav file for newly created alarm:","Alarm *.wav Datei f�r neu angelegte Alarme:" },
 { "New profile","Neues Profil" },
 { "Clone profile","Klone Profil" },
 { "Delete profile","L�sche Profil" },
 { "Profile:","Profil:" },
 { "Include in multiple sync","Beziehe Profil in mehrfach Sync mit ein" },
 { "Force: Take local entry always","Erzwinge: Nimm immer lokalen Eintrag" },
 { "Force: Take remote entry always","Erzwinge: Nimm immer fernen Eintrag" },
 { "Show summary after sync","Zeige Zusammenfassung nach dem Synchronisieren" },
 { "Write back file","Schreibe Datei zur�ck" },
 { "Remote file (w down/upload command)","Entfernte Datei (via down/upload Kommando)" },
 { "Pre sync (download) command:","Bevor Sync (download) Kommando:" },
 { "Local device name:","Name dieses Ger�tes:" },
 { "Ask for preferences before sync","Frage nach Synchronisationseinstellungen vor dem Syncen" },
 { "Sync preferences","Synchronisations Einstellungen" },
 { "Profile kind","Profil Art" },
 { "Local file","Lokale Datei" },
 { "Local file:","Lokale Datei:" },
 { "Post sync (upload) command:","Nach Sync (upload) Kommando:" },
 { "Fill in default values for:","Setze Beispiel Werte ein f�r:" },
 { "Hint: Use $PWD$ for placeholder of password!","Hinweis: Benutze $PWD$ als Platzhalter f�r ein Passwort!" },
 { "Synchronization Preferences","Einstellungen der Synchronisationsprofile"},
 { "Device","Ger�t:" },
 { "Sync with file \n...%1\nfrom:\n%2\n","Sync mit Datei \n...%1\nvom:\n%2\n" },
 { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n","Synchronisations�bersicht:\n\n %d items lokal hinzugef�gt\n %d items entfernt hinzugef�gt\n %d items lokal ge�ndert\n %d items entfernt ge�ndert\n %d items lokal gel�scht\n %d items entfernt gel�scht\n" },
 { "Synchronization successful","Synchronisation erfolgreich" },
 { "Sync cancelled or failed. Nothing synced.","Sync abgebrochen oder fehlgeschlagen. Nichts wurde gesynced." },
 { "Sync file \n...%1\ndoes not exist!\nNothing synced!\n","Sync Datei \n...%1\nexistiert nicht!\nNichts wurde gesynced!\n" },
 { "Sync filename(*.ics/*.vcs)","Sync Dateiname(*.ics/*.vcs)" },
 { "Enter password","Passwort eingeben" },
 { "Do you really want\nto remote sync\nwith profile \n","Wollen Sie wirklich\nmit dem entfernten\nProfil syncen: \n" },
 { "Copy remote file to local machine...","Kopiere entfernte Datei auf lokalen Rechner..." },
 { "Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n","Sorry, das Kopierkommando schlug fehl!\nKommando war:\n%1\n \nVersuche Kommando von Kosole um\nDetails f�r das Fehlschlagen\nzu erfahren.\n" },
 { "Writing back file result: ","Resultat des Dateizur�ckschreibens: " },
 { "Syncronization sucessfully completed","Synchronisation erfolgreich abgeschlossen" },
 { "Edit Calendar Filters","Editiere Kalendar Filter" },
 { "Enter filter name:","Neuer Filter Name:" },
 { "Add Filter","Filter hinzuf�gen" },
 { "Question","Frage" },
 { "Filter position: ","Filter Position: " },
 { "Month View","Monatsansicht" },
 { "This profil cannot be deleted!\n","Dieses Profil kann\nnicht gel�scht werden!" },
 { "KO/Pi config error","KO/Pi Konfig. Fehler" },
 { "Local device name undefined!\nPlease define device name!","Name dieses Ger�tes undefiniert!\nBitte Namen angeben!" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile haben denselben Namen!\nBitte unterschiedliche Namen w�hlen!" },
 { "Access: ","Zugriff: " },
 { "Needs Action","Aktion notwendig" },
 { "Accepted","Akzeptiert" },
 { "Declined","Abgelehnt" },
 { "Tentative","Vorl�ufig" },
 { "Delegated","Beauftragt" },
 { "Completed","Vollst�ndig" },
 { "In Process","In Bearbeitung" },
 { "Participant","Teilnehmer" },
 { "Optional Participant","M�glicher Teilnehmer" },
 { "Observer","Beobachter" },
 { "Chair","Vorsitzender" },
 { "Not supported \non desktop!\n","" },
 { "Nothing selected!\n\nThis prints the full width of the Agenda view as you see it!\n\nTo determine the vertical range of the printing, please select\na vertical range (with the left mouse button down) in one column. ","Es ist nichts selektiert!\nDieses druckt die volle Breite der Agenda View, so wie man sie sieht.\nUm die verticale Auswahl zum Drucken zu bestimmen,\nbitte einen verticalen Zeitraum (mit gedr�ckter linker Maustaste)\nin einer Spalte ausw�hlen. " },
 { "Date range: ","Datums Zeitspanne: " },
 { "Not supported \non  PDA!\n","Nicht verf�gbar\nauf dem PDA. " },
 { "Syncing - close to abort!","Syncing-schlie�e um abzubrechen." },
 { "Add / remove events","Add./entferne Termine" },
 { "File does not exist:\n '%1'.","Datei existiert nicht:\n '%1'." },
 { "Couldn't load calendar\n '%1'.","Kann Kalender nicht laden:\n '%1'." },
 { "\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie gepeicherte Datei wurde ver�ndert!\nDatei Gr�sse: %1 Bytes.\nZuletzt ge�ndert: %2\nM�chten Sie:\n\n - Speichern und die Datei �berschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
 { "Overwrite","�berschreiben" },
 { "Sync+save","Syncen+speichern" },
 { "Default","Standard" },
 { " Categories added to list! "," Kategorien zur Liste hinzugef�gt! " },
 { "  %d items?","  %d Eintr�ge?" },
 { "\nThis event recurs\nover multiple dates.\nAre you sure you want\nto delete this event\nand all its recurrences?","\nDieses ist ein\nwiederholender Termin!.\nSind Sie sicher, dass Sie\ndiesen Termin und alle\nWiederholungen l�schen m�chten?" },
 { " ?\n\nDelete:\n"," ?\n\nL�sche:\n" },
 { "Current","Aktuelle" },
 { "\nThis event recurs\nover multiple dates.\nDo you want to delete\nall it's recurrences,\nor only the current one on:\n","\nDieses ist ein\nwiederholender Termin!\nM�chten sie alle Wiederholungen\nl�schen, oder nur die aktuelle am:\n" }, 
 { "All","Alle" },
 { "Data Loss Warning","Datenverlust Warnung" },
 { "Proceed","Weitermachen" },
 { "The journal entries can not be\nexported to a vCalendar file.","Die Journal Eintr�ge k�nnen\nnicht in eine vCalendar\nDatei exportiert werden!" },
 { "Filter disabled ","Filter abgeschaltet" },
 { "Filter selected: ","Gew�hlter Filter: " },
 { "Toggle Cancel","Gecancelt �ndern" },
 { "&Toggle Cancel","Gecancel&t �ndern" },
 { "Configure Toolbar","Konfiguriere Toolbar" },
 { "Stretched TB","Gedehnte TB" },
 { "Import file \n...%1\ndoes not exist!\nNothing imported!\n","Import Datei \n...%1\nexistiert nicht!\nNichts importiert!\n" },
 { "Import filename(*.ics/*.vcs)","Import Dateiname(*.ics/*.vcs)" },
 { "When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing","Wenn ein Kalender doppelt importiert\nwird, werden doppelte Eintr�ge ignoriert!\nSie k�nnen eine Backup Datei anlegen unter\nDatei - Speichere Kalender Backup\num den Import r�ckg�ngig machen zu k�nnen.\n" },
 { "Not supported \non desktop!\n","Nur verf�gbar auf PDA!" },
 { "Imported file successfully","Datei erfolgreich importiert" },
 { "Error importing file","Fehler beim Importieren der Datei" },
 { "Export vcal filename(*.vcs)","Export vcal Dateiname(*.vcs)" },
 { "Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n","Zu speichernde Datei\existiert bereits!\nExist. Datei vom:\n%1\n�berschreiben?\n" },
 { "Overwrite!","�berschreiben!" },
 { "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n","Import Datei \n...%1\nvom:\n%2\nDuplizierte Eintr�ge\nwerden nicht importiert!\n" },
 { "Load backup filename","Lade Backup Dateiname" },
 { "Backup file\ndoes not exist!\nNothing loaded!","Backup Datei\nexistiert nicht!\nNichts geladen!" },
 { "KO/Pi:Loaded %1","KO/Pi:Geladen %1" },
 { "Save backup filename","Speichere Backup Dateiname" },
 { "Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n","Backup Datei\nexistiert bereits!\nAlte Backup Datei vom:\n%1\n�berschreiben?\n" },
 { "KO/Pi:Saved %1","KO/Pi:Gespeichert %1" },
 { "Details of attendee","Teilnehmerdetails" },
 { "Work phone:\n","Telefon Arbeit:\n" },
 { "Work mobile phone:\n","Mobiltelefon Arbeit:\n" },
 { "Home phone:\n","Telefon privat:\n" },
 { "Mobile home phone:\n","Mobiltelefon privat:\n" },
 { "Email:\n","Email:\n" },
 { "Alarm disabled","Alarm deaktiviert" },
 { "Audio.Al.: ","Audio Al.: " },
 { "Proc.Al.: ","Proc.Al.: " },
 { "No sound set","Kein Sound definiert" },
 { "*.wav|Wav Files","*.wav|Wav Dateien" },
 { "No program set","Kein Programm definiert" },
 { "Running '%1'","Ausf�hren '%1'" },
 { "Playing '%1'","Abspielen '%1'" },
 { "Show Sync Events in WN/Agenda view","Zeige Sync Events in WN/Agenda Ansicht" },
 { "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" },
 { "Load!","Laden!" },
 { "Backup file from:\n%1\nLoading  backup\nfile will delete\nyour current Data!\n","Backup Datei vom:\n%1\nDas Laden der Backup Datei\nl�scht die aktuellen Daten!\n" },
 { "KO/Pi Features and hints","KO/Pi Eigenschaften und Tipps" },
 { "KO/Pi User translation HowTo","KO/Pi Benutzer-�bersetzung HowTo" },
 { "KO/Pi Synchronization HowTo","KO/Pi Synchronisation HowTo" },
 { "Features + hints...","Eigenschaften + Tipps..." },
 { "User translation...","Benutzer �bersetzung..." },
 { "Sync HowTo...","Synchronisation HowTo..." },
 { "Print calendar...","Drucke Kalender..." },
 { "Anniversary","Jahrestag" },
 { "When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n","Wenn Geburtstage mehrfach importiert\nwerden, werden doppelte Eintr�ge ignoriert\nwenn sie nicht ver�ndert wurden.\n" },
 { "Import Birthdays (KA/Pi)","Importiere Geburtstage (KA/Pi)" },
 { "Next recurrence is on: ","N�chste Wiederholung ist am:" },
 { "<b>Alarm on:  </b>","<b>Alarm am:  </b>" },
 { "<b>Access: </b>","<b>Zugriff: </b>" },
 { "(%1 min before)","(%1 min vorher)" },
 { "<b>Categories: </b>","<b>Kategorien: </b>" },
 { "Save Journal/Description...","Speichere Journal/Details..." },
 { "This saves the text/details of selected\nJournals and Events/Todos\nto a text file.","Das speichert den Text bzw.\ndie Details von selektierten\nJournalen und Events/Todos\nin eine Textdatei." },
 { "Continue","Weitermachen" },
 { " birthdays/anniversaries added!"," Geburts-/Jahrestage hinzugef�gt" },
 { "Attendee:","Teilnehmer:" },
 { "Click OK to search ->","Klicke zum Suchen auf OK ->" },
 { "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" },
-{ "+01:00 Europe/Oslo(CET)","+01:00 Europa/Oslo(CET)" },
 { " Local Time"," Locale Zeit" },
-{ "+12:00 Asia/Kamchatka","+12:00 Asien/Kamchatka" },
-{ "+11:00 Asia/Magadan","+11:00 Asien/Magadan" },
-{ "+10:00 Asia/Vladivostok","+10:00 Asien/Vladivostok" },
-{ "+09:00 Asia/Tokyo","+09:00 Asien/Tokyo" },
-{ "+08:00 Asia/Hongkong","+08:00 Asien/Hongkong" },
-{ "+07:00 Asia/Bangkok","+07:00 Asien/Bangkok" },
-{ "+06:00 Indian/Chagos","+06:00 Indien/Chagos" },
-{ "+05:00 Indian/Maldives","+05:00 Indien/Maldiven" },
-{ "+04:00 Indian/Mauritius","+04:00 Indien/Mauritius" },
-{ "+03:00 Europe/Moscow","+03:00 Europa/Moskau" },
-{ "+02:00 Europe/Helsinki","+02:00 Europa/Helsinki" },
-{ " 00:00 Europe/London(UTC)"," 00:00 Europa/London(UTC)" },
-{ "-01:00 Atlantic/Azores","-01:00 Atlantik/Azoren" },
-{ "-02:00 Brazil/DeNoronha","-02:00 Brasilien/DeNoronha" },
-{ "-03:00 Brazil/East","-03:00 Brasilien/Ost" },
-{ "-04:00 Brazil/West","-04:00 Brasilien/West" },
-{ "-05:00 US/Eastern","-05:00 US/Eastern" },
-{ "-06:00 US/Central","-06:00 US/Central" },
-{ "-07:00 US/Mountain","-07:00 US/Mountain" },
-{ "-08:00 US/Pacific","-08:00 US/Pacific" },
-{ "-09:00 US/Alaska","-09:00 US/Alaska" },
-{ "-10:00 US/Hawaii","-10:00 US/Hawaii" },
-{ "-11:00 US/Samoa","-11:00 US/Samoa" },
 { "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" },
 { "tomorrow","morgen" },
 { "today","heute" },
 { "yesterday","gestern" },
 { "Ok","Ok" },
 { "Ok+Agenda","Ok+Agenda" },
 { "Email","Email" },
 { "RSVP","RSVP" },
 { "Email:","Email:" },
 { "Appointment Time ","Termin Zeit " },
 { "2","2" },
 { "3","3" },
 { "4","4" },
 { "  0 %","  0 %" },
 { " 20 %"," 20 %" },
 { " 40 %"," 40 %" },
 { " 60 %"," 60 %" },
 { " 80 %"," 80 %" },
 { "100 %","100 %" },
 { "Filter","Filter" },
 { "Configure","Konfiguriere" },
 { "What's Next","What's Next" },
 { "Complete calendar...","Kompletten Kalender..." },
 { "Filtered calendar...","Gefilterten Kalender..." },
 { "Export to phone","Exportiere zum Handy" },
 { "Beam receice enabled","Beam Empfang an" },
 { "What's new?","Was ist neu?" },
 { "FAQ...","FAQ..." },
 { "Licence...","Licence..." },
 { "What's This?","What's This?" },
 { "&Edit...","&Editiere..." },
 { "Oktober","Oktober" },
 { "Title","Titel" },
 { "%1 %","%1 %" },
 { "Enable Pi-Sync","Schalte Pi-Sync an" },
 { "Import!","Importiere!" },
 { "inserting birthdays - close to abort!","Burzeltage werden eingef�gt - schlie�e um abzubrechen!" },
 { "Export to phone options","Export ans Handy Optionen" },
 { "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." },
 { "I/O device: ","I/O device: " },
 { "Connection: ","Connection: " },
 { "Model(opt.): ","Model(opt.): " },
 { "Write back events in future only","Schreibe nur zuk�nftige Termine zur�ck" },
 { "Max. weeks in future: ","Max. Wochen in der Zukunft: " },
 { "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das l�scht alle alten\nToDo/Kalender Daten auf dem Handy!" },
 { "Export to mobile phone!","Exportiere auf das Handy!" },
 { "Export complete calendar","Exportiere kompletten Kalender" },
 { "Writing to phone...","Sende Daten ans Handy..." },
 { " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" },
 { "Retry","Nochmal versuchen" },
 { "KDE/Pim phone access","KDE/Pim Handy Zugriff" },
 { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Ger�t!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" },
 { "Error exporting to phone!","Fehler beim Export auf das Handy!" },
 { "Export filtered calendar","Exportiere gefilterten Kalender" },
 { "Preferences","Vorlieben" },
 { "Global","Global" },
 { "Phone","Phone" },
 { "SMS","SMS" },
 { "Fax","Fax" },
 { "Pager","Pager" },
 { "SIP","SIP" },
 { "Italian","Italienisch" },
 { "24:00","24:00" },
 { "12:00am","12:00am" },
 { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },
 { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },
 { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },
 { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },
 { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" },
 { "Add 30 min (+00:30)  to selected Timezone","Addiere 30 min zur selektierten Zeitzone" },
 { "Used Mail Client","Benutzter Mail Client" },
 { "Channel:","Channel:" },
 { "Message:","Message:" },
 { "Parameters:","Parameter:" },
 { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" },
 { "extra Message:","extra Message:" },
 { "extra Parameters:","extra Parameter:" },
 { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },
 { "External Apps.","Externe Appl." },
 { "24 hours","24 Std." },
 { "3 hours","3 Std." },
 { "1 hour","1 Std." },
 { "15 minutes","15 Min." },
 { "5 minutes","5 Min." },
 { "1 minute","1 Min." },
 { "23","23" },
 { "Mon 15","Mon 15" },
 { "Configure KO","Konfiguriere KO" },
 { "Event text","Termin Text" },
 { "ToDo","ToDo" },
 { "Today","Heute" },
 { "What's Next View","What's Next Ansicht" },
 { "Show Sync Events in \nWhat's Next/Agenda view","Zeige Sync Termine in \nWhat's Next/Agenda view" },
 { "Use short date in \nWhat's Next/Event view","Zeige Kurzdatum in \nWhat's Next/Event view" },
 { "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" },
 { "Alarm","Alarm" },
 { "Used %1 Client","Benutzter %1 Client" },
 { "No email client installed","Kein Email Klient installiert" },
 { "Userdefined email client","Benutzerdef. Email Klient" },
 { "OM/Pi email client","OM/Pi Email Klient" },
 { "Include in multiple ","Beziehe in multiple " },
 { "calendar  ","Kalender  " },
 { "addressbook  ","Adressbuch  " },
 { "pwmanager","PWmanager" },
 { " sync"," Sync ein" },
 { "Write back synced data","Schreibe gesyncte Daten zur�ck" },
 { "-- Write back (on remote) existing entries only","-- Schreibe nur existierende (entfernte) Eintr�ge zur�ck" },
 { "-- Write back (calendar) entries in future only","-- Schreibe nur zuk�nftige Kalender-Eintr�ge zur�ck" },
 { "---- Max. weeks in future: ","---- Max. wochen in der Zukunft: " },
 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" },
 { "Mobile device (cell phone)","Mobiles Ger�t (Handy)" },
 { "Help...","Hilfe..." },
 { "Local file Cal:","Lokale Datei Kal:" },
 { "Local file ABook:","Lokale Datei ABuch:" },
 { "Local file PWMgr:","Lokale Datei PWMgr:" },
 { "Addressbook file (*.vcf) is used by KA/Pi","Adressbuch Datei (*.vcf) wird von KA/Pi genutzt" },
 { "Calendar:","Kalender:" },
 { "AddressBook:","AdressBuch:" },
 { "PWManager:","PWManager:" },
 { "Addressbook file is used by KA/Pi","Adressbuch Datei wird von KA/Pi genutzt" },
 { "ssh/scp","ssh/scp" },
 { "ftp","ftp" },
 { "Password for remote access: (could be the same for each)","Passwort f�r entfernten Zugriff: (kann dasselbe sein f�r alle)" },
 { "Remote IP address: (could be the same for each)","Entfernte IP Adresse: (kann dasselbe sein f�r alle)" },
 { "Remote port number: (should be different for each)","Entfernte Port Nummer: (Sollte f�r alle unterschiedlich sein)" },
 { "command for downloading remote file to local device","Kommando zum Download der entfernten Datei zum lokalen Ger�t" },
 { "command for uploading local temp file to remote device","Kommando zum Upload der lokalen temp. Datei zum entfernten Ger�t" },
 { "Insert device where\nphone is connected. E.g.:\n","F�ge Device ein, an dem\ndas Handy angeschlossen ist. Z.B.:\n" },
 { "KDE-Pim sync config","KDE-Pim sync Konfig" },
 { "Insert kind of connection,e.g.:\n","F�ge Art der Verbindung ein,z.B.:\n" },
 { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Model\nautomatisch erkannt\nwerden kann)\nOder f�ge Model Name ein:\n" },
 { "Port number (Default: %1)","Port Nummer (Default: %1)" },
 { "Password to enable\naccess from remote:","Passwort um entfernten\nZugriff zuzulassen:" },
 { "Automatically start\nat application startup","Starte automatisch\nbeim Programmstart" },
 { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" },
 { "Enter port for Pi-Sync","Port Nummer f�r Pi-Sync" },
 { "Disable Pi-Sync","Schalte Pi-Sync aus" },
 { "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen \"Multi-Syncen\"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
 { "KDE-Pim Sync","KDE-Pim Sync" },
 { "Multiple profiles","Multi-Sync Profile" },
 { "Device: ","Ger�t: " },
 { "Multiple sync started.","Multi-Sync gestartet." },
 { "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile\nselektiert f�r Multi-Sync" },
 { "Turn filter on","Schalte Filter an" },
 { "Turn filter off","Schalte Filter aus" },
 { "Key bindings  KOrganizer/Pi","Tastatur Belegung KOrganizer/Pi" },
 { "<p><b>White</b>: Item readonly</p>\n","<p><b>Weiss</b>: Eintrag schreibgesch�tzt</p>\n" },
 { "<p><b>Dark yellow</b>:  Event/todo with attendees.</p>\n","<p><b>Dunkelgelb</b>:  Termin/Todo mit Teilnehmern.</p>\n" },
 { "<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n","<p><b>Schwarz</b>: Termin/Todo mit Teilnehmern. Sie sind der Organisator!</p>\n" },
 { "<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n","<p><b>Dunkelgr�n</b>: Information(Beschreibung) verf�gbar.([i] in WN Ansicht)</p>\n" },
 { "<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n","<p><b>Blau</b>: Wiederholender Termin.([r] in Whats'Next Ansicht)</p>\n" },
 { "<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n","<p><b>Rot</b>: Alarm gesetzt.([a] in Whats'Next Ansicht)</p>\n" },
 { "<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n","<p><b>Kreuz</b>:  Eintrag gecancelt.([c] in Whats'Next Ansicht)</p>\n" },
 { "<p><b>(for square icons in agenda and month view)</b></p>\n","<p><b>(f�r quadratische Icons in Agenda und Monats Ansicht)</b></p>\n" },
 { "<p><h2>KO/Pi icon colors:</h2></p>\n","<p><h2>KO/Pi Icon Farben:</h2></p>\n" },
 { "<p><b>E</b>:  Edit item</p>\n","<p><b>E</b>:  Editiere Eintrag</p>\n" },
 { "<p><b>A</b>: Show agenda view.</p>\n","<p><b>A</b>: Zeige Agenda Ansicht.</p>\n" },
 { "<p><b>I,C</b>: Close dialog.</p>\n","<p><b>I,C</b>: Schlie�e Dialog.</p>\n" },
 { "<p><h3>In event/todo viewer:</h3></p>\n","<p><h3>In Termin/Todo Detail-Anzeige:</h3></p>\n" },
 { "<p><b>shift+up/down</b>: Goto first/last item</p>\n","<p><b>shift+up/down</b>: Gehe zum ersten/letzten Eintrag</p>\n" },
 { "<p><b>ctrl+up/down</b>:  Goto up/down by 20% of items</p>\n","<p><b>ctrl+up/down</b>:  Gehe hoch/runter 20% aller Eintr�ge</p>\n" },
 { "<p><b>up/down</b>: Next/prev item</p>\n","<p><b>up/down</b>: N�chster/vorheriger Eintrag</p>\n" },
 { "<p><b>return+shift</b>: Deselect item+one step down</p>\n","<p><b>return+shift</b>: Deselektiere Item+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>return</b>: Select item+one step down</p>\n","<p><b>return</b>: Selektiere Item+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>I</b>: Show info of current item+one step down.</p>\n","<p><b>I</b>: Zeige Detail-Ansicht vom sel.Eintrag+Cursor einen Eintrag runter.</p>\n" },
 { "<p><h3>In list view:</h3></p>\n","<p><h3>In Listen Ansicht:</h3></p>\n" },
 { "<p><b>return+shift</b>:  Mark item as not completed+one step down</p>\n","<p><b>return+shift</b>:  Markiere Todo als nicht erledigt+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>return</b>: Mark item as completed+one step down.</p>\n","<p><b>return</b>: Markiere Todo als erledigt+Cursor einen Eintrag runter.</p>\n" },
 { "<p><b>Q</b>: Toggle quick todo line edit.</p>\n","<p><b>Q</b>: Zeige/verstecke Quick Todo Eingabe Zeile.</p>\n" },
 { "<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n","<p><b>shift+P</b>: Mache Todo zum neuen <b>P</b>arent Todo f�r das Todo, welches mit shift+Sselektiert wurde.</p>\n" },
 { "<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n","<p><b>shift+S</b>: Mache Todo zum <b>S</b>ubtodo</p>\n" },
 { "<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n","<p><b>shift+U</b>: <b>U</b>nparent Todo (Mache Sub-Todo zum Toplevel Todo)</p>\n" },
 { "<p><h3>In todo view:</h3></p>\n","<p><h3>In Todo Anzige:</h3></p>\n" },
 { "<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n","<p><b>ctrl+up/down</b>: Scrolle kleine Todo Ansicht</p>\n" },
 { "<p><b>up/down</b>: Scroll agenda view</p>\n","<p><b>up/down</b>: Scrolle Agenda Ansicht</p>\n" },
 { "<p><h3>In agenda view:</h3></p>\n","<p><h3>In Agenda Ansicht:</h3></p>\n" },
 { "<p><b>del,backspace</b>: Delete selected item</p>\n","<p><b>del,backspace</b>: L�sche selektiertes Item</p>\n" },
 { "<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n","<p><b>left</b>: Vorh. Woche | <b>left+ctrl</b>: Vorh. Monat</p>\n" },
 { "<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n","<p><b>right</b>: N�chste Woche | <b>right+ctrl</b>: N�chste Woche</p>\n" },
 { "<p><b>B</b>: Edit description (details) of selected item</p>\n","<p><b>B</b>: Editiere Beschreibung (Details) des selektierten Items</p>\n" },
 { "<p><b>C</b>: Show current time in agenda view</p>\n","<p><b>C</b>: Zeige aktuelle Zeit in Agenda Ansicht</p>\n" },
 { "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda H�he</p>\n" },
 { "<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: F�ge Sub-Todo hinzu | <b>X</b>: Zeige/verstecke Datenavigator</p>\n" },
 { "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
 { "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
 { "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monats Ansicht</p>\n" },
 { "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochen Ansicht | <b>U</b>: Wochen Ansicht</p>\n" },
diff --git a/version b/version
index 0c43deb..87258cb 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.9";
+version = "1.9.10";
author	zautrix <zautrix>	2004-10-22 22:49:12 (UTC)
committer	zautrix <zautrix>	2004-10-22 22:49:12 (UTC)
commit	0f0dc54f0edc8c4ec5b320118c82fa5150591fed (patch) (unidiff)
tree	2dfc23bdd2fa71ee54a501e5109be6346e9044c3
parent	1d8ed9298d8c201184d0a941f0d45e7f42201fd4 (diff)
download	kdepimpi-0f0dc54f0edc8c4ec5b320118c82fa5150591fed.zip kdepimpi-0f0dc54f0edc8c4ec5b320118c82fa5150591fed.tar.gz kdepimpi-0f0dc54f0edc8c4ec5b320118c82fa5150591fed.tar.bz2