This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot.
commit 75d9f8573bc5f264f337e4a51d2479f50c9c4fc8 Author: tomangelo2 <tomang...@wp.pl> Date: Sun Jun 11 23:29:50 2017 +0200 Display warning if no quicksave slot is found --- po/colobot.pot | 3 +++ po/de.po | 7 ++++--- po/fr.po | 7 ++++--- po/pl.po | 3 +++ po/ru.po | 7 ++++--- src/common/error.h | 1 + src/common/restext.cpp | 1 + src/level/robotmain.cpp | 1 + 8 files changed, 21 insertions(+), 9 deletions(-) diff --git a/po/colobot.pot b/po/colobot.pot index bbcbe8b..509a3c7 100644 --- a/po/colobot.pot +++ b/po/colobot.pot @@ -1527,6 +1527,9 @@ msgstr "" msgid "Inappropriate bot" msgstr "" +msgid "Quicksave slot not found" +msgstr "" + msgid "Building completed" msgstr "" diff --git a/po/de.po b/po/de.po index 9c1fbef..5e2f4a5 100644 --- a/po/de.po +++ b/po/de.po @@ -1211,6 +1211,10 @@ msgstr "" msgid "Quick save\\Immediately save game" msgstr "" +#, fuzzy +msgid "Quicksave slot not found" +msgstr "Das Objekt existiert nicht" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Beenden\\Colobot: Gold Edition schließen" @@ -1939,9 +1943,6 @@ msgstr "epsitec.com" #~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgstr "Anzahl Ziergegenstände\\Anzahl Gegenstände ohne Funktion" -#~ msgid "Object not found" -#~ msgstr "Das Objekt existiert nicht" - #~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgstr "Planeten und Sterne\\Kreisende Planeten und Sterne" diff --git a/po/fr.po b/po/fr.po index 16e1546..01ca9de 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1208,6 +1208,10 @@ msgstr "" msgid "Quick save\\Immediately save game" msgstr "" +#, fuzzy +msgid "Quicksave slot not found" +msgstr "Objet n'existe pas" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Quitter\\Quitter Colobot : Édition Gold" @@ -1941,9 +1945,6 @@ msgstr "epsitec.com" #~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgstr "Nb d'objets décoratifs\\Qualité d'objets non indispensables" -#~ msgid "Object not found" -#~ msgstr "Objet n'existe pas" - #~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgstr "Planètes et étoiles\\Motifs mobiles dans le ciel" diff --git a/po/pl.po b/po/pl.po index 9d531ed..07a6328 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1194,6 +1194,9 @@ msgstr "Szybkie wczytywanie\\Natychmiastowo wczytuje zapisaną grę" msgid "Quick save\\Immediately save game" msgstr "Szybki zapis\\Natychmiastowo zapisuje grę" +msgid "Quicksave slot not found" +msgstr "Nie odnaleziono slotu szybkiego zapisu" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Wyjdź\\Kończy grę Colobot: Gold Edition" diff --git a/po/ru.po b/po/ru.po index fa1686d..fdcf909 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1220,6 +1220,10 @@ msgstr "" msgid "Quick save\\Immediately save game" msgstr "" +#, fuzzy +msgid "Quicksave slot not found" +msgstr "Объект не найден" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Выход\\Выйти из Colobot: Gold Edition" @@ -1951,9 +1955,6 @@ msgstr "epsitec.com" #~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgstr "Количество декораций\\Количество декоративных объектов" -#~ msgid "Object not found" -#~ msgstr "Объект не найден" - #~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgstr "Планеты и звезды\\Астрономические объекты в небе" diff --git a/src/common/error.h b/src/common/error.h index 7522c01..0ef8121 100644 --- a/src/common/error.h +++ b/src/common/error.h @@ -112,6 +112,7 @@ enum Error ERR_PROHIBITEDTOKEN = 801, //!< instruction prohibited ERR_AIM_IMPOSSIBLE = 900, //!< cannot aim at specified angle(s) ERR_WRONG_BOT = 910, //!< inappropriate bot + ERR_NO_QUICK_SLOT = 920, //!< quicksave slot not found INFO_FIRST = 10000, //! < first information INFO_BUILD = 10001, //! < construction builded diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 5a91541..3d16603 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -641,6 +641,7 @@ void InitializeRestext() stringsErr[ERR_DELETEBUILDING] = TR("Building destroyed"); stringsErr[ERR_ENEMY_OBJECT] = TR("Unable to control enemy objects"); stringsErr[ERR_WRONG_BOT] = TR("Inappropriate bot"); + stringsErr[ERR_NO_QUICK_SLOT] = TR("Quicksave slot not found"); stringsErr[INFO_BUILD] = TR("Building completed"); stringsErr[INFO_CONVERT] = TR("Titanium available"); diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 43801d8..a92b10b 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -5575,6 +5575,7 @@ void CRobotMain::QuickLoad() std::string dir = m_playerProfile->GetSaveFile(std::string("quicksave")); if(!CResourceManager::Exists(dir)) { + m_displayText->DisplayError(ERR_NO_QUICK_SLOT, Math::Vector(0.0f,0.0f,0.0f), 15.0f, 60.0f, 1000.0f); GetLogger()->Debug("Quicksave slot not found\n"); return; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits