diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
index 55414e28b..cd805050a 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
@@ -40,6 +40,9 @@ public class CreateForm {
@Size(max = 200)
public String name;
+ @Size(max = 1000)
+ public String description;
+
@Required
@CustomSize(maxKey = "form.admin.max.input.size")
public String handlerName;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java
index 9b8fab226..b420720be 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java
@@ -43,6 +43,9 @@ public class CreateForm {
@Size(max = 200)
public String name;
+ @Size(max = 1000)
+ public String description;
+
@Required
@UriType(protocolType = ProtocolType.FILE)
@CustomSize(maxKey = "form.admin.max.input.size")
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java b/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java
index 4f92f8c4f..7c7f88ce7 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java
@@ -16,6 +16,8 @@
package org.codelibs.fess.app.web.admin.suggest;
+import javax.annotation.Resource;
+
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.helper.SuggestHelper;
import org.lastaflute.web.Execute;
@@ -24,8 +26,6 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-
/**
* @author yfujita
*/
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggest/SuggestForm.java b/src/main/java/org/codelibs/fess/app/web/admin/suggest/SuggestForm.java
index 89b570bbb..c3c037cb6 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/suggest/SuggestForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/suggest/SuggestForm.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2012-2016 CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
package org.codelibs.fess.app.web.admin.suggest;
public class SuggestForm {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java
index a23b3ce80..6b58cbf94 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java
@@ -45,6 +45,9 @@ public class CreateForm {
@Size(max = 200)
public String name;
+ @Size(max = 1000)
+ public String description;
+
@Required
@UriType(protocolType = ProtocolType.WEB)
@CustomSize(maxKey = "form.admin.max.input.size")
diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
index c26ad6b88..9715686a4 100644
--- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
+++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
@@ -542,6 +542,9 @@ public class FessLabels extends UserMessages {
/** The key of the message: Suggest */
public static final String LABELS_menu_suggest = "{labels.menu_suggest}";
+ /** The key of the message: Suggest Word */
+ public static final String LABELS_menu_suggest_word = "{labels.menu_suggest_word}";
+
/** The key of the message: Additional Word */
public static final String LABELS_menu_elevate_word = "{labels.menu_elevate_word}";
@@ -2118,6 +2121,27 @@ public class FessLabels extends UserMessages {
/** The key of the message: Created */
public static final String LABELS_access_token_updated_time = "{labels.access_token_updated_time}";
+ /** The key of the message: Suggest Word */
+ public static final String LABELS_suggest_word_configuration = "{labels.suggest_word_configuration}";
+
+ /** The key of the message: Suggest Word */
+ public static final String LABELS_suggest_word_title_details = "{labels.suggest_word_title_details}";
+
+ /** The key of the message: Word Type */
+ public static final String LABELS_suggest_word_type = "{labels.suggest_word_type}";
+
+ /** The key of the message: Word Number */
+ public static final String LABELS_suggest_word_number = "{labels.suggest_word_number}";
+
+ /** The key of the message: All */
+ public static final String LABELS_suggest_word_type_all = "{labels.suggest_word_type_all}";
+
+ /** The key of the message: Document */
+ public static final String LABELS_suggest_word_type_document = "{labels.suggest_word_type_document}";
+
+ /** The key of the message: Query */
+ public static final String LABELS_suggest_word_type_query = "{labels.suggest_word_type_query}";
+
/** The key of the message: Additional Word */
public static final String LABELS_elevate_word_configuration = "{labels.elevate_word_configuration}";
@@ -2397,28 +2421,28 @@ public class FessLabels extends UserMessages {
/** The key of the message: E-mail */
public static final String LABELS_MAIL = "{labels.mail}";
- /** The key of the message: employeeNumber */
+ /** The key of the message: Employee Number */
public static final String LABELS_user_employeeNumber = "{labels.user_employeeNumber}";
- /** The key of the message: employeeNumber */
+ /** The key of the message: Employee Number */
public static final String LABELS_EMPLOYEE_NUMBER = "{labels.employeeNumber}";
- /** The key of the message: telephoneNumber */
+ /** The key of the message: Telephone Number */
public static final String LABELS_user_telephoneNumber = "{labels.user_telephoneNumber}";
- /** The key of the message: telephoneNumber */
+ /** The key of the message: Telephone Number */
public static final String LABELS_TELEPHONE_NUMBER = "{labels.telephoneNumber}";
- /** The key of the message: homePhone */
+ /** The key of the message: Home Phone */
public static final String LABELS_user_homePhone = "{labels.user_homePhone}";
- /** The key of the message: homePhone */
+ /** The key of the message: Home Phone */
public static final String LABELS_HOME_PHONE = "{labels.homePhone}";
- /** The key of the message: homePostalAddress */
+ /** The key of the message: Home Postal Address */
public static final String LABELS_user_homePostalAddress = "{labels.user_homePostalAddress}";
- /** The key of the message: homePostalAddress */
+ /** The key of the message: Home Postal Address */
public static final String LABELS_HOME_POSTAL_ADDRESS = "{labels.homePostalAddress}";
/** The key of the message: labeledURI */
@@ -2427,154 +2451,154 @@ public class FessLabels extends UserMessages {
/** The key of the message: labeledURI */
public static final String LABELS_LABELEDURI = "{labels.labeledURI}";
- /** The key of the message: roomNumber */
+ /** The key of the message: Room Number */
public static final String LABELS_user_roomNumber = "{labels.user_roomNumber}";
- /** The key of the message: roomNumber */
+ /** The key of the message: Room Number */
public static final String LABELS_ROOM_NUMBER = "{labels.roomNumber}";
- /** The key of the message: description */
+ /** The key of the message: Description */
public static final String LABELS_user_description = "{labels.user_description}";
- /** The key of the message: description */
+ /** The key of the message: Description */
public static final String LABELS_DESCRIPTION = "{labels.description}";
- /** The key of the message: title */
+ /** The key of the message: Title */
public static final String LABELS_user_title = "{labels.user_title}";
- /** The key of the message: title */
+ /** The key of the message: Title */
public static final String LABELS_TITLE = "{labels.title}";
- /** The key of the message: pager */
+ /** The key of the message: Pager */
public static final String LABELS_user_pager = "{labels.user_pager}";
- /** The key of the message: pager */
+ /** The key of the message: Pager */
public static final String LABELS_PAGER = "{labels.pager}";
- /** The key of the message: street */
+ /** The key of the message: Street */
public static final String LABELS_user_street = "{labels.user_street}";
- /** The key of the message: street */
+ /** The key of the message: Street */
public static final String LABELS_STREET = "{labels.street}";
- /** The key of the message: postalCode */
+ /** The key of the message: Postal Code */
public static final String LABELS_user_postalCode = "{labels.user_postalCode}";
- /** The key of the message: postalCode */
+ /** The key of the message: Postal Code */
public static final String LABELS_POSTAL_CODE = "{labels.postalCode}";
- /** The key of the message: physicalDeliveryOfficeName */
+ /** The key of the message: Physical Delivery Office Name */
public static final String LABELS_user_physicalDeliveryOfficeName = "{labels.user_physicalDeliveryOfficeName}";
- /** The key of the message: physicalDeliveryOfficeName */
+ /** The key of the message: Physical Delivery Office Name */
public static final String LABELS_PHYSICAL_DELIVERY_OFFICE_NAME = "{labels.physicalDeliveryOfficeName}";
- /** The key of the message: destinationIndicator */
+ /** The key of the message: Destination Indicator */
public static final String LABELS_user_destinationIndicator = "{labels.user_destinationIndicator}";
- /** The key of the message: destinationIndicator */
+ /** The key of the message: Destination Indicator */
public static final String LABELS_DESTINATION_INDICATOR = "{labels.destinationIndicator}";
- /** The key of the message: internationaliSDNNumber */
+ /** The key of the message: Internationali SDNNumber */
public static final String LABELS_user_internationaliSDNNumber = "{labels.user_internationaliSDNNumber}";
- /** The key of the message: internationaliSDNNumber */
+ /** The key of the message: Internationali SDNNumber */
public static final String LABELS_INTERNATIONALISDN_NUMBER = "{labels.internationaliSDNNumber}";
- /** The key of the message: state */
+ /** The key of the message: State */
public static final String LABELS_user_state = "{labels.user_state}";
- /** The key of the message: state */
+ /** The key of the message: State */
public static final String LABELS_STATE = "{labels.state}";
- /** The key of the message: employeeType */
+ /** The key of the message: Employee Type */
public static final String LABELS_user_employeeType = "{labels.user_employeeType}";
- /** The key of the message: employeeType */
+ /** The key of the message: Employee Type */
public static final String LABELS_EMPLOYEE_TYPE = "{labels.employeeType}";
- /** The key of the message: facsimileTelephoneNumber */
+ /** The key of the message: Facsimile Telephone Number */
public static final String LABELS_user_facsimileTelephoneNumber = "{labels.user_facsimileTelephoneNumber}";
- /** The key of the message: facsimileTelephoneNumber */
+ /** The key of the message: Facsimile Telephone Number */
public static final String LABELS_FACSIMILE_TELEPHONE_NUMBER = "{labels.facsimileTelephoneNumber}";
- /** The key of the message: postOfficeBox */
+ /** The key of the message: Post Office Box */
public static final String LABELS_user_postOfficeBox = "{labels.user_postOfficeBox}";
- /** The key of the message: postOfficeBox */
+ /** The key of the message: Post Office Box */
public static final String LABELS_POST_OFFICE_BOX = "{labels.postOfficeBox}";
- /** The key of the message: initials */
+ /** The key of the message: Initials */
public static final String LABELS_user_initials = "{labels.user_initials}";
- /** The key of the message: initials */
+ /** The key of the message: Initials */
public static final String LABELS_INITIALS = "{labels.initials}";
- /** The key of the message: carLicense */
+ /** The key of the message: Car License */
public static final String LABELS_user_carLicense = "{labels.user_carLicense}";
- /** The key of the message: carLicense */
+ /** The key of the message: Car License */
public static final String LABELS_CAR_LICENSE = "{labels.carLicense}";
- /** The key of the message: mobile */
+ /** The key of the message: Mobile */
public static final String LABELS_user_mobile = "{labels.user_mobile}";
- /** The key of the message: mobile */
+ /** The key of the message: Mobile */
public static final String LABELS_MOBILE = "{labels.mobile}";
- /** The key of the message: postalAddress */
+ /** The key of the message: Postal Address */
public static final String LABELS_user_postalAddress = "{labels.user_postalAddress}";
- /** The key of the message: postalAddress */
+ /** The key of the message: Postal Address */
public static final String LABELS_POSTAL_ADDRESS = "{labels.postalAddress}";
- /** The key of the message: city */
+ /** The key of the message: City */
public static final String LABELS_user_city = "{labels.user_city}";
- /** The key of the message: city */
+ /** The key of the message: City */
public static final String LABELS_CITY = "{labels.city}";
- /** The key of the message: teletexTerminalIdentifier */
+ /** The key of the message: Teletex Terminal Identifier */
public static final String LABELS_user_teletexTerminalIdentifier = "{labels.user_teletexTerminalIdentifier}";
- /** The key of the message: teletexTerminalIdentifier */
+ /** The key of the message: Teletex Terminal Identifier */
public static final String LABELS_TELETEX_TERMINAL_IDENTIFIER = "{labels.teletexTerminalIdentifier}";
- /** The key of the message: x121Address */
+ /** The key of the message: X121 Address */
public static final String LABELS_user_x121Address = "{labels.user_x121Address}";
- /** The key of the message: x121Address */
+ /** The key of the message: X121 Address */
public static final String LABELS_X121_ADDRESS = "{labels.x121Address}";
- /** The key of the message: businessCategory */
+ /** The key of the message: Business Category */
public static final String LABELS_user_businessCategory = "{labels.user_businessCategory}";
- /** The key of the message: businessCategory */
+ /** The key of the message: Business Category */
public static final String LABELS_BUSINESS_CATEGORY = "{labels.businessCategory}";
- /** The key of the message: registeredAddress */
+ /** The key of the message: Registered Address */
public static final String LABELS_user_registeredAddress = "{labels.user_registeredAddress}";
- /** The key of the message: registeredAddress */
+ /** The key of the message: Registered Address */
public static final String LABELS_REGISTERED_ADDRESS = "{labels.registeredAddress}";
- /** The key of the message: displayName */
+ /** The key of the message: Display Name */
public static final String LABELS_user_displayName = "{labels.user_displayName}";
- /** The key of the message: displayName */
+ /** The key of the message: Display Name */
public static final String LABELS_DISPLAY_NAME = "{labels.displayName}";
- /** The key of the message: preferredLanguage */
+ /** The key of the message: Preferred Language */
public static final String LABELS_user_preferredLanguage = "{labels.user_preferredLanguage}";
- /** The key of the message: preferredLanguage */
+ /** The key of the message: Preferred Language */
public static final String LABELS_PREFERRED_LANGUAGE = "{labels.preferredLanguage}";
- /** The key of the message: departmentNumber */
+ /** The key of the message: Department Number */
public static final String LABELS_user_departmentNumber = "{labels.user_departmentNumber}";
- /** The key of the message: departmentNumber */
+ /** The key of the message: Department Number */
public static final String LABELS_DEPARTMENT_NUMBER = "{labels.departmentNumber}";
/** The key of the message: uidNumber */
@@ -2592,10 +2616,10 @@ public class FessLabels extends UserMessages {
/** The key of the message: gidNumber */
public static final String LABELS_GID_NUMBER = "{labels.gidNumber}";
- /** The key of the message: homeDirectory */
+ /** The key of the message: Home Directory */
public static final String LABELS_user_homeDirectory = "{labels.user_homeDirectory}";
- /** The key of the message: homeDirectory */
+ /** The key of the message: Home Directory */
public static final String LABELS_HOME_DIRECTORY = "{labels.homeDirectory}";
/** The key of the message: Upgrade */
diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties
index e791e75c1..9f263188a 100644
--- a/src/main/resources/fess_label.properties
+++ b/src/main/resources/fess_label.properties
@@ -797,73 +797,73 @@ labels.user_surname=Last Name
labels.surame=Last Name
labels.user_mail=E-mail
labels.mail=E-mail
-labels.user_employeeNumber=employeeNumber
-labels.employeeNumber=employeeNumber
-labels.user_telephoneNumber=telephoneNumber
-labels.telephoneNumber=telephoneNumber
-labels.user_homePhone=homePhone
-labels.homePhone=homePhone
-labels.user_homePostalAddress=homePostalAddress
-labels.homePostalAddress=homePostalAddress
+labels.user_employeeNumber=Employee Number
+labels.employeeNumber=Employee Number
+labels.user_telephoneNumber=Telephone Number
+labels.telephoneNumber=Telephone Number
+labels.user_homePhone=Home Phone
+labels.homePhone=Home Phone
+labels.user_homePostalAddress=Home Postal Address
+labels.homePostalAddress=Home Postal Address
labels.user_labeledURI=labeledURI
labels.labeledURI=labeledURI
-labels.user_roomNumber=roomNumber
-labels.roomNumber=roomNumber
-labels.user_description=description
-labels.description=description
-labels.user_title=title
-labels.title=title
-labels.user_pager=pager
-labels.pager=pager
-labels.user_street=street
-labels.street=street
-labels.user_postalCode=postalCode
-labels.postalCode=postalCode
-labels.user_physicalDeliveryOfficeName=physicalDeliveryOfficeName
-labels.physicalDeliveryOfficeName=physicalDeliveryOfficeName
-labels.user_destinationIndicator=destinationIndicator
-labels.destinationIndicator=destinationIndicator
-labels.user_internationaliSDNNumber=internationaliSDNNumber
-labels.internationaliSDNNumber=internationaliSDNNumber
-labels.user_state=state
-labels.state=state
-labels.user_employeeType=employeeType
-labels.employeeType=employeeType
-labels.user_facsimileTelephoneNumber=facsimileTelephoneNumber
-labels.facsimileTelephoneNumber=facsimileTelephoneNumber
-labels.user_postOfficeBox=postOfficeBox
-labels.postOfficeBox=postOfficeBox
-labels.user_initials=initials
-labels.initials=initials
-labels.user_carLicense=carLicense
-labels.carLicense=carLicense
-labels.user_mobile=mobile
-labels.mobile=mobile
-labels.user_postalAddress=postalAddress
-labels.postalAddress=postalAddress
-labels.user_city=city
-labels.city=city
-labels.user_teletexTerminalIdentifier=teletexTerminalIdentifier
-labels.teletexTerminalIdentifier=teletexTerminalIdentifier
-labels.user_x121Address=x121Address
-labels.x121Address=x121Address
-labels.user_businessCategory=businessCategory
-labels.businessCategory=businessCategory
-labels.user_registeredAddress=registeredAddress
-labels.registeredAddress=registeredAddress
-labels.user_displayName=displayName
-labels.displayName=displayName
-labels.user_preferredLanguage=preferredLanguage
-labels.preferredLanguage=preferredLanguage
-labels.user_departmentNumber=departmentNumber
-labels.departmentNumber=departmentNumber
+labels.user_roomNumber=Room Number
+labels.roomNumber=Room Number
+labels.user_description=Description
+labels.description=Description
+labels.user_title=Title
+labels.title=Title
+labels.user_pager=Pager
+labels.pager=Pager
+labels.user_street=Street
+labels.street=Street
+labels.user_postalCode=Postal Code
+labels.postalCode=Postal Code
+labels.user_physicalDeliveryOfficeName=Physical Delivery Office Name
+labels.physicalDeliveryOfficeName=Physical Delivery Office Name
+labels.user_destinationIndicator=Destination Indicator
+labels.destinationIndicator=Destination Indicator
+labels.user_internationaliSDNNumber=Internationali SDNNumber
+labels.internationaliSDNNumber=Internationali SDNNumber
+labels.user_state=State
+labels.state=State
+labels.user_employeeType=Employee Type
+labels.employeeType=Employee Type
+labels.user_facsimileTelephoneNumber=Facsimile Telephone Number
+labels.facsimileTelephoneNumber=Facsimile Telephone Number
+labels.user_postOfficeBox=Post Office Box
+labels.postOfficeBox=Post Office Box
+labels.user_initials=Initials
+labels.initials=Initials
+labels.user_carLicense=Car License
+labels.carLicense=Car License
+labels.user_mobile=Mobile
+labels.mobile=Mobile
+labels.user_postalAddress=Postal Address
+labels.postalAddress=Postal Address
+labels.user_city=City
+labels.city=City
+labels.user_teletexTerminalIdentifier=Teletex Terminal Identifier
+labels.teletexTerminalIdentifier=Teletex Terminal Identifier
+labels.user_x121Address=X121 Address
+labels.x121Address=X121 Address
+labels.user_businessCategory=Business Category
+labels.businessCategory=Business Category
+labels.user_registeredAddress=Registered Address
+labels.registeredAddress=Registered Address
+labels.user_displayName=Display Name
+labels.displayName=Display Name
+labels.user_preferredLanguage=Preferred Language
+labels.preferredLanguage=Preferred Language
+labels.user_departmentNumber=Department Number
+labels.departmentNumber=Department Number
labels.user_uidNumber=uidNumber
labels.uidNumber=uidNumber
labels.user_gidNumber=gidNumber
labels.group_gidNumber=gidNumber
labels.gidNumber=gidNumber
-labels.user_homeDirectory=homeDirectory
-labels.homeDirectory=homeDirectory
+labels.user_homeDirectory=Home Directory
+labels.homeDirectory=Home Directory
labels.upgrade_title_configuration=Upgrade
labels.upgrade_data_migration=Data Migration
labels.upgrade_start_button=Start
diff --git a/src/main/resources/fess_label_en.properties b/src/main/resources/fess_label_en.properties
index 99db0bb0c..d4d934b42 100644
--- a/src/main/resources/fess_label_en.properties
+++ b/src/main/resources/fess_label_en.properties
@@ -797,73 +797,73 @@ labels.user_surname=Last Name
labels.surame=Last Name
labels.user_mail=E-Mail
labels.mail=E-Mail
-labels.user_employeeNumber=employeeNumber
-labels.employeeNumber=employeeNumber
-labels.user_telephoneNumber=telephoneNumber
-labels.telephoneNumber=telephoneNumber
-labels.user_homePhone=homePhone
-labels.homePhone=homePhone
-labels.user_homePostalAddress=homePostalAddress
-labels.homePostalAddress=homePostalAddress
+labels.user_employeeNumber=Employee Number
+labels.employeeNumber=Employee Number
+labels.user_telephoneNumber=Telephone Number
+labels.telephoneNumber=Telephone Number
+labels.user_homePhone=Home Phone
+labels.homePhone=Home Phone
+labels.user_homePostalAddress=Home Postal Address
+labels.homePostalAddress=Home Postal Address
labels.user_labeledURI=labeledURI
labels.labeledURI=labeledURI
-labels.user_roomNumber=roomNumber
-labels.roomNumber=roomNumber
-labels.user_description=description
-labels.description=description
-labels.user_title=title
-labels.title=title
-labels.user_pager=pager
-labels.pager=pager
-labels.user_street=street
-labels.street=street
-labels.user_postalCode=postalCode
-labels.postalCode=postalCode
-labels.user_physicalDeliveryOfficeName=physicalDeliveryOfficeName
-labels.physicalDeliveryOfficeName=physicalDeliveryOfficeName
-labels.user_destinationIndicator=destinationIndicator
-labels.destinationIndicator=destinationIndicator
-labels.user_internationaliSDNNumber=internationaliSDNNumber
-labels.internationaliSDNNumber=internationaliSDNNumber
-labels.user_state=state
-labels.state=state
-labels.user_employeeType=employeeType
-labels.employeeType=employeeType
-labels.user_facsimileTelephoneNumber=facsimileTelephoneNumber
-labels.facsimileTelephoneNumber=facsimileTelephoneNumber
-labels.user_postOfficeBox=postOfficeBox
-labels.postOfficeBox=postOfficeBox
-labels.user_initials=initials
-labels.initials=initials
-labels.user_carLicense=carLicense
-labels.carLicense=carLicense
-labels.user_mobile=mobile
-labels.mobile=mobile
-labels.user_postalAddress=postalAddress
-labels.postalAddress=postalAddress
-labels.user_city=city
-labels.city=city
-labels.user_teletexTerminalIdentifier=teletexTerminalIdentifier
-labels.teletexTerminalIdentifier=teletexTerminalIdentifier
-labels.user_x121Address=x121Address
-labels.x121Address=x121Address
-labels.user_businessCategory=businessCategory
-labels.businessCategory=businessCategory
-labels.user_registeredAddress=registeredAddress
-labels.registeredAddress=registeredAddress
-labels.user_displayName=displayName
-labels.displayName=displayName
-labels.user_preferredLanguage=preferredLanguage
-labels.preferredLanguage=preferredLanguage
-labels.user_departmentNumber=departmentNumber
-labels.departmentNumber=departmentNumber
+labels.user_roomNumber=Room Number
+labels.roomNumber=Room Number
+labels.user_description=Description
+labels.description=Description
+labels.user_title=Title
+labels.title=Title
+labels.user_pager=Pager
+labels.pager=Pager
+labels.user_street=Street
+labels.street=Street
+labels.user_postalCode=Postal Code
+labels.postalCode=Postal Code
+labels.user_physicalDeliveryOfficeName=Physical Delivery Office Name
+labels.physicalDeliveryOfficeName=Physical Delivery Office Name
+labels.user_destinationIndicator=Destination Indicator
+labels.destinationIndicator=Destination Indicator
+labels.user_internationaliSDNNumber=Internationali SDNNumber
+labels.internationaliSDNNumber=Internationali SDNNumber
+labels.user_state=State
+labels.state=State
+labels.user_employeeType=Employee Type
+labels.employeeType=Employee Type
+labels.user_facsimileTelephoneNumber=Facsimile Telephone Number
+labels.facsimileTelephoneNumber=Facsimile Telephone Number
+labels.user_postOfficeBox=Post Office Box
+labels.postOfficeBox=Post Office Box
+labels.user_initials=Initials
+labels.initials=Initials
+labels.user_carLicense=Car License
+labels.carLicense=Car License
+labels.user_mobile=Mobile
+labels.mobile=Mobile
+labels.user_postalAddress=Postal Address
+labels.postalAddress=Postal Address
+labels.user_city=City
+labels.city=City
+labels.user_teletexTerminalIdentifier=Teletex Terminal Identifier
+labels.teletexTerminalIdentifier=Teletex Terminal Identifier
+labels.user_x121Address=X121 Address
+labels.x121Address=X121 Address
+labels.user_businessCategory=Business Category
+labels.businessCategory=Business Category
+labels.user_registeredAddress=Registered Address
+labels.registeredAddress=Registered Address
+labels.user_displayName=Display Name
+labels.displayName=Display Name
+labels.user_preferredLanguage=Preferred Language
+labels.preferredLanguage=Preferred Language
+labels.user_departmentNumber=Department Number
+labels.departmentNumber=Department Number
labels.user_uidNumber=uidNumber
labels.uidNumber=uidNumber
labels.user_gidNumber=gidNumber
labels.group_gidNumber=gidNumber
labels.gidNumber=gidNumber
-labels.user_homeDirectory=homeDirectory
-labels.homeDirectory=homeDirectory
+labels.user_homeDirectory=Home Directory
+labels.homeDirectory=Home Directory
labels.upgrade_title_configuration=Upgrade
labels.upgrade_data_migration=Data Migration
labels.upgrade_start_button=Start
diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties
index ee06b752a..f25877752 100644
--- a/src/main/resources/fess_label_ja.properties
+++ b/src/main/resources/fess_label_ja.properties
@@ -791,73 +791,73 @@ labels.user_surname=\u540d\u524d(\u59d3)
labels.surame=\u540d\u524d(\u59d3)
labels.user_mail=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9
labels.mail=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9
-labels.user_employeeNumber=employeeNumber
-labels.employeeNumber=employeeNumber
-labels.user_telephoneNumber=telephoneNumber
-labels.telephoneNumber=telephoneNumber
-labels.user_homePhone=homePhone
-labels.homePhone=homePhone
-labels.user_homePostalAddress=homePostalAddress
-labels.homePostalAddress=homePostalAddress
+labels.user_employeeNumber=\u5f93\u696d\u54e1\u756a\u53f7
+labels.employeeNumber=\u5f93\u696d\u54e1\u756a\u53f7
+labels.user_telephoneNumber=\u96fb\u8a71\u756a\u53f7
+labels.telephoneNumber=\u96fb\u8a71\u756a\u53f7
+labels.user_homePhone=\u96fb\u8a71(\u81ea\u5b85)
+labels.homePhone=\u96fb\u8a71(\u81ea\u5b85)
+labels.user_homePostalAddress=\u90f5\u4fbf\u756a\u53f7(\u81ea\u5b85)
+labels.homePostalAddress=\u90f5\u4fbf\u756a\u53f7(\u81ea\u5b85)
labels.user_labeledURI=labeledURI
labels.labeledURI=labeledURI
-labels.user_roomNumber=roomNumber
-labels.roomNumber=roomNumber
-labels.user_description=description
-labels.description=description
-labels.user_title=title
-labels.title=title
-labels.user_pager=pager
-labels.pager=pager
-labels.user_street=street
-labels.street=street
-labels.user_postalCode=postalCode
-labels.postalCode=postalCode
-labels.user_physicalDeliveryOfficeName=physicalDeliveryOfficeName
-labels.physicalDeliveryOfficeName=physicalDeliveryOfficeName
-labels.user_destinationIndicator=destinationIndicator
-labels.destinationIndicator=destinationIndicator
-labels.user_internationaliSDNNumber=internationaliSDNNumber
-labels.internationaliSDNNumber=internationaliSDNNumber
-labels.user_state=state
-labels.state=state
-labels.user_employeeType=employeeType
-labels.employeeType=employeeType
-labels.user_facsimileTelephoneNumber=facsimileTelephoneNumber
-labels.facsimileTelephoneNumber=facsimileTelephoneNumber
-labels.user_postOfficeBox=postOfficeBox
-labels.postOfficeBox=postOfficeBox
-labels.user_initials=initials
-labels.initials=initials
-labels.user_carLicense=carLicense
-labels.carLicense=carLicense
-labels.user_mobile=mobile
-labels.mobile=mobile
-labels.user_postalAddress=postalAddress
-labels.postalAddress=postalAddress
-labels.user_city=city
-labels.city=city
-labels.user_teletexTerminalIdentifier=teletexTerminalIdentifier
-labels.teletexTerminalIdentifier=teletexTerminalIdentifier
+labels.user_roomNumber=\u90e8\u5c4b\u756a\u53f7
+labels.roomNumber=\u90e8\u5c4b\u756a\u53f7
+labels.user_description=\u8aac\u660e
+labels.description=\u8aac\u660e
+labels.user_title=\u5f79\u8077
+labels.title=\u5f79\u8077
+labels.user_pager=\u30dd\u30b1\u30d9\u30eb
+labels.pager=\u30dd\u30b1\u30d9\u30eb
+labels.user_street=\u756a\u5730
+labels.street=\u756a\u5730
+labels.user_postalCode=\u90f5\u4fbf\u756a\u53f7
+labels.postalCode=\u90f5\u4fbf\u756a\u53f7
+labels.user_physicalDeliveryOfficeName=\u4e8b\u696d\u6240
+labels.physicalDeliveryOfficeName=\u4e8b\u696d\u6240
+labels.user_destinationIndicator=\u96fb\u5831\u30b5\u30fc\u30d3\u30b9\u30a2\u30c9\u30ec\u30b9\u60c5\u5831
+labels.destinationIndicator=\u96fb\u5831\u30b5\u30fc\u30d3\u30b9\u30a2\u30c9\u30ec\u30b9\u60c5\u5831
+labels.user_internationaliSDNNumber=\u56fd\u969bISDN\u756a\u53f7
+labels.internationaliSDNNumber=\u56fd\u969bISDN\u756a\u53f7
+labels.user_state=\u90fd\u9053\u5e9c\u770c
+labels.state=\u90fd\u9053\u5e9c\u770c
+labels.user_employeeType=\u96c7\u7528\u5f62\u614b
+labels.employeeType=\u96c7\u7528\u5f62\u614b
+labels.user_facsimileTelephoneNumber=FAX\u756a\u53f7
+labels.facsimileTelephoneNumber=FAX\u756a\u53f7
+labels.user_postOfficeBox=\u79c1\u66f8\u7bb1
+labels.postOfficeBox=\u79c1\u66f8\u7bb1
+labels.user_initials=\u30a4\u30f3\u30b7\u30e3\u30eb
+labels.initials=\u30a4\u30f3\u30b7\u30e3\u30eb
+labels.user_carLicense=\u904b\u8ee2\u514d\u8a31\u8a3c
+labels.carLicense=\u904b\u8ee2\u514d\u8a31\u8a3c
+labels.user_mobile=\u643a\u5e2f\u96fb\u8a71
+labels.mobile=\u643a\u5e2f\u96fb\u8a71
+labels.user_postalAddress=\u4f4f\u6240
+labels.postalAddress=\u4f4f\u6240
+labels.user_city=\u5e02\u533a\u753a\u6751
+labels.city=\u5e02\u533a\u753a\u6751
+labels.user_teletexTerminalIdentifier=\u30c6\u30ec\u30c6\u30c3\u30af\u30b9\u7aef\u672b\u8b58\u5225\u5b50
+labels.teletexTerminalIdentifier=\u30c6\u30ec\u30c6\u30c3\u30af\u30b9\u7aef\u672b\u8b58\u5225\u5b50
labels.user_x121Address=x121Address
labels.x121Address=x121Address
-labels.user_businessCategory=businessCategory
-labels.businessCategory=businessCategory
-labels.user_registeredAddress=registeredAddress
-labels.registeredAddress=registeredAddress
-labels.user_displayName=displayName
-labels.displayName=displayName
-labels.user_preferredLanguage=preferredLanguage
-labels.preferredLanguage=preferredLanguage
-labels.user_departmentNumber=departmentNumber
-labels.departmentNumber=departmentNumber
+labels.user_businessCategory=\u696d\u7a2e
+labels.businessCategory=\u696d\u7a2e
+labels.user_registeredAddress=\u767b\u8a18\u4f4f\u6240
+labels.registeredAddress=\u767b\u8a18\u4f4f\u6240
+labels.user_displayName=\u8868\u793a\u540d
+labels.displayName=\u8868\u793a\u540d
+labels.user_preferredLanguage=\u512a\u5148\u8a00\u8a9e
+labels.preferredLanguage=\u512a\u5148\u8a00\u8a9e
+labels.user_departmentNumber=\u90e8\u9580\u756a\u53f7
+labels.departmentNumber=\u90e8\u9580\u756a\u53f7
labels.user_uidNumber=uidNumber
labels.uidNumber=uidNumber
labels.user_gidNumber=gidNumber
labels.group_gidNumber=gidNumber
labels.gidNumber=gidNumber
-labels.user_homeDirectory=homeDirectory
-labels.homeDirectory=homeDirectory
+labels.user_homeDirectory=\u30db\u30fc\u30e0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
+labels.homeDirectory=\u30db\u30fc\u30e0\u30c7\u30a3\u30ec\u30af\u30c8\u30ea
labels.upgrade_title_configuration=\u30a2\u30c3\u30d7\u30b0\u30ec\u30fc\u30c9
labels.upgrade_data_migration=\u30c7\u30fc\u30bf\u79fb\u884c
labels.upgrade_start_button=\u958b\u59cb
diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp
index 402790842..3f07e3ce3 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp
@@ -108,6 +108,11 @@
+
+ |
+ ${f:br(f:h(description))} |
+
diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
index 87da02248..d7ccae507 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
@@ -130,6 +130,15 @@
+
diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
index 70ae5d71e..eb29b14a0 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
@@ -193,6 +193,15 @@
+
diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
index 7a6d8e80c..ab0e1477e 100644
--- a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
@@ -201,6 +201,15 @@
+