diff options
| -rw-r--r-- | src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/sparser/KviIrcNumericCodes.h | 2 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_textEncoding.cpp | 10 | ||||
| -rw-r--r-- | src/modules/texticons/libkvitexticons.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp index 1440b0bfe..9161f149c 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp @@ -54,7 +54,7 @@ namespace KviKvsCoreFunctions @syntax: <string> $gender(<nickname:string>) @description: - Returns the gender, or 'unknown' if not setted from remote user, of the specified IRC user IF it is known.[br] + Returns the gender, or 'unknown' if not set from remote user, of the specified IRC user IF it is known.[br] The gender is known if [fnc]$isWellKnown[/fnc] returns 1.[br] The gender is generally known if the user is on a channel with you or has an open query with you.[br] diff --git a/src/kvirc/sparser/KviIrcNumericCodes.h b/src/kvirc/sparser/KviIrcNumericCodes.h index 8d781d6e1..e88b428fc 100644 --- a/src/kvirc/sparser/KviIrcNumericCodes.h +++ b/src/kvirc/sparser/KviIrcNumericCodes.h @@ -346,7 +346,7 @@ #define ERR_NOSERVICEHOST 492 /* ??? [I,D] */ // ERR_??????????? 493-500 #define ERR_UMODEUNKNOWNFLAG 501 /* ":Unknown MODE flag" [I,E,U,D] */ -#define ERR_USERSDONTMATCH 502 /* ":Cant change mode for other users" [I,E,U,D] */ +#define ERR_USERSDONTMATCH 502 /* ":Can't change mode for other users" [I,E,U,D] */ #define ERR_GHOSTEDCLIENT 503 /* ":Message could not be delivered to %s" [E] */ #define ERR_LAST_ERR_MSG 504 /* ":Last Error Message" [E] */ // ERR_??????????? 505-510 diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp index 752e5faf0..f6bd526f9 100644 --- a/src/modules/options/OptionsWidget_textEncoding.cpp +++ b/src/modules/options/OptionsWidget_textEncoding.cpp @@ -36,7 +36,7 @@ #include <QMessageBox> #include <QHeaderView> -QString g_szPrevSettedLocale; +QString g_szPrevSetLocale; OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) : KviOptionsWidget(parent) @@ -103,9 +103,9 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) g_pApp->getLocalKvircDirectory(szLangFile, KviApplication::None, KVI_FORCE_LOCALE_FILE_NAME); bool bIsDefaultLocale = !KviFileUtils::fileExists(szLangFile); - //We Have setted locale, but not restarted kvirc - if(!g_szPrevSettedLocale.isEmpty()) - m_szLanguage = g_szPrevSettedLocale; + //We Have set locale, but not restarted kvirc + if(!g_szPrevSetLocale.isEmpty()) + m_szLanguage = g_szPrevSetLocale; else m_szLanguage = KviLocale::instance()->localeName(); @@ -219,7 +219,7 @@ void OptionsWidget_textEncoding::commit() } else { - g_szPrevSettedLocale = m_pForcedLocaleCombo->itemText(idx); + g_szPrevSetLocale = m_pForcedLocaleCombo->itemText(idx); if(!KviFileUtils::writeFile(szLangFile, m_pForcedLocaleCombo->itemText(idx))) { QMessageBox::critical(this, "Writing to File Failed - KVIrc", __tr2qs_ctx("Unable to write language information to", "options") + "\n" + szLangFile, __tr2qs_ctx("OK", "options")); diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp index 748b1da71..f0f39ff7a 100644 --- a/src/modules/texticons/libkvitexticons.cpp +++ b/src/modules/texticons/libkvitexticons.cpp @@ -39,7 +39,7 @@ <string> $texticons.get(<iconName:string>) <integer> $texticons.get(<iconName:string>) @description: - if <iconName:string> is setted returns integer icon ID or string filename, associated with <iconName:string>[br] + if <iconName:string> is set returns integer icon ID or string filename, associated with <iconName:string>[br] if <iconName:string> isn't set returns hash where keys are the icon names, and values are the icon id's or filenames @seealso: [fnc]$texticons.get[/fnc] |