fix conflict

packages/app/public/static/locales/en_US/admin.json

@@ -3,7 +3,6 @@
     "display_name": "English"
   },
   "wiki_management_home_page": "Wiki Management Home Page",
-  "app_settings": "App Settings",
   "last_login": "Last login",
   "anyone_with_the_link": "anyone with the link",
   "only_me": "only me",

packages/app/public/static/locales/en_US/translation.json

@@ -523,12 +523,15 @@
     "file_upload_succeeded": "File upload succeeded.",
     "file_upload_failed": "File upload failed.",
     "initialize_successed": "Succeeded to initialize {{target}}",
+    "give_user_admin": "Succeeded to give {{username}} admin",
+    "remove_user_admin": "Succeeded to remove {{username}} admin",
     "activate_user_success": "Succeeded to activating {{username}}",
     "deactivate_user_success": "Succeeded to deactivate {{username}}",
     "remove_user_success": "Succeeded to removing {{username}}",
     "remove_share_link_success": "Succeeded to remove {{shareLinkId}}",
     "issue_share_link": "Succeeded to issue new share link",
     "remove_share_link": "Succeeded to remove {{count}} share links",
+    "remove_external_user_success": "Succeeded to remove {{accountId}}",
     "switch_disable_link_sharing_success": "Succeeded to update share link setting",
     "failed_to_reset_password":"Failed to reset password",
     "save_succeeded": "Saved successfully"

packages/app/public/static/locales/ja_JP/translation.json

@@ -518,8 +518,11 @@
     "file_upload_failed": "ファイルのアップロードに失敗しました",
     "initialize_successed": "{{target}}を初期化しました",
     "activate_user_success": "{{username}}を有効化しました",
+    "give_user_admin": "{{username}}を管理者に設定しました",
+    "remove_user_admin": "{{username}}を管理者から外しました",
     "deactivate_user_success": "{{username}}を無効化しました",
     "remove_user_success": "{{username}}を削除しました",
+    "remove_external_user_success": "{{accountId}}を削除しました",
     "remove_share_link_success": "{{shareLinkId}}を削除しました",
     "issue_share_link": "共有リンクを作成しました",
     "remove_share_link": "共有リンクを{{count}}件削除しました",

packages/app/public/static/locales/zh_CN/translation.json

@@ -497,9 +497,12 @@
     "file_upload_succeeded": "文件上传成功",
     "file_upload_failed": "文件上传失败",
     "initialize_successed": "Succeeded to initialize {{target}}",
+  	"give_user_admin": "Succeeded to give {{username}} admin",
+    "remove_user_admin": "Succeeded to remove {{username}} admin ",
 		"activate_user_success": "Succeeded to activating {{username}}",
 		"deactivate_user_success": "Succeeded to deactivate {{username}}",
 		"remove_user_success": "Succeeded to removing {{username}} ",
+    "remove_external_user_success": "Succeeded to remove {{accountId}} ",
     "switch_disable_link_sharing_success": "成功更新分享链接设置",
     "failed_to_reset_password":"Failed to reset password",
     "save_succeeded": "已成功保存"

packages/app/src/components/Admin/UserManagement.tsx

@@ -144,7 +144,6 @@ const UserManagement = (props: UserManagementProps) => {
                 ref={inputRef}
                 onChange={changeSearchTextHandler}
               />
-              {/* TODO: Fix position */}
               {
                 adminUsersContainer.state.searchText.length > 0
                   ? (<i

packages/app/src/components/Admin/Users/ExternalAccountTable.tsx

@@ -55,7 +55,6 @@ const ExternalAccountTable = (props: ExternalAccountTableProps): JSX.Element =>
             <th style={{ width: '100px' }}>
               <div className="d-flex align-items-center">
                 {t('user_management.password_setting')}
-                {/* TODO: Enable popper */}
                 <span
                   role="button"
                   className="text-muted mx-2"

packages/app/src/components/Admin/Users/GiveAdminButton.tsx

@@ -21,7 +21,7 @@ const GiveAdminButton = (props: GiveAdminButtonProps): JSX.Element => {
   const onClickGiveAdminBtnHandler = useCallback(async() => {
     try {
       const username = await adminUsersContainer.giveUserAdmin(user._id);
-      toastSuccess(t('admin:toaster.give_user_admin', { username }));
+      toastSuccess(t('toaster.give_user_admin', { username }));
     }
     catch (err) {
       toastError(err);

packages/app/src/components/Admin/Users/RemoveAdminButton.tsx

@@ -23,7 +23,7 @@ const RemoveAdminButton = (props: RemoveAdminButtonProps): JSX.Element => {
   const onClickRemoveAdminBtnHandler = useCallback(async() => {
     try {
       const username = await adminUsersContainer.removeUserAdmin(user._id);
-      toastSuccess(t('admin:toaster.remove_user_admin', { username }));
+      toastSuccess(t('toaster.remove_user_admin', { username }));
     }
     catch (err) {
       toastError(err);

packages/app/src/components/Admin/Users/RemoveAdminMenuItem.tsx

@@ -38,7 +38,7 @@ const RemoveAdminMenuItem = (props: Props): JSX.Element => {
   const clickRemoveAdminBtnHandler = useCallback(async() => {
     try {
       const username = await adminUsersContainer.removeUserAdmin(user._id);
-      toastSuccess(t('admin:toaster.remove_user_admin', { username }));
+      toastSuccess(t('toaster.remove_user_admin', { username }));
     }
     catch (err) {
       toastError(err);