- Update Portuguese (BR) translation (100%)
- Update Spanish translation (64%)
- Update Turkish translation (75%)
- - Merge simliar messages
+ - Merge similar messages
* Docs
- Clarify precedence of settings in config files
- Fix subjectrx example in the manual
* Docs
- Remove feature muttrc files
- Merge README.notmuch into manual
- - Remove unneded scripts
+ - Remove unneeded scripts
- Remove README.SECURITY
- Remove BEWARE and devel-notes.txt
- Update Makefiles
# Module which provides common text formatting
-# This is designed for documenation which looks like:
+# This is designed for documentation which looks like:
# code {...}
# or
# code {
# Module which can install autosetup
# autosetup(installed)=1 means that autosetup is not running from source
-# autosetup(sysinstall)=1 means that autosetup is running from a sysinstall verion
+# autosetup(sysinstall)=1 means that autosetup is running from a sysinstall version
# shared=1 means that we are trying to do a sysinstall. This is only possible from the development source.
proc autosetup_install {dir {shared 0}} {
}
/**
- * init_state - Initilise a browser state
+ * init_state - Initialise a browser state
* @param state BrowserState to initialise
* @param menu Current menu
*/
* struct ConfigSet - Container for lots of config items
*
* The config items are stored in a HashTable so that their names can be looked
- * up efficiently. Each config item is repesented by a HashElem. Once
+ * up efficiently. Each config item is represented by a HashElem. Once
* created, this HashElem is static and may be used for the lifetime of the
* ConfigSet.
*/
* Even though only OpenSSL 0.9.5 and later will complain about the lack of
* entropy, we try to our best and fill the pool with older versions also.
* (That's the reason for the ugly ifdefs and macros, otherwise I could have
- * simply ifdef'd the whole ssl_init funcion)
+ * simply ifdef'd the whole ssl_init function)
*/
static int ssl_init(void)
{
}
/**
- * ssl_socket_close_and_restore - Close an SSL Connection and restore Connnection callbacks - Implements Connection::conn_close()
+ * ssl_socket_close_and_restore - Close an SSL Connection and restore Connection callbacks - Implements Connection::conn_close()
*/
static int ssl_socket_close_and_restore(struct Connection *conn)
{
#set fast_reply # skip initial prompts when replying
#set fcc_attach # keep attachments in copies of sent messages?
#set force_name # fcc by recipient, create if mailbox doesn't exist
-#set forward_decode # weed and MIME decode forwaded messages
+#set forward_decode # weed and MIME decode forwarded messages
#set forward_format="[%a: %s]" # subject to use when forwarding messages
#set forward_quote # quote the header and body of forward msgs
#set index_format="%4C %Z %{%m/%d} [%2N] %-15.15F (%4c) %s"
my $format = openssl_format($filename);
my @args = ("x509", "-in", $filename, "-inform", $format);
my $output = join("", openssl_exec(@args));
- $? and die "openssl x509 certicate dump returned $?";
+ $? and die "openssl x509 certificate dump returned $?";
return $output;
}
/* These Config Variables are only used in mutt/idna.c */
#ifdef HAVE_LIBIDN
-bool IdnDecode; ///< Config: (idn) Decode internation domain names
+bool IdnDecode; ///< Config: (idn) Decode international domain names
bool IdnEncode; ///< Config: (idn) Encode international domain names
#endif
* @retval 0 Success, string converted
* @retval >0 Error, number of bytes that could be converted
*
- * If the data could be conveted using encoder, then set *encoder and *wlen.
+ * If the data could be converted using encoder, then set *encoder and *wlen.
* Otherwise return an upper bound on the maximum length of the data which
* could be converted.
*
/**
* list_insert - Insert parameter into an ordered list
* @param list List to insert into
- * @param par Paramter to insert
+ * @param par Parameter to insert
*
* Primary sorting key: attribute
* Secondary sorting key: index
WHERE struct ListHead MimeLookupList INITVAL(STAILQ_HEAD_INITIALIZER(MimeLookupList)); ///< List of mime types that that shouldn't use the mailcap entry
WHERE struct ListHead Muttrc INITVAL(STAILQ_HEAD_INITIALIZER(Muttrc)); ///< List of config files to read
#ifdef USE_SIDEBAR
-WHERE struct ListHead SidebarWhitelist INITVAL(STAILQ_HEAD_INITIALIZER(SidebarWhitelist)); ///< List of mailboxes to alway display in the sidebar
+WHERE struct ListHead SidebarWhitelist INITVAL(STAILQ_HEAD_INITIALIZER(SidebarWhitelist)); ///< List of mailboxes to always display in the sidebar
#endif
WHERE struct ListHead TempAttachmentsList INITVAL(STAILQ_HEAD_INITIALIZER(TempAttachmentsList)); ///< List of temporary files for displaying attachments
WHERE struct ListHead UserHeader INITVAL(STAILQ_HEAD_INITIALIZER(UserHeader)); ///< List of custom headers to add to outgoing emails
* Test if the `MM_NOASK` environment variable should allow autoviewing of the
* attachment.
*
- * @note If `MM_NOASK=1` then the function will automaticaly return true.
+ * @note If `MM_NOASK=1` then the function will automatically return true.
*/
static bool is_mmnoask(const char *buf)
{
* @param hc Pointer to the header_cache_t structure got by mutt_hcache_open
* @param key Message identification string
* @param keylen Length of the string pointed to by key
- * @retval ptr Succees, data if found and valid
+ * @retval ptr Success, data if found and valid
* @retval NULL Otherwise
*
* @note This function performs a check on the validity of the data found by
* @param uidvalidity IMAP server identifier
* @retval ptr Binary blob representing the Header
*
- * This function transforms a e into a char so that it is useable by
+ * This function transforms a e into a char so that it is usable by
* db_store.
*/
void *mutt_hcache_dump(header_cache_t *hc, const struct Email *e, int *off, unsigned int uidvalidity)
/**
* check_for_mailing_list - Search list of addresses for a mailing list
- * @param addr List of addreses to search
+ * @param addr List of addresses to search
* @param pfx Prefix string
* @param buf Buffer to store results
* @param buflen Buffer length
/**
* ICommandList - All available informational commands
*
- * @note These commands take precendence over conventional mutt rc-lines
+ * @note These commands take precedence over conventional mutt rc-lines
*/
const struct ICommand ICommandList[] = {
{ "set", icmd_set, 0 },
/* TODO: why the e->env check? */
if ((e->env && e->env->changed) || e->attach_del)
{
- /* L10N: The plural is choosen by the last %d, i.e. the total number */
+ /* L10N: The plural is chosen by the last %d, i.e. the total number */
mutt_message(ngettext("Saving changed message... [%d/%d]",
"Saving changed messages... [%d/%d]", m->msg_count),
i + 1, m->msg_count);
struct Connection *conn;
struct ConnAccount conn_account;
bool recovering;
- bool closing; /* If true, we are wating for CLOSE completion */
+ bool closing; /* If true, we are waiting for CLOSE completion */
unsigned char state; ///< ImapState, e.g. #IMAP_AUTHENTICATED
unsigned char status; ///< ImapFlags, e.g. #IMAP_FATAL
/* let me explain capstr: SASL needs the capability string (not bits).
return old;
/* If Sort is reverse and not threaded, the latest message is first.
- * If Sort is threaded, the latest message is first iff exactly one
+ * If Sort is threaded, the latest message is first if exactly one
* of Sort and SortAux are reverse.
*/
if (((Sort & SORT_REVERSE) && (Sort & SORT_MASK) != SORT_THREADS) ||
/**
* maildir_parse_stream - Parse a Maildir message
* @param magic Mailbox type, e.g. #MUTT_MAILDIR
- * @param f Mesage file handle
+ * @param f Message file handle
* @param fname Message filename
* @param is_old true, if the email is old (read)
* @param e Email
* menu_dialog_dokey - Check if there are any menu key events to process
* @param menu Current Menu
* @param ip Event ID
- * @retval 0 An event occured for the menu, or a timeout
+ * @retval 0 An event occurred for the menu, or a timeout
* @retval -1 There was an event, but not for menu
*/
static int menu_dialog_dokey(struct Menu *menu, int *ip)
MUTT_TAG, ///< Tagged messages
MUTT_UNTAG, ///< Messages to be un-tagged
MUTT_LIMIT, ///< Messages in limited view
- MUTT_EXPIRED, ///< Expired messsages
+ MUTT_EXPIRED, ///< Expired messages
MUTT_SUPERSEDED, ///< Superseded messages
MUTT_TRASH, ///< Trashed messages
* mutt_ch_set_charset - Update the records for a new character set
* @param charset New character set
*
- * Check if this chararacter set is utf-8 and pick a suitable replacement
+ * Check if this character set is utf-8 and pick a suitable replacement
* character for unprintable characters.
*
* @note This calls `bind_textdomain_codeset()` which will affect future
* @param iter State of iteration including ptr to line
* @param fp File pointer to read from
* @param flags Same as mutt_file_read_line()
- * @retval true iff data read, false on eof
+ * @retval true if data read, false on eof
*
* This is a slightly cleaner interface for mutt_file_read_line() which avoids
* the eternal C loop initialization ugliness. Use like this:
* @param user_data Arbitrary data passed to "func"
* @param fp File pointer to read from
* @param flags Same as mutt_file_read_line()
- * @retval true iff all data mapped, false if "func" returns false
+ * @retval true if all data mapped, false if "func" returns false
*/
bool mutt_file_map_lines(mutt_file_map_t func, void *user_data, FILE *fp, int flags)
{
* @param buflen Length of buffer
* @param addr Email address to use
*
- * If the user hasn't set `$save_address` the name will be trucated to the '@'
+ * If the user hasn't set `$save_address` the name will be truncated to the '@'
* character.
*/
void mutt_save_path(char *buf, size_t buflen, struct Address *addr)
}
/* This function breaks up the complete string-representation of the
- * version number S, which is of the following struture: <major
+ * version number S, which is of the following structure: <major
* number>.<minor number>.<micro number><patch level>. The major,
* minor and micro number components will be stored in *MAJOR, *MINOR
* and *MICRO. If MINOR or MICRO is NULL the version number is
* @retval 1 - no patterns were matched (if delegated to decryption_okay_regex)
* @retval 0 - DECRYPTION_OKAY was seen, with no PLAINTEXT outside
* @retval -1 - No decryption status codes were encountered
- * @retval -2 - PLAINTEXT was encountered outside of DECRYPTION delimeters
+ * @retval -2 - PLAINTEXT was encountered outside of DECRYPTION delimiters
* @retval -3 - DECRYPTION_FAILED was encountered
*
* Checks GnuPGP status fd output for various status codes indicating
#endif
/* These Config Variables are only used in ncrypt/pgpinvoke.c */
-char *PgpClearsignCommand; ///< Config: (pgp) External command to inline-sign a messsage
+char *PgpClearsignCommand; ///< Config: (pgp) External command to inline-sign a message
char *PgpDecodeCommand; ///< Config: (pgp) External command to decode a PGP attachment
char *PgpDecryptCommand; ///< Config: (pgp) External command to decrypt a PGP message
char *PgpEncryptOnlyCommand; ///< Config: (pgp) External command to encrypt, but not sign a message
* @param mdata NNTP Mailbox data
* @param query Query to match
* @param qlen Length of query
- * @param msg Progess message (OPTIONAL)
+ * @param msg Progress message (OPTIONAL)
* @param func Callback function
* @param data Data for callback function
* @retval 0 Success
* @param pat Pattern to match
* @param s String to parse
* @param err Buffer for error messages
- * @retval true If the pattern was read succesfully
+ * @retval true If the pattern was read successfully
*/
static bool eat_regex(struct Pattern *pat, struct Buffer *s, struct Buffer *err)
{
* @param pat Pattern to store the date in
* @param s String to parse
* @param err Buffer for error messages
- * @retval true If the pattern was read succesfully
+ * @retval true If the pattern was read successfully
*/
static bool eat_date(struct Pattern *pat, struct Buffer *s, struct Buffer *err)
{
* @param pat Pattern to store the range in
* @param s String to parse
* @param err Buffer for error messages
- * @retval true If the pattern was read succesfully
+ * @retval true If the pattern was read successfully
*/
static bool eat_range(struct Pattern *pat, struct Buffer *s, struct Buffer *err)
{
};
/* First decide if we're going to need the context at all.
- * Relative patterns need it iff they contain a dot or a number.
+ * Relative patterns need it if they contain a dot or a number.
* Absolute patterns only need it if they contain a dot. */
char *context_loc = strpbrk(s->dptr + pmatch[0].rm_so, context_req_chars[kind]);
if (!context_loc || (context_loc >= &s->dptr[pmatch[0].rm_eo]))
* @param pat Pattern to store the range in
* @param s String to parse
* @param err Buffer for error messages
- * @retval true If the pattern was read succesfully
+ * @retval true If the pattern was read successfully
*/
static bool eat_message_range(struct Pattern *pat, struct Buffer *s, struct Buffer *err)
{
if (!*tok)
continue;
- /* Only call mutt_expand_path iff tok has some data */
+ /* Only call mutt_expand_path if tok has some data */
mutt_debug(1, "Fcc: additional mailbox token = '%s'\n", tok);
mutt_str_strfcpy(fcc_expanded, tok, sizeof(fcc_expanded));
mutt_expand_path(fcc_expanded, sizeof(fcc_expanded));
static sort_t *AuxSort = NULL;
/**
- * perform_auxsort - Compare two emails using the auxilliary sort method
+ * perform_auxsort - Compare two emails using the auxiliary sort method
* @param retval Result of normal sort method
* @param a First email
* @param b Second email
/**
* state_prefix_put - Write a prefixed fixed-string to the State
* @param buf String to write
- * @param buflen Lenth of string
+ * @param buflen Length of string
* @param s State to write to
*/
void state_prefix_put(const char *buf, size_t buflen, struct State *s)
/**
* get_sort_str - Get the sort method as a string
* @param buf Buffer for the sort string
- * @param buflen Length of the bufer
+ * @param buflen Length of the buffer
* @param method Sort method, e.g. #SORT_DATE
* @retval ptr Buffer pointer
*/
/**
* mutt_system - Run an external command
- * @param cmd Command and argments
+ * @param cmd Command and arguments
* @retval -1 Error
* @retval >=0 Success (command's return code)
*
if(strncmp(badoptname, "--", 2) == 0) {
/* Strip any argument from the long option. */
- char* assignement = strchr(badoptname, '=');
- if(assignement != NULL) {
- size_t len = assignement - badoptname;
+ char* assignment = strchr(badoptname, '=');
+ if(assignment != NULL) {
+ size_t len = assignment - badoptname;
if(len > TEST_CMDLINE_AUXBUF_SIZE__)
len = TEST_CMDLINE_AUXBUF_SIZE__;
strncpy(auxbuf, badoptname, len);