diff --git a/translations/messages.en_GB.xliff b/translations/messages+intl-icu.en_GB.xliff
similarity index 99%
rename from translations/messages.en_GB.xliff
rename to translations/messages+intl-icu.en_GB.xliff
index b2509e61..1cb4ea7a 100644
--- a/translations/messages.en_GB.xliff
+++ b/translations/messages+intl-icu.en_GB.xliff
@@ -949,7 +949,7 @@
       </trans-unit>
       <trans-unit id="35393850a281f8697c65b09f1287abde67b81a1f" resname="ra.management.search.text.number_results">
         <source>ra.management.search.text.number_results</source>
-        <target>{0}no results found.|{1}%count% result found.|]1,Inf]%count% results found.</target>
+        <target>{count,plural,=0 {No results found.}one{# result found.}other{# results found.}}</target>
         <jms:reference-file line="10">/src/../src/Surfnet/StepupRa/RaBundle/Resources/views/ra_management/manage.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="ea11cd6d8f399195aeb56a640ac0a946a5302fce" resname="ra.menu.institution-configuration">
@@ -1236,7 +1236,7 @@
       </trans-unit>
       <trans-unit id="4292d16545d77ea6d0d8dcc6b51dc067b49d216b" resname="ra.recovery_token.search.text.number_of_recovery_tokens">
         <source>ra.recovery_token.search.text.number_of_recovery_tokens</source>
-        <target state="translated">{0}no results found.|{1}%count% result found.|]1,Inf]%count% results found.</target>
+        <target state="translated">{count,plural,=0 {No results found.}one{# result found.}other{# results found.}}</target>
         <jms:reference-file line="11">/src/../src/Surfnet/StepupRa/RaBundle/Resources/views/recovery_token/search.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="c6a8ca63fb65eca2a27a29e12c249f2426bf9bfa" resname="ra.recovery_token.search.title">
@@ -1372,7 +1372,7 @@
       </trans-unit>
       <trans-unit id="2e427c59176d431e47b67cbc0bd137a328979a16" resname="ra.second_factor.search.text.number_of_second_factors">
         <source>ra.second_factor.search.text.number_of_second_factors</source>
-        <target>{0}no results found.|{1}%count% result found.|]1,Inf]%count% results found.</target>
+        <target>{count,plural,=0 {No results found.}one{# result found.}other{# results found.}}</target>
         <jms:reference-file line="11">/src/../src/Surfnet/StepupRa/RaBundle/Resources/views/second_factor/search.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="eb850d6b26e216bb475d931bd9d785fde606299d" resname="ra.second_factor.search.title">
diff --git a/translations/messages.nl_NL.xliff b/translations/messages+intl-icu.nl_NL.xliff
similarity index 99%
rename from translations/messages.nl_NL.xliff
rename to translations/messages+intl-icu.nl_NL.xliff
index aa382ed8..5d9131ba 100644
--- a/translations/messages.nl_NL.xliff
+++ b/translations/messages+intl-icu.nl_NL.xliff
@@ -949,7 +949,7 @@
       </trans-unit>
       <trans-unit id="35393850a281f8697c65b09f1287abde67b81a1f" resname="ra.management.search.text.number_results">
         <source>ra.management.search.text.number_results</source>
-        <target>{0}geen resultaten gevonden.|{1}%count% resultaat gevonden.|]1,Inf]%count% resultaten gevonden.</target>
+        <target>{count,plural,=0 {Geen resultaten gevonden.}one{# resultaat gevonden.}other{# resultaten gevonden.}}</target>
         <jms:reference-file line="10">/src/../src/Surfnet/StepupRa/RaBundle/Resources/views/ra_management/manage.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="ea11cd6d8f399195aeb56a640ac0a946a5302fce" resname="ra.menu.institution-configuration">
@@ -1236,7 +1236,7 @@
       </trans-unit>
       <trans-unit id="4292d16545d77ea6d0d8dcc6b51dc067b49d216b" resname="ra.recovery_token.search.text.number_of_recovery_tokens">
         <source>ra.recovery_token.search.text.number_of_recovery_tokens</source>
-        <target state="translated">{0}geen resultaten gevonden.|{1}%count% resultaat gevonden.|]1,Inf]%count% resultaten gevonden.</target>
+        <target>{count,plural,=0 {Geen resultaten gevonden.}one{# resultaat gevonden.}other{# resultaten gevonden.}}</target>
         <jms:reference-file line="11">/src/../src/Surfnet/StepupRa/RaBundle/Resources/views/recovery_token/search.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="c6a8ca63fb65eca2a27a29e12c249f2426bf9bfa" resname="ra.recovery_token.search.title">
@@ -1372,7 +1372,7 @@
       </trans-unit>
       <trans-unit id="2e427c59176d431e47b67cbc0bd137a328979a16" resname="ra.second_factor.search.text.number_of_second_factors">
         <source>ra.second_factor.search.text.number_of_second_factors</source>
-        <target>{0}geen resultaten gevonden.|{1}%count% resultaat gevonden.|]1,Inf]%count% resultaten gevonden.</target>
+        <target>{count,plural,=0 {Geen resultaten gevonden.}one{# resultaat gevonden.}other{# resultaten gevonden.}}</target>
         <jms:reference-file line="11">/src/../src/Surfnet/StepupRa/RaBundle/Resources/views/second_factor/search.html.twig</jms:reference-file>
       </trans-unit>
       <trans-unit id="eb850d6b26e216bb475d931bd9d785fde606299d" resname="ra.second_factor.search.title">
diff --git a/translations/validators.en_GB.xliff b/translations/validators+intl-icu.en_GB.xliff
similarity index 100%
rename from translations/validators.en_GB.xliff
rename to translations/validators+intl-icu.en_GB.xliff
diff --git a/translations/validators.nl_NL.xliff b/translations/validators+intl-icu.nl_NL.xliff
similarity index 100%
rename from translations/validators.nl_NL.xliff
rename to translations/validators+intl-icu.nl_NL.xliff