message cleanup

src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -257,6 +257,9 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Start Pos */
     public static final String LABELS_START = "{labels.start}";
 
+    /** The key of the message: Login Required */
+    public static final String LABELS_LOGIN_REQUIRED = "{labels.loginRequired}";
+
     /** The key of the message: Thread Name */
     public static final String LABELS_THREAD_NAME = "{labels.threadName}";
 
@@ -380,6 +383,9 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Geo */
     public static final String LABELS_GEO = "{labels.geo}";
 
+    /** The key of the message: Groups */
+    public static final String LABELS_GROUPS = "{labels.groups}";
+
     /** The key of the message: Hash */
     public static final String LABELS_HASH = "{labels.hash}";
 
@@ -398,6 +404,9 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Query */
     public static final String LABELS_Q = "{labels.q}";
 
+    /** The key of the message: Roles */
+    public static final String LABELS_ROLES = "{labels.roles}";
+
     /** The key of the message: Suggest Search Log */
     public static final String LABELS_SUGGEST_SEARCH_LOG = "{labels.suggestSearchLog}";
 
@@ -434,9 +443,6 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Account Filter */
     public static final String LABELS_LDAP_ACCOUNT_FILTER = "{labels.ldapAccountFilter}";
 
-    /** The key of the message: Login Required */
-    public static final String LABELS_LOGIN_REQUIRED = "{labels.loginRequired}";
-
     /** The key of the message: Current Password */
     public static final String LABELS_OLD_PASSWORD = "{labels.oldPassword}";
 
@@ -749,6 +755,9 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Check the url. */
     public static final String LABELS_check_url = "{labels.check_url}";
 
+    /** The key of the message: Username */
+    public static final String LABELS_user_name = "{labels.user_name}";
+
     /** The key of the message: Login */
     public static final String LABELS_LOGIN = "{labels.login}";
 
@@ -884,6 +893,12 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: ms */
     public static final String LABELS_MILLISEC = "{labels.millisec}";
 
+    /** The key of the message: Role */
+    public static final String LABELS_role_type = "{labels.role_type}";
+
+    /** The key of the message: Label */
+    public static final String LABELS_label_type = "{labels.label_type}";
+
     /** The key of the message: Create */
     public static final String LABELS_file_crawling_button_create = "{labels.file_crawling_button_create}";
 
@@ -1379,12 +1394,6 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Script */
     public static final String LABELS_handler_script = "{labels.handler_script}";
 
-    /** The key of the message: Role */
-    public static final String LABELS_role_type = "{labels.role_type}";
-
-    /** The key of the message: Label */
-    public static final String LABELS_label_type = "{labels.label_type}";
-
     /** The key of the message: Create */
     public static final String LABELS_data_crawling_button_create = "{labels.data_crawling_button_create}";
 
@@ -1469,6 +1478,9 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Type */
     public static final String LABELS_failure_url_search_error_name = "{labels.failure_url_search_error_name}";
 
+    /** The key of the message: URL */
+    public static final String LABELS_failure_url_url = "{labels.failure_url_url}";
+
     /** The key of the message: Last Access */
     public static final String LABELS_failure_url_last_access_time = "{labels.failure_url_last_access_time}";
 
@@ -1508,9 +1520,6 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Log */
     public static final String LABELS_failure_url_error_log = "{labels.failure_url_error_log}";
 
-    /** The key of the message: URL */
-    public static final String LABELS_failure_url_url = "{labels.failure_url_url}";
-
     /** The key of the message: Web Crawling Configuration */
     public static final String LABELS_failure_url_web_config_name = "{labels.failure_url_web_config_name}";
 
@@ -1911,9 +1920,6 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Name */
     public static final String LABELS_user_list_name = "{labels.user_list_name}";
 
-    /** The key of the message: Name */
-    public static final String LABELS_user_name = "{labels.user_name}";
-
     /** The key of the message: Password */
     public static final String LABELS_user_password = "{labels.user_password}";
 
@@ -1950,12 +1956,6 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Group */
     public static final String LABELS_group_title_details = "{labels.group_title_details}";
 
-    /** The key of the message: Roles */
-    public static final String LABELS_ROLES = "{labels.roles}";
-
-    /** The key of the message: Groups */
-    public static final String LABELS_GROUPS = "{labels.groups}";
-
     /** The key of the message: Create */
     public static final String LABELS_crud_button_create = "{labels.crud_button_create}";
 
@@ -2037,6 +2037,9 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: LDAP */
     public static final String LABELS_general_menu_ldap = "{labels.general_menu_ldap}";
 
+    /** The key of the message: Notification */
+    public static final String LABELS_general_menu_notification = "{labels.general_menu_notification}";
+
     /** The key of the message: LDAP URL */
     public static final String LABELS_ldap_provider_url = "{labels.ldap_provider_url}";
 
