Index: development/models/lbx/LBX Configurator,1.0.0.trl
===================================================================
diff -u -r1943 -r2031
--- development/models/lbx/LBX Configurator,1.0.0.trl	(.../LBX Configurator,1.0.0.trl)	(revision 1943)
+++ development/models/lbx/LBX Configurator,1.0.0.trl	(.../LBX Configurator,1.0.0.trl)	(revision 2031)
@@ -440,6 +440,14 @@
     <label id="trl" default="Translations" />
     <label id="verpakkingtooltipstonen" default="VerpakkingTooltipsTonen" />
     <label id="verpakkingtooltipstrigger" default="VerpakkingTooltipsTrigger" />
+    <label id="code" default="Code" />
+    <label id="diverse" default="Diverse" />
+    <label id="statusbalk" default="StatusBalk" />
+    <label id="wand" default="Wand" />
+    <label id="bewarenerror" default="BewarenError" />
+    <label id="bewarenklantvoorkeurenerror" default="BewarenKlantVoorkeurenError" />
+    <label id="bewarenklantvoorkeurensucces" default="BewarenKlantVoorkeurenSucces" />
+    <label id="z" default="UitsparingData_Z" global="true" />
   </labels>
   <translations>
     <translation label="matantislipfiberkleur_uantraciet" language="en" value="Anthracite" />
@@ -1822,6 +1830,37 @@
     <translation label="sokkeldiepte" language="nb" value="Sokkeldybde" />
     <translation label="sokkeldiepte" language="nl" value="Sokkeldiepte" />
     <translation label="sokkeldiepte" language="sv" value="Sockeldjup" />
+    <translation label="z" language="de" value="Aussparung (Z)" />
+    <translation label="z" language="en" value="Cut out Z" />
+    <translation label="z" language="fr" value="Évidement Z" />
+    <translation label="z" language="it" value="Cavità Z" />
+    <translation label="z" language="nb" value="Utsparing (Z)" />
+    <translation label="z" language="nl" value="Uitsparing Z" />
+    <translation label="z" language="sv" value="UtskärningZ" />
+    <translation label="bewarenerror" language="de" value="Die Konfiguration ist nicht vollständig" />
+    <translation label="bewarenerror" language="en" value="The configuration is incomplete" />
+    <translation label="bewarenerror" language="fi" value="Kokoonpano on keskeneräinen" />
+    <translation label="bewarenerror" language="fr" value="La configuration n'est pas terminée" />
+    <translation label="bewarenerror" language="it" value="La configurazione non è completa" />
+    <translation label="bewarenerror" language="nb" value="Konfigurasjonen er ikke komplett" />
+    <translation label="bewarenerror" language="nl" value="De configuratie is niet volledig" />
+    <translation label="bewarenerror" language="sv" value="Konfigurationen är inte komplett" />
+    <translation label="bewarenklantvoorkeurenerror" language="de" value="Beim speichern der Einstellungen ist ein Fehler aufgetreten!" />
+    <translation label="bewarenklantvoorkeurenerror" language="en" value="An error occurred while saving your preferences!" />
+    <translation label="bewarenklantvoorkeurenerror" language="fi" value="Valintojesi tallettamisessa tapahtui virhe!" />
+    <translation label="bewarenklantvoorkeurenerror" language="fr" value="Une erreur s'est produite lors de l'enregistrement de vos préférences!" />
+    <translation label="bewarenklantvoorkeurenerror" language="it" value="Si è verificato un errore durante il salvataggio delle preferenze!" />
+    <translation label="bewarenklantvoorkeurenerror" language="nb" value="Det oppsto en feil da dine preferanser skulle lagres!" />
+    <translation label="bewarenklantvoorkeurenerror" language="nl" value="Er is een fout opgetreden tijdens het opslaan van uw voorkeuren!" />
+    <translation label="bewarenklantvoorkeurenerror" language="sv" value="Ett fel uppstod när dina preferenser skulle sparas!" />
+    <translation label="bewarenklantvoorkeurensucces" language="de" value="Ihre Einstellungen wurden gespeichert!" />
+    <translation label="bewarenklantvoorkeurensucces" language="en" value="Your preferences have been saved!" />
+    <translation label="bewarenklantvoorkeurensucces" language="fi" value="Valintasi on talletettu!" />
+    <translation label="bewarenklantvoorkeurensucces" language="fr" value="Vos préférences sont enregistré!" />
+    <translation label="bewarenklantvoorkeurensucces" language="it" value="Le preferenze sono state salvate!" />
+    <translation label="bewarenklantvoorkeurensucces" language="nb" value="Dine preferanser er lagret!" />
+    <translation label="bewarenklantvoorkeurensucces" language="nl" value="Uw voorkeuren zijn opgeslagen!" />
+    <translation label="bewarenklantvoorkeurensucces" language="sv" value="Dina preferenser har sparats!" />
   </translations>
   <languages>
     <language id="de" description="German" />
