From bcb704366cb5e333a626c18c308c7e0448a8e69f Mon Sep 17 00:00:00 2001 From: toma Date: Wed, 25 Nov 2009 17:56:58 +0000 Subject: Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features. BUG:215923 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kppp/Rules/Switzerland/Makefile.am | 10 +++++ kppp/Rules/Switzerland/Sunrise_Freetime.rst | 43 ++++++++++++++++++ kppp/Rules/Switzerland/Sunrise_Local.rst | 51 ++++++++++++++++++++++ kppp/Rules/Switzerland/Sunrise_Select_Internet.rst | 49 +++++++++++++++++++++ kppp/Rules/Switzerland/Swisscom_Local.rst | 38 ++++++++++++++++ kppp/Rules/Switzerland/Swisscom_Remote.rst | 43 ++++++++++++++++++ kppp/Rules/Switzerland/Swisscom_Surf.rst | 35 +++++++++++++++ 7 files changed, 269 insertions(+) create mode 100644 kppp/Rules/Switzerland/Makefile.am create mode 100644 kppp/Rules/Switzerland/Sunrise_Freetime.rst create mode 100644 kppp/Rules/Switzerland/Sunrise_Local.rst create mode 100644 kppp/Rules/Switzerland/Sunrise_Select_Internet.rst create mode 100644 kppp/Rules/Switzerland/Swisscom_Local.rst create mode 100644 kppp/Rules/Switzerland/Swisscom_Remote.rst create mode 100644 kppp/Rules/Switzerland/Swisscom_Surf.rst (limited to 'kppp/Rules/Switzerland') diff --git a/kppp/Rules/Switzerland/Makefile.am b/kppp/Rules/Switzerland/Makefile.am new file mode 100644 index 00000000..87582e64 --- /dev/null +++ b/kppp/Rules/Switzerland/Makefile.am @@ -0,0 +1,10 @@ +pkg_DATA = Swisscom_Local.rst \ + Swisscom_Remote.rst \ + Swisscom_Surf.rst \ + Sunrise_Freetime.rst \ + Sunrise_Select_Internet.rst \ + Sunrise_Local.rst + +pkgdir = $(kde_datadir)/kppp/Rules/Switzerland + +EXTRA_DIST = $(pkg_DATA) diff --git a/kppp/Rules/Switzerland/Sunrise_Freetime.rst b/kppp/Rules/Switzerland/Sunrise_Freetime.rst new file mode 100644 index 00000000..ebf15c2e --- /dev/null +++ b/kppp/Rules/Switzerland/Sunrise_Freetime.rst @@ -0,0 +1,43 @@ +################################################################ +# +# Sunrise Freetime (Unbeschränkt surfen mit 30.-/Monat) +# Created by Gregor Zumstein (zumstein@ssd.ethz.ch) +# Sep 29 2000 +# +################################################################ + +name=Sunrise_Freetime + +################################################################ +# currency settings +################################################################ + +currency_symbol=CHF +currency_position=right + +currency_digits=2 + +################################################################ +# connection settings +################################################################ + +per_connection=0.0 +minimum_costs=0.0 +default=(0, 1) + +# Niedertarif, tarif réduit +# +30 Fr. Basisgebühr pro Monat, tarif de base par mois +on (monday..friday) between (8:00..22:59) use (0.00046111, 1) + +on (01/01, 01/02, easter-2, easter+1, easter+39, easter+50, 08/01) between (0:00..23:59) use (0, 1) + +# Feiertage / Jours fériés: +# 01/01 Neujahr / Nouvel an +# 01/02 2. Januar / 2 janvier +# easter-2 Karfreitag / Vendredi saint +# easter+1 Ostermontag / Lundi de pâques +# easter+39 Auffahrt / Ascenscion +# easter+50 Pfingstmontag / Lundi de pentecôte +# 08/01 Nationalfeiertag / Fête nationale +# 12/25 Weihnachten / Noël +# 12/26 Stephanstag / 2ème jour de noël \ No newline at end of file diff --git a/kppp/Rules/Switzerland/Sunrise_Local.rst b/kppp/Rules/Switzerland/Sunrise_Local.rst new file mode 100644 index 00000000..7486c5c7 --- /dev/null +++ b/kppp/Rules/Switzerland/Sunrise_Local.rst @@ -0,0 +1,51 @@ +################################################################ +# +# Sunrise local +# Created by Daniel Brönnimann (dbroenni@g26.ethz.ch) +# Nov 16 1998 +# Updated by Gregor Zumstein (zumstein@ssd.ethz.ch) +# Sep 29 2000. +# +################################################################ + +name=Sunrise_Local + +################################################################ +# currency settings +################################################################ + +currency_symbol=CHF +currency_position=right +currency_digits=2 + +################################################################ +# connection settings +################################################################ + +per_connection=0.0 +minimum_costs=0.0 + +# Nachttarif, tarif de nuit +default=(0.00019444, 1) + +# Normaltarif, tarif normal +on (monday..friday) between (8:00..16:59) use (0.0011111, 1) + +# Niedertarif, tarif réduit +# easter+39 = Ascension Day (Auffahrt), easter+50 = Whit Monday (Pfingstmontag) +on (monday..friday) between (17:00..22:59) use (0.0005, 1) +on (saturday..sunday) between (8:00..22:59) use (0.0005, 1) +on (01/01, 01/02, easter-2, easter+1) between (8:00..22:59) use (0.0005, 1) +on (easter+39, easter+50) between (8:00..22:59) use(0.0005, 1) +on (08/01, 12/25, 12/26) between (8:00..22:59) use (0.0005, 1) + +# Feiertage / Jours fériés: +# 01/01 Neujahr / Nouvel an +# 01/02 2. Januar / 2 janvier +# easter-2 Karfreitag / Vendredi saint +# easter+1 Ostermontag / Lundi de pâques +# easter+39 Auffahrt / Ascenscion +# easter+50 Pfingstmontag / Lundi de pentecôte +# 08/01 Nationalfeiertag / Fête nationale +# 12/25 Weihnachten / Noël +# 12/26 Stephanstag / 2ème jour de noël diff --git a/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst b/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst new file mode 100644 index 00000000..0cda65f9 --- /dev/null +++ b/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst @@ -0,0 +1,49 @@ +################################################################ +# +# Sunrise Select Internet +# Created by Daniel Brönnimann (dbroenni@g26.ethz.ch) Nov 19. 1998 +# Changed by Philipp Gressly (phi@gressly.ch) Sep. 16. 2000 +# Changed by Gregor Zumstein (zumstein@ssd.ethz.ch) Sep 29 2000 +# +################################################################ + +name=Sunrise_Select_Internet + +################################################################ +# currency settings +################################################################ + +currency_symbol=CHF +currency_position=right +currency_digits=2 + +################################################################ +# connection settings +################################################################ + +per_connection=0.0 +minimum_costs=0.0 + +# Nachttarif, tarif de nuit +default=(0.00023056, 1) + +# Normaltarif, Niedertarif tarif normal +on (monday..sunday) between (8:00..22:59) use (0.0004639, 1) + +# "Nationale Feiertage" +# easter+39 = Ascension Day (Auffahrt), easter+50 = Whit Monday (Pfingstmontag) +on (01/01, 01/02, easter-2, easter+1) between (8:00..22:59) use (0.0004639, 1) +on (easter+39, easter+50) between (8:00..22:59) use(0.0004639, 1) +on (08/01, 12/25, 12/26) between (8:00..22:59) use (0.0004639, 1) + + +# Feiertage / Jours fériés: +# 01/01 Neujahr / Nouvel an +# 01/02 2. Januar / 2 janvier +# easter-2 Karfreitag / Vendredi saint +# easter+1 Ostermontag / Lundi de pâques +# easter+39 Auffahrt / Ascenscion +# easter+50 Pfingstmontag / Lundi de pentecôte +# 08/01 Nationalfeiertag / Fête nationale +# 12/25 Weihnachten / Noël +# 12/26 Stephanstag / 2ème jour de noël diff --git a/kppp/Rules/Switzerland/Swisscom_Local.rst b/kppp/Rules/Switzerland/Swisscom_Local.rst new file mode 100644 index 00000000..4a4e446b --- /dev/null +++ b/kppp/Rules/Switzerland/Swisscom_Local.rst @@ -0,0 +1,38 @@ +# Changed by Daniel Brönnimann (dbroenni@g26.ethz.ch)# Thu Nov 19 1998 +# Changed by Fritz Zaucker (zaucker@ee.ethz.ch) +# Sun Oct 24 1999 +# Valid from 1-Oct-1999 + +name=Swisscom_Local_2 + +currency_symbol=CHF + +currency_position=left +currency_digits=2 +per_connection=0.0 +minimum_costs=0.00 +default=(0.10, 90) + +# Special dates: +# easter - 2 days (Karfreitag/ ??? ) +# easter + 39 days (Auffahrt/ ??? ) +# easter + 50 days (Pfingstmontag/ Pentecost Monday ) +# 08/01 (August 1st, Swiss National Holiday) + +# Note: the previous version of this rule set erroneously had +# 02/01 instead of 01/02 (January 2nd) +# and 01/08 instead of 08/01 (August 1st) + +# Normal tarif +on (monday..friday) between (8:00..17:00) use (0.10, 90) + +# Low tarif +on (monday..friday) between (6:00..8:00) use (0.10, 180) +on (monday..friday) between (17:00..22:00) use (0.10, 180) +on (saturday..sunday) between (6:00..22:00) use (0.10, 180) +on (01/01, 01/02, easter-2, easter+1) between (6:00..22:00) use(0.10, 180) +on (easter+39, easter+50, 08/01, 12/25,12/26) between (6:00..22:00) use (0.10, 180) + +# Night tarif +on (monday..sunday) between (22:00..0:00) use (0.10, 360) +on (monday..sunday) between (0:00..6:00) use (0.10, 360) diff --git a/kppp/Rules/Switzerland/Swisscom_Remote.rst b/kppp/Rules/Switzerland/Swisscom_Remote.rst new file mode 100644 index 00000000..a614786e --- /dev/null +++ b/kppp/Rules/Switzerland/Swisscom_Remote.rst @@ -0,0 +1,43 @@ +# Calls outside own area code +# Created by J. Wezel (jwezel@access.ch) +# Sun Sep 14 01:30:33 1997 +# Changed by Daniel Brönnimann (dbreonni@g26.ethz.ch) +# Thu Nov 19 1998 +# Changed by Fritz Zaucker (zaucker@ee.ethz.ch) +# Sun Oct 24 1999 +# Valid from 1-Oct-1999 + +name=Swisscom_Remote + +currency_symbol=CHF + +currency_position=left +currency_digits=2 +per_connection=0.00 +minimum_costs=0.00 +default=(0.10, 24) + +# Special dates: +# easter - 2 days (Karfreitag/ ??? ) +# easter + 39 days (Auffahrt/ ??? ) +# easter + 50 days (Pfingstmontag/ Pentecost Monday ) +# 08/01 (August 1st, Swiss National Holiday) + +# Note: the previous version of this rule set erroneously had +# 02/01 instead of 01/02 (January 2nd) +# and 01/08 instead of 08/01 (August 1st) + +# Normal tarif +on (monday..friday) between (8:00..17:00) use (0.10, 24) + +# Low tarif +on (monday..friday) between (6:00..8:00) use (0.10, 48) +on (monday..friday) between (17:00..22:00) use (0.10, 48) +on (saturday..sunday) between (6:00..22:00) use (0.10, 48) + +on (01/01, 01/02, easter-2, easter+1) between (6:00..22:00) use (0.10, 48) +on (easter+39, easter+50, 08/01, 12/25, 12/26) between (6:00..22:00) use (0.10, 48) + +# Night tarif +on (monday..sunday) between (22:00..0:00) use (0.10, 96) +on (monday..sunday) between (0:00..6:00) use (0.10, 96) diff --git a/kppp/Rules/Switzerland/Swisscom_Surf.rst b/kppp/Rules/Switzerland/Swisscom_Surf.rst new file mode 100644 index 00000000..5d1bb0c9 --- /dev/null +++ b/kppp/Rules/Switzerland/Swisscom_Surf.rst @@ -0,0 +1,35 @@ +# Swisscom surfing rates of 0840 Business NumbersISP, Switzerland +# Created by J. Wezel (jwezel@access.ch) +# Sun Sep 14 01:30:33 1997 +# Changed by Daniel Brönnimann (dbroenni@g26.ethz.ch) +# Thu Nov 19 1998 +# Valid from 1-Aug-97 +# Changed by Uli Pfeiffer (uli@bluewin.ch), 29/04/2000 +# Changed by Günther Palfinger (guenther.palfinger@gmx.net), 2001-09-08 +# see http://www.swisscom.ch/gd/services/voice_com/call_charges/charges_internet-en.html +# corrected Business surf 90 -> 129 s/0.1 CHF + +name=Swisscom_Surf + +currency_symbol=CHF + +currency_position=left +currency_digits=2 +per_connection=0.0 +minimum_costs=0.00 +default=(0.10, 129) + +# Business-Surf (CHF 2.80/h) +on (monday..friday) between (8:00..16:00) use (0.10, 129) + +# Evening-Surf (CHF 1.80/h) +on (monday..friday) between (16:00..22:00) use (0.10, 200) + +# Moonlight-Surf / Weekend-night Surf (CHF 0.70/h) +on (monday..sunday) between (22:00..8:00) use (0.10, 514) + +# Weekend-day Surf +on (saturday..sunday) between (8:00..22:00) use (0.10, 200) +on (01/01, 01/02, easter-2, easter+1) between (8:00..22:00) use(0.10, 200) +on (easter+39, easter+50, 08/01, 12/25,12/26) between (8:00..22:00) use (0.10, 200) + -- cgit v1.2.1