diff options
| author | 2015-09-15 22:43:28 +0100 | |
|---|---|---|
| committer | 2015-09-15 22:55:36 +0100 | |
| commit | 624305ac108ee6efd9093ef0fb3c73f241982483 (patch) | |
| tree | cbe2ffa87beb1e6ac9d5db84599cb2c23b75d356 /src | |
| parent | Merge pull request #1597 from uNiversaI/Mary-Poppins (diff) | |
| download | KVIrc-624305ac108ee6efd9093ef0fb3c73f241982483.tar.gz KVIrc-624305ac108ee6efd9093ef0fb3c73f241982483.tar.bz2 KVIrc-624305ac108ee6efd9093ef0fb3c73f241982483.zip | |
Minor grammar: english -> English
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp | 4 | ||||
| -rw-r--r-- | src/kvirc/kvs/object/KviKvsObject.cpp | 4 | ||||
| -rw-r--r-- | src/kvirc/kvs/parser/KviKvsParser.cpp | 4 | ||||
| -rw-r--r-- | src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp | 2 | ||||
| -rw-r--r-- | src/modules/language/libkvilanguage.cpp | 2 | ||||
| -rw-r--r-- | src/modules/options/OptionsDialog.cpp | 2 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_identity.cpp | 4 | ||||
| -rw-r--r-- | src/modules/setup/SetupWizard.cpp | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp index 624eeb047..31be1d4ed 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp @@ -526,7 +526,7 @@ namespace KviKvsCoreFunctions [/p] [p] All of the strings in your script are written in a "primary language". - The most common "primary language" is english, but theoretically + The most common "primary language" is English, but theoretically it can be any language of your choice. [/p] [p] @@ -566,7 +566,7 @@ namespace KviKvsCoreFunctions [/p] [p] Translate mytranslation_it.po. The format of the po file is straightforward. - There are msgid lines with the original english text and immediately + There are msgid lines with the original English text and immediately following msgstr lines that must be filled with the corresponding translation. For example in Italian you would translate:[br] msgid "your default language text" diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp index 8a9505850..0cd63465a 100644 --- a/src/kvirc/kvs/object/KviKvsObject.cpp +++ b/src/kvirc/kvs/object/KviKvsObject.cpp @@ -396,7 +396,7 @@ [cmd]return[/cmd] 1 } else { [cmd]echo[/cmd] I don't know that language ($0) - [cmd]echo[/cmd] defaulting to english + [cmd]echo[/cmd] defaulting to English [fnc:$this]$$[/fnc]->%lang = english [cmd]return[/cmd] 0 } @@ -443,7 +443,7 @@ The base class name could be also [class]object[/class] in this case, but the [class]object[/class] class has no "sayhello" function defined so it would result in an error.[br][br] In the above example, all the values of [fnc]$this[/fnc]->%language - that are not equal to "italian" are assumed to be "english". + that are not equal to "italian" are assumed to be "English". This is not always true, for example, just after the object creation the %language variable field is effectively empty. The above class works correctly in this case, but we might want to have always a coherent state of the field variables, so we need another concept: the class [b]constructor[/b] diff --git a/src/kvirc/kvs/parser/KviKvsParser.cpp b/src/kvirc/kvs/parser/KviKvsParser.cpp index 055eae9e7..5cb6e64a9 100644 --- a/src/kvirc/kvs/parser/KviKvsParser.cpp +++ b/src/kvirc/kvs/parser/KviKvsParser.cpp @@ -298,7 +298,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer I'll try to explain the language by using examples instead of strict syntactic rules. (Actually I have even tried to write the rules...take a look [doc:syntactic_rules]here[/doc][br][br] - And please...forgive me for my "fantastic" english :) + And please...forgive me for my "fantastic" English :) [/p] Szymon Stefanek */ @@ -1471,7 +1471,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const QChar * pBuffer your help files are written in. The languages dirs should be named with the language code also used for the translation files (like "en", "it" etc...). - Please note that english is the default language and KVIrc will + Please note that English is the default language and KVIrc will fallback to the "en" subdirectory when no other language is found around... [/p] diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp index 1de3229aa..6413b2302 100644 --- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp +++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp @@ -1095,7 +1095,7 @@ void KviIrcServerParser::parseCommandSyntaxHelp(KviIrcMessage *msg) QString szCommand = msg->connection()->decodeText(msg->safeParam(1)); QString szWText = msg->connection()->decodeText(msg->safeTrailing()); pOut->output(KVI_OUT_HELP, - __tr2qs("Command syntax %Q: %Q"),&szCommand,&szWText); // Pragma: wheee..... that should be in english :D + __tr2qs("Command syntax %Q: %Q"),&szCommand,&szWText); // Pragma: wheee..... that should be in English :D } } diff --git a/src/modules/language/libkvilanguage.cpp b/src/modules/language/libkvilanguage.cpp index 6badce6ba..ea86316d5 100644 --- a/src/modules/language/libkvilanguage.cpp +++ b/src/modules/language/libkvilanguage.cpp @@ -48,7 +48,7 @@ This command is exported by the "language" module. @examples: [example] - %dati = $language.detect("I'm a lord and i speak perfect english."); + %dati = $language.detect("I'm a lord and I speak perfect English."); if(%dati{"error"} != "")echo "Language detection failed: " %dati{"error"}; %count = %dati{"matchcount"}; for(%i=0;%i<%count;%i++) diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp index 72d5a78dc..8fe7db1a6 100644 --- a/src/modules/options/OptionsDialog.cpp +++ b/src/modules/options/OptionsDialog.cpp @@ -198,7 +198,7 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal) QString szTip = __tr2qs_ctx("<p>This is the search tool for this options dialog.</p>" \ "<p>You can enter a search term either in your native " \ - "language or in english and press the button on the right. " \ + "language or in English and press the button on the right. " \ "The pages that contain some options related to the " \ "search term will be highlighted and you will be able " \ "to quickly find them.</p><p>Try \"nickname\" for example.</p>","options"); diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp index 6debb2d0d..e54bb9204 100644 --- a/src/modules/options/OptionsWidget_identity.cpp +++ b/src/modules/options/OptionsWidget_identity.cpp @@ -440,11 +440,11 @@ void KviIdentityGeneralOptionsWidget::commit() switch(m_pGenderCombo->currentIndex()) { case 1: - // this should be in english + // this should be in English KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender) = "Female"; break; case 2: - // this should be in english + // this should be in English KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender) = "Male"; break; default: diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp index a6c96ce8f..b0adaea1d 100644 --- a/src/modules/setup/SetupWizard.cpp +++ b/src/modules/setup/SetupWizard.cpp @@ -1078,11 +1078,11 @@ void SetupWizard::accept() switch(m_pGenderCombo->currentIndex()) { case 1: - // this should be in english + // this should be in English KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender) = "Female"; break; case 2: - // this should be in english + // this should be in English KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender) = "Male"; break; default: |
