summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/phonenumber.cpp2
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 897c56d..12b9b09 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -238,3 +238,3 @@ QStringList PhoneNumber::supportedTypeListNames()
if ( list.count() == 0 )
- list << i18n("Home") << i18n("Work") << i18n("Mobile") << i18n("SIP") << i18n("VoIP") <<i18n("Home2")<< i18n("Work2") << i18n("Mobile2") << i18n("SIP2") << i18n("Assistent") << i18n("Company") << i18n("Fax (Home)") << i18n("Fax (Work)") << i18n("Fax (Other)") << i18n("Pager") << i18n("ISDN") << i18n("Callback") << i18n("Primary")<< i18n("Other");
+ list << i18n("Home") << i18n("Work") << i18n("Mobile") << i18n("SiP") << i18n("VoIP") <<i18n("Home2")<< i18n("Work2") << i18n("Mobile2") << i18n("SiP2") << i18n("Assistent") << i18n("Company") << i18n("Fax (Home)") << i18n("Fax (Work)") << i18n("Fax (Other)") << i18n("Pager") << i18n("ISDN") << i18n("Callback") << i18n("Primary")<< i18n("Other");
return list;
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index fe9ff5a..141a9ce 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -97,2 +97,3 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
mPausePopUp->insertItem( "10 sec", 10 );
+ mPausePopUp->insertItem( "15 sec", 15 );
mPausePopUp->insertItem( "30 sec", 30 );
@@ -100,3 +101,2 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
mPausePopUp->insertItem( " 5 min", 300 );
- mPausePopUp->insertItem( "10 min", 600 );
mSuspendPopUp = new QPopupMenu( this );
@@ -115,5 +115,5 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
mBeepPopUp->insertItem( "Beep interval",mPausePopUp );
- mBeepPopUp->insertItem( "180", 180 );
- mBeepPopUp->insertItem( "60", 60 );
- mBeepPopUp->insertItem( "30", 30 );
+ mBeepPopUp->insertItem( "100", 100 );
+ mBeepPopUp->insertItem( "50", 50 );
+ mBeepPopUp->insertItem( "25", 25 );
mBeepPopUp->insertItem( "17", 17 );