jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

misc: unify terminology

Browse Source 
8+3 filename → 8.3 filename
be ware → beware
{cannot, can not, cant, can't, could not, couldn't} → unable to
conpleted → completed
file name → filename
imcomplete → incomplete
informations → information
trying to → attempting to
wrong password → incorrect password

GitLab: https://git.jami.net/savoirfairelinux/jami-client-qt/issues/1730

Change-Id: Ia7757efafd2c06af978db02c65b40b1b77c393f8
This commit is contained in:
ovari123
2024-09-14 16:12:06 -04:00
committed by ovari123@zoho.com
parent 3004e72cef
commit ad5b6cbaf6
120 changed files with 896 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/asterisk/extensions.conf
View File

@ -589,7 +589,7 @@ exten => i,1,Playback(invalid) ; "That's not valid, try again"
;
exten => 500,1,Playback(demo-abouttotry); Let them know what's going on
exten => 500,n,Dial(IAX2/guest@pbx.digium.com/s@default) ; Call the Asterisk demo
exten => 500,n,Playback(demo-nogo) ; Couldn't connect to the demo site
exten => 500,n,Playback(demo-nogo) ; Unable to connect to the demo site
exten => 500,n,Goto(s,6) ; Return to the start over message.
;

8
tools/asterisk/sip.conf
View File

