mirror of
https://github.com/zero-peak/ZeroOmega.git
synced 2025-01-22 15:08:12 -05:00
Add Conflicts section in options. Replaces Proxy Changes. Fix #1052.
This commit is contained in:
FelisCatus
parent
5c837b7470
commit
ddf9f47c4d
@ -321,6 +321,40 @@ msgstr "Proxy Changes"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Revert proxy changes done by other apps."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Network Requests"
|
||||
|
||||
|
||||
@ -322,6 +322,40 @@ msgstr "Proxy Změny"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Reverzní proxy změněna jinou aplikací."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Síťové požadavky"
|
||||
|
||||
|
||||
@ -326,6 +326,40 @@ msgstr "Proxy Changes"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Revert proxy changes done by other apps."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Network Requests"
|
||||
|
||||
|
||||
@ -322,6 +322,40 @@ msgstr "Proxy Changes"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Revert proxy changes done by other apps."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Network Requests"
|
||||
|
||||
|
||||
@ -333,6 +333,40 @@ msgstr "Cambios Proxy"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Deshacer cambios de proxy realizados por otras aplicaciones."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Peticiones de red"
|
||||
|
||||
|
||||
@ -326,6 +326,40 @@ msgstr "Proxy Changes"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Revert proxy changes done by other apps."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Network Requests"
|
||||
|
||||
|
||||
@ -326,6 +326,40 @@ msgstr "تغییر پروکسی"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "بازگرداندن تغییرات پروکسی انجام شده توسط دیگر برنامه ها."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "درخواست های شبکه"
|
||||
|
||||
|
||||
@ -323,6 +323,40 @@ msgstr "Proxy Changes"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Revert proxy changes done by other apps."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Network Requests"
|
||||
|
||||
|
||||
@ -266,6 +266,40 @@ msgstr ""
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr ""
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -316,6 +316,40 @@ msgstr "Proxy Changes"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Revert proxy changes done by other apps."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Network Requests"
|
||||
|
||||
|
||||
@ -274,6 +274,40 @@ msgstr ""
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr ""
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Nettverksforespørsler"
|
||||
|
||||
|
||||
@ -256,6 +256,40 @@ msgstr ""
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr ""
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -322,6 +322,40 @@ msgstr "Proxy Changes"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Revert proxy changes done by other apps."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Network Requests"
|
||||
|
||||
|
||||
@ -326,6 +326,40 @@ msgstr "Proxy Changes"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Revert proxy changes done by other apps."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Network Requests"
|
||||
|
||||
|
||||
@ -265,6 +265,40 @@ msgstr ""
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr ""
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -267,6 +267,40 @@ msgstr ""
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr ""
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@ -325,6 +325,40 @@ msgstr "Proxy Changes"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Revert proxy changes done by other apps."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Network Requests"
|
||||
|
||||
|
||||
@ -355,6 +355,40 @@ msgstr "Зміни проксі-серверів"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "Відмінити зміни проксі-серверів, що зроблені іншими додатками."
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "Conflicts"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"Sometimes, other apps will also try to control the proxy settings, resulting "
|
||||
"in conflicts. Note that ad blockers and other extensions may also use proxy "
|
||||
"settings under the hood. Such conflicts cannot be avoided due to how the "
|
||||
"browser works."
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"A red badge like this on the SwitchyOmega icon indicates that another app has "
|
||||
"higher priority so SwitchyOmega cannot control the settings. Please try to "
|
||||
"uninstall SwitchyOmega and reinstall, which should raise SwitchyOmega's "
|
||||
"priority. If you still see conflicts after reinstallation, please consider "
|
||||
"removing the other app causing the conflict."
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"If SwitchyOmega has higher priority, you can give the control back to other "
|
||||
"apps or system settings by selecting $SYSTEMPROFILE$ in the popup menu."
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "Show popup menu item to import proxy settings from other apps."
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"When $SYSTEMPROFILE$ is selected, you can import the effective proxy settings "
|
||||
"from other apps by selecting $EXTERNALPROFILE$ on the popup menu. "
|
||||
"The settings will be imported as a profile using the name you provide. "
|
||||
"Please note that the imported profile is a snapshot and will not reflect "
|
||||
"any changes from the source app thereafter."
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "Мережеві запити"
|
||||
|
||||
|
||||
@ -293,6 +293,35 @@ msgstr "代理设置变化"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "撤消其他扩展对代理的更改。"
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "冲突"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"有时其他应用也会试图控制代理设置，从而导致冲突。请注意，去广告等其他扩展也可能"
|
||||
"利用了代理设置来实现功能。此类冲突是由浏览器的工作原理引起的，所以无法避免。"
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"如果 SwitchyOmega 图标上显示这样的红色徽章，表示另一个应用优先级较高，因此"
|
||||
"SwitchyOmega 无法控制代理设置。请尝试卸载 SwitchyOmega 再重新安装，这样可能可"
|
||||
"以提高 SwitchyOmega 的优先级。如果重装后您仍然看到冲突，那么请考虑移除那个"
|
||||
"导致冲突的应用。"
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"如果 SwitchyOmega 的优先级较高，那么您可以在弹出菜单中选择 $SYSTEMPROFILE$ 来"
|
||||
"把控制权还给其他应用或系统设置。"
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "在弹出菜单中显示菜单项，以导入其他应用提供的代理设置。"
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"选择了 $SYSTEMPROFILE$ 的情况下，您可以在弹出菜单中选择 $EXTERNALPROFILE$ 来"
|
||||
"导入其他应用提供的代理设置。导入的设置将会成为一个新的情景模式，其名称由您决"
|
||||
"定。请注意导入的情景模式只是当时的一个快照，导入后不会随着原来的应用更新。"
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "网络请求"
|
||||
|
||||
|
||||
@ -293,6 +293,35 @@ msgstr "代理設定變化"
|
||||
msgid "options_revertProxyChanges"
|
||||
msgstr "撤消其他擴展對代理的更改。"
|
||||
|
||||
msgid "options_group_conflicts"
|
||||
msgstr "衝突"
|
||||
|
||||
msgid "options_conflicts_introduction"
|
||||
msgstr ""
|
||||
"有時其他應用也會試圖控制代理設置，從而導致衝突。請注意，去廣告等其他擴展也可能"
|
||||
"利用了代理設置來實現功能。此類衝突是由瀏覽器的工作原理引起的，所以無法避免。"
|
||||
|
||||
msgid "options_conflicts_lowerPriority"
|
||||
msgstr ""
|
||||
"如果 SwitchyOmega 圖標上顯示這樣的紅色徽章，表示另一個應用優先級較高，因此"
|
||||
"SwitchyOmega 無法控制代理設置。請嘗試卸載 SwitchyOmega 再重新安裝，這樣可能可"
|
||||
"以提高 SwitchyOmega 的優先級。如果重裝後您仍然看到衝突，那麼請考慮移除那個"
|
||||
"導致衝突的應用。"
|
||||
|
||||
msgid "options_conflicts_higherPriority"
|
||||
msgstr ""
|
||||
"如果 SwitchyOmega 的優先級較高，那麼您可以在彈出菜單中選擇 $SYSTEMPROFILE$ 來"
|
||||
"把控制權還給其他應用或系統設置。"
|
||||
|
||||
msgid "options_showExternalProfile"
|
||||
msgstr "在彈出菜單中顯示菜單項，以導入其他應用提供的代理設置。"
|
||||
|
||||
msgid "options_showExternalProfileHelp"
|
||||
msgstr ""
|
||||
"選擇了 $SYSTEMPROFILE$ 的情況下，您可以在彈出菜單中選擇 $EXTERNALPROFILE$ 來"
|
||||
"導入其他應用提供的代理設置。導入的設置將會成為一個新的情景模式，其名稱由您決"
|
||||
"定。請注意導入的情景模式只是當時的一個快照，導入後不會隨著原來的應用更新。"
|
||||
|
||||
msgid "options_group_networkRequests"
|
||||
msgstr "網路請求"
|
||||
|
||||
|
||||
@ -75,7 +75,9 @@ OmegaTargetPopup = {
|
||||
callBackgroundNoReply('addTempRule', [domain, profileName], cb);
|
||||
},
|
||||
openManage: function(domain, profileName, cb) {
|
||||
chrome.tabs.create({url: 'chrome://extensions/?id=' + chrome.runtime.id});
|
||||
chrome.tabs.create({
|
||||
url: 'chrome://extensions/?id=' + chrome.runtime.id,
|
||||
}, cb);
|
||||
},
|
||||
getMessage: chrome.i18n.getMessage.bind(chrome.i18n),
|
||||
};
|
||||
|
||||
@ -7,6 +7,7 @@ module.exports = ->
|
||||
"-revertProxyChanges": true
|
||||
"-confirmDeletion": true
|
||||
"-showInspectMenu": true
|
||||
"-showExternalProfile": true
|
||||
"-downloadInterval": 1440
|
||||
"+proxy":
|
||||
bypassList: [
|
||||
|
||||
@ -368,6 +368,12 @@ class Options
|
||||
if refresh?
|
||||
@_state.set({'refreshOnProfileChange': refresh})
|
||||
|
||||
showExternal = changes['-showExternalProfile']
|
||||
if not showExternal?
|
||||
showExternal = true
|
||||
@_setOptions({'-showExternalProfile': true}, {persist: true})
|
||||
@_state.set({'showExternalProfile': showExternal})
|
||||
|
||||
if changes['-enableQuickSwitch']? or changes['-quickSwitchProfiles']?
|
||||
@reloadQuickSwitch()
|
||||
if changes['-downloadInterval']?
|
||||
|
||||
@ -108,6 +108,13 @@ angular.module('omega').controller 'MasterCtrl', ($scope, $rootScope, $window,
|
||||
$rootScope.profileByName = (name) ->
|
||||
OmegaPac.Profiles.byName(name, $rootScope.options)
|
||||
|
||||
$rootScope.systemProfile = $rootScope.profileByName('system')
|
||||
$rootScope.externalProfile =
|
||||
color: '#49afcd'
|
||||
name: tr('popup_externalProfile')
|
||||
profileType: 'FixedProfile'
|
||||
fallbackProxy: {host: "127.0.0.1", port: 42, scheme: "http"}
|
||||
|
||||
$rootScope.applyOptionsConfirm = ->
|
||||
return $q.reject 'form_invalid' unless checkFormValid()
|
||||
return $q.when(true) unless $rootScope.optionsDirty
|
||||
|
||||
@ -1,11 +1,5 @@
|
||||
.page-header
|
||||
h2 {{'options_tab_general' | tr}}
|
||||
section.settings-group
|
||||
h3 {{'options_group_proxyChanges' | tr}}
|
||||
div.checkbox
|
||||
label
|
||||
input#revert-proxy-changes(type='checkbox' ng-model='options["-revertProxyChanges"]')
|
||||
span {{'options_revertProxyChanges' | tr}}
|
||||
section.settings-group
|
||||
h3 {{'options_group_networkRequests' | tr}}
|
||||
div.checkbox
|
||||
@ -13,10 +7,27 @@ section.settings-group
|
||||
input#revert-proxy-changes(type='checkbox' ng-model='options["-monitorWebRequests"]')
|
||||
span {{'options_monitorWebRequests' | tr}}
|
||||
p.help-block(omega-html="'options_monitorWebRequestsHelp' | tr")
|
||||
section.settings-group
|
||||
section.settings-group.width-limit
|
||||
h3 {{'options_downloadOptions' | tr}}
|
||||
p.help-block {{'options_downloadOptionsHelp' | tr}}
|
||||
.form-group
|
||||
label(for='download-interval') {{'options_downloadInterval' | tr}}
|
||||
select#download-interval.form-control.inline-form-control(ng-model='options["-downloadInterval"]'
|
||||
ng-options='interval as (downloadIntervalI18n(interval) | tr) for interval in downloadIntervals')
|
||||
section.settings-group.width-limit
|
||||
h3 {{'options_group_conflicts' | tr}}
|
||||
p {{'options_conflicts_introduction' | tr}}
|
||||
p.help-text.text-danger
|
||||
span(style='padding: 1px 4px; background: #da4f49; color: #fff; box-shadow: #ccc 1px 1px 1px 1px;') =
|
||||
= ' '
|
||||
| {{'options_conflicts_lowerPriority' | tr}}
|
||||
p.help-text.text-info
|
||||
span.glyphicon.glyphicon-info-sign
|
||||
= ' '
|
||||
span(omega-html="'options_conflicts_higherPriority' | tr:[$profile('systemProfile')]")
|
||||
|
||||
div.checkbox
|
||||
label
|
||||
input#revert-proxy-changes(type='checkbox' ng-model='options["-showExternalProfile"]')
|
||||
span {{'options_showExternalProfile' | tr}}
|
||||
p.help-block(omega-html="'options_showExternalProfileHelp' | tr:[$profile('systemProfile'), $profile('externalProfile')]")
|
||||
|
||||
@ -84,6 +84,28 @@ p {
|
||||
border-color: #adadad;
|
||||
}
|
||||
|
||||
.om-btn-link {
|
||||
font-weight: 400;
|
||||
color: #337ab7;
|
||||
border-radius: 0;
|
||||
background-color: rgba(0, 0, 0, 0);
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
border-color: rgba(0, 0, 0, 0);
|
||||
}
|
||||
|
||||
.om-btn-link:hover {
|
||||
color: #23527c;
|
||||
text-decoration: underline;
|
||||
background-color: rgba(0, 0, 0, 0);
|
||||
}
|
||||
|
||||
.om-btn-link:active {
|
||||
background-color: rgba(0, 0, 0, 0);
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
.om-btn-primary {
|
||||
color: #fff;
|
||||
background-color: #337ab7;
|
||||
|
||||
@ -14,6 +14,7 @@ $script('../js/omega_target_popup.js', 'om-target', function() {
|
||||
'currentProfileCanAddRule',
|
||||
'proxyNotControllable',
|
||||
'externalProfile',
|
||||
'showExternalProfile',
|
||||
], function(err, state) {
|
||||
window.OmegaPopup.state = state;
|
||||
$script.done('om-state');
|
||||
|
||||
@ -66,7 +66,8 @@
|
||||
function updateMenuByStateAndPageInfo() {
|
||||
var state = OmegaPopup.state;
|
||||
var info = OmegaPopup.pageInfo;
|
||||
if (state.externalProfile && (!info || !info.errorCount)) {
|
||||
if (state.showExternalProfile && state.externalProfile &&
|
||||
(!info || !info.errorCount)) {
|
||||
showMenuForExternalProfile(state);
|
||||
}
|
||||
if (!info || !info.url) return updateOtherItems(null);
|
||||
|
||||
@ -1,12 +1,26 @@
|
||||
(function() {
|
||||
function closePopup() {
|
||||
window.close();
|
||||
// If the popup is opened as a tab, the above won't work. Let's reload then.
|
||||
document.body.style.opacity = 0;
|
||||
setTimeout(function() { history.go(0); }, 300);
|
||||
}
|
||||
var closeButton = document.getElementById('js-close');
|
||||
closeButton.addEventListener('click', window.close.bind(window), false);
|
||||
closeButton.addEventListener('click', closePopup, false);
|
||||
|
||||
var manageButton = document.getElementById('js-manage-ext');
|
||||
manageButton.addEventListener('click',
|
||||
OmegaTargetPopup.openManage.bind(OmegaTargetPopup), false);
|
||||
manageButton.addEventListener('click', function () {
|
||||
OmegaTargetPopup.openManage(closePopup);
|
||||
}, false);
|
||||
|
||||
var learnMoreButton = document.getElementById('js-nc-learn-more');
|
||||
learnMoreButton.addEventListener('click', function () {
|
||||
OmegaTargetPopup.openOptions('#!/general', closePopup);
|
||||
}, false);
|
||||
|
||||
closeButton.textContent = OmegaTargetPopup.getMessage('dialog_cancel');
|
||||
learnMoreButton.textContent = 'Learn More'
|
||||
//OmegaTargetPopup.getMessage('popup_proxyNotControllableLearnMore');
|
||||
manageButton.textContent = OmegaTargetPopup.getMessage(
|
||||
'popup_proxyNotControllableManage');
|
||||
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
<p class="om-dialog-help" id="js-nc-details"></p>
|
||||
<p class="om-dialog-controls">
|
||||
<button id="js-close" class="om-btn om-btn-default"></button>
|
||||
<button id="js-nc-learn-more" class="om-btn om-btn-link"></button>
|
||||
<button id="js-manage-ext" class="om-btn om-btn-primary"></button>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user