immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #751 from OdyX/018-minor-fixes 

Fix spelling error, and add Keywords to the desktop file
dev-time-step
krzys_h 2016-03-30 14:00:45 +02:00
parent ef0147eb37 761c85468f
commit d84304cba5
12 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/colobot.ini
View File

@ -1,4 +1,4 @@
Name="Colobot"
GenericName="Game to learn programming"
Comment="Colonize with bots"
Keywords="robots;3d;space;astronaut;java;c++"

2
desktop/create_desktop_file.sh
View File

@ -10,7 +10,7 @@ cat colobot.desktop.in
linguas=$([ ! -d lang ] || ( cd lang ; ls));
for type in Name GenericName Comment; do
for type in Name GenericName Comment Keywords; do
egrep "^$type=" $fname | sed -e "s/^$type=\"\(.*\)\"$/$type=\1/g"
for l in $linguas; do
egrep "^$type=" lang/$l/$fname | sed -e "s/^$type=\"\(.*\)\"$/$type[$l]=\1/g"

8
desktop/po/colobot-desktop.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2016-03-25 19:24+0100\n"
"POT-Creation-Date: 2016-03-30 13:45+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -34,6 +34,12 @@ msgstr ""
msgid "Colonize with bots"
msgstr ""
#. type: Keywords=
#: colobot.ini:4
#, no-wrap
msgid "robots;3d;space;astronaut;java;c++"
msgstr ""
#. type: =head1
#: colobot.pod:3
msgid "NAME"

10
desktop/po/fr.po
View File

@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: colobot 0.1.7\n"
"POT-Creation-Date: 2016-03-25 19:24+0100\n"
"PO-Revision-Date: 2016-03-25 21:13+0100\n"
"POT-Creation-Date: 2016-03-30 13:45+0200\n"
"PO-Revision-Date: 2016-03-30 13:49+0100\n"
"Last-Translator: Didier Raboud <odyx@debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
@ -34,6 +34,12 @@ msgstr "Apprentissage de la programmation par le jeu"
msgid "Colonize with bots"
msgstr "Colonise avec des roBots"
#. type: Keywords=
#: colobot.ini:4
#, no-wrap
msgid "robots;3d;space;astronaut;java;c++"
msgstr "robots;3d;espace;astronaute;cosmonaute;java;c++"
#. type: =head1
#: colobot.pod:3
msgid "NAME"

4
src/CBot/CBotProgram.h
View File

@ -143,7 +143,7 @@ public:
* \param[out] code Error code
* \param[out] start Starting position in the code string of this error
* \param[out] end Ending position in the code string of this error
* \return false if no error has occured
* \return false if no error has occurred
*/
bool GetError(CBotError& code, int& start, int& end);
@ -153,7 +153,7 @@ public:
* \param[out] start Starting position in the code string of this error
* \param[out] end Ending position in the code string of this error
* \param[out] pProg Program that caused the error (TODO: This always returns "this"... what?)
* \return false if no error has occured
* \return false if no error has occurred
*/
bool GetError(CBotError& code, int& start, int& end, CBotProgram*& pProg);

2
src/CBot/CBotStack.h
View File

@ -105,7 +105,7 @@ public:
/**
* \brief Check if there was an error
* \return false if an error occured
* \return false if an error occurred
* \see GetError()
*/
bool IsOk()

4
src/app/signal_handlers.cpp
View File

