diff --git a/omega-i18n/en/messages.json b/omega-i18n/en/messages.json index 64beea0..c440cfa 100644 --- a/omega-i18n/en/messages.json +++ b/omega-i18n/en/messages.json @@ -461,7 +461,7 @@ "message": "Please select the type of the profile:" }, "options_profileTypeFixedProfile" : { - "message": "Fixed Profile" + "message": "Proxy Profile" }, "options_profileDescFixedProfile" : { "message": "Tunneling traffic through proxy servers." @@ -472,11 +472,14 @@ "options_profileDescPacProfile" : { "message": "Choosing proxies using an online/local PAC script." }, + "options_profileDescMorePacProfile" : { + "message": "You will only need this if you have a PAC script or a URL to it. Don't try to create one unless you have knowledge about PAC." + }, "options_profileTypeSwitchProfile" : { "message": "Switch Profile" }, "options_profileDescSwitchProfile" : { - "message": "Applying different profiles automatically on various conditions such as domains or patterns. (Replaces AutoSwitch mode.)" + "message": "Applying different profiles automatically on various conditions such as domains or patterns.\n You can also import rules published online for easier switching. (Replaces AutoSwitch mode + Rule List.)" }, "options_profileTypeRuleListProfile" : { "message": "Rule List Profile" diff --git a/omega-i18n/zh/messages.json b/omega-i18n/zh/messages.json index 93b974c..20f7ec4 100644 --- a/omega-i18n/zh/messages.json +++ b/omega-i18n/zh/messages.json @@ -472,11 +472,14 @@ "options_profileDescPacProfile" : { "message": "根据在线或本地的PAC脚本选择代理。" }, + "options_profileDescMorePacProfile" : { + "message": "如果您没有任何PAC脚本,也没有脚本的网址,则不必使用此情景模式。不了解PAC的用户不建议自行尝试编写脚本。" + }, "options_profileTypeSwitchProfile" : { "message": "自动切换模式" }, "options_profileDescSwitchProfile" : { - "message": "根据多种条件,如域名或网址等自动选择情景模式。" + "message": "根据多种条件,如域名或网址等自动选择情景模式。您也可以导入在线发布的切换规则(如 AutoProxy 列表)以简化设置。" }, "options_profileTypeRuleListProfile" : { "message": "规则列表" diff --git a/omega-web/src/partials/new_profile.jade b/omega-web/src/partials/new_profile.jade index c870596..1cb916c 100644 --- a/omega-web/src/partials/new_profile.jade +++ b/omega-web/src/partials/new_profile.jade @@ -36,14 +36,7 @@ form(ng-submit='newProfile.$valid && $close(profile)' name='newProfile') = ' ' span {{'options_profileTypePacProfile' | tr}} .help-block {{'options_profileDescPacProfile' | tr}} - .radio - label - input(type='radio', name='profile-new-type', value='SwitchyRuleListProfile' ng-model='profile.profileType') - span.profile-type - span.glyphicon.glyphicon-list - = ' ' - span {{'options_profileTypeRuleListProfile' | tr}} - .help-block {{'options_profileDescRuleListProfile' | tr}} + .help-block {{'options_profileDescMorePacProfile' | tr}} .modal-footer button.btn.btn-default(type='button' ng-click='$dismiss()') {{'dialog_cancel' | tr}} button.btn.btn-primary(type='submit' ng-disabled='!newProfile.$valid') {{'options_createProfile' | tr}}