continuing fix of faulty merge

xml/source/servicebreakdown.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <breakdown xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../dtd/servicebreakdown.xsd">
   <service>
-    <description>Example Service 1: set duration in days and with hourly rate.</description>
+    <specification>Example Service 1: set duration in days and with hourly rate.</specification>
     <effort in="days">2</effort>
     <hourly_rate>10</hourly_rate>
     <fee denomination="eur">
@@ -9,8 +9,8 @@
     </fee>
   </service>
   <service>
-    <description>Example Service 2: variable duration with min/max parameters and with hourly
-      rate.</description>
+    <specification>Example Service 2: variable duration with min/max parameters and with hourly
+      rate.</specification>
     <effort in="days">
       <min>3</min>
       <max>4</max>
@@ -21,14 +21,14 @@
     </fee>
   </service>
   <service>
-    <description>Example Service 3: set duration in days with CUSTOM (non-computed) set
-      fee.</description>
+    <specification>Example Service 3: set duration in days with CUSTOM (non-computed) set
+      fee.</specification>
     <effort in="days">5</effort>
     <fee denomination="eur">500</fee>
   </service>
   <service>
-    <description>Example Service 4: set duration in hours with CUSTOM (non-computed) variable fee
-      (min/max).</description>
+    <specification>Example Service 4: set duration in hours with CUSTOM (non-computed) variable fee
+      (min/max).</specification>
     <effort in="hours">4</effort>
     <fee denomination="eur">
       <min>100</min>
@@ -36,13 +36,13 @@
     </fee>
   </service>
   <service>
-    <description>Example Service 5: set duration in days with CUSTOM (non-computed) estimated
-      fee.</description>
+    <specification>Example Service 5: set duration in days with CUSTOM (non-computed) estimated
+      fee.</specification>
     <effort in="hours">4</effort>
     <fee denomination="eur" estimate="yes">1000</fee>
   </service>
   <service optional="yes">
-    <description>Example Service 6: optional service</description>
+    <specification>Example Service 6: optional service</specification>
     <effort in="days">
       <min>1</min>
       <max>2</max>
@@ -53,22 +53,22 @@
     </fee>
   </service>
   <extra>
-    <description>Example Extra Cost 1: set fee</description>
+    <specification>Example Extra Cost 1: set fee</specification>
     <fee denomination="eur">1000</fee>
   </extra>
   <extra>
-    <description>Example Extra Cost 2: variable min/max fee</description>
+    <specification>Example Extra Cost 2: variable min/max fee</specification>
     <fee denomination="eur">
       <min>1000</min>
       <max>1200</max>
     </fee>
   </extra>
   <extra>
-    <description>Example Extra Cost 3: estimated fee</description>
+    <specification>Example Extra Cost 3: estimated fee</specification>
     <fee denomination="eur" estimate="yes">600</fee>
   </extra>
   <extra>
-    <description>Example Extra Cost 4: with duration</description>
+    <specification>Example Extra Cost 4: with duration</specification>
     <effort in="days">6</effort>
     <fee denomination="eur">600</fee>
   </extra>

xml/source/snippets/offerte/en/engagementtime.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<p>Based on the information provided, we expect this to be a <p_duration/>-day
-  engagement. The planning of this engagement is as follows:
+<p>Based on the information provided, we expect this engagement to take <p_persondays/>
+  persondays. The planning of this engagement is as follows:
 </p>

xml/source/snippets/offerte/en/planningandpayment.xml

@@ -5,7 +5,7 @@
     <company_short/> will uphold the following schedule for the services:
   </p>
   <ul>
-    <li><company_short/> performs a <p_duration/>-day <company_svc_short/> starting <p_startdate/>.</li>
+    <li><company_short/> performs a <company_svc_short/> starting <p_startdate/>.</li>
     <li><company_short/> delivers the final report on 
       <p_reportdue/>.</li>
   </ul>

xml/source/snippets/offerte/en/projectoverview.xml

@@ -18,10 +18,9 @@
   <p>
     <company_short/> will test for the presence of the most common
     vulnerabilities, using both publicly available vulnerability scanning
-    tools and manual testing. <company_short/> shall perform a
-    <p_duration/>-day 
+    tools and manual testing. <company_short/> shall perform a 
     <p_boxtype/> intrusive test via the
-    internet (total estimated effort is <p_persondays/> persondays). A breakdown of the requested services can be found below:
+    internet (total estimated effort: <p_persondays/> persondays). A breakdown of the requested services can be found below:
   </p>
   
  

xml/source/snippets/offerte/en/projectoverview_code-audit.xml

@@ -16,8 +16,7 @@
     <p>
         <company_short/> will test for the presence of the most common vulnerabilities using a
         combination of publicly available (static, dynamic and concolic) analytic tools, fuzzing and
-        code reading. <company_short/> will perform this code audit in <p_duration/> days
-        (<p_persondays/> persondays). </p>
+        code reading. <company_short/> will need <p_persondays/> persondays for this code audit. </p>
     
 
     <!--Not Needed if Disclaimer is Included; Duplicate Text-->

xml/source/snippets/offerte/en/projectoverview_retest.xml

@@ -15,7 +15,7 @@
   <p>
     <company_short/> will test using both publicly available vulnerability
     scanning tools and manual testing. <company_short/> shall perform a
-    <p_duration/>-day, <p_boxtype/> follow-up penetration test via the internet.
+   <p_boxtype/> follow-up penetration test via the internet between <p_startdate/> and <p_enddate/>.
   </p>
 
   <!--Not Needed if Disclaimer is Included; Duplicate Text-->

xml/source/snippets/offerte/nl/engagementtime.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<p>Op basis van de verstrekte informatie verwachten wij dat het uitvoeren van de
-  opdracht <p_duration/> dagen zal duren. De planning van de opdracht is als volgt:
+<p>Op basis van de verstrekte informatie verwachten wij <p_persondays/> persoondagen nodig te hebben voor het uitvoeren van de
+  opdracht. De planning van de opdracht is als volgt:
 </p>

xml/source/snippets/offerte/nl/planningandpayment.xml

@@ -4,7 +4,7 @@
   <p><company_short/> houdt de volgende planning aan voor haar werkzaamheden:</p>  
   
     <ul>
-      <li><company_short/> voert een <p_duration/>-daagse <company_svc_short/> uit op het doelwit: <p_startdate/>.</li>
+      <li><company_short/> voert een <company_svc_short/> uit op het doelwit: <p_startdate/>.</li>
       <li><company_short/> levert het definitieve rapport: <p_reportdue/>.</li>
     </ul>
   

xml/source/snippets/offerte/nl/projectoverview.xml

@@ -19,8 +19,8 @@
   <p>
     <company_short/> zal testen op de aanwezigheid van de meest voorkomende
     kwetsbaarheden, gebruik makend van zowel publiek beschikbare scanning tools,
-    als door handmatig testen. <company_short/> zal een grondige <p_duration/>-daagse
-    (<p_persondays/> persoondagen), <p_boxtype/> test uitvoeren via internet.
+    als door handmatig testen. <company_short/> zal een grondige 
+    <p_boxtype/> test van <p_persondays/> persoondagen uitvoeren via internet.
   </p>
 
   <section todo="yes">