diff --git a/apps/i18n/chen/en.json b/apps/i18n/chen/en.json
index cf94e939c..946b331b2 100644
--- a/apps/i18n/chen/en.json
+++ b/apps/i18n/chen/en.json
@@ -1,77 +1,49 @@
 {
-  "action": {
-    "refresh": "Refresh",
-    "new": "New",
-    "new_query": "New Query",
-    "view_data": "View Data",
-    "show_properties": "Show Properties",
-    "label": {
-      "name": "Name",
-      "type": "Type",
-      "version": "Version",
-      "user": "User",
-      "jdbc_url": "JDBC URL",
-      "driver_class": "Driver Class",
-      "driver_version": "Driver Version"
-    }
-  },
-  "title": {
-    "query": "Query",
-    "properties": "Properties",
-    "datasource_properties": "Datasource Properties"
-  },
-  "state": {
-    "connected": "Connected"
-  },
-  "msg": {
-    "error": {
-      "fetch_error": "Error while fetching data",
-      "connect_error": "Error while connecting",
-      "change_context_error": "Error while changing context",
-      "parse_error": "Error while parsing",
-      "execute_error": "Error while executing",
-      "already_first_page": "It's already the first page",
-      "already_last_page": "It's already the last page",
-      "perms_expired": "Permissions associated with this session expired on %s",
-      "over_max_idle_time": "Since this sessioon has been idle for more than %d minutes, it has been closed",
-      "over_max_session_time": "Since this session has been active for more than %d hours, it has been closed",
-      "command_review_timeout": "Command review request has timed out",
-      "command_review_reject": "Command review request has been rejected by %s",
-      "session_closed_by": "This session has been closed by %s.",
-      "user_cancel_command_review": "The user has cancelled the command review.",
-      "session_locked": "This session has been paused and cannot continue executing commands",
-      "no_permission": " You do not have permission to perform this action",
-      "acl_reject": " Command rejected by ACL"
-    },
-    "success": {
-      "execute_success": "Executed successfully",
-      "connect_success": "Connected successfully"
-    },
-    "info": {
-      "affected_rows": "Affected rows"
-    },
-    "dialog": {
-      "session_locked": "This session is locked by %s, please wait for the session to be unlocked.",
-      "session_unlocked": "This session has been unlocked by %s.",
-      "title": {
-        "init_datasource": "Initialize Datasource",
-        "init_datasource_failed": "Initialize Datasource Failed",
-        "error_message": "Error Message",
-        "session_finished": "Session Finished",
-        "command_review": "Command Review"
-      },
-      "message": {
-        "init_datasource": "Initializing data source, please wait...",
-        "init_datasource_failed": "Connection failed, please check if the database connection configuration is correct",
-        "command_review": "The command you entered requires verification before it can be executed. Would you like to initiate a review request?",
-        "wait_command_review": "The review request has been initiated, please wait for the review results"
-      }
-    }
-  },
-  "btn": {
-    "label": {
-      "submit": "Submit",
-      "cancel": "Cancel"
-    }
-  }
+  "Refresh": "Refresh",
+  "NewQuery": "New query",
+  "ViewData": "View data",
+  "ShowProperties": "Show properties",
+  "Name": "Name",
+  "Type": "Type",
+  "Version": "Version",
+  "User": "User",
+  "JDBCURL": "JDBC URL",
+  "DriverClass": "Driver class",
+  "DriverVersion": "Driver version",
+  "Properties": "Properties",
+  "DatabaseProperties": "Datasource properties",
+  "Connected": "Connected",
+  "FetchError": "Error while fetching data",
+  "ConnectError": "Error while fetching data",
+  "ChangeContextError": "Error while changing context",
+  "ParseError": "Error while parsing",
+  "ExecuteError": "Error while executing",
+  "AlreadyFirstPageError": "It's already the first page",
+  "AlreadyLastPageError": "It's already the last page",
+  "CommandReviewRejectBy": "Command review request has been rejected by %s",
+  "SessionClosedBy": "This session has been closed by %s.",
+  "PermissionsExpiredOn": "Permissions associated with this session expired on %s",
+  "OverMaxIdleTimeError": "Since this sessioon has been idle for more than %d minutes, it has been closed",
+  "OverMaxSessionTimeError": "Since this session has been active for more than %d hours, it has been closed",
+  "CommandReviewTimeoutError": "Command review request has timed out",
+  "UserCancelCommandReviewError": "The user has cancelled the command review.",
+  "SessionLockedError": "This session has been paused and cannot continue executing commands",
+  "NoPermissionError": " You do not have permission to perform this action",
+  "ACLRejectError": " Command rejected by ACL",
+  "ExecuteSuccess": "Executed successfully",
+  "ConnectSuccess": "Connected successfully",
+  "AffectedRows": "Affected rows",
+  "SessionLockedMessage": "This session is locked by %s, please wait for the session to be unlocked.",
+  "SessionUnlockedMessage": "This session has been unlocked by %s.",
+  "InitializeDatasource": "Initialize datasource",
+  "InitializeDatasourceFailed": "Initialize datasource failed",
+  "ErrorMessage": "Error message",
+  "SessionFinished": "Session finished",
+  "CommandReview": "Command review",
+  "InitializingDatasourceMessage": "Initializing data source, please wait...",
+  "initializingDatasourceFailedMessage": "Connection failed, please check if the database connection configuration is correct",
+  "CommandReviewMessage": "The command you entered requires verification before it can be executed. Would you like to initiate a review request?",
+  "WaitCommandReviewMessage": "The review request has been initiated, please wait for the review results",
+  "Submit": "Submit",
+  "Cancel": "Cancel"
 }
