From 6a8b04d01e7228577d6249fbf869f2de863bf93a Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 27 Feb 2010 16:41:10 +0000 Subject: [PATCH] (svn r19278) [1.0] -Backport from trunk: - Feature: BaNaNaS support for music sets (r19262) - Fix: [NewGRF] Ensure prices cannot be set to zero. Zero prices break a lot of the internal logic to determine whether something has been done [FS#3646] (r19277) - Fix: 'Cannot build here... in the way' showed the to-be-built industry twice, instead of the to-be-built industry and the industry that's in the way [FS#3618] (r19265) - Fix: strgen segfaults when trying to lookup the command for a non-existing command (r19264) --- src/base_media_base.h | 4 +- src/economy.cpp | 10 ++++ src/fileio.cpp | 73 +++++++++++++++++++++++++++++ src/fileio_func.h | 1 + src/industry_cmd.cpp | 2 +- src/lang/afrikaans.txt | 2 +- src/lang/arabic_egypt.txt | 2 +- src/lang/brazilian_portuguese.txt | 2 +- src/lang/bulgarian.txt | 2 +- src/lang/catalan.txt | 2 +- src/lang/croatian.txt | 2 +- src/lang/czech.txt | 2 +- src/lang/danish.txt | 2 +- src/lang/dutch.txt | 2 +- src/lang/english.txt | 2 +- src/lang/english_US.txt | 2 +- src/lang/esperanto.txt | 2 +- src/lang/estonian.txt | 2 +- src/lang/finnish.txt | 2 +- src/lang/french.txt | 2 +- src/lang/galician.txt | 2 +- src/lang/german.txt | 2 +- src/lang/greek.txt | 2 +- src/lang/hebrew.txt | 2 +- src/lang/hungarian.txt | 2 +- src/lang/icelandic.txt | 2 +- src/lang/indonesian.txt | 2 +- src/lang/italian.txt | 2 +- src/lang/japanese.txt | 2 +- src/lang/korean.txt | 2 +- src/lang/latvian.txt | 2 +- src/lang/lithuanian.txt | 2 +- src/lang/luxembourgish.txt | 2 +- src/lang/malay.txt | 2 +- src/lang/norwegian_bokmal.txt | 2 +- src/lang/norwegian_nynorsk.txt | 2 +- src/lang/polish.txt | 2 +- src/lang/portuguese.txt | 2 +- src/lang/romanian.txt | 2 +- src/lang/russian.txt | 2 +- src/lang/serbian.txt | 2 +- src/lang/simplified_chinese.txt | 2 +- src/lang/slovak.txt | 2 +- src/lang/slovenian.txt | 2 +- src/lang/spanish.txt | 2 +- src/lang/swedish.txt | 2 +- src/lang/traditional_chinese.txt | 2 +- src/lang/turkish.txt | 2 +- src/lang/ukrainian.txt | 2 +- src/lang/unfinished/frisian.txt | 2 +- src/lang/vietnamese.txt | 2 +- src/lang/welsh.txt | 2 +- src/network/network_content.cpp | 6 +++ src/network/network_content_gui.cpp | 5 ++ src/station_cmd.cpp | 2 +- src/strgen/strgen.cpp | 4 +- 56 files changed, 149 insertions(+), 52 deletions(-) diff --git a/src/base_media_base.h b/src/base_media_base.h index 4b43c24fd8..88b78374b4 100644 --- a/src/base_media_base.h +++ b/src/base_media_base.h @@ -170,7 +170,9 @@ public: static uint FindSets() { BaseMedia fs; - return fs.Scan(GetExtension(), Tbase_set::SUBDIR); + /* GM_DIR == music set. Music sets don't support tars, + * so there is no need to search for tars in that case. */ + return fs.Scan(GetExtension(), Tbase_set::SUBDIR, Tbase_set::SUBDIR != GM_DIR); } /** diff --git a/src/economy.cpp b/src/economy.cpp index 8711011cd1..d326336a59 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -667,6 +667,16 @@ void RecomputePrices() price >>= -shift; } + /* Make sure the price does not get reduced to zero. + * Zero breaks quite a few commands that use a zero + * cost to see whether something got changed or not + * and based on that cause an error. When the price + * is zero that fails even when things are done. */ + if (price == 0) { + price = Clamp(_price_base_specs[i].start_price, -1, 1); + /* No base price should be zero, but be sure. */ + assert(price != 0); + } /* Store value */ _price[i] = price; } diff --git a/src/fileio.cpp b/src/fileio.cpp index 253ad8ebb3..1ae3c7e5e6 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -743,6 +743,79 @@ bool TarListAddFile(const char *filename) return true; } +/** + * Extract the tar with the given filename in the directory + * where the tar resides. + * @param tar_filename the name of the tar to extract. + * @return false on failure. + */ +bool ExtractTar(const char *tar_filename) +{ + TarList::iterator it = _tar_list.find(tar_filename); + /* We don't know the file. */ + if (it == _tar_list.end()) return false; + + const char *dirname = (*it).second.dirname; + + /* The file doesn't have a sub directory! */ + if (dirname == NULL) return false; + + char filename[MAX_PATH]; + strecpy(filename, tar_filename, lastof(filename)); + char *p = strrchr(filename, PATHSEPCHAR); + /* The file's path does not have a separator? */ + if (p == NULL) return false; + + p++; + strecpy(p, dirname, lastof(filename)); + DEBUG(misc, 8, "Extracting %s to directory %s", tar_filename, filename); + FioCreateDirectory(filename); + + for (TarFileList::iterator it2 = _tar_filelist.begin(); it2 != _tar_filelist.end(); it2++) { + if (strcmp((*it2).second.tar_filename, tar_filename) != 0) continue; + + strecpy(p, (*it2).first.c_str(), lastof(filename)); + + DEBUG(misc, 9, " extracting %s", filename); + + /* First open the file in the .tar. */ + size_t to_copy = 0; + FILE *in = FioFOpenFileTar(&(*it2).second, &to_copy); + if (in == NULL) { + DEBUG(misc, 6, "Extracting %s failed; could not open %s", filename, tar_filename); + return false; + } + + /* Now open the 'output' file. */ + FILE *out = fopen(filename, "wb"); + if (out == NULL) { + DEBUG(misc, 6, "Extracting %s failed; could not open %s", filename, filename); + fclose(in); + return false; + } + + /* Now read from the tar and write it into the file. */ + char buffer[4096]; + size_t read; + for (; to_copy != 0; to_copy -= read) { + read = fread(buffer, 1, min(to_copy, lengthof(buffer)), in); + if (read <= 0 || fwrite(buffer, 1, read, out) != read) break; + } + + /* Close everything up. */ + fclose(in); + fclose(out); + + if (to_copy != 0) { + DEBUG(misc, 6, "Extracting %s failed; still %i bytes to copy", filename, (int)to_copy); + return false; + } + } + + DEBUG(misc, 9, " extraction successful"); + return true; +} + static int ScanPathForTarFiles(const char *path, size_t basepath_length) { extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb); diff --git a/src/fileio_func.h b/src/fileio_func.h index b2d2da8032..53b3aa233c 100644 --- a/src/fileio_func.h +++ b/src/fileio_func.h @@ -63,6 +63,7 @@ void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize); bool FileExists(const char *filename); const char *FioTarFirstDir(const char *tarname); void FioTarAddLink(const char *src, const char *dest); +bool ExtractTar(const char *tar_filename); extern char *_personal_dir; ///< custom directory for personal settings, saves, newgrf, etc. diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 7663c5cf95..874ea7d0df 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -477,7 +477,7 @@ static CommandCost ClearTile_Industry(TileIndex tile, DoCommandFlag flags) (_current_company == OWNER_WATER && ((indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER) || HasBit(GetIndustryTileSpec(GetIndustryGfx(tile))->slopes_refused, 5)))) { - SetDParam(0, indspec->name); + SetDParam(1, indspec->name); return_cmd_error(flags & DC_AUTO ? STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY : INVALID_STRING_ID); } diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 27dadc9a3c..24aa4e85ad 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -3308,7 +3308,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...alree STR_ERROR_OWNED_BY :{WHITE}...besit deur {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...gebied is besit deur 'n ander maatskappy STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Naam moet unike wees -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} in die pad +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} in die pad # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} plaaslike raad weier om dit te toelaat diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 8dba0c18fb..aa03e49f6f 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...تم STR_ERROR_OWNED_BY :{WHITE} مملوكة من قبل ... {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...المنطقة مملوكة لشركة منافسة STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}السم يجب ان يكون فريدا - غير مستخدم -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} على الطريق +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} على الطريق # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}بلدية المدينة ترفض السماح بهذا diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 50172485ea..13c84b7f9d 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -3330,7 +3330,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...já c STR_ERROR_OWNED_BY :{WHITE}...propriedade de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...a área é propriedade de outra empresa STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nome deve ser único -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} no caminho +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} no caminho # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}A autoridade local de {TOWN} não autoriza diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index d420d8b849..051dcc2cde 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -3297,7 +3297,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...ве STR_ERROR_OWNED_BY :{WHITE}...собственост на {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...земята е притежание на друга компания STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Името трябва да е уникално -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} пречи +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} пречи # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} местните власти отказват да позволят това diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index e6dec793a6..903b0e0f52 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -3330,7 +3330,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... ja c STR_ERROR_OWNED_BY :{WHITE}... propietat de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... l'àrea és propietat d'una altra companyia STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}El nom ha de ser únic -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} en el camí +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} en el camí # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Les autoritats locals de {TOWN} no permeten fer això diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 70a9278564..b70fe43306 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -3425,7 +3425,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...već STR_ERROR_OWNED_BY :{WHITE}...u vlasništvu {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...područje je u vlasništvu druge tvrtke STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Ime mora biti jedinstveno -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} na putu +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} na putu # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} lokalna samouprava odbija to dopustiti diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 52a0326f26..8a75cac7e0 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -3403,7 +3403,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... již STR_ERROR_OWNED_BY :{WHITE}... vlastněno {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... území vlastní jiná společnost STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Jméno musí být jedinečné -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} v cestě +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} v cestě # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Místní správa města {TOWN} odmítla vydat povolení. diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 185679c467..eaf6ffd79d 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -3321,7 +3321,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...aller STR_ERROR_OWNED_BY :{WHITE}... ejes af {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... området ejes af et andet selskab STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Navnet skal være unikt -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} i vejen +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} i vejen # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} de lokale myndigheder nægter at tillade dette diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 8b621fc44c..1af42cf7fb 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... reed STR_ERROR_OWNED_BY :{WHITE}... is eigendom van {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... gebied is van ander bedrijf STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Naam moet uniek zijn -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} in de weg +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} in de weg # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}De gemeenteraad van {TOWN} staat dit niet toe diff --git a/src/lang/english.txt b/src/lang/english.txt index 921215d4c6..5ed00087ca 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3332,7 +3332,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... alre STR_ERROR_OWNED_BY :{WHITE}... owned by {STRING2} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... area is owned by another company STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Name must be unique -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} in the way +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} in the way # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} local authority refuses to allow this diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 9737fddb4f..446c45b7be 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... alre STR_ERROR_OWNED_BY :{WHITE}... owned by {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... area is owned by another company STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Name must be unique -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} in the way +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} in the way # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} local authority refuses to allow this diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index cd8068274b..5a23f79b89 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -2859,7 +2859,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... jam STR_ERROR_OWNED_BY :{WHITE}... posedata de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...regiono estas posedata de alia kompanio STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nomo devas esti ununura -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} okupas la lokon +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} okupas la lokon # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}La loka estraro de {TOWN} rifuzas permesi ĉi tion diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index dec7a0364e..7f22b0ff89 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -3367,7 +3367,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...juba STR_ERROR_OWNED_BY :{WHITE}...omanik on {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...ala kuulub teisele ettevõttele STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nime ei tohi korduda -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} on ees +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} on ees # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} kohalik omavalitsus keeldub seda lubamast diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 42f2fb04ed..b530352593 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...se on STR_ERROR_OWNED_BY :{WHITE}... omistaja: {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... alueen omistaa toinen yhtiö STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nimen täytyy olla uniikki -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} on tiellä. +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} on tiellä. # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}: paikallisviranomaiset kieltäytyvät. diff --git a/src/lang/french.txt b/src/lang/french.txt index b42007cfce..5fe6cfb96c 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -3330,7 +3330,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... déj STR_ERROR_OWNED_BY :{WHITE}... appartient à {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... appartient à une autre compagnie STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Le nom doit être unique -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} présente +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} présente # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}La municipalité de {TOWN} refuse cette opération diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 261a9d6628..3b09404f9a 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -3227,7 +3227,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...xa es STR_ERROR_OWNED_BY :{WHITE}...é propiedade de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...a área é propiedade doutra compañía STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}O nome debe ser único -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} no camiño +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} no camiño # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}: a autoridade local négase a permitilo diff --git a/src/lang/german.txt b/src/lang/german.txt index dabf6861ab..1593d5bae2 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -3330,7 +3330,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... ist STR_ERROR_OWNED_BY :{WHITE}... Eigentum von {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... Gelände gehört einer anderen Firma STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Name bereits vergeben -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} im Weg +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} im Weg # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Die Stadtverwaltung von {TOWN} erteilt keine Genehmigung diff --git a/src/lang/greek.txt b/src/lang/greek.txt index ec7adfd498..4511389200 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -3428,7 +3428,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... ήδ STR_ERROR_OWNED_BY :{WHITE}... ιδιοκτησία του {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... αυτή η περιοχή είναι ιδιοκτησία άλλης εταιρίας STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Το όνομα πρέπει να είναι μοναδικό -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} στη μέση +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} στη μέση # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Οι τοπικές αρχές της πόλης {TOWN} δεν το επιτρέπουν diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 9cde2f8243..437f6ed025 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -3343,7 +3343,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... כב STR_ERROR_OWNED_BY :{WHITE}... בבעלות {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... השטח בבעלותה של חברה אחרת STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}השם חייב להיות ייחודי -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}חוסם את הדרך {STRING} +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}חוסם את הדרך {1:STRING} # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE} הרשות המקומית של {TOWN} מתנגדת לפעולה זו diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 800c53de7a..30f6bf2a80 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -3363,7 +3363,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...már STR_ERROR_OWNED_BY :{WHITE}... {STRING} tulajdona STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...a terület más cégé STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}A névnek egyedinek kell lennie -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}...{STRING} van az útban +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}...{1:STRING} van az útban # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} önkormányzata nem engedélyezi diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 0b35de0e0a..27d9d04493 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -3217,7 +3217,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...nú STR_ERROR_OWNED_BY :{WHITE}...í eigu {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...svæðið er í eigu annars fyrirtækis STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nafnið verður að vera sérstætt -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} er fyrir +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} er fyrir # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} bæjaryfirvöld leyfa þetta ekki diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index af964633a5..aeba84d918 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...sudah STR_ERROR_OWNED_BY :{WHITE}...dimiliki oleh {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...area ini dimiliki oleh perusahaan lain STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nama haruslah unik -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :terhalang {WHITE}{STRING} +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :terhalang {WHITE}{1:STRING} # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Pemkot {TOWN} tidak mengijinkan anda melakukan ini diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 893e8bee40..2b137e7554 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -3331,7 +3331,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... già STR_ERROR_OWNED_BY :{WHITE}... posseduto da {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... l'area appartiene a un'altra compagnia STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Il nome deve essere univoco -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} di mezzo +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} di mezzo # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}L'autorità locale di {TOWN} non lo autorizza diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index de666c3f7a..121ee49e93 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -3237,7 +3237,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...す STR_ERROR_OWNED_BY :{WHITE}...所有者は {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...この土地は他の会社に所有されています STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}名前は唯一でなければなりません -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING}があります +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING}があります # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}の町議会が拒否しました。 diff --git a/src/lang/korean.txt b/src/lang/korean.txt index ed03b25f6b..ebbb68601d 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -3330,7 +3330,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...이 STR_ERROR_OWNED_BY :{WHITE}... {STRING}의 소유입니다. STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...다른 회사의 소유지입니다! STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}이름은 유일해야 합니다 -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}중간에 {STRING}{G 0 "이" "가"} 있습니다. +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}중간에 {1:STRING}{G 1 "이" "가"} 있습니다. # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}에 대한 낮은 성취도로 인해 지역당국이 이 행위를 거절했습니다! diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 4ae6458e2b..b2d96c79d0 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -3237,7 +3237,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...jau u STR_ERROR_OWNED_BY :{WHITE}... pieder {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... zemes gabals pieder citam uzņēmumam STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Vārdam jābūt unikālam -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} traucē +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} traucē # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} vietējā pašvaldība neatļauj šādu rīcību diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index db2388106a..74f7f69188 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -3397,7 +3397,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... jau STR_ERROR_OWNED_BY :{WHITE}... priklauso {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... ši žemė priklauso kitai įmonei STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Vardas turi būti unikalus -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} kelyje +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} kelyje # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} vietos valdžia neleidžia diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 20845638dc..b6387501a2 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...schon STR_ERROR_OWNED_BY :{WHITE}...am Besëtz vun {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...d'Plaz ass am Besëtz vun enger aanerer Firma STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Numm muss eenzegartëg sinn -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} am Wee +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} am Wee # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} d'Gemeng wëll dat net erlaaben diff --git a/src/lang/malay.txt b/src/lang/malay.txt index f2e7f1da6b..b5045dce55 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -3052,7 +3052,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... suda STR_ERROR_OWNED_BY :{WHITE}... dimiliki oleh {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... kawasan dimiliki oleh syarikat lain STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nama mesti unik -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} menghalang +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} menghalang # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} majlis tempatan tidak membenarkannya diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index a89eaa8c1b..a5dd40ba4b 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... alle STR_ERROR_OWNED_BY :{WHITE}... eies av {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... området eies av et annet firma STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Navn må være unikt -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} er i veien +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} er i veien # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN}s bystyre nekter deg å gjøre dette. diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index fd291c0a17..26db0edf6d 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -3330,7 +3330,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... alle STR_ERROR_OWNED_BY :{WHITE}... eigd av {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... feltet er eigd av eit anna firma STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Namnet må vera unikt -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} er i vegen +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} er i vegen # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Bystyret i {TOWN} nektar deg å gjere dette diff --git a/src/lang/polish.txt b/src/lang/polish.txt index d6095c05ef..228dd7382c 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -3713,7 +3713,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...już STR_ERROR_OWNED_BY :{WHITE}...w posiadaniu {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...teren jest własnością innej firmy STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nazwa nie może się powtarzać -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} na drodze +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} na drodze # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Lokalne władze {TOWN} nie pozwalają na to diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index e7d4c0a8c4..b89359216d 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... já STR_ERROR_OWNED_BY :{WHITE}... propriedade de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... a área é propriedade de outra empresa STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Nome deve ser único -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} no caminho +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} no caminho # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}A autoridade local de {TOWN} não autoriza diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index b0efbdfeb2..9c55fcb50a 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...deja STR_ERROR_OWNED_BY :{WHITE}...apartine companiei {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...terenul se află în proprietatea altei companii STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Numele trebuie să fie unic -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} în cale +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} în cale # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Autorităţile locale din {TOWN} refuză să permită această acţiune diff --git a/src/lang/russian.txt b/src/lang/russian.txt index cc04745a53..796c66ed6f 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -3509,7 +3509,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... уж STR_ERROR_OWNED_BY :{WHITE}... принадлежит {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... область принадлежит другой компании STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Имя должно быть уникальным -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} на пути +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} на пути # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}...администрация города {TOWN} запрещает вам это делать diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index a52110df15..fe0f2b9413 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -3524,7 +3524,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...već STR_ERROR_OWNED_BY :{WHITE}...je u vlasništvu igrača {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...zemljište je u vlasništvu drugog preduzeća STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Naziv mora biti jedinstven -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} je na putu +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} je na putu # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} vlast odbija da izda dozvolu diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 43b82e41e5..1961ffe4ce 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -3312,7 +3312,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... 已 STR_ERROR_OWNED_BY :{WHITE} 归 {STRING} 所有 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... 此区域由另一公司所有 STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}名称重复!请重新命名. -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}目标位置有 {STRING} +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}目标位置有 {1:STRING} # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} 地方政府不批准此操作…… diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 782b2b90b2..fd4bd701a8 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -3396,7 +3396,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... uz b STR_ERROR_OWNED_BY :{WHITE}... vlastníkom je {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... oblasť vlastní iná spoločnosť STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Meno musí byt jedinecné -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} v ceste +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} v ceste # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Miestna správa {TOWN} to nedovolí diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index d242b1e32f..d000d304cd 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -3371,7 +3371,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... že STR_ERROR_OWNED_BY :{WHITE}... v lasti {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... zemljišče je last drugega podjetja STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Ime mora biti edinstveno -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} na poti +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} na poti # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} mestna oblast tega ne dovoli diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index ea593539ca..a1d2bbc671 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -3330,7 +3330,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... ya c STR_ERROR_OWNED_BY :{WHITE}... propiedad de {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... otra empresa posee esta área STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}El nombre debe ser único -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} en medio +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} en medio # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Las autoridades locales de {TOWN} rechazan esto diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 74b8d67117..9db0b60715 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -3323,7 +3323,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... reda STR_ERROR_OWNED_BY :{WHITE}... ägs av {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... området ägs av ett annat företag STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Namnet måste vara unikt -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} i vägen +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} i vägen # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} de lokala myndigheterna tillåter inte detta diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index cb86e7e56a..cfbc15bf3a 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... 已 STR_ERROR_OWNED_BY :{WHITE}... 所有者是 {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... 此區域屬於其它公司所有 STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}名稱必須是唯一的 -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}被 {STRING} 擋住 +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}被 {1:STRING} 擋住 # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} 地方政府不同意 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index db3112ccee..aef8f69b5e 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -3324,7 +3324,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... zate STR_ERROR_OWNED_BY :{WHITE}... sahibi {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... alan başka bir şirkete ait STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}İsim daha önce kullanılmamış olmalı -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}yolda {STRING} var +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}yolda {1:STRING} var # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} belediyesi buna izin vermiyor diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 409d4cbbbb..278a7d11f0 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -3448,7 +3448,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... вж STR_ERROR_OWNED_BY :{WHITE}... власність {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... ділянка у власності іншої компанії STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Назва має бути унікальною -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} на шляху +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} на шляху # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Влада міста {TOWN} проти цього diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index a04e32ebc7..156165392f 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -1772,7 +1772,7 @@ STR_ERROR_SITE_UNSUITABLE :{WHITE}...terre STR_ERROR_ALREADY_BUILT :{WHITE}...is al bout STR_ERROR_OWNED_BY :{WHITE}...is fan {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...gebiet is fan in oar bedriuw -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} yn it paad +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} yn it paad # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}{TOWN} gemiente stiet dit net ta diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 9bf7df5116..51b357a63b 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -3329,7 +3329,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... đã STR_ERROR_OWNED_BY :{WHITE}... sở hữu bởi {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... vùng này sở hữu bởi công ty khác STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Tên phải không trùng lặp -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} đang có trên đường +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} đang có trên đường # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Chính quyền {TOWN} từ chối bạn làm việc này diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index ff370126fd..eccd5fe34d 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -3220,7 +3220,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}...eisoe STR_ERROR_OWNED_BY :{WHITE}...eiddo {STRING} STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...mae'r ardal yn eiddo i gwmni arall STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Rhaid i'r enw fod yn unigryw -STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{STRING} yn y ffordd +STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} yn y ffordd # Local authority errors STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}Nid yw awdurdod lleol {TOWN}yn caniatáu hyn diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp index b5177d6ada..7e9dea5d40 100644 --- a/src/network/network_content.cpp +++ b/src/network/network_content.cpp @@ -481,6 +481,12 @@ void ClientNetworkContentSocketHandler::AfterDownload() TarListAddFile(GetFullFilename(this->curInfo, false)); + if (this->curInfo->type == CONTENT_TYPE_BASE_MUSIC) { + /* Music can't be in a tar. So extract the tar! */ + ExtractTar(GetFullFilename(this->curInfo, false)); + unlink(GetFullFilename(this->curInfo, false)); + } + this->OnDownloadComplete(this->curInfo->id); } else { ShowErrorMessage(STR_CONTENT_ERROR_COULD_NOT_EXTRACT, INVALID_STRING_ID, 0, 0); diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp index bb77aea6d5..9a936287b1 100644 --- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -106,6 +106,11 @@ public: SetWindowDirty(WC_GAME_OPTIONS, 0); break; + case CONTENT_TYPE_BASE_MUSIC: + BaseMusic::FindSets(); + SetWindowDirty(WC_GAME_OPTIONS, 0); + break; + case CONTENT_TYPE_NEWGRF: ScanNewGRFFiles(); /* Yes... these are the NewGRF windows */ diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index b08564e7ba..89c83ce119 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -3242,7 +3242,7 @@ CommandCost ClearTile_Station(TileIndex tile, DoCommandFlag flags) case STATION_BUOY: return_cmd_error(STR_ERROR_BUOY_IN_THE_WAY); case STATION_DOCK: return_cmd_error(STR_ERROR_MUST_DEMOLISH_DOCK_FIRST); case STATION_OILRIG: - SetDParam(0, STR_INDUSTRY_NAME_OIL_RIG); + SetDParam(1, STR_INDUSTRY_NAME_OIL_RIG); return_cmd_error(STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY); } } diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp index 1048ac09c6..22450bddfe 100644 --- a/src/strgen/strgen.cpp +++ b/src/strgen/strgen.cpp @@ -399,8 +399,8 @@ static void EmitGender(char *buf, int value) if (!ParseRelNum(&buf, &argidx, &offset)) {} const CmdStruct *cmd = _cur_pcs.cmd[argidx]; - if ((cmd->flags & C_GENDER) == 0) { - error("Command '%s' can't have a gender", cmd->cmd); + if (cmd == NULL || (cmd->flags & C_GENDER) == 0) { + error("Command '%s' can't have a gender", cmd == NULL ? "" : cmd->cmd); } for (nw = 0; nw < MAX_NUM_GENDER; nw++) {