'changed_to_i18nBundle_names'

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties

@@ -1038,3 +1038,4 @@ dd_upper=Day degree upper cutoffs
 observedPhase=Observed phase at biofix date
 YSTEMBTEMP=Yellow Stemborer Temperature Model
 addIllustration=Add illustration
+allRoles=All roles

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties

@@ -1031,3 +1031,4 @@ dd_upper=Day degree upper cutoffs
 observedPhase=Observed phase at biofix date
 YSTEMBTEMP=Yellow Stemborer Temperature Model
 addIllustration=Add illustration
+allRoles=All roles

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties

@@ -1030,3 +1030,4 @@ dd_upper=Day degree upper cutoffs
 observedPhase=Observed phase at biofix date
 YSTEMBTEMP=Yellow Stemborer Temperature Model
 addIllustration=Add illustration
+allRoles=All roles

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties

@@ -1039,3 +1039,4 @@ dd_upper=Maksimumstemperaturer d\u00f8gngradberegning
 observedPhase=Observert utviklingsstadium ved biofix-dato
 YSTEMBTEMP=Yellow Stemborer temperaturmodell
 addIllustration=Legg til illustrasjon
+allRoles=Alle roller

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties

@@ -1032,3 +1032,4 @@ dd_upper=Day degree upper cutoffs
 observedPhase=Observed phase at biofix date
 YSTEMBTEMP=Yellow Stemborer Temperature Model
 addIllustration=Add illustration
+allRoles=All roles

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties

@@ -1025,3 +1025,4 @@ dd_upper=Day degree upper cutoffs
 observedPhase=Observed phase at biofix date
 YSTEMBTEMP=Yellow Stemborer Temperature Model
 addIllustration=Add illustration
+allRoles=All roles

src/main/webapp/templates/userList.ftl

@@ -113,12 +113,12 @@
 	</p>
         <#if messageKey?has_content>
 		<div class="alert alert-success">${i18nBundle(messageKey)}</div>
-	</#if>
+	</#if>              
         <tr>
             <td>
                 <#if user.isSuperUser() || user.isOrganizationAdmin() >
                     <select onchange="<#if user.isSuperUser()>sortByOrgAndUserRole();<#else>sortByUserRole();</#if>" id="selectUserRole" class="form-control">
-                        <option value="-1">*Alle typer brukere</option>
+                        <option value="-1">${i18nBundle.allRoles}</option>
                         <#list vipsLogicRoles as role>
                             <option value="${role.vipsLogicRoleId}">${i18nBundle["vipsLogicRole_" + role.vipsLogicRoleId]}</option>
                         </#list>
@@ -127,7 +127,7 @@
             <br>
                 <#if user.isSuperUser() >
                     <select onclick="sortByOrgAndUserRole();" id="selectOrg" class="form-control">
-                        <option value="-1">*Alle organisasjoner</option>
+                        <option value="-1">${i18nBundle.allOrganizations}</option>
                         <#list organizations as org>
                             <option value=${org.organizationId}>${org.organizationName}</option>
                         </#list>  
@@ -141,8 +141,8 @@
 			<th>${i18nBundle.lastName}</th>
                         <th>${i18nBundle.firstName}</th>
 			<th>${i18nBundle.status}</th>
-                        <th>*Organisasjon</th>
-                        <th>*Roller</th>
+                        <th>${i18nBundle.organizationId}</th>
+                        <th>${i18nBundle.vipsLogicRoles}</th>
 		</thead>
 		<tbody>
                 <!-- The ones that need treatment first -->