From 23f5fc19b0ca063983a00c880d3007c0a4fa7dee Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Fri, 29 Apr 2022 08:41:09 +0200 Subject: [PATCH] Changed charset encoding from latin1, latin2 to UTF-8 --- .../calendar/NeTEx_Calendar_se_PA1.xml | 2 +- .../calendar/Netex_calendarCodeing_02.xml | 2 +- .../Netex_calendarExample_01_BHN01.xml | 2 +- ...NTUR-SchoolTwiceADayTripCarnet_2020120.xml | 4 +- ...ographicFares_UnitZone_MultipleProduct.xml | 134 +-- ...SimpleFares_PointToPoint_SingleProduct.xml | 2 +- ...impleFares_PointToPoint_MultipleOffers.xml | 2 +- ...mpleFares_ZoneToZone_AdultChildProduct.xml | 2 +- ..._SimpleFares_ZoneToZone_OffPeakProduct.xml | 2 +- ...raphicFares_UnitDistance_SingleProduct.xml | 4 +- ...raphicFares_UnitZone_AdultChildProduct.xml | 2 +- ...aphicFares_UnitFareStage_SingleProduct.xml | 8 +- ...cFares_HierarchicalZone_MultipleOffers.xml | 2 +- ...imeIntervalFares_Zonal_MultipleProduct.xml | 2 +- ...2_Bus_ZonalFares_MultipleSalesPackages.xml | 44 +- ...Netex_81.1_Metro_FlatFare_GroupProduct.xml | 2 +- ...tex_91.1_Rail_RailCard_MultipleProduct.xml | 2 +- .../fares/rail/Netex_era_crossborder_de.xml | 34 +- .../fares/rail/Netex_era_distance_ro.xml | 58 +- .../functions/fares/rail/Netex_era_toc_uk.xml | 84 +- .../Netex_GroupingExample_General_01.xml | 2 +- .../newModes/NewModes-CarClubExample.xml | 2 +- .../newModes/NewModes-CarPoolingExample.xml | 4 +- .../NewModes-ChauffeuredServiceExample.xml | 2 +- .../newModes/NewModes-CycleSharingExample.xml | 2 +- .../patterns/Netex_KBIC_ParisNetwork_1.xml | 4 +- .../Netex_Sites_PoiClassification_1.xml | 2 +- .../simpleNetwork/Netex_SimpleNetwork_1.xml | 2 +- .../simpleNetwork/Netex_uk_underground_1.xml | 2 +- .../site/Netex_01_Sites_SimpleStadium_1.xml | 2 +- .../Netex_10_Sites_OlympicPark_2_basic.xml | 2 +- .../site/Netex_11_Sites_OlympicPark_1.xml | 2 +- .../site/Netex_12_Sites_OlympicPark_3_nav.xml | 2 +- ...Netex_13_Sites_OlympicPark_4_delayOnly.xml | 2 +- .../site/Netex_21_Sites_Parking_1.xml | 2 +- .../site/Netex_21_Sites_Parking_2.xml | 2 +- .../site/Netex_Address_Example_1.xml | 2 +- ...FER_910GWIMBLDN-accessibility_20140601.xml | 2 +- .../Netex_01_StopPoints_NoFrills_1.xml | 2 +- .../Netex_01_Stops_SingleStopOnStreet_1.xml | 2 +- .../Netex_02_Stops_StopPairOnStreet_1.xml | 2 +- .../Netex_04_Stops_SimpleStation_1.xml | 2 +- ...topPlace_uk_ComplexStation_Wimbledon_1.xml | 2 +- .../Netex_10_StopPlace_withParking_1.xml | 2 +- ..._01.1_Bus_SimpleTimetable_JourneysOnly.xml | 2 +- ...x_01.2_Bus_SimpleTimetable_WithTimings.xml | 2 +- ...s_SimpleTimetable_WithMultiplePatterns.xml | 2 +- ...1.4_Bus_SimpleTimetable_WithConnection.xml | 2 +- ...1.5_Bus_SimpleTimetable_StopAssignment.xml | 2 +- ....6_Bus_SimpleTimetable_RouteProjection.xml | 2 +- ...Netex_02.1_Bus_CircularRoute_Timetable.xml | 2 +- ..._BranchedRouteTimetable_SimplePatterns.xml | 2 +- ..._BranchedRouteTimetable_SharedPatterns.xml | 2 +- ...Bus_TemplateTimetable_HeadwayFrequency.xml | 2 +- ..._TemplateTimetable_RhythmicalFrequency.xml | 2 +- ...quencyJourneyTimetable_HeadwayInterval.xml | 2 +- ...ncyJourneyTimetable_RhythmicalInterval.xml | 2 +- ...x_07.1_Bus_FlexibleTimetable_ZonesOnly.xml | 2 +- ...07.2_Bus_FlexibleTimetable_WithPattern.xml | 2 +- ..._08.1_BusTram_Timetable_AmbiguousLinks.xml | 2 +- ..._08.2_Bus_SimpleTimetable_Cancellation.xml | 2 +- .../Netex_09.1_Bus_InterchangeRule.xml | 2 +- ...etex_10_Rail_SplittingJoiningTimetable.xml | 2 +- .../timetable/Netex_11_Rail_CompoundTrain.xml | 2 +- ...etex_21_Rail_NetworkTimetable_eurostar.xml | 192 ++-- ...ltimodal_PassengerInformationEquipment.xml | 2 +- .../validityCondition/NeTEx_trigger-01.xml | 2 +- .../variant/Netex_VariantExample_Step_05.xml | 2 +- .../Netex_simpleVehicleSchedule_01.xml | 6 +- .../versioning/Netex_Uniqueness_01.xml | 2 +- .../Netex_VersioningExample_Step_01.xml | 2 +- .../Netex_VersioningExample_Step_02.xml | 2 +- .../Netex_VersioningExample_Step_03.xml | 2 +- .../Netex_VersioningExample_Step_04.xml | 2 +- .../Netex_VersioningExample_Step_05.xml | 2 +- .../Netex_VersioningExample_Step_05_ByRef.xml | 2 +- ...VersioningExample_Step_05_GeneralFrame.xml | 2 +- ..._VersioningExample_VersionHistories_01.xml | 2 +- ..._VersioningExample_VersionHistories_02.xml | 2 +- examples/standards/epiap/eiap_test1_ramp.xml | 2 +- .../standards/epip/epip_common_profile.xml | 2 +- .../Netex_era_uic_Stations_SSP_Se_1.xml | 4 +- .../era_uic/Netex_era_uic_Stations_Se_1.xml | 4 +- .../Netex_era_uic_timetable_hack_01.xml | 2 +- ...AMSY_NETWORK_FARE_Arriva-pass_20200417.xml | 114 +-- ...AMSY_NETWORK_FARE_Arriva-trip_20200417.xml | 8 +- ...ristol-Line-48-trip-(stage)_2017-01-01.xml | 34 +- ...ARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml | 154 +-- ...FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml | 180 ++-- ...FirstSheffield-pass-by-period_20200310.xml | 50 +- ...E_FirstSheffield-pass-by-user_20200310.xml | 122 +-- ...RE_FirstSheffield-pass-simple_20200310.xml | 50 +- ...RE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml | 2 +- ...YOR-Line-26-trip-(stages-Z2Z)-20181101.xml | 32 +- ...INE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml | 6 +- ...RE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml | 6 +- ...K_FARE_Metrorider-pass+others_20170101.xml | 188 ++-- ..._NETWORK_FARE_Metrorider-pass_20170101.xml | 136 +-- ...RK_FARE_Metrorider-pass_basic_20170101.xml | 68 +- ...S_LINE_FARE_Line-3-trip-(p2p)_20190101.xml | 4 +- ...ETWORK_FARE_Travelmaster-pass_20200315.xml | 386 +++---- .../fxc/uk_fxc_addon_HSP_plusbus.xml | 14 +- .../standards/fxc/uk_fxc_common_profile.xml | 2 +- examples/standards/gbfs/Netex_gbfs_exm1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Agency_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_CalendarDates_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Calendar_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_FareAttributes_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_FareRules_1.xml | 4 +- .../gtfs/Netex_gtfs_exm1_Frequencies_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Routes_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Shapes_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_StopTimes_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Stops_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Transfers_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_Trips_1.xml | 2 +- .../gtfs/Netex_gtfs_exm1_zz_Composite.xml | 4 +- ...s_Example_1_flatFare_unlimitedTransfer.xml | 6 +- ...fs_fares_Example_2_flatFare_noTransfer.xml | 6 +- ...s_fares_Example_3_flatFare_90mTransfer.xml | 6 +- ...s_fares_Example_4_flatFare_byLineGroup.xml | 2 +- ...fares_Example_5_flatFare_feeToTransfer.xml | 2 +- ...es_Example_6_pointToPointFare_anyRoute.xml | 2 +- ..._gtfs_fares_Example_7_zoneSequenceFare.xml | 4 +- ...ex_StopPlace_se_NOPTIS_Example_TEH_PA1.xml | 12 +- ...tex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml | 12 +- ...onDelivery_109_Oslo_morningbus_example.xml | 2 +- ...Calendar-DayType-AvailabilityCondition.xml | 2 +- .../ServiceCalendar-DayTypeAssignments.xml | 2 +- ...endar-OperatingPeriods-with-exceptions.xml | 2 +- .../ServiceCalendar-OperatingPeriods.xml | 2 +- .../schedule/ServiceCalendar-calendar-ref.xml | 2 +- .../schedule/ServiceCalendar-example.xml | 2 +- .../norway/schedule/ServiceCalendar-test.xml | 2 +- .../stops/BasicIndoorStopPlace_example.xml | 2 +- .../BasicStopPlace-two-quays_example.xml | 2 +- .../norway/stops/BasicStopPlace_example.xml | 2 +- .../norway/stops/PointOfInterest.xml | 2 +- ...ace-with-equipment-and-parking_example.xml | 2 +- .../standards/nta/NeTEx-Export Example.xml | 2 +- .../tap_tsi/B1_NRT/Netex_sncf_b1_1.xml | 2 +- .../B1_NRT/Netex_tap_tsi_B1-1080-TCVP.xml | 2 +- .../B1_NRT/Netex_tap_tsi_B1-1080-full.xml | 950 +++++++++--------- .../tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml | 950 +++++++++--------- .../tap_tsi/B1_NRT/Netex_tap_tsi_B1.xml | 24 +- .../B1_NRT/Netex_tap_tsi_tcvc_carrier_1.xml | 2 +- .../B1_NRT/Netex_tap_tsi_tcvg_stations_1.xml | 106 +- .../B1_NRT/Netex_tap_tsi_tcvs_series_1.xml | 2 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml | 8 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml | 52 +- .../B2_IRT/Netex_tap_tsi_B2-71-optimised.xml | 20 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml | 26 +- .../tap_tsi/B2_IRT/Netex_tap_tsi_B2.xml | 20 +- .../B2_IRT/Netex_tap_tsi_tcvs_irt_1.xml | 2 +- .../B3_Special/Netex_tap_tsi_B3+more.xml | 6 +- .../tap_tsi/B3_Special/Netex_tap_tsi_B3.xml | 6 +- .../tap_tsi/Other/Netex_tap_trainhotel_1.xml | 208 ++-- .../Netex_tap_trainhotel_SalesPackage_2.xml | 212 ++-- .../Netex_vdv_452_brighton_Stops_1.xml | 2 +- .../Netex_de_calendarExample_01_gd.xml | 2 +- .../vdv452/timetable/NeTEx VDV Example.xml | 2 +- .../siri_generic/exa_checkStatus_request.xml | 2 +- .../siri_generic/exa_checkStatus_response.xml | 2 +- .../siri_generic/exa_dataReady_request.xml | 2 +- .../siri_generic/exa_dataReady_response.xml | 2 +- .../exa_dataReceived_response.xml | 2 +- .../siri_generic/exa_dataSupply_request.xml | 2 +- .../siri_generic/exa_heartbeat_request.xml | 2 +- .../exa_requestSubscription_response.xml | 2 +- .../exa_terminateSubscription_request.xml | 2 +- .../exa_terminateSubscription_response.xml | 2 +- ...exa_terminateSubscription_response_err.xml | 2 +- .../siri_netex/exu_dataObject_request.xml | 2 +- .../siri_netex/exu_dataObject_request_b1.xml | 2 +- .../siri_netex/exu_dataObject_response.xml | 2 +- .../exu_dataObject_response_b1-NX.xml | 2 +- .../siri_netex/exu_dataObject_response_b1.xml | 2 +- .../exu_dataObject_subscriptionRequest-Nx.xml | 2 +- .../exu_dataObject_subscriptionRequest.xml | 2 +- xsd/NeTEx_publication-NoConstraint.xsd | 2 +- xsd/NeTEx_publication.xsd | 2 +- xsd/NeTEx_publication_timetable.xsd | 2 +- .../netex_compositeFrame_version.xsd | 2 +- .../netex_contact_version.xsd | 2 +- .../netex_organisation_version.xsd | 2 +- .../netex_place_version.xsd | 2 +- .../netex_access_version.xsd | 2 +- .../netex_otherOrganisation_version.xsd | 2 +- .../netex_serviceRestrictions_version.xsd | 2 +- .../netex_topographicPlace_version.xsd | 2 +- .../netex_transportOrganisation_version.xsd | 2 +- .../netex_utility/netex_location_types.xsd | 2 +- .../netex_utility/netex_utility_types.xsd | 2 +- .../part1_frames/netex_siteFrame_version.xsd | 2 +- .../netex_lineNetwork_version.xsd | 2 +- .../netex_line_version.xsd | 2 +- .../netex_routeInstruction_version.xsd | 2 +- .../netex_route_version.xsd | 2 +- .../netex_fareZone_version.xsd | 2 +- .../netex_servicePattern_version.xsd | 2 +- .../netex_serviceFrame_version.xsd | 2 +- .../netex_nm_mobilityJourneyFrame_version.xsd | 2 +- .../netex_nm_mobilityServiceFrame_version.xsd | 2 +- xsd/wsdl/NeTEx_publication-NoConstraint.xsd | 2 +- 204 files changed, 2541 insertions(+), 2541 deletions(-) diff --git a/examples/functions/calendar/NeTEx_Calendar_se_PA1.xml b/examples/functions/calendar/NeTEx_Calendar_se_PA1.xml index 110845c17..18dc9d32e 100644 --- a/examples/functions/calendar/NeTEx_Calendar_se_PA1.xml +++ b/examples/functions/calendar/NeTEx_Calendar_se_PA1.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/functions/calendar/Netex_calendarCodeing_02.xml b/examples/functions/calendar/Netex_calendarCodeing_02.xml index 9825c1175..961732d24 100644 --- a/examples/functions/calendar/Netex_calendarCodeing_02.xml +++ b/examples/functions/calendar/Netex_calendarCodeing_02.xml @@ -1,4 +1,4 @@ - + 2017-12-17T09:30:47.0Z @@ -321,7 +321,7 @@ 2021-09-07T01:07:00 - Kj�p Skoleskyss + Kjøp Skoleskyss Initial purchase of carnet 2020-09-06T01:07:00 10000 diff --git a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml index 5a94948c6..8d7ab8fcc 100644 --- a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml +++ b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml @@ -1,4 +1,4 @@ - + - Oyster Top ups must be in in �5 Multiples + Oyster Top ups must be in in £5 Multiples up 5 - Oyster AUTO Top ups must be in in �20 Multiples + Oyster AUTO Top ups must be in in £20 Multiples up 20 @@ -2801,12 +2801,12 @@ To apply online you will need: An active, valid email address A colour, digital photo of your child -Debit or credit card to pay the �10 administration fee +Debit or credit card to pay the £10 administration fee You will be asked for your child's machine readable passport number. If your child does not have a machine-readable passport and you can't complete all the application steps online you may be prompted to: Download and print off a verification letter Get the verification letter signed and approved by your child's education establishment -Take the verification letter to the Post Office along with required documentation and pay the �10 administration fee +Take the verification letter to the Post Office along with required documentation and pay the £10 administration fee Apply online Applying at a Post Office You can collect a 16+ Zip Oyster photocard application form from a Post Office in London. @@ -2884,7 +2884,7 @@ You must have an 11-15 Oyster photocard to get: Child-rate fares on the Tube, DLR and London Overground 7 Day, Monthly and longer period Travelcards at child rate -Holders of the following can buy a Zones 1-9 Off-Peak Day Travelcard after 10:00 for just �2 each for up to four children travelling with them: +Holders of the following can buy a Zones 1-9 Off-Peak Day Travelcard after 10:00 for just £2 each for up to four children travelling with them: Gold Card Network RailCard Family and Friends RailCard @@ -3090,7 +3090,7 @@ Your Unique Learner Number (ULN) A UK Provider Reference Number (UKPRN) A colour, digital photo to upload An active email address -A credit or debit card to pay the �10 fee +A credit or debit card to pay the £10 fee @@ -3178,9 +3178,9 @@ We will not issue a Veterans Oyster photocard if you live in London and are elig Group Day tickets are available from Tube or London Overground station ticket offices and Tube station touchscreen machines. You can also get Group Day Tickets from some National Rail stations that Tube and London Overground services run through. Adult Under-18s -Zones 1-6 �4.50 each �1.70 each -Zones 1-8 + Watford Junction �6.50 each �2.20 each -Zones 1-9 �6.50 each �2.20 each +Zones 1-6 £4.50 each £1.70 each +Zones 1-8 + Watford Junction £6.50 each £2.20 each +Zones 1-9 £6.50 each £2.20 each * Only valid on the following National Rail services: Amersham to Marylebone @@ -3426,7 +3426,7 @@ Discounted travel for one adult travelling with the RailCard holder for the whol Purchase from Ticket Machine - At ticket offices Day Travelcards and Group Day tickets can be bought up to�seven days in advance of the start date + At ticket offices Day Travelcards and Group Day tickets can be bought up to seven days in advance of the start date P4D @@ -3691,14 +3691,14 @@ Oyster_PayAsYouGo_right - PayAsYouGo_trip Auto Cash Top up Payment before ride - - Auto top-up makes sure you never run out of pay as you go credit by automatically topping up your Oyster card with money from your credit or debit card, whenever your pay as you go balance falls below �10. + Auto top-up makes sure you never run out of pay as you go credit by automatically topping up your Oyster card with money from your credit or debit card, whenever your pay as you go balance falls below £10. How to set up Auto top-up Create or log in to your Oyster online account Select 'add/renew/top-up ticket' and then 'pay as you go with Auto top-up' -Add some pay as you go credit (minimum �10) -Select a Auto top-up amount (�20 or �40) +Add some pay as you go credit (minimum £10) +Select a Auto top-up amount (£20 or £40) Choose a station or tram stop from the dropdown list for where you want to activate Auto top-up You need to activate within eight days @@ -3882,7 +3882,7 @@ If you don't have an Oyster card, you can get one online and set up an Oyster on No Transfer - At ticket offices Day Travelcards and Group Day tickets can be bought up to�seven days in advance of the start date + At ticket offices Day Travelcards and Group Day tickets can be bought up to seven days in advance of the start date @@ -4307,7 +4307,7 @@ Gold Card - You will need to pay �5 deposit when you get a new Oyster card. This is refundable if you return the card. + You will need to pay £5 deposit when you get a new Oyster card. This is refundable if you return the card. @@ -4384,7 +4384,7 @@ If your Oyster only has pay as you go credit at adult rate on it you can let som - You will need to pay �5 deposit when you get a new Oyster card. This is refundable if you return the card. + You will need to pay £5 deposit when you get a new Oyster card. This is refundable if you return the card. 5.00 @@ -5003,7 +5003,7 @@ You can only get these as paper tickets, not on an Oyster card, and they must be Family Day Travel Card - Holders of the following can buy a Zones 1-9 Off-Peak Day Travelcard after 10:00 for just �2 each for up to four children travelling with them: + Holders of the following can buy a Zones 1-9 Off-Peak Day Travelcard after 10:00 for just £2 each for up to four children travelling with them: Gold Card Network RailCard Family and Friends RailCard @@ -5662,12 +5662,12 @@ To apply online you will need: An active, valid email address A colour, digital photo of your child -Debit or credit card to pay the �10 administration fee +Debit or credit card to pay the £10 administration fee You will be asked for your child's machine readable passport number. If your child does not have a machine-readable passport and you can't complete all the application steps online you may be prompted to: Download and print off a verification letter Get the verification letter signed and approved by your child's education establishment -Take the verification letter to the Post Office along with required documentation and pay the �10 administration fee +Take the verification letter to the Post Office along with required documentation and pay the £10 administration fee Apply online Applying at a Post Office You can collect a 16+ Zip Oyster photocard application form from a Post Office in London. @@ -5705,7 +5705,7 @@ To apply online, you will need: An active, valid email address Your child's machine-readable passport number A digital photo of your child -Credit or debit card to pay the �10 administration fee +Credit or debit card to pay the £10 administration fee If we're able to verify your child's age online: We will post the 16+ Zip Oyster photocard to the address you provide. It can take up to two weeks for the photocard to be delivered. @@ -5726,7 +5726,7 @@ To apply you will need: An active, valid email address A digital photo of your child -Credit or debit card to pay the �10 administration fee +Credit or debit card to pay the £10 administration fee You need to bring your confirmation email and proof of the applicants' age when collecting the Oyster photocard from a London Travel Information Centre. This can be either: Passport @@ -5768,7 +5768,7 @@ To apply online, you will need: A colour, digital photo Your enrolment ID from your education establishment A London address -A valid debit or credit card to pay the �10 administration fee +A valid debit or credit card to pay the £10 administration fee An active, valid email address Once you've fully enrolled with your education establishment, you can apply up to four weeks before your course start date, or on your 18th birthday. Applications received sooner than then this will be rejected. @@ -11884,7 +11884,7 @@ Wallington After 09:20 You can have two adults named on your Family and Friends RailCard allowing either adult to carry the card and get a discount. -All kids under five travel free - and each adult may take up to two 'under fives' with them. However, if the only child in the group is under five, you'll need to purchase a discounted child ticket to qualify for the adult RailCard discount. All child fares are subject to a �1 minimum fare. +All kids under five travel free - and each adult may take up to two 'under fives' with them. However, if the only child in the group is under five, you'll need to purchase a discounted child ticket to qualify for the adult RailCard discount. All child fares are subject to a £1 minimum fare. If your child turns 16 during the validity period of your 1-year Family and Friends RailCard, they will still be entitled to travel at the discounted child fare. This lasts for as long as your 1-year Family and Friends RailCard is valid. @@ -11932,12 +11932,12 @@ TODO some stuff not captured There are a range of National RailCards you can buy that allow discounted travel during off-peak times on Tube, DLR, London Overground and National Rail services. Name Cost per annum Validity Eligibility - 16-25 RailCard �28 12 months Visit website - Senior RailCard �28 12 months Visit website - HM Forces RailCard �15 12 months Visit website - Disabled Persons RailCard �20 12 months Visit website - Network RailCard �28 12 months Visit website - Family and Friends RailCard �28 12 months Visit website + 16-25 RailCard £28 12 months Visit website + Senior RailCard £28 12 months Visit website + HM Forces RailCard £15 12 months Visit website + Disabled Persons RailCard £20 12 months Visit website + Network RailCard £28 12 months Visit website + Family and Friends RailCard £28 12 months Visit website Gold Cards Gold Cards are annual season tickets with a difference: @@ -11974,7 +11974,7 @@ When you buy an annual season ticket at a station within the Network RailCard Ar Cost of card Buy your RailCard now and Save! -On 19 May the price of a 1-year RailCard will change from �28 to �30 and a 3-year RailCard from �65 to �70. The Family and Friends RailCard is still great value with cardholders saving on average �131 a year on their rail travel, as well as taking advantage of our RailCard partner offers. +On 19 May the price of a 1-year RailCard will change from £28 to £30 and a 3-year RailCard from £65 to £70. The Family and Friends RailCard is still great value with cardholders saving on average £131 a year on their rail travel, as well as taking advantage of our RailCard partner offers. 2013-05-19 @@ -12149,7 +12149,7 @@ On 19 May the price of a 1-year RailCard will change from What is the HM Forces RailCard? -The HM Forces RailCard costs �15 and it'll save you 1/3 on most rail fares throughout Great Britain for a whole year. That works out to under �2 a month for huge savings. You're eligible if you're a member of the Regular Forces or a spouse of a member, for more details see eligibility. +The HM Forces RailCard costs £15 and it'll save you 1/3 on most rail fares throughout Great Britain for a whole year. That works out to under £2 a month for huge savings. You're eligible if you're a member of the Regular Forces or a spouse of a member, for more details see eligibility. There are plenty of ways you can use your RailCard, for both long and short trips. Better still you can use it anytime on weekends, Public Holidays and during the week. The only restriction is that if you travel before 10am Monday to Friday (except during July and August) a minimum fare will apply. For more details see minimum fares. @@ -12480,7 +12480,7 @@ Are buying or leasing a vehicle through the Motability scheme A copy of the leas Use pay as you go and daily price capping Buy 7 Day, monthly and longer period Bus and Tram Passes You do not need an Oyster card to pay cash single fares. -You can also use a contactless payment card to pay for single fares on buses (not trams) at the pay as you go fare of �1.40. +You can also use a contactless payment card to pay for single fares on buses (not trams) at the pay as you go fare of £1.40. Find out more about using contactless payment cards on buses @@ -13121,12 +13121,12 @@ Operated by KPMG Thames Clippers - St George Wharf to Millbank �3.30 �2.97 �2.20 �6.60 + St George Wharf to Millbank £3.30 £2.97 £2.20 £6.60 - Millbank to Bankside �5.50 �4.95 �3.70 �11 + Millbank to Bankside £5.50 £4.95 £3.70 £11 @@ -13135,9 +13135,9 @@ Operated by KPMG Thames Clippers RB2 adult fares - Millbank to Bankside �5.50 �4.95 �3.70 �11 -St George Wharf to Millbank �3.30 �2.97 �2.20 �6.60 -All other journeys on this service �6 �5.40 �4 �12 + Millbank to Bankside £5.50 £4.95 £3.70 £11 +St George Wharf to Millbank £3.30 £2.97 £2.20 £6.60 +All other journeys on this service £6 £5.40 £4 £12 @@ -13243,9 +13243,9 @@ All other journeys on this service RB2 child fares - Millbank to Bankside �2.80 n/a �1.80 -St George Wharf to Millbank �1.70 n/a �1.10 -All other journeys on this service �3.00 n/a �2.00 + Millbank to Bankside £2.80 n/a £1.80 +St George Wharf to Millbank £1.70 n/a £1.10 +All other journeys on this service £3.00 n/a £2.00 @@ -13351,9 +13351,9 @@ All other journeys on this service RB2 child fares - Millbank to Bankside �2.80 n/a �1.80 -St George Wharf to Millbank �1.70 n/a �1.10 -All other journeys on this service �3.00 n/a �2.00 + Millbank to Bankside £2.80 n/a £1.80 +St George Wharf to Millbank £1.70 n/a £1.10 +All other journeys on this service £3.00 n/a £2.00 @@ -14270,10 +14270,10 @@ All other journeys on this service A Cableway Trip - 360� tour -You will have the option of taking a non-stop return trip on the Emirates Air Line; just ask for a 360� tour Boarding Pass at an Emirates Air Line ticket office. 360� tour Boarding Pass fares are the same as return fares. + 360° tour +You will have the option of taking a non-stop return trip on the Emirates Air Line; just ask for a 360° tour Boarding Pass at an Emirates Air Line ticket office. 360° tour Boarding Pass fares are the same as return fares. -Oyster card holders who want to travel on the Emirates Air Line as part of a 360� tour will need to buy a Boarding Pass - available at the discounted rate when you show your Oyster card. +Oyster card holders who want to travel on the Emirates Air Line as part of a 360° tour will need to buy a Boarding Pass - available at the discounted rate when you show your Oyster card. @@ -14449,7 +14449,7 @@ Multi-journey Boarding Passes are not transferable. Buy SIngle Cash ticket for zone 1 - � 4.50 cash + £ 4.50 cash 2013-07-08T01:07:00 4.50 @@ -14495,7 +14495,7 @@ Multi-journey Boarding Passes are not transferable. Buy Group Day ticket ticket for zone 1-6 4 Adults 10 Children - 4 @� 4.50 each + 10@ � 1.70 each + 4 @£ 4.50 each + 10@ £ 1.70 each 2013-07-08T01:07:15 28.70 @@ -14556,7 +14556,7 @@ Multi-journey Boarding Passes are not transferable. Buy single Cash ticket with Travel card discount fr River RB2 Millbank to Bankside - � 3.70 cash + £ 3.70 cash 2013-07-08T01:07:00 3.70 @@ -14599,7 +14599,7 @@ Multi-journey Boarding Passes are not transferable. Buy an Travel Card Oyster Card with 7 days for zones 1 and 2 - Card 5.00 deposit + Pass @ �30.40 + Card 5.00 deposit + Pass @ £30.40 2013-07-08T01:07:00 35.40 @@ -14647,10 +14647,10 @@ Multi-journey Boarding Passes are not transferable. - + - Top up Oyster card with �10 - �10 + Top up Oyster card with £10 + £10 2013-07-08T01:07:10 10.00 @@ -14674,7 +14674,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch in in a zone inside travel card - Raises liability for max far �.8.40 ( �2.40) + Raises liability for max far £.8.40 ( £2.40) 2013-07-08T01:09:00 8.40 @@ -14705,7 +14705,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch out in a zone inside travel card - Raises liabliity for max incremntal fare zons 2- 8 �.8.40 ( �2.40) + Raises liabliity for max incremntal fare zons 2- 8 £.8.40 ( £2.40) 2013-07-08T01:09:10 -8.40 @@ -14744,7 +14744,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch in - Raises libailiity for max far �.8.40 ( �2.40) + Raises libailiity for max far £.8.40 ( £2.40) 2013-07-08T01:12:00 8.40 @@ -14779,7 +14779,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch out n a zone outside traval card - Max 8.40 - actusl �2.40 = -�6.00 + Max 8.40 - actusl £2.40 = -£6.00 2013-07-08T01:12:30 -6.0 @@ -14809,8 +14809,8 @@ Multi-journey Boarding Passes are not transferable. - Top up Oyster card with �10 - Put �10 on card to trigger + Top up Oyster card with £10 + Put £10 on card to trigger 2013-07-08T01:07:10 10.00 @@ -14853,8 +14853,8 @@ Multi-journey Boarding Passes are not transferable. - Top up Oyster card with �10 - Put �10 on card to trigger + Top up Oyster card with £10 + Put £10 on card to trigger 2013-07-08T01:07:10 10.00 @@ -14904,7 +14904,7 @@ Multi-journey Boarding Passes are not transferable. Buy an Travel Card Oyster Card with 20 PAY as you go - Card 5.00 deposit + Pass @ �20 + Card 5.00 deposit + Pass @ £20 2013-07-08T01:07:00 25.00 @@ -14929,9 +14929,9 @@ Multi-journey Boarding Passes are not transferable. - + - Add �10 Pay as you go + Add £10 Pay as you go 2013-07-08T01:07:10 @@ -14950,7 +14950,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch in - Raises libailiity for max far �.8.40 ( �2.40) + Raises libailiity for max far £.8.40 ( £2.40) 2013-07-08T01:12:00 8.40 @@ -14985,7 +14985,7 @@ Multi-journey Boarding Passes are not transferable. Oyster Touch out n a zone outside traval card - Max 8.40 - actusl �2.40 = -�6.00 + Max 8.40 - actusl £2.40 = -£6.00 2013-07-08T01:12:30 -6.0 diff --git a/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml b/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml index d8823052e..e9fddc86d 100644 --- a/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml +++ b/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml @@ -1,4 +1,4 @@ - + - + 0 - + 80 - + 115 - + 135 @@ -1919,7 +1919,7 @@ TopologicalPlace>North East North East student fare 15Week unfunded 2011-08-08 250 - + @@ -1933,7 +1933,7 @@ TopologicalPlace>North East North East North East Student -15 Week-�80 Funded +15 Week-£80 Funded 170 20110808,Variable, 104 @@ -1945,7 +1945,7 @@ TopologicalPlace>North East North East student fare 15Week unfunded 2011-08-08 170 - + @@ -1958,7 +1958,7 @@ TopologicalPlace>North East North East North East Student -15 Week-�115 Funded +15 Week-£115 Funded 135 20110808,Variable, 104 @@ -1970,7 +1970,7 @@ TopologicalPlace>North East North East student fare 15Week unfunded 2011-08-08 135 - + @@ -1983,7 +1983,7 @@ TopologicalPlace>North East North East North East Student -15 Week-�135 Funded +15 Week-£135 Funded 115 20110808,Variable, 104 @@ -1995,7 +1995,7 @@ TopologicalPlace>North East North East student fare 15Week unfunded 2011-08-08 115 - + @@ -2270,7 +2270,7 @@ TopologicalPlace>North East County Durham student fare 15Week unfunded 2011-08-08 220 - + @@ -2283,7 +2283,7 @@ TopologicalPlace>North East North East Co. Durham Student -15 Week-�80 Funded +15 Week-£80 Funded 140 20110808,Variable, 104 @@ -2295,7 +2295,7 @@ TopologicalPlace>North East County Durham student fare 15Week unfunded 2011-08-08 140 - + @@ -2308,7 +2308,7 @@ TopologicalPlace>North East North East Co. Durham Student -15 Week-�115 Funded +15 Week-£115 Funded 105 20110808,Variable, 104 @@ -2320,7 +2320,7 @@ TopologicalPlace>North East County Durham student fare 15Week unfunded 2011-08-08 105 - + @@ -2333,7 +2333,7 @@ TopologicalPlace>North East North East Co. Durham Student -15 Week-�135 Funded +15 Week-£135 Funded 85 20110808,Variable, 104 @@ -2345,7 +2345,7 @@ TopologicalPlace>North East County Durham student fare 15Week unfunded 2011-08-08 85 - + diff --git a/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml b/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml index 89991b01b..d6df818e1 100644 --- a/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml +++ b/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml @@ -1,4 +1,4 @@ - + Bucharest to Buzau. @@ -7419,13 +7419,13 @@ State Secretariat - Mizil to S�h�teni. + Mizil to Săhăteni. 7 - S�h�teni to Ulmeni. + Săhăteni to Ulmeni. 12 @@ -7595,10 +7595,10 @@ State Secretariat TODO - add members - + TODO - add members - + TODO - add members @@ -7677,7 +7677,7 @@ State Secretariat - Transferoviar C�l�tori + Transferoviar Călători TODO-BITMAPVALUE https://www.transferoviarcalatori.ro/logo.png TFC @@ -7703,13 +7703,13 @@ State Secretariat - TFC - Transferoviar C�l�tori S.R.L. + Transferoviar Călători S.R.L. ilete@tfc-online.ro 0238 434 380 @@ -7722,7 +7722,7 @@ c Strada Tudor Vladimirescu Cluj Napoca ap 1 et 1 sector 1 - Jude�ul Cluj + Judeţul Cluj diff --git a/examples/functions/fares/rail/Netex_era_toc_uk.xml b/examples/functions/fares/rail/Netex_era_toc_uk.xml index 8054fd451..005494fd3 100644 --- a/examples/functions/fares/rail/Netex_era_toc_uk.xml +++ b/examples/functions/fares/rail/Netex_era_toc_uk.xml @@ -1,4 +1,4 @@ - + Anglia Plus 'Three Days in Seven' Anglia Plus 'Three Days in Seven' Flexi Rover -This pass gives you all the flexibility of the One Day Ranger for just �38.00 per adult - which means your third day's travel is free! You choose whichever three days you would like to travel on within a seven day period - and children are still only �2.00 each when accompanied by an adult. All prices apply until 1 January 2019. +This pass gives you all the flexibility of the One Day Ranger for just £38.00 per adult - which means your third day's travel is free! You choose whichever three days you would like to travel on within a seven day period - and children are still only £2.00 each when accompanied by an adult. All prices apply until 1 January 2019. Both the One Day Ranger and the Flexi Rover are valid after 08:45 on Mondays to Fridays and at any time at weekends and on Bank Holidays. You can also use the following trains on weekdays that depart before 08:45: @@ -8785,8 +8785,8 @@ On the "Breeze" town services in Bury St Edmunds operated by Stephensons +Full term: £270.00 Full term: £460.00 +Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this great value fare. @@ -9218,7 +9218,7 @@ Short Term (1/4/18-1/6/18): NETWORK Railcard (Annual Gold Card) holders get 1/3 off the adult price of PLUSBUS day tickets for towns and cities located within the South East of England, upon presentation of their valid Network Railcard (Annual Gold Card), as follows: ** Mondays to Fridays after 10:00hours; ** Saturday, Sunday, Bank Holidays any time. -The �13 minimum fare restriction does not apply to PLUSBUS day ticket purchases. +The £13 minimum fare restriction does not apply to PLUSBUS day ticket purchases. http://www.plusbus.info/sites/default/files/Railcard%20discount%20restrictions%20for%20PLUSBUS.pdf offPeak @@ -9354,7 +9354,7 @@ http://www.plusbus.info/sites/default/files/Railcard%20discount%20restrictions%2 NETWORK Railcard (Annual Gold Card) holders get 1/3 off the adult price of PLUSBUS day tickets for towns and cities located within the South East of England, upon presentation of their valid Network Railcard (Annual Gold Card), as follows: ** Mondays to Fridays after 10:00hours; ** Saturday, Sunday, Bank Holidays any time. -The �13 minimum fare restriction does not apply to PLUSBUS day ticket purchases. +The £13 minimum fare restriction does not apply to PLUSBUS day ticket purchases. @@ -9389,7 +9389,7 @@ Children MUST be charged the normal child PLUSBUS day ticket price (which is hal Tickets bought with other Rail cards have no off peak restriction 16-25 Railcard, 26-30 Railcard and HM Forces Railcard holders get holders get 1/3 off the adult price of PLUSBUS day tickets, upon presentation of their valid 16-25 or 26-30 Railcard or HM Forces Railcard, at all times. -The �12 minimum fare restriction does not apply to PLUSBUS day ticket purchases. +The £12 minimum fare restriction does not apply to PLUSBUS day ticket purchases. Disabled Persons Railcard holders get 1/3 off the adult price of PLUSBUS day tickets, upon presentation of their valid Disabled Persons Railcard at all times, when purchased with the following rail ticket types:- *** Off-Peak Day Singles, Off-Peak Day Returns; @@ -9645,7 +9645,7 @@ You must show the actual PLUSBUS ticket to the bus driver (or tram conductor) to COmmercial conditions 14. Are refunds available for PLUSBUS tickets? -PLUSBUS is a National Rail ticket, whose standard terms and conditions apply (including for ticket refunds). If you have bought a PLUSBUS ticket in advance from a station (or online) and do not want to use it, then you may claim a refund from the ticket office (or ticket retailer) that took original payment, but you must do this within 28 days of the travel date shown on the ticket. You must also return the ticket. Some ticket offices (and agents) may charge an administration fee of up to �10 to process refunds. +PLUSBUS is a National Rail ticket, whose standard terms and conditions apply (including for ticket refunds). If you have bought a PLUSBUS ticket in advance from a station (or online) and do not want to use it, then you may claim a refund from the ticket office (or ticket retailer) that took original payment, but you must do this within 28 days of the travel date shown on the ticket. You must also return the ticket. Some ticket offices (and agents) may charge an administration fee of up to £10 to process refunds. PLUSBUS tickets bought online may not be refundable from some online agents. @@ -9719,7 +9719,7 @@ The validity of your PlusBus season ticket does not have to match your rail seas COmmercial conditions 14. Are refunds available for PLUSBUS tickets? -PLUSBUS is a National Rail ticket, whose standard terms and conditions apply (including for ticket refunds). If you have bought a PLUSBUS ticket in advance from a station (or online) and do not want to use it, then you may claim a refund from the ticket office (or ticket retailer) that took original payment, but you must do this within 28 days of the travel date shown on the ticket. You must also return the ticket. Some ticket offices (and agents) may charge an administration fee of up to �10 to process refunds. +PLUSBUS is a National Rail ticket, whose standard terms and conditions apply (including for ticket refunds). If you have bought a PLUSBUS ticket in advance from a station (or online) and do not want to use it, then you may claim a refund from the ticket office (or ticket retailer) that took original payment, but you must do this within 28 days of the travel date shown on the ticket. You must also return the ticket. Some ticket offices (and agents) may charge an administration fee of up to £10 to process refunds. PLUSBUS tickets bought online may not be refundable from some online agents. @@ -10552,7 +10552,7 @@ Fully inter-available First Class Season Ticket (i.e. tickets not specific to on Any First Class Anytime ticket valid for travel on the Virgin Trains East Coast route Any Virgin Trains East Coast First Class packages Holders of a First Class Lounge supplement, available for purchase with a Virgin Trains East Coast First Advance ticket or First Class reader offer -Please be aware that First Advance and Weekend First tickets are not entitled to use the First Class Lounges. If travelling on a First Advance ticket, you can purchase a �5 supplement ticket, which allows you access into the First Class Lounge. This can be purchased on the day of travel at any Virgin Trains East Coast Travel Centre or at the time of booking your ticket online. +Please be aware that First Advance and Weekend First tickets are not entitled to use the First Class Lounges. If travelling on a First Advance ticket, you can purchase a £5 supplement ticket, which allows you access into the First Class Lounge. This can be purchased on the day of travel at any Virgin Trains East Coast Travel Centre or at the time of booking your ticket online. http://www.nationalrail.co.uk/stations_destinations/44863.aspx diff --git a/examples/functions/grouping/Netex_GroupingExample_General_01.xml b/examples/functions/grouping/Netex_GroupingExample_General_01.xml index a639bdcc7..506fa7f3b 100644 --- a/examples/functions/grouping/Netex_GroupingExample_General_01.xml +++ b/examples/functions/grouping/Netex_GroupingExample_General_01.xml @@ -1,4 +1,4 @@ - + - Calais Fr�thun + Calais Fréthun Calais mixed @@ -1662,7 +1662,7 @@ Q.4. Public holiday - Services do not run on a christams day - railStation - Marne La Vall�e Chessy + Marne La Vallée Chessy Marne For Disneyland Resort @@ -1785,11 +1785,11 @@ Q.4. Public holiday - Services do not run on a christams day - railStation - Mo�tiers - Mo�tiers + Moûtiers + Moûtiers outdoors - Mo�tiers + Moûtiers true @@ -1985,7 +1985,7 @@ Q.4. Public holiday - Services do not run on a christams day - Paris / Brussels - Disneyland Paris / Marne-La-Vall�e + Disneyland Paris / Marne-La-Vallée Avignon @@ -1997,7 +1997,7 @@ Q.4. Public holiday - Services do not run on a christams day - Brussels to London - Disneyland Paris (Marne-La-Vall�e) to London + Disneyland Paris (Marne-La-Vallée) to London Avignon to London @@ -2090,12 +2090,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Calais to Mo�tiers + Calais to Moûtiers - Mo�tiers to Aime + Moûtiers to Aime @@ -2159,12 +2159,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Mo�tiers to Calais + Moûtiers to Calais - Aime to Mo�tiers + Aime to Moûtiers @@ -2239,7 +2239,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - (Ebbsfleet) - Ashford - (Calais) - Lille - Marne La Vall�e + London - (Ebbsfleet) - Ashford - (Calais) - Lille - Marne La Vallée outbound @@ -2270,7 +2270,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - (Ebbsfleet) - Ashford - (Calais) - Mo�tiers - Aime - Bourg St Maurice + London - (Ebbsfleet) - Ashford - (Calais) - Moûtiers - Aime - Bourg St Maurice outbound @@ -2426,7 +2426,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Bourg - Aime - Mo�tiers - (lille) - (Calais) - Ashford -( Ebbsfleet) - London + Bourg - Aime - Moûtiers - (lille) - (Calais) - Ashford -( Ebbsfleet) - London inbound @@ -2531,7 +2531,7 @@ Q.4. Public holiday - Services do not run on a christams day - Lille - Disneyland Resort Paris / Marne La Vall�e + Disneyland Resort Paris / Marne La Vallée Disneyland / Marne @@ -2543,7 +2543,7 @@ Q.4. Public holiday - Services do not run on a christams day - London - Mo�tiers - Aime la Plagne - Bourg St Maurice + Moûtiers - Aime la Plagne - Bourg St Maurice French Alps @@ -2619,11 +2619,11 @@ Q.4. Public holiday - Services do not run on a christams day - Ashford - Alps - Calais to Mo�tiers + Calais to Moûtiers - Mo�tiers to Aime + Moûtiers to Aime @@ -2783,11 +2783,11 @@ Q.4. Public holiday - Services do not run on a christams day - - Calais to Mo�tiers + Calais to Moûtiers - Mo�tiers to Aime + Moûtiers to Aime @@ -2816,7 +2816,7 @@ Q.4. Public holiday - Services do not run on a christams day - Ashford - Calais Fr�thun + Calais Fréthun Calais @@ -2836,7 +2836,7 @@ Q.4. Public holiday - Services do not run on a christams day - Paris GdL - Marne-La-Vall�e + Marne-La-Vallée Marne For Disneyland @@ -2853,8 +2853,8 @@ Q.4. Public holiday - Services do not run on a christams day - Avignon Centre - Mo�tiers - Mo�tiers + Moûtiers + Moûtiers Aime-la-Plagne @@ -2913,12 +2913,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Calais to Mo�tiers + Calais to Moûtiers - Mo�tiers to Aime + Moûtiers to Aime @@ -2973,12 +2973,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Mo�tiers to Calais + Moûtiers to Calais - Aime to Mo�tiers + Aime to Moûtiers @@ -3271,7 +3271,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Lille - Marne La Vall�e + London - Ashford - Lille - Marne La Vallée outbound @@ -3292,7 +3292,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Mo�tiers - Aime - Bourg St Maurice + London - Ashford - Moûtiers - Aime - Bourg St Maurice outbound @@ -3635,7 +3635,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Bourg St Maurice - Aime - Mo�tiers - Ashford - London + Bourg St Maurice - Aime - Moûtiers - Ashford - London inbound @@ -4068,7 +4068,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Calais Fr�thun + Calais Fréthun @@ -4083,7 +4083,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Marne-La-Marne-La-Vall�e (for Disneyland Resort) + Marne-La-Marne-La-Vallée (for Disneyland Resort) @@ -4098,7 +4098,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Mo�tiers + Moûtiers @@ -4315,12 +4315,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Calais to Mo�tiers + Calais to Moûtiers - Mo�tiers to Aime + Moûtiers to Aime @@ -4441,12 +4441,12 @@ Q.4. Public holiday - Services do not run on a christams day - - Mo�tiers to Calais + Moûtiers to Calais - Aime to Mo�tiers + Aime to Moûtiers @@ -4515,7 +4515,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Mo�tiers to Ashford + Moûtiers to Ashford @@ -4824,7 +4824,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Lille - Marne La Vall�e + London - Ashford - Lille - Marne La Vallée outbound @@ -4846,7 +4846,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Mo�tiers - Aime - Bourg St Maurice + London - Ashford - Moûtiers - Aime - Bourg St Maurice outbound @@ -5192,7 +5192,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Bourg St Maurice - Aime - Mo�tiers - Ashford - London + Bourg St Maurice - Aime - Moûtiers - Ashford - London inbound @@ -5525,7 +5525,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Lille - Marne La Vall�e + London - Ashford - Lille - Marne La Vallée outbound @@ -5551,7 +5551,7 @@ Q.4. Public holiday - Services do not run on a christams day - - London - Ashford - Mo�tiers - Aime - Bourg St Maurice + London - Ashford - Moûtiers - Aime - Bourg St Maurice outbound @@ -5917,7 +5917,7 @@ Q.4. Public holiday - Services do not run on a christams day - - Bourg St Maurice - Aime - Mo�tiers - Ashford - London + Bourg St Maurice - Aime - Moûtiers - Ashford - London inbound @@ -6057,12 +6057,12 @@ Q.4. Public holiday - Services do not run on a christams day - PT20M - Calais to Mo�tiers + Calais to Moûtiers PT20M - Mo�tiers to Aime + Moûtiers to Aime PT20M @@ -10372,7 +10372,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9074 London - Ebbsfleet - Ashford - Mo�tiers - Aime - Bourg St Maurice + 9074 London - Ebbsfleet - Ashford - Moûtiers - Aime - Bourg St Maurice @@ -10444,7 +10444,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9096 London - Ebbsfleet - Ashford - Mo�tiers - Aime - Bourg St Maurice + 9096 London - Ebbsfleet - Ashford - Moûtiers - Aime - Bourg St Maurice @@ -10516,7 +10516,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9095 Bourg St Maurice - AIme - Mo�tiers - Ashford - London + 9095 Bourg St Maurice - AIme - Moûtiers - Ashford - London @@ -10587,7 +10587,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9099 Bourg St Maurice - AIme - Mo�tiers - Ashford - London + 9099 Bourg St Maurice - AIme - Moûtiers - Ashford - London @@ -10667,7 +10667,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9092 London - Ashford - Mo�tiers - Aime - Bourg St Maurice + 9092 London - Ashford - Moûtiers - Aime - Bourg St Maurice @@ -10676,7 +10676,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9096 London - Ashford - Mo�tiers - Aime - Bourg St Maurice + 9096 London - Ashford - Moûtiers - Aime - Bourg St Maurice @@ -10705,7 +10705,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9095 Bourg St Maurice - Aime - Mo�tiers - Ashford - London + 9095 Bourg St Maurice - Aime - Moûtiers - Ashford - London @@ -10714,7 +10714,7 @@ Q.4. Public holiday - Services do not run on a christams day - - 9099 Bourg St Maurice - Aime - Mo�tiers - Ashford - London + 9099 Bourg St Maurice - Aime - Moûtiers - Ashford - London @@ -10808,8 +10808,8 @@ Q.4. Public holiday - Services do not run on a christams day - Nantes - Mo�tiers - Mo�tiers + Moûtiers + Moûtiers diff --git a/examples/functions/timetable/Netex_32_Multimodal_PassengerInformationEquipment.xml b/examples/functions/timetable/Netex_32_Multimodal_PassengerInformationEquipment.xml index cf11a019d..1b9133391 100644 --- a/examples/functions/timetable/Netex_32_Multimodal_PassengerInformationEquipment.xml +++ b/examples/functions/timetable/Netex_32_Multimodal_PassengerInformationEquipment.xml @@ -1,4 +1,4 @@ - + 2001-12-17T09:30:47.0Z diff --git a/examples/functions/variant/Netex_VariantExample_Step_05.xml b/examples/functions/variant/Netex_VariantExample_Step_05.xml index 191c8a5c2..491945b47 100644 --- a/examples/functions/variant/Netex_VariantExample_Step_05.xml +++ b/examples/functions/variant/Netex_VariantExample_Step_05.xml @@ -1,4 +1,4 @@ - + 16 Plus Card - he 16Plus photocard is available to anyone aged between 16 and 21, entitling the holder to discounted travel on Arriva bus services in Merseyside and Lancashire for 1 year (�1.80 flat fare, single trip). + he 16Plus photocard is available to anyone aged between 16 and 21, entitling the holder to discounted travel on Arriva bus services in Merseyside and Lancashire for 1 year (£1.80 flat fare, single trip). https://www.arrivabus.co.uk/north-west/bus-tickets/16Plus/ beforeTravel @@ -1245,18 +1245,18 @@ We group the elements in separate frames @@ -1265,8 +1265,8 @@ July + August 1 July 2020 31 August 2020 AND @@ -1296,7 +1296,7 @@ Academic Year 1 September 2019 30 June 2020 AND @@ -1321,8 +1321,8 @@ Academic Year + 1 1 September 2019 31 July 2020 AND @@ -1352,10 +1352,10 @@ Academic Year + 2 1 September 2019 31 August 2020 AND @@ -1393,9 +1393,9 @@ Spring + Summer Terms + 2 1 January 2020 31 August 2020 AND @@ -1593,12 +1593,12 @@ July + August 1 July 2020 31 August 2020 @@ -1606,8 +1606,8 @@ Summer Term 10 April 2020 22 July 2020 AND @@ -1636,7 +1636,7 @@ Academic Year 1 September 2019 22 July 2020 AND @@ -1661,8 +1661,8 @@ Autumn + Spring Terms 1 September 2019 10 April 2020 AND @@ -1691,7 +1691,7 @@ Spring + Summer Terms 20 December 2020 22 July 2020 AND @@ -2144,19 +2144,19 @@ Summer Term 10 April 2020 22 July 2020 @@ -2241,12 +2241,12 @@ July + August 1 July 2020 31 August 2020 Autumn term 2019 diff --git a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml index 9688b08e4..df15243ec 100644 --- a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml +++ b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-trip_20200417.xml @@ -1,4 +1,4 @@ - + 16 Plus Card - he 16Plus photocard is available to anyone aged between 16 and 21, entitling the holder to discounted travel on Arriva bus services in Merseyside and Lancashire for 1 year (�1.80 flat fare, single trip). + he 16Plus photocard is available to anyone aged between 16 and 21, entitling the holder to discounted travel on Arriva bus services in Merseyside and Lancashire for 1 year (£1.80 flat fare, single trip). https://www.arrivabus.co.uk/north-west/bus-tickets/16Plus/ beforeTravel diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml index 4b2336497..15e4c0ab3 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_LINE-FARE_WOE-Bristol-Line-48-trip-(stage)_2017-01-01.xml @@ -1,4 +1,4 @@ - + @@ -1870,11 +1870,11 @@ You'll need to scan the QR when you board the bus or show the ticket to the driv First West of England section ("Distance Based") Trip Fare diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml index e4e2455e2..18c15a111 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml +++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml @@ -1,4 +1,4 @@ - + @@ -1019,11 +1019,11 @@ You'll need to scan the QR when you board the bus or show the ticket to the driv @@ -2845,7 +2845,7 @@ Over 12 miles (within West of England area) @@ -3040,7 +3040,7 @@ Bath Short_Hop Fares @@ -3118,10 +3118,10 @@ Bristol Inner 1 trip short hop | 1.000 Single Fares @@ -3375,7 +3375,7 @@ Weston-super-Mare Town Zone 1 trip | Weston 10 Journey also available on mTickets Ten single journey tickets to go anywhere in Weston-super-Mare Town Zone (valid for 12 months from the date of issue). Adult hild aged 5-15 16-21 year olds/student -Weston �18 �9 �12.60 +Weston £18 £9 £12.60 --> @@ -3706,9 +3706,9 @@ Weston ______ ______ ________ | Adult Child Student NB see related prduct Weston 10 Journey also available on mTickets Ten single journey tickets to go anywhere in Weston-super-Mare Town Zone (valid for 12 months from the date of issue). -Adult �18 -16-21 year olds/student �12.60 -Child aged 5-15 �9 +Adult £18 +16-21 year olds/student £12.60 +Child aged 5-15 £9 --> @@ -4095,14 +4095,14 @@ For Terms and Conditions and details of PayPoint agents see link or contact cust @@ -4313,10 +4313,10 @@ West of England plus | | | | @@ -4467,10 +4467,10 @@ Annual : 1 year | Bristol Outer | | paper | || m-ticket | ______ ______ ________ | Adult Child Student | Family | Group || Adult Child Student | Group -1 day : 1 day | �6.60 �3.30 �4.50 | �13.00 | �10.00 || �6.00 | �3.00 | �4.20 | �8.00 -1 week : 7 day | �23.80 �11.90 �16.70 | | || �22.00 �11.00 �15.40 -4 week : 31 day | �86.40 �43.20 �60.50 | | || �80.00 �40.00 �56.00 -Annual : 1 year | �907.00 �453.50 �635.00 ! | ||�840.00 �420.00 �588.00 +1 day : 1 day | £6.60 £3.30 £4.50 | £13.00 | £10.00 || £6.00 | £3.00 | £4.20 | £8.00 +1 week : 7 day | £23.80 £11.90 £16.70 | | || £22.00 £11.00 £15.40 +4 week : 31 day | £86.40 £43.20 £60.50 | | || £80.00 £40.00 £56.00 +Annual : 1 year | £907.00 £453.50 £635.00 ! | ||£840.00 £420.00 £588.00 --> @@ -4782,10 +4782,10 @@ Annual : 1 year | @@ -4996,10 +4996,10 @@ Annual : 1 year | @@ -5104,10 +5104,10 @@ Annual : 1 year | @@ -5490,10 +5490,10 @@ Annual : 1 year | @@ -5704,10 +5704,10 @@ Annual : 1 year | @@ -5812,10 +5812,10 @@ Annual : 1 year | @@ -6027,10 +6027,10 @@ ______ ______ ______ _ | ______ ______ ______ ______ ___ @@ -6208,7 +6208,7 @@ ______ ______ ______ _ | ______ ______ ______ ______ ___ @@ -7211,10 +7211,10 @@ Some bus operators even offer special 'smart' discounts for customers using Pay- Travelwest Rider Pass Travelling with more than one bus company? The AvonRider, BathRider, BristolRider and WestonRider are day tickets available to buy on bus, where you can travel on up to 14 different operator services across the area of your choice with just one ticket. - AvonRider �7.20 Adult �5.50 Student/Child - BathRider �4.50 Adult �4 Student/Child -BristolRider �4.50 Adult �3.50 Student/Child -WestonRider �4 Adult �3 Student/ + AvonRider £7.20 Adult £5.50 Student/Child + BathRider £4.50 Adult £4 Student/Child +BristolRider £4.50 Adult £3.50 Student/Child +WestonRider £4 Adult £3 Student/ Rider Tickets Rider Tickets are day tickets that are accepted by all bus operators in a given area Valid for travel on the day of issue and up to 2.59am the following morning. @@ -7408,14 +7408,14 @@ Student/child Rider Tickets are not available on travelcards. The following tickets can be loaded onto your Travelcard online*, on the bus, except First buses and metrobus services, (using cash or Pay-As-You-Go credit) or at an iPoint (using a bank card or Pay-As-You-Go credit): -AvonRider Adult - Covering the area of the former County of Avon. Day ticket (�7.20) and Weekly ticket (�32.50) are available online. For more information about this ticket visit our page AvonRider -BristolRider Adult - Covering approximately a 6 mile radius of the city centre. Day ticket (�5.00) and Weekly ticket (�20.00) are available online. For more information about this ticket visit our page BristolRider +AvonRider Adult - Covering the area of the former County of Avon. Day ticket (£7.20) and Weekly ticket (£32.50) are available online. For more information about this ticket visit our page AvonRider +BristolRider Adult - Covering approximately a 6 mile radius of the city centre. Day ticket (£5.00) and Weekly ticket (£20.00) are available online. For more information about this ticket visit our page BristolRider *Only Adult tickets can be bought online, you can buy other tickets from the driver. The following tickets can be loaded onto your Travelcard on the bus**, except First buses, (using cash or Pay-As-You-Go credit): -BathRider - Covering the Bath urban area. Day ticket (�4.50) and Weekly ticket (�20.00) are available. For more information about this ticket visit our page BathRider -WestonRider - Covering the Weston-super-Mare urban area. Day ticket (�4.00) and Weekly ticket (�18) are available. For more information about this ticket visit our page WestonRider +BathRider - Covering the Bath urban area. Day ticket (£4.50) and Weekly ticket (£20.00) are available. For more information about this ticket visit our page BathRider +WestonRider - Covering the Weston-super-Mare urban area. Day ticket (£4.00) and Weekly ticket (£18) are available. For more information about this ticket visit our page WestonRider **Only Adult tickets are available to buy for your Travelcard. @@ -7448,10 +7448,10 @@ WestonRider - Covering the Weston-super-Mare urban area. Day ticket ( Pass@TW_Rider Fares diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml index 209cdc625..d45b906c8 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml @@ -1,4 +1,4 @@ - + @@ -2334,11 +2334,11 @@ You'll need to scan the QR when you board the bus or show the ticket to the driv First West of England section ("Distance Based") Trip Fare @@ -3068,8 +3068,8 @@ Over 12 miles (within West of England area) Short_hop Fares @@ -3347,9 +3347,9 @@ Bristol 1 trip short hop 1.20 0.60 0.60 _1 trip__ _____ ___ | p ticket __1 trip__ _____ ___ | Adult Child Student | -Bath | �2.50 �1.30 �1.80 | -Bristol | 2.50 �1.30 �1.80 | -Weston-super-Mare | 1.70 �0.85 �1.20 | +Bath | £2.50 £1.30 £1.80 | +Bristol | 2.50 £1.30 £1.80 | +Weston-super-Mare | 1.70 £0.85 £1.20 | West_of_England | na na na | --> @@ -3437,10 +3437,10 @@ West_of_England | na na na | Single trip in zone prices, m-ticket @@ -3730,10 +3730,10 @@ West_of_England | Weston 10 Journey also available on mTickets Ten single journey tickets to go anywhere in Weston-super-Mare Zone (valid for 12 months from the date of issue). Adult hild aged 5-15 16-21 year olds/student -Bath �10.00 5.00 7.00 -Bristol �10.00 5.00 7.00 -Weston �7.50 5.00 3.75 -West of Englad (mticketOnlY) �17.50 8.75 12.25 +Bath £10.00 5.00 7.00 +Bristol £10.00 5.00 7.00 +Weston £7.50 5.00 3.75 +West of Englad (mticketOnlY) £17.50 8.75 12.25 --> @@ -3758,19 +3758,19 @@ West of Englad (mticketOnlY) - Pack of 5 adult trips - just �2 per journey + Pack of 5 adult trips - just £2 per journey 10.00 - Pack of 5 student trips - jjust �1.00 per journey + Pack of 5 student trips - jjust £1.00 per journey 5.00 - Pack of 5 student trips - jjust �1.40 per journey + Pack of 5 student trips - jjust £1.40 per journey 7.00 @@ -3791,19 +3791,19 @@ West of Englad (mticketOnlY) - Pack of 5 adult trips - just �2 per journey + Pack of 5 adult trips - just £2 per journey 10.00 - Pack of 5 child trips - jjust �1.00 per journey + Pack of 5 child trips - jjust £1.00 per journey 5.00 - Pack of 5 student trips - jjust �1.40 per journey + Pack of 5 student trips - jjust £1.40 per journey 7.00 @@ -4914,11 +4914,11 @@ For Terms and Conditions and details of PayPoint agents see link or contact cust @@ -5064,11 +5064,11 @@ ______ _____ | Adult Child Student | Group | @@ -5213,7 +5213,7 @@ ______ ____ | Adult Child Student | Group @@ -5249,11 +5249,11 @@ ______ _____ | Adult Child Student @@ -5399,11 +5399,11 @@ ______ _____ | Adult Child Student | Group | @@ -5554,7 +5554,7 @@ ______ ____ | Adult Child Student | Group @@ -5592,10 +5592,10 @@ ______ _____ | Adult Child Student @@ -5716,10 +5716,10 @@ ______ _____ | Adult Child Student | Group | @@ -5839,7 +5839,7 @@ ______ ____ | Adult Child Student | Group @@ -5875,11 +5875,11 @@ ______ _____ | Adult Child Student @@ -6025,11 +6025,11 @@ ______ _____ | Adult Child Student | Group | @@ -6174,7 +6174,7 @@ ______ ____ | Adult Child Student | Group @@ -6216,7 +6216,7 @@ ______ _____ | Adult Child Student @@ -7697,7 +7697,7 @@ The AvonRider, BathRider, BristolRider and WestonRider are day tickets available Day | | Week | Adult | Student/Child || Adult | Student/Child -ison | �4.00 | �3.00 || 18.00 | 13.50 | / +ison | £4.00 | £3.00 || 18.00 | 13.50 | / Rider Tickets Rider Tickets are day tickets that are accepted by all bus operators in a given area Valid for travel on the day of issue and up to 2.59am the following morning. @@ -8040,10 +8040,10 @@ Student/child Rider Tickets are not available on travelcards. @@ -9058,12 +9058,12 @@ A photocard is required for the monthly Freedom Travelpass Pass@Freedom Fares diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml index bcc9c160b..6446408a8 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml @@ -1,4 +1,4 @@ - + @@ -5727,13 +5727,13 @@ ______ ______ ______ | Adult Child Group Student | Adult Child Group Student | FirstPass | | | | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -FirstDay: 1 day | �5.00 �2.30 �10.00 xxxxx | �5.00 �2.00 �9.00 xxxxx | -Firstweek : 7 day | �20.00 �8.00 xxxxx �l5.00 | �20.00 �7.00 xxxxx xxxx | -First4Week : 28 day | xxxxx xxxxx xxxxx xxxxx | �76.00 �28.00 xxxxx �36.00 | -FirstUnlimited: 28 day | xxxxx xxxxx xxxxx xxxxx | �74.00 xxxxx xxxxx xxxxx | -FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | �814.00 xxxxx xxxxx xxxxx | -Term1 : 1 term | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx �109.00 | -AllTerms: 1 ac year | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx �249.00 | +FirstDay: 1 day | £5.00 £2.30 £10.00 xxxxx | £5.00 £2.00 £9.00 xxxxx | +Firstweek : 7 day | £20.00 £8.00 xxxxx £l5.00 | £20.00 £7.00 xxxxx xxxx | +First4Week : 28 day | xxxxx xxxxx xxxxx xxxxx | £76.00 £28.00 xxxxx £36.00 | +FirstUnlimited: 28 day | xxxxx xxxxx xxxxx xxxxx | £74.00 xxxxx xxxxx xxxxx | +FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | £814.00 xxxxx xxxxx xxxxx | +Term1 : 1 term | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx £109.00 | +AllTerms: 1 ac year | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx £249.00 | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | --> diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml index 04cfc6c21..20da827d7 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml @@ -1,4 +1,4 @@ - + @@ -5369,8 +5369,8 @@ FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | FARE ZONE: Sheffield ______ ______ ______ | Cash ______ ______ ______ | Adult -FirstDay: 1 day | �4.40 -Firstweek : 7 day | �14.50 +FirstDay: 1 day | £4.40 +Firstweek : 7 day | £14.50 --> @@ -5413,8 +5413,8 @@ Firstweek : 7 day | @@ -5456,7 +5456,7 @@ Firstweek : 7 day | FARE ZONE: Sheffield | Cash ______ ______ ______ | Group FirstDay: 1 day | xxxxx -Firstweek : 7 day | �l0.00 +Firstweek : 7 day | £l0.00 First4Week : 28 day | xxxxx --> @@ -5490,7 +5490,7 @@ First4Week : 28 day | xxxxx @@ -5599,9 +5599,9 @@ FirstYear: 1 year | @@ -5679,8 +5679,8 @@ FirstYear: 1 year | xxxxx FARE ZONE: Sheffield | m-ticket ______ ______ ______ | Student FirstDay: 1 day | xxxxx -Firstweek : 7 day | �10.00 -First4Week : 28 day | �36.00 +Firstweek : 7 day | £10.00 +First4Week : 28 day | £36.00 --> @@ -5724,7 +5724,7 @@ ______ ______ ______ | Group FirstDay: 1 day | xxxxx Firstweek : 7 day | xxxxx First4Week : 28 day | xxxxx -FirstUnlimited: 28 day | �52.00 +FirstUnlimited: 28 day | £52.00 FirstYear: 1 year | xxxxx --> @@ -5768,13 +5768,13 @@ FirstYear: 1 year | xxxxx @@ -5808,8 +5808,8 @@ Term1 : 1 day | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx @@ -5897,7 +5897,7 @@ First4Week : 28 day | xxxxx @@ -5933,7 +5933,7 @@ First4Week : 28 day | xxxxx FARE ZONE: South Yorks | Cash ______ ______ ______ | Adult FirstDay: 1 day | xxxxx -Firstweek : 7 day | �l5.00 +Firstweek : 7 day | £l5.00 First4Week : 28 day | xxxxx FirstUnlimited: 28 day | xxxxx FirstYear: 1 year | xxxxx @@ -5985,11 +5985,11 @@ FirstYear: 1 year | xxxxx @@ -6045,9 +6045,9 @@ FirstYear: 1 year | @@ -6194,7 +6194,7 @@ ______ ______ ______ | Adult FirstDay: 1 day | xxxxx Firstweek : 7 day | xxxxx First4Week : 28 day | xxxxx -FirstUnlimited: 28 day | �74.00 +FirstUnlimited: 28 day | £74.00 --> diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml index 165e1a5fc..a4e62c6ac 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-simple_20200310.xml @@ -1,4 +1,4 @@ - + @@ -5468,13 +5468,13 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ FARE ZONE: South Yorks | Cash onbus | m-ticket | ______ ______ ______ | Adult Child Group Student | Adult Child Group Student | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -FirstDay: 1 day | �5.00 �2.30 �10.00 xxxxx | �5.00 �2.00 �9.00 xxxxx | -Firstweek : 7 day | �20.00 �8.00 xxxxx �l5.00 | �20.00 �7.00 xxxxx xxxx | -First4Week : 28 day | xxxxx xxxxx xxxxx xxxxx | �76.00 �28.00 xxxxx �36.00 | -FirstUnlimited: 28 day | xxxxx xxxxx xxxxx xxxxx | �74.00 xxxxx xxxxx xxxxx | -FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | �814.00 xxxxx xxxxx xxxxx | -Term1 : 1 term | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx �109.00 | -Allterms: 1 ac year | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx �249.00 | +FirstDay: 1 day | £5.00 £2.30 £10.00 xxxxx | £5.00 £2.00 £9.00 xxxxx | +Firstweek : 7 day | £20.00 £8.00 xxxxx £l5.00 | £20.00 £7.00 xxxxx xxxx | +First4Week : 28 day | xxxxx xxxxx xxxxx xxxxx | £76.00 £28.00 xxxxx £36.00 | +FirstUnlimited: 28 day | xxxxx xxxxx xxxxx xxxxx | £74.00 xxxxx xxxxx xxxxx | +FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | £814.00 xxxxx xxxxx xxxxx | +Term1 : 1 term | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx £109.00 | +Allterms: 1 ac year | xxxxx xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx £249.00 | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | --> diff --git a/examples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml b/examples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml index e7053e641..9dfe322e8 100644 --- a/examples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml +++ b/examples/standards/fxc/FX-PI-01_UK_FYOR_LINE-FARE_FYOR-Line-10-trip-(gtfs)_2018-11-01.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml index 5f678b767..dc1542e98 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml @@ -1,4 +1,4 @@ - + @@ -1007,11 +1007,11 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ https://www.metrobus.co.uk/metrovayger-adult-fares/ Adult fares on the key - 1 day: �6.70 - 1 week: �24 - 4 weeks: �85 - 13 weeks: �250 - Annual: �870 + 1 day: £6.70 + 1 week: £24 + 4 weeks: £85 + 13 weeks: £250 + Annual: £870 What's not available on the key: @@ -1772,15 +1772,15 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ _____ ______ ______ ______ | Cash Cash Cash | m-ticket m-ticket m-ticket m-ticket | the key the key the key | ______ ______ ______ ______ | Adult Child Family | Adult Child Family Duo | Adult Child Student | Metrorider | | | | -60 min : 60 minutes | xxxxx xxxxx xxxxx | �2.20 �1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 day : 1 day | �4.90 �2.70 �9.00 | �4.20 �2.35 �9.00 �7.90 | �4.20 �2.35 �3.15 | -2 day : 2 day | xxxxx xxxxx xxxxx | �7.90 �4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -3 day : 3 day | xxxxx xxxxx xxxxx | �11.50 �6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 week : 7 day | �20.00 �11.00 xxxxx | �18.00 �9.75 xxxxx xxxxx | �18.00 �9.75 �13.50 | -4 week : 28 day | xxxxx xxxxx xxxxx | �59.00 �32.50 xxxxx xxxxx | �59.00 �32.50 �44.25 | -13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �154.00 �79.00 �115.50 | -Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �520.00 �290.00 �390.00 | -Evening : 1 day | �4.00 xxxxx xxxxx | �3.70 xxxxx xxxxx xxxxx | �3.70 xxxxx xxxxx | +60 min : 60 minutes | xxxxx xxxxx xxxxx | £2.20 £1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 day : 1 day | £4.90 £2.70 £9.00 | £4.20 £2.35 £9.00 £7.90 | £4.20 £2.35 £3.15 | +2 day : 2 day | xxxxx xxxxx xxxxx | £7.90 £4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +3 day : 3 day | xxxxx xxxxx xxxxx | £11.50 £6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 week : 7 day | £20.00 £11.00 xxxxx | £18.00 £9.75 xxxxx xxxxx | £18.00 £9.75 £13.50 | +4 week : 28 day | xxxxx xxxxx xxxxx | £59.00 £32.50 xxxxx xxxxx | £59.00 £32.50 £44.25 | +13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £154.00 £79.00 £115.50 | +Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £520.00 £290.00 £390.00 | +Evening : 1 day | £4.00 xxxxx xxxxx | £3.70 xxxxx xxxxx xxxxx | £3.70 xxxxx xxxxx | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | @@ -2326,13 +2326,13 @@ _____ ______ ______ | Cash Cash Cash | m-ticket m-ticket m-ticket m-ticket | th ______ ______ ______ _ | Adult Child Family | Adult Child Family Duo | Adult Child Student | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | MetroVoyager | | | | -1 day 1 day | �7.40 �4.30 �12.50 | �6.70 �3.80 �12.50 xxxxx | �6.70 �3.80 �5.05 | -2 day : 2 day | xxxxx xxxxx xxxxx | �12.50 �6.90 xxxxx xxxxx | xxxxx xxxxx xxxxx | -3 day : 3 day | xxxxx xxxxx xxxxx | �18.20 �10.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 week : 7 day | �26.00 �16.50 xxxxx | �24.00 �15.75 xxxxx xxxxx | �24.00 �15.75 �18.00 | -4 week : 28 day | xxxxx xxxxx xxxxx | �85.00 �52.00 xxxxx xxxxx | �85.00 �52.00 �63.75 | -13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �250.00 �153.00 �187.50 | -Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �879.00 �610.00 �652.50 | +1 day 1 day | £7.40 £4.30 £12.50 | £6.70 £3.80 £12.50 xxxxx | £6.70 £3.80 £5.05 | +2 day : 2 day | xxxxx xxxxx xxxxx | £12.50 £6.90 xxxxx xxxxx | xxxxx xxxxx xxxxx | +3 day : 3 day | xxxxx xxxxx xxxxx | £18.20 £10.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 week : 7 day | £26.00 £16.50 xxxxx | £24.00 £15.75 xxxxx xxxxx | £24.00 £15.75 £18.00 | +4 week : 28 day | xxxxx xxxxx xxxxx | £85.00 £52.00 xxxxx xxxxx | £85.00 £52.00 £63.75 | +13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £250.00 £153.00 £187.50 | +Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £879.00 £610.00 £652.50 | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ______ ______ | ______ ______ ______ | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | @@ -3224,9 +3224,9 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ @@ -3436,9 +3436,9 @@ ______ ______ ______ _ | Gatwick Travel Card If you work at Gatwick Airport, an easitCRAWLEY member or at selected companies in City Place, you may be able to get up to 38% off by buying a Gatwick Travelcard. These are accepted at all times on all Metrobus routes which serve Crawley or Gatwick and are available for periods of: -1 week (�17) -4 weeks (�54) -Annual (�495). +1 week (£17) +4 weeks (£54) +Annual (£495). A special key smartcard is required to purchase a Gatwick Travelcard. To get yours, visit one of our Travel shops in Crawley or Redhill and now at our new Travel Shop at Gatwick South Terminal . If you are airport staff, you will need to show your airside or landside ID or a letter from your employer (with accompanying photographic ID) proving that you work at an approved company at Gatwick Airport. If you work for an easitCRAWLEY member company, you will need to show your valid Easit_card - If you don't have an Easit_card click here to apply , or speak to your employer for further advice. If you work for one of the eligible City Place companies you will need to show your valid Staff ID card. Once you have collected your card, you can then top up your key card with Gatwick Travelcards either online or at our travel shops. @@ -3980,7 +3980,7 @@ Metrobus Travel Shop, Crawley Bus Station, Marlborough Street, Crawley, BS1 3NU Easit_card -Traffic congestion has been described as having a negative impact on Sussex based businesses (Sussex Enterprise, Voice of Business Survey, 2008) with transport inadequacies costing each Sussex business an average of �29,000 every year. +Traffic congestion has been described as having a negative impact on Sussex based businesses (Sussex Enterprise, Voice of Business Survey, 2008) with transport inadequacies costing each Sussex business an average of £29,000 every year. Given the importance of Manor Royal to the local and wider economy, easitCRAWLEY was introduced to tackle the problems caused by business related traffic movements and to help achieve better commercial and community outcomes. Manor Royal BID information @@ -4004,9 +4004,9 @@ Travel planning Optional network meetings For further information please select initiativ -There is no cost to registering, but some of our initiatives require you to have an Easit_card - these cost �5.05 (inc vat) and can be purchased online. +There is no cost to registering, but some of our initiatives require you to have an Easit_card - these cost £5.05 (inc vat) and can be purchased online. -The Easit_card can save you ���'s on your daily commute! +The Easit_card can save you £££'s on your daily commute! For membership details please email info@easit.org.uk @@ -4044,7 +4044,7 @@ You may purchase Single and Return tickets (ONLY) online at easit.org.uk/app/use All other ticket types must be purchased from the relevant ticket office i.e. tickets for Southern routes must be purchased from a Southern station, tickets for GWR routes must be purchased from a GWR station. You will be required to show your Easit_card with every purchase. It is possible to find out who operates a station at www.nationalrail.co.uk and selecting 'stations and destinations'. How do I get an Easit_card? -The card costs �5.05 (inc VAT) and is available to purchase via easit.org.uk +The card costs £5.05 (inc VAT) and is available to purchase via easit.org.uk The Easit_card has not arrived. Please allow three weeks for your card to arrive. If you are outside of this time frame please log into your account and ensure that your shipping details are correct. If they are - please email info@easit.org.uk so that we may investigate. Please note, you must notify us within five weeks of an order or we will not be able to reprint the card. If you are outside of this timeframe, you can always log into your account and order a replacement card. @@ -4400,7 +4400,7 @@ Unfortunately not. As our discounts are genuine discounts off of the cost of the Family - Family Discovery - �17.50 (up to 5 people with a minimum of 1 adult and a maximum of 2 adults). + Family Discovery - £17.50 (up to 5 people with a minimum of 1 adult and a maximum of 2 adults). 5 @@ -4431,9 +4431,9 @@ Unfortunately not. As our discounts are genuine discounts off of the cost of the Discovery fares - one day tickets. Available from the driver. From 1st May 2018 the prices will be: -Adult Discovery - �9 -Child Discovery - �7.20 -Family Discovery - �17.50 +Adult Discovery - £9 +Child Discovery - £7.20 +Family Discovery - £17.50 (up to 5 people with a minimum of 1 adult and a maximum of 2 adults). Discovery tickets will be issued and accepted by the following operators in West Sussex, East Sussex, Surrey, Brighton and Hove, East Hampshire, Kent and Medway (subject to exclusions at the bottom): @@ -4540,7 +4540,7 @@ Excluded services: Services operated on behalf of Transport for London, City Sig @@ -1151,11 +1151,11 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ https://www.metrobus.co.uk/metrovayger-adult-fares/ Adult fares on the key - 1 day: �6.70 - 1 week: �24 - 4 weeks: �85 - 13 weeks: �250 - Annual: �870 + 1 day: £6.70 + 1 week: £24 + 4 weeks: £85 + 13 weeks: £250 + Annual: £870 What's not available on the key: @@ -1916,15 +1916,15 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ _____ ______ ______ ______ | Cash Cash Cash | m-ticket m-ticket m-ticket m-ticket | the key the key the key | ______ ______ ______ ______ | Adult Child Family | Adult Child Family Duo | Adult Child Student | Metrorider | | | | -60 min : 60 minutes | xxxxx xxxxx xxxxx | �2.20 �1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 day : 1 day | �4.90 �2.70 �9.00 | �4.20 �2.35 �9.00 �7.90 | �4.20 �2.35 �3.15 | -2 day : 2 day | xxxxx xxxxx xxxxx | �7.90 �4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -3 day : 3 day | xxxxx xxxxx xxxxx | �11.50 �6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 week : 7 day | �20.00 �11.00 xxxxx | �18.00 �9.75 xxxxx xxxxx | �18.00 �9.75 �13.50 | -4 week : 28 day | xxxxx xxxxx xxxxx | �59.00 �32.50 xxxxx xxxxx | �59.00 �32.50 �44.25 | -13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �154.00 �79.00 �115.50 | -Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �520.00 �290.00 �390.00 | -Evening : 1 day | �4.00 xxxxx xxxxx | �3.70 xxxxx xxxxx xxxxx | �3.70 xxxxx xxxxx | +60 min : 60 minutes | xxxxx xxxxx xxxxx | £2.20 £1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 day : 1 day | £4.90 £2.70 £9.00 | £4.20 £2.35 £9.00 £7.90 | £4.20 £2.35 £3.15 | +2 day : 2 day | xxxxx xxxxx xxxxx | £7.90 £4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +3 day : 3 day | xxxxx xxxxx xxxxx | £11.50 £6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 week : 7 day | £20.00 £11.00 xxxxx | £18.00 £9.75 xxxxx xxxxx | £18.00 £9.75 £13.50 | +4 week : 28 day | xxxxx xxxxx xxxxx | £59.00 £32.50 xxxxx xxxxx | £59.00 £32.50 £44.25 | +13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £154.00 £79.00 £115.50 | +Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £520.00 £290.00 £390.00 | +Evening : 1 day | £4.00 xxxxx xxxxx | £3.70 xxxxx xxxxx xxxxx | £3.70 xxxxx xxxxx | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | @@ -2470,13 +2470,13 @@ _____ ______ ______ | Cash Cash Cash | m-ticket m-ticket m-ticket m-ticket | th ______ ______ ______ _ | Adult Child Family | Adult Child Family Duo | Adult Child Student | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | MetroVoyager | | | | -1 day 1 day | �7.40 �4.30 �12.50 | �6.70 �3.80 �12.50 xxxxx | �6.70 �3.80 �5.05 | -2 day : 2 day | xxxxx xxxxx xxxxx | �12.50 �6.90 xxxxx xxxxx | xxxxx xxxxx xxxxx | -3 day : 3 day | xxxxx xxxxx xxxxx | �18.20 �10.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 week : 7 day | �26.00 �16.50 xxxxx | �24.00 �15.75 xxxxx xxxxx | �24.00 �15.75 �18.00 | -4 week : 28 day | xxxxx xxxxx xxxxx | �85.00 �52.00 xxxxx xxxxx | �85.00 �52.00 �63.75 | -13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �250.00 �153.00 �187.50 | -Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �879.00 �610.00 �652.50 | +1 day 1 day | £7.40 £4.30 £12.50 | £6.70 £3.80 £12.50 xxxxx | £6.70 £3.80 £5.05 | +2 day : 2 day | xxxxx xxxxx xxxxx | £12.50 £6.90 xxxxx xxxxx | xxxxx xxxxx xxxxx | +3 day : 3 day | xxxxx xxxxx xxxxx | £18.20 £10.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 week : 7 day | £26.00 £16.50 xxxxx | £24.00 £15.75 xxxxx xxxxx | £24.00 £15.75 £18.00 | +4 week : 28 day | xxxxx xxxxx xxxxx | £85.00 £52.00 xxxxx xxxxx | £85.00 £52.00 £63.75 | +13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £250.00 £153.00 £187.50 | +Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £879.00 £610.00 £652.50 | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ______ ______ | ______ ______ ______ | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | @@ -3368,9 +3368,9 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml index e0c6fadfb..63bfe7b6f 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MB_NETWORK_FARE_Metrorider-pass_basic_20170101.xml @@ -1,4 +1,4 @@ - + @@ -833,15 +833,15 @@ ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | __ _____ ______ ______ ______ | Cash Cash Cash | m-ticket m-ticket m-ticket m-ticket | the key the key the key | ______ ______ ______ ______ | Adult Child Family | Adult Child Family Duo | Adult Child Student | Metrorider | | | | -60 min : 60 minutes | xxxxx xxxxx xxxxx | �2.20 �1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 day : 1 day | �4.90 �2.70 �9.00 | �4.20 �2.35 �9.00 �7.90 | �4.20 �2.35 �3.15 | -2 day : 2 day | xxxxx xxxxx xxxxx | �7.90 �4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -3 day : 3 day | xxxxx xxxxx xxxxx | �11.50 �6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | -1 week : 7 day | �20.00 �11.00 xxxxx | �18.00 �9.75 xxxxx xxxxx | �18.00 �9.75 �13.50 | -4 week : 28 day | xxxxx xxxxx xxxxx | �59.00 �32.50 xxxxx xxxxx | �59.00 �32.50 �44.25 | -13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �154.00 �79.00 �115.50 | -Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | �520.00 �290.00 �390.00 | -Evening : 1 day | �4.00 xxxxx xxxxx | �3.70 xxxxx xxxxx xxxxx | �3.70 xxxxx xxxxx | +60 min : 60 minutes | xxxxx xxxxx xxxxx | £2.20 £1.10 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 day : 1 day | £4.90 £2.70 £9.00 | £4.20 £2.35 £9.00 £7.90 | £4.20 £2.35 £3.15 | +2 day : 2 day | xxxxx xxxxx xxxxx | £7.90 £4.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +3 day : 3 day | xxxxx xxxxx xxxxx | £11.50 £6.45 xxxxx xxxxx | xxxxx xxxxx xxxxx | +1 week : 7 day | £20.00 £11.00 xxxxx | £18.00 £9.75 xxxxx xxxxx | £18.00 £9.75 £13.50 | +4 week : 28 day | xxxxx xxxxx xxxxx | £59.00 £32.50 xxxxx xxxxx | £59.00 £32.50 £44.25 | +13 week : 91 day | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £154.00 £79.00 £115.50 | +Annual : 1 year | xxxxx xxxxx xxxxx | xxxxx xxxxx xxxxx xxxxx | £520.00 £290.00 £390.00 | +Evening : 1 day | £4.00 xxxxx xxxxx | £3.70 xxxxx xxxxx xxxxx | £3.70 xxxxx xxxxx | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | ______ ______ ______ _ | ______ ______ ______ ______ ______ ______ ________ | ______ ______ ______ | diff --git a/examples/standards/fxc/FX-PI-01_UK_MYBUS_LINE_FARE_Line-3-trip-(p2p)_20190101.xml b/examples/standards/fxc/FX-PI-01_UK_MYBUS_LINE_FARE_Line-3-trip-(p2p)_20190101.xml index 234ec74e4..32480b289 100644 --- a/examples/standards/fxc/FX-PI-01_UK_MYBUS_LINE_FARE_Line-3-trip-(p2p)_20190101.xml +++ b/examples/standards/fxc/FX-PI-01_UK_MYBUS_LINE_FARE_Line-3-trip-(p2p)_20190101.xml @@ -1,4 +1,4 @@ - + @@ -7454,15 +7454,15 @@ FARE ZONE: SHeffield ______ ______ ______ | m-ticket, smartcard | ______ ______ ______ | 1day 1week 28days | ______ ______ ____ _ | ______ ______ ______ | -Sheffield: CityBus | �4.00 �13.00 �52.00 | +Sheffield: CityBus | £4.00 £13.00 £52.00 | -Sheffield: CityWide + tram | �4.30 �14.80 �55.70 | -Barnsley: BConnect | �4.25 �14.70 �55.10 | -Doncaster: DonConnect | �4.25 �14.70 �55.10 | -Rotherham: RConnect | �4.25 �14.70 �55.10 | +Sheffield: CityWide + tram | £4.30 £14.80 £55.70 | +Barnsley: BConnect | £4.25 £14.70 £55.10 | +Doncaster: DonConnect | £4.25 £14.70 £55.10 | +Rotherham: RConnect | £4.25 £14.70 £55.10 | ______ ______ _____ | ______ ______ ______ | -AllZone: SyConnect | �5.90 �19.90 �74.90 | -AllZone: SyConnect +TRain| �7.40 �26.00 �97.40 | +AllZone: SyConnect | £5.90 £19.90 £74.90 | +AllZone: SyConnect +TRain| £7.40 £26.00 £97.40 | ______ ______ _____ | ______ ______ ______ | @@ -7759,18 +7759,18 @@ ______ ______ ______ | 1day 1week 28days 1year | 1day | 1day 1week 28days 1year TravelMaster pass | | | | | ______ ______ ____ _ | ______ ______ ______ _______ | ______ | ______ ______ ______ ______ | -Sheffield: CityBus | �4.70 �17.50 xxxxx xxxxx | �4.70 | �4.70 �16.30 �61.20 �703.84 | +Sheffield: CityBus | £4.70 £17.50 xxxxx xxxxx | £4.70 | £4.70 £16.30 £61.20 £703.84 | -Sheffield: CityWide + tram | �5.10 �17.50 xxxxx xxxxx | �5.10 | �5.10 �17.50 �65.60 �754.40 | -Barnsley: BConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 | �5.00 �17.30 �64.90 �746.35 | -Doncaster: DConnect | �5.00 xxxxx xxxxx xxxxx | �5.00 | �5.00 �17.30 �64.90 �746.35 | -Rotherham: RConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 | �5.00 �17.30 �64.90 �746.35 | +Sheffield: CityWide + tram | £5.10 £17.50 xxxxx xxxxx | £5.10 | £5.10 £17.50 £65.60 £754.40 | +Barnsley: BConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 | £5.00 £17.30 £64.90 £746.35 | +Doncaster: DConnect | £5.00 xxxxx xxxxx xxxxx | £5.00 | £5.00 £17.30 £64.90 £746.35 | +Rotherham: RConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 | £5.00 £17.30 £64.90 £746.35 | ______ ______ _____ | ______ ______ ______ _______ | ______ | ______ ______ ______ ______ | -AllZone: SyConnect | �7.00 �26.00 xxxxx xxxxx | �7.00 | �7.00 �23.50 �88.20 �1014.30| -AllZone: SyConnect +TRain| �8.80 xxxxx xxxxx xxxxx | �8.80 | �8.80 �30.60 �114.60 �1318.00| +AllZone: SyConnect | £7.00 £26.00 xxxxx xxxxx | £7.00 | £7.00 £23.50 £88.20 £1014.30| +AllZone: SyConnect +TRain| £8.80 xxxxx xxxxx xxxxx | £8.80 | £8.80 £30.60 £114.60 £1318.00| ______ ______ _____ | ______ ______ ______ _______ | ______ | ______ ______ ______ ______ | -AllZone: GetAbout | �2.60 �9.00 xxxxx xxxxx | �2.60 | �2.60 �8.30 �33.20 xxxxx | -AllZone: GetAbout +TRain | �4.80 �14.00 xxxxx xxxxx | �4.80 | �4.80 �14.00 �56.00 xxxxx | +AllZone: GetAbout | £2.60 £9.00 xxxxx xxxxx | £2.60 | £2.60 £8.30 £33.20 xxxxx | +AllZone: GetAbout +TRain | £4.80 £14.00 xxxxx xxxxx | £4.80 | £4.80 £14.00 £56.00 xxxxx | ______ ______ _____ | ______ ______ ______ _______ | ______ | ______ ______ ______ ______ | --> @@ -8225,15 +8225,15 @@ FARE ZONE: SHeffield ______ ______ ______ | m-ticket, smartcard | ______ ______ ______ | 1day 1week 28days | ______ ______ ____ _ | ______ ______ ______ | -Sheffield: | �4.00 �13.00 �52.00 | +Sheffield: | £4.00 £13.00 £52.00 | -Sheffield: CityWide + tram | �4.30 �14.80 �55.70 | -Barnsley: BConnect | �4.25 �14.70 �55.10 | -Doncaster: DonConnect | �4.25 �14.70 �55.10 | -Rotherham: RConnect | �4.25 �14.70 �55.10 | +Sheffield: CityWide + tram | £4.30 £14.80 £55.70 | +Barnsley: BConnect | £4.25 £14.70 £55.10 | +Doncaster: DonConnect | £4.25 £14.70 £55.10 | +Rotherham: RConnect | £4.25 £14.70 £55.10 | ______ ______ _____ | ______ ______ ______ | -AllZone: SyConnect | �5.90 �19.90 �74.90 | -AllZone: SyConnect +TRain| �7.40 �26.00 �97.40 | +AllZone: SyConnect | £5.90 £19.90 £74.90 | +AllZone: SyConnect +TRain| £7.40 £26.00 £97.40 | ______ ______ _____ | ______ ______ ______ | @@ -8465,18 +8465,18 @@ ______ ______ ______ | 1day 1week 28days 1year | day 1week 28days 1year | TravelMaster pass | | | | ______ ______ ____ _ | ______ ______ ______ _______ | ______ ______ ______ ______ | -Sheffield: CityBus | �4.70 �17.50 xxxxx xxxxx | �4.70 �16.30 �61.20 �703.84 | +Sheffield: CityBus | £4.70 £17.50 xxxxx xxxxx | £4.70 £16.30 £61.20 £703.84 | -Sheffield: CityWide + tram | �5.10 �17.50 xxxxx xxxxx | �5.10 �17.50 �65.60 �754.40 | -Barnsley: BConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | -Doncaster: DConnect | �5.00 xxxxx xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | -Rotherham: RConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | +Sheffield: CityWide + tram | £5.10 £17.50 xxxxx xxxxx | £5.10 £17.50 £65.60 £754.40 | +Barnsley: BConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | +Doncaster: DConnect | £5.00 xxxxx xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | +Rotherham: RConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -AllZone: SyConnect | �7.00 �26.00 xxxxx xxxxx | �7.00 �23.50 �88.20 �1014.30| -AllZone: SyConnect +TRain| �8.80 xxxxx xxxxx xxxxx | �8.80 �30.60 �114.60 �1318.00| +AllZone: SyConnect | £7.00 £26.00 xxxxx xxxxx | £7.00 £23.50 £88.20 £1014.30| +AllZone: SyConnect +TRain| £8.80 xxxxx xxxxx xxxxx | £8.80 £30.60 £114.60 £1318.00| ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -AllZone: Getabout | �2.60 �9.00 xxxxx xxxxx | �2.60 �8.30 �33.20 xxxxx| -AllZone: Getabout +TRain | �4.80 �14.00 xxxxx xxxxx | �4.80 �14.00 �56.00 xxxxx| +AllZone: Getabout | £2.60 £9.00 xxxxx xxxxx | £2.60 £8.30 £33.20 xxxxx| +AllZone: Getabout +TRain | £4.80 £14.00 xxxxx xxxxx | £4.80 £14.00 £56.00 xxxxx| ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | --> @@ -8516,10 +8516,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ Sheffield CityBus @@ -8669,10 +8669,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -8823,10 +8823,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -8975,10 +8975,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ Doncaster DConnect @@ -9120,10 +9120,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -9273,10 +9273,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -9426,10 +9426,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -9571,9 +9571,9 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -9702,9 +9702,9 @@ AllZone: Getabout @@ -9838,15 +9838,15 @@ FARE ZONE: SHeffield ______ ______ ______ | off vehicle | ______ ______ ______ | 1day 1week 28days | ______ ______ ____ _ | ______ ______ ______ | -Sheffield: CityBus | �4.00 �13.00 �52.00 | +Sheffield: CityBus | £4.00 £13.00 £52.00 | -Sheffield: CityWide + tram | �4.30 �14.80 �55.70 | -Barnsley: BConnect | �4.25 �14.70 �55.10 | -Doncaster: DonConnect | �4.25 �14.70 �55.10 | -Rotherham: RConnect | �4.25 �14.70 �55.10 | +Sheffield: CityWide + tram | £4.30 £14.80 £55.70 | +Barnsley: BConnect | £4.25 £14.70 £55.10 | +Doncaster: DonConnect | £4.25 £14.70 £55.10 | +Rotherham: RConnect | £4.25 £14.70 £55.10 | ______ ______ _____ | ______ ______ ______ | -AllZone: SyConnect | �5.90 �19.90 �74.90 | -AllZone: SyConnect +TRain| �7.40 �26.00 �97.40 | +AllZone: SyConnect | £5.90 £19.90 £74.90 | +AllZone: SyConnect +TRain| £7.40 £26.00 £97.40 | ______ ______ _____ | ______ ______ ______ | @@ -9886,9 +9886,9 @@ ______ ______ _____ | ______ ______ ______ | @@ -9997,9 +9997,9 @@ Sheffield: CityBus @@ -10108,9 +10108,9 @@ Sheffield: CityWide + tram @@ -10220,9 +10220,9 @@ Barnsley: BConnect @@ -10331,9 +10331,9 @@ Doncaster: DConnect @@ -10442,9 +10442,9 @@ Rotherham: RConnect @@ -10553,9 +10553,9 @@ AllZone: SyConnect @@ -10687,18 +10687,18 @@ ______ ______ ______ | 1day 1week 28days 1year | day 1week 28days 1year | TravelMaster pass | | | | ______ ______ ____ _ | ______ ______ ______ _______ | ______ ______ ______ ______ | -Sheffield: CityBus | �4.70 �17.50 xxxxx xxxxx | �4.70 �16.30 �61.20 �703.84 | +Sheffield: CityBus | £4.70 £17.50 xxxxx xxxxx | £4.70 £16.30 £61.20 £703.84 | -Sheffield: CityWide + tram | �5.10 �17.50 xxxxx xxxxx | �5.10 �17.50 �65.60 �754.40 | -Barnsley: BConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | -Doncaster: DConnect | �5.00 xxxxx xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | -Rotherham: RConnect | �5.00 �18.50 xxxxx xxxxx | �5.00 �17.30 �64.90 �746.35 | +Sheffield: CityWide + tram | £5.10 £17.50 xxxxx xxxxx | £5.10 £17.50 £65.60 £754.40 | +Barnsley: BConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | +Doncaster: DConnect | £5.00 xxxxx xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | +Rotherham: RConnect | £5.00 £18.50 xxxxx xxxxx | £5.00 £17.30 £64.90 £746.35 | ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -AllZone: SyConnect | �7.00 �26.00 xxxxx xxxxx | �7.00 �23.50 �88.20 �1014.30| -AllZone: SyConnect +TRain| �8.80 xxxxx xxxxx xxxxx | �8.80 �30.60 �114.60 �1318.00| +AllZone: SyConnect | £7.00 £26.00 xxxxx xxxxx | £7.00 £23.50 £88.20 £1014.30| +AllZone: SyConnect +TRain| £8.80 xxxxx xxxxx xxxxx | £8.80 £30.60 £114.60 £1318.00| ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | -AllZone: Getabout | �2.60 �9.00 xxxxx xxxxx | �2.60 �8.30 �33.20 xxxxx| -AllZone: Getabout +TRain | �4.80 �14.00 xxxxx xxxxx | �4.80 �14.00 �56.00 xxxxx| +AllZone: Getabout | £2.60 £9.00 xxxxx xxxxx | £2.60 £8.30 £33.20 xxxxx| +AllZone: Getabout +TRain | £4.80 £14.00 xxxxx xxxxx | £4.80 £14.00 £56.00 xxxxx| ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______ | --> @@ -10714,10 +10714,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -10770,10 +10770,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -10825,10 +10825,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -10880,10 +10880,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -10927,10 +10927,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -10982,10 +10982,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -11037,10 +11037,10 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -11089,9 +11089,9 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ _____ @@ -11136,9 +11136,9 @@ AllZone: Getabout @@ -11192,15 +11192,15 @@ FARE ZONE: SHeffield ______ ______ ______ | off vehicle | ______ ______ ______ | 1day 1week 28days | ______ ______ ____ _ | ______ ______ ______ | -Sheffield: CityBus | �4.00 �13.00 �52.00 | +Sheffield: CityBus | £4.00 £13.00 £52.00 | -Sheffield: CityWide + tram | �4.30 �14.80 �55.70 | -Barnsley: BConnect | �4.25 �14.70 �55.10 | -Doncaster: DonConnect | �4.25 �14.70 �55.10 | -Rotherham: RConnect | �4.25 �14.70 �55.10 | +Sheffield: CityWide + tram | £4.30 £14.80 £55.70 | +Barnsley: BConnect | £4.25 £14.70 £55.10 | +Doncaster: DonConnect | £4.25 £14.70 £55.10 | +Rotherham: RConnect | £4.25 £14.70 £55.10 | ______ ______ _____ | ______ ______ ______ | -AllZone: SyConnect | �5.90 �19.90 �74.90 | -AllZone: SyConnect +TRain| �7.40 �26.00 �97.40 | +AllZone: SyConnect | £5.90 £19.90 £74.90 | +AllZone: SyConnect +TRain| £7.40 £26.00 £97.40 | ______ ______ _____ | ______ ______ ______ | @@ -11224,9 +11224,9 @@ ______ ______ _____ | ______ ______ ______ | Sheffield CityBus @@ -11261,9 +11261,9 @@ Sheffield: CityBus @@ -11297,9 +11297,9 @@ Sheffield: CityWide + tram @@ -11334,9 +11334,9 @@ Barnsley: BConnect @@ -11370,9 +11370,9 @@ Doncaster: DConnect @@ -11406,9 +11406,9 @@ Rotherham: RConnect @@ -11442,9 +11442,9 @@ AllZone: SyConnect diff --git a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml index 817777d3d..3b2cf693c 100644 --- a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml +++ b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml @@ -1,4 +1,4 @@ - + @@ -62,7 +62,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH @@ -73,7 +73,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH 22210 @@ -153,7 +153,7 @@ true - M�rby + Mörby 90 @@ -244,7 +244,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH 22210-2 diff --git a/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml b/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml index 3ed5eecaa..5a9fb688e 100644 --- a/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml +++ b/examples/standards/noptis/Netex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml @@ -1,7 +1,7 @@ - + + IFOPT representation of Tekniska Högskolan which is used for Bus and Metro in Stockholm (reduced) --> 2001-12-17T09:30:47.0Z SYS001 @@ -47,7 +47,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH @@ -58,7 +58,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH 22210 @@ -183,7 +183,7 @@ true - M�rby + Mörby 90 @@ -274,7 +274,7 @@ - Tekniska h�gskolan + Tekniska högskolan TEH 22210-2 diff --git a/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml b/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml index 700f24da6..e59970b67 100644 --- a/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml +++ b/examples/standards/norway/Full_PublicationDelivery_109_Oslo_morningbus_example.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/standards/norway/schedule/ServiceCalendar-DayType-AvailabilityCondition.xml b/examples/standards/norway/schedule/ServiceCalendar-DayType-AvailabilityCondition.xml index 036e3a6a8..c7c802578 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-DayType-AvailabilityCondition.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-DayType-AvailabilityCondition.xml @@ -1,4 +1,4 @@ - + 2016-06-28T12:00:00.0Z diff --git a/examples/standards/norway/schedule/ServiceCalendar-DayTypeAssignments.xml b/examples/standards/norway/schedule/ServiceCalendar-DayTypeAssignments.xml index 3f81232da..67eb1071b 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-DayTypeAssignments.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-DayTypeAssignments.xml @@ -1,4 +1,4 @@ - + 2016-06-28T12:00:00.0Z diff --git a/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods-with-exceptions.xml b/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods-with-exceptions.xml index 690872b6d..b4326a643 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods-with-exceptions.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods-with-exceptions.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods.xml b/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods.xml index 6ad706b99..023160447 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-OperatingPeriods.xml @@ -1,4 +1,4 @@ - + 2016-06-28T12:00:00.0Z diff --git a/examples/standards/norway/schedule/ServiceCalendar-calendar-ref.xml b/examples/standards/norway/schedule/ServiceCalendar-calendar-ref.xml index d26e55a05..5886000ea 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-calendar-ref.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-calendar-ref.xml @@ -1,4 +1,4 @@ - + 2016-06-28T12:00:00.0Z diff --git a/examples/standards/norway/schedule/ServiceCalendar-example.xml b/examples/standards/norway/schedule/ServiceCalendar-example.xml index d5eb7ff6b..78d8899e1 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-example.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-example.xml @@ -1,4 +1,4 @@ - + 2016-06-28T12:00:00.0Z diff --git a/examples/standards/norway/schedule/ServiceCalendar-test.xml b/examples/standards/norway/schedule/ServiceCalendar-test.xml index 9b5b3474f..cc125113a 100644 --- a/examples/standards/norway/schedule/ServiceCalendar-test.xml +++ b/examples/standards/norway/schedule/ServiceCalendar-test.xml @@ -1,4 +1,4 @@ - + 2017-01-02T12:00:00.0Z diff --git a/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml b/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml index cb6c476df..4afdc320a 100644 --- a/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml +++ b/examples/standards/norway/stops/BasicIndoorStopPlace_example.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/standards/nta/NeTEx-Export Example.xml b/examples/standards/nta/NeTEx-Export Example.xml index 8580ae9bb..2ee18760e 100644 --- a/examples/standards/nta/NeTEx-Export Example.xml +++ b/examples/standards/nta/NeTEx-Export Example.xml @@ -1,4 +1,4 @@ - + 2012-10-25T13:53:18.0811912Z SYS0001 diff --git a/examples/standards/tap_tsi/B1_NRT/Netex_sncf_b1_1.xml b/examples/standards/tap_tsi/B1_NRT/Netex_sncf_b1_1.xml index 383e39b77..8d8dcb290 100644 --- a/examples/standards/tap_tsi/B1_NRT/Netex_sncf_b1_1.xml +++ b/examples/standards/tap_tsi/B1_NRT/Netex_sncf_b1_1.xml @@ -1,4 +1,4 @@ - + @@ -147,7 +147,7 @@ The example shows the usage of special fares for - Brussels - K�ln + Brussels - Köln diff --git a/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml b/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml index f892be511..e5829adb2 100644 --- a/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml +++ b/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml @@ -1,4 +1,4 @@ - + @@ -114,7 +114,7 @@ The example shows the usage of special fares for - Brussels - K�ln + Brussels - Köln diff --git a/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml b/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml index c38fdbdd5..b3553008b 100644 --- a/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml +++ b/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml @@ -1,4 +1,4 @@ - + @@ -70,7 +70,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. breakfast lunch @@ -81,7 +81,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. breakfast @@ -102,7 +102,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - L et N = En Classe Single et Double " Affaires ", le petit d�jeuner est inclus. + L et N = En Classe Single et Double " Affaires ", le petit déjeuner est inclus. Double Affaires @@ -113,7 +113,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - R = En cabine Classe Touriste, compartiment exclusivement d�di� aux personnes du m�me sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est enti�rement r�serv�e et devient dans ce cas compartiment Famille . + R = En cabine Classe Touriste, compartiment exclusivement dédié aux personnes du même sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est entièrement réservée et devient dans ce cas compartiment Famille . T4 Touriste @@ -125,7 +125,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - P = Cabine Classe Touriste occup�e uniquement par 2 personnes qui se connaissent. Sur Mosa�que+ dans saisie type de lit , s�lectionner T2 et dans " compartiment , s�lectionner Famille . . + P = Cabine Classe Touriste occupée uniquement par 2 personnes qui se connaissent. Sur Mosaïque+ dans saisie type de lit , sélectionner T2 et dans " compartiment , sélectionner Famille . . T4 Touriste @@ -138,7 +138,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Si�ges Super inclinables + Sièges Super inclinables recliningSeats @@ -159,7 +159,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Gamme de prix ELIPSOS Trainh�tel + Gamme de prix ELIPSOS Trainhôtel @@ -184,78 +184,78 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - L_�change des billets �mis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orl�ans et Limoges. + L_échange des billets émis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orléans et Limoges. - L'�change ou le remboursement s'effectue jusqu'� H (Heure de d�part du train). + L'échange ou le remboursement s'effectue jusqu'à H (Heure de départ du train). - En classe P, les enfants de moins de 4 ans et de 4 � 12 ans ne peuvent pas partager un lit. N�anmoins, une des deux personnes partageant la cabine peut �tre un enfant occupant un lit. Il est alors consid�r� comme la 2e personne pour b�n�ficier de ce tarif. + En classe P, les enfants de moins de 4 ans et de 4 à 12 ans ne peuvent pas partager un lit. Néanmoins, une des deux personnes partageant la cabine peut être un enfant occupant un lit. Il est alors considéré comme la 2e personne pour bénéficier de ce tarif. - Sur Mosa�que +, indiquez toujours 4 personnes m�me si la cabine est occup�e par 3 voyageurs. + Sur Mosaïque +, indiquez toujours 4 personnes même si la cabine est occupée par 3 voyageurs. - Tarif propos� �galement aux titulaires de la carte ISIC (International Student Identity Card) sans condition d'�ge, ainsi qu_aux porteurs de la carte Carnet Jove �g�s de 14 � moins de 30 ans. + Tarif proposé également aux titulaires de la carte ISIC (International Student Identity Card) sans condition d'âge, ainsi qu_aux porteurs de la carte Carnet Jove âgés de 14 à moins de 30 ans. - Eurail Global Pass, Eurail Select Pass (incluant au moins un des pays concern�s par le trajet du train), Eurail France - Italy Pass,Eurail France-Switzerland Pass, Eurail France-Spain Pass, Eurail Italy-Spain Pass, Eurail Spain Pass, France Rail Pass, Eurail Portugal - Spain Pass, Eurail Benelux - France Pass, Eurail France-Germany Pass, InterRail Global Pass, InterRail Spain Pass,InterRail France Pass. - Uniquement sur les OD du Trainh�tel Pau Casals (Barcelone - Zurich) : Swiss Pass, Eurail Austria - Switzerland Pass, Eurail Germany - Switzerland Pass, InterRail Swiss Pass et uniquement sur les OD du Trainh�tel Salvador Dali (Barcelone - Milan) : InterRail Italy Pass, Eurail Italy Pass, Eurail Greece - Italy Pass. + Eurail Global Pass, Eurail Select Pass (incluant au moins un des pays concernés par le trajet du train), Eurail France - Italy Pass,Eurail France-Switzerland Pass, Eurail France-Spain Pass, Eurail Italy-Spain Pass, Eurail Spain Pass, France Rail Pass, Eurail Portugal - Spain Pass, Eurail Benelux - France Pass, Eurail France-Germany Pass, InterRail Global Pass, InterRail Spain Pass,InterRail France Pass. + Uniquement sur les OD du Trainhôtel Pau Casals (Barcelone - Zurich) : Swiss Pass, Eurail Austria - Switzerland Pass, Eurail Germany - Switzerland Pass, InterRail Swiss Pass et uniquement sur les OD du Trainhôtel Salvador Dali (Barcelone - Milan) : InterRail Italy Pass, Eurail Italy Pass, Eurail Greece - Italy Pass. - Le client a acc�s � toutes les classes de service ind�pendamment de son type de Pass ou sa carte FIP (1re/2e). Pour le FIP Service : Carte FIP + ordre de mission � pr�senter au point de vente habilit�. + Le client a accès à toutes les classes de service indépendamment de son type de Pass ou sa carte FIP (1re/2e). Pour le FIP Service : Carte FIP + ordre de mission à présenter au point de vente habilité. - Pour un enfant de 4 � moins de 12 ans, �mettre un billet ouvert en 2e classe en pr�cisant le point fronti�re (Port Bou fronti�re sur les relations Paris/Barcelone, Barcelone/Milan ou Barcelone/Zurich et Hendaye fronti�re sur la relation Paris/Madrid). L'enfant de moins de 4 ans voyage gratuitement et partage le lit de la personne qui l'accompagne � condition que la cabine soit enti�rement r�serv�e. + Pour un enfant de 4 à moins de 12 ans, émettre un billet ouvert en 2e classe en précisant le point frontière (Port Bou frontière sur les relations Paris/Barcelone, Barcelone/Milan ou Barcelone/Zurich et Hendaye frontière sur la relation Paris/Madrid). L'enfant de moins de 4 ans voyage gratuitement et partage le lit de la personne qui l'accompagne à condition que la cabine soit entièrement réservée. - Les animaux domestiques de petite taille doivent �tre transport�s dans un contenant (taille maximale 60x35x35). �mettre un billet ouvert en 2e classe en pr�cisant le point fronti�re*. Les chiens "guide d'aveugle ou d'assistance" sont gratuits (pas d'�mission de billet). + Les animaux domestiques de petite taille doivent être transportés dans un contenant (taille maximale 60x35x35). Émettre un billet ouvert en 2e classe en précisant le point frontière*. Les chiens "guide d'aveugle ou d'assistance" sont gratuits (pas d'émission de billet). - Condition non exig�e pour les chiens "guide d'aveugle ou d'assistance". En cas d'opposition des autres voyageurs � la pr�sence du chien, le personnel essaiera de trouver, dans la mesure du possible, une solution de reclassement. + Condition non exigée pour les chiens "guide d'aveugle ou d'assistance". En cas d'opposition des autres voyageurs à la présence du chien, le personnel essaiera de trouver, dans la mesure du possible, une solution de reclassement. - Pour effectuer une vente en cabine double Grande Classe au tarif Senior associ� au tarif Guide Handicap�, le dossier doit �tre constitu� sur Mosa�que classique (Pav� Accueil > Informations). + Pour effectuer une vente en cabine double Grande Classe au tarif Senior associé au tarif Guide Handicapé, le dossier doit être constitué sur Mosaïque classique (Pavé Accueil > Informations). - Trainh�tel No 409/407 (quotidien) + Trainhôtel No 409/407 (quotidien) - Trainh�tel No 477/475 (quotidien) + Trainhôtel No 477/475 (quotidien) - Trainh�tel No 11273/273 (circulation le mardi, jeudi et dimanche dans le sens Sud -> Nord (Barcelone Milan et Zurich) + Trainhôtel No 11273/273 (circulation le mardi, jeudi et dimanche dans le sens Sud -> Nord (Barcelone Milan et Zurich) - Trainh�tel No 11274/274 (circulation le lundi, mercredi et vendredi dans le sens Nord -> Sud (Milan et Zurich Barcelone) + Trainhôtel No 11274/274 (circulation le lundi, mercredi et vendredi dans le sens Nord -> Sud (Milan et Zurich Barcelone) - La cabine Double Grande Classe et la cabine Double Affaires doivent �tre utilis�es uniquement par deux personnes qui se connaissent (r�server en compartiment " Famille "). + La cabine Double Grande Classe et la cabine Double Affaires doivent être utilisées uniquement par deux personnes qui se connaissent (réserver en compartiment " Famille "). - Carte FIP + ordre de mission � pr�senter au poste de vente habilit�. + Carte FIP + ordre de mission à présenter au poste de vente habilité. - IMPORTANT ! Lors d_une vente, pour toute difficult� li�e � HERMES, veuillez contacter l_Assistance Gares au 30 40 50 ou 01 56 79 61 50. + IMPORTANT ! Lors d_une vente, pour toute difficulté liée à HERMES, veuillez contacter l_Assistance Gares au 30 40 50 ou 01 56 79 61 50. - P = Cabine Classe Touriste occup�e uniquement par 2 personnes qui se connaissent. Sur Mosa�que+ dans " saisie type de lit ", s�lectionner T2 et dans " compartiment ", s�lectionner " Famille ". + P = Cabine Classe Touriste occupée uniquement par 2 personnes qui se connaissent. Sur Mosaïque+ dans " saisie type de lit ", sélectionner T2 et dans " compartiment ", sélectionner " Famille ". - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. - L et N = En Classe Single et Double " Affaires ", le petit d�jeuner est inclus. + L et N = En Classe Single et Double " Affaires ", le petit déjeuner est inclus. - R = En cabine Classe Touriste, compartiment exclusivement d�di� aux personnes du m�me sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est enti�rement r�serv�e et devient dans ce cas compartiment " Famille ". + R = En cabine Classe Touriste, compartiment exclusivement dédié aux personnes du même sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est entièrement réservée et devient dans ce cas compartiment " Famille ". - Le Trainh�tel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination. + Le Trainhôtel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination. - La r�servation est ouverte � J-3 mois et jusqu_au d�part du Trainh�tel. La r�servation reste obligatoire. + La réservation est ouverte à J-3 mois et jusqu_au départ du Trainhôtel. La réservation reste obligatoire. @@ -315,7 +315,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Madrid Chamartin - Barcelone Fran�a + Barcelone França Zurich @@ -326,8 +326,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel FRANCISCO DE GOYA - Paris Austerlitz _ Les Aubrais - Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel FRANCISCO DE GOYA + Paris Austerlitz _ Les Aubrais - Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -359,8 +359,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel JOAN MIRO - Paris Austerlitz _ Les Aubrais _ Orl�ans _ Limoges � destination de Figueras _ G�rone et Barcelone Fran�a + Trainhôtel JOAN MIRO + Paris Austerlitz _ Les Aubrais _ Orléans _ Limoges à destination de Figueras _ Gérone et Barcelone França @@ -380,8 +380,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - - + + @@ -389,14 +389,14 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel PAU CASALS - Au d�part de Barcelone Fran�a _ G�rone, Figureras _ Perpignan � destination de Gen�ve _ Lausanne _ Fribourg _ Bern et Zurich + Trainhôtel PAU CASALS + Au départ de Barcelone França _ Gérone, Figureras _ Perpignan à destination de Genève _ Lausanne _ Fribourg _ Bern et Zurich - - + + @@ -422,14 +422,14 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel SALVADOR DALI - Au d�part de Barcelone Fran�a _ G�rone _ Figueras _ Perpignan � destination de Bardonecchia _ Torino _ Novara et Milano + Trainhôtel SALVADOR DALI + Au départ de Barcelone França _ Gérone _ Figueras _ Perpignan à destination de Bardonecchia _ Torino _ Novara et Milano - - + + @@ -455,13 +455,13 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue P29D @@ -478,11 +478,11 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue @@ -522,8 +522,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel FRANCISCO DE GOYA - Au d�part de Paris Austerlitz _ Les Aubrais-Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel FRANCISCO DE GOYA + Au départ de Paris Austerlitz _ Les Aubrais-Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -1729,8 +1729,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel JOAN MIRO - Au d�part de Paris Austerlitz _ Les Aubrais-Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel JOAN MIRO + Au départ de Paris Austerlitz _ Les Aubrais-Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -2936,8 +2936,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel PAU CASALS (PRICES NOT YET ADDED) - Au d�part de Barcelone Fran�a _ G�rone, Figureras _ Perpignan � destination de Gen�ve _ Lausanne _ Fribourg _ Bern et Zurich + Trainhôtel PAU CASALS (PRICES NOT YET ADDED) + Au départ de Barcelone França _ Gérone, Figureras _ Perpignan à destination de Genève _ Lausanne _ Fribourg _ Bern et Zurich @@ -3007,8 +3007,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Trainh�tel SALVADOR DALI (PRICES NOT YET ADDED) - Au d�part de Barcelone Fran�a _ G�rone _ Figueras _ Perpignan � destination de Bardonecchia _ Torino _ Novara et Milano + Trainhôtel SALVADOR DALI (PRICES NOT YET ADDED) + Au départ de Barcelone França _ Gérone _ Figueras _ Perpignan à destination de Bardonecchia _ Torino _ Novara et Milano @@ -3095,14 +3095,14 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Enfant - Enfants de 4 � moins de 12 ans le jour du voyage + Enfants de 4 à moins de 12 ans le jour du voyage 4 111 Enfant partegeant un lit - Cabine enti�rement r�serv�e. Compartiment Famille + Cabine entièrement réservée. Compartiment Famille @@ -3127,7 +3127,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Animaux domestiques - Cabine enti�rement r�serv�e (10). Compartiment famille + Cabine entièrement réservée (10). Compartiment famille @@ -3144,12 +3144,12 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG FIP Service - Sur pr�sentation de la Carte FIP + Sur présentation de la Carte FIP Congress Salons - Sur pr�sentation d_un justificatif � dates sp�cifiques (mail de confirmation ou billet d_entr�e) + Sur présentation d_un justificatif à dates spécifiques (mail de confirmation ou billet d_entrée) @@ -3159,14 +3159,14 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Mini a Deux - Achat jusqu_� J-14. Places limit�es. 2 personnes voyageant ensemble + Achat jusqu_à J-14. Places limitées. 2 personnes voyageant ensemble 2 2 Duo (prix pour 2) - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment Famille sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment Famille sauf en classe A @@ -3180,14 +3180,14 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Espace Plus (prix pour 4) - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment Famille sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment Famille sauf en classe A 4 4 Group ticket - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) @@ -3197,8 +3197,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG 12 - Group Handicap� - L_handicap� ou l_aveugle doivent �tre titulaire d_une carte d_invalidit�. Pour un handicap� en fauteuil roulant, celui-ci doit �tre pliable. + Group Handicapé + L_handicapé ou l_aveugle doivent être titulaire d_une carte d_invalidité. Pour un handicapé en fauteuil roulant, celui-ci doit être pliable. @@ -3216,13 +3216,13 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG true - Le Trainh�tel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination + Le Trainhôtel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination rail rail false - Achat jusqu_� J-14. Places limit�es. + Achat jusqu_à J-14. Places limitées. P14D @@ -3230,7 +3230,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG none - Oui jusqu_� H (2) du voyage aller + Oui jusqu_à H (2) du voyage aller @@ -3250,7 +3250,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG PT2H - Jusqu_� J-30 avec 20% de retenue; De J-29 � J-8 avec 30% de retenue; + Jusqu_à J-30 avec 20% de retenue; De J-29 à J-8 avec 30% de retenue; @@ -3285,7 +3285,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG none - Oui jusqu_� H (2) du voyage aller + Oui jusqu_à H (2) du voyage aller @@ -3320,7 +3320,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG anyTime - PremsOui jusqu_� H (2) du voyage aller + PremsOui jusqu_à H (2) du voyage aller @@ -3344,7 +3344,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG PT2H - Jusqu_� J-30 avec 20% de retenue; De J-29 � J-8 avec 30% de retenue; + Jusqu_à J-30 avec 20% de retenue; De J-29 à J-8 avec 30% de retenue; @@ -3374,7 +3374,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG beforeStartOfValidity - La r�servation reste obligatoire + La réservation reste obligatoire reservationsCompulsory @@ -3384,7 +3384,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG true - La r�servation est ouverte � J-3 mois et jusqu_au d�part du Trainh�tel. + La réservation est ouverte à J-3 mois et jusqu_au départ du Trainhôtel. @@ -3573,7 +3573,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Enfant - Enfants de 4 � moins de 12 ans le jour du voyage + Enfants de 4 à moins de 12 ans le jour du voyage PT0012 @@ -3632,7 +3632,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Prems - Achat jusqu_� J-14. Places limit�es. + Achat jusqu_à J-14. Places limitées. PP05AD @@ -3671,7 +3671,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG MiniADeux - SAchat jusqu_� J-14. Places limit�es. 2 personnes voyageant ensemble + SAchat jusqu_à J-14. Places limitées. 2 personnes voyageant ensemble PP05AD @@ -3711,7 +3711,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Duo - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment "Famille" sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment "Famille" sauf en classe A @@ -3807,7 +3807,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Jeune - De 12 � moins de 26 ans le jour du voyage + De 12 à moins de 26 ans le jour du voyage @@ -3871,8 +3871,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Congr�s _ Salons - Sur pr�sentation d_un justificatif � dates sp�cifiques (mail de confirmation ou billet d_entr�e) + Congrès _ Salons + Sur présentation d_un justificatif à dates spécifiques (mail de confirmation ou billet d_entrée) CN20AD @@ -3933,7 +3933,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Groupe Adulte (TS) - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) GR00AD @@ -3973,7 +3973,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Groupe Adulte (TS) - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) GR02AD @@ -3992,8 +3992,8 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Guide d_handicap� ou d_aveugle - L_handicap� ou l_aveugle doivent �tre titulaire d_une carte d_invalidit�. Pour un handicap� en fauteuil roulant, celui-ci doit �tre pliable. + Guide d_handicapé ou d_aveugle + L_handicapé ou l_aveugle doivent être titulaire d_une carte d_invalidité. Pour un handicapé en fauteuil roulant, celui-ci doit être pliable. @@ -4058,7 +4058,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG FIP Service - Sur pr�sentation de la Carte FIP + Sur présentation de la Carte FIP @@ -4101,7 +4101,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Enfant Partegeant Un Lit - Cabine enti�rement r�serv�e. Compartiment " Famille " + Cabine entièrement réservée. Compartiment " Famille " @@ -4141,7 +4141,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG Animaux domestiques - Cabine enti�rement r�serv�e (10). Compartiment "famille" + Cabine entièrement réservée (10). Compartiment "famille" @@ -4188,12 +4188,12 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue @@ -4216,7 +4216,7 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG - + @@ -4228,9 +4228,9 @@ This variation uses multiple FARE PRODUCT products and a single SALES PACKAG gares De Remboursement - L_�change des billets �mis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du -Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orl�ans et Limoges. -(2) L'�change ou le remboursement s'effectue jusqu'� H (Heure de d�part du train). + L_échange des billets émis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du +Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orléans et Limoges. +(2) L'échange ou le remboursement s'effectue jusqu'à H (Heure de départ du train). exchange refund atStop @@ -4335,7 +4335,7 @@ Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les senior - Handicap� + Handicapé Animale @@ -4417,7 +4417,7 @@ Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les TypeOfFareProduct - Trainh�tel + Trainhôtel diff --git a/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_SalesPackage_2.xml b/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_SalesPackage_2.xml index 33741f6b5..f9d616937 100644 --- a/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_SalesPackage_2.xml +++ b/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_SalesPackage_2.xml @@ -1,4 +1,4 @@ - + @@ -104,7 +104,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. breakfast lunch @@ -115,7 +115,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. breakfast @@ -136,7 +136,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - L et N = En Classe Single et Double " Affaires ", le petit d�jeuner est inclus. + L et N = En Classe Single et Double " Affaires ", le petit déjeuner est inclus. Double Affaires @@ -147,7 +147,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - R = En cabine Classe Touriste, compartiment exclusivement d�di� aux personnes du m�me sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est enti�rement r�serv�e et devient dans ce cas compartiment Famille . + R = En cabine Classe Touriste, compartiment exclusivement dédié aux personnes du même sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est entièrement réservée et devient dans ce cas compartiment Famille . T4 Touriste @@ -159,7 +159,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - P = Cabine Classe Touriste occup�e uniquement par 2 personnes qui se connaissent. Sur Mosa�que+ dans saisie type de lit , s�lectionner T2 et dans " compartiment , s�lectionner Famille . . + P = Cabine Classe Touriste occupée uniquement par 2 personnes qui se connaissent. Sur Mosaïque+ dans saisie type de lit , sélectionner T2 et dans " compartiment , sélectionner Famille . . T4 Touriste @@ -172,7 +172,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Si�ges Super inclinables + Sièges Super inclinables recliningSeats @@ -193,7 +193,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Gamme de prix ELIPSOS Trainh�tel + Gamme de prix ELIPSOS Trainhôtel @@ -218,78 +218,78 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - L_�change des billets �mis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orl�ans et Limoges. + L_échange des billets émis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orléans et Limoges. - L'�change ou le remboursement s'effectue jusqu'� H (Heure de d�part du train). + L'échange ou le remboursement s'effectue jusqu'à H (Heure de départ du train). - En classe P, les enfants de moins de 4 ans et de 4 � 12 ans ne peuvent pas partager un lit. N�anmoins, une des deux personnes partageant la cabine peut �tre un enfant occupant un lit. Il est alors consid�r� comme la 2e personne pour b�n�ficier de ce tarif. + En classe P, les enfants de moins de 4 ans et de 4 à 12 ans ne peuvent pas partager un lit. Néanmoins, une des deux personnes partageant la cabine peut être un enfant occupant un lit. Il est alors considéré comme la 2e personne pour bénéficier de ce tarif. - Sur Mosa�que +, indiquez toujours 4 personnes m�me si la cabine est occup�e par 3 voyageurs. + Sur Mosaïque +, indiquez toujours 4 personnes même si la cabine est occupée par 3 voyageurs. - Tarif propos� �galement aux titulaires de la carte ISIC (International Student Identity Card) sans condition d'�ge, ainsi qu_aux porteurs de la carte Carnet Jove �g�s de 14 � moins de 30 ans. + Tarif proposé également aux titulaires de la carte ISIC (International Student Identity Card) sans condition d'âge, ainsi qu_aux porteurs de la carte Carnet Jove âgés de 14 à moins de 30 ans. - Eurail Global Pass, Eurail Select Pass (incluant au moins un des pays concern�s par le trajet du train), Eurail France - Italy Pass,Eurail France-Switzerland Pass, Eurail France-Spain Pass, Eurail Italy-Spain Pass, Eurail Spain Pass, France Rail Pass, Eurail Portugal - Spain Pass, Eurail Benelux - France Pass, Eurail France-Germany Pass, InterRail Global Pass, InterRail Spain Pass,InterRail France Pass. - Uniquement sur les OD du Trainh�tel Pau Casals (Barcelone - Zurich) : Swiss Pass, Eurail Austria - Switzerland Pass, Eurail Germany - Switzerland Pass, InterRail Swiss Pass et uniquement sur les OD du Trainh�tel Salvador Dali (Barcelone - Milan) : InterRail Italy Pass, Eurail Italy Pass, Eurail Greece - Italy Pass. + Eurail Global Pass, Eurail Select Pass (incluant au moins un des pays concernés par le trajet du train), Eurail France - Italy Pass,Eurail France-Switzerland Pass, Eurail France-Spain Pass, Eurail Italy-Spain Pass, Eurail Spain Pass, France Rail Pass, Eurail Portugal - Spain Pass, Eurail Benelux - France Pass, Eurail France-Germany Pass, InterRail Global Pass, InterRail Spain Pass,InterRail France Pass. + Uniquement sur les OD du Trainhôtel Pau Casals (Barcelone - Zurich) : Swiss Pass, Eurail Austria - Switzerland Pass, Eurail Germany - Switzerland Pass, InterRail Swiss Pass et uniquement sur les OD du Trainhôtel Salvador Dali (Barcelone - Milan) : InterRail Italy Pass, Eurail Italy Pass, Eurail Greece - Italy Pass. - Le client a acc�s � toutes les classes de service ind�pendamment de son type de Pass ou sa carte FIP (1re/2e). Pour le FIP Service : Carte FIP + ordre de mission � pr�senter au point de vente habilit�. + Le client a accès à toutes les classes de service indépendamment de son type de Pass ou sa carte FIP (1re/2e). Pour le FIP Service : Carte FIP + ordre de mission à présenter au point de vente habilité. - Pour un enfant de 4 � moins de 12 ans, �mettre un billet ouvert en 2e classe en pr�cisant le point fronti�re (Port Bou fronti�re sur les relations Paris/Barcelone, Barcelone/Milan ou Barcelone/Zurich et Hendaye fronti�re sur la relation Paris/Madrid). L'enfant de moins de 4 ans voyage gratuitement et partage le lit de la personne qui l'accompagne � condition que la cabine soit enti�rement r�serv�e. + Pour un enfant de 4 à moins de 12 ans, émettre un billet ouvert en 2e classe en précisant le point frontière (Port Bou frontière sur les relations Paris/Barcelone, Barcelone/Milan ou Barcelone/Zurich et Hendaye frontière sur la relation Paris/Madrid). L'enfant de moins de 4 ans voyage gratuitement et partage le lit de la personne qui l'accompagne à condition que la cabine soit entièrement réservée. - Les animaux domestiques de petite taille doivent �tre transport�s dans un contenant (taille maximale 60x35x35). �mettre un billet ouvert en 2e classe en pr�cisant le point fronti�re*. Les chiens "guide d'aveugle ou d'assistance" sont gratuits (pas d'�mission de billet). + Les animaux domestiques de petite taille doivent être transportés dans un contenant (taille maximale 60x35x35). Émettre un billet ouvert en 2e classe en précisant le point frontière*. Les chiens "guide d'aveugle ou d'assistance" sont gratuits (pas d'émission de billet). - Condition non exig�e pour les chiens "guide d'aveugle ou d'assistance". En cas d'opposition des autres voyageurs � la pr�sence du chien, le personnel essaiera de trouver, dans la mesure du possible, une solution de reclassement. + Condition non exigée pour les chiens "guide d'aveugle ou d'assistance". En cas d'opposition des autres voyageurs à la présence du chien, le personnel essaiera de trouver, dans la mesure du possible, une solution de reclassement. - Pour effectuer une vente en cabine double Grande Classe au tarif Senior associ� au tarif Guide Handicap�, le dossier doit �tre constitu� sur Mosa�que classique (Pav� Accueil > Informations). + Pour effectuer une vente en cabine double Grande Classe au tarif Senior associé au tarif Guide Handicapé, le dossier doit être constitué sur Mosaïque classique (Pavé Accueil > Informations). - Trainh�tel No 409/407 (quotidien) + Trainhôtel No 409/407 (quotidien) - Trainh�tel No 477/475 (quotidien) + Trainhôtel No 477/475 (quotidien) - Trainh�tel No 11273/273 (circulation le mardi, jeudi et dimanche dans le sens Sud -> Nord (Barcelone Milan et Zurich) + Trainhôtel No 11273/273 (circulation le mardi, jeudi et dimanche dans le sens Sud -> Nord (Barcelone Milan et Zurich) - Trainh�tel No 11274/274 (circulation le lundi, mercredi et vendredi dans le sens Nord -> Sud (Milan et Zurich Barcelone) + Trainhôtel No 11274/274 (circulation le lundi, mercredi et vendredi dans le sens Nord -> Sud (Milan et Zurich Barcelone) - La cabine Double Grande Classe et la cabine Double Affaires doivent �tre utilis�es uniquement par deux personnes qui se connaissent (r�server en compartiment " Famille "). + La cabine Double Grande Classe et la cabine Double Affaires doivent être utilisées uniquement par deux personnes qui se connaissent (réserver en compartiment " Famille "). - Carte FIP + ordre de mission � pr�senter au poste de vente habilit�. + Carte FIP + ordre de mission à présenter au poste de vente habilité. - IMPORTANT ! Lors d_une vente, pour toute difficult� li�e � HERMES, veuillez contacter l_Assistance Gares au 30 40 50 ou 01 56 79 61 50. + IMPORTANT ! Lors d_une vente, pour toute difficulté liée à HERMES, veuillez contacter l_Assistance Gares au 30 40 50 ou 01 56 79 61 50. - P = Cabine Classe Touriste occup�e uniquement par 2 personnes qui se connaissent. Sur Mosa�que+ dans " saisie type de lit ", s�lectionner T2 et dans " compartiment ", s�lectionner " Famille ". + P = Cabine Classe Touriste occupée uniquement par 2 personnes qui se connaissent. Sur Mosaïque+ dans " saisie type de lit ", sélectionner T2 et dans " compartiment ", sélectionner " Famille ". - S et T = En Classe Single et Double Grande Classe, le d�ner, les boissons et le petit-d�jeuner sont inclus. + S et T = En Classe Single et Double Grande Classe, le dîner, les boissons et le petit-déjeuner sont inclus. - L et N = En Classe Single et Double " Affaires ", le petit d�jeuner est inclus. + L et N = En Classe Single et Double " Affaires ", le petit déjeuner est inclus. - R = En cabine Classe Touriste, compartiment exclusivement d�di� aux personnes du m�me sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est enti�rement r�serv�e et devient dans ce cas compartiment " Famille ". + R = En cabine Classe Touriste, compartiment exclusivement dédié aux personnes du même sexe (Homme ou Dame) et devient mixte lorsque 2, 3 ou 4 personnes voyagent ensemble ; la cabine est entièrement réservée et devient dans ce cas compartiment " Famille ". - Le Trainh�tel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination. + Le Trainhôtel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination. - La r�servation est ouverte � J-3 mois et jusqu_au d�part du Trainh�tel. La r�servation reste obligatoire. + La réservation est ouverte à J-3 mois et jusqu_au départ du Trainhôtel. La réservation reste obligatoire. @@ -348,7 +348,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Madrid Chamartin - Barcelone Fran�a + Barcelone França Zurich @@ -359,8 +359,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel FRANCISCO DE GOYA - Paris Austerlitz _ Les Aubrais - Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel FRANCISCO DE GOYA + Paris Austerlitz _ Les Aubrais - Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -392,8 +392,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel JOAN MIRO - Paris Austerlitz _ Les Aubrais _ Orl�ans _ Limoges � destination de Figueras _ G�rone et Barcelone Fran�a + Trainhôtel JOAN MIRO + Paris Austerlitz _ Les Aubrais _ Orléans _ Limoges à destination de Figueras _ Gérone et Barcelone França @@ -413,8 +413,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - - + + @@ -422,14 +422,14 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel PAU CASALS - Au d�part de Barcelone Fran�a _ G�rone, Figureras _ Perpignan � destination de Gen�ve _ Lausanne _ Fribourg _ Bern et Zurich + Trainhôtel PAU CASALS + Au départ de Barcelone França _ Gérone, Figureras _ Perpignan à destination de Genève _ Lausanne _ Fribourg _ Bern et Zurich - - + + @@ -455,14 +455,14 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel SALVADOR DALI - Au d�part de Barcelone Fran�a _ G�rone _ Figueras _ Perpignan � destination de Bardonecchia _ Torino _ Novara et Milano + Trainhôtel SALVADOR DALI + Au départ de Barcelone França _ Gérone _ Figueras _ Perpignan à destination de Bardonecchia _ Torino _ Novara et Milano - - + + @@ -488,13 +488,13 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue P29D @@ -511,11 +511,11 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue @@ -639,8 +639,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel FRANCISCO DE GOYA - Au d�part de Paris Austerlitz _ Les Aubrais-Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel FRANCISCO DE GOYA + Au départ de Paris Austerlitz _ Les Aubrais-Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -1806,8 +1806,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel JOAN MIRO - Au d�part de Paris Austerlitz _ Les Aubrais-Orl�ans _ Blois _ Poitiers � destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin + Trainhôtel JOAN MIRO + Au départ de Paris Austerlitz _ Les Aubrais-Orléans _ Blois _ Poitiers à destination de Vitoria _ Burgos _ Valladolid et Madrid Chamartin @@ -2973,8 +2973,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel PAU CASALS (PRICES NOT YET ADDED) - Au d�part de Barcelone Fran�a _ G�rone, Figureras _ Perpignan � destination de Gen�ve _ Lausanne _ Fribourg _ Bern et Zurich + Trainhôtel PAU CASALS (PRICES NOT YET ADDED) + Au départ de Barcelone França _ Gérone, Figureras _ Perpignan à destination de Genève _ Lausanne _ Fribourg _ Bern et Zurich @@ -3004,8 +3004,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Trainh�tel SALVADOR DALI (PRICES NOT YET ADDED) - Au d�part de Barcelone Fran�a _ G�rone _ Figueras _ Perpignan � destination de Bardonecchia _ Torino _ Novara et Milano + Trainhôtel SALVADOR DALI (PRICES NOT YET ADDED) + Au départ de Barcelone França _ Gérone _ Figueras _ Perpignan à destination de Bardonecchia _ Torino _ Novara et Milano @@ -3051,14 +3051,14 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Enfant - Enfants de 4 � moins de 12 ans le jour du voyage + Enfants de 4 à moins de 12 ans le jour du voyage 4 111 Enfant partegeant un lit - Cabine enti�rement r�serv�e. Compartiment Famille + Cabine entièrement réservée. Compartiment Famille @@ -3083,7 +3083,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Animaux domestiques - Cabine enti�rement r�serv�e (10). Compartiment famille + Cabine entièrement réservée (10). Compartiment famille @@ -3100,12 +3100,12 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE FIP Service - Sur pr�sentation de la Carte FIP + Sur présentation de la Carte FIP Congress Salons - Sur pr�sentation d_un justificatif � dates sp�cifiques (mail de confirmation ou billet d_entr�e) + Sur présentation d_un justificatif à dates spécifiques (mail de confirmation ou billet d_entrée) @@ -3115,14 +3115,14 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Mini a Deux - Achat jusqu_� J-14. Places limit�es. 2 personnes voyageant ensemble + Achat jusqu_à J-14. Places limitées. 2 personnes voyageant ensemble 2 2 Duo (prix pour 2) - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment Famille sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment Famille sauf en classe A @@ -3136,14 +3136,14 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Espace Plus (prix pour 4) - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment Famille sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment Famille sauf en classe A 4 4 Group ticket - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) @@ -3153,8 +3153,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE 12 - Group Handicap� - L_handicap� ou l_aveugle doivent �tre titulaire d_une carte d_invalidit�. Pour un handicap� en fauteuil roulant, celui-ci doit �tre pliable. + Group Handicapé + L_handicapé ou l_aveugle doivent être titulaire d_une carte d_invalidité. Pour un handicapé en fauteuil roulant, celui-ci doit être pliable. @@ -3172,13 +3172,13 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE true - Le Trainh�tel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination + Le Trainhôtel est une offre internationale et il est interdit de descendre du train en dehors de sa gare de destination rail rail false - Achat jusqu_� J-14. Places limit�es. + Achat jusqu_à J-14. Places limitées. P14D @@ -3186,7 +3186,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE none - Oui jusqu_� H (2) du voyage aller + Oui jusqu_à H (2) du voyage aller @@ -3206,7 +3206,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE PT2H - Jusqu_� J-30 avec 20% de retenue; De J-29 � J-8 avec 30% de retenue; + Jusqu_à J-30 avec 20% de retenue; De J-29 à J-8 avec 30% de retenue; @@ -3241,7 +3241,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE none - Oui jusqu_� H (2) du voyage aller + Oui jusqu_à H (2) du voyage aller @@ -3276,7 +3276,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE anyTime - PremsOui jusqu_� H (2) du voyage aller + PremsOui jusqu_à H (2) du voyage aller @@ -3300,7 +3300,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE PT2H - Jusqu_� J-30 avec 20% de retenue; De J-29 � J-8 avec 30% de retenue; + Jusqu_à J-30 avec 20% de retenue; De J-29 à J-8 avec 30% de retenue; @@ -3330,7 +3330,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE beforeStartOfValidity - La r�servation reste obligatoire + La réservation reste obligatoire reservationsCompulsory @@ -3340,7 +3340,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE true - La r�servation est ouverte � J-3 mois et jusqu_au d�part du Trainh�tel. + La réservation est ouverte à J-3 mois et jusqu_au départ du Trainhôtel. @@ -3399,12 +3399,12 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Jusqu_� J-30 avec 20% de retenue + Jusqu_à J-30 avec 20% de retenue - De J-29 � J-8 avec 30% de retenue + De J-29 à J-8 avec 30% de retenue @@ -3428,7 +3428,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - + @@ -3465,7 +3465,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Enfant - Enfants de 4 � moins de 12 ans le jour du voyage + Enfants de 4 à moins de 12 ans le jour du voyage PT0012 @@ -3539,7 +3539,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Prems - Achat jusqu_� J-14. Places limit�es. + Achat jusqu_à J-14. Places limitées. PP05AD @@ -3582,7 +3582,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE MiniADeux - SAchat jusqu_� J-14. Places limit�es. 2 personnes voyageant ensemble + SAchat jusqu_à J-14. Places limitées. 2 personnes voyageant ensemble PP05AD @@ -3625,7 +3625,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Duo - 2 personnes voyageant ensemble (3). Places limit�es. Compartiment "Famille" sauf en classe A + 2 personnes voyageant ensemble (3). Places limitées. Compartiment "Famille" sauf en classe A @@ -3729,7 +3729,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Jeune - De 12 � moins de 26 ans le jour du voyage + De 12 à moins de 26 ans le jour du voyage @@ -3817,8 +3817,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Congr�s _ Salons - Sur pr�sentation d_un justificatif � dates sp�cifiques (mail de confirmation ou billet d_entr�e) + Congrès _ Salons + Sur présentation d_un justificatif à dates spécifiques (mail de confirmation ou billet d_entrée) CN20AD @@ -3903,7 +3903,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Groupe Adulte (TS) - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) GR00AD @@ -3947,7 +3947,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Groupe Adulte (TS) - Minimum 12 adultes. Demande effectu�e par le client au 0810 879 479 (Agence Commerciale Voyageurs) + Minimum 12 adultes. Demande effectuée par le client au 0810 879 479 (Agence Commerciale Voyageurs) GR02AD @@ -3990,8 +3990,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE - Guide d_handicap� ou d_aveugle - L_handicap� ou l_aveugle doivent �tre titulaire d_une carte d_invalidit�. Pour un handicap� en fauteuil roulant, celui-ci doit �tre pliable. + Guide d_handicapé ou d_aveugle + L_handicapé ou l_aveugle doivent être titulaire d_une carte d_invalidité. Pour un handicapé en fauteuil roulant, celui-ci doit être pliable. @@ -4080,7 +4080,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE FIP Service - Sur pr�sentation de la Carte FIP + Sur présentation de la Carte FIP @@ -4136,7 +4136,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Enfant Partegeant Un Lit - Cabine enti�rement r�serv�e. Compartiment " Famille " + Cabine entièrement réservée. Compartiment " Famille " @@ -4179,7 +4179,7 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE Animaux domestiques - Cabine enti�rement r�serv�e (10). Compartiment "famille" + Cabine entièrement réservée (10). Compartiment "famille" @@ -4230,8 +4230,8 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE gares De Remboursement - L_�change des billets �mis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orl�ans et Limoges. -(2) L'�change ou le remboursement s'effectue jusqu'� H (Heure de d�part du train). + L_échange des billets émis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orléans et Limoges. +(2) L'échange ou le remboursement s'effectue jusqu'à H (Heure de départ du train). exchange refund atStop @@ -4265,9 +4265,9 @@ This Variation uses a single "Train Hotel" FARE PRODUCT and multiple SALES OFFE gares De Remboursement - L_�change des billets �mis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du -Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orl�ans et Limoges. -(2) L'�change ou le remboursement s'effectue jusqu'� H (Heure de d�part du train). + L_échange des billets émis par "RENFE" se fait uniquement en Gare de Paris Austerlitz, Paris Montparnasse, Paris Gare du +Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les Aubrais - Orléans et Limoges. +(2) L'échange ou le remboursement s'effectue jusqu'à H (Heure de départ du train). exchange refund atStop @@ -4314,7 +4314,7 @@ Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les senior - Handicap� + Handicapé Animale @@ -4396,7 +4396,7 @@ Nord, Paris St Lazare (NEV Amsterdam), Paris Gare de Lyon, Poitiers, Blois, Les TypeOfFareProduct - Trainh�tel + Trainhôtel diff --git a/examples/standards/vdv452/brighton/stopPlace/Netex_vdv_452_brighton_Stops_1.xml b/examples/standards/vdv452/brighton/stopPlace/Netex_vdv_452_brighton_Stops_1.xml index 8fc38f25a..7e6c50ba2 100644 --- a/examples/standards/vdv452/brighton/stopPlace/Netex_vdv_452_brighton_Stops_1.xml +++ b/examples/standards/vdv452/brighton/stopPlace/Netex_vdv_452_brighton_Stops_1.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_checkStatus_response.xml b/examples/ws_siri_request/siri_generic/exa_checkStatus_response.xml index 8d32b4899..65c181549 100644 --- a/examples/ws_siri_request/siri_generic/exa_checkStatus_response.xml +++ b/examples/ws_siri_request/siri_generic/exa_checkStatus_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_dataReady_request.xml b/examples/ws_siri_request/siri_generic/exa_dataReady_request.xml index 8fe5f2e0b..419385018 100644 --- a/examples/ws_siri_request/siri_generic/exa_dataReady_request.xml +++ b/examples/ws_siri_request/siri_generic/exa_dataReady_request.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_dataReady_response.xml b/examples/ws_siri_request/siri_generic/exa_dataReady_response.xml index c759755e7..3aa2efb67 100644 --- a/examples/ws_siri_request/siri_generic/exa_dataReady_response.xml +++ b/examples/ws_siri_request/siri_generic/exa_dataReady_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_dataReceived_response.xml b/examples/ws_siri_request/siri_generic/exa_dataReceived_response.xml index 330068f76..e7fbc2041 100644 --- a/examples/ws_siri_request/siri_generic/exa_dataReceived_response.xml +++ b/examples/ws_siri_request/siri_generic/exa_dataReceived_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_dataSupply_request.xml b/examples/ws_siri_request/siri_generic/exa_dataSupply_request.xml index 4a0393216..2e67e99ea 100644 --- a/examples/ws_siri_request/siri_generic/exa_dataSupply_request.xml +++ b/examples/ws_siri_request/siri_generic/exa_dataSupply_request.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_heartbeat_request.xml b/examples/ws_siri_request/siri_generic/exa_heartbeat_request.xml index 7db2d1c15..c0e6d2539 100644 --- a/examples/ws_siri_request/siri_generic/exa_heartbeat_request.xml +++ b/examples/ws_siri_request/siri_generic/exa_heartbeat_request.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_requestSubscription_response.xml b/examples/ws_siri_request/siri_generic/exa_requestSubscription_response.xml index c757cd4ec..c05113fb0 100644 --- a/examples/ws_siri_request/siri_generic/exa_requestSubscription_response.xml +++ b/examples/ws_siri_request/siri_generic/exa_requestSubscription_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_request.xml b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_request.xml index 494a9109a..fe5316b6b 100644 --- a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_request.xml +++ b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_request.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response.xml b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response.xml index 1dd891767..c7adb4f01 100644 --- a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response.xml +++ b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response_err.xml b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response_err.xml index 21fcb7b19..285f16c2d 100644 --- a/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response_err.xml +++ b/examples/ws_siri_request/siri_generic/exa_terminateSubscription_response_err.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_request.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_request.xml index 891363e0e..0e1258b47 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_request.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_request.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_request_b1.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_request_b1.xml index 3978156cf..d79f6e6d9 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_request_b1.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_request_b1.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_response.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_response.xml index 60720388e..cf2fe1a9c 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_response.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_response.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1-NX.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1-NX.xml index 799d0fbc5..e47b4b4a3 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1-NX.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1-NX.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1.xml index 3a6875b77..1692f1506 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_response_b1.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest-Nx.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest-Nx.xml index a9eb0c667..f680f8c84 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest-Nx.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest-Nx.xml @@ -1,4 +1,4 @@ - + diff --git a/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest.xml b/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest.xml index f6a93f12d..cf227d833 100644 --- a/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest.xml +++ b/examples/ws_siri_request/siri_netex/exu_dataObject_subscriptionRequest.xml @@ -1,4 +1,4 @@ - + diff --git a/xsd/NeTEx_publication-NoConstraint.xsd b/xsd/NeTEx_publication-NoConstraint.xsd index dde4d75f5..0d3963541 100644 --- a/xsd/NeTEx_publication-NoConstraint.xsd +++ b/xsd/NeTEx_publication-NoConstraint.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd index 9ccf5ddd9..742f86bd8 100644 --- a/xsd/NeTEx_publication.xsd +++ b/xsd/NeTEx_publication.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd index ea9f6edbd..03334b967 100644 --- a/xsd/NeTEx_publication_timetable.xsd +++ b/xsd/NeTEx_publication_timetable.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd index 6d6361f99..01b9c3c30 100644 --- a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd +++ b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd index f39269935..01834d945 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_contact_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd index a2d7e9e93..a45b7c5eb 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd index 95e0029f5..312ca8245 100644 --- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd +++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd index 50ef33812..717166c79 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd index fc68c4209..9cc4b6934 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd index 37a1815af..8cc98fff1 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd index 3dd5758ef..a7f9b7293 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd index 94fe044b9..bff3eb407 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_utility/netex_location_types.xsd b/xsd/netex_framework/netex_utility/netex_location_types.xsd index 62cf219da..b02eb4b63 100644 --- a/xsd/netex_framework/netex_utility/netex_location_types.xsd +++ b/xsd/netex_framework/netex_utility/netex_location_types.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_framework/netex_utility/netex_utility_types.xsd b/xsd/netex_framework/netex_utility/netex_utility_types.xsd index 4f4322ba7..6ae817b03 100644 --- a/xsd/netex_framework/netex_utility/netex_utility_types.xsd +++ b/xsd/netex_framework/netex_utility/netex_utility_types.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd index f4fd3c7ae..eacd4a944 100644 --- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd +++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd index 66747f64b..fcd8a84da 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd index f29a49b5d..a8a586f2f 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd index 03183c86b..5b2180e34 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd index f7244cb91..95c498e7a 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd index 1d3663bc7..167cca972 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd index 1ed177d26..cd4c1e7df 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd index 37248b541..be397201c 100644 --- a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd +++ b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd b/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd index a4ef08cd9..16b2c0452 100644 --- a/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd +++ b/xsd/netex_part_5/part5_frames/netex_nm_mobilityJourneyFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd b/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd index 7babde2ac..c227a0682 100644 --- a/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd +++ b/xsd/netex_part_5/part5_frames/netex_nm_mobilityServiceFrame_version.xsd @@ -1,4 +1,4 @@ - + diff --git a/xsd/wsdl/NeTEx_publication-NoConstraint.xsd b/xsd/wsdl/NeTEx_publication-NoConstraint.xsd index 70c0dce46..845eadf8e 100644 --- a/xsd/wsdl/NeTEx_publication-NoConstraint.xsd +++ b/xsd/wsdl/NeTEx_publication-NoConstraint.xsd @@ -1,4 +1,4 @@ - +