Index: development/models/lbx/LBX Configurator,1.0.0.xml
===================================================================
diff -u -r2029 -r2031
--- development/models/lbx/LBX Configurator,1.0.0.xml	(.../LBX Configurator,1.0.0.xml)	(revision 2029)
+++ development/models/lbx/LBX Configurator,1.0.0.xml	(.../LBX Configurator,1.0.0.xml)	(revision 2031)
@@ -27,10 +27,10 @@
         </PROPERTIES>
       </CLASS>
     </REFERENCE>
-    <REFERENCE ID="DATA" LABEL="DATA" TYPE="String" VALUE="Structure" ENABLED="false" SEQNO="2" USED="1:4,8,20,22,28,33,36,37,38,39,40,42,43,44,45,46,47,48,49,54,57,58,59,60,61,62,63,64,65,66,67,68,70,77,82,84,85,86,99,101,102,103,106,107,109,110,112,113,115,116,117,118,119,121,122,123,124,125,126,127,128,131,134,136,137,138,144,145,146,147,148,149,150,151,152,159,160,161,162,163,164,165,179,180,198,199,200,201,202,203,204,205,206,207,208,210,211,212,213,214,215">
+    <REFERENCE ID="DATA" LABEL="DATA" TYPE="String" VALUE="Structure" ENABLED="false" SEQNO="2" USED="1:4,8,15,20,22,28,33,36,37,38,39,40,42,43,44,45,46,47,48,49,54,57,58,59,60,61,62,63,64,65,66,67,68,70,77,82,84,85,86,99,101,102,103,106,107,109,110,112,113,115,116,117,118,119,121,122,123,124,125,126,127,128,131,134,136,137,138,144,145,146,147,148,149,150,151,152,159,160,161,162,163,164,165,179,180,198,199,200,201,202,203,204,205,206,207,208,210,211,212,213,214,215,216">
       <CLASS ID="Structure" LABEL="Structure" TYPE="">
         <REFERENCES>
-          <REFERENCE ID="Kenmerken" LABEL="Kenmerken" TYPE="String" VALUE="Structure" CONSTANT="true" SEQNO="1" USED="1:8,20,22,28,33,36,37,38,39,40,42,43,44,45,46,47,48,49,54,57,58,59,60,61,62,63,64,67,68,70,77,82,84,85,86,99,101,102,103,106,107,109,110,112,113,115,116,117,118,119,121,122,123,124,125,126,127,128,131,134,136,137,138,144,145,146,147,148,151,159,160,161,162,163,164,165,180,198,199,200,201,202,203,204,205,206,207,208,210,211,212,213,214,215">
+          <REFERENCE ID="Kenmerken" LABEL="Kenmerken" TYPE="String" VALUE="Structure" CONSTANT="true" SEQNO="1" USED="1:8,15,20,22,28,33,36,37,38,39,40,42,43,44,45,46,47,48,49,54,57,58,59,60,61,62,63,64,67,68,70,77,82,84,85,86,99,101,102,103,106,107,109,110,112,113,115,116,117,118,119,121,122,123,124,125,126,127,128,131,134,136,137,138,144,145,146,147,148,151,159,160,161,162,163,164,165,180,198,199,200,201,202,203,204,205,206,207,208,210,211,212,213,214,215,216">
             <CLASS ID="Structure" LABEL="Structure" TYPE="">
               <PROPERTIES>
                 <PROPERTY ID="BodemKleur" LABEL="BodemKleur" TYPE="String" ENABLED="false" ANALYZE="true" SEQNO="1" USED="1:22,116,117,121,125,203,206">
