summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt6
-rw-r--r--kabc/addresseeview.cpp31
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
@@ -782,9 +782,9 @@
{ "Secrecy","Sichtbar" },
{ "male","männlich" },
{ "female","weiblich" },
-{ "","" },
-{ "","" },
-{ "","" },
+{ "Hide!","Verbergen!" },
+{ "Show!","Anzeigen!" },
+{ "Details","Details" },
{ "","" },
{ "","" },
{ "","" },
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 202a718..7c70ab1 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -229,10 +229,20 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
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>"
@@ -240,7 +250,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
.arg( "" )
.arg( tempX );
-
+
tempX = mAddressee.categories().join(" - ");
if ( !tempX.isEmpty() ) {
notes += QString(
@@ -313,14 +323,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
.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");
@@ -362,8 +365,8 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
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!") );
}