further minor changes to fieldnames

1 files changed, 14 insertions, 14 deletions

diff --git a/server/xml/macros/oejentryk-1.0.xml b/server/xml/macros/oejentryk-1.0.xml
index 5bba613..800da90 100644
--- a/server/xml/macros/oejentryk-1.0.xml
+++ b/server/xml/macros/oejentryk-1.0.xml
@@ -15,24 +15,24 @@
   <resume language="lua">
     out = ''
 
-    if ( getValue('tonometer.mangler.odxt') == '' or getValue('tonometer.mangler.osin') == '' )
+    if ( getValue('tonometri.mangler.odxt') == '' or getValue('tonometri.mangler.osin') == '' )
     then
       out = out .. 'Øjentryk:\n'
     end
 
-    if ( getValue('tonometer.mangler.odxt') == '' )
+    if ( getValue('tonometri.mangler.odxt') == '' )
     then
-      out = out .. 'o.dxt: ' .. getValue('tonometer.tryk.odxt') .. ' mmHg\n'
+      out = out .. 'o.dxt: ' .. getValue('tonometri.tryk.odxt') .. ' mmHg\n'
     end
 
-    if ( getValue('tonometer.mangler.osin') == '' )
+    if ( getValue('tonometri.mangler.osin') == '' )
     then
-      out = out .. 'o.sin: ' .. getValue('tonometer.tryk.odxt') .. ' mmHg\n'
+      out = out .. 'o.sin: ' .. getValue('tonometri.tryk.odxt') .. ' mmHg\n'
     end
 
-    if ( getValue('tonometer.mangler.odxt') == '' or getValue('tonometer.mangler.osin') == '' )
+    if ( getValue('tonometri.mangler.odxt') == '' or getValue('tonometri.mangler.osin') == '' )
     then
-      out = out .. getValue('tonometer.apparat') .. '.\n'
+      out = out .. getValue('tonometri.apparat') .. '.\n'
     end
 
     return out
@@ -106,7 +106,7 @@
         enable('right_eye_frame')
       end
 
-      if( getValue('tonometer.mangler.odxt') == 'mangler' and getValue('tonometer.mangler.osin') == 'mangler' )
+      if( getValue('tonometri.mangler.odxt') == 'mangler' and getValue('tonometri.mangler.osin') == 'mangler' )
       then
         disable('device_frame')
       else
@@ -123,7 +123,7 @@
         enable('left_eye_frame')
       end
 
-      if( getValue('tonometer.mangler.odxt') == 'mangler' and getValue('tonometer.mangler.osin') == 'mangler' )
+      if( getValue('tonometri.mangler.odxt') == 'mangler' and getValue('tonometri.mangler.osin') == 'mangler' )
       then
         disable('device_frame')
       else
@@ -141,13 +141,13 @@
       <!-- o.dxt -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.dxt"
-		  name="tonometer.mangler.odxt" script="right_eye"
+		  name="tonometri.mangler.odxt" script="right_eye"
 		  map="missing_eye_odxt_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="right_eye_frame" caption="o.dxt" layout="hbox">
 	  <label caption="Tryk:"/>
 	  <spacer/>
-	  <lineedit name="tonometer.tryk.odxt" regexp="\d{1,2}" script="lt80gt0" value=""/>
+	  <lineedit name="tonometri.tryk.odxt" regexp="\d{1,2}" script="lt80gt0" value=""/>
 	  <label caption="mmHg"/>
 	  <spacer/>
 	</frame>
@@ -156,13 +156,13 @@
       <!-- o.sin -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på o.sin"
-		  name="tonometer.mangler.osin" script="left_eye"
+		  name="tonometri.mangler.osin" script="left_eye"
 		  map="missing_eye_osin_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="o.sin" layout="hbox">
 	  <label caption="Tryk:"/>
 	  <spacer/>
-	  <lineedit name="tonometer.tryk.osin" regexp="\d{1,2}" script="lt80gt0" value=""/>
+	  <lineedit name="tonometri.tryk.osin" regexp="\d{1,2}" script="lt80gt0" value=""/>
 	  <label caption="mmHg"/>
 	  <spacer/>
 	</frame>
@@ -172,7 +172,7 @@
 
     <frame name="device_frame" layout="vbox">
       <label caption="Tonometer måling foretaget med:"/>
-      <combobox name="tonometer.apparat" value="">
+      <combobox name="tonometri.apparat" value="">
 	<item caption="Applanationstonometer" value="Appl"/>
 	<item caption="Lufttonometer" value="Luft"/>
       </combobox>