@@ -225,7 +225,7 @@
                 </PROPERTY>
               </PROPERTIES>
               <REFERENCES>
-                <REFERENCE ID="NietMeeleveren" LABEL="NietMeeleveren" TYPE="String" VALUE="Structure" ENABLED="false" SEQNO="22" USED="1:8,33,125,201,204,210,211,212,213,214,215">
+                <REFERENCE ID="NietMeeleveren" LABEL="NietMeeleveren" TYPE="String" VALUE="Structure" ENABLED="false" SEQNO="22" USED="1:8,15,33,125,201,204,210,211,212,213,214,215,216">
                   <CLASS ID="Structure" LABEL="Structure" TYPE="">
                     <PROPERTIES>
                       <PROPERTY ID="NietMeeleveren_AfdekkapBinnen" LABEL="NietMeeleveren_AfdekkapBinnen" TYPE="Boolean" VALUE="false" ANALYZE="true" SEQNO="1" USED="1:125">
@@ -324,7 +324,7 @@
                           </PROPERTIES>
                         </CLASS>
                       </REFERENCE>
-                      <REFERENCE ID="Z1" LABEL="Z1" TYPE="String" VALUE="Structure" SEQNO="3" USED="1:8,42,67,127,159,201,204,205,210,211,212,213,214,215">
+                      <REFERENCE ID="Z1" LABEL="UitsparingData_Z1" TYPE="String" VALUE="Structure" SEQNO="3" USED="1:8,42,67,127,159,201,204,205,210,211,212,213,214,215">
                         <CLASS ID="Structure" LABEL="Structure" TYPE="">
                           <PROPERTIES>
                             <PROPERTY ID="Breedte" LABEL="Breedte" TYPE="Double" ANALYZE="true" SEQNO="1" USED="1:67,127">
@@ -538,7 +538,7 @@
                     <OPTION ID="TOB" LABEL="GeleiderTechnologie_TOB" />
                   </OPTIONS>
                 </PROPERTY>
-                <PROPERTY ID="GeleiderTechnologieLabel" LABEL="GeleiderTechnologieLabel" TYPE="String" MANDATORY="true" SEQNO="16" STYLE="labelclass:hidden;readonly:true" USED="1:201,210,211,212,213,214,215" PANE="AfwerkingPane;">
+                <PROPERTY ID="GeleiderTechnologieLabel" LABEL="GeleiderTechnologieLabel" TYPE="String" MANDATORY="true" SEQNO="16" STYLE="labelclass:hidden;readonly:true" USED="1:124,201,210,211,212,213,214,215" PANE="AfwerkingPane;">
                 </PROPERTY>
                 <PROPERTY ID="Draagkracht" LABEL="Draagkracht" TYPE="String" MANDATORY="true" SEQNO="17" STYLE="controlclass:vh-tile-large;radio:true" USED="1:42,201,210,211,212,213,214,215" PANE="AfwerkingPane;">
                   <OPTIONS>
@@ -595,7 +595,7 @@
                 </PROPERTY>
                 <PROPERTY ID="HeeftMat" LABEL="HeeftMat" TYPE="Boolean" VALUE="false" SEQNO="32" STYLE="controlclass:vh-slidercheckbox" USED="1:167,168,169,170,171,180,204,207" PANE="MatPane;">
                 </PROPERTY>
