-# Copyright (C) 2016 Roland Haeder
+# Copyright (C) 2016, 2017 Roland H\u00e4der
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Unknown gender
-GENDER_UNKNOWN=Unknown
-GENDER_MALE=Mr.
-GENDER_FEMALE=Mrs.
+PERSONAL_TITLE_MR=Mr.
+PERSONAL_TITLE_MRS=Mrs.
CHOICE_YES=Yes
CHOICE_NO=No
PAGE_TITLE_INDEX_WELCOME=Welcome!
PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE=Please accept our privacy policy.
TERMS_NOT_ACCEPTED_MESSAGE=Please accept Terms&Conditions.
PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least your name, address and phone number.
-PERSONAL_DATA_GENDER=Salutation:
+PERSONAL_DATA_PERSONAL_TITLE=Salutation:
PERSONAL_DATA_FIRST_NAME=First name:
PERSONAL_DATA_FAMILY_NAME=Family name:
PERSONAL_DATA_STREET=Street:
CLICK_HERE=here
GUEST_ALREADY_USER_CONTINUE_LOGIN_1=Already registered? Then click
GUEST_ALREADY_USER_CONTINUE_LOGIN_2=to login.
-PAGE_TITLE_LOGIN_HOME=Welcome to user area
-CONTENT_TITLE_LOGIN_HOME=Overview of your applications:
+PAGE_TITLE_USER_LOGIN_HOME=Welcome to user area
+CONTENT_TITLE_USER_LOGIN_HOME=Overview of your applications:
LINK_LOGIN_LOGOUT=Logout
PAGE_TITLE_LOGIN_AREA=User area
COUNTRY_GERMANY=Germany
USER_IS_NOT_LOGGED_IN_FULL=To use this feature you need to register and be logged-in into your account.
LOGIN_EDIT_USER_DATA_TITLE=What do you want to change?
LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE=You can change your personal data, your email address and your password for login here.
-LINK_LOGIN_CHANGE_PERSONAL_DATA=Change personal data such as your address.
-LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change your personal data like address, phone number and so on.
-LINK_LOGIN_CHANGE_EMAIL_ADDRESS=Change your email address
-LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address. This requires another confirmation and can be undone.
-LINK_LOGIN_CHANGE_PASSWORD=Change your password
-LINK_LOGIN_CHANGE_PASSWORD_TITLE=Change here your password, if you want another one.
+LINK_LOGIN_USER_CHANGE_PERSONAL_DATA=Change personal data such as your address.
+LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=Change your personal data like address, phone number and so on.
+LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Change your email address
+LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address. This requires another confirmation and can be undone.
+LINK_LOGIN_USER_CHANGE_PASSWORD=Change your password
+LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE=Change here your password, if you want another one.
LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Your current password for confirmation:
LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE=Please enter your current password for confirmation of the change.
LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM=Current password:
BUTTON_CHANGE_PERSONAL_DATA=Change personal data
-LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change personal data:
+LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=Change personal data:
ERROR_USER_CURRENT_PASSWORD_MISMATCHING=Error: Your entered password doesn't match the currently stored one.
MESSAGE_BOX_TITLE=Notice:
MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY=Error: Parameter "message" not set.
LOGIN_MESSAGE_DATA_SAVED=Data has been saved.
PAGE_TITLE_LOGIN_DATA_SAVED=Your data has been saved
CONTENT_TITLE_LOGIN_DATA_SAVED=Data has been saved:
-LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address:
-LOGIN_CHANGE_EMAIL_LEGEND=Change email address:
-LOGIN_CHANGE_EMAIL_LEGEND_TITLE=Here you can change your email address. You can do this by entering it twice and then confirm the new one.
-LOGIN_CHANGE_EMAIL_OLD_ADDRESS=Your current email address:
-LOGIN_CHANGE_EMAIL_ENTER_EMAIL=Enter new email address:
-LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT=Repeat new email address:
+LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address:
+LOGIN_USER_CHANGE_EMAIL_LEGEND=Change email address:
+LOGIN_USER_CHANGE_EMAIL_LEGEND_TITLE=Here you can change your email address. You can do this by entering it twice and then confirm the new one.
+LOGIN_USER_CHANGE_EMAIL_OLD_ADDRESS=Your current email address:
+LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL=Enter new email address:
+LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL_REPEAT=Repeat new email address:
BUTTON_CHANGE_EMAIL_ADDRESS=Change email address
-PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=Change your email address
-CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS=Enter new email address:
-PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA=Change your personal data
-CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA=Change your address, phone number or others:
+PAGE_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Change your email address
+CONTENT_TITLE_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Enter new email address:
+PAGE_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA=Change your personal data
+CONTENT_TITLE_LOGIN_USER_CHANGE_PERSONAL_DATA=Change your address, phone number or others:
SELECT_LANGUAGE=Language:
DE_DE=Deutsch (DE)
EN_US=English (US)
CONTENT_TITLE_ADMIN_ADD_USER=Add new user account:
TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, list all users
ADMIN_ADD_USER_TITLE=Create a new user account
-ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least salutation, first name, family name, user name and email address.
+ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least title, first name, family name, user name and email address.
ADMIN_CONTACT_PERSONAL_DATA_LEGEND=Personal data of the user:
ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE=Here you can enter the personal data of the new user.
-ADMIN_PERSONAL_DATA_GENDER=Select salutation:
+ADMIN_PERSONAL_DATA_PERSONAL_TITLE=Select title:
ADMIN_PERSONAL_DATA_FIRST_NAME=First name:
ADMIN_PERSONAL_DATA_FAMILY_NAME=Family name:
ADMIN_PERSONAL_DATA_STREET=Name of street:
ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT=Repeat password:
ADMIN_LIST_USER_ID=User id:
ADMIN_LIST_USER_NAME=User name:
-ADMIN_LIST_USER_GENDER=Gender:
+ADMIN_LIST_USER_PERSONAL_TITLE=Gender:
ADMIN_LIST_USER_FIRST_NAME=First name:
ADMIN_LIST_USER_FAMILY_NAME=Family name:
ADMIN_LIST_USER_ACCOUNT_STATUS=Account status:
ADMIN_USER_CONTACT_CREATED=When contact data created:
ADMIN_USER_CONTACT_UPDATED=When contact data updated:
ADMIN_CONTACT_IS_OWN_CONTACT=Own account:
-ADMIN_CONTACT_GENDER=Gender:
-ADMIN_CONTACT_TITLE=Title:
+ADMIN_CONTACT_PERSONAL_TITLE=Gender:
+ADMIN_CONTACT_ACADEMIC_TITLE=Title:
ADMIN_CONTACT_FIRST_NAME=First name:
ADMIN_CONTACT_FAMILY_NAME=Family name:
ADMIN_CONTACT_STREET=Street:
CONTACT_IS_UNUSED=Not linked
CONTACT_IS_USER=Is a user
ADMIN_CONTACT_USAGE=Usage:
-ADMIN_LINK_SHOW_CONTACT_TITLE=Show contact data
-ADMIN_MENU_CONTACT_TITLE=Contact data
+ADMIN_LINK_SHOW_CONTACT_DATA_TITLE=Show contact data
+ADMIN_MENU_CONTACT_TITLE=Manage contact data
LINK_ADMIN_LIST_CONTACT=List contact data
LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created.
ERROR_PARAMETER_MOBILE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'mobileNumber' and 'contact' are not set.
ADMIN_DELETE_CONTACT_TITLE=Delete contact data unreverseable
BUTTON_ADMIN_DELETE_CONTACT=Delete contact data
ADMIN_DELETE_CONTACT_NOTICE=You want to delete contact data. This data could be still linked with other data which could lead to errors. Please delete only, if you are sure that no foreign data links to this record.
-ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least salutation, first name and family name.
+ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE=Please enter at least title, first name and family name.
LINK_ADMIN_LIST_CONTACT=List contact data
LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created.
CONTACT_IS_USER=Is a user
GUEST_AGREE_READ_TERMS_CONDITIONS_2=and I accept them with this.
LINK_GUEST_TERMS_CONDITIONS=Terms & Conditions
LINK_GUEST_PRIVACY_STATEMENTS=privacy statements
-ADMIN_ADD_OR_ENTER_CONTACT_DATA=... or enter the recruiter's contact data:
+ADMIN_ADD_OR_ENTER_CONTACT_DATA=... or enter the user's contact data:
ADMIN_PERSONAL_DATA_EMAIL_ADDRESS=Email address:
ERROR_CONTACT_ID_NOT_FOUND=Error: contact data not found
GUEST_REGISTRATION_PAGE1_TITLE=Registration page 1
GUEST_RESEND_CONFIRMATION_LINK_NOTICE=The old confirmation link won't work after this. Please always use the one from newer email.
RESEND_CONFIRMATION_LINK_LEGEND=Enter email address:
RESEND_CONFIRMATION_LINK_LEGEND_TITLE=Please enter your email address you have used on registration.
-LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address. This requires another confirmation and can be undone.
LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM=Current password:
LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE=Please enter your current password for confirmation of the change.
LOGIN_EDIT_USER_DATA_TITLE=What do you want to change?
LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE=You can change your personal data, your email address and your password for login here.
BUTTON_CHANGE_PERSONAL_DATA=Change personal data
-LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change your personal data like address, phone number and so on.
-LINK_LOGIN_CHANGE_PASSWORD=Change your password
-LINK_LOGIN_CHANGE_PERSONAL_DATA=Change personal data such as your address.
+LINK_LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=Change your personal data like address, phone number and so on.
+LINK_LOGIN_USER_CHANGE_PASSWORD=Change your password
+LINK_LOGIN_USER_CHANGE_PERSONAL_DATA=Change personal data such as your address.
LINK_GUEST_LOGIN_LOST_PASSWORD=Forgot your password?
SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE=If you choose "Invisible", nobody can share address books with you.
SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS=If you choose "Only members", other users can start sharing address books with you.
SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC=If you choose "All" the whole Internet can view your profile, including bots.
LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Your current password for confirmation:
-LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change personal data:
-LINK_LOGIN_CHANGE_PASSWORD_TITLE=Change here your password, if you want another one.
-LINK_LOGIN_CHANGE_EMAIL_ADDRESS=Change your email address
+LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=Change personal data:
+LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE=Change here your password, if you want another one.
LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD=Restore your password
PAGE_TITLE_INDEX_CONFIRM_ACCOUNT=Confirm registration
CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT=Confirm user registration:
BIRTHDAY_PATTERN=MM-dd-yyyy
INVALID_BIRTHDAY=Wrong birthday entered.
ADMIN_EXPORT_CONTACT_ID=Contact data id
-ADMIN_EXPORT_CONTACT_GENDER=Gender
-ADMIN_EXPORT_CONTACT_TITLE=Title
+ADMIN_EXPORT_CONTACT_PERSONAL_TITLE=Gender
+ADMIN_EXPORT_CONTACT_ACADEMIC_TITLE=Title
ADMIN_EXPORT_CONTACT_FIRST_NAME=First name
ADMIN_EXPORT_CONTACT_FAMILY_NAME=Family name
ADMIN_EXPORT_CONTACT_STREET=Street
GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED=Please enter your ZIP code.
GUEST_CONTACT_DATA_CITY_REQUIRED=Please enter your city.
GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED=Please enter your birthday.
-FIELD_GENDER_REQUIRED=Please select a salutation.
+FIELD_PERSONAL_TITLE_REQUIRED=Please select a salutation.
ADMIN_PERSONAL_DATA_TITLE=Title:
LINK_ADMIN_EXPORT_USER=Export user data
LINK_ADMIN_EXPORT_USER_TITLE=Exports all user and contact data.
USER_ACTIVITY_ADMIN_ADDED_USER_ACCOUNT=An aministrator has created your new user account.
ADMIN_ACTIVITY_USER_LOGGED_OUT=User has logged out.
USER_ACTIVITY_USER_LOGGED_OUT=You have logged out.
+ERROR_GUEST_USER_NAME_REQUIRED_DISABLED=Error: This application requires no user name, still this template has been loaded.
+ADMIN_SHOW_PRINCIPAL_NAME=Admin-Login:
+ADMIN_LINK_SHOW_USER_ACTIVITY_LOG_TITLE=Lists all user's activity.
+ADMIN_DELETE_USER_TITLE=Do you really want to delete user account {0} (id number {1})?
+BUTTON_ADMIN_DELETE_USER=Delete user account
+ADMIN_DELETE_USER_NOTICE=By deleting the user's account, only user data is deleted but not contact data.
+ADMIN_ACTIVITY_ADMIN_DELETED_USER_ACCOUNT=User account has been deleted by administrator.
+USER_ACTIVITY_ADMIN_DELETED_USER_ACCOUNT=Your account has been deleted by an administrator.
+ADMIN_USER_DELETE_REASON=Delete reason: (optional)
+ADMIN_USER_PASSWORD_REPEAT_DIFFERENT=Your both entered passwords don't match.
+ADMIN_USER_NAME_ALREADY_EXISTS=Your entered user name does already exist in other user account.
+ADMIN_USER_ENTERED_SAME_AS_OLD_PASSWORD=You have not changed the password (same as stored entered)
+PAGE_TITLE_USER_LOGIN_USER_CHANGE_PASSWORD=Change your user account password
+CONTENT_TITLE_USER_LOGIN_USER_CHANGE_PASSWORD=Here you can change your user account password:
+USER_MUST_CHANGE_PASSWORD_NOTICE=You have to change your password as this is requested by the administrator. After successful change, you can use your account as usual.
+LOGIN_USER_CHANGE_PASSWORD_TITLE=Change your password:
+LOGIN_USER_CHANGE_PASSWORD_LEGEND=Please enter twice the new password:
+LOGIN_USER_CHANGE_PASSWORD_LEGEND_TITLE=The new password must be entered twice to avoid typing mistakes. It still must not match older passwords.
+ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED=Changing of user's email address is administratively deactivated.
+ERROR_USER_CHANGE_EMAIL_ADDRESS_ALREADY_QUEUED=You have already entered the email address for changing. Please report to support.
+ERROR_USER_EMAIL_ADDRESSES_MISMATCH=Your both entered email addresses are mismatching.
+MENU_USER_EDIT_PROFILE_TITLE=Edit profile data
+USER_ENTER_NEW_PASSWORD=New password:
+USER_ENTER_NEW_PASSWORD_REPEAT=Repeat:
+BUTTON_USER_CHANGE_PASSWORD=Change password
+ADMIN_LINK_SHOW_CONTACT_DATA=Show contact data
+ERROR_USER_PASSWORD_TO_WEAK=Your entered password is to weak. Please enter letters, numbers and special characters to create a secure password.
+ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED=Error: Registration page is index, not the registration page.
+ERROR_ADMIN_BEAN_MOBILE_NUMBER_NOT_SET=Error: Instance 'cellPhone' in administrative bean not set.
+CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=List mobile phone numbers:
+LOGIN_ENTER_CURRENT_PASSWORD=Enter current password:
+GUEST_REGISTRATION_USER_NAME_NOT_ENTERED=Please enter a user name. The entered name is being checked for availability.
+<<<<<<< HEAD
+=======
+PAGE_TITLE_LOGIN_FINANCIAL_OVERVIEW=Financials Overview
+SUB_TITLE_LOGIN_FINANCIAL_OVERVIEW=Overview of your financials:
+PAGE_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT=Add receipt
+SUB_TITLE_LOGIN_FINANCIAL_ADD_RECEIPT=Add new receipt:
+PAGE_TITLE_LOGIN_FINANCIAL_ADD_INCOME=Add new income type
+SUB_TITLE_LOGIN_FINANCIAL_ADD_INCOME=Add new income type:
+LOGIN_FINANCIAL_ADD_INCOME_FORM_TITLE=Enter all data of one income type:
+LOGIN_FINANCIAL_INCOME_INTERVAL=Income interval:
+FIELD_FINANCIAL_INCOME_REQUIRED=Field "Income interval" must be selected.
+BUTTON_LOGIN_FINCIAL_ADD_INCOME=Add income type
+LOGIN_FINANCIAL_INCOME_SINGLE_VALUE=Income value:
+FIELD_FINANCIAL_INCOME_SINGLE_VALUE_REQUIRED=Field "Income value" must be filled out.
+LOGIN_FINANCIAL_INCOME_TITLE=Title of income type:
+FIELD_FINANCIAL_INCOME_TITLE_REQUIRED=Field "Title" must be filled out.
+ERROR_USER_PASSWORD_EMPTY=You have to enter a password.
+ERROR_USER_PASSWORD_REPEAT_EMPTY=You have to repeat the entered password.
+GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_ALLOWED=If you left both password fields empty, a random password will generated for you.
+GUEST_REGISTRATION_USER_PASSWORDS_EMPTY_NOT_ALLOWED=You have to enter an own password. Please enter it twice for confirmation.
+>>>>>>> 6ed28b1... Please cherry-pick:
projects / jjobs-war.git / blobdiff