diff --git a/core/locale/en.json b/core/locale/en.json
index f686b22..d78fd4a 100644
--- a/core/locale/en.json
+++ b/core/locale/en.json
@@ -1,16 +1,16 @@
{
"app": {
"name": "RootPanel",
- "description": "A linux virtual host management system with extensibility"
+ "description": "Pluggable PaaS service development framework"
},
"plans": {
"sample": {
- "name": "Sample Services",
- "description": "$1.25 per month, calculated by hour"
+ "name": "Sample Plan",
+ "description": "10 CNY per month, calculated by hour"
},
"test": {
- "name": "Test Services",
- "description": "Calculated by requirements, will be auto closed after 7 days absence"
+ "name": "Test Plan",
+ "description": "Calculated by usages"
}
},
"common": {
@@ -43,7 +43,8 @@
"email_exist": "Email already exists",
"invalid_username": "Invalid username",
"invalid_password": "Invalid password",
- "invalid_email": "Invalid email"
+ "invalid_email": "Invalid email",
+ "insufficient_balance": "Insufficient Balance"
},
"account": {
"": "Account",
@@ -56,11 +57,11 @@
"preferences": "Preferences"
},
"panel": {
- "": "Management",
+ "": "Panel",
"overview": "Overview"
},
"ticket": {
- "": "Support Tickets",
+ "": "Tickets",
"title": "Title",
"status": "Status",
"create": "Create",
@@ -75,18 +76,24 @@
"creator": "Creator",
"members": "Members"
},
+ "ticket_status": {
+ "closed": "Closed",
+ "open": "Open",
+ "pending": "Pending",
+ "finish": "Finish",
+ "related": "Related"
+ },
"plan": {
"": "Plan",
- "join": "Subscribe",
- "leave": "Unsubscribe",
+ "join": "Join",
+ "leave": "Leave",
"balance": "Balance",
- "remaining_time": "Time Remaining",
"currency": {
"CNY": "CNY"
}
},
"admin": {
- "admin_panel": "Admin Panel"
+ "admin_panel": "Admin Area"
},
"time": {
"day": "Day"
@@ -99,7 +106,7 @@
"navigation": "Extend"
},
"account": {
- "password2": "repeat",
+ "password2": "Repeat",
"already_register": "Already has account?",
"no_account": "Has no account?",
"password_inconsistent": "Passwords not matched"
@@ -110,7 +117,7 @@
"coupon_code": "Coupon Code",
"code": "Code",
"update_password": "Update password",
- "original_password": "Old password",
+ "original_password": "Original password",
"new_password": "New password",
"repeat_password": "Repeat password",
"update_email": "Update Email",
@@ -118,8 +125,7 @@
"new_email": "New Email"
},
"panel": {
- "billing": "Billing",
- "service_switch": "Switch"
+ "financials": "Financials"
},
"pay": {
"pay_log": "Pay History",
@@ -139,5 +145,10 @@
"order_id": "Order Id"
}
},
+ "coupons": {
+ "amount": {
+ "message": "Cash: __amount__ __currency__"
+ }
+ },
"plugins": {}
}
diff --git a/core/locale/zh_CN.json b/core/locale/zh_CN.json
index 95cf47b..80631ac 100644
--- a/core/locale/zh_CN.json
+++ b/core/locale/zh_CN.json
@@ -1,16 +1,16 @@
{
"app": {
"name": "RootPanel",
- "description": "一个插件化的 Linux 虚拟主机管理系统。"
+ "description": "插件化 PaaS 服务开发框架"
},
"plans": {
"sample": {
"name": "示例",
- "description": "每月 8 元,按小时计费"
+ "description": "每月 10 元,按小时计费"
},
"test": {
"name": "测试",
- "description": "按量付费,7 天不使用自动关闭"
+ "description": "按使用量付费"
}
},
"common": {
@@ -88,7 +88,6 @@
"join": "订购方案",
"leave": "退订方案",
"balance": "余额",
- "remaining_time": "剩余时长",
"currency": {
"CNY": "CNY"
}
@@ -126,8 +125,7 @@
"new_email": "新邮箱"
},
"panel": {
- "billing": "财务",
- "service_switch": "服务开关"
+ "financials": "财务"
},
"pay": {
"pay_log": "充值记录",
@@ -149,7 +147,7 @@
},
"coupons": {
"amount": {
- "message": "账户余额:__amount__ __currency__"
+ "message": "代金券:__amount__ __currency__"
}
},
"plugins": {}
diff --git a/core/view/panel.jade b/core/view/panel.jade
index 37dd7cf..c238882 100644
--- a/core/view/panel.jade
+++ b/core/view/panel.jade
@@ -10,7 +10,7 @@ append header
block main
.row
- header= t('view.panel.billing')
+ header= t('view.panel.financials')
p #{t('plan.balance')}: #{account.billing.balance.toFixed(2)} #{t('plan.currency.' + config.billing.currency)}
p
a(href= '/panel/pay/').btn.btn-success= t('common.charge')
diff --git a/package.json b/package.json
index 05afddf..12f0534 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "rootpanel",
"version": "0.8.0",
- "description": "A pluggable PaaS framework",
+ "description": "A pluggable PaaS service development framework",
"homepage": "https://rootpanel.io",
"license": "AGPL-3.0",
"repository": {
diff --git a/plugin/bitcoin/locale/en.json b/plugin/bitcoin/locale/en.json
new file mode 100644
index 0000000..fbad29b
--- /dev/null
+++ b/plugin/bitcoin/locale/en.json
@@ -0,0 +1,8 @@
+{
+ "": "Bitcoin",
+ "view": {
+ "payment_tips": "You can transfer directly to this address. system will automatically recharge for you after first confirmed. The minimum payment amount: 0.0005 BTC.",
+ "exchange_rate_tips": "Real-time Exchange Rates: 10 CNY = __rate10__ BTC",
+ "payment_details": "Bitcoin Payment __short_order_id__"
+ }
+}
diff --git a/plugin/bitcoin/locale/zh_CN.json b/plugin/bitcoin/locale/zh_CN.json
index b184658..4b40c99 100644
--- a/plugin/bitcoin/locale/zh_CN.json
+++ b/plugin/bitcoin/locale/zh_CN.json
@@ -1,7 +1,7 @@
{
"": "比特币",
"view": {
- "payment_tips": "你可以直接向该地址发送比特币。在经过一次确认后,系统会实时地,自动为你折算充值金额,最小支付金额为 0.0005.",
+ "payment_tips": "你可以直接向该地址发送比特币。在经过一次确认后,系统会实时地,自动为你折算充值金额,最小支付金额为 0.0005 BTC.",
"exchange_rate_tips": "实时汇率:10 CNY = __rate10__ BTC",
"payment_details": "比特币支付 __short_order_id__"
}
diff --git a/plugin/linux/locale/en.json b/plugin/linux/locale/en.json
new file mode 100644
index 0000000..a0c2db5
--- /dev/null
+++ b/plugin/linux/locale/en.json
@@ -0,0 +1,15 @@
+{
+ "": "Linux",
+ "server_monitor": "Server Status",
+ "widget": {
+ "hour_cpu": "CPU usage in last hour",
+ "hour_memory": "Memory usage in last hour",
+ "storage": "Storage used",
+ "month_transfer": "traffic of this month"
+ },
+ "monitor": {
+ "system": "Operator System",
+ "system_info": "System info",
+ "cpu": "CPU"
+ }
+}
diff --git a/plugin/linux/locale/zh_CN.json b/plugin/linux/locale/zh_CN.json
index dc64453..4d3ce09 100644
--- a/plugin/linux/locale/zh_CN.json
+++ b/plugin/linux/locale/zh_CN.json
@@ -1,7 +1,6 @@
{
"": "Linux",
"server_monitor": "服务器状态",
- "description": "Linux 是 RP 主机的基础服务,负责进行资源限制",
"widget": {
"hour_cpu": "一小时 CPU 时间",
"hour_memory": "一小时内存占用",
diff --git a/plugin/rpvhost/locale/en.json b/plugin/rpvhost/locale/en.json
index e3c6ba5..05b29b9 100644
--- a/plugin/rpvhost/locale/en.json
+++ b/plugin/rpvhost/locale/en.json
@@ -1,3 +1,16 @@
{
- "site_name": "RP Virtual Hosting"
+ "site_name": "RP Virtual Hosting",
+ "taobao": "Taobao",
+ "official_blog": "Official Blog",
+ "view": {
+ "payment_tips": "Purchase the following product, and tell us your username and which server.",
+ "go_pay": "Pay on Taobao",
+ "payment_details": "Taobao Payment, Order ID: __order_id__"
+ },
+ "plans": {
+ "all": {
+ "name": "All Service (Default)",
+ "description": "Storage 520MB, Memory: 27MB, Traffic of month: 37GB"
+ }
+ }
}
diff --git a/plugin/shadowsocks/locale/en.json b/plugin/shadowsocks/locale/en.json
new file mode 100644
index 0000000..112f2c8
--- /dev/null
+++ b/plugin/shadowsocks/locale/en.json
@@ -0,0 +1,11 @@
+{
+ "": "ShadowSocks",
+ "remote_access": "Remote Access",
+ "remote_port": "Port",
+ "reset": "Reset",
+ "transfer": "Traffic",
+ "transfer_remainder": "About __traffic__ G remainder",
+ "24hours_ago": "24 hours ago",
+ "7days_ago": "7 days ago",
+ "30days_ago": "30 days ago"
+}
diff --git a/plugin/ssh/locale/en.json b/plugin/ssh/locale/en.json
new file mode 100644
index 0000000..a8508a7
--- /dev/null
+++ b/plugin/ssh/locale/en.json
@@ -0,0 +1,10 @@
+{
+ "": "SSH",
+ "process": "Process",
+ "memory": "Memory",
+ "cpu": "CPU",
+ "kill": "Kill",
+ "view": {
+ "update_password": "Update SSH password"
+ }
+}
diff --git a/plugin/ssh/locale/zh_CN.json b/plugin/ssh/locale/zh_CN.json
index 0e60c14..795592c 100644
--- a/plugin/ssh/locale/zh_CN.json
+++ b/plugin/ssh/locale/zh_CN.json
@@ -1,6 +1,5 @@
{
"": "SSH",
- "description": "SSH 提供了远程登录服务",
"process": "进程",
"memory": "内存",
"cpu": "CPU",
diff --git a/plugin/supervisor/locale/en.json b/plugin/supervisor/locale/en.json
new file mode 100644
index 0000000..b62809e
--- /dev/null
+++ b/plugin/supervisor/locale/en.json
@@ -0,0 +1,17 @@
+{
+ "": "Supervisor",
+ "common": {
+ "name": "Name",
+ "command": "Start Command",
+ "options": "Options",
+ "status": "Status",
+ "directory": "Start Directory",
+ "autostart": "Auto start with system",
+ "autorestart": "Auto restart"
+ },
+ "autorestart": {
+ "true": "Always restart",
+ "false": "Don't restart",
+ "unexpected": "Restart when error"
+ }
+}
diff --git a/plugin/wiki/locale/en.json b/plugin/wiki/locale/en.json
new file mode 100644
index 0000000..b1f4024
--- /dev/null
+++ b/plugin/wiki/locale/en.json
@@ -0,0 +1,3 @@
+{
+ "": "User Manual"
+}