-                <PROPERTY ID="VerpakkingTypeLabel" LABEL="VerpakkingTypeLabel" TYPE="String" MANDATORY="true" SEQNO="39" STYLE="labelclass:hidden;readonly:true" USED="1:201,210,211,212,213,214,215" PANE="VerpakkingPane;">
+                <PROPERTY ID="VerpakkingTypeLabel" LABEL="VerpakkingTypeLabel" TYPE="String" MANDATORY="true" SEQNO="39" STYLE="labelclass:hidden;readonly:true" USED="1:123,201,210,211,212,213,214,215" PANE="VerpakkingPane;">
                 </PROPERTY>
                 <PROPERTY ID="SneltoetsenNietMeeleveren" LABEL="SneltoetsenNietMeeleveren" TYPE="String" SEQNO="43" STYLE="controlclass:LargeTiles;radio:true;cols:10" USED="1:69" PANE="VerpakkingPane;">
                   <OPTIONS>
@@ -721,7 +721,7 @@
                           </PROPERTIES>
                         </CLASS>
                       </REFERENCE>
-                      <REFERENCE ID="Z1" LABEL="Z1" TYPE="String" VALUE="Structure" CONSTANT="true" SEQNO="4" STYLE="control:matrix;cols:4;optionlabel:false" USED="1:42,127,132,136,137,142,145,149,150,151,157,159,193,194,201,204,207,210,211,212,213,214,215">
+                      <REFERENCE ID="Z1" LABEL="UitsparingData_Z1" TYPE="String" VALUE="Structure" CONSTANT="true" SEQNO="4" STYLE="control:matrix;cols:4;optionlabel:false" USED="1:42,127,132,136,137,142,145,149,150,151,157,159,193,194,201,204,207,210,211,212,213,214,215">
                         <CLASS ID="Structure" LABEL="Structure" TYPE="">
                           <PROPERTIES>
                             <PROPERTY ID="BreedteUitsparing" LABEL="BreedteUitsparing" TYPE="Double" SEQNO="1" STYLE="columnwidth:120;labelclass:hidden;format:{0};cols:12" USED="1:42,132,149,150,151,207">
@@ -837,7 +837,7 @@
                       </PROPERTY>
                       <PROPERTY ID="X" LABEL="X" TYPE="Double" ENABLED="false" SEQNO="2" USED="1:205">
                       </PROPERTY>
-                      <PROPERTY ID="Z1" LABEL="Z1" TYPE="Double" ENABLED="false" SEQNO="3" USED="1:205">
+                      <PROPERTY ID="Z1" LABEL="UitsparingData_Z1" TYPE="Double" ENABLED="false" SEQNO="3" USED="1:205">
                       </PROPERTY>
                       <PROPERTY ID="Y" LABEL="Y" TYPE="Double" ENABLED="false" SEQNO="4" USED="1:205">
                       </PROPERTY>
@@ -1278,7 +1278,7 @@
                 <REFERENCE ID="Top" LABEL="Top" TYPE="String" VALUE="Structure" CONSTANT="true" SEQNO="1" USED="1:21,201,210,211,212,213,214,215">
                   <CLASS ID="Structure" LABEL="Structure" TYPE="">
                     <PROPERTIES>
-                      <PROPERTY ID="SaveAndExitButton" LABEL="SaveAndExitButton" TYPE="String" VALUE="False" CONSTANT="true" SEQNO="1" STYLE="button:true;labelclass:hidden;image:images/Vanhoecke/General/add-to-cart.png">
+                      <PROPERTY ID="SaveAndExitButton" LABEL="SaveAndExitButton" TYPE="String" VALUE="False" CONSTANT="true" SEQNO="1" STYLE="button:true;labelclass:hidden;image:images/Vanhoecke/General/add-to-cart.png" USED="1:21">
                       </PROPERTY>
                       <PROPERTY ID="SaveAndContinueButton" LABEL="SaveAndContinueButton" TYPE="String" VALUE="False" CONSTANT="true" SEQNO="2" STYLE="button:true;labelclass:hidden;image:images/Vanhoecke/General/add-to-cart.png">
                       </PROPERTY>
