Merge branch 'master' into master

Author: khushboovashi

Make.bat

@@ -272,7 +272,6 @@ REM Main build sequence Ends
 
     CALL yarn set version berry || EXIT /B 1
     CALL yarn set version 4 || EXIT /B 1
-    CALL yarn plugin import workspace-tools || EXIT /B 1
     CALL yarn workspaces focus --production || EXIT /B 1
 
     ECHO Removing yarn cache...

docs/en_US/images/permissions.png

@@ -178,7 +178,6 @@ _build_runtime() {
     pushd "${BUNDLEDIR}/resources/app" > /dev/null || exit
         yarn set version berry
         yarn set version 4
-        yarn plugin import workspace-tools
         yarn workspaces focus --production
 
         # remove the yarn cache

pkg/linux/build-functions.sh

@@ -60,7 +60,6 @@ _build_runtime() {
     pushd "${BUNDLE_DIR}/Contents/Resources/app/" > /dev/null || exit
         yarn set version berry
         yarn set version 4
-        yarn plugin import workspace-tools
         yarn workspaces focus --production
 
         # remove the yarn cache

pkg/mac/build-functions.sh

@@ -59,6 +59,7 @@
     'pt_BR': 'Portuguese (Brazilian)',
     'ru': 'Russian',
     'es': 'Spanish',
+    'sv': 'Swedish'
 }
 
 # DO NOT CHANGE UNLESS YOU KNOW WHAT YOU ARE DOING!

web/config.py

@@ -719,6 +719,7 @@ def delete(self, gid, sid):
         return make_json_response(success=1,
                                   info=gettext("Server deleted"))
 
+    @permissions_required(AllPermissionTypes.object_register_server)
     @pga_login_required
     def update(self, gid, sid):
         """Update the server settings"""

web/pgadmin/browser/server_groups/servers/__init__.py

@@ -141,6 +141,7 @@ define('pgadmin.browser.node', [
             function() {
               return !!(self.canEdit(...arguments));
             } : (!!self.canEdit),
+          permission: self.type == 'server' ? AllPermissionTypes.OBJECT_REGISTER_SERVER : undefined,
         }]);
       }
 
@@ -161,7 +162,7 @@ define('pgadmin.browser.node', [
             function() {
               return !!(self.canDrop(...arguments));
             } : (!!self.canDrop),
-          permission: self.type == 'server' ? 'object_register_server' : undefined,
+          permission: self.type == 'server' ? AllPermissionTypes.OBJECT_REGISTER_SERVER : undefined,
         }]);
 
         if (self.canDropCascade) {

web/pgadmin/browser/static/js/node.js

@@ -48,12 +48,12 @@ def __init__(self):
         self.add_permission(
             AllPermissionCategories.object_explorer,
             AllPermissionTypes.object_register_server,
-            gettext("Register/remove server")
+            gettext("Manage Server")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_query_tool,
-            gettext("Query tool")
+            gettext("Query Tool")
         )
         self.add_permission(
             AllPermissionCategories.tools,
@@ -63,32 +63,32 @@ def __init__(self):
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_psql_tool,
-            gettext("PSQL tool")
+            gettext("PSQL Tool")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_backup,
-            gettext("Backup tool (including server and globals)")
+            gettext("Backup Tool (including server and globals)")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_restore,
-            gettext("Restore tool")
+            gettext("Restore Tool")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_import_export_data,
-            gettext("Import/export data")
+            gettext("Import/Export Data")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_import_export_servers,
-            gettext("Import/export servers")
+            gettext("Import/Export Servers")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_search_objects,
-            gettext("Search objects")
+            gettext("Search Objects")
         )
         self.add_permission(
             AllPermissionCategories.tools,
@@ -98,32 +98,32 @@ def __init__(self):
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_schema_diff,
-            gettext("Schema diff")
+            gettext("Schema Diff")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_grant_wizard,
-            gettext("Grant wizard")
+            gettext("Grant Wizard")
         )
         self.add_permission(
             AllPermissionCategories.tools,
             AllPermissionTypes.tools_erd_tool,
-            gettext("ERD tool")
+            gettext("ERD Tool")
         )
         self.add_permission(
             AllPermissionCategories.storage_manager,
             AllPermissionTypes.storage_add_folder,
-            gettext("Add folder")
+            gettext("Add Folder")
         )
         self.add_permission(
             AllPermissionCategories.storage_manager,
             AllPermissionTypes.storage_remove_folder,
-            gettext("Delete file/folder")
+            gettext("Delete File/Folder")
         )
         self.add_permission(
             AllPermissionCategories.miscellaneous,
             AllPermissionTypes.change_password,
-            gettext("Change password")
+            gettext("Change Password")
         )
 
     def add_permission(self, category: str, permission: str, label: str):