-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
-rw-r--r-- | kabc/addresseeview.cpp | 26 | ||||
-rw-r--r-- | kaddressbook/addresseeeditorwidget.cpp | 2 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 2 |
4 files changed, 18 insertions, 14 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 | |||
@@ -85,25 +85,25 @@ | |||
85 | { "tomorrow","Morgen" }, | 85 | { "tomorrow","Morgen" }, |
86 | { "today","Heute" }, | 86 | { "today","Heute" }, |
87 | { "yesterday","Gestern" }, | 87 | { "yesterday","Gestern" }, |
88 | { "Monday","Montag" }, | 88 | { "Monday","Montag" }, |
89 | { "Tuesday","Dienstag" }, | 89 | { "Tuesday","Dienstag" }, |
90 | { "Wednesday","Mittwoch" }, | 90 | { "Wednesday","Mittwoch" }, |
91 | { "Thursday","Donnerstag" }, | 91 | { "Thursday","Donnerstag" }, |
92 | { "Friday","Freitag" }, | 92 | { "Friday","Freitag" }, |
93 | { "Saturday","Samstag" }, | 93 | { "Saturday","Samstag" }, |
94 | { "Sunday","Sonntag" }, | 94 | { "Sunday","Sonntag" }, |
95 | { "Anniversary:","Jahrestag:" }, | 95 | { "Anniversary:","Jahrestag:" }, |
96 | { "Gender:","Geschlecht:" }, | 96 | { "Gender:","Geschlecht:" }, |
97 | { "ALIEN (gender undefined)","ALIEN (Geschlecht unbekannt)" }, | 97 | { "ALIEN (undefined)","ALIEN (undefiniert)" }, |
98 | { "female","weiblich" }, | 98 | { "female","weiblich" }, |
99 | { "male","männlich" }, | 99 | { "male","männlich" }, |
100 | { "&Details","&Details" }, | 100 | { "&Details","&Details" }, |
101 | { "Note:","Notiz:" }, | 101 | { "Note:","Notiz:" }, |
102 | { "&Notes","&Notizen" }, | 102 | { "&Notes","&Notizen" }, |
103 | { "Use geo data","Benutze geo Daten" }, | 103 | { "Use geo data","Benutze geo Daten" }, |
104 | { "Latitude:","Breitengrad:" }, | 104 | { "Latitude:","Breitengrad:" }, |
105 | { "Longitude:","Längengrad:" }, | 105 | { "Longitude:","Längengrad:" }, |
106 | { "Edit Geo Data...","Edit geo Daten..." }, | 106 | { "Edit Geo Data...","Edit geo Daten..." }, |
107 | { "Keys:","Schlüssel:" }, | 107 | { "Keys:","Schlüssel:" }, |
108 | { "Add","Hinzu" }, | 108 | { "Add","Hinzu" }, |
109 | { "Remove","Entf." }, | 109 | { "Remove","Entf." }, |
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 2691d9a..f3cfb23 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp | |||
@@ -225,29 +225,31 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | |||
225 | 225 | ||
226 | 226 | ||
227 | QString notes; | 227 | QString notes; |
228 | if ( sFullDetailsMode ) { | 228 | if ( sFullDetailsMode ) { |
229 | notes = QString( | 229 | notes = QString( |
230 | "<tr><td align=\"right\"><b>%1</b></td>" | 230 | "<tr><td align=\"right\"><b>%1</b></td>" |
231 | "<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" ) | 231 | "<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" ) |
232 | .arg( i18n("Details") ) | 232 | .arg( i18n("Details") ) |
233 | .arg( i18n("Hide!") ); | 233 | .arg( i18n("Hide!") ); |
234 | 234 | ||
235 | QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); | 235 | QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); |
236 | if ( !tempX.isEmpty() ) { | 236 | if ( !tempX.isEmpty() ) { |
237 | notes += QString( | 237 | if ( tempX == "male" || tempX == "female" ) { |
238 | "<tr><td align=\"right\"><b>%1</b></td>" | 238 | notes += QString( |
239 | "<td align=\"left\">%2</td></tr>" ) | 239 | "<tr><td align=\"right\"><b>%1</b></td>" |
240 | .arg( i18n( "" ) ) | 240 | "<td align=\"left\">%2</td></tr>" ) |
241 | .arg( i18n(tempX) ); | 241 | .arg( i18n( "" ) ) |
242 | .arg( i18n(tempX) ); | ||
243 | } | ||
242 | } | 244 | } |
243 | 245 | ||
244 | 246 | ||
245 | tempX = mAddressee.secrecy().asString(); | 247 | tempX = mAddressee.secrecy().asString(); |
246 | 248 | ||
247 | notes += QString( | 249 | notes += QString( |
248 | "<tr><td align=\"right\"><b>%1</b></td>" | 250 | "<tr><td align=\"right\"><b>%1</b></td>" |
249 | "<td align=\"left\">%2</td></tr>" ) | 251 | "<td align=\"left\">%2</td></tr>" ) |
250 | .arg( "" ) | 252 | .arg( "" ) |
251 | .arg( tempX ); | 253 | .arg( tempX ); |
252 | 254 | ||
253 | 255 | ||
@@ -318,30 +320,32 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | |||
318 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" ); | 320 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" ); |
319 | if ( !tempX.isEmpty() ) { | 321 | if ( !tempX.isEmpty() ) { |
320 | notes += QString( | 322 | notes += QString( |
321 | "<tr><td align=\"right\"><b>%1</b></td>" | 323 | "<tr><td align=\"right\"><b>%1</b></td>" |
322 | "<td align=\"left\">%2</td></tr>" ) | 324 | "<td align=\"left\">%2</td></tr>" ) |
323 | .arg( i18n( "Messanger" ) ) | 325 | .arg( i18n( "Messanger" ) ) |
324 | .arg( tempX ); | 326 | .arg( tempX ); |
325 | } | 327 | } |
326 | 328 | ||
327 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); | 329 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); |
328 | if ( !tempX.isEmpty() ) { | 330 | if ( !tempX.isEmpty() ) { |
329 | QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d"); | 331 | QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d"); |
330 | tempX = KGlobal::locale()->formatDate(dt, true); | 332 | if ( dt.isValid () ) { |
331 | notes += QString( | 333 | tempX = KGlobal::locale()->formatDate(dt, true); |
332 | "<tr><td align=\"right\"><b>%1</b></td>" | 334 | notes += QString( |
333 | "<td align=\"left\">%2</td></tr>" ) | 335 | "<tr><td align=\"right\"><b>%1</b></td>" |
334 | .arg( i18n( "Anniversary" ) ) | 336 | "<td align=\"left\">%2</td></tr>" ) |
335 | .arg( tempX ); | 337 | .arg( i18n( "Anniversary" ) ) |
338 | .arg( tempX ); | ||
339 | } | ||
336 | } | 340 | } |
337 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ); | 341 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ); |
338 | if ( !tempX.isEmpty() ) { | 342 | if ( !tempX.isEmpty() ) { |
339 | notes += QString( | 343 | notes += QString( |
340 | "<tr><td align=\"right\"><b>%1</b></td>" | 344 | "<tr><td align=\"right\"><b>%1</b></td>" |
341 | "<td align=\"left\">%2</td></tr>" ) | 345 | "<td align=\"left\">%2</td></tr>" ) |
342 | .arg( i18n( "Spouse" ) ) | 346 | .arg( i18n( "Spouse" ) ) |
343 | .arg( tempX ); | 347 | .arg( tempX ); |
344 | } | 348 | } |
345 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-Children" ); | 349 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-Children" ); |
346 | if ( !tempX.isEmpty() ) { | 350 | if ( !tempX.isEmpty() ) { |
347 | notes += QString( | 351 | notes += QString( |
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 5334a0e..29abd6f 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp | |||
@@ -697,25 +697,25 @@ void AddresseeEditorWidget::setupTab2() | |||
697 | connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ), | 697 | connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ), |
698 | SLOT( dateChanged( QDate ) ) ); | 698 | SLOT( dateChanged( QDate ) ) ); |
699 | 699 | ||
700 | label->setBuddy( mAnniversaryPicker ); | 700 | label->setBuddy( mAnniversaryPicker ); |
701 | layout->addWidget( mAnniversaryPicker, iii, 2 ); | 701 | layout->addWidget( mAnniversaryPicker, iii, 2 ); |
702 | ++iii; | 702 | ++iii; |
703 | 703 | ||
704 | } | 704 | } |
705 | 705 | ||
706 | label = new QLabel( i18n( "Gender:" ), tab2 ); | 706 | label = new QLabel( i18n( "Gender:" ), tab2 ); |
707 | layout->addWidget( label, iii, 1 ); | 707 | layout->addWidget( label, iii, 1 ); |
708 | mGenderBox = new QComboBox ( tab2 ); | 708 | mGenderBox = new QComboBox ( tab2 ); |
709 | mGenderBox->insertItem ( i18n( "ALIEN (gender undefined)" )); | 709 | mGenderBox->insertItem ( i18n( "ALIEN (undefined)" )); |
710 | mGenderBox->insertItem ( i18n( "female" )); | 710 | mGenderBox->insertItem ( i18n( "female" )); |
711 | mGenderBox->insertItem ( i18n( "male" )); | 711 | mGenderBox->insertItem ( i18n( "male" )); |
712 | connect( mGenderBox, SIGNAL( activated ( const QString & ) ), | 712 | connect( mGenderBox, SIGNAL( activated ( const QString & ) ), |
713 | SLOT( textChanged( const QString& ) ) ); | 713 | SLOT( textChanged( const QString& ) ) ); |
714 | label->setBuddy( mGenderBox ); | 714 | label->setBuddy( mGenderBox ); |
715 | layout->addWidget( mGenderBox, iii, 2 ); | 715 | layout->addWidget( mGenderBox, iii, 2 ); |
716 | ++iii; | 716 | ++iii; |
717 | // Build the layout and add to the tab widget | 717 | // Build the layout and add to the tab widget |
718 | layout->activate(); // required | 718 | layout->activate(); // required |
719 | 719 | ||
720 | mTabWidget->addTab( tab2, i18n( "&Details" ) ); | 720 | mTabWidget->addTab( tab2, i18n( "&Details" ) ); |
721 | } | 721 | } |
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 72359df..d0865c3 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -115,25 +115,25 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) | |||
115 | 115 | ||
116 | attendeeGroup = new QHBox( topFrame ); | 116 | attendeeGroup = new QHBox( topFrame ); |
117 | layout->addWidget(attendeeGroup ); | 117 | layout->addWidget(attendeeGroup ); |
118 | new QLabel( i18n("Attendee:"),attendeeGroup ); | 118 | new QLabel( i18n("Attendee:"),attendeeGroup ); |
119 | mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup ); | 119 | mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup ); |
120 | mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup ); | 120 | mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup ); |
121 | // Date range | 121 | // Date range |
122 | // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"), | 122 | // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"), |
123 | // topFrame); | 123 | // topFrame); |
124 | // layout->addWidget(rangeGroup); | 124 | // layout->addWidget(rangeGroup); |
125 | 125 | ||
126 | QWidget *rangeWidget = new QWidget(topFrame); | 126 | QWidget *rangeWidget = new QWidget(topFrame); |
127 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()); | 127 | QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,KDialog::spacingHint()-3); |
128 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); | 128 | rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget)); |
129 | mStartDate = new KDateEdit(rangeWidget); | 129 | mStartDate = new KDateEdit(rangeWidget); |
130 | rangeLayout->addWidget(mStartDate); | 130 | rangeLayout->addWidget(mStartDate); |
131 | rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); | 131 | rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget)); |
132 | mEndDate = new KDateEdit(rangeWidget); | 132 | mEndDate = new KDateEdit(rangeWidget); |
133 | mEndDate->setDate(QDate::currentDate().addDays(365)); | 133 | mEndDate->setDate(QDate::currentDate().addDays(365)); |
134 | rangeLayout->addWidget(mEndDate); | 134 | rangeLayout->addWidget(mEndDate); |
135 | QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); | 135 | QToolButton *wt = QWhatsThis::whatsThisButton ( rangeWidget ); |
136 | rangeLayout->addWidget( (QWidget*)wt ); | 136 | rangeLayout->addWidget( (QWidget*)wt ); |
137 | layout->addWidget(rangeWidget); | 137 | layout->addWidget(rangeWidget); |
138 | // Results list view | 138 | // Results list view |
139 | listView = new KOListView(mCalendar,topFrame); | 139 | listView = new KOListView(mCalendar,topFrame); |