diff --git a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
index 50b82fca9..f00afe5fd 100644
--- a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
+++ b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
@@ -35,6 +35,12 @@ o.default     = "2"
 o.datatype    = "range(1, 100)"
 o.rmempty     = false
 
+o = s:option(Value, "wait_test", translate("Wait after a failed test (s)"))
+o.placeholder = "0"
+o.default     = "0"
+o.datatype    = "range(0, 100)"
+o.rmempty     = false
+
 o = s:option(DynamicList, "hosts", translate("Hosts"), translate("IPs or domains must be available over http"))
 o.placeholder = "bing.com"
 o.default     = { "bing.com", "google.com" }
@@ -72,6 +78,12 @@ o.default     = "2"
 o.datatype    = "range(1, 100)"
 o.rmempty     = false
 
+o = s:option(Value, "wait_test", translate("Wait after a failed test (s)"))
+o.placeholder = "0"
+o.default     = "0"
+o.datatype    = "range(0, 100)"
+o.rmempty     = false
+
 s = m:section(TypedSection, "defaults", translate("Defaults Settings"), translate("OMR-Tracker create needed routes and detect when a connection is down or up"))
 s.anonymous   = true
 
@@ -96,6 +108,12 @@ o.default     = "2"
 o.datatype    = "range(1, 100)"
 o.rmempty     = false
 
+o = s:option(Value, "wait_test", translate("Wait after a failed test (s)"))
+o.placeholder = "0"
+o.default     = "0"
+o.datatype    = "range(0, 100)"
+o.rmempty     = false
+
 o = s:option(ListValue, "type", translate("Type"), translate("Always ping gateway, then test connection by ping, httping or dns. None mode only ping gateway."))
 o:value("ping","ping")
 o:value("httping","httping")
@@ -146,6 +164,12 @@ o.default     = "2"
 o.datatype    = "range(1, 100)"
 o.rmempty     = false
 
+o = s:option(Value, "wait_test", translate("Wait after a failed test (s)"))
+o.placeholder = "0"
+o.default     = "0"
+o.datatype    = "range(0, 100)"
+o.rmempty     = false
+
 o = s:option(ListValue, "type", translate("Type"), translate("Always ping gateway, then test connection by ping, httping or dns. None mode only ping gateway."))
 o:value("ping","ping")
 o:value("httping","httping")
diff --git a/luci-app-omr-tracker/po/templates/omr-tracker.pot b/luci-app-omr-tracker/po/templates/omr-tracker.pot
index 49e4ca635..f71762609 100644
--- a/luci-app-omr-tracker/po/templates/omr-tracker.pot
+++ b/luci-app-omr-tracker/po/templates/omr-tracker.pot
@@ -1,31 +1,134 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-msgid ""
-"Always ping gateway, then test connection by ping or dns. None mode only "
-"ping gateway."
+#: luci-app-omr-tracker/luasrc/view/omr-tracker/cbi-select-add.htm:8
+msgid "Add"
 msgstr ""
 
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:117
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:173
+msgid ""
+"Always ping gateway, then test connection by ping, httping or dns. None mode "
+"only ping gateway."
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:87
 msgid "Defaults Settings"
 msgstr ""
 
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:7
+msgid "Detect if Proxy is down and stop traffic redirection over it."
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:50
+msgid "Detect if Server is down and use defined backup server in this case."
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:17
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:60
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:90
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:146
+msgid "Enable"
+msgstr ""
+
+#: luci-app-omr-tracker/root/usr/share/rpcd/acl.d/luci-app-omr-tracker.json:3
+msgid "Grant UCI access for luci-app-omr-tracker"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:44
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:130
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:187
 msgid "Hosts"
 msgstr ""
 
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:44
+msgid "IPs or domains must be available over http"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:135
+msgid "Interfaces"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/view/omr-tracker/cbi-select-add.htm:9
+msgid "Invalid"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:123
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:179
+msgid "Mail alert"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:130
+msgid "Must be IPs and not domains"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/controller/omr-tracker.lua:5
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:5
+#: luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json:3
 msgid "OMR-Tracker"
 msgstr ""
 
-msgid "OMR-Tracker detect when a connection is down"
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:87
+msgid ""
+"OMR-Tracker create needed routes and detect when a connection is down or up"
 msgstr ""
 
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:7
+msgid "Proxy tracker Settings"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:32
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:75
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:105
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:161
 msgid "Retry interval (s)"
 msgstr ""
 
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:123
+msgid "Send a mail when connection state change"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:179
+msgid ""
+"Send a mail when connection status change. You need to configure e-mail "
+"settings <a href=\"/cgi-bin/luci/admin/services/mail\">here</a>."
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:50
+msgid "Server tracker Settings"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:20
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:63
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:93
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:149
 msgid "Timeout (s)"
 msgstr ""
 
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:26
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:69
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:99
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:155
 msgid "Tries"
 msgstr ""
 
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:117
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:173
 msgid "Type"
 msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:38
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:81
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:111
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:167
+msgid "Wait after a failed test (s)"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:17
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:90
+msgid "When tracker is disabled, connection failover is also disabled"
+msgstr ""
+
+#: luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua:60
+msgid "When tracker is disabled, server failover is also disabled"
+msgstr ""