@@ -1762,13 +1762,25 @@
         </PROPERTIES>
       </CLASS>
     </REFERENCE>
-    <REFERENCE ID="TRL" LABEL="Translations" TYPE="String" VALUE="Structure" ENABLED="false" STORE="false" SEQNO="8" USED="1:201,210,211,212,213,214,215">
+    <REFERENCE ID="TRL" LABEL="Translations" TYPE="String" VALUE="Structure" ENABLED="false" STORE="false" SEQNO="8" USED="1:21,129,131,134,201,210,211,212,213,214,215,216">
       <CLASS ID="Structure" LABEL="Structure" TYPE="">
         <PROPERTIES>
-          <PROPERTY ID="CorpusBinnenbreedte" LABEL="CorpusBinnenbreedte" TYPE="String" SEQNO="1">
+          <PROPERTY ID="BewarenError" LABEL="BewarenError" TYPE="String" SEQNO="1" USED="1:213,214,215">
           </PROPERTY>
-          <PROPERTY ID="CorpusBuitenbreedte" LABEL="CorpusBuitenbreedte" TYPE="String" SEQNO="2">
+          <PROPERTY ID="BewarenKlantVoorkeurenError" LABEL="BewarenKlantVoorkeurenError" TYPE="String" SEQNO="2" USED="1:216">
           </PROPERTY>
+          <PROPERTY ID="BewarenKlantVoorkeurenSucces" LABEL="BewarenKlantVoorkeurenSucces" TYPE="String" SEQNO="3" USED="1:216">
+          </PROPERTY>
+          <PROPERTY ID="CorpusBinnenbreedte" LABEL="CorpusBinnenbreedte" TYPE="String" SEQNO="4" USED="1:129">
+          </PROPERTY>
+          <PROPERTY ID="CorpusBuitenbreedte" LABEL="CorpusBuitenbreedte" TYPE="String" SEQNO="5" USED="1:129">
+          </PROPERTY>
+          <PROPERTY ID="SaveChangesButton" LABEL="SaveChangesButton" TYPE="String" SEQNO="6" USED="1:21">
+          </PROPERTY>
+          <PROPERTY ID="Z" LABEL="UitsparingData_Z" TYPE="String" SEQNO="7" USED="1:131,134">
+          </PROPERTY>
+          <PROPERTY ID="Z1" LABEL="UitsparingData_Z1" TYPE="String" SEQNO="8" USED="1:131">
+          </PROPERTY>
         </PROPERTIES>
       </CLASS>
     </REFERENCE>
@@ -2087,7 +2099,7 @@
           <IMPLICATION>local boolean _Result = CopyOptionsToArray("UI.Kenmerken.NietMeeleverenOptions"; "UI.Kenmerken.NietMeeleveren");
 
 index i of UI.Kenmerken.NietMeeleveren
-	UI.Kenmerken.NietMeeleveren(i)@label = GetLocalizedLabel("NietMeeleveren");
+	UI.Kenmerken.NietMeeleveren(i)@label = DATA.Kenmerken.NietMeeleveren@label;
 	UI.Kenmerken.NietMeeleveren(i)@repeat = false;
 	UI.Kenmerken.NietMeeleveren(i).IsSelected@style.controlclass = "vh-slidercheckbox";
 	UI.Kenmerken.NietMeeleveren(i).Text@style.controlclass = "vh-checkboxlist-item";
@@ -2237,10 +2249,10 @@
 UI.Buttons.Bottom.SaveAndContinueButton@default = "task:eCon.UI.Tasks.SetValueTask:'STATE.SavedAndContinue','true'";
 
 local boolean _IsEditMode = (CONFIG.InputMode == "Edit");