\ No newline at end of file
diff --git a/apps/i18n/chen/ja.json b/apps/i18n/chen/ja.json
index 0f2d0cc07..44e5ac63d 100644
--- a/apps/i18n/chen/ja.json
+++ b/apps/i18n/chen/ja.json
@@ -1,77 +1,49 @@
 {
-  "action": {
-    "refresh": "更新",
-    "new": "新規",
-    "new_query": "新規クエリ",
-    "view_data": "データ表示",
-    "show_properties": "プロパティ表示",
-    "label": {
-      "name": "名前",
-      "type": "タイプ",
-      "version": "バージョン",
-      "user": "ユーザー",
-      "jdbc_url": "JDBC URL",
-      "driver_class": "ドライバクラス",
-      "driver_version": "ドライババージョン"
-    }
-  },
-  "title": {
-    "query": "クエリ",
-    "properties": "プロパティ",
-    "datasource_properties": "データソースのプロパティ"
-  },
-  "state": {
-    "connected": "接続済み"
-  },
-  "msg": {
-    "error": {
-      "fetch_error": "データ取得エラー",
-      "connect_error": "接続エラー",
-      "change_context_error": "コンテキスト変更エラー",
-      "parse_error": "解析エラー",
-      "execute_error": "実行エラー",
-      "already_first_page": "すでに最初のページです",
-      "already_last_page": "すでに最後のページです",
-      "perms_expired": "このセッションの権限が%sに失効しました",
-      "over_max_idle_time": "このセッションは%d分以上アイドル状態が続いたため、閉じられました",
-      "over_max_session_time": "このセッションは%d时以上継続したため、閉じられました",
-      "command_review_timeout": "コマンドレビューリクエストがタイムアウトしました",
-      "command_review_reject": "コマンドレビューリクエストは%sによって拒否されました",
-      "session_closed_by": "このセッションは%sによって閉じられました。",
-      "user_cancel_command_review": "ユーザーがコマンドレビューをキャンセルしました。",
-      "session_locked": "このセッションは一時停止されており、コマンドを続行できません",
-      "no_permission": "  この操作を行う権限がありません",
-      "acl_reject": " この操作はACLによって拒否されました"
-    },
-    "success": {
-      "execute_success": "正常に実行されました",
-      "connect_success": "正常に接続されました"
-    },
-    "info": {
-      "affected_rows": "影響を受けた行数"
-    },
-    "dialog": {
-      "session_locked": "このセッションは%sロックされており、コマンドを実行できません",
-      "session_unlocked": "このセッションは%sロック解除されており、コマンドを実行できます",
-      "title": {
-        "init_datasource": "データソースの初期化",
-        "init_datasource_failed": "データソースの初期化失敗",
-        "error_message": "エラーメッセージ",
-        "session_finished": "セッション終了",
-        "command_review": "コマンドレビュー"
-      },
-      "message": {
-        "init_datasource": "データソースを初期化しています、お待ちください...",
-        "init_datasource_failed": "接続に失敗しました、データベース接続設定が正しいことを確認してください",
-        "command_review": "入力したコマンドは、実行前に検証が必要です。レビューリクエストを開始しますか？",
-        "wait_command_review": "レビューリクエストが開始されました、レビュー結果をお待ちください"
-      }
-    }
-  },
-  "btn": {
-    "label": {
-      "submit": "送信",
-      "cancel": "キャンセル"
-    }
-  }
-}
\ No newline at end of file
+  "Refresh": "リフレッシュ",
+  "NewQuery": "新規クエリ",
+  "ViewData": "データを見る",
+  "ShowProperties": "プロパティ",
+  "Name": "名前",
+  "Type": "タイプ",
+  "Version": "バージョン",
+  "User": "ユーザー",
+  "JDBCURL": "JDBC URL",
+  "DriverClass": "ドライバークラス",
+  "DriverVersion": "ドライバーバージョン",
+  "Properties": "プロパティ",
+  "DatabaseProperties": "データソースプロパティ",
+  "Connected": "接続済み",
+  "FetchError": "データの取得に失敗しました",
+  "ConnectError": "接続に失敗しました",
+  "ChangeContextError": "コンテキストの切り替えに失敗しました",
+  "ParseError": "解析に失敗しました",
+  "ExecuteError": "実行に失敗しました",
+  "AlreadyFirstPageError": "既に最初のページです",
+  "AlreadyLastPageError": "既に最後のページです",
+  "CommandReviewRejectBy": "コマンドレビューが%sに拒否されました",
+  "SessionClosedBy": "セッションが%sによって閉じられました",
+  "PermissionsExpiredOn": "このセッションに関連する権限は%sに期限切れです",
+  "OverMaxIdleTimeError": "このセッションのアイドル時間が%d分を超えたため、閉じられました",
+  "OverMaxSessionTimeError": "このセッションの時間が%d時間を超えたため、閉じられました",
+  "CommandReviewTimeoutError": "コマンドレビューがタイムアウトしました",
+  "UserCancelCommandReviewError": "ユーザーがコマンドレビューをキャンセルしました",
+  "SessionLockedError": "現在のセッションはロックされており、コマンドを続行できません",
+  "NoPermissionError": "この操作を実行する権限がありません",
+  "ACLRejectError": "このコマンドの実行は禁止されています",
+  "ExecuteSuccess": "実行に成功しました",
+  "ConnectSuccess": "接続に成功しました",
+  "AffectedRows": "影響を受けた行数",
+  "SessionLockedMessage": "このセッションは%sにロックされており、コマンドを続行できません",
+  "SessionUnlockedMessage": "このセッションは%sにアンロックされ、コマンドを続行できます",
+  "InitializeDatasource": "データソースを初期化",
+  "InitializeDatasourceFailed": "データソースの初期化に失敗しました",
+  "ErrorMessage": "エラーメッセージ",
+  "SessionFinished": "セッションが終了しました",
+  "CommandReview": "コマンドレビュー",
+  "InitializingDatasourceMessage": "データソースを初期化中、しばらくお待ちください...",
+  "initializingDatasourceFailedMessage": "接続に失敗しました。データベース接続設定が正しいか確認してください",
+  "CommandReviewMessage": "入力されたコマンドはレビュー後に実行されます。レビューリクエストを送信しますか?",
+  "WaitCommandReviewMessage": "レビューリクエストが送信されました。レビュー結果をお待ちください",
+  "Submit": "提出",
+  "Cancel": "キャンセル"
+}
diff --git a/apps/i18n/chen/zh.json b/apps/i18n/chen/zh.json
index 23b341c00..cbf1dc195 100644
--- a/apps/i18n/chen/zh.json
+++ b/apps/i18n/chen/zh.json
@@ -1,77 +1,49 @@
 {
-  "action": {
-    "refresh": "刷新",
-    "new": "新建",
-    "new_query": "新建查询",
-    "view_data": "查看数据",
-    "show_properties": "属性",
-    "label": {
-      "name": "名称",
-      "type": "类型",
-      "version": "版本",
-      "user": "用户",
-      "jdbc_url": "JDBC 链接",
-      "driver_class": "驱动类",
-      "driver_version": "驱动版本"
-    }
-  },
-  "title": {
-    "query": "查询",
-    "properties": "属性",
-    "datasource_properties": "数据源属性"
-  },
-  "state": {
-    "connected": "已连接"
-  },
-  "msg": {
-    "error": {
-      "fetch_data": "获取数据失败",
-      "connect_error": "连接失败",
-      "change_context_error": "切换上下文错误",
-      "parse_error": "解析错误",
-      "execute_error": "执行错误",
-      "already_first_page": "已经是第一页",
-      "already_last_page": "已经是最后一页",
-      "user_cancel_command_review": "用户取消命令复核",
-      "command_review_timeout": "命令复核超时",
-      "command_review_reject": "命令复核被 %s 拒绝",
-      "perms_expired": "此会话关联的权限已于 %s 过期",
-      "over_max_idle_time": "由于此会话空闲时间大于 %d 分钟，已经被关闭",
-      "over_max_session_time": "由于此会话时间大于 %d 小时，已经被关闭",
-      "session_closed_by": "当前会话被管理员 %s 关闭",
-      "session_locked": "当前会话已被锁定，无法继续执行命令",
-      "no_permission": " 没有执行此操作的权限",
-      "acl_reject": " 此命令禁止被执行"
-    },
-    "success": {
-      "execute_success": "执行成功",
-      "connect_success": "连接成功"
-    },
-    "info": {
-      "affected_rows": "受影响行数"
-    },
-    "dialog": {
-      "session_locked": "此会话已被 %s 锁定，无法继续执行命令",
-      "session_unlocked": "此会话已被 %s 解锁，可以继续执行命令",
-      "title": {
-        "init_datasource": "初始化数据源",
-        "init_datasource_failed": "初始化数据源失败",
-        "error_message": "错误消息",
-        "session_finished": "会话已结束",
-        "command_review": "命令复核"
-      },
-      "message": {
-        "init_datasource": "正在初始化数据源，请稍候...",
-        "init_datasource_failed": "连接失败，请检查数据库连接配置是否正确",
-        "command_review": "您输入的命令需要复核后才可以执行, 是否发起复核请求?",
-        "wait_command_review": "复核请求已发起, 请等待复核结果"
-      }
-    }
-  },
-  "btn": {
-    "label": {
-      "submit": "提交",
-      "cancel": "取消"
-    }
-  }
+  "Refresh": "刷新",
+  "NewQuery": "新建查询",
+  "ViewData": "查看数据",
+  "ShowProperties": "属性",
+  "Name": "名称",
+  "Type": "类型",
+  "Version": "版本",
+  "User": "用户",
+  "JDBCURL": "JDBC URL",
+  "DriverClass": "驱动类",
+  "DriverVersion": "驱动版本",
+  "Properties": "属性",
+  "DatabaseProperties": "数据源属性",
+  "Connected": "已连接",
+  "FetchError": "获取数据失败",
+  "ConnectError": "连接失败",
+  "ChangeContextError": "切换上下文失败",
+  "ParseError": "解析失败",
+  "ExecuteError": "执行失败",
+  "AlreadyFirstPageError": "已经是第一页",
+  "AlreadyLastPageError": "已经是最后一页",
+  "CommandReviewRejectBy": "命令复核被 %s 拒绝",
+  "SessionClosedBy": "会话被 %s 关闭",
+  "PermissionsExpiredOn": "此会话关联的权限已于 %s 过期",
+  "OverMaxIdleTimeError": "由于此会话空闲时间大于 %d 分钟，已经被关闭",
+  "OverMaxSessionTimeError": "由于此会话时间大于 %d 小时，已经被关闭",
+  "CommandReviewTimeoutError": "命令复核超时",
+  "UserCancelCommandReviewError": "用户取消命令复核",
+  "SessionLockedError": "当前会话已被锁定，无法继续执行命令",
+  "NoPermissionError": "没有执行此操作的权限",
+  "ACLRejectError": " 此命令禁止被执行",
+  "ExecuteSuccess": "执行成功",
+  "ConnectSuccess": "连接成功",
+  "AffectedRows": "受影响行数",
+  "SessionLockedMessage": "此会话已被 %s 锁定，无法继续执行命令",
+  "SessionUnlockedMessage": "此会话已被 %s 解锁，可以继续执行命令",
+  "InitializeDatasource": "初始化数据源",
+  "InitializeDatasourceFailed": "初始化数据源失败",
+  "ErrorMessage": "错误消息",
+  "SessionFinished": "会员已结束",
+  "CommandReview": "命令复核",
+  "InitializingDatasourceMessage": "正在初始化数据源，请稍候...",
+  "initializingDatasourceFailedMessage": "连接失败，请检查数据库连接配置是否正确",
+  "CommandReviewMessage": "您输入的命令需要复核后才可以执行, 是否发起复核请求?",
+  "WaitCommandReviewMessage": "复核请求已发起, 请等待复核结果",
+  "Submit": "提交",
+  "Cancel": "取消"
 }
