| -rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 6 | ||||
| -rw-r--r-- | kabc/addresseeview.cpp | 31 |
2 files changed, 20 insertions, 17 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 473aa0e..515161f 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -777,17 +777,17 @@ { "Spouse","Ehegatte" },
{ "Notes","Notizen" },
{ "Messanger","Messanger" },
{ "Assistant","Assistent" },
{ "Manager","Manager" },
{ "Secrecy","Sichtbar" },
{ "male","männlich" },
{ "female","weiblich" },
-{ "","" },
-{ "","" },
-{ "","" },
+{ "Hide!","Verbergen!" },
+{ "Show!","Anzeigen!" },
+{ "Details","Details" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
\ No newline at end of file diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 202a718..7c70ab1 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp @@ -224,28 +224,38 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) } QString notes; if ( sFullDetailsMode ) { notes = QString( "<tr><td align=\"right\"><b>%1</b></td>" "<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" ) - .arg( i18n("Details:") ) - .arg( i18n("Click here to hide!") ); + .arg( i18n("Details") ) + .arg( i18n("Hide!") ); - QString tempX = mAddressee.secrecy().asString(); + QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); + if ( !tempX.isEmpty() ) { + notes += QString( + "<tr><td align=\"right\"><b>%1</b></td>" + "<td align=\"left\">%2</td></tr>" ) + .arg( i18n( "" ) ) + .arg( i18n(tempX) ); + } + + + tempX = mAddressee.secrecy().asString(); notes += QString( "<tr><td align=\"right\"><b>%1</b></td>" "<td align=\"left\">%2</td></tr>" ) .arg( "" ) .arg( tempX ); - + tempX = mAddressee.categories().join(" - "); if ( !tempX.isEmpty() ) { notes += QString( "<tr><td align=\"right\"><b>%1</b></td>" "<td align=\"left\">%2</td></tr>" ) .arg( i18n( "Category" ) ) .arg( tempX ); } @@ -308,24 +318,17 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) tempX = mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" ); if ( !tempX.isEmpty() ) { notes += QString( "<tr><td align=\"right\"><b>%1</b></td>" "<td align=\"left\">%2</td></tr>" ) .arg( i18n( "Messanger" ) ) .arg( tempX ); } - tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); - if ( !tempX.isEmpty() ) { - notes += QString( - "<tr><td align=\"right\"><b>%1</b></td>" - "<td align=\"left\">%2</td></tr>" ) - .arg( i18n( "Gender" ) ) - .arg( i18n(tempX) ); - } + tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); if ( !tempX.isEmpty() ) { QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d"); tempX = KGlobal::locale()->formatDate(dt, true); notes += QString( "<tr><td align=\"right\"><b>%1</b></td>" "<td align=\"left\">%2</td></tr>" ) .arg( i18n( "Anniversary" ) ) @@ -357,18 +360,18 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) //US .arg( mAddressee.note().replace( '\n', "<br>" ) ); .arg( mAddressee.note().replace( QRegExp("\n"), "<br>" ) ); //qDebug("AddresseeView::setAddressee has to be verified."); } } else { notes = QString( "<tr><td align=\"right\"><b>%1</b></td>" "<td align=\"left\"><a href=\"allDetails\">%4</a></td></tr>" ) - .arg( i18n("Details:") ) - .arg( i18n("Click here to show!") ); + .arg( i18n("Details") ) + .arg( i18n("Show!") ); } QString aRole = ""; QString aOrga = ""; if ( true /*!mAddressee.role().isEmpty()*/ ) { aRole = "<tr>" |