Răsfoiți Sursa

resolve conflict

itizawa 6 ani în urmă
părinte
comite
f28e47fdfd
1 a modificat fișierele cu 0 adăugiri și 54 ștergeri
  1. 0 54
      resource/locales/en-US/translation.json

+ 0 - 54
resource/locales/en-US/translation.json

@@ -363,60 +363,6 @@
     "insert_image": "inserts an image",
     "open_sandbox": "Open Sandbox"
   },
-<<<<<<< HEAD
-  "admin_top": {
-    "Management Wiki": "Management Wiki",
-    "System Information": "System Information",
-    "wiki_administrator": "Only Wiki administrator can access this page",
-    "assign_administrator": "You can assign administrator from Assign administrator button in the User management page",
-    "List of installed plugins": "List of installed plugins",
-    "Package name": "Package name",
-    "Specified version": "Specified version",
-    "Installed version": "Installed version"
-  },
-  "app_setting": {
-    "Site Name": "Site name",
-    "sitename_change": "You can change Site Name which is used for header and HTML title.",
-    "header_content": "The contents entered here will be shown in the header etc.",
-    "Site URL desc": "This is for the site URL setting.",
-    "Site URL warn": "Some features don't work because the site URL is not set.",
-    "siteurl_help": "Site full URL beginning from <code>http://</code> or <code>https://</code>.",
-    "Confidential name": "Confidential name",
-    "Default Language for new users": "Default Language for new users",
-    "ex) internal use only": "ex): internal use only",
-    "File Uploading": "File Uploading",
-    "enable_files_except_image": "Enable file upload other than image files.",
-    "attach_enable": "You can attach files other than image files if you enable this option.",
-    "Update": "Update",
-    "Mail settings": "Mail settings",
-    "SMTP_used": "If you have SMTP settings, it will be used.",
-    "SMTP_but_AWS": "If you do not have SMTP settings but AWS settings,  e-mails will be sent by SES.",
-    "neihter_of": "If you do not of neither of these, e-mails will not be sent.",
-    "From e-mail address": "From e-mail address",
-    "SMTP settings": "SMTP settings",
-    "Host": "Host",
-    "Port": "Port",
-    "User": "User",
-    "AWS settings": "AWS settings",
-    "AWS_access": "This is for AWS settings. If you complete AWS settings, file upload function, profile picture function etc will be enabled.",
-    "No_SMTP_setting": "If you do not have SMTP settings, e-mails will be sent via SES. You need to verify from e-mail address and production settings.",
-    "change_setting": "Caution:if you change this setting not completed, you will not be able to access files you have uploaded so far.",
-    "region": "Region",
-    "bucket name": "Bucket name",
-    "custom endpoint": "Custom endpoint",
-    "custom_endpoint_change": "Input the URL of the endpoint of an object storage service like MinIO that has a S3-compatible API.  Amazon S3 is used if empty.",
-    "Plugin settings": "Plugin settings",
-    "Enable plugin loading": "Enable plugin loading",
-    "Load plugins": "Load plugins",
-    "Enable": "Enable",
-    "Disable": "Disable",
-    "Use env var if empty": "If the value in the database is empty, the value of the environment variable <cod>{{variable}}</code> is used.",
-    "updated_app_setting": "Succeeded to update app setting",
-    "updated_site_url": "Succeeded to update site URL",
-    "updated_plugin_setting": "Succeeded to update plugin setting"
-  },
-=======
->>>>>>> master
   "security_setting": {
     "Security settings": "Security settings",
     "Guest Users Access": "Guest Users Access",