@ -124,7 +124,7 @@ void CSignalHandlers::ReportError(const std::string& errorMessage)
}
std::stringstream msg;
msg << "Unhandled exception occured!" << std::endl;
msg << "Unhandled exception occurred!" << std::endl;
msg << "==============================" << std::endl;
msg << errorMessage << std::endl;
msg << "==============================" << std::endl;
@ -162,7 +162,7 @@ void CSignalHandlers::ReportError(const std::string& errorMessage)
std::cerr << std::endl << msg.str() << std::endl;
m_systemUtils->SystemDialog(SDT_ERROR, "Unhandled exception occured!", msg.str());
m_systemUtils->SystemDialog(SDT_ERROR, "Unhandled exception occurred!", msg.str());
if (canSave && !triedSaving)
{

2
src/graphics/opengl/gl21device.cpp
View File

@ -174,7 +174,7 @@ bool CGL21Device::Create()
if (!InitializeGLEW())
{
m_errorMessage = "An error occured while initializing GLEW.";
m_errorMessage = "An error occurred while initializing GLEW.";
return false;
}

2
src/graphics/opengl/gl33device.cpp
View File

@ -173,7 +173,7 @@ bool CGL33Device::Create()
if (!InitializeGLEW())
{
m_errorMessage = "An error occured while initializing GLEW.";
m_errorMessage = "An error occurred while initializing GLEW.";
return false;
}

2
src/graphics/opengl/gldevice.cpp
View File

@ -169,7 +169,7 @@ bool CGLDevice::Create()
if (!InitializeGLEW())
{
m_errorMessage = "An error occured while initializing GLEW.";
m_errorMessage = "An error occurred while initializing GLEW.";
return false;
}

8
src/graphics/opengl/glutil.cpp
View File

@ -480,8 +480,8 @@ GLint LoadShader(GLint type, const char* filename)
auto message = MakeUniqueArray<GLchar>(len + 1);
glGetShaderInfoLog(shader, len + 1, nullptr, message.get());
GetLogger()->Error("Shader compilation error occured!\n%s\n", message.get());
lastShaderError = std::string("Shader compilation error occured!\n\n") + std::string(message.get());
GetLogger()->Error("Shader compilation error occurred!\n%s\n", message.get());
lastShaderError = std::string("Shader compilation error occurred!\n\n") + std::string(message.get());
glDeleteShader(shader);
return 0;
@ -513,8 +513,8 @@ GLint LinkProgram(int count, GLint shaders[])
auto message = MakeUniqueArray<GLchar>(len + 1);
glGetProgramInfoLog(program, len + 1, nullptr, message.get());
GetLogger()->Error("Shader program linking error occured!\n%s\n", message.get());
lastShaderError = std::string("Shader program linking error occured!\n\n") + std::string(message.get());
GetLogger()->Error("Shader program linking error occurred!\n%s\n", message.get());
lastShaderError = std::string("Shader program linking error occurred!\n\n") + std::string(message.get());
glDeleteProgram(program);

10
src/level/robotmain.cpp
View File

@ -563,7 +563,7 @@ void CRobotMain::ChangePhase(Phase phase)
}
catch (const std::runtime_error& e)
{
LevelLoadingError("An error occured while trying to load a level", e);
LevelLoadingError("An error occurred while trying to load a level", e);
}
}
@ -606,7 +606,7 @@ void CRobotMain::ChangePhase(Phase phase)
}
catch (const std::runtime_error& e)
{
LevelLoadingError("An error occured while trying to load win scene", e);
LevelLoadingError("An error occurred while trying to load win scene", e);
}
}
}
@ -636,7 +636,7 @@ void CRobotMain::ChangePhase(Phase phase)
}
catch (const std::runtime_error& e)
{
LevelLoadingError("An error occured while trying to load lost scene", e);
LevelLoadingError("An error occurred while trying to load lost scene", e);
}
}
}
@ -2781,7 +2781,7 @@ void CRobotMain::ScenePerso()
}
catch (const std::runtime_error& e)
{
LevelLoadingError("An error occured while trying to load apperance scene", e, PHASE_PLAYER_SELECT);
LevelLoadingError("An error occurred while trying to load apperance scene", e, PHASE_PLAYER_SELECT);
}
m_engine->SetDrawWorld(false); // does not draw anything on the interface
@ -4986,7 +4986,7 @@ void CRobotMain::ResetCreate()
}
catch (const std::runtime_error& e)
{
LevelLoadingError("An error occured while trying to reset scene", e);
LevelLoadingError("An error occurred while trying to reset scene", e);
}
}