fix admin.json and restore gcp in app-settings

resource/locales/en_US/admin/admin.json

@@ -44,8 +44,8 @@
     "file_upload_settings":"File Upload Settings",
     "file_upload_method":"File Upload Method",
     "fixed_by_env_var": "This is fixed by the env var <code>FILE_UPLOAD={{fileUploadType}}</code>.",
-    "gcp_label": "GCP",
-    "aws_label": "AWS",
+    "gcs_label": "GCP(GCS)",
+    "aws_label": "AWS(S3)",
     "file_upload": "This is for uploading file settings. If you complete file upload settings, file upload function, profile picture function etc will be enabled.",
     "ses_settings":"SES settings",
     "test_connection": "Test connection to mail",

resource/locales/ja_JP/admin/admin.json

@@ -43,8 +43,8 @@
     "confirm_to_initialize_mail_settings": "一度初期化した設定は戻せません。本当に初期化しますか？",
     "file_upload_settings":"ファイルアップロード設定",
     "file_upload_method":"ファイルアップロード方法",
-    "gcp_label": "GCP",
-    "aws_label": "AWS",
+    "gcs_label": "GCP(GCS)",
+    "aws_label": "AWS(S3)",
     "fixed_by_env_var": "環境変数 <code>FILE_UPLOAD={{fileUploadType}}</code> により固定されています。",
     "file_upload": "ファイルをアップロードするための設定を行います。ファイルアップロードの設定を完了させると、ファイルアップロード機能、プロフィール写真機能などが有効になります。",
     "ses_settings":"SES設定",

resource/locales/zh_CN/admin/admin.json

@@ -43,8 +43,8 @@
     "confirm_to_initialize_mail_settings": "当前设置将被清空且不可恢复。确认重置？",
     "file_upload_settings":"文件上传设置",
     "file_upload_method":"文件上传方法",
-    "gcp_label": "GCP",
-    "aws_label": "AWS",
+    "gcs_label": "GCP(GCS)",
+    "aws_label": "AWS(S3)",
 		"fixed_by_env_var": "这是由env var<code>FILE_UPLOAD={{fileUploadType}}</code>修复的。",
     "file_upload": "这是文件上传设定。完成了文件上传设定以后，文件上传功能、档案头像功能将会被开启。",
     "ses_settings":"SES设置",

src/server/routes/apiv3/app-settings.js

@@ -111,7 +111,7 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
  *        properties:
  *          gcsApiKeyJsonPath:
  *            type: string
- *            description: apiKeyJsonPath of gcs
+ *            description: apiKeyJsonPath of gcp
  *          gcsBucket:
  *            type: string
  *            description: bucket name of gcs
@@ -120,7 +120,7 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
  *            description: name space of gcs
  *          envGcsApiKeyJsonPath:
  *            type: string
- *            description: Path of the JSON file that contains service account key to authenticate to GCS API
+ *            description: Path of the JSON file that contains service account key to authenticate to GCP API
  *          envGcsBucket:
  *            type: string
  *            description: Name of the GCS bucket