-local string _LabelSave = GetLocalizedLabel("SaveAndExitButton");
+local string _LabelSave = UI.Buttons.Top.SaveAndExitButton@label;
 
 if (_IsEditMode) then
-	_LabelSave = GetLocalizedLabel("SaveChangesButton"); 	
+	_LabelSave = TRL.SaveChangesButton@label; 	
 end if;
 
 UI.Buttons.Top.SaveAndExitButton@label = _LabelSave;
@@ -3845,14 +3857,14 @@
       <RULES LABEL="Messages" DESCRIPTION="">
         <RULE LABEL="Message Probox">
           <CONDITION>true</CONDITION>
-          <IMPLICATION>UI.Kenmerken.VerpakkingTypeLabel@default = GetLocalizedLabel("VerpakkingTypeLabel");
+          <IMPLICATION>UI.Kenmerken.VerpakkingTypeLabel@default = UI.Kenmerken.VerpakkingTypeLabel@label;
 UI.Kenmerken.VerpakkingTypeLabel@visible = (DATA.Kenmerken.VerpakkingType == "Probox");</IMPLICATION>
           <DESCRIPTION>Message Probox</DESCRIPTION>
           <LHS>;ui.kenmerken.verpakkingtypelabel@default;ui.kenmerken.verpakkingtypelabel@visible;</LHS>
         </RULE>
         <RULE LABEL="Message TIP-ON BLUMOTION">
           <CONDITION>true</CONDITION>
-          <IMPLICATION>UI.Kenmerken.GeleiderTechnologieLabel@default = GetLocalizedLabel("GeleiderTechnologieLabel");
+          <IMPLICATION>UI.Kenmerken.GeleiderTechnologieLabel@default = UI.Kenmerken.GeleiderTechnologieLabel@label;
 UI.Kenmerken.GeleiderTechnologieLabel@visible = (DATA.Kenmerken.GeleiderTechnologie == "TOB" and DATA.Kenmerken.Toepassing &lt;&gt; "SST");</IMPLICATION>
           <DESCRIPTION>Message TIP-ON BLUMOTION</DESCRIPTION>
           <LHS>;ui.kenmerken.geleidertechnologielabel@default;ui.kenmerken.geleidertechnologielabel@visible;</LHS>
@@ -3986,8 +3998,8 @@
       <RULE LABEL="Label CorpusBreedte">
         <CONDITION>true</CONDITION>
         <IMPLICATION>UI.Kenmerken.CorpusBreedte@label = switch (UI.Kenmerken.IsBinnenbreedte)
-	case true: GetLocalizedLabel("CorpusBinnenbreedte")
-	else GetLocalizedLabel("CorpusBuitenbreedte")
+	case true: TRL.CorpusBinnenbreedte@label
+	else TRL.CorpusBuitenbreedte@label
 end switch;</IMPLICATION>
         <DESCRIPTION>Label CorpusBreedte</DESCRIPTION>
         <LHS>;</LHS>
@@ -4005,9 +4017,9 @@
       <RULE LABEL="Label UitsparingData Z1">
         <CONDITION>(DATA.Kenmerken.Toepassing == "SY") or (DATA.Kenmerken.Toepassing == "SP")</CONDITION>
         <IMPLICATION>if (DATA.Kenmerken.UitsparingData.UitsparingAantal == "Enkel") then 
-	UI.Kenmerken.UitsparingData.Z1@label = GetLocalizedLabel("Z");
+	UI.Kenmerken.UitsparingData.Z1@label = TRL.Z@label;
 else 
-	UI.Kenmerken.UitsparingData.Z1@label = GetLocalizedLabel("Z1");
+	UI.Kenmerken.UitsparingData.Z1@label = TRL.Z1@label;
 end if;
 </IMPLICATION>
         <DESCRIPTION>Label UitsparingData Z1</DESCRIPTION>
@@ -4057,7 +4069,7 @@
         <IMPLICATION>local boolean _IsSpoelbaklade = (DATA.Kenmerken.Toepassing in {"SP"});
 
 UI.Kenmerken.UitsparingDataSpoelbak@visible = (_IsSpoelbaklade);