@ -797,7 +797,7 @@ tlscertfile=/etc/asterisk/keys/asterisk.pem ; Certificate file (*.pem format onl
;
; The IP address used for media (audio, video, and text) in the SDP can also be overridden by using
; the media_address configuration option. This is only applicable to the general section and
; can not be set per-user or per-peer.
; is unable to be set per-user or per-peer.
;
; media_address = 172.16.42.1
;
@ -858,7 +858,7 @@ tlscertfile=/etc/asterisk/keys/asterisk.pem ; Certificate file (*.pem format onl
;directmediapermit=172.16.0.0/16; which peers should be able to pass directmedia to each other
; (There is no default setting, this is just an example)
; Use this if some of your phones are on IP addresses that
; can not reach each other directly. This way you can force
; is unable to reach each other directly. This way you can force
; RTP to always flow through asterisk in such cases.
;ignoresdpversion=yes ; By default, Asterisk will honor the session version
@ -966,7 +966,7 @@ tlscertfile=/etc/asterisk/keys/asterisk.pem ; Certificate file (*.pem format onl
; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of a
; SIP channel. Defaults to "no". An enabled jitterbuffer will
; be used only if the sending side can create and the receiving
; side can not accept jitter. The SIP channel can accept jitter,
; side is unable to accept jitter. The SIP channel can accept jitter,
; thus a jitterbuffer on the receive SIP side will be used only
; if it is forced and enabled.
@ -1110,7 +1110,7 @@ tlscertfile=/etc/asterisk/keys/asterisk.pem ; Certificate file (*.pem format onl
;[sip_proxy]
; For incoming calls only. Example: FWD (Free World Dialup)
; We match on IP address of the proxy for incoming calls
; since we can not match on username (caller id)
; since we are unable to match on username (caller id)
;type=peer
;context=from-fwd
;host=fwd.pulver.com

36
tools/cpplint.py3 vendored
View File

@ -153,7 +153,7 @@ Syntax: cpplint.py [--verbose=#] [--output=vs7] [--filter=-x,+y,...]
through --filter command-line flag.
"exclude_files" allows to specify a regular expression to be matched against
a file name. If the expression matches, the file is skipped and not run
a filename. If the expression matches, the file is skipped and not run
through liner.
"linelength" allows to specify the allowed line length for the project.
@ -411,7 +411,7 @@ _UNAPPROVED_CPP11_HEADERS = frozenset([
# These headers are excluded from [build/include] and [build/include_order]
# checks:
# - Anything not following google file name conventions (containing an
# - Anything not following google filename conventions (containing an
# uppercase character, such as Python.h or nsStringAPI.h, for example).
# - Lua headers.
_THIRD_PARTY_HEADERS_PATTERN = re.compile(
@ -515,7 +515,7 @@ _root = None
# This is set by --linelength flag.
_line_length = 80
# The allowed extensions for file names
# The allowed extensions for filenames
# This is set by --extensions flag.
_valid_extensions = set(['cc', 'h', 'cpp', 'cu', 'cuh'])
@ -635,7 +635,7 @@ class _IncludeState(object):
_OTHER_HEADER: 'other header',
}
_SECTION_NAMES = {
_INITIAL_SECTION: "... nothing. (This can't be an error.)",
_INITIAL_SECTION: "... nothing. (This is not an error.)",
_MY_H_SECTION: 'a header this file implements',
_C_SECTION: 'C system header',
_CPP_SECTION: 'C++ system header',
@ -1286,7 +1286,7 @@ def RemoveMultiLineComments(filename, lines, error):
lineix_end = FindNextMultiLineCommentEnd(lines, lineix_begin)
if lineix_end >= len(lines):
error(filename, lineix_begin + 1, 'readability/multiline_comment', 5,
'Could not find end of multi-line comment')
'Unable to find end of multi-line comment')
return
RemoveMultiLineCommentsFromRange(lines, lineix_begin, lineix_end + 1)
lineix = lineix_end + 1
@ -1858,7 +1858,7 @@ def CheckForNewlineAtEOF(filename, lines, error):
# last-but-two element of lines() exists and is empty.
if len(lines) < 3 or lines[-2]:
error(filename, len(lines) - 2, 'whitespace/ending_newline', 5,
'Could not find a newline character at the end of the file.')
'Unable to find a newline character at the end of the file.')
def CheckForMultilineCommentsAndStrings(filename, clean_lines, linenum, error):
@ -2326,7 +2326,7 @@ class NestingState(object):
pos = 0
continue
# We can't be sure if we just find a single '<', and need to
# We are unsure if we just find a single '<', and need to
# find the matching '>'.
(_, end_line, end_pos) = CloseExpression(clean_lines, linenum, pos - 1)
if end_pos < 0:
@ -4715,7 +4715,7 @@ def _GetTextInside(text, start_pattern):
the text.
Returns:
The extracted text.
None if either the opening string or ending punctuation could not be found.
None if either the opening string or ending punctuation are unable to be found.
"""
# TODO(unknown): Audit cpplint.py to see what places could be profitably
# rewritten to use _GetTextInside (and use inferior regexp matching today).
@ -4971,7 +4971,7 @@ def CheckGlobalStatic(filename, clean_lines, linenum, error):
# string Class<Type>::Method(...
#
# - Operators. These are matched separately because operator names
# cross non-word boundaries, and trying to match both operators
# cross non-word boundaries, and attempting to match both operators
# and functions at the same time would decrease accuracy of
# matching identifiers.
# string Class::operator*()
@ -5683,10 +5683,10 @@ def CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error,
# For Emacs's flymake.
# If cpplint is invoked from Emacs's flymake, a temporary file is generated
# by flymake and that file name might end with '_flymake.cc'. In that case,
# restore original file name here so that the corresponding header file can be
# by flymake and that filename might end with '_flymake.cc'. In that case,
# restore original filename here so that the corresponding header file can be
# found.
# e.g. If the file name is 'foo_flymake.cc', we should search for 'foo.h'
# e.g. If the filename is 'foo_flymake.cc', we should search for 'foo.h'
# instead of 'foo_flymake.h'
abs_filename = re.sub(r'_flymake\.cc$', '.cc', abs_filename)
@ -5810,7 +5810,7 @@ def CheckRedundantVirtual(filename, clean_lines, linenum, error):
start_col = 0
if end_col < 0:
return # Couldn't find end of parameter list, give up
return # Unable to find end of parameter list, give up
# Look for "override" or "final" after the parameter list
# (possibly on the next few lines).
@ -6095,7 +6095,7 @@ def ProcessConfigOverrides(filename):
cfg_filters.append(val)
elif name == 'exclude_files':
# When matching exclude_files pattern, use the base_name of
# the current file name or the directory name we are processing.
# the current filename or the directory name we are processing.
# For example, if we are checking for lint errors in /foo/bar/baz.cc
# and we found the .cfg file at /foo/CPPLINT.cfg, then the config
# file's "exclude_files" filter is meant to be checked against "bar"
@ -6121,7 +6121,7 @@ def ProcessConfigOverrides(filename):
except IOError:
sys.stderr.write(
"Skipping config file '%s': Can't open for reading\n" % cfg_file)
"Skipping config file '%s': Unable to open for reading\n" % cfg_file)
keep_looking = False
# Apply all the accumulated filters in reverse order (top-level directory
@ -6182,7 +6182,7 @@ def ProcessFile(filename, vlevel, extra_check_functions=[]):
except IOError:
sys.stderr.write(
"Skipping input '%s': Can't open for reading\n" % filename)
"Skipping input '%s': Unable to open for reading\n" % filename)
_RestoreFilters()
return
@ -6192,7 +6192,7 @@ def ProcessFile(filename, vlevel, extra_check_functions=[]):
# When reading from stdin, the extension is unknown, so no cpplint tests
# should rely on the extension.
if filename != '-' and file_extension not in _valid_extensions:
sys.stderr.write('Ignoring %s; not a valid file name '
sys.stderr.write('Ignoring %s; not a valid filename '
'(%s)\n' % (filename, ', '.join(_valid_extensions)))
else:
ProcessFileData(filename, file_extension, lines, Error,
@ -6205,7 +6205,7 @@ def ProcessFile(filename, vlevel, extra_check_functions=[]):
# since critique can handle these just fine, and the style guide
# doesn't dictate a particular end of line sequence.
#
# We can't depend on os.linesep to determine what the desired
# We are unable to depend on os.linesep to determine what the desired
# end-of-line sequence should be, since that will return the
# server-side end-of-line sequence.
if lf_lines and crlf_lines:

8
tools/jamictrl/controller.py
View File

@ -540,12 +540,12 @@ class libjamiCtrl(Thread):
return [str(x) for x in self.callmanager.getConferenceList()]
def getCallDetails(self, callid):
"""Return informations on this call if exists"""
"""Return information on this call if exists"""
return self.callmanager.getCallDetails(callid)
def getConferenceDetails(self, confid):
"""Return informations on this conference if exists"""
"""Return information on this conference if exists"""
return self.callmanager.getConferenceDetails(confid)
@ -572,7 +572,7 @@ class libjamiCtrl(Thread):
self.setFirstRegisteredAccount()
if self.account != "IP2IP" and not self.isAccountRegistered():
raise libjamiCtrlAccountError("Can't place a call without a registered account")
raise libjamiCtrlAccountError("Unable to place a call without a registered account")
# Send the request to the CallManager
callid = self.callmanager.placeCall(self.account, dest)
@ -622,7 +622,7 @@ class libjamiCtrl(Thread):
self.setFirstRegisteredAccount()
if not self.isAccountRegistered():
raise libjamiCtrlAccountError("Can't accept a call without a registered account")
raise libjamiCtrlAccountError("Unable to accept a call without a registered account")
if callid is None or callid == "":
raise libjamiCtrlError("Invalid callID")

6
tools/jamictrl/sippwrap.py
View File

@ -51,7 +51,7 @@ class SippWrapper:
if not self.remotePort and not self.remoteServer:
self.isUserAgentClient = False
elif self.remotePort and not self.remoteServer:
print "Error cannot have remote port specified with no server"
print "Error: Unable to have remote port specified with no server"
return
if self.remoteServer:
@ -130,7 +130,7 @@ class SippScreenStatParser:
# TODO: Find a better way to determine which line to consider
if "Failed call" not in self.logfile[40]:
print "Error: Could not find 'Failed call' statistics"
print "Error: Unable to find 'Failed call' statistics"
# We consider this as a failure
return True
@ -142,7 +142,7 @@ class SippScreenStatParser:
# TODO: Find a better way to determine which line to consider
if "Successful call" not in self.logfile[39]:
print "Error: Could not find 'Successful call' statistics"
print "Error: Unable to find 'Successful call' statistics"
return False
return "1" in self.logfile[39]