[gemrb] 06/06: DEBIAN: Fix some spelling errors in man pages, gemrb_core and in GUIScript
Beren Minor
berenm-guest at moszumanska.debian.org
Tue Nov 28 18:25:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
berenm-guest pushed a commit to branch patch-queue/master
in repository gemrb.
commit 41d271e7a46b67e61443bd6376df2e7dd7bc3685
Author: Beren Minor <beren.minor+git at gmail.com>
Date: Tue Mar 22 01:13:52 2016 +0100
DEBIAN: Fix some spelling errors in man pages, gemrb_core and in GUIScript
---
android/prep_env.sh | 2 +-
gemrb.6.in | 10 +++++-----
gemrb/core/SaveGameIterator.cpp | 4 ++--
gemrb/core/Scriptable/Actor.cpp | 2 +-
gemrb/docs/en/GUIScript/controls.txt | 2 +-
gemrb/plugins/GUIScript/GUIScript.cpp | 16 ++++++++--------
gemrb/plugins/OpenALAudio/OpenALAudio.cpp | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/android/prep_env.sh b/android/prep_env.sh
index 92764b2..1959e4e 100644
--- a/android/prep_env.sh
+++ b/android/prep_env.sh
@@ -243,7 +243,7 @@ function move_and_edit_projectfiles {
function finished {
popd # back from $ENVROOT
local build_path=${ENVROOT##$PWD/}
- echo -en "That should be it, provided all the commands ran succesfully.\n\n" # TODO: Error checking beyond $1
+ echo -en "That should be it, provided all the commands ran successfully.\n\n" # TODO: Error checking beyond $1
echo -en "To build:\n"
echo -en " cd $build_path/build/gemrb\n"
echo -en " ndk-build && ant debug\n\n"
diff --git a/gemrb.6.in b/gemrb.6.in
index 9bb766a..489edea 100644
--- a/gemrb.6.in
+++ b/gemrb.6.in
@@ -45,7 +45,7 @@ For example, if the program's name is
.I torment
instead of
.IR gemrb ,
-the engine first seaches for
+the engine first searches for
.I torment.cfg
and only if it's not found it searches for
.IR gemrb.cfg .
@@ -65,7 +65,7 @@ A configuration file consists of pairs
.IR PARAMETER=VALUE ,
each on its own line. The case of PARAMETER is not significant,
GameType is the same as GAMETYPE. If the same PARAMETER is defined
-more than once, only the last occurence is used.
+more than once, only the last occurrence is used.
Empty lines and lines starting with `#' (hash sign) are ignored.
@@ -143,7 +143,7 @@ Whether the game should run in fullscreen mode.
.TP
.BR TooltipDelay =INT
-Delay (in miliseconds) before tooltips are displayed when the mouse is not moving.
+Delay (in milliseconds) before tooltips are displayed when the mouse is not moving.
A reasonable number for this option is e.g.
.IR 500 .
The default is
@@ -337,11 +337,11 @@ It is not set by default.
.TP
.BR DoubleClickDelay =INT
-Milisecond threshold for detecting a double click. The default is 250.
+Millisecond threshold for detecting a double click. The default is 250.
.TP
.BR RepeatKeyDelay =INT
-Milisecond threshold for detecting a repeated key press. The default is 250.
+Millisecond threshold for detecting a repeated key press. The default is 250.
.TP
.BR UseSoftKeyboard =(0|1)
diff --git a/gemrb/core/SaveGameIterator.cpp b/gemrb/core/SaveGameIterator.cpp
index e82955d..b0511ce 100644
--- a/gemrb/core/SaveGameIterator.cpp
+++ b/gemrb/core/SaveGameIterator.cpp
@@ -623,7 +623,7 @@ int SaveGameIterator::CreateSaveGame(int index, bool mqs)
return -1;
}
- // Save succesful / Quick-save succesful
+ // Save successful / Quick-save successful
if (qsave) {
displaymsg->DisplayConstantString(STR_QSAVESUCCEED, DMC_BG2XPGREEN);
if (gc) {
@@ -685,7 +685,7 @@ int SaveGameIterator::CreateSaveGame(Holder<SaveGame> save, const char *slotname
return -1;
}
- // Save succesful
+ // Save successful
displaymsg->DisplayConstantString(STR_SAVESUCCEED, DMC_BG2XPGREEN);
if (gc) {
gc->SetDisplayText(STR_SAVESUCCEED, 30);
diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index e8d6fa0..855e70e 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -4010,7 +4010,7 @@ bool Actor::OverrideActions()
void Actor::Panic(Scriptable *attacker, int panicmode)
{
if (GetStat(IE_STATE_ID)&STATE_PANIC) {
- print("Already paniced");
+ print("Already panicked");
//already in panic
return;
}
diff --git a/gemrb/docs/en/GUIScript/controls.txt b/gemrb/docs/en/GUIScript/controls.txt
index 35a0b12..e11646d 100644
--- a/gemrb/docs/en/GUIScript/controls.txt
+++ b/gemrb/docs/en/GUIScript/controls.txt
@@ -3,7 +3,7 @@
==== Button ====
Buttons are the most versatile controls in the GUI engine. The following button types exist: checkbox, radiobutton and normal button.
-Checkboxes of the same type are cummulative, and usually hold a bit value.
+Checkboxes of the same type are cumulative, and usually hold a bit value.
Radiobuttons of the same type are mutually exclusive.
Normal buttons are similar to radiobuttons, but they are not affecting each other.
diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp
index 499b81b..e508df7 100644
--- a/gemrb/plugins/GUIScript/GUIScript.cpp
+++ b/gemrb/plugins/GUIScript/GUIScript.cpp
@@ -486,7 +486,7 @@ position value:\n\
* 1 - bottom\n\
* 2 - right\n\
* 3 - top\n\
- * 4 - bottom (cummulative)\n\
+ * 4 - bottom (cumulative)\n\
\n\
**Parameters:** N/A\n\
\n\
@@ -2594,7 +2594,7 @@ PyDoc_STRVAR( GemRB_Window_SetKeyPressEvent__doc,
\n\
**Parameters:**\n\
* callback - Python function that accepts (windowIndex, key, mod) arguments and returns\n\
- * 1 indicating succesful key press consumption or 0 otherwise. \n\
+ * 1 indicating successful key press consumption or 0 otherwise. \n\
\n\
**Return value:** N/A\n\
\n\
@@ -5554,7 +5554,7 @@ being visible, selectable, dead, etc.\n\
\n\
**Parameters:** \n\
* PartyID - party ID or global ID of the actor to check\n\
- * flags - bits to check agains (see GameControlSetTargetMode)\n\
+ * flags - bits to check against (see GameControlSetTargetMode)\n\
\n\
**See also:** [[guiscript:GameControlSetTargetMode]]\n\
\n\
@@ -8380,7 +8380,7 @@ must be called once after a character was created and before EnterGame().\n\
* Portrait2 - small portrait\n\
* clear - clear all the quickslot/spell/item fields?\n\
\n\
-avprefix.2da is a gemrb specific table. Its first row contains the base animationID used for the actor. Its optional additional rows contain other table resrefs which refine the animationID by different player stats. The first row of these tables contain the stat which affects the animationID. The other rows assign cummulative values to the animationID. \n\
+avprefix.2da is a gemrb specific table. Its first row contains the base animationID used for the actor. Its optional additional rows contain other table resrefs which refine the animationID by different player stats. The first row of these tables contain the stat which affects the animationID. The other rows assign cumulative values to the animationID. \n\
\n\
**For example:**\n\
avprefix.2da\n\
@@ -10506,7 +10506,7 @@ parameter matches the arguments.\n\
**Parameters:** \n\
* globalID - party ID or global ID of the actor to use\n\
* EffectName - effect reference name (eg. 'State:Helpless')\n\
- * Parameter2 - parameter2 of targetted effect\n\
+ * Parameter2 - parameter2 of targeted effect\n\
\n\
**Return value:** N/A"
);
@@ -12846,7 +12846,7 @@ static bool CanUseActionButton(Actor *pcc, int type)
capability = pcc->GetSkill(IE_LOCKPICKING) + pcc->GetSkill(IE_PICKPOCKET);
break;
default:
- Log(WARNING, "GUIScript", "Uknown action (button) type: %d", type);
+ Log(WARNING, "GUIScript", "Unknown action (button) type: %d", type);
}
} else {
// use levels instead, so inactive dualclasses work as expected
@@ -12858,7 +12858,7 @@ static bool CanUseActionButton(Actor *pcc, int type)
capability = pcc->GetThiefLevel() + pcc->GetBardLevel();
break;
default:
- Log(WARNING, "GUIScript", "Uknown action (button) type: %d", type);
+ Log(WARNING, "GUIScript", "Unknown action (button) type: %d", type);
}
}
return capability > 0;
@@ -14855,7 +14855,7 @@ PyDoc_STRVAR( GemRB_SetTickHook__doc,
This is useful for things like running a twisted reactor.\n\
\n\
**Parameters:**\n\
- * callback - pyton function to run\
+ * callback - python function to run\
\n\
**Return value:** N/A"
);
diff --git a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
index bf449a7..edc7a96 100644
--- a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
+++ b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
@@ -335,7 +335,7 @@ int OpenALAudioDriver::CountAvailableSources(int limit)
checkALError("Error while auto-detecting number of sources", WARNING);
- // Return number of succesfully allocated sources
+ // Return number of successfully allocated sources
return i;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gemrb.git
More information about the Pkg-games-commits
mailing list