diff --git a/desktop_version/lang/ca/strings.xml b/desktop_version/lang/ca/strings.xml index 7c1a444a..a7c1e7b6 100644 --- a/desktop_version/lang/ca/strings.xml +++ b/desktop_version/lang/ca/strings.xml @@ -759,6 +759,8 @@ Has trobat el laboratori secret!" explanation="" max="34*4"/> + + diff --git a/desktop_version/lang/de/strings.xml b/desktop_version/lang/de/strings.xml index f00c03d8..0c9a6088 100644 --- a/desktop_version/lang/de/strings.xml +++ b/desktop_version/lang/de/strings.xml @@ -759,6 +759,8 @@ Du hast das Geheimlabor gefunden!" explanation="" max="34*4"/> + + diff --git a/desktop_version/lang/en/strings.xml b/desktop_version/lang/en/strings.xml index 39c51b3d..d8b253ad 100644 --- a/desktop_version/lang/en/strings.xml +++ b/desktop_version/lang/en/strings.xml @@ -753,6 +753,8 @@ You have found the secret lab!" translation="" explanation="" max="34*4"/> + + diff --git a/desktop_version/lang/eo/strings.xml b/desktop_version/lang/eo/strings.xml index 8a26c0e5..42786a05 100644 --- a/desktop_version/lang/eo/strings.xml +++ b/desktop_version/lang/eo/strings.xml @@ -759,6 +759,8 @@ Vi trovis la sekretan labon!" explanation="" max="34*4"/> + + diff --git a/desktop_version/lang/es/strings.xml b/desktop_version/lang/es/strings.xml index 982a0aa3..4f1a608c 100644 --- a/desktop_version/lang/es/strings.xml +++ b/desktop_version/lang/es/strings.xml @@ -759,6 +759,8 @@ You have found the secret lab!" translation="¡Enhorabuena! + + diff --git a/desktop_version/lang/fr/strings.xml b/desktop_version/lang/fr/strings.xml index 5de883e1..45b4f1d3 100644 --- a/desktop_version/lang/fr/strings.xml +++ b/desktop_version/lang/fr/strings.xml @@ -753,6 +753,8 @@ You have found the secret lab!" translation="Félicitations ! Vous avez trouvé + + diff --git a/desktop_version/lang/it/strings.xml b/desktop_version/lang/it/strings.xml index 4a8f6ced..b3d141a1 100644 --- a/desktop_version/lang/it/strings.xml +++ b/desktop_version/lang/it/strings.xml @@ -759,6 +759,8 @@ Hai trovato il laboratorio segreto!" explanation="" max="34*4"/> + + diff --git a/desktop_version/lang/nl/strings.xml b/desktop_version/lang/nl/strings.xml index 7c871b5a..596df43f 100644 --- a/desktop_version/lang/nl/strings.xml +++ b/desktop_version/lang/nl/strings.xml @@ -760,6 +760,8 @@ Je hebt het geheime lab gevonden!" explanation="" max="34*4"/> + + diff --git a/desktop_version/lang/pt_BR/strings.xml b/desktop_version/lang/pt_BR/strings.xml index 3304be2d..5741019c 100644 --- a/desktop_version/lang/pt_BR/strings.xml +++ b/desktop_version/lang/pt_BR/strings.xml @@ -759,6 +759,8 @@ Você encontrou o laboratório secreto!" explanation="" max="34*4"/> + + diff --git a/desktop_version/lang/pt_PT/strings.xml b/desktop_version/lang/pt_PT/strings.xml index 4ed16c39..d45be62a 100644 --- a/desktop_version/lang/pt_PT/strings.xml +++ b/desktop_version/lang/pt_PT/strings.xml @@ -759,6 +759,8 @@ Encontraste o laboratório secreto!" explanation="" max="34*4"/> + + diff --git a/desktop_version/lang/ru/strings.xml b/desktop_version/lang/ru/strings.xml index 6d21683a..4087ce05 100644 --- a/desktop_version/lang/ru/strings.xml +++ b/desktop_version/lang/ru/strings.xml @@ -759,6 +759,8 @@ You have found the secret lab!" translation="Поздравляем! + + diff --git a/desktop_version/lang/tr/strings.xml b/desktop_version/lang/tr/strings.xml index 2e0d8f85..25f93588 100644 --- a/desktop_version/lang/tr/strings.xml +++ b/desktop_version/lang/tr/strings.xml @@ -759,6 +759,8 @@ Gizli laboratuvarı buldun!" explanation="" max="34*4"/> + + diff --git a/desktop_version/src/CustomLevels.cpp b/desktop_version/src/CustomLevels.cpp index e92d1522..2dc5300b 100644 --- a/desktop_version/src/CustomLevels.cpp +++ b/desktop_version/src/CustomLevels.cpp @@ -1018,13 +1018,22 @@ bool customlevelclass::load(std::string _path) if (!FILESYSTEM_loadTiXml2Document(_path.c_str(), doc)) { - vlog_warn("%s not found", _path.c_str()); + FILESYSTEM_setLevelDirError( + loc::gettext("Level {path} not found"), + "path:str", + _path.c_str() + ); goto fail; } if (doc.Error()) { - vlog_error("Error parsing %s: %s", _path.c_str(), doc.ErrorStr()); + FILESYSTEM_setLevelDirError( + loc::gettext("Error parsing {path}: {error}"), + "path:str, error:str", + _path.c_str(), + doc.ErrorStr() + ); goto fail; } diff --git a/desktop_version/src/FileSystemUtils.cpp b/desktop_version/src/FileSystemUtils.cpp index 2254077b..54e0bb4a 100644 --- a/desktop_version/src/FileSystemUtils.cpp +++ b/desktop_version/src/FileSystemUtils.cpp @@ -456,7 +456,7 @@ const char* FILESYSTEM_getLevelDirError(void) return levelDirError; } -static void setLevelDirError(const char* text, const char* args_index, ...) +void FILESYSTEM_setLevelDirError(const char* text, const char* args_index, ...) { levelDirHasError = true; @@ -475,7 +475,7 @@ static bool FILESYSTEM_mountAssetsFrom(const char *fname) if (real_dir == NULL) { - setLevelDirError( + FILESYSTEM_setLevelDirError( loc::gettext("Could not mount {path}: real directory doesn't exist"), "path:str", fname diff --git a/desktop_version/src/FileSystemUtils.h b/desktop_version/src/FileSystemUtils.h index bd564d7e..e4d8160b 100644 --- a/desktop_version/src/FileSystemUtils.h +++ b/desktop_version/src/FileSystemUtils.h @@ -60,6 +60,7 @@ void FILESYSTEM_freeEnumerate(EnumHandle* handle); bool FILESYSTEM_levelDirHasError(void); void FILESYSTEM_clearLevelDirError(void); const char* FILESYSTEM_getLevelDirError(void); +void FILESYSTEM_setLevelDirError(const char* text, const char* args_index, ...); bool FILESYSTEM_openDirectoryEnabled(void); bool FILESYSTEM_openDirectory(const char *dname);