From: Iordan Iordanov Date: Sat, 5 Nov 2011 19:29:55 +0000 (+0000) Subject: 1) Made spacing with \ syntax consistent across the board. X-Git-Tag: 0.11.0~1400 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6e632b72258d82ce2938d273973842c8d69f7018;p=project%2Fluci.git 1) Made spacing with \ syntax consistent across the board. --- diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua index a77bc776a3..7675b97ff5 100644 --- a/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua +++ b/applications/luci-pbx/luasrc/model/cbi/pbx-advanced.lua @@ -199,9 +199,9 @@ function maintain_firewall_rules() end m = Map (modulename, translate("Advanced Settings"), - translate("This section contains settings which 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\ + translate("This section contains settings which 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.")) -- Recreate the voip server config, and restart necessary services after changes are commited @@ -229,13 +229,13 @@ s.anonymous = true s:tab("general", translate("General Settings")) s:tab("remote_usage", translate("Remote Usage"), - translatef("You can use your SIP devices/softphones with this system from a remote location\ - as well, as long as your Internet Service Provider gives you a public IP.\ - You will be able to call other local users for free (e.g. other Analog Telephone Adapters (ATAs))\ - and use your VoIP providers to make calls as if you were at local to the PBX.\ - After configuring this tab, go back to where users are configured and see the new\ - Server and Port setting you need to configure the SIP devices with. Please note that by default\ - %s uses UDP port range %d to %d for RTP traffic (which carries voice), in case you need to configure\ + translatef("You can use your SIP devices/softphones with this system from a remote location \ + as well, as long as your Internet Service Provider gives you a public IP. \ + You will be able to call other local users for free (e.g. other Analog Telephone Adapters (ATAs)) \ + and use your VoIP providers to make calls as if you were at local to the PBX. \ + After configuring this tab, go back to where users are configured and see the new \ + Server and Port setting you need to configure the SIP devices with. Please note that by default \ + %s uses UDP port range %d to %d for RTP traffic (which carries voice), in case you need to configure \ NAT or QoS on another device.", appname, defaultrtpstart, defaultrtpend)) s:tab("qos", translate("QoS Settings"), @@ -247,28 +247,28 @@ s:tab("qos", translate("QoS Settings"), and Upload speed.")) ua = s:taboption("general", Value, "useragent", translate("User Agent String"), - translate("This is the name that the VoIP server will use to identify itself when\ - registering to VoIP (SIP) providers. Some providers require this to a specific\ + translate("This is the name that the VoIP server will use to identify itself when \ + registering to VoIP (SIP) providers. Some providers require this to a specific \ string matching a hardware SIP device.")) ua.default = appname h = s:taboption("remote_usage", Value, "externhost", translate("Domain Name/Dynamic Domain Name"), - translate("You should either have registered a domain name and have a static IP\ - address, or have configured Dynamic DNS on this router. Enter a\ + translate("You should either have registered a domain name and have a static IP \ + address, or have configured Dynamic DNS on this router. Enter a \ domain name which resolves to your external IP address.")) h.datatype = "hostname" p = s:taboption("remote_usage", Value, "bindport", translate("External SIP Port"), - translate("Pick a random port number between 6500 and 9500 for the service to listen on.\ - Do not pick the standard 5060, because it is often subject to brute-force attacks.\ - When finished, (1) click \"Save and Apply\", and (2) click the \"Restart VoIP Service\"\ - button above. Finally, (3) look in the \"SIP Device/Softphone Accounts\" section for\ + translate("Pick a random port number between 6500 and 9500 for the service to listen on. \ + Do not pick the standard 5060, because it is often subject to brute-force attacks. \ + When finished, (1) click \"Save and Apply\", and (2) click the \"Restart VoIP Service\" \ + button above. Finally, (3) look in the \"SIP Device/Softphone Accounts\" section for \ updated Server and Port settings for your SIP Devices/Softphones.")) 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\ + 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 \ 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 9c91133dfd..13e2a91181 100644 --- a/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua +++ b/applications/luci-pbx/luasrc/model/cbi/pbx-calls.lua @@ -40,8 +40,8 @@ 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\ - calls are routed, what numbers can get into this PBX with a password, and what\ + country/area codes, which users can use which SIP/Google accounts, how incoming \ + calls are routed, what numbers can get into this PBX with a password, and what \ numbers are blacklisted.")) -- Recreate the config, and restart services after changes are commited to the configuration. @@ -52,18 +52,18 @@ end ---------------------------------------------------------------------------------------------------- s = m:section(NamedSection, "outgoing_calls", "call_routing", translate("Outgoing Calls"), - translate("If you have more than one account which 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.\ - For example to make calls to Germany through a provider, you can enter 49. To make calls\ - to North America, you can enter 1NXXNXXXXXX. If one of your providers can make \"local\"\ - calls to an area code like New York's 646, you can enter 646NXXXXXX for that\ - provider. You should leave one account with an empty list to make calls with\ - it by default, if no other provider's prefixes match. The system will automatically\ - replace an empty list with a message that the provider dials all numbers. Be as specific as\ - possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international dial codes\ - are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a space-separated\ + translate("If you have more than one account which 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. \ + For example to make calls to Germany through a provider, you can enter 49. To make calls \ + to North America, you can enter 1NXXNXXXXXX. If one of your providers can make \"local\" \ + calls to an area code like New York's 646, you can enter 646NXXXXXX for that \ + provider. You should leave one account with an empty list to make calls with \ + it by default, if no other provider's prefixes match. The system will automatically \ + replace an empty list with a message that the provider dials all numbers. Be as specific as \ + possible (i.e. 1NXXNXXXXXX is better than 1). Please note all international dial codes \ + are discarded (e.g. 00, 011, 010, 0011). Entries can be made in a space-separated \ list, and/or one per line by hitting enter after every one.")) s.anonymous = true @@ -143,12 +143,12 @@ m.uci:foreach(voipmodulename, "voip_provider", ---------------------------------------------------------------------------------------------------- s = m:section(NamedSection, "incoming_calls", "call_routing", translate("Incoming Calls"), - 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\ - silently. Also, entering a username here overrides the user's setting to not receive\ - incoming calls, so this way, you can make users ring only for select providers.\ - Entries can be made in a space-separated list, and/or one per\ + 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 \ + silently. Also, entering a username here overrides the user's setting to not receive \ + incoming calls, so this way, you can make users ring only for select providers. \ + Entries can be made in a space-separated list, and/or one per \ line by hitting enter after every one.")) s.anonymous = true @@ -223,11 +223,11 @@ m.uci:foreach(voipmodulename, "voip_provider", ---------------------------------------------------------------------------------------------------- s = m:section(NamedSection, "providers_user_can_use", "call_routing", - translate("Providers Used for Outgoing Calls"), - 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\ + translate("Providers Used for Outgoing Calls"), + 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 will be rejected silently. Entries can be made in a \ space-separated list, and/or one per line by hitting enter after every one.")) s.anonymous = true @@ -276,7 +276,7 @@ m.uci:foreach(usersmodulename, "local_user", ---------------------------------------------------------------------------------------------------- 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 which will be allowed to call through this system and which user's \ privileges it will have.")) s.anonymous = true s.addremove = true @@ -290,7 +290,7 @@ p:value("no", translate("No")) p.default = "yes" user = s:option(Value, "defaultuser", translate("User Name"), - translate("The number(s) specified above will be able to dial out with this user's providers.\ + translate("The number(s) specified above will be able to dial out with this user's providers. \ Invalid usernames are dropped silently, please verify that the entry was accepted.")) function user.write(self, section, value) trimuser = luci.util.trim(value) @@ -300,8 +300,8 @@ function user.write(self, section, value) end pwd = s:option(Value, "pin", translate("PIN"), - translate("Your PIN disappears when saved for your protection. It will be changed\ - only when you enter a value different from the saved one. Leaving the PIN\ + translate("Your PIN disappears when saved for your protection. It will be changed \ + only when you enter a value different from the saved one. Leaving the PIN \ empty is possible, but please beware of the security implications.")) pwd.password = true pwd.rmempty = false @@ -322,9 +322,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\ + 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 diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua index 08256dbb72..32b3442b6f 100644 --- a/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua +++ b/applications/luci-pbx/luasrc/model/cbi/pbx-google.lua @@ -31,8 +31,8 @@ defaultstatus = "dnd" defaultstatusmessage = "PBX online, may lose messages" m = Map (modulename, translate("Google Accounts"), - translate("This is where you set up your Google (Talk and Voice) Accounts, in order to start\ - using them for dialing and receiving calls (voice chat and real phone calls). Click \"Add\"\ + translate("This is where you set up your Google (Talk and Voice) Accounts, in order to start \ + using them for dialing and receiving calls (voice chat and real phone calls). Click \"Add\" \ to add as many accounts as you wish.")) -- Recreate the config, and restart services after changes are commited to the configuration. @@ -63,8 +63,8 @@ s.addremove = true s:option(Value, "username", translate("Email")) pwd = s:option(Value, "secret", translate("Password"), - translate("When your password is saved, it disappears from this field and is not displayed\ - for your protection. The previously saved password will be changed only when you\ + translate("When your password is saved, it disappears from this field and is not displayed \ + for your protection. The previously saved password will be changed only when you \ enter a value different from the saved one.")) pwd.password = true pwd.rmempty = false @@ -86,21 +86,21 @@ end p = s:option(ListValue, "register", translate("Enable Incoming Calls (See Status, Message 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\ - receive the call. If you have Google Voice, you must go to your GVoice settings and\ - forward calls to Google chat in order to actually receive calls made to your\ - GVoice number. If you have trouble receiving calls from GVoice, experiment\ - with the Call Screening option in your GVoice Settings. Finally, make sure no other\ - client is online with this account (browser in gmail, mobile/desktop Google Talk\ + 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 \ + receive the call. If you have Google Voice, you must go to your GVoice settings and \ + forward calls to Google chat in order to actually receive calls made to your \ + GVoice number. If you have trouble receiving calls from GVoice, experiment \ + with the Call Screening option in your GVoice Settings. Finally, make sure no other \ + client is online with this account (browser in gmail, mobile/desktop Google Talk \ App) as it may interfere.")) p:value("yes", translate("Yes")) p:value("no", translate("No")) p.default = "yes" p = s:option(ListValue, "make_outgoing_calls", translate("Enable Outgoing Calls"), - translate("Use this account to make outgoing calls as configured in the \"Call Routing\" section.")) + translate("Use this account to make outgoing calls as configured in the \"Call Routing\" section.")) p:value("yes", translate("Yes")) p:value("no", translate("No")) p.default = "yes" diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua index fba0d49dda..c388967a65 100644 --- a/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua +++ b/applications/luci-pbx/luasrc/model/cbi/pbx-users.lua @@ -31,11 +31,11 @@ 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\ - will ring simultaneously if a call is made to one of your VoIP provider accounts or GV\ + 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 \ + will ring simultaneously if a call is made to one of your VoIP provider accounts or GV \ numbers.")) -- Recreate the config, and restart services after changes are commited to the configuration. @@ -62,7 +62,7 @@ if bindport ~= nil then end s:option(DummyValue, "ipaddr", translate("Server Setting for Local SIP Devices"), - translate("Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices you will\ + translate("Enter this IP (or IP:port) in the Server/Registrar setting of SIP devices you will \ use ONLY locally and never from a remote location.")).default = ipaddr if externhost ~= nil then @@ -71,18 +71,18 @@ if externhost ~= nil then externhost = externhost .. ":" .. bindport end s:option(DummyValue, "externhost", translate("Server Setting for Remote SIP Devices"), - translate("Enter this hostname (or hostname:port) in the Server/Registrar setting of SIP\ + translate("Enter this hostname (or hostname:port) in the Server/Registrar setting of SIP \ devices you will use from a remote location (they will work locally too).") ).default = externhost 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\ - 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\ + 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 \ + 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.", ipaddr, externhost, just_ipaddr, just_externhost)).default = bindport end @@ -96,12 +96,12 @@ s:option(Value, "fullname", translate("Full Name"), translate("You can specify a real name to show up in the Caller ID here.")) du = s:option(Value, "defaultuser", translate("User Name"), - translate("Use (four to five digit) numeric user name if you are connecting normal telephones\ + translate("Use (four to five digit) numeric user name if you are connecting normal telephones \ with ATAs to this system (so they can dial user names).")) du.datatype = "uciname" pwd = s:option(Value, "secret", translate("Password"), - translate("Your password disappears when saved for your protection. It will be changed\ + translate("Your password disappears when saved for your protection. It will be changed \ only when you enter a value different from the saved one.")) pwd.password = true pwd.rmempty = false diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua b/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua index c7d9de177b..41395ae86a 100644 --- a/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua +++ b/applications/luci-pbx/luasrc/model/cbi/pbx-voip.lua @@ -28,9 +28,9 @@ end modulename = "pbx-voip" m = Map (modulename, translate("SIP Accounts"), - translate("This is where you set up your SIP (VoIP) accounts ts like Sipgate, SipSorcery,\ + translate("This is where you set up your SIP (VoIP) accounts ts like Sipgate, SipSorcery, \ the popular Betamax providers, and any other providers with SIP settings in order to start \ - using them for dialing and receiving calls (SIP uri and real phone calls). Click \"Add\" to\ + using them for dialing and receiving calls (SIP uri and real phone calls). Click \"Add\" to \ add as many accounts as you wish.")) -- Recreate the config, and restart services after changes are commited to the configuration. @@ -60,8 +60,8 @@ s.addremove = true s:option(Value, "defaultuser", translate("User Name")) pwd = s:option(Value, "secret", translate("Password"), - translate("When your password is saved, it disappears from this field and is not displayed\ - for your protection. The previously saved password will be changed only when you\ + translate("When your password is saved, it disappears from this field and is not displayed \ + for your protection. The previously saved password will be changed only when you \ enter a value different from the saved one.")) @@ -87,8 +87,8 @@ h = s:option(Value, "host", translate("SIP Server/Registrar")) h.datatype = "host" p = s:option(ListValue, "register", translate("Enable Incoming Calls (Register via SIP)"), - translate("This option should be set to \"Yes\" if you have a DID \(real telephone number\)\ - associated with this SIP account or want to receive SIP uri calls through this\ + translate("This option should be set to \"Yes\" if you have a DID \(real telephone number\) \ + associated with this SIP account or want to receive SIP uri calls through this \ provider.")) p:value("yes", translate("Yes")) p:value("no", translate("No")) diff --git a/applications/luci-pbx/luasrc/model/cbi/pbx.lua b/applications/luci-pbx/luasrc/model/cbi/pbx.lua index 3f2ee674b5..b099b6a30d 100644 --- a/applications/luci-pbx/luasrc/model/cbi/pbx.lua +++ b/applications/luci-pbx/luasrc/model/cbi/pbx.lua @@ -69,17 +69,17 @@ end m = Map (modulename, translate("PBX Main Page"), - translate("This configuration page allows you to configure a phone system (PBX) service which\ - permits making phone calls through multiple Google and SIP (like Sipgate,\ + translate("This configuration page allows you to configure a phone system (PBX) service which \ + permits making phone calls through multiple Google and SIP (like Sipgate, \ SipSorcery, and Betamax) accounts and sharing them among many SIP devices. \ Note that Google accounts, SIP accounts, and local user accounts are configured in the \ \"Google Accounts\", \"SIP Accounts\", and \"User Accounts\" sub-sections. \ You must add at least one User Account to this PBX, and then configure a SIP device or \ softphone to use the account, in order to make and receive calls with your Google/SIP \ - accounts. Configuring multiple users will allow you to make free calls between all users,\ + accounts. Configuring multiple users will allow you to make free calls between all users, \ and share the configured Google and SIP accounts. If you have more than one Google and SIP \ accounts set up, you should probably configure how calls to and from them are routed in \ - the \"Call Routing\" page. If you're interested in using your own PBX from anywhere in the\ + the \"Call Routing\" page. If you're interested in using your own PBX from anywhere in the \ world, then visit the \"Remote Usage\" section in the \"Advanced Settings\" page.")) -----------------------------------------------------------------------------------------