Merge branch 'devel' into CB-4661-remove-includes-concept-from-resour…

…ces-api

README.md

@@ -3,9 +3,9 @@
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" width="250"/>
 
 Cloud Database Manager - Community Edition.  
-CloudBeaver is a web server which provides rich web interface. Server itself is a Java application, web part is written on TypeScript and React.  
+CloudBeaver is a web server that provides a rich web interface. The server itself is a Java application, and the web part is written in TypeScript and React.  
 It is free to use and open-source (licensed under [Apache 2](https://github.com/dbeaver/cloudbeaver/blob/devel/LICENSE) license).  
-See out [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.  
+See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details. 
 
 ![](https://github.com/dbeaver/cloudbeaver/wiki/images/demo_screenshot_1.png)
 
@@ -16,7 +16,7 @@ See out [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.
 
 ## Demo server
 
-You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io  
+You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io  
 
 [Database access instructions](https://github.com/dbeaver/cloudbeaver/wiki/Demo-Server)
 
@@ -25,7 +25,7 @@ You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io
 ### 24.2.0. 2024-09-02
 ### Changes since 24.1.0:
 - General:
-  -    French language support was added (thanks to @matthieukhl)
+  -    French language support was added (thanks to [matthieukhl](https://github.com/matthieukhl))
   -    Added the ability to close editor tabs with the middle mouse button
   -    Added right-click support to open the context menu in the Metadata Editor
   -    The list of forbidden characters for naming and renaming resource manager files has been updated, and now it includes the following characters: / : " \ ' <> | ? *
@@ -45,9 +45,15 @@ You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io
 - Administration:
   -    Redesigned administration navigation panel - now it is more compact and clear
   -    Added the ability to change the default commit mode for each connection separately
-  -    Added the ability to configure the server property rootURI parameter (thanks to @arioko)
+  -    Added the ability to configure the server property rootURI parameter (thanks to [arioko](https://github.com/arioko))
 - Databases:
   -    Added the "Keep alive" setting for Db2 LUW and IMB i, Apache Kyuubi, Clickhouse, Firebird, and Trino
   -    Updated Firebird driver to version 5.0.4
-  -    DDL generation for Oracle Tablespaces was added (thanks to @pandya09)
+  -    DDL generation for Oracle Tablespaces was added (thanks to [pandya09](https://github.com/pandya09))
 
+## Contribution
+As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 
+
+[We are happy to reward](https://dbeaver.com/help-beaver/) our most active contributors every major sprint.
+The most significant contribution to our code for the major release 24.2.0 was made by:
+1. [matthieukhl](https://github.com/matthieukhl)

webapp/packages/core-administration/src/locales/zh.ts

@@ -1,7 +1,14 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
   ['administration_menu_enter', '管理'],
   ['administration_menu_back', '返回应用'],
   ['administration_configuration_wizard_title', '初始化服务器配置'],
-  ['administration_configuration_wizard_finish_success_title', 'Server configured'],
-  ['administration_configuration_wizard_finish_success_message', 'You can log-in as administrator in order to set up additional parameters.'],
+  ['administration_configuration_wizard_finish_success_title', '服务器已完成配置'],
+  ['administration_configuration_wizard_finish_success_message', '您可以使用管理员登录后进行更多参数配置。'],
 ];

webapp/packages/core-authentication/src/locales/zh.ts

@@ -1,10 +1,17 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
-  ['core_authentication_auth_settings_group', 'Authentication'],
-  ['settings_authentication_disable_anonymous_access_name', 'Disable anonymous access'],
-  ['settings_authentication_disable_anonymous_access_description', 'Disable anonymous access function'],
+  ['core_authentication_auth_settings_group', '认证'],
+  ['settings_authentication_disable_anonymous_access_name', '禁用匿名访问'],
+  ['settings_authentication_disable_anonymous_access_description', '禁用匿名访问功能'],
 
-  ['core_authentication_password_policy_min_length', 'Password must be at least {arg:min} characters long'],
-  ['core_authentication_password_policy_upper_lower_case', 'Password must contain both upper and lower case letters'],
-  ['core_authentication_password_policy_min_digits', 'Password must contain at least {arg:min} digits'],
-  ['core_authentication_password_policy_min_special_characters', 'Password must contain at least {arg:min} special characters'],
+  ['core_authentication_password_policy_min_length', '密码长度需要至少 {arg:min} 个字符'],
+  ['core_authentication_password_policy_upper_lower_case', '密码必须包含大写和小写字母'],
+  ['core_authentication_password_policy_min_digits', '密码至少需要包含 {arg:min} 个数字'],
+  ['core_authentication_password_policy_min_special_characters', '密码至少需要包含 {arg:min} 个特殊字符'],
 ];

webapp/packages/core-blocks/src/BlocksLocaleService.ts

@@ -26,6 +26,8 @@ export class BlocksLocaleService extends Bootstrap {
         return (await import('./locales/ru')).default;
       case 'it':
         return (await import('./locales/it')).default;
+      case 'zh':
+        return (await import('./locales/zh')).default;
       case 'fr':
         return (await import('./locales/fr')).default;
       default:

webapp/packages/core-blocks/src/locales/zh.ts

@@ -0,0 +1,22 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+export default [
+  ['core_block_properties_table_name', '表名'],
+  ['core_block_properties_table_value', '值'],
+  ['core_block_properties_table_filter_name', '过滤器'],
+  ['core_block_properties_table_add', '添加属性'],
+  ['core_blocks_confirmation_dialog_title', '需要确认'],
+  ['core_blocks_properties_table_item_reset', '重置默认值'],
+  ['core_blocks_object_property_info_form_empty_placeholder', '属性为空'],
+  ['core_blocks_object_property_info_password_saved', '字段值已保存'],
+  ['core_blocks_properties_table_item_remove', '移除属性'],
+  ['combobox_no_results_placeholder', '无结果'],
+  ['core_blocks_exception_message_error_title', '无法显示内容'],
+  ['core_blocks_exception_message_error_message', '出现错误.'],
+  ['core_blocks_custom_input_validation_error', '字段值无效'],
+];

webapp/packages/core-browser-settings/src/locales/zh.ts

@@ -1,4 +1,11 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export default [
   ['core_browser_settings_cookies_settings_group', 'Cookies'],
-  ['core_browser_settings_browser_settings_group', 'Browser'],
+  ['core_browser_settings_browser_settings_group', '浏览器'],
 ];

webapp/packages/core-connections/src/locales/zh.ts

@@ -6,9 +6,9 @@
  * you may not use this file except in compliance with the License.
  */
 export default [
-  ['core_connections_connections_settings_group', 'Connections'],
-  ['connections_administration_item', 'Connection Templates'],
-  ['connections_administration_connection_create', 'Add Database Template'],
+  ['core_connections_connections_settings_group', '连接'],
+  ['connections_administration_item', '连接模板'],
+  ['connections_administration_connection_create', '添加数据库模板'],
   ['connections_administration_search_database_tip', '在此处输入您的主机，例如“localhost host1.myhost.com 192.168.0.1”然后按 Enter'],
   ['connections_administration_new_connection', '新连接'],
   ['connections_administration_connection_create_error', '创建连接失败'],
@@ -32,45 +32,45 @@ export default [
   ['connections_connection_connect', '连接'],
   ['connections_connection_create_custom', '自定义'],
   ['connections_connection_create_search_database', '搜索'],
-  ['connections_connection_authentication_save_credentials_for_user', 'Save credentials for the current user'],
-  ['connections_connection_authentication_save_credentials_for_user_tooltip', 'These credentials will be used to make automatic connection'],
-  ['connections_connection_authentication_save_credentials_for_session', 'Don’t ask again during the session'],
-  ['connections_connection_authentication_save_credentials_for_session_tooltip', 'These credentials will be removed after logout'],
-  ['connections_connection_edit_save_credentials_shared', 'Save credentials for all users with access'],
+  ['connections_connection_authentication_save_credentials_for_user', '为当前用户保存凭证'],
+  ['connections_connection_authentication_save_credentials_for_user_tooltip', '凭证将用于自动连接数据库'],
+  ['connections_connection_authentication_save_credentials_for_session', '当前会话不再询问'],
+  ['connections_connection_authentication_save_credentials_for_session_tooltip', '注销后将移除凭证'],
+  ['connections_connection_edit_save_credentials_shared', '为所有访问用户保存凭证'],
   [
     'connections_connection_edit_save_credentials_shared_tooltip',
-    'These credentials will be used to make automatic connection for all users having access',
+    '凭证将用于为所有访问用户自动连接数据库',
   ],
-  ['connections_connection_share_credentials', 'Share credentials with teammates'],
-  ['connections_connection_share_credentials_tooltip', 'These credentials will be used to make automatic connection for all users in a team'],
+  ['connections_connection_share_credentials', '分享凭证至团队'],
+  ['connections_connection_share_credentials_tooltip', '凭证将用于为所有团队用户自动连接数据库'],
   ['connections_connection_credentials_provisioning', '认证凭据'],
-  ['connections_connection_credentials_provisioning_description', '您却要填写或确认凭据以测试此连接。'],
+  ['connections_connection_credentials_provisioning_description', '您需要填写或确认凭据以测试此连接。'],
   ['connections_connection_edit_authentication', '认证'],
   ['connections_connection_edit_access', '权限'],
   ['connections_connection_edit_access_load_failed', '无法获取连接访问权限'],
   ['connections_connection_edit_search', '搜索'],
   ['connections_connection_edit_search_hosts', '主机名称'],
   ['connections_connection_address', '地址'],
-  ['connections_connection_folder', 'Folder'],
-  ['connections_connection_folder_validation', "Folder's name may not contain the following symbols / : \" \\ ' <> | ? * and can't start with a dot"],
+  ['connections_connection_folder', '文件夹'],
+  ['connections_connection_folder_validation', "文件夹名称不得包含以下符号 / : \" \\ ' <> | ? * 且不能以点开头"],
   ['connections_connection_name', '连接名称'],
-  ['connections_connection_access_admin_info', 'Administrators see all connections except private connections of other users.'],
+  ['connections_connection_access_admin_info', '管理员可以查看除其他用户的私有连接之外的所有连接。'],
   ['connections_connection_description', '描述'],
-  ['connections_connection_project', 'Project'],
+  ['connections_connection_project', '项目'],
   ['connections_connection_driver', '驱动'],
-  ['connections_connection_configuration', 'Configuration'],
+  ['connections_connection_configuration', '配置'],
   ['connections_connection_host', '主机'],
   ['connections_connection_port', '端口'],
   ['connections_connection_template', '模板'],
   ['connections_connection_test', '测试连接'],
-  ['connections_connection_test_tooltip', 'Test connection'],
+  ['connections_connection_test_tooltip', '测试链接'],
   ['connections_connection_test_fail', '连接测试失败'],
   ['connections_connection_create_fail', '无法创建连接'],
   ['connections_connection_save_fail', '无法保存连接'],
-  ['connections_connection_expert_settings', 'Expert settings'],
-  ['connections_connection_keep_alive', 'Keep alive (in seconds)'],
-  ['connections_connection_autocommit', 'Auto commit'],
-  ['connections_connection_keep_alive_tooltip', 'No auto disconnect'],
+  ['connections_connection_expert_settings', '专业设置'],
+  ['connections_connection_keep_alive', '保持连接 (秒)'],
+  ['connections_connection_autocommit', '自动提交'],
+  ['connections_connection_keep_alive_tooltip', '无自动断开连接'],
   ['connections_network_handler_test', '测试隧道'],
   ['connections_network_handler_test_fail', '隧道测试失败'],
   ['connections_network_handler_test_success', '隧道测试成功'],
@@ -83,11 +83,11 @@ export default [
   ['connections_network_handler_ssh_tunnel_port', '端口'],
   ['connections_network_handler_ssh_tunnel_user', '用户'],
   ['connections_network_handler_ssh_tunnel_password', '密码'],
-  ['connections_network_handler_ssh_tunnel_auth_type', 'Authentication method'],
-  ['connections_network_handler_ssh_tunnel_private_key', 'Private key'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings', 'Advanced Settings'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_alive_interval', 'Alive interval (ms)'],
-  ['connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout', 'Connect timeout (ms)'],
+  ['connections_network_handler_ssh_tunnel_auth_type', '认证方式'],
+  ['connections_network_handler_ssh_tunnel_private_key', '私钥'],
+  ['connections_network_handler_ssh_tunnel_advanced_settings', '高级设置'],
+  ['connections_network_handler_ssh_tunnel_advanced_settings_alive_interval', '活动间隔 (ms)'],
+  ['connections_network_handler_ssh_tunnel_advanced_settings_connect_timeout', '连接超时 (ms)'],
   ['connections_driver_search_placeholder', '输入驱动名称...'],
   ['connections_not_found', '未找到数据库连接'],