-UI.Kenmerken.UitsparingDataSpoelbak.Z1@label = GetLocalizedLabel("Z");
+UI.Kenmerken.UitsparingDataSpoelbak.Z1@label = TRL.Z@label;
 
 local double _BreedteX = 158;
 local double _BreedteY = 158;
@@ -5869,7 +5881,7 @@
 
 	local string _Feedback = "";
 
-	_Feedback = _Feedback + "&lt;b&gt;" + GetLocalizedLabel("BewarenError") + ":" + "&lt;/b&gt;";
+	_Feedback = _Feedback + "&lt;b&gt;" + TRL.BewarenError@label + ":" + "&lt;/b&gt;";
 	_Feedback = _Feedback + "&lt;ul style='list-style-type:square;'&gt;";
 	
 	for i = 1 to Len(DATA.Lijn.InvalidFieldSet@options)
@@ -5903,7 +5915,7 @@
 
 	local string _Feedback = "";
 
-	_Feedback = _Feedback + "&lt;b&gt;" + GetLocalizedLabel("BewarenError") + ":" + "&lt;/b&gt;";
+	_Feedback = _Feedback + "&lt;b&gt;" + TRL.BewarenError@label + ":" + "&lt;/b&gt;";
 	_Feedback = _Feedback + "&lt;ul style='list-style-type:square;'&gt;";
 	
 	for i = 1 to Len(DATA.Lijn.InvalidFieldSet@options)
@@ -5937,7 +5949,7 @@
 	
 	local string _Feedback = "";
 
-	_Feedback = _Feedback + "&lt;b&gt;" + GetLocalizedLabel("BewarenError") + ":" + "&lt;/b&gt;";
+	_Feedback = _Feedback + "&lt;b&gt;" + TRL.BewarenError@label + ":" + "&lt;/b&gt;";
 	_Feedback = _Feedback + "&lt;ul style='list-style-type:square;'&gt;";
 	
 	for i = 1 to Len(DATA.Lijn.InvalidFieldSet@options)
@@ -5968,7 +5980,7 @@
 local string _Feedback = "";
 
 if (_Result) then
-	_Feedback = _Feedback + "&lt;b&gt;" + GetLocalizedLabel("BewarenKlantVoorkeurenSuccess") + "&lt;/b&gt;";
+	_Feedback = _Feedback + "&lt;b&gt;" + TRL.BewarenKlantVoorkeurenSucces@label + "&lt;/b&gt;";
 	_Feedback = _Feedback + "&lt;ul style='list-style-type:square;'&gt;";
 	
 	for i = 1 to Len(CONFIG.Defaults.KlantVoorkeuren@options)
@@ -5996,7 +6008,7 @@
 			
 			if (_IsNietMeeleveren and CBool(_Id) and (LCase(_ShortName) in CONFIG.NietMeeleverenExtern@options)) then
 				_Feedback = _Feedback + "&lt;li&gt;";
-				_Feedback = _Feedback + GetLocalizedLabel("NietMeeleveren") + ": " + GetLocalizedLabel(_Label);
+				_Feedback = _Feedback + DATA.Kenmerken.NietMeeleveren@label + ": " + GetLocalizedLabel(_Label);
 				_Feedback = _Feedback + "&lt;/li&gt;";
 			end if;
 			
@@ -6010,7 +6022,7 @@
 	
 	_Feedback = _Feedback + "&lt;/ul&gt;";
 else 
-	_Feedback = _Feedback + "&lt;b&gt;" + GetLocalizedLabel("BewarenKlantVoorkeurenError") + "&lt;/b&gt;";
+	_Feedback = _Feedback + "&lt;b&gt;" + TRL.BewarenKlantVoorkeurenError@label + "&lt;/b&gt;";
 end if;
 
 local long _FeedbackResult = MsgBox(_Feedback);