summaryrefslogtreecommitdiff
authorerik <erik>2007-01-12 00:36:11 (UTC)
committer erik <erik>2007-01-12 00:36:11 (UTC)
commita7855ba97853d175de1c0e2efee6549557adeb09 (patch) (side-by-side diff)
treef8b2815f6dba5ae5f7111fc5b868a38d7c1edaa5
parentc0145131ff669a911d51cd0a2b5d3471bf150eb0 (diff)
downloadopie-a7855ba97853d175de1c0e2efee6549557adeb09.zip
opie-a7855ba97853d175de1c0e2efee6549557adeb09.tar.gz
opie-a7855ba97853d175de1c0e2efee6549557adeb09.tar.bz2
This commit switches from using hardcoded ntp servers to using a pool ntp
server.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--etc/ntpservers22
-rw-r--r--i18n/es/netsystemtime.ts4
-rw-r--r--noncore/settings/netsystemtime/settingstabwidget.cpp6
3 files changed, 16 insertions, 16 deletions
diff --git a/etc/ntpservers b/etc/ntpservers
index 5ea836b..2482d31 100644
--- a/etc/ntpservers
+++ b/etc/ntpservers
@@ -1,24 +1,24 @@
[servers]
count = 11
[0]
-name = time.fu-berlin.de
+name = de.pool.ntp.org
[1]
-name = time.ethz.ch
+name = ch.pool.ntp.org
[2]
-name = otc2.psu.edu
+name = us.pool.ntp.org
[3]
-name = ice.mcc.ac.uk
+name = uk.pool.ntp.org
[4]
-name = ptbtime1.ptb.de
+name = 0.de.pool.ntp.org
[5]
-name = bernina.ethz.ch
+name = 0.ch.pool.ntp.org
[6]
-name = ntp.univ-lyon1.fr
+name = fr.pool.ntp.org
[7]
-name = ntp.bri.connect.com.au
+name = au.pool.ntp.org
[8]
-name = nist1.datum.com
+name = 1.us.pool.ntp.org
[9]
-name = time-a.nist.gov
+name = 2.us.pool.ntp.org
[10]
-name = time-b.timefreq.bldrdoc.gov
+name = 3.us.pool.ntp.org
diff --git a/i18n/es/netsystemtime.ts b/i18n/es/netsystemtime.ts
index f777c73..4ad8631 100644
--- a/i18n/es/netsystemtime.ts
+++ b/i18n/es/netsystemtime.ts
@@ -1,12 +1,12 @@
<!DOCTYPE TS><TS>
<context>
<name>Ntp</name>
<message>
- <source>time.fu-berlin.de</source>
- <translation>time.fu-berlin.de</translation>
+ <source>pool.ntp.org</source>
+ <translation>pool.ntp.org</translation>
</message>
<message>
<source>Run NTP?</source>
<translation>¿Ejecutar NTP?</translation>
</message>
<message>
diff --git a/noncore/settings/netsystemtime/settingstabwidget.cpp b/noncore/settings/netsystemtime/settingstabwidget.cpp
index 3bb0ec3..b26e751 100644
--- a/noncore/settings/netsystemtime/settingstabwidget.cpp
+++ b/noncore/settings/netsystemtime/settingstabwidget.cpp
@@ -100,15 +100,15 @@ SettingsTabWidget::SettingsTabWidget( QWidget *parent )
for ( int i = 0; i < srvCount; i++ )
{
ntpSrvs.setGroup( QString::number( i ) );
cbTimeServer->insertItem( ntpSrvs.readEntry( "name" ) );
}
if ( srvCount==0 ) {
- cbTimeServer->insertItem( "time.fu-berlin.de" );
- cbTimeServer->insertItem( "time-a.nist.gov" );
- cbTimeServer->insertItem( "ntp.bri.connect.com.au" );
+ cbTimeServer->insertItem( "0.pool.ntp.org" );
+ cbTimeServer->insertItem( "1.pool.ntp.org" );
+ cbTimeServer->insertItem( "2.pool.ntp.org" );
}
Config config( "ntp" );
config.setGroup( "settings" );
sbPredictDelay->setValue( config.readNumEntry( "minLookupDiff", 720 ) );
sbNtpDelay->setValue( config.readNumEntry( "ntpRefreshFreq", 1440 ) );
cbTimeServer->setCurrentItem( config.readNumEntry( "ntpServer", 0 ) );