\ No newline at end of file
diff --git a/apps/i18n/chen/zh_hant.json b/apps/i18n/chen/zh_hant.json
index 5d23024b0..dde2062e5 100644
--- a/apps/i18n/chen/zh_hant.json
+++ b/apps/i18n/chen/zh_hant.json
@@ -1,77 +1,49 @@
 {
-  "action": {
-    "refresh": "刷新",
-    "new": "新建",
-    "new_query": "新建查詢",
-    "view_data": "查看數據",
-    "show_properties": "屬性",
-    "label": {
-      "name": "名稱",
-      "type": "類型",
-      "version": "版本",
-      "user": "用戶",
-      "jdbc_url": "JDBC 連結",
-      "driver_class": "驅動類",
-      "driver_version": "驅動版本"
-    }
-  },
-  "title": {
-    "query": "查詢",
-    "properties": "屬性",
-    "datasource_properties": "數據源屬性"
-  },
-  "state": {
-    "connected": "已連接"
-  },
-  "msg": {
-    "error": {
-      "fetch_data": "獲取數據失敗",
-      "connect_error": "連接失敗",
-      "change_context_error": "切換上下文錯誤",
-      "parse_error": "解析錯誤",
-      "execute_error": "執行錯誤",
-      "already_first_page": "已經是第一頁",
-      "already_last_page": "已經是最後一頁",
-      "user_cancel_command_review": "用戶取消命令覆核",
-      "command_review_timeout": "命令覆核超時",
-      "command_review_reject": "命令覆核被 %s 拒絕",
-      "perms_expired": "此會話關聯的權限已於 %s 過期",
-      "over_max_idle_time": "由於此會話空閒時間大於 %d 分鐘，已經被關閉",
-      "over_max_session_time": "由於此會話時間大於 %d 小時，已經被關閉",
-      "session_closed_by": "當前會話被管理員 %s 關閉",
-      "session_locked": "當前會話已被鎖定，無法繼續執行命令",
-      "no_permission": " 沒有執行此操作的權限",
-      "acl_reject": " 此命令禁止被執行"
-    },
-    "success": {
-      "execute_success": "執行成功",
-      "connect_success": "連接成功"
-    },
-    "info": {
-      "affected_rows": "受影響行數"
-    },
-    "dialog": {
-      "session_locked": "此會話已被 %s 鎖定，無法繼續執行命令",
-      "session_unlocked": "此會話已被 %s 解鎖，可以繼續執行命令",
-      "title": {
-        "init_datasource": "初始化數據源",
-        "init_datasource_failed": "初始化數據源失敗",
-        "error_message": "錯誤消息",
-        "session_finished": "會話已結束",
-        "command_review": "命令覆核"
-      },
-      "message": {
-        "init_datasource": "正在初始化數據源，請稍候...",
-        "init_datasource_failed": "連接失敗，請檢查資料庫連接配置是否正確",
-        "command_review": "您輸入的命令需要覆核後才可以執行, 是否發起覆核請求?",
-        "wait_command_review": "覆核請求已發起, 請等待覆核結果"
-      }
-    }
-  },
-  "btn": {
-    "label": {
-      "submit": "提交",
-      "cancel": "取消"
-    }
-  }
-}
\ No newline at end of file
+  "Refresh": "刷新",
+  "NewQuery": "新建查詢",
+  "ViewData": "查看資料",
+  "ShowProperties": "屬性",
+  "Name": "名稱",
+  "Type": "類型",
+  "Version": "版本",
+  "User": "用戶",
+  "JDBCURL": "JDBC URL",
+  "DriverClass": "驅動類",
+  "DriverVersion": "驅動版本",
+  "Properties": "屬性",
+  "DatabaseProperties": "資料源屬性",
+  "Connected": "已連接",
+  "FetchError": "獲取資料失敗",
+  "ConnectError": "連接失敗",
+  "ChangeContextError": "切換上下文失敗",
+  "ParseError": "解析失敗",
+  "ExecuteError": "執行失敗",
+  "AlreadyFirstPageError": "已經是第一頁",
+  "AlreadyLastPageError": "已經是最後一頁",
+  "CommandReviewRejectBy": "命令覆核被 %s 拒絕",
+  "SessionClosedBy": "會話被 %s 關閉",
+  "PermissionsExpiredOn": "此會話關聯的權限已於 %s 過期",
+  "OverMaxIdleTimeError": "由於此會話閒置時間大於 %d 分鐘，已經被關閉",
+  "OverMaxSessionTimeError": "由於此會話時間大於 %d 小時，已經被關閉",
+  "CommandReviewTimeoutError": "命令覆核超時",
+  "UserCancelCommandReviewError": "用戶取消命令覆核",
+  "SessionLockedError": "當前會話已被鎖定，無法繼續執行命令",
+  "NoPermissionError": "沒有執行此操作的權限",
+  "ACLRejectError": "此命令禁止被執行",
+  "ExecuteSuccess": "執行成功",
+  "ConnectSuccess": "連接成功",
+  "AffectedRows": "受影響行數",
+  "SessionLockedMessage": "此會話已被 %s 鎖定，無法繼續執行命令",
+  "SessionUnlockedMessage": "此會話已被 %s 解鎖，可以繼續執行命令",
+  "InitializeDatasource": "初始化資料源",
+  "InitializeDatasourceFailed": "初始化資料源失敗",
+  "ErrorMessage": "錯誤消息",
+  "SessionFinished": "會話已結束",
+  "CommandReview": "命令覆核",
+  "InitializingDatasourceMessage": "正在初始化資料源，請稍候...",
+  "initializingDatasourceFailedMessage": "連接失敗，請檢查資料庫連接配置是否正確",
+  "CommandReviewMessage": "您輸入的命令需要覆核後才可以執行，是否發起覆核請求?",
+  "WaitCommandReviewMessage": "覆核請求已發起，請等待覆核結果",
+  "Submit": "提交",
+  "Cancel": "取消"
+}