diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
index d1b535a4cc9b8bfe6cb4e23143f9a04c0edefe1f..03e0245fe58ee6f99153ddd76e9281ba5d3d982a 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
@@ -391,7 +391,9 @@ isPest = Is pest
 isPrivate = Is private
 
 isQuantified = Is quantified
+
 isPositiveRegistration=Pest presence confirmed
+
 isRequiredField = Required field
 
 language = Language
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
deleted file mode 100755
index 69fb5f1d3cda2371e2ac60f20c77b441c431eb66..0000000000000000000000000000000000000000
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
+++ /dev/null
@@ -1,1059 +0,0 @@
-#
- # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
- # 
- # This file is part of VIPSLogic.
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU Affero General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU Affero General Public License for more details.
- #
- # You should have received a copy of the GNU Affero General Public License
- # along with this program.  If not, see <https://www.gnu.org/licenses/>.
- # 
-isPositiveRegistration=Pest presence confirmed
-ALTERNARIA = Alternaria Model
-
-APPLESCABM = Apple scab model
-
-BARLEYNETB = Barley net blotch model
-
-BREMIALACT = Bremia lactucae model
-
-CYDIAPOMON = Cydia pomonella model
-
-DELIARADIC = Delia radicum model
-
-DELIARFOBO = Delia radicum/floralis observation model for old crops
-
-DELIARFOBS = Delia radicum/floralis observation model
-
-DELIARFOBY = Delia radicum/floralis observation model for young crops
-
-DOWNCASTMO = DOWNCAST model
-
-FINNCEREAL = Model for Pyrenophora teres, Drechslera tritici-repentis and Stagonospora nodorum
-
-GRASSDRYMO = Grass drying model
-
-LYGUSRUGUL = Lygus rugulipennis model
-
-MAMESTRABR = Mamestra brassicae model
-
-Mail = Email
-
-NAERSTADMO = N\u00e6rstad's model
-
-NEGPROGMOD = Negative prognosis model
-
-OATFLOWERM = Oat flowering model
-
-PLASMOVITI = Downy Mildew model
-
-PSILAROBSE = Psila rosae observation model
-
-PSILARTEMP = Psila rosae Temperature Model
-
-RAINYDAYSM = Rainy days model
-
-SEPAPIICOL = Septoria apiicola model
-
-SEPTREFHUM = Septoria reference humidity model
-
-Sms = SMS
-
-VIPSLogicTitle = VIPS administration system
-
-active = Active
-
-activeWeatherStations = Active weather stations
-
-addMultipleNew = Add multiple new
-
-addNew = Add new
-
-address = Address
-
-advisor = Advisor
-
-all = All
-
-allCategories = All categories
-
-allCrops = All crops
-
-allOrganizations = All organizations
-
-allPests = All pests
-
-allSystems = All systems
-
-altitude = Altitude
-
-appleFruitMoth = Apple fruit moth
-
-appleFruitMothChangeSeasonConfirm = Are you sure you want to change season? All unsaved data for the current season will be lost.
-
-approvalApplication = Approval application
-
-approvalApplicationHelp = Describe what you want to do as a registered user. E.g. write messages, register observations, etc.
-
-approved = Approved
-
-approvesSmsBilling = Approves billing for SMS messages
-
-approvesSmsBillingDescription = By checking this option, you confirm that you accept the billing costs for receiving SMS messages from our subscription services. This consent can be terminated at any time, either by unchecking this checkbox or by sending VIPS STOP to your country's short number. Number for Norway is 1963.
-
-archiveUserId = Archive user
-
-attachIdToExistingUser = Add this login to my existing user
-
-attachIdToExistingUserReceipt = The id was successfully connected to the user. You may now log in with it
-
-availableFor = Available for
-
-availableTranslations = Available translations
-
-back = Back
-
-barkbeetle = Barkbilleoverv\u00e5king
-
-body = Body
-
-broadcastMessage = Broadcast the message
-
-browse = Browse
-
-calculationEnd = Calculation end
-
-calculationStart = Calculation start
-
-cancel = Cancel
-
-changeDate = Change date
-
-children = Children
-
-city = City
-
-clearAll = Clear all
-
-clearOne = Clear one
-
-clusterStored = The cluster information was stored
-
-completenessAtFinish = Completeness at finish
-
-configureAndRunManually = Configure and run manually
-
-confirmCancel = Do you really want to cancel?
-
-confirmDelete = Do you really want to delete?
-
-confirmEmailFailure = Your email address was not confirmed. Please contact the system administrator.
-
-confirmEmailReceipt = Your email was successfully confirmed. You will be notified as soon as the organization administrator approves your application.
-
-confirmLeaveForm = Do you really want to leave this form? All changes are left behind.
-
-confirmReloadForm = Do you really want to reload this form. All unsaved changes will be lost.
-
-country = Country
-
-createPasswordResetCodeAndSendToUserBody = You have requested to reset your current password for username {0} in VIPSLogic, and create a new one. Please follow this link to proceed: {1}
-
-createPasswordResetCodeAndSendToUserSubject = Create new password in VIPSLogic
-
-cropCategoriesFor = Crop categories for
-
-cropCategory = Crop category
-
-cropCategoryIds = Crop categories
-
-cropCategoryUpdated = Crop category was updated
-
-cropOrganismId = Crop
-
-cropOrganismIds = Crops
-
-cropPestUpdated = Crop pest was updated
-
-cropSusceptibility = Crop susceptibility
-
-crops = Crops
-
-currentDate = Current date
-
-dataSource = Data source
-
-dataSourceMissing = Data source is missing
-
-dataSourceName = Data source name
-
-date2ndUpperLeafEmerging = Date 2nd upper leaf emerging
-
-date3rdUpperLeafEmerging = Date 3rd upper leaf emerging
-
-dateEnd = Date end
-
-dateGs31 = Date GS 31
-
-dateGs75 = Date GS 75
-
-datePub = Date published
-
-datePubPeriod = Period of publication
-
-dateSpraying1 = Spraying date 1
-
-dateSpraying2 = Spraying date 2
-
-dateStart = Date start
-
-dateUpperLeafEmerging = Date upper leaf emerging
-
-dateValidTo = Valid to date
-
-days = Days
-
-defaultLocale = Default language
-
-defaultMapCenter = Default map center
-
-defaultMapZoom = Default map zoom
-
-defaultTimeZone = Default time zone
-
-defaultVipsCoreUserId = Default VIPSCore user ID
-
-degreeOfParasitation = Degree of parasitation
-
-delete = Delete
-
-deleteIllustration = Delete illustration
-
-deletePoi = Delete point of interest
-
-deleteUser = Delete user
-
-deleteUserDescription = You must transfer the user's resouces to another user before deleting is possible
-
-deleteWeatherStation = Delete weather station
-
-deleteWeatherStationPreviewExplanation = The weather station that you want to delete has the resources below connected to it. When you delete the weather station, you also delete these resources.
-
-denominator = Denominator
-
-description = Description
-
-details = Details
-
-digit = Digit
-
-doesNotMatchDateFormat = Does not match format {0}
-
-doesNotMatchFormatX = Does not match format {0}
-
-edit = Edit
-
-editCropPests = Edit pests for crop
-
-editMessage = Edit message
-
-editObservation = Edit observation
-
-editOrganization = Edit organization
-
-editPoi = Edit Point Of Interest
-
-editWeatherStation = Edit weather station
-
-elementMeasurementTypes = Measurement types
-
-email = Email
-
-emailAddressIsAlreadyInUse = Email address is already in use
-
-emailNotRegistered = The email address is not registered
-
-emailNotUnique = The email address is not unique. Please contact the VIPSLogic administrator to sort this out.
-
-emailNotVerified = You must verify your email address before the user approval process can proceed
-
-endTime = End time
-
-exceedsMaxLengthOf = Exceeds max length of {0}
-
-externalForecastProviders = External forecast providers
-
-externalResourceIdentifier = External resource identifier
-
-externalResources = External resources
-
-factoryId = Factory id
-
-farmer = Farmer
-
-farms = Farms
-
-fieldIsRequired = Field is required
-
-fieldSowingDate = Field sowing date
-
-fields = Fields
-
-traps = Traps
-
-filter = Filter
-
-filterList = Filter list
-
-filterMessages = Filter messages
-
-firstName = First name
-
-forecastConfigurationDeleted = Forecast configuration was deleted
-
-forecastConfigurationId = Forecast configuration
-
-forecastConfigurationIds = Forecast configuration ids
-
-forecastConfigurationUpdated = Forecast configuration was updated
-
-forecastNotificationMessageBodyTpl_1 = This is for {0} in {1} at location {2} at date {3}. Details: {4}
-
-forecastNotificationMessageBodyTpl_2 = This is for {0} in {1} at location {2} at date {3}.Read more: {4}
-
-forecastNotificationMessageHeadingTpl_1 = Notification of high risk of infection
-
-forecastNotificationMessageHeadingTpl_2 = Notification of moderate infection risk
-
-forecastNotifications = Forecast notifications
-
-forecastNotificationsDescription = Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a  higher risk level. E.g. green to yellow or yellow to red status.
-
-forecasts = Forecasts
-
-forgottenPassword = Forgotten password
-
-freeSms = Free SMS
-
-from = From
-
-general = General
-
-genericPlaces = Generic places
-
-greeting = Dobro do\u0161li u
-
-groupMembers = Group members
-
-heading = Heading
-
-help = Help
-
-helpMessageFormCropCategoryIds = No crop selection means visibility regardless of user's crop preferences
-
-hierarchyCategoryId = Hierarchy category
-
-higherThanMaximum = Higher than the maximum ({0})
-
-illustration = Illustration
-
-inactiveWeatherStations = Inactive weather stations
-
-includeAllChildCrops = Include all child crops
-
-indexText = VIPSLogic is the common administration system for VIPS. This is where you configure users, weather stations and forecasts, and where you report observations and write messages, and more.
-
-informAdminOfConfirmedEmailBody = The user''s last name is {0}. The approval information is as follows: {1}. \\nFollow this link to edit this user: {2} \\n Follow this link to approve automatically: {3}
-
-informAdminOfConfirmedEmailSubject = New user has confirmed email and is now ready for approval
-
-internal = Internal
-
-invalidFormat = Invalid format
-
-invalidcredentials = Invalid username and/or password
-
-isCrop = Is crop
-
-isForecastLocation = Is forecast location
-
-isPest = Is pest
-
-isPrivate = Is private
-
-isQuantified = Is quantified
-
-isRequiredField = Required field
-
-language = Language
-
-lastEditedBy = Last edited by
-
-lastName = Last name
-
-lastUpdated = Last updated
-
-latinName = Latin name
-
-latitude = Latitude
-
-leadParagraph = Lead paragraph
-
-leafLifeTime = Leaf life time (days)
-
-leaveForm = Leave form
-
-listCrops = List all crops
-
-listPests = List all pests
-
-listSelectedCropCategoryOnTop = List crops from selected category on top
-
-localName = Local name
-
-location = Location
-
-locationIsPrivate = Location is private
-
-locationIsPublic = Location is public
-
-locationPointOfInterestId = Location
-
-logInterval = Log interval
-
-logInterval1d = 1 day
-
-logInterval1h = 1 hour
-
-loggedinas = Prijavi se kao
-
-login = Log in
-
-loginCredentials = Login credentials
-
-logout = Log out
-
-logoutsuccess = You are now logged out. Welcome back!
-
-longitude = Longitude
-
-lowerThanMinimum = Lower than the minimum ({0})
-
-lowercase = Lower case
-
-mapDataIsRequired = Map data is required
-
-mapDrawTypeLabel = What do you want to draw
-
-maskObservationWith = Mask observation with
-
-messageDeleted = Message was deleted
-
-messageFormat = Message format
-
-messageIllustrationCaptionLocale = Caption
-
-messageNotifications = Message notifications
-
-messageNotificationsDescription = A message notification is issued when a news message is published for a specific crop group.
-
-messageTags = Message tags
-
-messageUpdated = Message was updated
-
-messages = Messages
-
-meter = Meter
-
-missing = Missing
-
-missingInDatabase = Missing in database
-
-missingSeparatorComma = Missing separator comma
-
-missingUsernameAndPassword = Missing username and password
-
-missingValues = Missing values
-
-modelId = Forecasting model
-
-modelName = Model name
-
-multipleForecastConfigurationsCreated = The forecast configurations were successfully created
-
-myAccount = My account
-
-name = Name
-
-nameAlreadyExists = The name already exists
-
-newGroup = New group
-
-newIllustration = New illustration
-
-newMessage = New message
-
-newObservation = New observation
-
-newObservationSite = New observation site
-
-newObservationSitePoint = New observation site point
-
-newOrganism = New organism
-
-newOrganization = New organization
-
-newPoi = New Point Of Interest
-
-newUser = New user
-
-newUserCredentialsHelpText = Please enter a user name for the new user. An auto generated password will be sent to the user's email address.
-
-newWeatherStation = New weather station
-
-noDescriptionFound = No description found
-
-noMapDataEntered = No map data entered
-
-noPrivateForecastsFoundForUser = No private forecasts found for user
-
-noResultsFoundForCriteria = No results were found for the given search criteria
-
-noTasksRunning = No tasks running
-
-noWhitespaceAllowed = No whitespace allowed
-
-none = None
-
-notificationSubscriptionDescription = You can subscribe to different kinds of notifications below. Choose the format for notification, for instance email or SMS
-
-notificationSubscriptions = Notification subscriptions
-
-notificationSubscriptionsUpdated = Notification subscriptions was successfully updated
-
-numberRequired = A number is required
-
-observationData = Observation data
-
-observationDataField_counting1 = Counting 1
-
-observationDataField_counting2 = Counting 2
-
-observationDataField_trapCountCropEdge = Number of trap counts at field's edge
-
-observationDataField_trapCountCropInside = Number of trap counts inside the field
-
-observationDeleted = Observation was deleted
-
-observationHeading = Observation heading
-
-observationMap = Observation map
-
-observationMethodDescription_KNOCKING = Knocking description (TODO)
-
-observationMethodDescription_NOT_REGISTERED = The observation method is not registered
-
-observationMethodId = Observation method
-
-observationMethodTitle_COUNTING = Counting
-
-observationMethodTitle_HARVESTING = Harvesting
-
-observationMethodTitle_KNOCKING = Knocking
-
-observationMethodTitle_NOT_REGISTERED = Not registered
-
-observationMethodTitle_VISUAL = Visual
-
-observationNotifications = Observation notifications
-
-observationNotificationsDescription = An observation notification is issued when a field observation is made of a pest or disease in a specific crop group.
-
-observationSiteName = Observation site name
-
-observationSitePointName = Observation site point name
-
-observationSitePoints = Observation site pointsObservasjonsstedspunkter
-
-observationSiteStored = Observation site was successfully updated
-
-observationStored = Observation was stored
-
-observationText = Observation text
-
-observations = Observations
-
-observedDateOfFirstCatch = Observed date of first catch
-
-observedValue = Observed value
-
-observer = Observer
-
-older = Older
-
-or = Or
-
-organism = Organism
-
-organismDeleted = Organism was deleted
-
-organismId = Organism id
-
-organismNotDeleted = Organism was not deleted
-
-organismRegistered = Organism was registered
-
-organismUpdated = Organism was updated
-
-organisms = Organisms
-
-organizationGroupDeleted = The organization group was deleted
-
-organizationGroupList = Organization groups
-
-organizationGroupStored = Organization group was stored
-
-organizationId = Organization
-
-organizationStored = Organization was stored
-
-organizations = Organizations
-
-organizationsArchiveUser = The organization's standard archive user
-
-other = Other
-
-parentOrganismId = Parent organism
-
-password = Password
-
-password2 = Repeat password
-
-passwordResetCodeExpired = The password reset code has expired.
-
-passwordResetCodeNotFound = The password reset code was not found
-
-passwordResetSuccess = Password was successfully created. Please log in.
-
-passwordsDoNotMatch = Passwords do not match
-
-pending = Pending
-
-pestOrganismId = Pest
-
-pestOrganismIds = Pests
-
-phone = Telephone
-
-pleaseAwaitApproval = Please await your user approval
-
-pleaseSelect = Please select
-
-pleaseSpecifyOther = If other, please specify
-
-pleaselogin = Please log in
-
-poi = Point of interest
-
-poiDeleted = Point of interest was deleted
-
-poiStored = Poi was stored
-
-point = point
-
-pointOfInterestType = Point of Interest Type
-
-pointOfInterestType_0 = Unspecified
-
-pointOfInterestType_1 = Weather station
-
-pointOfInterestType_2 = Farm
-
-pointOfInterestType_3 = Field
-
-pointOfInterestType_4 = Region
-
-pois = Points Of Interest
-
-polygon = Polygon
-
-position = Position
-
-postalCode = Postal code
-
-preferredLocale = Preferred locale
-
-previousCrop = Previous crop
-
-privateForecasts = Private forecasts
-
-privateForecastsForOtherUser = Private forecasts for other user
-
-progress = Progress
-
-publicForecasts = Public forecasts
-
-publiclyAvailable = Publicly available
-
-reference = Reference
-
-registerNewUser = Register new user
-
-registerNewUserExplanation = Please fill out the form to apply for a user account. By registering as a user in VIPS, you accept our <a href="/public/documentation/Privacy_statement_NIBIO-VIPS.pdf" target="new">privacy statement.</a>
-
-registerNewUserReceipt = Thanks. You should receive an email requesting you to validate your email address. After following the instructions there, the organization admin will hopefully approve your application shortly.
-
-registrationOf = Registration of
-
-registrationShortcuts = Registration shortcuts
-
-rejected = Rejected
-
-remarks = Remarks
-
-rememberLogin = Remember login
-
-remoteloginfailed = Remote login failed
-
-replaceIllustration = Replace illustration
-
-researcher = Researcher
-
-reset = Reset
-
-resetPassword = Reset and create new password
-
-resetPasswordFormExplanation = Please enter your new password
-
-resetPasswordRequest = Request to reset password
-
-resetPasswordRequestAccepted = Your request has been accepted. An email with further instructions have been sent to the registered email address.
-
-resetPasswordRequestFormExplanation = An email will be sent to the address you enter here, with a link to reset your current password and enter a new one.
-
-runTask = Run task
-
-runningTasks = Running tasks
-
-scheduledTasks = Scheduled tasks
-
-scheduling = Scheduling
-
-schedulingOverview = Scheduling overview
-
-schedulingStarted = Scheduling started
-
-schedulingStopped = Scheduling was stopped
-
-schedulingStoppedExplanation = The scheduling system is stopped. None of the tasks in the list below will be run, unless scheduling is started again.
-
-season = Season
-
-seasonEnd = Season end
-
-seasonStart = Season start
-
-select = Select
-
-sendUserApprovalConfirmationBody = We are happy to confirm that your user account for VIPSLogic has been approved. Please log in here: {0}
-
-sendUserApprovalConfirmationSubject = Your user account has been approved
-
-sendUsernameAndPasswordToUserBody = Here is your username and password for logging in to VIPSLogic (http://{2}):\nUsername: {0}\nPassword: {1}
-
-sendUsernameAndPasswordToUserSubject = Username and password for VIPSLogic
-
-showMeWhereIAm = Show me where I Am
-
-signInWith = Sign in with
-
-slidingHoursAhead = Reference period, forwards (hours)
-
-slidingHoursPast = Reference period, backwards (hours)
-
-specificFieldsForX = Specific fields for {0}
-
-sprayingDate01 = Spraying Date 01
-
-sprayingDate02 = Spraying Date 02
-
-sprayingDate03 = Spraying Date 03
-
-sprayingDate04 = Spraying Date 04
-
-sprayingProtectionDays = Expected protection period (days) after spraying
-
-startDateAscosporeMaturity = Start date for ascospore maturation
-
-startDateDayDegreeAccumulation = Start date for day degree accumulation
-
-startDateGrowth = Start date for growth
-
-startScheduling = Start scheduling
-
-startTime = Start time
-
-status = Status
-
-statusRemarks = Status remarks
-
-statusTypeId = Status
-
-statusTypeIdTitle_1 = Pending
-
-statusTypeIdTitle_2 = Rejected
-
-statusTypeIdTitle_3 = Approved
-
-stopScheduling = Stop scheduling
-
-submit = Submit
-
-suggestedUserRole = Suggested user role
-
-surveillanceMessageInformation = If you want to create a message about an observation, please use the observation registration form
-
-systemTime = System time
-
-taskHistory = Task history
-
-taskHistoryDate = Date for task history
-
-taskHistoryDetails = Task history details
-
-taskHistoryStatusFailedCompletely = Failed completely
-
-taskHistoryStatusFailedPartly = Failed partly
-
-taskHistoryStatusOK = OK
-
-taskXWasLaunched = Task "{0}" was launched
-
-task_DeleteAllExpiredUserUuidsTask_description = Cleaning up the database of UUIDs, which is used for remembering client logins
-
-task_DeleteAllExpiredUserUuidsTask_name = Delete all expired user UUIDs
-
-task_RunAllForecastConfigurationsForOrganizationTask_description = Test
-
-task_RunAllForecastConfigurationsForOrganizationTask_name = Run all forecasts for one organization
-
-task_RunAllForecastConfigurationsTask_description = Runs all current forecasts for all organizations
-
-task_RunAllForecastConfigurationsTask_name = Run all forecast configurations
-
-task_RunForecastConfigurationsByIdTask_description = Run all forecast configurations corresponding to ids in a comma separated list
-
-task_RunForecastConfigurationsByIdTask_name = Run forecast configurations by id
-
-task_RunGridModelsTask_description = Test
-
-task_RunGridModelsTask_name = Run grid models
-
-task_SendForecastEventNotificationsTask_description = Checks to see if there has been changes in forecasts to YELLOW or RED status. If so, finds subscribers to such events and sends notifications
-
-task_SendForecastEventNotificationsTask_name = Send forecast event notifications
-
-task_UpdateForecastResultCacheTableTask_description = To speed up certain tasks, for instance aggregating warnings for today, the table forecast_result_cache should contain only today's forecast results. Today = SystemTime.
-
-task_UpdateForecastResultCacheTableTask_name = Update forecast result cache table
-
-task_UpdateForecastSummaryTableTask_description = This task updates the table for summaries
-
-task_UpdateForecastSummaryTableTask_name = Update table of forecast summaries
-
-task_UpdateModelInformationTask_description = Fetches information about models from VIPSCoreManager and stores in VIPSLogic
-
-task_UpdateModelInformationTask_name = Update model information
-
-tasks = Tasks
-
-test = Test
-
-thousandBerrySample = Thousand berry sample
-
-thresholdHumidPeriodHours = Threshold Number of consecutive humid hours
-
-thresholdLeafWetness = Threshold leaf wetness (min/h)
-
-thresholdPrecipitation = Threshold precipitation (mm)
-
-thresholdRelativeHumidity = Threshold relative humidty (%)
-
-tillageMethod = Tillage method
-
-timeOfObservation = Time of observation
-
-timeZone = Time zone
-
-timestamp = Timestamp
-
-to = To
-
-toTheTop = To the top
-
-tooManySeparatorCommas = Too many separator commas
-
-tradeName = Trade name
-
-transferAndDelete = Transfer and delete
-
-transferResources = Transfer resources
-
-type = Type
-
-unknownOrganismId = Unknown Organism Id
-
-unknownTranslationKey = Unknown translation key: {0}
-
-up = Up
-
-uppercase = Upper case
-
-user = User
-
-userAccountInformation = User account information
-
-userApproved = The user was approved
-
-userCreatedAndInformed = User was created. An email with username and password was sent to the user's email
-
-userDeleted = User was deleted
-
-userOrganizationGroupsListDescription = Organization groups can be used to share resources like points of interest
-
-userRegistrationEmailVerificationMessageBody = We have received a request to register a new user at VIPSLogic (http://{0}/). Please confirm your email by clicking this link: {1}\n\nThank you
-
-userRegistrationEmailVerificationMessageSubject = Email verification needed
-
-userResources = User resources
-
-userStatusId = Approval status
-
-userStatus_1 = Awaiting email validation
-
-userStatus_2 = Awaiting approval
-
-userStatus_3 = Rejected
-
-userStatus_4 = Approved
-
-userStatus_5 = Disabled
-
-userUpdated = User was updated
-
-username = User name
-
-usernameExists = Username {0} exists
-
-users = Users
-
-viewAllTasks = View all tasks
-
-viewForecastConfiguration = View forecast configuration
-
-viewFullScreen = Full screen view
-
-viewOthersObservations = View observations made by others
-
-vipsLogicRole_1 = Superuser
-
-vipsLogicRole_10 = Bark beetle administrator
-
-vipsLogicRole_11 = Bark beetle county admin
-
-vipsLogicRole_2 = Organization administrator
-
-vipsLogicRole_3 = Observer
-
-vipsLogicRole_4 = Observation authority
-
-vipsLogicRole_5 = Message author
-
-vipsLogicRole_6 = Apple Fruit Moth Administrator
-
-vipsLogicRole_7 = Organism editor
-
-vipsLogicRole_8 = Apple Fruit Moth Rowanberry Cluster Counter
-
-vipsLogicRole_9 = Bark beetle registrator
-
-vipsLogicRoles = User roles
-
-vipsLogicUserId = User
-
-vipswebUrl = VIPSWeb URL
-
-warningStatus = Warning status
-
-warningStatus_0 = No forecast available
-
-warningStatus_1 = Missing data
-
-warningStatus_2 = No risk of infection
-
-warningStatus_3 = Medium risk of infection
-
-warningStatus_4 = High risk of infection
-
-warning_fieldNotFoundInFormDefinition = WARNING: field {0} not found in form definition. The system does not know how to validate it. Continue anyway?
-
-weatherForecastProvider = Weather forecast service
-
-weatherStationDeleted = Weather station was deleted
-
-weatherStationForecastConfigurations = Forecasts connected to the weather station
-
-weatherStationPointOfInterestId = Weather station
-
-weatherStationPointOfInterestIds = Weather stations
-
-weatherStationRemoteId = Remote Id for weather station
-
-weatherStationRemoteIdMissing = Remote Id for weather station is missing
-
-weatherStationStored = Weather station information was stored
-
-weatherStations = Weather stations
-
-xIsNotAfterY = {0} is not after {1}
-
-xIsNotEqualToY = {0} is not equal to {1}
-
-your = Your
-biofixDate=Biofix date
-heatRequirements=Heat requirements
-dd_lower=Day degree lower cutoffs
-dd_upper=Day degree upper cutoffs
-observedPhase=Observed phase at biofix date
-YSTEMBTEMP=Yellow Stemborer Temperature Model
-addIllustration=Add illustration
-allRoles=All roles
-allStatuses=All statuses
-LEAFBLOTCH=Leaf blotch model
-universalMessageSettingsLink_tpl=To edit your VIPS notification subscriptions, please use this link: {0}
-pointOfInterestType_5=Trap
-sowingDate=Sowing date
-pointOfInterestType_6=Apiary site
-pointOfInterestType_7=Nursery
-privacyStatement=Privacy statement
-privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf
-thresholdDSVMax=DSV threshold for high infection risk
-thresholdDSVTempMin=Minimum temperature for DSV calculation
-useGridWeatherData=Use grid weather data
-doNotUse=Do not use
-defaultGridWeatherStationDataSource=Gridded weather data source
-weatherStationDataSources=Weather station data sources
-newWeatherStationDataSource=New weather (station) data source
-editWeatherStationDataSource=Edit weather (station) data source
-datafetchUriExpression=URI template for requesting data
-infoUriExpression=Template for request for station information
-isGridWeatherDataSource=This is a grid based weather data source
-weatherStationDataSourceStored=Weather (station) data source was successfully stored
-weatherStationDataSourceDeleted=The weather (station) data source was successfully deleted
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
deleted file mode 100755
index fcde6d89ad112ea828d6f8663fcb3e1def2c91a2..0000000000000000000000000000000000000000
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
+++ /dev/null
@@ -1,1057 +0,0 @@
-#
- # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
- # 
- # This file is part of VIPSLogic.
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU Affero General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU Affero General Public License for more details.
- #
- # You should have received a copy of the GNU Affero General Public License
- # along with this program.  If not, see <https://www.gnu.org/licenses/>.
- # 
-isPositiveRegistration=Pest presence confirmed
-ALTERNARIA = Alternaria Model
-
-APPLESCABM = Apple scab model
-
-BARLEYNETB = Barley net blotch model
-
-BREMIALACT = Bremia lactucae model
-
-CYDIAPOMON = Cydia pomonella model
-
-DELIARADIC = Delia radicum model
-
-DELIARFOBO = Delia radicum/floralis observation model for old crops
-
-DELIARFOBS = Delia radicum/floralis observation model
-
-DELIARFOBY = Delia radicum/floralis observation model for young crops
-
-DOWNCASTMO = DOWNCAST model
-
-FINNCEREAL = Model for Pyrenophora teres, Drechslera tritici-repentis and Stagonospora nodorum
-
-GRASSDRYMO = Grass drying model
-
-LYGUSRUGUL = Lygus rugulipennis model
-
-MAMESTRABR = Mamestra brassicae model
-
-Mail = Email
-
-NAERSTADMO = N\u00e6rstad's model
-
-NEGPROGMOD = Negative prognosis model
-
-OATFLOWERM = Oat flowering model
-
-PLASMOVITI = Downy Mildew model
-
-PSILAROBSE = Psila rosae observation model
-
-PSILARTEMP = Psila rosae Temperature Model
-
-RAINYDAYSM = Rainy days model
-
-SEPAPIICOL = Septoria apiicola model
-
-SEPTREFHUM = Septoria reference humidity model
-
-Sms = SMS
-
-VIPSLogicTitle = VIPS administration system
-
-active = Active
-
-activeWeatherStations = Active weather stations
-
-addMultipleNew = Add multiple new
-
-addNew = Add new
-
-address = Address
-
-advisor = Advisor
-
-all = All
-
-allCategories = All categories
-
-allCrops = All crops
-
-allOrganizations = All organizations
-
-allPests = All pests
-
-allSystems = All systems
-
-altitude = Altitude
-
-appleFruitMoth = Apple fruit moth
-
-appleFruitMothChangeSeasonConfirm = Are you sure you want to change season? All unsaved data for the current season will be lost.
-
-approvalApplication = Approval application
-
-approvalApplicationHelp = Describe what you want to do as a registered user. E.g. write messages, register observations, etc.
-
-approved = Approved
-
-approvesSmsBilling = Approves billing for SMS messages
-
-approvesSmsBillingDescription = By checking this option, you confirm that you accept the billing costs for receiving SMS messages from our subscription services. This consent can be terminated at any time, either by unchecking this checkbox or by sending VIPS STOP to your country's short number. Number for Norway is 1963.
-
-archiveUserId = Archive user
-
-attachIdToExistingUser = Add this login to my existing user
-
-attachIdToExistingUserReceipt = The id was successfully connected to the user. You may now log in with it
-
-availableFor = Available for
-
-availableTranslations = Available translations
-
-back = Back
-
-barkbeetle = Barkbilleoverv\u00e5king
-
-body = Body
-
-broadcastMessage = Broadcast the message
-
-browse = Browse
-
-calculationEnd = Calculation end
-
-calculationStart = Calculation start
-
-cancel = Cancel
-
-changeDate = Change date
-
-children = Children
-
-city = City
-
-clearAll = Clear all
-
-clearOne = Clear one
-
-clusterStored = The cluster information was stored
-
-completenessAtFinish = Completeness at finish
-
-configureAndRunManually = Configure and run manually
-
-confirmCancel = Do you really want to cancel?
-
-confirmDelete = Do you really want to delete?
-
-confirmEmailFailure = Your email address was not confirmed. Please contact the system administrator.
-
-confirmEmailReceipt = Your email was successfully confirmed. You will be notified as soon as the organization administrator approves your application.
-
-confirmLeaveForm = Do you really want to leave this form? All changes are left behind.
-
-confirmReloadForm = Do you really want to reload this form. All unsaved changes will be lost.
-
-country = Country
-
-createPasswordResetCodeAndSendToUserBody = You have requested to reset your current password for username {0} in VIPSLogic, and create a new one. Please follow this link to proceed: {1}
-
-createPasswordResetCodeAndSendToUserSubject = Create new password in VIPSLogic
-
-cropCategoriesFor = Crop categories for
-
-cropCategory = Crop category
-
-cropCategoryIds = Crop categories
-
-cropCategoryUpdated = Crop category was updated
-
-cropOrganismId = Crop
-
-cropOrganismIds = Crops
-
-cropPestUpdated = Crop pest was updated
-
-cropSusceptibility = Crop susceptibility
-
-crops = Crops
-
-currentDate = Current date
-
-dataSource = Data source
-
-dataSourceMissing = Data source is missing
-
-dataSourceName = Data source name
-
-date2ndUpperLeafEmerging = Date 2nd upper leaf emerging
-
-date3rdUpperLeafEmerging = Date 3rd upper leaf emerging
-
-dateEnd = Date end
-
-dateGs31 = Date GS 31
-
-dateGs75 = Date GS 75
-
-datePub = Date published
-
-datePubPeriod = Period of publication
-
-dateSpraying1 = Spraying date 1
-
-dateSpraying2 = Spraying date 2
-
-dateStart = Date start
-
-dateUpperLeafEmerging = Date upper leaf emerging
-
-dateValidTo = Valid to date
-
-days = Days
-
-defaultLocale = Default language
-
-defaultMapCenter = Default map center
-
-defaultMapZoom = Default map zoom
-
-defaultTimeZone = Default time zone
-
-defaultVipsCoreUserId = Default VIPSCore user ID
-
-degreeOfParasitation = Degree of parasitation
-
-delete = Delete
-
-deleteIllustration = Delete illustration
-
-deletePoi = Delete point of interest
-
-deleteUser = Delete user
-
-deleteUserDescription = You must transfer the user's resouces to another user before deleting is possible
-
-deleteWeatherStation = Delete weather station
-
-deleteWeatherStationPreviewExplanation = The weather station that you want to delete has the resources below connected to it. When you delete the weather station, you also delete these resources.
-
-denominator = Denominator
-
-description = Description
-
-details = Details
-
-digit = Digit
-
-doesNotMatchDateFormat = Does not match format {0}
-
-doesNotMatchFormatX = Does not match format {0}
-
-edit = Edit
-
-editCropPests = Edit pests for crop
-
-editMessage = Edit message
-
-editObservation = Edit observation
-
-editOrganization = Edit organization
-
-editPoi = Edit Point Of Interest
-
-editWeatherStation = Edit weather station
-
-elementMeasurementTypes = Measurement types
-
-email = Email
-
-emailAddressIsAlreadyInUse = Email address is already in use
-
-emailNotRegistered = The email address is not registered
-
-emailNotUnique = The email address is not unique. Please contact the VIPSLogic administrator to sort this out.
-
-emailNotVerified = You must verify your email address before the user approval process can proceed
-
-endTime = End time
-
-exceedsMaxLengthOf = Exceeds max length of {0}
-
-externalForecastProviders = External forecast providers
-
-externalResourceIdentifier = External resource identifier
-
-externalResources = External resources
-
-factoryId = Factory id
-
-farmer = Farmer
-
-farms = Farms
-
-fieldIsRequired = Field is required
-
-fieldSowingDate = Field sowing date
-
-fields = Fields
-
-traps = Traps
-
-filter = Filter
-
-filterList = Filter list
-
-filterMessages = Filter messages
-
-firstName = First name
-
-forecastConfigurationDeleted = Forecast configuration was deleted
-
-forecastConfigurationId = Forecast configuration
-
-forecastConfigurationIds = Forecast configuration ids
-
-forecastConfigurationUpdated = Forecast configuration was updated
-
-forecastNotificationMessageBodyTpl_1 = This is for {0} in {1} at location {2} at date {3}. Details: {4}
-
-forecastNotificationMessageBodyTpl_2 = This is for {0} in {1} at location {2} at date {3}.Read more: {4}
-
-forecastNotificationMessageHeadingTpl_1 = Notification of high risk of infection
-
-forecastNotificationMessageHeadingTpl_2 = Notification of moderate infection risk
-
-forecastNotifications = Forecast notifications
-
-forecastNotificationsDescription = Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a  higher risk level. E.g. green to yellow or yellow to red status.
-
-forecasts = Forecasts
-
-forgottenPassword = Forgotten password
-
-freeSms = Free SMS
-
-from = From
-
-general = General
-
-genericPlaces = Generic places
-
-greeting = Dobro do\u0161li u
-
-groupMembers = Group members
-
-heading = Heading
-
-help = Help
-
-helpMessageFormCropCategoryIds = No crop selection means visibility regardless of user's crop preferences
-
-hierarchyCategoryId = Hierarchy category
-
-higherThanMaximum = Higher than the maximum ({0})
-
-illustration = Illustration
-
-inactiveWeatherStations = Inactive weather stations
-
-includeAllChildCrops = Include all child crops
-
-indexText = VIPSLogic is the common administration system for VIPS. This is where you configure users, weather stations and forecasts, and where you report observations and write messages, and more.
-
-informAdminOfConfirmedEmailBody = The user''s last name is {0}. The approval information is as follows: {1}. \\nFollow this link to edit this user: {2} \\n Follow this link to approve automatically: {3}
-
-informAdminOfConfirmedEmailSubject = New user has confirmed email and is now ready for approval
-
-internal = Internal
-
-invalidFormat = Invalid format
-
-isCrop = Is crop
-
-isForecastLocation = Is forecast location
-
-isPest = Is pest
-
-isPrivate = Is private
-
-isQuantified = Is quantified
-
-isRequiredField = Required field
-
-language = Language
-
-lastEditedBy = Last edited by
-
-lastName = Last name
-
-lastUpdated = Last updated
-
-latinName = Latin name
-
-latitude = Latitude
-
-leadParagraph = Lead paragraph
-
-leafLifeTime = Leaf life time (days)
-
-leaveForm = Leave form
-
-listCrops = List all crops
-
-listPests = List all pests
-
-listSelectedCropCategoryOnTop = List crops from selected category on top
-
-localName = Local name
-
-location = Location
-
-locationIsPrivate = Location is private
-
-locationIsPublic = Location is public
-
-locationPointOfInterestId = Location
-
-logInterval = Log interval
-
-logInterval1d = 1 day
-
-logInterval1h = 1 hour
-
-loggedinas = Logged in as
-
-login = Log in
-
-loginCredentials = Login credentials
-
-logout = Log out
-
-logoutsuccess = You are now logged out. Welcome back!
-
-longitude = Longitude
-
-lowerThanMinimum = Lower than the minimum ({0})
-
-lowercase = Lower case
-
-mapDataIsRequired = Map data is required
-
-mapDrawTypeLabel = What do you want to draw
-
-maskObservationWith = Mask observation with
-
-messageDeleted = Message was deleted
-
-messageFormat = Message format
-
-messageIllustrationCaptionLocale = Caption
-
-messageNotifications = Message notifications
-
-messageNotificationsDescription = A message notification is issued when a news message is published for a specific crop group.
-
-messageTags = Message tags
-
-messageUpdated = Message was updated
-
-messages = Messages
-
-meter = Meter
-
-missing = Missing
-
-missingInDatabase = Missing in database
-
-missingSeparatorComma = Missing separator comma
-
-missingUsernameAndPassword = Missing username and password
-
-missingValues = Missing values
-
-modelId = Forecasting model
-
-modelName = Model name
-
-multipleForecastConfigurationsCreated = The forecast configurations were successfully created
-
-myAccount = My account
-
-name = Name
-
-nameAlreadyExists = The name already exists
-
-newGroup = New group
-
-newIllustration = New illustration
-
-newMessage = New message
-
-newObservation = New observation
-
-newObservationSite = New observation site
-
-newObservationSitePoint = New observation site point
-
-newOrganism = New organism
-
-newOrganization = New organization
-
-newPoi = New Point Of Interest
-
-newUser = New user
-
-newUserCredentialsHelpText = Please enter a user name for the new user. An auto generated password will be sent to the user's email address.
-
-newWeatherStation = New weather station
-
-noDescriptionFound = No description found
-
-noMapDataEntered = No map data entered
-
-noPrivateForecastsFoundForUser = No private forecasts found for user
-
-noResultsFoundForCriteria = No results were found for the given search criteria
-
-noTasksRunning = No tasks running
-
-noWhitespaceAllowed = No whitespace allowed
-
-none = None
-
-notificationSubscriptionDescription = You can subscribe to different kinds of notifications below. Choose the format for notification, for instance email or SMS
-
-notificationSubscriptions = Notification subscriptions
-
-notificationSubscriptionsUpdated = Notification subscriptions was successfully updated
-
-numberRequired = A number is required
-
-observationData = Observation data
-
-observationDataField_counting1 = Counting 1
-
-observationDataField_counting2 = Counting 2
-
-observationDataField_trapCountCropEdge = Number of trap catches at field's edge
-
-observationDataField_trapCountCropInside = Number of trap catches inside the field
-
-observationDeleted = Observation was deleted
-
-observationHeading = Observation heading
-
-observationMap = Observation map
-
-observationMethodDescription_KNOCKING = Knocking description (TODO)
-
-observationMethodDescription_NOT_REGISTERED = The observation method is not registered
-
-observationMethodId = Observation method
-
-observationMethodTitle_COUNTING = Counting
-
-observationMethodTitle_HARVESTING = Harvesting
-
-observationMethodTitle_KNOCKING = Knocking
-
-observationMethodTitle_NOT_REGISTERED = Not registered
-
-observationMethodTitle_VISUAL = Visual
-
-observationNotifications = Observation notifications
-
-observationNotificationsDescription = An observation notification is issued when a field observation is made of a pest or disease in a specific crop group.
-
-observationSiteName = Observation site name
-
-observationSitePointName = Observation site point name
-
-observationSitePoints = Observation site points
-
-observationSiteStored = Observation site was successfully updated
-
-observationStored = Observation was stored
-
-observationText = Observation text
-
-observations = Observations
-
-observedDateOfFirstCatch = Observed date of first catch
-
-observedValue = Observed value
-
-observer = Observer
-
-older = Older
-
-or = Or
-
-organism = Organism
-
-organismDeleted = Organism was deleted
-
-organismId = Organism id
-
-organismNotDeleted = Organism was not deleted
-
-organismRegistered = Organism was registered
-
-organismUpdated = Organism was updated
-
-organisms = Organisms
-
-organizationGroupDeleted = The organization group was deleted
-
-organizationGroupList = Organization groups
-
-organizationGroupStored = Organization group was stored
-
-organizationId = Organization
-
-organizationStored = Organization was stored
-
-organizations = Organizations
-
-organizationsArchiveUser = The organization's standard archive user
-
-other = Other
-
-parentOrganismId = Parent organism
-
-password = Password
-
-password2 = Repeat password
-
-passwordResetCodeExpired = The password reset code has expired.
-
-passwordResetCodeNotFound = The password reset code was not found
-
-passwordResetSuccess = Password was successfully created. Please log in.
-
-passwordsDoNotMatch = Passwords do not match
-
-pending = Pending
-
-pestOrganismId = Pest
-
-pestOrganismIds = Pests
-
-phone = Telephone
-
-pleaseAwaitApproval = Please await your user approval
-
-pleaseSelect = Please select
-
-pleaseSpecifyOther = If other, please specify
-
-pleaselogin = Please log in
-
-poi = Point of interest
-
-poiDeleted = Point of interest was deleted
-
-poiStored = Poi was stored
-
-point = point
-
-pointOfInterestType = Point of Interest Type
-
-pointOfInterestType_0 = Unspecified
-
-pointOfInterestType_1 = Weather station
-
-pointOfInterestType_2 = Farm
-
-pointOfInterestType_3 = Field
-
-pointOfInterestType_4 = Region
-
-pois = Points Of Interest
-
-polygon = Polygon
-
-position = Position
-
-postalCode = Postal code
-
-preferredLocale = Preferred locale
-
-previousCrop = Previous crop
-
-privateForecasts = Private forecasts
-
-privateForecastsForOtherUser = Private forecasts for other user
-
-progress = Progress
-
-publicForecasts = Public forecasts
-
-publiclyAvailable = Publicly available
-
-reference = Reference
-
-registerNewUser = Register new user
-
-registerNewUserExplanation = Please fill out the form to apply for a user account. By registering as a user in VIPS, you accept our <a href="/public/documentation/Privacy_statement_NIBIO-VIPS.pdf" target="new">privacy statement.</a>
-
-registerNewUserReceipt = Thanks. You should receive an email requesting you to validate your email address. After following the instructions there, the organization admin will hopefully approve your application shortly.
-
-registrationOf = Registration of
-
-registrationShortcuts = Registration shortcuts
-
-rejected = Rejected
-
-remarks = Remarks
-
-rememberLogin = Remember login
-
-remoteloginfailed = Remote login failed
-
-replaceIllustration = Replace illustration
-
-researcher = Researcher
-
-reset = Reset
-
-resetPassword = Reset and create new password
-
-resetPasswordFormExplanation = Please enter your new password
-
-resetPasswordRequest = Request to reset password
-
-resetPasswordRequestAccepted = Your request has been accepted. An email with further instructions have been sent to the registered email address.
-
-resetPasswordRequestFormExplanation = An email will be sent to the address you enter here, with a link to reset your current password and enter a new one.
-
-runTask = Run task
-
-runningTasks = Running tasks
-
-scheduledTasks = Scheduled tasks
-
-scheduling = Scheduling
-
-schedulingOverview = Scheduling overview
-
-schedulingStarted = Scheduling started
-
-schedulingStopped = Scheduling was stopped
-
-schedulingStoppedExplanation = The scheduling system is stopped. None of the tasks in the list below will be run, unless scheduling is started again.
-
-season = Season
-
-seasonEnd = Season end
-
-seasonStart = Season start
-
-select = Select
-
-sendUserApprovalConfirmationBody = We are happy to confirm that your user account for VIPSLogic has been approved. Please log in here: {0}
-
-sendUserApprovalConfirmationSubject = Your user account has been approved
-
-sendUsernameAndPasswordToUserBody = Here is your username and password for logging in to VIPSLogic (http://{2}):\nUsername: {0}\nPassword: {1}
-
-sendUsernameAndPasswordToUserSubject = Username and password for VIPSLogic
-
-showMeWhereIAm = Show me where I Am
-
-signInWith = Sign in with
-
-slidingHoursAhead = Reference period, forwards (hours)
-
-slidingHoursPast = Reference period, backwards (hours)
-
-specificFieldsForX = Specific fields for {0}
-
-sprayingDate01 = Spraying Date 01
-
-sprayingDate02 = Spraying Date 02
-
-sprayingDate03 = Spraying Date 03
-
-sprayingDate04 = Spraying Date 04
-
-sprayingProtectionDays = Expected protection period (days) after spraying
-
-startDateAscosporeMaturity = Start date for ascospore maturation
-
-startDateDayDegreeAccumulation = Start date for day degree accumulation
-
-startDateGrowth = Start date for growth
-
-startScheduling = Start scheduling
-
-startTime = Start time
-
-status = Status
-
-statusRemarks = Status remarks
-
-statusTypeId = Status
-
-statusTypeIdTitle_1 = Pending
-
-statusTypeIdTitle_2 = Rejected
-
-statusTypeIdTitle_3 = Approved
-
-stopScheduling = Stop scheduling
-
-submit = Submit
-
-suggestedUserRole = Suggested user role
-
-surveillanceMessageInformation = If you want to create a message about an observation, please use the observation registration form
-
-systemTime = System time
-
-taskHistory = Task history
-
-taskHistoryDate = Date for task history
-
-taskHistoryDetails = Task history details
-
-taskHistoryStatusFailedCompletely = Failed completely
-
-taskHistoryStatusFailedPartly = Failed partly
-
-taskHistoryStatusOK = OK
-
-taskXWasLaunched = Task "{0}" was launched
-
-task_DeleteAllExpiredUserUuidsTask_description = Cleaning up the database of UUIDs, which is used for remembering client logins
-
-task_DeleteAllExpiredUserUuidsTask_name = Delete all expired user UUIDs
-
-task_RunAllForecastConfigurationsForOrganizationTask_description = Test
-
-task_RunAllForecastConfigurationsForOrganizationTask_name = Run all forecasts for one organization
-
-task_RunAllForecastConfigurationsTask_description = Runs all current forecasts for all organizations
-
-task_RunAllForecastConfigurationsTask_name = Run all forecast configurations
-
-task_RunForecastConfigurationsByIdTask_description = Run all forecast configurations corresponding to ids in a comma separated list
-
-task_RunForecastConfigurationsByIdTask_name = Run forecast configurations by id
-
-task_RunGridModelsTask_description = Test
-
-task_RunGridModelsTask_name = Run grid models
-
-task_SendForecastEventNotificationsTask_description = Checks to see if there has been changes in forecasts to YELLOW or RED status. If so, finds subscribers to such events and sends notifications
-
-task_SendForecastEventNotificationsTask_name = Send forecast event notifications
-
-task_UpdateForecastResultCacheTableTask_description = To speed up certain tasks, for instance aggregating warnings for today, the table forecast_result_cache should contain only today's forecast results. Today = SystemTime.
-
-task_UpdateForecastResultCacheTableTask_name = Update forecast result cache table
-
-task_UpdateForecastSummaryTableTask_description = This task updates the table for summaries
-
-task_UpdateForecastSummaryTableTask_name = Update table of forecast summaries
-
-task_UpdateModelInformationTask_description = Fetches information about models from VIPSCoreManager and stores in VIPSLogic
-
-task_UpdateModelInformationTask_name = Update model information
-
-tasks = Tasks
-
-test = Test
-
-thousandBerrySample = Thousand berry sample
-
-thresholdHumidPeriodHours = Threshold Number of consecutive humid hours
-
-thresholdLeafWetness = Threshold leaf wetness (min/h)
-
-thresholdPrecipitation = Threshold precipitation (mm)
-
-thresholdRelativeHumidity = Threshold relative humidty (%)
-
-tillageMethod = Tillage method
-
-timeOfObservation = Time of observation
-
-timeZone = Time zone
-
-timestamp = Timestamp
-
-to = To
-
-toTheTop = To the top
-
-tooManySeparatorCommas = Too many separator commas
-
-tradeName = Trade name
-
-transferAndDelete = Transfer and delete
-
-transferResources = Transfer resources
-
-type = Type
-
-unknownOrganismId = Unknown Organism Id
-
-unknownTranslationKey = Unknown translation key: {0}
-
-up = Up
-
-uppercase = Upper case
-
-user = User
-
-userAccountInformation = User account information
-
-userApproved = The user was approved
-
-userCreatedAndInformed = User was created. An email with username and password was sent to the user's email
-
-userDeleted = User was deleted
-
-userOrganizationGroupsListDescription = Organization groups can be used to share resources like points of interest
-
-userRegistrationEmailVerificationMessageBody = We have received a request to register a new user at VIPSLogic (http://{0}/). Please confirm your email by clicking this link: {1}\n\nAfter confirming your email, a VIPS admin will review your registration and (hopefully) enable your account. Please contact us if this takes longer than a day or two.\n\nThank you
-
-userRegistrationEmailVerificationMessageSubject = Email verification needed
-
-userResources = User resources
-
-userStatusId = Approval status
-
-userStatus_1 = Awaiting email validation
-
-userStatus_2 = Awaiting approval
-
-userStatus_3 = Rejected
-
-userStatus_4 = Approved
-
-userStatus_5 = Disabled
-
-userUpdated = User was updated
-
-username = User name
-
-usernameExists = Username {0} exists
-
-users = Users
-
-viewAllTasks = View all tasks
-
-viewForecastConfiguration = View forecast configuration
-
-viewFullScreen = Full screen view
-
-viewOthersObservations = View observations made by others
-
-vipsLogicRole_1 = Superuser
-
-vipsLogicRole_10 = Bark beetle administrator
-
-vipsLogicRole_11 = Bark beetle county admin
-
-vipsLogicRole_2 = Organization administrator
-
-vipsLogicRole_3 = Observer
-
-vipsLogicRole_4 = Observation authority
-
-vipsLogicRole_5 = Message author
-
-vipsLogicRole_6 = Apple Fruit Moth Administrator
-
-vipsLogicRole_7 = Organism editor
-
-vipsLogicRole_8 = Apple Fruit Moth Rowanberry Cluster Counter
-
-vipsLogicRole_9 = Bark beetle registrator
-
-vipsLogicRoles = User roles
-
-vipsLogicUserId = User
-
-vipswebUrl = VIPSWeb URL
-
-warningStatus = Warning status
-
-warningStatus_0 = No forecast available
-
-warningStatus_1 = Missing data
-
-warningStatus_2 = No risk of infection
-
-warningStatus_3 = Medium risk of infection
-
-warningStatus_4 = High risk of infection
-
-warning_fieldNotFoundInFormDefinition = WARNING: field {0} not found in form definition. The system does not know how to validate it. Continue anyway?
-
-weatherForecastProvider = Weather forecast service
-
-weatherStationDeleted = Weather station was deleted
-
-weatherStationForecastConfigurations = Forecasts connected to the weather station
-
-weatherStationPointOfInterestId = Weather station
-
-weatherStationPointOfInterestIds = Weather stations
-
-weatherStationRemoteId = Remote Id for weather station
-
-weatherStationRemoteIdMissing = Remote Id for weather station is missing
-
-weatherStationStored = Weather station information was stored
-
-weatherStations = Weather stations
-
-xIsNotAfterY = {0} is not after {1}
-
-xIsNotEqualToY = {0} is not equal to {1}
-
-your = Your
-biofixDate=Biofix date
-heatRequirements=Heat requirements
-dd_lower=Day degree lower cutoffs
-dd_upper=Day degree upper cutoffs
-observedPhase=Observed phase at biofix date
-YSTEMBTEMP=Yellow Stemborer Temperature Model
-addIllustration=Add illustration
-allRoles=All roles
-allStatuses=All statuses
-LEAFBLOTCH=Leaf blotch model
-universalMessageSettingsLink_tpl=To edit your notification subscriptions, please use this link: {0}
-pointOfInterestType_5=Trap
-sowingDate=Sowing date
-pointOfInterestType_6=Apiary site
-pointOfInterestType_7=Nursery
-privacyStatement=Privacy statement
-privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf
-thresholdDSVMax=DSV threshold for high infection risk
-thresholdDSVTempMin=Minimum temperature for DSV calculation
-useGridWeatherData=Use grid weather data
-doNotUse=Do not use
-defaultGridWeatherStationDataSource=Gridded weather data source
-weatherStationDataSources=Weather station data sources
-newWeatherStationDataSource=New weather (station) data source
-editWeatherStationDataSource=Edit weather (station) data source
-datafetchUriExpression=URI template for requesting data
-infoUriExpression=Template for request for station information
-isGridWeatherDataSource=This is a grid based weather data source
-weatherStationDataSourceStored=Weather (station) data source was successfully stored
-weatherStationDataSourceDeleted=The weather (station) data source was successfully deleted
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
deleted file mode 100755
index 7eb7473abecd9c43cc4a7c7829f13ae9cb3c4052..0000000000000000000000000000000000000000
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
+++ /dev/null
@@ -1,1059 +0,0 @@
-#
- # Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
- # 
- # This file is part of VIPSLogic.
- # This program is free software: you can redistribute it and/or modify
- # it under the terms of the GNU Affero General Public License as published by
- # the Free Software Foundation, either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU Affero General Public License for more details.
- #
- # You should have received a copy of the GNU Affero General Public License
- # along with this program.  If not, see <https://www.gnu.org/licenses/>.
- # 
-isPositiveRegistration=Pest presence confirmed
-ALTERNARIA = Alternaria Model
-
-APPLESCABM = Apple scab model
-
-BARLEYNETB = Barley net blotch model
-
-BREMIALACT = Bremia lactucae model
-
-CYDIAPOMON = Cydia pomonella model
-
-DELIARADIC = Delia radicum model
-
-DELIARFOBO = Delia radicum/floralis observation model for old crops
-
-DELIARFOBS = Delia radicum/floralis observation model
-
-DELIARFOBY = Delia radicum/floralis observation model for young crops
-
-DOWNCASTMO = DOWNCAST model
-
-FINNCEREAL = Model for Pyrenophora teres, Drechslera tritici-repentis and Stagonospora nodorum
-
-GRASSDRYMO = Grass drying model
-
-LYGUSRUGUL = Lygus rugulipennis model
-
-MAMESTRABR = Mamestra brassicae model
-
-Mail = Email
-
-NAERSTADMO = N\u00e6rstad's model
-
-NEGPROGMOD = Negative prognosis model
-
-OATFLOWERM = Oat flowering model
-
-PLASMOVITI = Downy Mildew model
-
-PSILAROBSE = Psila rosae observation model
-
-PSILARTEMP = Psila rosae Temperature Model
-
-RAINYDAYSM = Rainy days model
-
-SEPAPIICOL = Septoria apiicola model
-
-SEPTREFHUM = Septoria reference humidity model
-
-Sms = SMS
-
-VIPSLogicTitle = VIPS administration system
-
-active = Active
-
-activeWeatherStations = Active weather stations
-
-addMultipleNew = Add multiple new
-
-addNew = Add new
-
-address = Address
-
-advisor = Advisor
-
-all = All
-
-allCategories = All categories
-
-allCrops = All crops
-
-allOrganizations = All organizations
-
-allPests = All pests
-
-allSystems = All systems
-
-altitude = Altitude
-
-appleFruitMoth = Apple fruit moth
-
-appleFruitMothChangeSeasonConfirm = Are you sure you want to change season? All unsaved data for the current season will be lost.
-
-approvalApplication = Approval application
-
-approvalApplicationHelp = Describe what you want to do as a registered user. E.g. write messages, register observations, etc.
-
-approved = Approved
-
-approvesSmsBilling = Approves billing for SMS messages
-
-approvesSmsBillingDescription = By checking this option, you confirm that you accept the billing costs for receiving SMS messages from our subscription services. This consent can be terminated at any time, either by unchecking this checkbox or by sending VIPS STOP to your country's short number. Number for Norway is 1963.
-
-archiveUserId = Archive user
-
-attachIdToExistingUser = Add this login to my existing user
-
-attachIdToExistingUserReceipt = The id was successfully connected to the user. You may now log in with it
-
-availableFor = Available for
-
-availableTranslations = Available translations
-
-back = Back
-
-barkbeetle = Barkbilleoverv\u00e5king
-
-body = Body
-
-broadcastMessage = Broadcast the message
-
-browse = Browse
-
-calculationEnd = Calculation end
-
-calculationStart = Calculation start
-
-cancel = Cancel
-
-changeDate = Change date
-
-children = Children
-
-city = City
-
-clearAll = Clear all
-
-clearOne = Clear one
-
-clusterStored = The cluster information was stored
-
-completenessAtFinish = Completeness at finish
-
-configureAndRunManually = Configure and run manually
-
-confirmCancel = Do you really want to cancel?
-
-confirmDelete = Do you really want to delete?
-
-confirmEmailFailure = Your email address was not confirmed. Please contact the system administrator.
-
-confirmEmailReceipt = Your email was successfully confirmed. You will be notified as soon as the organization administrator approves your application.
-
-confirmLeaveForm = Do you really want to leave this form? All changes are left behind.
-
-confirmReloadForm = Do you really want to reload this form. All unsaved changes will be lost.
-
-country = Country
-
-createPasswordResetCodeAndSendToUserBody = You have requested to reset your current password for username {0} in VIPSLogic, and create a new one. Please follow this link to proceed: {1}
-
-createPasswordResetCodeAndSendToUserSubject = Create new password in VIPSLogic
-
-cropCategoriesFor = Crop categories for
-
-cropCategory = Crop category
-
-cropCategoryIds = Crop categories
-
-cropCategoryUpdated = Crop category was updated
-
-cropOrganismId = Crop
-
-cropOrganismIds = Crops
-
-cropPestUpdated = Crop pest was updated
-
-cropSusceptibility = Crop susceptibility
-
-crops = Crops
-
-currentDate = Current date
-
-dataSource = Data source
-
-dataSourceMissing = Data source is missing
-
-dataSourceName = Data source name
-
-date2ndUpperLeafEmerging = Date 2nd upper leaf emerging
-
-date3rdUpperLeafEmerging = Date 3rd upper leaf emerging
-
-dateEnd = Date end
-
-dateGs31 = Date GS 31
-
-dateGs75 = Date GS 75
-
-datePub = Date published
-
-datePubPeriod = Period of publication
-
-dateSpraying1 = Spraying date 1
-
-dateSpraying2 = Spraying date 2
-
-dateStart = Date start
-
-dateUpperLeafEmerging = Date upper leaf emerging
-
-dateValidTo = Valid to date
-
-days = Days
-
-defaultLocale = Default language
-
-defaultMapCenter = Default map center
-
-defaultMapZoom = Default map zoom
-
-defaultTimeZone = Default time zone
-
-defaultVipsCoreUserId = Default VIPSCore user ID
-
-degreeOfParasitation = Degree of parasitation
-
-delete = Delete
-
-deleteIllustration = Delete illustration
-
-deletePoi = Delete point of interest
-
-deleteUser = Delete user
-
-deleteUserDescription = You must transfer the user's resouces to another user before deleting is possible
-
-deleteWeatherStation = Delete weather station
-
-deleteWeatherStationPreviewExplanation = The weather station that you want to delete has the resources below connected to it. When you delete the weather station, you also delete these resources.
-
-denominator = Denominator
-
-description = Description
-
-details = Details
-
-digit = Digit
-
-doesNotMatchDateFormat = Does not match format {0}
-
-doesNotMatchFormatX = Does not match format {0}
-
-edit = Edit
-
-editCropPests = Edit pests for crop
-
-editMessage = Edit message
-
-editObservation = Edit observation
-
-editOrganization = Edit organization
-
-editPoi = Edit Point Of Interest
-
-editWeatherStation = Edit weather station
-
-elementMeasurementTypes = Measurement types
-
-email = Email
-
-emailAddressIsAlreadyInUse = Email address is already in use
-
-emailNotRegistered = The email address is not registered
-
-emailNotUnique = The email address is not unique. Please contact the VIPSLogic administrator to sort this out.
-
-emailNotVerified = You must verify your email address before the user approval process can proceed
-
-endTime = End time
-
-exceedsMaxLengthOf = Exceeds max length of {0}
-
-externalForecastProviders = External forecast providers
-
-externalResourceIdentifier = External resource identifier
-
-externalResources = External resources
-
-factoryId = Factory id
-
-farmer = Farmer
-
-farms = Farms
-
-fieldIsRequired = Field is required
-
-fieldSowingDate = Field sowing date
-
-fields = Fields
-
-traps = Traps
-
-filter = Filter
-
-filterList = Filter list
-
-filterMessages = Filter messages
-
-firstName = First name
-
-forecastConfigurationDeleted = Forecast configuration was deleted
-
-forecastConfigurationId = Forecast configuration
-
-forecastConfigurationIds = Forecast configuration ids
-
-forecastConfigurationUpdated = Forecast configuration was updated
-
-forecastNotificationMessageBodyTpl_1 = This is for {0} in {1} at location {2} at date {3}. Details: {4}
-
-forecastNotificationMessageBodyTpl_2 = This is for {0} in {1} at location {2} at date {3}.Read more: {4}
-
-forecastNotificationMessageHeadingTpl_1 = Notification of high risk of infection
-
-forecastNotificationMessageHeadingTpl_2 = Notification of moderate infection risk
-
-forecastNotifications = Forecast notifications
-
-forecastNotificationsDescription = Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a  higher risk level. E.g. green to yellow or yellow to red status.
-
-forecasts = Forecasts
-
-forgottenPassword = Forgotten password
-
-freeSms = Free SMS
-
-from = From
-
-general = General
-
-genericPlaces = Generic places
-
-greeting = Dobro do\u0161li u
-
-groupMembers = Group members
-
-heading = Heading
-
-help = Help
-
-helpMessageFormCropCategoryIds = No crop selection means visibility regardless of user's crop preferences
-
-hierarchyCategoryId = Hierarchy category
-
-higherThanMaximum = Higher than the maximum ({0})
-
-illustration = Illustration
-
-inactiveWeatherStations = Inactive weather stations
-
-includeAllChildCrops = Include all child crops
-
-indexText = VIPSLogic is the common administration system for VIPS. This is where you configure users, weather stations and forecasts, and where you report observations and write messages, and more.
-
-informAdminOfConfirmedEmailBody = The user''s last name is {0}. The approval information is as follows: {1}. \\nFollow this link to edit this user: {2} \\n Follow this link to approve automatically: {3}
-
-informAdminOfConfirmedEmailSubject = New user has confirmed email and is now ready for approval
-
-internal = Internal
-
-invalidFormat = Invalid format
-
-invalidcredentials = Invalid username and/or password
-
-isCrop = Is crop
-
-isForecastLocation = Is forecast location
-
-isPest = Is pest
-
-isPrivate = Is private
-
-isQuantified = Is quantified
-
-isRequiredField = Required field
-
-language = Language
-
-lastEditedBy = Last edited by
-
-lastName = Last name
-
-lastUpdated = Last updated
-
-latinName = Latin name
-
-latitude = Latitude
-
-leadParagraph = Lead paragraph
-
-leafLifeTime = Leaf life time (days)
-
-leaveForm = Leave form
-
-listCrops = List all crops
-
-listPests = List all pests
-
-listSelectedCropCategoryOnTop = List crops from selected category on top
-
-localName = Local name
-
-location = Location
-
-locationIsPrivate = Location is private
-
-locationIsPublic = Location is public
-
-locationPointOfInterestId = Location
-
-logInterval = Log interval
-
-logInterval1d = 1 day
-
-logInterval1h = 1 hour
-
-loggedinas = Logged in as
-
-login = Log in
-
-loginCredentials = Login credentials
-
-logout = Log out
-
-logoutsuccess = You are now logged out. Welcome back!
-
-longitude = Longitude
-
-lowerThanMinimum = Lower than the minimum ({0})
-
-lowercase = Lower case
-
-mapDataIsRequired = Map data is required
-
-mapDrawTypeLabel = What do you want to draw
-
-maskObservationWith = Mask observation with
-
-messageDeleted = Message was deleted
-
-messageFormat = Message format
-
-messageIllustrationCaptionLocale = Caption
-
-messageNotifications = Message notifications
-
-messageNotificationsDescription = A message notification is issued when a news message is published for a specific crop group.
-
-messageTags = Message tags
-
-messageUpdated = Message was updated
-
-messages = Messages
-
-meter = Meter
-
-missing = Missing
-
-missingInDatabase = Missing in database
-
-missingSeparatorComma = Missing separator comma
-
-missingUsernameAndPassword = Missing username and password
-
-missingValues = Missing values
-
-modelId = Forecasting model
-
-modelName = Model name
-
-multipleForecastConfigurationsCreated = The forecast configurations were successfully created
-
-myAccount = My account
-
-name = Name
-
-nameAlreadyExists = The name already exists
-
-newGroup = New group
-
-newIllustration = New illustration
-
-newMessage = New message
-
-newObservation = New observation
-
-newObservationSite = New observation site
-
-newObservationSitePoint = New observation site point
-
-newOrganism = New organism
-
-newOrganization = New organization
-
-newPoi = New Point Of Interest
-
-newUser = New user
-
-newUserCredentialsHelpText = Please enter a user name for the new user. An auto generated password will be sent to the user's email address.
-
-newWeatherStation = New weather station
-
-noDescriptionFound = No description found
-
-noMapDataEntered = No map data entered
-
-noPrivateForecastsFoundForUser = No private forecasts found for user
-
-noResultsFoundForCriteria = No results were found for the given search criteria
-
-noTasksRunning = No tasks running
-
-noWhitespaceAllowed = No whitespace allowed
-
-none = None
-
-notificationSubscriptionDescription = You can subscribe to different kinds of notifications below. Choose the format for notification, for instance email or SMS
-
-notificationSubscriptions = Notification subscriptions
-
-notificationSubscriptionsUpdated = Notification subscriptions was successfully updated
-
-numberRequired = A number is required
-
-observationData = Observation data
-
-observationDataField_counting1 = Counting 1
-
-observationDataField_counting2 = Counting 2
-
-observationDataField_trapCountCropEdge = Number of trap counts at field's edge
-
-observationDataField_trapCountCropInside = Number of trap counts inside the field
-
-observationDeleted = Observation was deleted
-
-observationHeading = Observation heading
-
-observationMap = Observation map
-
-observationMethodDescription_KNOCKING = Knocking description (TODO)
-
-observationMethodDescription_NOT_REGISTERED = The observation method is not registered
-
-observationMethodId = Observation method
-
-observationMethodTitle_COUNTING = Counting
-
-observationMethodTitle_HARVESTING = Harvesting
-
-observationMethodTitle_KNOCKING = Knocking
-
-observationMethodTitle_NOT_REGISTERED = Not registered
-
-observationMethodTitle_VISUAL = Visual
-
-observationNotifications = Observation notifications
-
-observationNotificationsDescription = An observation notification is issued when a field observation is made of a pest or disease in a specific crop group.
-
-observationSiteName = Observation site name
-
-observationSitePointName = Observation site point name
-
-observationSitePoints = Observation site points
-
-observationSiteStored = Observation site was successfully updated
-
-observationStored = Observation was stored
-
-observationText = Observation text
-
-observations = Observations
-
-observedDateOfFirstCatch = Observed date of first catch
-
-observedValue = Observed value
-
-observer = Observer
-
-older = Older
-
-or = Or
-
-organism = Organism
-
-organismDeleted = Organism was deleted
-
-organismId = Organism id
-
-organismNotDeleted = Organism was not deleted
-
-organismRegistered = Organism was registered
-
-organismUpdated = Organism was updated
-
-organisms = Organisms
-
-organizationGroupDeleted = The organization group was deleted
-
-organizationGroupList = Organization groups
-
-organizationGroupStored = Organization group was stored
-
-organizationId = Organization
-
-organizationStored = Organization was stored
-
-organizations = Organizations
-
-organizationsArchiveUser = The organization's standard archive user
-
-other = Other
-
-parentOrganismId = Parent organism
-
-password = Password
-
-password2 = Repeat password
-
-passwordResetCodeExpired = The password reset code has expired.
-
-passwordResetCodeNotFound = The password reset code was not found
-
-passwordResetSuccess = Password was successfully created. Please log in.
-
-passwordsDoNotMatch = Passwords do not match
-
-pending = Pending
-
-pestOrganismId = Pest
-
-pestOrganismIds = Pests
-
-phone = Telephone
-
-pleaseAwaitApproval = Please await your user approval
-
-pleaseSelect = Please select
-
-pleaseSpecifyOther = If other, please specify
-
-pleaselogin = Please log in
-
-poi = Point of interest
-
-poiDeleted = Point of interest was deleted
-
-poiStored = Poi was stored
-
-point = point
-
-pointOfInterestType = Point of Interest Type
-
-pointOfInterestType_0 = Unspecified
-
-pointOfInterestType_1 = Weather station
-
-pointOfInterestType_2 = Farm
-
-pointOfInterestType_3 = Field
-
-pointOfInterestType_4 = Region
-
-pois = Points Of Interest
-
-polygon = Polygon
-
-position = Position
-
-postalCode = Postal code
-
-preferredLocale = Preferred locale
-
-previousCrop = Previous crop
-
-privateForecasts = Private forecasts
-
-privateForecastsForOtherUser = Private forecasts for other user
-
-progress = Progress
-
-publicForecasts = Public forecasts
-
-publiclyAvailable = Publicly available
-
-reference = Reference
-
-registerNewUser = Register new user
-
-registerNewUserExplanation = Please fill out the form to apply for a user account. By registering as a user in VIPS, you accept our <a href="/public/documentation/Privacy_statement_NIBIO-VIPS.pdf" target="new">privacy statement.</a>
-
-registerNewUserReceipt = Thanks. You should receive an email requesting you to validate your email address. After following the instructions there, the organization admin will hopefully approve your application shortly.
-
-registrationOf = Registration of
-
-registrationShortcuts = Registration shortcuts
-
-rejected = Rejected
-
-remarks = Remarks
-
-rememberLogin = Remember login
-
-remoteloginfailed = Remote login failed
-
-replaceIllustration = Replace illustration
-
-researcher = Researcher
-
-reset = Reset
-
-resetPassword = Reset and create new password
-
-resetPasswordFormExplanation = Please enter your new password
-
-resetPasswordRequest = Request to reset password
-
-resetPasswordRequestAccepted = Your request has been accepted. An email with further instructions have been sent to the registered email address.
-
-resetPasswordRequestFormExplanation = An email will be sent to the address you enter here, with a link to reset your current password and enter a new one.
-
-runTask = Run task
-
-runningTasks = Running tasks
-
-scheduledTasks = Scheduled tasks
-
-scheduling = Scheduling
-
-schedulingOverview = Scheduling overview
-
-schedulingStarted = Scheduling started
-
-schedulingStopped = Scheduling was stopped
-
-schedulingStoppedExplanation = The scheduling system is stopped. None of the tasks in the list below will be run, unless scheduling is started again.
-
-season = Season
-
-seasonEnd = Season end
-
-seasonStart = Season start
-
-select = Select
-
-sendUserApprovalConfirmationBody = We are happy to confirm that your user account for VIPSLogic has been approved. Please log in here: {0}
-
-sendUserApprovalConfirmationSubject = Your user account has been approved
-
-sendUsernameAndPasswordToUserBody = Here is your username and password for logging in to VIPSLogic (http://{2}):\nUsername: {0}\nPassword: {1}
-
-sendUsernameAndPasswordToUserSubject = Username and password for VIPSLogic
-
-showMeWhereIAm = Show me where I Am
-
-signInWith = Sign in with
-
-slidingHoursAhead = Reference period, forwards (hours)
-
-slidingHoursPast = Reference period, backwards (hours)
-
-specificFieldsForX = Specific fields for {0}
-
-sprayingDate01 = Spraying Date 01
-
-sprayingDate02 = Spraying Date 02
-
-sprayingDate03 = Spraying Date 03
-
-sprayingDate04 = Spraying Date 04
-
-sprayingProtectionDays = Expected protection period (days) after spraying
-
-startDateAscosporeMaturity = Start date for ascospore maturation
-
-startDateDayDegreeAccumulation = Start date for day degree accumulation
-
-startDateGrowth = Start date for growth
-
-startScheduling = Start scheduling
-
-startTime = Start time
-
-status = Status
-
-statusRemarks = Status remarks
-
-statusTypeId = Status
-
-statusTypeIdTitle_1 = Pending
-
-statusTypeIdTitle_2 = Rejected
-
-statusTypeIdTitle_3 = Approved
-
-stopScheduling = Stop scheduling
-
-submit = Submit
-
-suggestedUserRole = Suggested user role
-
-surveillanceMessageInformation = If you want to create a message about an observation, please use the observation registration form
-
-systemTime = System time
-
-taskHistory = Task history
-
-taskHistoryDate = Date for task history
-
-taskHistoryDetails = Task history details
-
-taskHistoryStatusFailedCompletely = Failed completely
-
-taskHistoryStatusFailedPartly = Failed partly
-
-taskHistoryStatusOK = OK
-
-taskXWasLaunched = Task "{0}" was launched
-
-task_DeleteAllExpiredUserUuidsTask_description = Cleaning up the database of UUIDs, which is used for remembering client logins
-
-task_DeleteAllExpiredUserUuidsTask_name = Delete all expired user UUIDs
-
-task_RunAllForecastConfigurationsForOrganizationTask_description = Test
-
-task_RunAllForecastConfigurationsForOrganizationTask_name = Run all forecasts for one organization
-
-task_RunAllForecastConfigurationsTask_description = Runs all current forecasts for all organizations
-
-task_RunAllForecastConfigurationsTask_name = Run all forecast configurations
-
-task_RunForecastConfigurationsByIdTask_description = Run all forecast configurations corresponding to ids in a comma separated list
-
-task_RunForecastConfigurationsByIdTask_name = Run forecast configurations by id
-
-task_RunGridModelsTask_description = Test
-
-task_RunGridModelsTask_name = Run grid models
-
-task_SendForecastEventNotificationsTask_description = Checks to see if there has been changes in forecasts to YELLOW or RED status. If so, finds subscribers to such events and sends notifications
-
-task_SendForecastEventNotificationsTask_name = Send forecast event notifications
-
-task_UpdateForecastResultCacheTableTask_description = To speed up certain tasks, for instance aggregating warnings for today, the table forecast_result_cache should contain only today's forecast results. Today = SystemTime.
-
-task_UpdateForecastResultCacheTableTask_name = Update forecast result cache table
-
-task_UpdateForecastSummaryTableTask_description = This task updates the table for summaries
-
-task_UpdateForecastSummaryTableTask_name = Update table of forecast summaries
-
-task_UpdateModelInformationTask_description = Fetches information about models from VIPSCoreManager and stores in VIPSLogic
-
-task_UpdateModelInformationTask_name = Update model information
-
-tasks = Tasks
-
-test = Test
-
-thousandBerrySample = Thousand berry sample
-
-thresholdHumidPeriodHours = Threshold Number of consecutive humid hours
-
-thresholdLeafWetness = Threshold leaf wetness (min/h)
-
-thresholdPrecipitation = Threshold precipitation (mm)
-
-thresholdRelativeHumidity = Threshold relative humidty (%)
-
-tillageMethod = Tillage method
-
-timeOfObservation = Time of observation
-
-timeZone = Time zone
-
-timestamp = Timestamp
-
-to = To
-
-toTheTop = To the top
-
-tooManySeparatorCommas = Too many separator commas
-
-tradeName = Trade name
-
-transferAndDelete = Transfer and delete
-
-transferResources = Transfer resources
-
-type = Type
-
-unknownOrganismId = Unknown Organism Id
-
-unknownTranslationKey = Unknown translation key: {0}
-
-up = Up
-
-uppercase = Upper case
-
-user = User
-
-userAccountInformation = User account information
-
-userApproved = The user was approved
-
-userCreatedAndInformed = User was created. An email with username and password was sent to the user's email
-
-userDeleted = User was deleted
-
-userOrganizationGroupsListDescription = Organization groups can be used to share resources like points of interest
-
-userRegistrationEmailVerificationMessageBody = We have received a request to register a new user at VIPSLogic (http://{0}/). Please confirm your email by clicking this link: {1}\n\nThank you
-
-userRegistrationEmailVerificationMessageSubject = Email verification needed
-
-userResources = User resources
-
-userStatusId = Approval status
-
-userStatus_1 = Awaiting email validation
-
-userStatus_2 = Awaiting approval
-
-userStatus_3 = Rejected
-
-userStatus_4 = Approved
-
-userStatus_5 = Disabled
-
-userUpdated = User was updated
-
-username = User name
-
-usernameExists = Username {0} exists
-
-users = Users
-
-viewAllTasks = View all tasks
-
-viewForecastConfiguration = View forecast configuration
-
-viewFullScreen = Full screen view
-
-viewOthersObservations = View observations made by others
-
-vipsLogicRole_1 = Superuser
-
-vipsLogicRole_10 = Bark beetle administrator
-
-vipsLogicRole_11 = Bark beetle county admin
-
-vipsLogicRole_2 = Organization administrator
-
-vipsLogicRole_3 = Observer
-
-vipsLogicRole_4 = Observation authority
-
-vipsLogicRole_5 = Message author
-
-vipsLogicRole_6 = Apple Fruit Moth Administrator
-
-vipsLogicRole_7 = Organism editor
-
-vipsLogicRole_8 = Apple Fruit Moth Rowanberry Cluster Counter
-
-vipsLogicRole_9 = Bark beetle registrator
-
-vipsLogicRoles = User roles
-
-vipsLogicUserId = User
-
-vipswebUrl = VIPSWeb URL
-
-warningStatus = Warning status
-
-warningStatus_0 = No forecast available
-
-warningStatus_1 = Missing data
-
-warningStatus_2 = No risk of infection
-
-warningStatus_3 = Medium risk of infection
-
-warningStatus_4 = High risk of infection
-
-warning_fieldNotFoundInFormDefinition = WARNING: field {0} not found in form definition. The system does not know how to validate it. Continue anyway?
-
-weatherForecastProvider = Weather forecast service
-
-weatherStationDeleted = Weather station was deleted
-
-weatherStationForecastConfigurations = Forecasts connected to the weather station
-
-weatherStationPointOfInterestId = Weather station
-
-weatherStationPointOfInterestIds = Weather stations
-
-weatherStationRemoteId = Remote Id for weather station
-
-weatherStationRemoteIdMissing = Remote Id for weather station is missing
-
-weatherStationStored = Weather station information was stored
-
-weatherStations = Weather stations
-
-xIsNotAfterY = {0} is not after {1}
-
-xIsNotEqualToY = {0} is not equal to {1}
-
-your = Your
-biofixDate=Biofix date
-heatRequirements=Heat requirements
-dd_lower=Day degree lower cutoffs
-dd_upper=Day degree upper cutoffs
-observedPhase=Observed phase at biofix date
-YSTEMBTEMP=Yellow Stemborer Temperature Model
-addIllustration=Add illustration
-allRoles=All roles
-allStatuses=All statuses
-LEAFBLOTCH=Leaf blotch model
-universalMessageSettingsLink_tpl=To edit your notification subscriptions, please use this link: {0}
-pointOfInterestType_5=Trap
-sowingDate=Sowing date
-pointOfInterestType_6=Apiary site
-pointOfInterestType_7=Nursery
-privacyStatement=Privacy statement
-privacyStatementFileName=Privacy_statement_NIBIO-VIPS.pdf
-thresholdDSVMax=DSV threshold for high infection risk
-thresholdDSVTempMin=Minimum temperature for DSV calculation
-useGridWeatherData=Use grid weather data
-doNotUse=Do not use
-defaultGridWeatherStationDataSource=Gridded weather data source
-weatherStationDataSources=Weather station data sources
-newWeatherStationDataSource=New weather (station) data source
-editWeatherStationDataSource=Edit weather (station) data source
-datafetchUriExpression=URI template for requesting data
-infoUriExpression=Template for request for station information
-isGridWeatherDataSource=This is a grid based weather data source
-weatherStationDataSourceStored=Weather (station) data source was successfully stored
-weatherStationDataSourceDeleted=The weather (station) data source was successfully deleted
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
index 8e0f57063b6cf713ffe34b4cfc16e42d4e119cfc..731d0896dc4fb0df8f637c2d89571c44a58c00a9 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
@@ -15,7 +15,6 @@
  # You should have received a copy of the GNU Affero General Public License
  # along with this program.  If not, see <https://www.gnu.org/licenses/>.
  # 
-isPositiveRegistration=Pest presence confirmed
 ALTERNARIA = Alternaria Model
 
 APPLESCABM = \u82f9\u679c\u9ed1\u661f\u75c5\u6a21\u578b
@@ -174,6 +173,8 @@ cropCategory = \u4f5c\u7269\u7c7b\u578b
 
 cropCategoryIds = \u4f5c\u7269\u7c7b\u578b
 
+cropCategoryUpdated = Crop category was updated
+
 cropOrganismId = \u4f5c\u7269
 
 cropOrganismIds = \u4f5c\u7269
@@ -236,6 +237,8 @@ deleteIllustration = \u5220\u9664\u56fe
 
 deletePoi = Delete point of interest
 
+deletePoiPreviewExplanation = The point of interest that you want to delete has the resources below connected to it. When you delete the POI, you also delete these resources.
+
 deleteUser = \u5220\u9664\u7528\u6237
 
 deleteUserDescription = \u5728\u5220\u9664\u4e4b\u524d\u4f60\u5fc5\u987b\u5c06\u7528\u6237\u8d44\u6e90\u8f6c\u79fb\u5230\u5176\u4ed6\u7528\u6237
@@ -380,12 +383,16 @@ invalidcredentials = \u65e0\u6548\u7528\u6237\u540d\u6216\u5bc6\u7801
 
 isCrop = \u662f\u4f5c\u7269?
 
+isForecastLocation = Is forecast location
+
 isPest = \u662f\u5bb3\u866b?
 
 isPrivate = \u662f\u79c1\u4eba\u7684
 
 isQuantified = \u662f\u5b9a\u91cf\u7684
 
+isPositiveRegistration=Pest presence confirmed
+
 isRequiredField = Required field
 
 language = \u8bed\u8a00
@@ -542,14 +549,22 @@ observationDataField_counting1 = \u8ba1\u6570 1
 
 observationDataField_counting2 = \u8ba1\u6570 2
 
+observationDataField_number = Number
+
 observationDataField_trapCountCropEdge = Number of trap counts at field's edge
 
 observationDataField_trapCountCropInside = Number of trap counts inside the field
 
+observationDataField_unit = Measuring unit
+
+allObservations = All observations
+
 observationDeleted = \u89c2\u6d4b\u88ab\u5220\u9664
 
 observationHeading = \u89c2\u6d4b\u6807\u9898
 
+observationMap = Observation map
+
 observationMethodDescription_KNOCKING = \u6572\u51fb\u63cf\u8ff0 (TODO)
 
 observationMethodDescription_NOT_REGISTERED = \u89c2\u6d4b\u65b9\u6cd5\u672a\u6ce8\u518c