diff --git a/omega-locales/ach/LC_MESSAGES/omega-web.po b/omega-locales/ach/LC_MESSAGES/omega-web.po index 06cdb1a..40e6b91 100644 --- a/omega-locales/ach/LC_MESSAGES/omega-web.po +++ b/omega-locales/ach/LC_MESSAGES/omega-web.po @@ -262,6 +262,9 @@ msgstr "Refresh current tab on profile change." msgid "options_showInspectMenu" msgstr "Allow inspecting proxy used for page elements via context menu." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Keyboard Shortcut" diff --git a/omega-locales/cs/LC_MESSAGES/omega-web.po b/omega-locales/cs/LC_MESSAGES/omega-web.po index 86c90a3..3db9f45 100644 --- a/omega-locales/cs/LC_MESSAGES/omega-web.po +++ b/omega-locales/cs/LC_MESSAGES/omega-web.po @@ -264,6 +264,9 @@ msgstr "Obnovit aktuální záložku na změnu profilu." msgid "options_showInspectMenu" msgstr "Povolit kontrolu proxy pro prvky stránky přes kontextové menu." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Klávesnicové zkratky" diff --git a/omega-locales/de/LC_MESSAGES/omega-web.po b/omega-locales/de/LC_MESSAGES/omega-web.po index dfdf431..a2bde8a 100644 --- a/omega-locales/de/LC_MESSAGES/omega-web.po +++ b/omega-locales/de/LC_MESSAGES/omega-web.po @@ -267,6 +267,9 @@ msgstr "Refresh current tab on profile change." msgid "options_showInspectMenu" msgstr "Allow inspecting proxy used for page elements via context menu." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Keyboard Shortcut" diff --git a/omega-locales/en_US/LC_MESSAGES/omega-web.po b/omega-locales/en_US/LC_MESSAGES/omega-web.po index fe5a7e0..232993f 100644 --- a/omega-locales/en_US/LC_MESSAGES/omega-web.po +++ b/omega-locales/en_US/LC_MESSAGES/omega-web.po @@ -263,6 +263,9 @@ msgstr "Refresh current tab on profile change." msgid "options_showInspectMenu" msgstr "Allow inspecting proxy used for page elements via context menu." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Keyboard Shortcut" diff --git a/omega-locales/es/LC_MESSAGES/omega-web.po b/omega-locales/es/LC_MESSAGES/omega-web.po index e864166..1dbd1fe 100644 --- a/omega-locales/es/LC_MESSAGES/omega-web.po +++ b/omega-locales/es/LC_MESSAGES/omega-web.po @@ -275,6 +275,9 @@ msgstr "" "Permitir inspeccionar el proxy utilizado por cada elemento de la página a " "través del menú contextual." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Atajo de teclado" diff --git a/omega-locales/es_AR/LC_MESSAGES/omega-web.po b/omega-locales/es_AR/LC_MESSAGES/omega-web.po index 086dfc9..f9f50c8 100644 --- a/omega-locales/es_AR/LC_MESSAGES/omega-web.po +++ b/omega-locales/es_AR/LC_MESSAGES/omega-web.po @@ -267,6 +267,9 @@ msgstr "Refresh current tab on profile change." msgid "options_showInspectMenu" msgstr "Allow inspecting proxy used for page elements via context menu." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Keyboard Shortcut" diff --git a/omega-locales/fa/LC_MESSAGES/omega-web.po b/omega-locales/fa/LC_MESSAGES/omega-web.po index 6501bed..15a21e9 100644 --- a/omega-locales/fa/LC_MESSAGES/omega-web.po +++ b/omega-locales/fa/LC_MESSAGES/omega-web.po @@ -270,6 +270,9 @@ msgstr "" "مجوز برای بررسی پروکسی مورد استفاده برای یک المان صفحه در منوی زمنیه (" "context menu)." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "میانبرهای کیبرد" diff --git a/omega-locales/fr/LC_MESSAGES/omega-web.po b/omega-locales/fr/LC_MESSAGES/omega-web.po index f40be8e..405d010 100644 --- a/omega-locales/fr/LC_MESSAGES/omega-web.po +++ b/omega-locales/fr/LC_MESSAGES/omega-web.po @@ -264,6 +264,9 @@ msgstr "Refresh current tab on profile change." msgid "options_showInspectMenu" msgstr "Allow inspecting proxy used for page elements via context menu." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Keyboard Shortcut" diff --git a/omega-locales/is/LC_MESSAGES/omega-web.po b/omega-locales/is/LC_MESSAGES/omega-web.po index 4e9da82..f7ef97c 100644 --- a/omega-locales/is/LC_MESSAGES/omega-web.po +++ b/omega-locales/is/LC_MESSAGES/omega-web.po @@ -218,6 +218,9 @@ msgstr "" msgid "options_showInspectMenu" msgstr "" +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "" diff --git a/omega-locales/ja/LC_MESSAGES/omega-web.po b/omega-locales/ja/LC_MESSAGES/omega-web.po index ce1b779..69c30d8 100644 --- a/omega-locales/ja/LC_MESSAGES/omega-web.po +++ b/omega-locales/ja/LC_MESSAGES/omega-web.po @@ -259,6 +259,9 @@ msgstr "プロファイルの変更にともなって現在のタブを更新す msgid "options_showInspectMenu" msgstr "Allow inspecting proxy used for page elements via context menu." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "キーボードショートカット" diff --git a/omega-locales/nb_NO/LC_MESSAGES/omega-web.po b/omega-locales/nb_NO/LC_MESSAGES/omega-web.po index f2fac36..9f76ba9 100644 --- a/omega-locales/nb_NO/LC_MESSAGES/omega-web.po +++ b/omega-locales/nb_NO/LC_MESSAGES/omega-web.po @@ -226,6 +226,9 @@ msgstr "Gjenoppfrisk gjeldende fane ved profilendring." msgid "options_showInspectMenu" msgstr "" +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Tastatursnarvei" diff --git a/omega-locales/nl/LC_MESSAGES/omega-web.po b/omega-locales/nl/LC_MESSAGES/omega-web.po index 5437565..c3af900 100644 --- a/omega-locales/nl/LC_MESSAGES/omega-web.po +++ b/omega-locales/nl/LC_MESSAGES/omega-web.po @@ -208,6 +208,9 @@ msgstr "" msgid "options_showInspectMenu" msgstr "" +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "" diff --git a/omega-locales/pt_BR/LC_MESSAGES/omega-web.po b/omega-locales/pt_BR/LC_MESSAGES/omega-web.po index f7b5891..2f3b8de 100644 --- a/omega-locales/pt_BR/LC_MESSAGES/omega-web.po +++ b/omega-locales/pt_BR/LC_MESSAGES/omega-web.po @@ -263,6 +263,9 @@ msgstr "Refresh current tab on profile change." msgid "options_showInspectMenu" msgstr "Allow inspecting proxy used for page elements via context menu." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Keyboard Shortcut" diff --git a/omega-locales/ru/LC_MESSAGES/omega-web.po b/omega-locales/ru/LC_MESSAGES/omega-web.po index 083b281..08162b9 100644 --- a/omega-locales/ru/LC_MESSAGES/omega-web.po +++ b/omega-locales/ru/LC_MESSAGES/omega-web.po @@ -267,6 +267,9 @@ msgstr "Refresh current tab on profile change." msgid "options_showInspectMenu" msgstr "Allow inspecting proxy used for page elements via context menu." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Keyboard Shortcut" diff --git a/omega-locales/sk/LC_MESSAGES/omega-web.po b/omega-locales/sk/LC_MESSAGES/omega-web.po index f52d535..6bc5fc2 100644 --- a/omega-locales/sk/LC_MESSAGES/omega-web.po +++ b/omega-locales/sk/LC_MESSAGES/omega-web.po @@ -217,6 +217,9 @@ msgstr "" msgid "options_showInspectMenu" msgstr "" +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "" diff --git a/omega-locales/sl/LC_MESSAGES/omega-web.po b/omega-locales/sl/LC_MESSAGES/omega-web.po index 374a498..4f64ea4 100644 --- a/omega-locales/sl/LC_MESSAGES/omega-web.po +++ b/omega-locales/sl/LC_MESSAGES/omega-web.po @@ -219,6 +219,9 @@ msgstr "" msgid "options_showInspectMenu" msgstr "" +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "" diff --git a/omega-locales/tr/LC_MESSAGES/omega-web.po b/omega-locales/tr/LC_MESSAGES/omega-web.po index c15674b..7911f94 100644 --- a/omega-locales/tr/LC_MESSAGES/omega-web.po +++ b/omega-locales/tr/LC_MESSAGES/omega-web.po @@ -266,6 +266,9 @@ msgstr "Refresh current tab on profile change." msgid "options_showInspectMenu" msgstr "Allow inspecting proxy used for page elements via context menu." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Keyboard Shortcut" diff --git a/omega-locales/uk/LC_MESSAGES/omega-web.po b/omega-locales/uk/LC_MESSAGES/omega-web.po index c2ec68d..89dc4db 100644 --- a/omega-locales/uk/LC_MESSAGES/omega-web.po +++ b/omega-locales/uk/LC_MESSAGES/omega-web.po @@ -288,6 +288,9 @@ msgstr "" "Дозволити з'ясування, які проксі-сервери використовуватимуться для елементів " "сторінки за допомогою контекстного меню." +msgid "options_addConditionsToBottom" +msgstr "Put new conditions added using the popup to the bottom of the list." + msgid "options_group_keyboardShortcut" msgstr "Клавіатурні скорочення" diff --git a/omega-locales/zh_CN/LC_MESSAGES/omega-web.po b/omega-locales/zh_CN/LC_MESSAGES/omega-web.po index 085bc44..80492cc 100644 --- a/omega-locales/zh_CN/LC_MESSAGES/omega-web.po +++ b/omega-locales/zh_CN/LC_MESSAGES/omega-web.po @@ -245,6 +245,9 @@ msgstr "当更改情景模式时刷新当前标签。" msgid "options_showInspectMenu" msgstr "右键菜单中,可检查网页元素所使用的代理。" +msgid "options_addConditionsToBottom" +msgstr "把以弹出菜单创建的规则添加到列表末尾。" + msgid "options_group_keyboardShortcut" msgstr "键盘快捷键" diff --git a/omega-locales/zh_TW/LC_MESSAGES/omega-web.po b/omega-locales/zh_TW/LC_MESSAGES/omega-web.po index b46f54d..171f516 100644 --- a/omega-locales/zh_TW/LC_MESSAGES/omega-web.po +++ b/omega-locales/zh_TW/LC_MESSAGES/omega-web.po @@ -245,6 +245,9 @@ msgstr "當更改情景模式時刷新當前標籤。" msgid "options_showInspectMenu" msgstr "右鍵選單中,可檢查網頁元素所使用的代理。" +msgid "options_addConditionsToBottom" +msgstr "把以彈出菜單創建的規則添加到列表末尾。" + msgid "options_group_keyboardShortcut" msgstr "鍵盤快捷鍵" diff --git a/omega-target/src/default_options.coffee b/omega-target/src/default_options.coffee index a9c58cf..4ae32bd 100644 --- a/omega-target/src/default_options.coffee +++ b/omega-target/src/default_options.coffee @@ -7,6 +7,7 @@ module.exports = -> "-revertProxyChanges": true "-confirmDeletion": true "-showInspectMenu": true + "-addConditionsToBottom": false "-showExternalProfile": true "-downloadInterval": 1440 "+proxy": diff --git a/omega-target/src/options.coffee b/omega-target/src/options.coffee index c944cae..d421f13 100644 --- a/omega-target/src/options.coffee +++ b/omega-target/src/options.coffee @@ -852,11 +852,17 @@ class Options profile.rules.splice(i, 1) break - # Add the new rule to the start so that it won't be shadowed by others. - profile.rules.unshift({ - condition: cond - profileName: profileName - }) + + if @_options['-addConditionsToBottom'] + profile.rules.push({ + condition: cond + profileName: profileName + }) + else + profile.rules.unshift({ + condition: cond + profileName: profileName + }) OmegaPac.Profiles.updateRevision(profile) changes = {} diff --git a/omega-web/src/partials/ui.jade b/omega-web/src/partials/ui.jade index e62b183..14c6bdd 100644 --- a/omega-web/src/partials/ui.jade +++ b/omega-web/src/partials/ui.jade @@ -14,6 +14,10 @@ section.settings-group label input(type='checkbox' ng-model='options["-showInspectMenu"]') span {{'options_showInspectMenu' | tr}} + div.checkbox + label + input(type='checkbox' ng-model='options["-addConditionsToBottom"]') + span {{'options_addConditionsToBottom' | tr}} section.settings-group h3 {{'options_group_keyboardShortcut' | tr}} p