@@ -2055,9 +2058,6 @@ public class FessLabels extends ActionMessages {
     /** The key of the message: Search top page */
     public static final String LABELS_notification_search_top = "{labels.notification_search_top}";
 
-    /** The key of the message: Notification */
-    public static final String LABELS_general_menu_notification = "{labels.general_menu_notification}";
-
     /** The key of the message: Send TestMail */
     public static final String LABELS_send_testmail = "{labels.send_testmail}";
 

src/main/resources/fess_label.properties

@@ -137,7 +137,6 @@ labels.ldapProviderUrl=LDAP URL
 labels.ldapSecurityPrincipal=Bind DN
 labels.ldapBaseDn=Base DN
 labels.ldapAccountFilter=Account Filter
-labels.loginRequired=Login Required
 labels.oldPassword=Current Password
 labels.newPassword=New Password
 labels.confirmNewPassword=New Password(Confirm)
@@ -456,8 +455,6 @@ labels.data_crawling_title_details=Data\u3000Store Crawling Configuration
 labels.handler_name=Handler Name
 labels.handler_parameter=Parameter
 labels.handler_script=Script
-labels.role_type=Role
-labels.label_type=Label
 labels.data_crawling_button_create=Create
 labels.data_crawling_button_create_job=Create new job
 labels.wizard_title_configuration=Configuration Wizard
@@ -500,7 +497,6 @@ labels.failure_url_id=ID
 labels.failure_url_thread_name=Thread Name
 labels.failure_url_error_name=Type
 labels.failure_url_error_log=Log
-labels.failure_url_url=URL
 labels.failure_url_web_config_name=Web Crawling Configuration
 labels.failure_url_file_config_name=File Crawling Configuration
 labels.system_info_configuration=System Info
@@ -634,7 +630,6 @@ labels.bad_word_suggest_word=Bad Word
 labels.bad_word_file=Bad Word File
 labels.user_configuration=User
 labels.user_list_name=Name
-labels.user_name=Name
 labels.user_password=Password
 labels.user_confirm_password=Confirm
 labels.user_title_details=User
@@ -647,8 +642,6 @@ labels.group_configuration=group
 labels.group_list_name=Name
 labels.group_name=Name
 labels.group_title_details=Group
-labels.roles=Roles
-labels.groups=Groups
 labels.crud_button_create=Create
 labels.crud_button_update=Update
 labels.crud_button_delete=Delete
@@ -681,10 +674,8 @@ labels.ldap_provider_url=LDAP URL
 labels.ldap_security_principal=Bind DN
 labels.ldap_base_dn=Base DN
 labels.ldap_account_filter=Account Filter
-labels.ldap_account_filter=Account Filter
 labels.notification_login=Login page
 labels.notification_search_top=Search top page
-labels.general_menu_notification=Notification
 labels.send_testmail=Send TestMail
 labels.backup_configuration=Back Up
 labels.backup_name=Name

src/main/resources/fess_label_en.properties

@@ -137,7 +137,6 @@ labels.ldapProviderUrl=LDAP URL
 labels.ldapSecurityPrincipal=Bind DN
 labels.ldapBaseDn=Base DN
 labels.ldapAccountFilter=Account Filter
-labels.loginRequired=Login Required
 labels.oldPassword=Current Password
 labels.newPassword=New Password
 labels.confirmNewPassword=New Password(Confirm)
@@ -456,8 +455,6 @@ labels.data_crawling_title_details=Data\u3000Store Crawling Configuration
 labels.handler_name=Handler Name
 labels.handler_parameter=Parameter
 labels.handler_script=Script
-labels.role_type=Role
-labels.label_type=Label
 labels.data_crawling_button_create=Create
 labels.data_crawling_button_create_job=Create new job
 labels.wizard_title_configuration=Configuration Wizard
@@ -500,7 +497,6 @@ labels.failure_url_id=ID
 labels.failure_url_thread_name=Thread Name
 labels.failure_url_error_name=Type
 labels.failure_url_error_log=Log
-labels.failure_url_url=URL
 labels.failure_url_web_config_name=Web Crawling Configuration
 labels.failure_url_file_config_name=File Crawling Configuration
 labels.system_info_configuration=System Info
@@ -634,7 +630,6 @@ labels.bad_word_suggest_word=Bad Word
 labels.bad_word_file=Bad Word File
 labels.user_configuration=User
 labels.user_list_name=Name
-labels.user_name=Name
 labels.user_password=Password
 labels.user_confirm_password=Confirm
 labels.user_title_details=User
@@ -647,8 +642,6 @@ labels.group_configuration=group
 labels.group_list_name=Name
 labels.group_name=Name
 labels.group_title_details=Group
-labels.roles=Roles
-labels.groups=Groups
 labels.crud_button_create=Create
 labels.crud_button_update=Update
 labels.crud_button_delete=Delete