17 files changed, 13 insertions, 6 deletions

diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 6721d5f..30b4168 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -751,4 +751,4 @@
 { "Shrink searchfield in portrait view","Verkleinere Suchfeld im Portraitmodus" },

-{ "","" },

-{ "","" },

+{ "Edit new contact","Bearbeite neuen Kontakt" },

+{ "Edit ","Bearbeite " },

 { "","" },

diff --git a/bin/kdepim/kaddressbook/icons16/ic_family.png b/bin/kdepim/kaddressbook/icons16/ic_family.png
new file mode 100644
index 0000000..6b0dec6
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons16/ic_family.png
diff --git a/bin/kdepim/kaddressbook/icons16/ic_female.png b/bin/kdepim/kaddressbook/icons16/ic_female.png
new file mode 100644
index 0000000..c427605
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons16/ic_female.png
diff --git a/bin/kdepim/kaddressbook/icons16/ic_kids.png b/bin/kdepim/kaddressbook/icons16/ic_kids.png
new file mode 100644
index 0000000..fdbdabc
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons16/ic_kids.png
diff --git a/bin/kdepim/kaddressbook/icons16/ic_male.png b/bin/kdepim/kaddressbook/icons16/ic_male.png
new file mode 100644
index 0000000..f22eaab
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons16/ic_male.png
diff --git a/bin/kdepim/kaddressbook/icons16/ic_penguin.png b/bin/kdepim/kaddressbook/icons16/ic_penguin.png
new file mode 100644
index 0000000..a78da37
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons16/ic_penguin.png
diff --git a/bin/kdepim/kaddressbook/icons16/package_toys.png b/bin/kdepim/kaddressbook/icons16/package_toys.png
deleted file mode 100644
index eea4fc7..0000000
--- a/bin/kdepim/kaddressbook/icons16/package_toys.png
+++ b/dev/null
diff --git a/bin/kdepim/kaddressbook/icons22/ic_family.png b/bin/kdepim/kaddressbook/icons22/ic_family.png
new file mode 100644
index 0000000..6b0dec6
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/ic_family.png
diff --git a/bin/kdepim/kaddressbook/icons22/ic_female.png b/bin/kdepim/kaddressbook/icons22/ic_female.png
new file mode 100644
index 0000000..c427605
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/ic_female.png
diff --git a/bin/kdepim/kaddressbook/icons22/ic_kids.png b/bin/kdepim/kaddressbook/icons22/ic_kids.png
new file mode 100644
index 0000000..fdbdabc
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/ic_kids.png
diff --git a/bin/kdepim/kaddressbook/icons22/ic_male.png b/bin/kdepim/kaddressbook/icons22/ic_male.png
new file mode 100644
index 0000000..f22eaab
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/ic_male.png
diff --git a/bin/kdepim/kaddressbook/icons22/ic_penguin.png b/bin/kdepim/kaddressbook/icons22/ic_penguin.png
new file mode 100644
index 0000000..a78da37
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/ic_penguin.png
diff --git a/bin/kdepim/kaddressbook/icons22/package_toys.png b/bin/kdepim/kaddressbook/icons22/package_toys.png
deleted file mode 100644
index eea4fc7..0000000
--- a/bin/kdepim/kaddressbook/icons22/package_toys.png
+++ b/dev/null
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index e85991e..8f104e0 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -254,2 +254,3 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
   if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) {
+      picString =  "<img src=\"myimage\" width=\"50\" height=\"70\">";
       if (  picAvailintern ) {
@@ -260,6 +261,11 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
           } else {
-          QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) );
+              static bool setDefaultImage = false;
+              if ( !setDefaultImage ) {
+                  qDebug("Setting default pixmap ");
+                  QMimeSourceFactory::defaultFactory()->setPixmap( "defaultPenguin", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) );
+                  setDefaultImage = true;
+              }
+              picString =  "<img src=\"defaultPenguin\" width=\"64\" height=\"64\">";
           }
       }
-      picString =  "<img src=\"myimage\" width=\"50\" height=\"70\">";
     mText = QString::fromLatin1(
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index a84fc61..b5a60f2 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -69,3 +69,3 @@ void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr )
 
-  this->setCaption("Edit " + addr.formattedName());
+  this->setCaption(i18n ("Edit ") + addr.formattedName());
 }
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3f9b546..e1a490d 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1262,2 +1262,3 @@ void KABCore::newContact()
     mEditorDialog->setAddressee( addr );
+    mEditorDialog->setCaption( i18n("Edit new contact"));
     KApplication::execDialog ( mEditorDialog );
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 8752636..53cd011 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -262,3 +262,3 @@ void KOViewManager::showNextView()
 
-    if ( KOPrefs::instance()->mShowIconTodoview ) {  showTodoView() ;return ;}
+    //if ( KOPrefs::instance()->mShowIconTodoview ) {  showTodoView() ;return ;}