diff --git a/README.md b/README.md
index 175775d4..86e211fe 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ and [AngularJS](http://angularjs.org/) based applications.
27. Software, game, picture, ebook type torrents support NOW!
28. Admin can update or set users Vip attribute data manual in manage page.
29. Admin or oper can set torrent 'VIP' attribute, all these torrents only __VIP__ user can list and download.
-30. Complete torrents maker group support, Admin can create a group and set a founder, and the founder can add or remove member users.
+30. Complete torrents resources group support, Admin can create a group and set a founder, and the founder can add or remove member users.
31. Complete movie collections support, Admin can create a collection and insert any movie into it, user can view collection and download all torrents of the collection.
32. Sort on torrent Vote, seeders, leechers, finished data on torrent list table head clicked events.
33. Simple vip donate payment function, support Paypal me, Alipay Qrcode and Weixin QRcode.
@@ -109,7 +109,7 @@ and [AngularJS](http://angularjs.org/) based applications.
44. New user status 'idle' for long time not login, idle user can not download and can not announce, user can active account with fixed score numbers.
45. Support anonymous uploader.
46. In forum, Admin/Moderators and topic owner can edit topic title through click on the title text.
-47. New feature for list all uploader(maker group and user), admin can set uploader access to pass review directly when upload a torrent file.
+47. New feature for list all uploader(resources group and user), admin can set uploader access to pass review directly when upload a torrent file.
48. Complete emoji support on chat room, message box.
49. Complete server auto notice function to users.
50. Complete RSS subscription support.
diff --git a/config/env/torrents.js b/config/env/torrents.js
index 4d9f38b2..44958a5b 100644
--- a/config/env/torrents.js
+++ b/config/env/torrents.js
@@ -235,7 +235,7 @@ module.exports = {
* If you limited some vpn ip to access it, please add the vpn ip into the @limitedIp array
* If no limited ip, set the @limit to false
* @upload: setting of access for torrents uploader
- * @limitToMakerGroup: setting whether limit the access to maker group for torrents uploader
+ * @limitToMakerGroup: setting whether limit the access to resources group for torrents uploader
* if false, everyone can upload torrent
*/
access: {
@@ -517,7 +517,7 @@ module.exports = {
* @forumTopicTitleLength: forum topic title length limit
* @forumTopicContentLength: forum topic content length limit
* @forumReplyContentLength: forum reply content length limit
- * @makerGroupDescLength: maker group desc content length limit
+ * @makerGroupDescLength: resources group desc content length limit
* @collectionsOverviewLength: movie collections overview content length limit
*/
inputLength: {
diff --git a/modules/about/client/templates/uploader-rules-en.md b/modules/about/client/templates/uploader-rules-en.md
index db34ce85..99cce25f 100644
--- a/modules/about/client/templates/uploader-rules-en.md
+++ b/modules/about/client/templates/uploader-rules-en.md
@@ -13,7 +13,7 @@
1. Any torrents you uploaded, administrators can set more additional attributes, such as recommended levels, sales levels, resource tags, and so on.
1. When uploading torrents, you should select the attribute tags accurately and as comprehensively as possible, because users will index small areas according to different tags at any time. If tags and resources do not actually match, they will be deleted and punished by the administrator.
1. After the torrent is released successfully, the system will give a certain scores reward. Similarly, when the torrent is deleted, the reward scores will be deducted. [User score rules detail is here](/about/manual/scoreRules).
-1. Sometimes system only accepts resource maker group to upload torrents, current setting value is: `%(accessConfig.upload.limitToMakerGroup)s`.
+1. Sometimes system only accepts resources group to upload torrents, current setting value is: `%(accessConfig.upload.limitToMakerGroup)s`.
1. It is forbidden to upload images and texts that are not related to the content of the resources in the seed description area.
1. Unauthorized commercial promotion in any area is strictly prohibited.
1. If you have 0-day resources or superb repression skills, please do not hesitate to please contact our {{'%(supportConfig.supportGroupNameDesc)s' | translate}} by **[Message](/messages/send?to=%(supportConfig.supportGroupName)s)** or **[Email](mailto: %(supportConfig.supportMailAddress)s)**.
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index ebb390ae..c6777253 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -49,7 +49,7 @@
MENU_ABOUT: 'About',
MENU_ABOUT_MANUAL: 'User Manual',
MENU_ABOUT_BLACKLIST: 'Client Black List',
- MENU_ABOUT_MAKERGROUP: 'Torrents Maker Group',
+ MENU_ABOUT_MAKERGROUP: 'Resources Group',
MENU_ABOUT_OPERLIST: 'Admin/Oper List',
MENU_ABOUT_RANKING: 'Users Ranking',
MENU_VIP: 'VIP',
@@ -228,7 +228,7 @@
REQUEST_RULES: 'Requests Rules',
MANUAL_FAQ: 'FAQ',
BLACK: 'Client Black List',
- MAKER: 'Torrents Maker Group',
+ MAKER: 'Resources Group',
OPERLIST: 'Admin/Oper List',
COLLECTIONS: 'Movie Collections',
VIP: 'Vip',
@@ -492,7 +492,7 @@
BUTTON_UNSHOW_NEXT_TIME: 'I know, don`t show this next time',
POPUP_UPLOADED_TOOLTIP: 'The torrent is uploaded successfully and is waiting for the administrator to review. The new torrent file with your Passkey will be automatically downloaded after you click the "OK" button, and you can use this new torrent file to start seeding.',
TORRENT_DOWNLOADING_FILENAME: 'Downloading file name: ',
- UPLOAD_ACCESS_TOOLTIP: '{{site}} only accepts resource maker group to upload torrents, you can list and join them!',
+ UPLOAD_ACCESS_TOOLTIP: '{{site}} only accepts resource resources group to upload torrents, you can list and join them!',
SELECT_RESOURCE_TYPE: '2. Please select the resource type',
SELECT_TORRENT_FILE: '1. Please select the torrent file',
@@ -520,7 +520,7 @@
SELECT_SE: '4.1. Please select number of seasons and input number of episodes',
SELECT_TAGS: '5. Please select any tags for the resources',
ENTER_VIDEO_NFO: '6. Please enter video and audio NFO',
- SELECT_MAKER_GROUP: '7. Please select torrent maker group upload from and anonymous option',
+ SELECT_MAKER_GROUP: '7. Please select resources group upload from and anonymous option',
MAKER_NULL: 'NULL',
UPLOADER_ANONYMOUS: 'Anonymous Upload (The user wont see me as an uploader)',
ANONYMOUS: 'Anonymous',
@@ -602,7 +602,7 @@
//uploader admin
UPLOADER: {
- CAPTION_MAKER: 'Uploader - Maker Group',
+ CAPTION_MAKER: 'Uploader - Resources Group',
CAPTION_USER: 'Uploader - User',
FIELDS_NAME: 'Name',
FIELDS_DISPLAY_NAME: 'DisplayName',
@@ -616,7 +616,7 @@
FIELDS_REVIEW: 'review',
FIELDS_PASS: 'pass',
ACCESS_CHANGED_SUCCESSFULLY: 'Upload access changed successfully',
- ACCESS_DESC: 'Upload access desc:
* If maker or user has upload access of "pass", the uploaded new torrents do not need to review by administrators!
* maker group upload access is preceded by user upload access.
'
+ ACCESS_DESC: 'Upload access desc:
* If maker or user has upload access of "pass", the uploaded new torrents do not need to review by administrators!
* resources group upload access is preceded by user upload access.
'
},
//vip views
@@ -652,42 +652,42 @@
MENU_ABOUT_MANUAL_REQUEST_RULES: 'Requests Rules Detail',
MENU_ABOUT_MANUAL_FAQ: 'FAQ',
CLIENT_BLACK_LIST: 'Client Black List',
- MAKER_GROUP: 'Torrents Maker Group',
+ MAKER_GROUP: 'Resources Group',
BLACK_TOOLTIP: 'Note:
All the clients in the list was forbidden by server and can not announce or get any torrent data, For more help, please contact our {{sNameDesc | translate}} by Message or Email.',
BLANK_NAME: 'Client Name',
BLANK_REASON: 'Forbidden Reason',
- FORM_MAKER_NAME: 'Maker Group Name',
- FORM_MAKER_DESC: 'Maker Group Description',
- FORM_MAKER_FOR: 'Create maker group for - {{name}}',
- MAKER_CREATE_SUCCESSFULLY: 'Create maker group successfully',
- MAKER_CREATE_FAILED: 'Create maker group failed',
+ FORM_MAKER_NAME: 'Resources Group Name',
+ FORM_MAKER_DESC: 'Resources Group Description',
+ FORM_MAKER_FOR: 'Create resources group for - {{name}}',
+ MAKER_CREATE_SUCCESSFULLY: 'Create resources group successfully',
+ MAKER_CREATE_FAILED: 'Create resources group failed',
OPER_LIST: 'Admin and Oper List',
OPER_LIST_TOOLTIP: 'Note:
All the users in the list was the Administrator or Operator of {{site}}, If you need any help, please contact our {{sNameDesc | translate}} by Message or Email or send a message to them from below.',
- MAKER_LIST_TOOLTIP: 'All the torrent maker group in the list was the official group of {{site}}, Thanks to the contributions of these groups. If you want to join one of these groups, send the station message to the group founder.',
+ MAKER_LIST_TOOLTIP: 'All the resources group in the list was the official group of {{site}}, Thanks to the contributions of these groups. If you want to join one of these groups, send the station message to the group founder.',
GROUP_FOUNDER: 'Founder: ',
BTN_EDIT_DESC: 'Edit Desc',
BTN_ADD_USER: 'Add Member',
BTN_REMOVE_GROUP: 'Delete Group',
- MAKER_TORRENTS_LIST_ERROR: 'Maker group torrents list error',
- MAKER_TORRENTS_IS_LOADING: 'Maker group torrents is loading...',
- MAKER_TORRENTS_IS_EMPTY: 'No torrents of this maker group is founded!',
+ MAKER_TORRENTS_LIST_ERROR: 'Resources group torrents list error',
+ MAKER_TORRENTS_IS_LOADING: 'Resources group torrents is loading...',
+ MAKER_TORRENTS_IS_EMPTY: 'No torrents of this resources group is founded!',
DELETE_CONFIRM_OK: 'Delete',
DELETE_CONFIRM_CANCEL: 'Cancel',
DELETE_CONFIRM_HEADER_TEXT: 'Delete Confirm',
- DELETE_CONFIRM_BODY_TEXT: 'Are you sure want to delete this maker group?',
+ DELETE_CONFIRM_BODY_TEXT: 'Are you sure want to delete this resources group?',
DELETE_MEMBER_CONFIRM_BODY_TEXT: 'Are you sure want to delete the member from this group?',
- DELETE_SUCCESSFULLY: 'Maker group deleted successfully',
- DELETE_FAILED: 'Maker group deleted failed',
- RATING_SUCCESSFULLY: 'Rating for maker group successfully',
- RATING_FAILED: 'Rating for maker group failed',
+ DELETE_SUCCESSFULLY: 'Resources group deleted successfully',
+ DELETE_FAILED: 'Resources group deleted failed',
+ RATING_SUCCESSFULLY: 'Rating for resources group successfully',
+ RATING_FAILED: 'Rating for resources group failed',
ADD_MEMBER_TITLE: 'Add Member',
ADD_MEMBER_SUCCESSFULLY: 'Add group member successfully',
ADD_MEMBER_FAILED: 'Add group member failed',
REMOVE_MEMBER_SUCCESSFULLY: 'Remove group member successfully',
REMOVE_MEMBER_FAILED: 'Remove group member failed',
REMOVE_MEMBER_TITLE: 'Remove this member',
- EDIT_DESC_SUCCESSFULLY: 'Edit maker group desc successfully',
- EDIT_DESC_FAILED: 'Edit maker group desc failed'
+ EDIT_DESC_SUCCESSFULLY: 'Edit resources group desc successfully',
+ EDIT_DESC_FAILED: 'Edit resources group desc failed'
},
//collections views
@@ -889,7 +889,7 @@
BTN_UNBAN: 'Unban',
BTN_CREATE_MAKER: 'Create Maker',
SEALED: 'sealed',
- MAKER: 'Maker Group',
+ MAKER: 'Resources Group',
VIP_START_AT: 'Vip start at',
VIP_END_AT: 'Vip end at',
MY_FOLLOWERS: 'My Followers',
@@ -1062,7 +1062,7 @@
MESSAGE_TO_ICON_TITLE: 'Send a message to {{name}}',
USER_INFO_TITLE: 'user info of {{name}}',
- MAKER_INFO_TITLE: 'maker group info of {{name}}',
+ MAKER_INFO_TITLE: 'resources group info of {{name}}',
USER_IS_VIP: '{{name}} is a VIP',
USER_UPLOADED_FLAG: '{{name}} uploaded',
USER_DOWNLOADED_FLAG: '{{name}} downloaded',
@@ -1598,7 +1598,7 @@
EMAIL_ADDRESS_IS_NOT_ALLOW: 'The domain of this email address is not allowable from server',
INFO_HASH_IS_EMPTY: 'Info hash field of torrent file is empty',
INFO_HASH_ALREADY_EXISTS: 'This info hash value is already exists',
- UPLOAD_ACCESS_DENY: 'System only accepts resource maker group to upload torrents'
+ UPLOAD_ACCESS_DENY: 'System only accepts resources group to upload torrents'
},
//server message string, content string support markdown and emoji
@@ -1612,20 +1612,20 @@
TITLE_USER_VIP_CHANGED_ADD: 'Vip status changed',
CONTENT_USER_VIP_CHANGED_ADD: '### Welcome! \n Your vip status changed, now end at: **{{vip_end_at | date: "yyyy-MM-dd HH:mm"}}**, all H&R warning already clean. :four_leaf_clover:',
- TITLE_MAKER_CREATED: 'Maker group has created',
- CONTENT_MAKER_CREATED: 'Administrator [{{by_name}}](/userinfo/{{by_id}}) already created a maker group [{{maker_name}}](/about/maker/{{maker_id}}) for you, you are the group founder now, Thank you for your contribution on **{{site_name}}** :100:',
+ TITLE_MAKER_CREATED: 'Resources group has created',
+ CONTENT_MAKER_CREATED: 'Administrator [{{by_name}}](/userinfo/{{by_id}}) already created a resources group [{{maker_name}}](/about/maker/{{maker_id}}) for you, you are the group founder now, Thank you for your contribution on **{{site_name}}** :100:',
- TITLE_MAKER_DELETED: 'Maker group was deleted',
- CONTENT_MAKER_DELETED: ':warning: Your maker group **-={{maker_name}}=-** was deleted by user [{{by_name}}](/userinfo/{{by_id}}), Thank you for your contribution on **{{site_name}}**.',
+ TITLE_MAKER_DELETED: 'Resources group was deleted',
+ CONTENT_MAKER_DELETED: ':warning: Your resources group **-={{maker_name}}=-** was deleted by user [{{by_name}}](/userinfo/{{by_id}}), Thank you for your contribution on **{{site_name}}**.',
- TITLE_MAKER_UPLOAD_ACCESS_CHANGED: 'Maker group upload access changed',
- CONTENT_MAKER_UPLOAD_ACCESS_CHANGED: '### upload access changed! \n Your upload access of maker group [{{maker_name}}](/about/maker/{{maker_id}}) was changed by user [{{by_name}}](/userinfo/{{by_id}}), current access is **{{maker_access | translate}}**, Thank you for your contribution on **{{site_name}}**.',
+ TITLE_MAKER_UPLOAD_ACCESS_CHANGED: 'Resources group upload access changed',
+ CONTENT_MAKER_UPLOAD_ACCESS_CHANGED: '### upload access changed! \n Your upload access of resources group [{{maker_name}}](/about/maker/{{maker_id}}) was changed by user [{{by_name}}](/userinfo/{{by_id}}), current access is **{{maker_access | translate}}**, Thank you for your contribution on **{{site_name}}**.',
- TITLE_MAKER_ADD_MEMBER: 'Welcome become maker group member',
- CONTENT_MAKER_ADD_MEMBER: '### Welcome! \n :clap: You have become a member of maker group [{{maker_name}}](/about/maker/{{maker_id}}) by user [{{by_name}}](/userinfo/{{by_id}}), Thank you for your contribution on **{{site_name}}**.',
+ TITLE_MAKER_ADD_MEMBER: 'Welcome become resources group member',
+ CONTENT_MAKER_ADD_MEMBER: '### Welcome! \n :clap: You have become a member of resources group [{{maker_name}}](/about/maker/{{maker_id}}) by user [{{by_name}}](/userinfo/{{by_id}}), Thank you for your contribution on **{{site_name}}**.',
- TITLE_MAKER_REMOVE_MEMBER: 'Quit out of maker group',
- CONTENT_MAKER_REMOVE_MEMBER: ':warning: You already quit out of maker group [{{maker_name}}](/about/maker/{{maker_id}}) by user [{{by_name}}](/userinfo/{{by_id}}), Thank you for your contribution on **{{site_name}}**.',
+ TITLE_MAKER_REMOVE_MEMBER: 'Quit out of resources group',
+ CONTENT_MAKER_REMOVE_MEMBER: ':warning: You already quit out of resources group [{{maker_name}}](/about/maker/{{maker_id}}) by user [{{by_name}}](/userinfo/{{by_id}}), Thank you for your contribution on **{{site_name}}**.',
TITLE_HNR_WARNING_ADD: 'New H&R warning',
CONTENT_HNR_WARNING_ADD: '### H&R warning! \n You just got a h&r warning on torrent [{{torrent_file_name}}](/torrents/{{torrent_id}}), please continue to seeding, the warning will be auto cleanup when the seed ratio more than {{hnr_ratio}} or seed time more than {{hnr_days}} days or clean up manually at [warning list](/status/warning).',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index fcfe18c2..1766ba3d 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -49,7 +49,7 @@
MENU_ABOUT: '关于',
MENU_ABOUT_MANUAL: '用户手册',
MENU_ABOUT_BLACKLIST: '禁止客户端列表',
- MENU_ABOUT_MAKERGROUP: '资源压制小组',
+ MENU_ABOUT_MAKERGROUP: '资源小组',
MENU_ABOUT_OPERLIST: 'Admin/Oper 列表',
MENU_ABOUT_RANKING: '用户排行榜',
MENU_VIP: 'VIP',
@@ -228,7 +228,7 @@
REQUEST_RULES: '求种细则',
MANUAL_FAQ: '问题解答',
BLACK: '禁止客户端列表',
- MAKER: '资源压制小组',
+ MAKER: '资源小组',
OPERLIST: 'Admin/Oper 列表',
COLLECTIONS: '电影系列',
VIP: 'Vip',
@@ -520,7 +520,7 @@
SELECT_SE: '4.1. 请选择电视剧季数并输入本资源为本剧第几集',
SELECT_TAGS: '5. 请为资源选择合适的标签',
ENTER_VIDEO_NFO: '6. 请输入视频和音频的NFO信息',
- SELECT_MAKER_GROUP: '7. 请选择您上传时使用的资源压制小组',
+ SELECT_MAKER_GROUP: '7. 请选择您上传时使用的资源小组',
MAKER_NULL: '无',
UPLOADER_ANONYMOUS: '匿名上传（用户不会看到我是上传者）',
ANONYMOUS: '匿名',
@@ -652,18 +652,18 @@
MENU_ABOUT_MANUAL_REQUEST_RULES: '求种细则',
MENU_ABOUT_MANUAL_FAQ: '问题解答',
CLIENT_BLACK_LIST: '禁止客户端列表',
- MAKER_GROUP: '资源压制小组',
+ MAKER_GROUP: '资源小组',
BLACK_TOOLTIP: '提示:
下面列出的所有客户端都已被服务器禁止，使用它们将不能下载到任何数据, 如需其它帮助，请给{{sNameDesc | translate}}发送 消息 或 邮件.',
BLANK_NAME: '客户端名称',
BLANK_REASON: '禁止理由',
- FORM_MAKER_NAME: '资源压制小组名称',
- FORM_MAKER_DESC: '资源压制小组简介',
- FORM_MAKER_FOR: '创建资源压制小组 - {{name}}',
- MAKER_CREATE_SUCCESSFULLY: '资源压制小组创建成功',
- MAKER_CREATE_FAILED: '资源压制小组创建失败',
+ FORM_MAKER_NAME: '资源小组名称',
+ FORM_MAKER_DESC: '资源小组简介',
+ FORM_MAKER_FOR: '创建资源小组 - {{name}}',
+ MAKER_CREATE_SUCCESSFULLY: '资源小组创建成功',
+ MAKER_CREATE_FAILED: '资源小组创建失败',
OPER_LIST: 'Admin & Oper 列表',
OPER_LIST_TOOLTIP: '提示:
下面列出的所有用户都是 {{site}} 站点的 Administrator 或 Operator, 如果您需要帮助, 请给{{sNameDesc | translate}}发送 消息 或 邮件 或者向下面列出的管理员直接发送站内消息.',
- MAKER_LIST_TOOLTIP: '下面列出的所有资源压制小组都是入驻 {{site}} 的官方小组, 感谢这些压制小组对站点做出的贡献, 如果您想加入其中的小组, 请向小组创始人发送站内消息并欢迎您成为其中的一份子.',
+ MAKER_LIST_TOOLTIP: '下面列出的所有资源小组都是入驻 {{site}} 的官方小组, 感谢这些压制小组对站点做出的贡献, 如果您想加入其中的小组, 请向小组创始人发送站内消息并欢迎您成为其中的一份子.',
GROUP_FOUNDER: '创始人: ',
BTN_EDIT_DESC: '编辑简介',
BTN_ADD_USER: '添加新成员',
@@ -674,12 +674,12 @@
DELETE_CONFIRM_OK: '删除',
DELETE_CONFIRM_CANCEL: '取消',
DELETE_CONFIRM_HEADER_TEXT: '删除确认',
- DELETE_CONFIRM_BODY_TEXT: '您确定要删除这个资源压制小组?',
+ DELETE_CONFIRM_BODY_TEXT: '您确定要删除这个资源小组?',
DELETE_MEMBER_CONFIRM_BODY_TEXT: '您确定要从小组删除这个成员?',
- DELETE_SUCCESSFULLY: '资源压制小组删除成功',
- DELETE_FAILED: '资源压制小组删除失败',
- RATING_SUCCESSFULLY: '为资源压制小组评分成功',
- RATING_FAILED: '为资源压制小组评分失败',
+ DELETE_SUCCESSFULLY: '资源小组删除成功',
+ DELETE_FAILED: '资源小组删除失败',
+ RATING_SUCCESSFULLY: '为资源小组评分成功',
+ RATING_FAILED: '为资源小组评分失败',
ADD_MEMBER_TITLE: '添加小组成员',
ADD_MEMBER_SUCCESSFULLY: '添加小组成员成功',
ADD_MEMBER_FAILED: '添加小组成员失败',
@@ -889,7 +889,7 @@
BTN_UNBAN: '解禁',
BTN_CREATE_MAKER: '创建小组',
SEALED: '冻结',
- MAKER: '资源压制小组',
+ MAKER: '资源小组',
VIP_START_AT: 'Vip 资格开始于',
VIP_END_AT: 'Vip 资格结束于',
MY_FOLLOWERS: '关注我的',
@@ -1062,7 +1062,7 @@
MESSAGE_TO_ICON_TITLE: '给{{name}}发送站内消息',
USER_INFO_TITLE: '{{name}} 的用户信息',
- MAKER_INFO_TITLE: '资源压制小组 [{{name}}]',
+ MAKER_INFO_TITLE: '资源小组 [{{name}}]',
USER_IS_VIP: '{{name}} 是一个VIP用户',
USER_UPLOADED_FLAG: '{{name}} 的上传量',
USER_DOWNLOADED_FLAG: '{{name}} 的下载量',