diff --git a/src/3rdparty/sqlite3/sqlite3.c b/src/3rdparty/sqlite3/sqlite3.c index 320d6355e3..4bb7b461fe 100644 --- a/src/3rdparty/sqlite3/sqlite3.c +++ b/src/3rdparty/sqlite3/sqlite3.c @@ -180331,7 +180331,7 @@ static int sessionBindRow( ** iterator pIter points to to the SELECT and attempts to seek to the table ** entry. If a row is found, the SELECT statement left pointing at the row ** and SQLITE_ROW is returned. Otherwise, if no row is found and no error -** has occured, the statement is reset and SQLITE_OK is returned. If an +** has occurred, the statement is reset and SQLITE_OK is returned. If an ** error occurs, the statement is reset and an SQLite error code is returned. ** ** If this function returns SQLITE_ROW, the caller must eventually reset() diff --git a/src/csync/std/c_string.h b/src/csync/std/c_string.h index ef17848924..8b0421b2c7 100644 --- a/src/csync/std/c_string.h +++ b/src/csync/std/c_string.h @@ -89,7 +89,7 @@ int c_streq(const char *a, const char *b); * * @param size Size to allocate. * - * @return Pointer to the newly allocated stringlist. NULL if an error occured. + * @return Pointer to the newly allocated stringlist. NULL if an error occurred. */ c_strlist_t *c_strlist_new(size_t size); @@ -99,7 +99,7 @@ c_strlist_t *c_strlist_new(size_t size); * @param strlist Stringlist to expand * @param size New size of the strlinglist to expand * - * @return Pointer to the expanded stringlist. NULL if an error occured. + * @return Pointer to the expanded stringlist. NULL if an error occurred. */ c_strlist_t *c_strlist_expand(c_strlist_t *strlist, size_t size); @@ -111,7 +111,7 @@ c_strlist_t *c_strlist_expand(c_strlist_t *strlist, size_t size); * @param strlist Stringlist to add the string. * @param string String to add. * - * @return 0 on success, less than 0 and errno set if an error occured. + * @return 0 on success, less than 0 and errno set if an error occurred. * ENOBUFS if the list is full. */ int c_strlist_add(c_strlist_t *strlist, const char *string); @@ -125,7 +125,7 @@ int c_strlist_add(c_strlist_t *strlist, const char *string); * @param strlist Stringlist to add the string. * @param string String to add. * - * @return 0 on success, less than 0 and errno set if an error occured. + * @return 0 on success, less than 0 and errno set if an error occurred. */ int c_strlist_add_grow(c_strlist_t **strlist, const char *string); diff --git a/src/gui/wizard/owncloudoauthcredspage.ui b/src/gui/wizard/owncloudoauthcredspage.ui index 7b20b6cc45..285ef3a2b5 100644 --- a/src/gui/wizard/owncloudoauthcredspage.ui +++ b/src/gui/wizard/owncloudoauthcredspage.ui @@ -43,7 +43,7 @@ - An error occured while connecting. Please try again. + An error occurred while connecting. Please try again. Qt::PlainText