summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-pbx
diff options
context:
space:
mode:
authorIordan Iordanov <iiordanov@gmail.com>2011-11-27 22:49:13 +0000
committerIordan Iordanov <iiordanov@gmail.com>2011-11-27 22:49:13 +0000
commit1c2449394db9b0c93847a9f52b286163960d14cb (patch)
treea429f5381de73cd38105dfbcf3d86a07a0361358 /applications/luci-pbx
parent3c3e3128bb209401c3d0f20a52599aaf8e29a113 (diff)
1) Revised a lot of wording
2) Set default for SMTP authentication to off so the interface is cleaner to begin with (when not configured).
Diffstat (limited to 'applications/luci-pbx')
-rw-r--r--applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua6
-rw-r--r--applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua35
-rw-r--r--applications/luci-pbx/luasrc/model/cbi/pbx-google.lua8
-rw-r--r--applications/luci-pbx/luasrc/model/cbi/pbx-users.lua16
-rw-r--r--applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua2
5 files changed, 33 insertions, 34 deletions
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
index a783c72e21..f36ca0eb59 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua
@@ -199,7 +199,7 @@ function maintain_firewall_rules()
end
m = Map (modulename, translate("Advanced Settings"),
- translate("This section contains settings which do not need to be changed under \
+ translate("This section contains settings that do not need to be changed under \
normal circumstances. In addition, here you can configure your system \
for use with remote SIP devices, and resolve call quality issues by enabling \
the insertion of QoS rules."))
@@ -247,7 +247,7 @@ s:tab("qos", translate("QoS Settings"),
QoS configuration page (Network->QoS) to configure other critical QoS settings like Download \
and Upload speed."))
-ringtime = s:taboption("general", Value, "ringtime", translate("Number of seconds to ring"),
+ringtime = s:taboption("general", Value, "ringtime", translate("Number of Seconds to Ring"),
translate("Set the number of seconds to ring users upon incoming calls before hanging up \
or going to voicemail, if the voicemail is installed and enabled."))
ringtime.default = 30
@@ -274,7 +274,7 @@ p.datatype = "port"
p = s:taboption("remote_usage", Value, "rtpstart", translate("RTP Port Range Start"),
translate("RTP traffic carries actual voice packets. This is the start of the port range \
- which will be used for setting up RTP communication. It's usually OK to leave this \
+ that will be used for setting up RTP communication. It's usually OK to leave this \
at the default value."))
p.datatype = "port"
p.default = defaultrtpstart
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
index af18c6ff00..8cede198c5 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua
@@ -49,7 +49,7 @@ end
m = Map (modulename, translate("Call Routing"),
translate("This is where you indicate which Google/SIP accounts are used to call what \
- country/area codes, which users can use which SIP/Google accounts, how incoming \
+ country/area codes, which users can use what SIP/Google accounts, how incoming \
calls are routed, what numbers can get into this PBX with a password, and what \
numbers are blacklisted."))
@@ -127,7 +127,7 @@ if nallvalidaccounts == 0 then
elseif nvalidoutaccounts == 0 then
text = translate("NOTE: There are no Google or SIP provider accounts enabled for outgoing calls.")
else
- text = translate("If you have more than one account which can make outgoing calls, you \
+ text = translate("If you have more than one account that can make outgoing calls, you \
should enter a list of phone numbers and prefixes in the following fields for each \
provider listed. Invalid prefixes are removed silently, and only 0-9, X, Z, N, #, *, \
and + are valid characters. The letter X matches 0-9, Z matches 1-9, and N matches 2-9. \
@@ -155,7 +155,7 @@ for k,v in pairs(validoutaccounts) do
value = self.map:get(section, self.option)
if value == nil then
- return {translate("Dials any number")}
+ return {translate("Used for numbers unmatched elsewhere")}
else
return value
end
@@ -184,9 +184,9 @@ if nallvalidaccounts == 0 then
elseif nvalidinaccounts == 0 then
text = translate("NOTE: There are no Google or SIP provider accounts enabled for incoming calls.")
else
- text = translate("For each provider that receives calls, here you can restrict which users to ring \
- on incoming calls. If the list is empty, the system will indicate that all users \
- which are enabled for incoming calls will ring. Invalid usernames will be rejected \
+ text = translate("For each provider enabled for incoming calls, here you can restrict which users to\
+ ring on incoming calls. If the list is empty, the system will indicate that all users \
+ enabled for incoming calls will ring. Invalid usernames will be rejected \
silently. Also, entering a username here overrides the user's setting to not receive \
incoming calls. This way, you can make certain users ring only for specific providers. \
Entries can be made in a space-separated list, and/or one per line by hitting enter after \
@@ -236,13 +236,13 @@ if nallvalidusers == 0 then
elseif nvalidoutusers == 0 then
text = translate("NOTE: There are no local user accounts enabled for outgoing calls.")
else
- text = translate("If you would like, you could restrict which providers users are allowed to use for \
- outgoing calls. By default all users can use all providers. To show up in the list below the user \
- should be allowed to make outgoing calls in the \"User Accounts\" page. Enter VoIP providers in the \
- format username@some.host.name, as listed in \"Outgoing Calls\" above. It's easiest to copy and \
- paste the providers from above. Invalid entries, including providers not enabled for outgoing \
- calls, will be rejected silently. Entries can be made in a space-separated list, and/or one per \
- line by hitting enter after every one.")
+ text = translate("For each user enabled for outgoing calls you can restrict what providers the user \
+ can use for outgoing calls. By default all users can use all providers. To show up in the list \
+ below the user should be allowed to make outgoing calls in the \"User Accounts\" page. Enter VoIP \
+ providers in the format username@some.host.name, as listed in \"Outgoing Calls\" above. It's \
+ easiest to copy and paste the providers from above. Invalid entries, including providers not \
+ enabled for outgoing calls, will be rejected silently. Entries can be made in a space-separated \
+ list, and/or one per line by hitting enter after every one.")
end
@@ -288,7 +288,7 @@ end
----------------------------------------------------------------------------------------------------
s = m:section(TypedSection, "callthrough_numbers", translate("Call-through Numbers"),
- translate("Designate numbers which will be allowed to call through this system and which user's \
+ translate("Designate numbers that are allowed to call through this system and which user's \
privileges it will have."))
s.anonymous = true
s.addremove = true
@@ -335,10 +335,9 @@ end
----------------------------------------------------------------------------------------------------
s = m:section(NamedSection, "blacklisting", "call_routing", translate("Blacklisted Numbers"),
- translate("Enter phone numbers that you want to decline calls from automatically. \
- You should probably omit the country code and any leading \
- zeroes, but please experiment to make sure you are blocking numbers from your \
- desired area successfully."))
+ translate("Enter phone numbers that you want to decline calls from automatically. \
+ You should probably omit the country code and any leading zeroes, but please \
+ experiment to make sure you are blocking numbers from your desired area successfully."))
s.anonymous = true
b = s:option(DynamicList, "blacklist1", translate("Dynamic List of Blacklisted Numbers"),
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
index 32b3442b6f..32e203e8c0 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua
@@ -37,7 +37,7 @@ m = Map (modulename, translate("Google Accounts"),
-- Recreate the config, and restart services after changes are commited to the configuration.
function m.on_after_commit(self)
- -- Create a field "name" for each account which identifies the account in the backend.
+ -- Create a field "name" for each account that identifies the account in the backend.
commit = false
m.uci:foreach(modulename, "gtalk_jabber",
function(s1)
@@ -85,7 +85,7 @@ end
p = s:option(ListValue, "register",
- translate("Enable Incoming Calls (See Status, Message below)"),
+ translate("Enable Incoming Calls (set Status below)"),
translate("When somebody starts voice chat with your GTalk account or calls the GVoice, \
number (if you have Google Voice), the call will be forwarded to any users \
that are online (registered using a SIP device or softphone) and permitted to \
@@ -105,14 +105,14 @@ p:value("yes", translate("Yes"))
p:value("no", translate("No"))
p.default = "yes"
-st = s:option(ListValue, "status", translate("Account Status"))
+st = s:option(ListValue, "status", translate("Google Talk Status"))
st:depends("register", "yes")
st:value("dnd", translate("Do Not Disturb"))
st:value("away", translate("Away"))
st:value("available", translate("Available"))
st.default = defaultstatus
-stm = s:option(Value, "statusmessage", translate("Account Status Message"),
+stm = s:option(Value, "statusmessage", translate("Google Talk Status Message"),
translate("Avoid using anything but alpha-numeric characters, space, comma, and period."))
stm:depends("register", "yes")
stm.default = defaultstatusmessage
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
index c388967a65..c7c8b4d8bb 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua
@@ -31,10 +31,10 @@ modulenameadvanced = "pbx-advanced"
m = Map (modulename, translate("User Accounts"),
- translate("Here you must configure at least one SIP account, which you \
- will use to register with this service. Use this account either in an analog telephony \
- adapter (ATA), or in a SIP softphone like CSipSimple, Linphone, or Sipdroid on your \
- Android smartphone, or X-lite or Ekiga on your computer. By default, all SIP accounts \
+ translate("Here you must configure at least one SIP account, that you \
+ will use to register with this service. Use this account either in an Analog Telephony \
+ Adapter (ATA), or in a SIP software like CSipSimple, Linphone, or Sipdroid on your \
+ smartphone, or Ekiga, Linphone, or X-Lite on your computer. By default, all SIP accounts \
will ring simultaneously if a call is made to one of your VoIP provider accounts or GV \
numbers."))
@@ -79,11 +79,11 @@ end
if bindport ~= nil then
s:option(DummyValue, "bindport", translate("Port Setting for SIP Devices"),
translatef("If setting Server/Registrar to %s or %s does not work for you, try setting \
- it to %s or %s and entering this port number in a separate field which specifies the \
+ it to %s or %s and entering this port number in a separate field that specifies the \
Server/Registrar port number. Beware that some devices have a confusing \
- setting which sets the port where SIP requests originate from on the SIP \
- device itself (bind port). The port specified on this page is NOT this bind port \
- but the this service listens on.",
+ setting that sets the port where SIP requests originate from on the SIP \
+ device itself (the bind port). The port specified on this page is NOT this bind port \
+ but the port this service listens on.",
ipaddr, externhost, just_ipaddr, just_externhost)).default = bindport
end
diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
index 41395ae86a..ed1ed1edb1 100644
--- a/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
+++ b/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua
@@ -36,7 +36,7 @@ m = Map (modulename, translate("SIP Accounts"),
-- Recreate the config, and restart services after changes are commited to the configuration.
function m.on_after_commit(self)
commit = false
- -- Create a field "name" for each account which identifies the account in the backend.
+ -- Create a field "name" for each account that identifies the account in the backend.
m.uci:foreach(modulename, "voip_provider",
function(s1)
if s1.defaultuser ~= nil and s1.host ~= nil then