diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties index c50e7a8c6066d6b3d030196e525b4e3fc360b70e..13230b38ed8e0db010f43a5ee3dd22fdef17d584 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties @@ -426,7 +426,7 @@ locationIsPrivate = Sted skal ikke offentliggj\u00f8res locationIsPublic = Sted kan vises offentlig -locationPointOfInterestId=Sted-Id +locationPointOfInterestId=Sted logInterval = M\u00e5leintervall @@ -1034,6 +1034,7 @@ weatherStations = M\u00e5lestasjoner xIsNotAfterY = {0} er ikke etter {1} + xIsNotEqualToY = {0} er ikke lik {1} your = Din diff --git a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html index 92f82d74c599925b4fa6869a9f780a92c10e9558..4b2e97c64a691fd9ffe8d896aba1cf56feb0c8cb 100755 --- a/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html +++ b/src/test/resources/HTMLFormGeneratorTest/forecastConfigurationForm_result.html @@ -17,7 +17,7 @@ <span class="help-block" id="forecastConfigurationForm_modelId_validation"></span> </div> <div class="form-group"> -<label for="locationPointOfInterestId">Lokalitet</label> +<label for="locationPointOfInterestId">Sted</label> <select class="form-control" name="locationPointOfInterestId" onblur="validateField(this);"> <option value="-1">Vennligst velg målestasjon</option> <option value="38">Ullensvang</option>