From kde-commits  Sun May 31 22:00:41 2009
From: David Jarvie <software () astrojar ! org ! uk>
Date: Sun, 31 May 2009 22:00:41 +0000
To: kde-commits
Subject: branches/KDE/4.2/kdepim/kalarm
Message-Id: <1243807241.878461.9841.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=124386172727502

SVN commit 976102 by djarvie:

Convert translatable string from a #define to a ki18nc(), because it was omitted from
the .po file using #define.


 M  +10 -10    prefdlg.cpp  


--- branches/KDE/4.2/kdepim/kalarm/prefdlg.cpp #976101:976102
@@ -1,7 +1,7 @@
 /*
  *  prefdlg.cpp  -  program preferences dialog
  *  Program:  kalarm
- *  Copyright © 2001-2008 by David Jarvie <djarvie@kde.org>
+ *  Copyright © 2001-2009 by David Jarvie <djarvie@kde.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -1123,7 +1123,7 @@
 EditPrefTab::EditPrefTab(StackedScrollGroup* scrollGroup)
 	: PrefsTabBase(scrollGroup)
 {
-#define DEFSETTING "The default setting for <interface>%1</interface> in the alarm edit dialog."
+	KLocalizedString defsetting = ki18nc("@info:whatsthis", "The default setting for <interface>%1</interface> in the alarm edit dialog.");
 
 	KTabWidget* tabs = new KTabWidget(topWidget());
 	StackedGroupT<KVBox>* tabgroup = new StackedGroupT<KVBox>(tabs);
@@ -1144,7 +1144,7 @@
 	// Show in KOrganizer
 	mCopyToKOrganizer = new QCheckBox(EditAlarmDlg::i18n_chk_ShowInKOrganizer(), topGeneral);
 	mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->sizeHint());
-	mCopyToKOrganizer->setWhatsThis(i18nc("@info:whatsthis", DEFSETTING, EditAlarmDlg::i18n_chk_ShowInKOrganizer()));
+	mCopyToKOrganizer->setWhatsThis(defsetting.subs(EditAlarmDlg::i18n_chk_ShowInKOrganizer()).toString());
 
 	// Late cancellation
 	KHBox* box = new KHBox(topGeneral);
@@ -1152,7 +1152,7 @@
 	box->setSpacing(KDialog::spacingHint());
 	mLateCancel = new QCheckBox(LateCancelSelector::i18n_chk_CancelIfLate(), box);
 	mLateCancel->setMinimumSize(mLateCancel->sizeHint());
-	mLateCancel->setWhatsThis(i18nc("@info:whatsthis", DEFSETTING, LateCancelSelector::i18n_chk_CancelIfLate()));
+	mLateCancel->setWhatsThis(defsetting.subs(LateCancelSelector::i18n_chk_CancelIfLate()).toString());
 	box->setStretchFactor(new QWidget(box), 1);    // left adjust the control
 
 	// Recurrence
@@ -1214,12 +1214,12 @@
 
 	mConfirmAck = new QCheckBox(EditDisplayAlarmDlg::i18n_chk_ConfirmAck(), group);
 	mConfirmAck->setMinimumSize(mConfirmAck->sizeHint());
-	mConfirmAck->setWhatsThis(i18nc("@info:whatsthis", DEFSETTING, EditDisplayAlarmDlg::i18n_chk_ConfirmAck()));
+	mConfirmAck->setWhatsThis(defsetting.subs(EditDisplayAlarmDlg::i18n_chk_ConfirmAck()).toString());
 	vlayout->addWidget(mConfirmAck, 0, Qt::AlignLeft);
 
 	mAutoClose = new QCheckBox(LateCancelSelector::i18n_chk_AutoCloseWinLC(), group);
 	mAutoClose->setMinimumSize(mAutoClose->sizeHint());
-	mAutoClose->setWhatsThis(i18nc("@info:whatsthis", DEFSETTING, LateCancelSelector::i18n_chk_AutoCloseWin()));
+	mAutoClose->setWhatsThis(defsetting.subs(LateCancelSelector::i18n_chk_AutoCloseWin()).toString());
 	vlayout->addWidget(mAutoClose, 0, Qt::AlignLeft);
 
 	box = new KHBox(group);
@@ -1254,7 +1254,7 @@
 	if (theApp()->speechEnabled())
 		mSound->addItem(SoundPicker::i18n_combo_Speak());  // index 3
 	mSound->setMinimumSize(mSound->sizeHint());
-	mSound->setWhatsThis(i18nc("@info:whatsthis", DEFSETTING, SoundPicker::i18n_label_Sound()));
+	mSound->setWhatsThis(defsetting.subs(SoundPicker::i18n_label_Sound()).toString());
 	hlayout->addWidget(mSound);
 	hlayout->addStretch();
 
@@ -1292,13 +1292,13 @@
 
 	mCmdScript = new QCheckBox(EditCommandAlarmDlg::i18n_chk_EnterScript(), group);
 	mCmdScript->setMinimumSize(mCmdScript->sizeHint());
-	mCmdScript->setWhatsThis(i18nc("@info:whatsthis", DEFSETTING, EditCommandAlarmDlg::i18n_chk_EnterScript()));
+	mCmdScript->setWhatsThis(defsetting.subs(EditCommandAlarmDlg::i18n_chk_EnterScript()).toString());
 	hlayout->addWidget(mCmdScript);
 	hlayout->addStretch();
 
 	mCmdXterm = new QCheckBox(EditCommandAlarmDlg::i18n_chk_ExecInTermWindow(), group);
 	mCmdXterm->setMinimumSize(mCmdXterm->sizeHint());
-	mCmdXterm->setWhatsThis(i18nc("@info:whatsthis", DEFSETTING, EditCommandAlarmDlg::i18n_radio_ExecInTermWindow()));
+	mCmdXterm->setWhatsThis(defsetting.subs(EditCommandAlarmDlg::i18n_radio_ExecInTermWindow()).toString());
 	hlayout->addWidget(mCmdXterm);
 
 	// EMAIL ALARMS
@@ -1310,7 +1310,7 @@
 	// BCC email to sender
 	mEmailBcc = new QCheckBox(EditEmailAlarmDlg::i18n_chk_CopyEmailToSelf(), group);
 	mEmailBcc->setMinimumSize(mEmailBcc->sizeHint());
-	mEmailBcc->setWhatsThis(i18nc("@info:whatsthis", DEFSETTING, EditEmailAlarmDlg::i18n_chk_CopyEmailToSelf()));
+	mEmailBcc->setWhatsThis(defsetting.subs(EditEmailAlarmDlg::i18n_chk_CopyEmailToSelf()).toString());
 	vlayout->addWidget(mEmailBcc, 0, Qt::AlignLeft);
 
 	lay = qobject_cast<QVBoxLayout*>(topTypes->layout());