| -rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
| -rw-r--r-- | kabc/addresseeview.cpp | 4 | ||||
| -rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 2 | ||||
| -rw-r--r-- | korganizer/searchdialog.cpp | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index c18a241..b2f2704 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -94,7 +94,7 @@ { "Sunday","Sonntag" },
{ "Anniversary:","Jahrestag:" },
{ "Gender:","Geschlecht:" },
-{ "ALIEN (gender undefined)","ALIEN (Geschlecht unbekannt)" },
+{ "ALIEN (undefined)","ALIEN (undefiniert)" },
{ "female","weiblich" },
{ "male","männlich" },
{ "&Details","&Details" },
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 2691d9a..f3cfb23 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp @@ -234,12 +234,14 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); if ( !tempX.isEmpty() ) { + if ( tempX == "male" || tempX == "female" ) { 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(); @@ -327,6 +329,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); if ( !tempX.isEmpty() ) { QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d"); + if ( dt.isValid () ) { tempX = KGlobal::locale()->formatDate(dt, true); notes += QString( "<tr><td align=\"right\"><b>%1</b></td>" @@ -334,6 +337,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) .arg( i18n( "Anniversary" ) ) .arg( tempX ); } + } tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ); if ( !tempX.isEmpty() ) { notes += QString( diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 5334a0e..29abd6f 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -706,7 +706,7 @@ void AddresseeEditorWidget::setupTab2() label = new QLabel( i18n( "Gender:" ), tab2 ); layout->addWidget( label, iii, 1 ); mGenderBox = new QComboBox ( tab2 ); - mGenderBox->insertItem ( i18n( "ALIEN (gender undefined)" )); + mGenderBox->insertItem ( i18n( "ALIEN (undefined)" )); mGenderBox->insertItem ( i18n( "female" )); mGenderBox->insertItem ( i18n( "male" )); connect( mGenderBox, SIGNAL( activated ( const QString & ) ), diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 72359df..d0865c3 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -124,7 +124,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) // layout->addWidget(rangeGroup); QWidget *rangeWidget = new QWidget(topFrame); - QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); + QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()-3); rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); mStartDate = new KDateEdit(rangeWidget); rangeLayout->addWidget(mStartDate); |