diff --git a/omega-locales/cs/LC_MESSAGES/omega-web.po b/omega-locales/cs/LC_MESSAGES/omega-web.po index 734d51a..2f67447 100644 --- a/omega-locales/cs/LC_MESSAGES/omega-web.po +++ b/omega-locales/cs/LC_MESSAGES/omega-web.po @@ -1007,14 +1007,26 @@ msgstr "Protokol chyb" msgid "popup_requestErrorCount" msgstr "$COUNT$ chybových požadavků" +msgid "popup_requestErrorHeading" +msgstr "Resources that failed to load" + msgid "popup_requestErrorWarning" msgstr "Několik zdrojů se nepodařilo načíst kvůli potížím se sítí." +msgid "popup_requestErrorWarningHelp" +msgstr "SwitchyOmega is just the reporter of these issues, not the cause of them." + msgid "popup_requestErrorAddCondition" msgstr "" "Můžete zkontrolovat následující domény a použít proxy server pro ně v " "případě potřeby." +msgid "popup_requestErrorCannotAddCondition" +msgstr "You can add switch conditions for them only when using a Switch Profile." + +msgid "popup_configureMonitorWebRequests" +msgstr "Configure Network Monitor" + msgid "options_resultProfileForSelectedDomains" msgstr "Použít tento profil pro všechny vybrané domény" diff --git a/omega-locales/en_US/LC_MESSAGES/omega-web.po b/omega-locales/en_US/LC_MESSAGES/omega-web.po index 5380ef3..3509c99 100644 --- a/omega-locales/en_US/LC_MESSAGES/omega-web.po +++ b/omega-locales/en_US/LC_MESSAGES/omega-web.po @@ -1002,12 +1002,24 @@ msgstr "Error log" msgid "popup_requestErrorCount" msgstr "$COUNT$ failed resources" +msgid "popup_requestErrorHeading" +msgstr "Resources that failed to load" + msgid "popup_requestErrorWarning" -msgstr "A few resources failed to load due to network issues." +msgstr "A few resources failed to load due to issues with your network, proxy server or the webpage." + +msgid "popup_requestErrorWarningHelp" +msgstr "SwitchyOmega is just the reporter of these issues, not the cause of them." msgid "popup_requestErrorAddCondition" msgstr "You can review the following domains and use proxy for them when appropriate." +msgid "popup_requestErrorCannotAddCondition" +msgstr "You can add switch conditions for them only when using a Switch Profile." + +msgid "popup_configureMonitorWebRequests" +msgstr "Configure Network Monitor" + msgid "options_resultProfileForSelectedDomains" msgstr "Use this profile for all selected domains" diff --git a/omega-locales/ja/LC_MESSAGES/omega-web.po b/omega-locales/ja/LC_MESSAGES/omega-web.po index cdc7319..b9cb0ab 100644 --- a/omega-locales/ja/LC_MESSAGES/omega-web.po +++ b/omega-locales/ja/LC_MESSAGES/omega-web.po @@ -1010,12 +1010,23 @@ msgstr "Error log" msgid "popup_requestErrorCount" msgstr "$COUNT$ failed resources" +msgid "popup_requestErrorHeading" +msgstr "Resources that failed to load" + msgid "popup_requestErrorWarning" -msgstr "A few resources failed to load due to network issues." +msgstr "A few resources failed to load due to issues with your network, proxy server or the webpage." + +msgid "popup_requestErrorWarningHelp" +msgstr "SwitchyOmega is just the reporter of these issues, not the cause of them." msgid "popup_requestErrorAddCondition" -msgstr "" -"You can review the following domains and use proxy for them when appropriate." +msgstr "You can review the following domains and use proxy for them when appropriate." + +msgid "popup_requestErrorCannotAddCondition" +msgstr "You can add switch conditions for them only when using a Switch Profile." + +msgid "popup_configureMonitorWebRequests" +msgstr "Configure Network Monitor" msgid "options_resultProfileForSelectedDomains" msgstr "Use this profile for all selected domains" diff --git a/omega-locales/tr/LC_MESSAGES/omega-web.po b/omega-locales/tr/LC_MESSAGES/omega-web.po index e36487f..26519c4 100644 --- a/omega-locales/tr/LC_MESSAGES/omega-web.po +++ b/omega-locales/tr/LC_MESSAGES/omega-web.po @@ -1016,12 +1016,24 @@ msgstr "Error log" msgid "popup_requestErrorCount" msgstr "$COUNT$ failed resources" +msgid "popup_requestErrorHeading" +msgstr "Resources that failed to load" + msgid "popup_requestErrorWarning" -msgstr "A few resources failed to load due to network issues." +msgstr "A few resources failed to load due to issues with your network, proxy server or the webpage." + +msgid "popup_requestErrorWarningHelp" +msgstr "SwitchyOmega is just the reporter of these issues, not the cause of them." msgid "popup_requestErrorAddCondition" msgstr "You can review the following domains and use proxy for them when appropriate." +msgid "popup_requestErrorCannotAddCondition" +msgstr "You can add switch conditions for them only when using a Switch Profile." + +msgid "popup_configureMonitorWebRequests" +msgstr "Configure Network Monitor" + msgid "options_resultProfileForSelectedDomains" msgstr "Use this profile for all selected domains" diff --git a/omega-locales/zh_CN/LC_MESSAGES/omega-web.po b/omega-locales/zh_CN/LC_MESSAGES/omega-web.po index 154d400..2827331 100644 --- a/omega-locales/zh_CN/LC_MESSAGES/omega-web.po +++ b/omega-locales/zh_CN/LC_MESSAGES/omega-web.po @@ -881,12 +881,24 @@ msgstr "错误日志" msgid "popup_requestErrorCount" msgstr "$COUNT$个资源未加载" +msgid "popup_requestErrorHeading" +msgstr "加载失败的资源列表" + msgid "popup_requestErrorWarning" -msgstr "由于网络原因，此页面部分资源加载失败。" +msgstr "由于网络原因，此页面部分资源加载失败。这些问题可能是由您的网络、代理服务器或网站本身引起的。" + +msgid "popup_requestErrorWarningHelp" +msgstr "这些问题并非由 SwitchyOmega 自身导致，它只不过检测并报告了错误而已。" msgid "popup_requestErrorAddCondition" msgstr "您可以查看以下域名，并根据实际情况确定是否对其使用代理。" +msgid "popup_requestErrorCannotAddCondition" +msgstr "在使用自动切换情景时，才可以将这些资源添加为切换条件。" + +msgid "popup_configureMonitorWebRequests" +msgstr "设置网络检测选项" + msgid "options_resultProfileForSelectedDomains" msgstr "对所有选中域名使用此情景模式：" diff --git a/omega-locales/zh_TW/LC_MESSAGES/omega-web.po b/omega-locales/zh_TW/LC_MESSAGES/omega-web.po index 9b84d8b..4d08808 100644 --- a/omega-locales/zh_TW/LC_MESSAGES/omega-web.po +++ b/omega-locales/zh_TW/LC_MESSAGES/omega-web.po @@ -881,12 +881,24 @@ msgstr "錯誤日誌" msgid "popup_requestErrorCount" msgstr "$COUNT$個資源未載入" +msgid "popup_requestErrorHeading" +msgstr "載入失敗的資源列表" + msgid "popup_requestErrorWarning" msgstr "由於網路原因，此頁面部分資源載入失敗。" +msgid "popup_requestErrorWarningHelp" +msgstr "這些問題並非由 SwitchyOmega 自身導致，它只不過檢測並報告了錯誤而已。" + msgid "popup_requestErrorAddCondition" msgstr "您可以檢視以下域名，並根據實際情況確定是否對其使用代理。" +msgid "popup_requestErrorCannotAddCondition" +msgstr "在使用自動切換情景時，才可以將這些資源新增為切換條件。" + +msgid "popup_configureMonitorWebRequests" +msgstr "設定網路檢測選項" + msgid "options_resultProfileForSelectedDomains" msgstr "對所有選中域名使用此情景模式：" diff --git a/omega-web/src/popup.jade b/omega-web/src/popup.jade index 07251b7..fe9ead0 100644 --- a/omega-web/src/popup.jade +++ b/omega-web/src/popup.jade @@ -142,7 +142,9 @@ html(lang='en' ng-app='omegaPopup' ng-controller='PopupCtrl' ng-csp) span.profile-inline span(omega-profile-inline='currentProfile' options='availableProfiles' disp-name='dispNameFilter') legend(ng-show='!currentProfileCanAddRule') - p.text-warning {{'popup_requestErrorWarning' | tr}} + | {{'popup_requestErrorHeading' | tr}} + .text-warning {{'popup_requestErrorWarning' | tr}} + p.help-block {{'popup_requestErrorWarningHelp' | tr}} p.help-block(ng-show='!!currentProfileCanAddRule') {{'popup_requestErrorAddCondition' | tr}} .checkbox(ng-repeat='domain in requestInfo.domains') label @@ -153,10 +155,14 @@ html(lang='en' ng-app='omegaPopup' ng-controller='PopupCtrl' ng-csp) label {{'options_resultProfileForSelectedDomains' | tr}} div(omega-profile-select='validResultProfiles' ng-model='profileForDomains' disp-name='dispNameFilter' options='availableProfiles') + p.help-block(ng-show='!currentProfileCanAddRule') + | {{'popup_requestErrorCannotAddCondition' | tr}} div.condition-controls button.btn.btn-default(type='button' ng-click='showRequestInfo = false') | {{'dialog_cancel' | tr}} button.btn.btn-primary(type='submit' ng-show='!!currentProfileCanAddRule') {{'popup_addCondition' | tr}} + button.btn.btn-default.pull-right(type='submit' ng-show='!currentProfileCanAddRule' + ng-click='openOptions("#/general")') {{'popup_configureMonitorWebRequests' | tr}} script(src='js/log_error.js') script(src='lib/FileSaver/FileSaver.js')