diff options
| author | frosch <frosch@openttd.org> | 2010-03-21 15:16:05 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2010-03-21 15:16:05 +0000 |
| commit | 475c2959bd119190d2c5f2196717de2f8849c99b (patch) | |
| tree | 1d22baf0ae45b79a996425fd7293a4ec58d5fa26 /src | |
| parent | e188c5d87c2092a7fd711493d6f7f045c0c9783b (diff) | |
| download | openttd-475c2959bd119190d2c5f2196717de2f8849c99b.tar.xz | |
(svn r19499) -Remove: same_industry_close setting did not do what it said and caused NewGRF trouble.
Diffstat (limited to 'src')
51 files changed, 4 insertions, 69 deletions
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 27ba3f364..bbf000ba6 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1518,35 +1518,19 @@ static bool CheckIfCanLevelIndustryPlatform(TileIndex tile, DoCommandFlag flags, } -/** Check that the new industry is far enough from other industries. +/** Check that the new industry is far enough from conflicting industries. * @param tile Tile to construct the industry. * @param type Type of the new industry. * @return Succeeded or failed command. */ -static CommandCost CheckIfFarEnoughFromIndustry(TileIndex tile, int type) +static CommandCost CheckIfFarEnoughFromConflictingIndustry(TileIndex tile, int type) { const IndustrySpec *indspec = GetIndustrySpec(type); - - if (_settings_game.economy.same_industry_close && indspec->IsRawIndustry()) { - /* Allow primary industries to be placed close to any other industry */ - return CommandCost(); - } - const Industry *i; FOR_ALL_INDUSTRIES(i) { /* Within 14 tiles from another industry is considered close */ if (DistanceMax(tile, i->location.tile) > 14) continue; - /* check if an industry that accepts the same goods is nearby */ - if (!indspec->IsRawIndustry() && // not a primary industry? - indspec->accepts_cargo[0] == i->accepts_cargo[0] && ( - /* at least one of those options must be true */ - _game_mode != GM_EDITOR || // editor must not be stopped - !_settings_game.economy.same_industry_close || - !_settings_game.economy.multiple_industry_per_town)) { - return_cmd_error(STR_ERROR_INDUSTRY_TOO_CLOSE); - } - /* check if there are any conflicting industry types around */ if (i->type == indspec->conflicting[0] || i->type == indspec->conflicting[1] || @@ -1732,7 +1716,7 @@ static CommandCost CreateNewIndustryHelper(TileIndex tile, IndustryType type, Do return_cmd_error(STR_ERROR_SITE_UNSUITABLE); } - ret = CheckIfFarEnoughFromIndustry(tile, type); + ret = CheckIfFarEnoughFromConflictingIndustry(tile, type); if (ret.Failed()) return ret; const Town *t = NULL; diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index c7a0088a5..4f217ad9a 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :geen STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :as ander nywerhede STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :vooruitsigting STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Laat meer as een soortgelyke nywerhede per dorp toe: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Nywerhede van die selfde tipe kan naby aan mekaar gebou word: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Toon altyd lang datum in die standbaan: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Toon seine op die bestuur kant: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Toon finansies venster op die einde van die jaar: {ORANGE}{STRING} diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 6d68f7f58..d387cce27 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :بدون STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :ككل المصانع الأخرى STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :تنقيب STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}السماح بوجود اكثر من مصنع من نفس النوع في المدينة الواحدة: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}من الممكن بناء مصانع من نفس النوع بجوار بعض: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}استخدام التاريخ الطويل في لوحة العرض دائما: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}اظهار الاشارات على جهة السائق: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}أعرض نافذة المالية في آخر السنه: {ORANGE}{STRING} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index dbe0628a5..46f9b4cc8 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1104,7 +1104,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :nenhum STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :como as outras indústrias STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :em prospecção STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Permitir várias indústrias semelhantes por cidade: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Indústrias do mesmo tipo podem ser construídas próximas: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Sempre exibir a data completa na barra de estado: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Exibir sinais no lado da circulação: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Exibir janela das finanças no fim do ano: {ORANGE}{STRING} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 4604c911a..54d2c4ff1 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1105,7 +1105,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :нищо STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :като други промишлености STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :предстоящ STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Няколко еднакви индустрии на град: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Индустрии от еднакъв тип могат да бъдат строени близо една до друга: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Дълга дата в лента за състоянието: {ORANGE}{STRING.f} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Семафорите от страната на пътното движение: {ORANGE}{STRING.n} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Финансов отчет в края на годината: {ORANGE}{STRING.m} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 6db49783a..f6efb25d8 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1104,7 +1104,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :cap STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :com les altres indústries STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospeccionant STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Permet vàries indústries similars a cada població: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Permet construir indústries del mateix tipus unes aprop de les altres: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Mostra sempre la data llarga a la barra d'estat: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Mostra senyals en el sentit de la marxa: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Mostra la finestra de balanç al finalitzar cada any: {ORANGE}{STRING} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index a61d0c9ca..a3b76960e 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1199,7 +1199,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :nijedna STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :kao i druge industrije STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prosperirajuća STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Dopusti više sličnih industrija po gradu: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industrije iste vrste mogu biti izgrađene u blizini jedna druge: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Uvijek pokaži dugi datum u statusnoj traci: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Pokaži signale na vozačkoj strani: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Pokaži financijski prozor na kraju godine: {ORANGE}{STRING} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 0979b590c..8aab970e2 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1171,7 +1171,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :žádný STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :jako u ostatniho průmyslu STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :průzkum STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Povolit více stejného průmyslu kolem jednoho města: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Průmysl stejného druhu může být budován poblíž sebe: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Ukazovat dlouhé datum ve stavové liště: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Ukazovat semafory na straně, kde jezdí silniční vozidla: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Ukazovat finanční okno na konci každého roku: {ORANGE}{STRING} diff --git a/src/lang/danish.txt b/src/lang/danish.txt index ca3be233b..9113bcc48 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1098,7 +1098,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :ingen STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :som andre industrier STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :efterforskning STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Tillad flere af samme slags industri per by: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Tillad flere af samme type industri tæt på hinanden: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Vis altid lang dato i statusbaren: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Vis signaler i kørselssiden: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Vis finansvinduet i slutningen af året: {ORANGE}{STRING} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 3a32bb8d0..c2def704a 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :geen STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :zoals andere industrieën STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :proberen STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Meerdere vergelijkbare industrieën per stad toestaan: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industrieën van hetzelfde type dicht bij elkaar toestaan: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Altijd lange datum in statusbalk weergeven: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Seinen aan rijzijde plaatsen: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Financieel overzicht aan het eind van het jaar weergeven: {ORANGE}{STRING} diff --git a/src/lang/english.txt b/src/lang/english.txt index b87288228..86f0fe16d 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :none STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :as other industries STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospecting STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING1} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industries of the same type can be built close to each other: {ORANGE}{STRING1} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING1} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING1} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING1} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 26aed3bb6..1fec9dccd 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1102,7 +1102,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :none STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :as other industries STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospecting STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industries of the same type can be built close to each other: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index d78a40c83..5ea566d40 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1097,7 +1097,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :neniu STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :kiel aliaj industrioj STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospektori STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Permesu pliajn similajn industriojn en la sama urbo: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Samtipaj industrioj povas esti konstruataj proksime unu de la alia: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Ĉiam montru longan daton en la statbreto: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Montru signalojn veturflanke: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Montru financan fenestron fine de la jaro: {ORANGE}{STRING} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index eae30346b..85a087e76 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1160,7 +1160,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :pole STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :nagu muud tööstused STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :eeluuringutega STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Samalaadsed tööstused ühes linnas: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Samalaadsed tööstused lähestiku: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Täispikk kuupäev olekuribal: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Signaalide paigutamine sõidusuunda: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Aastalõpu rahavoogude aruanne: {ORANGE}{STRING} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index afc562c57..87eed5767 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :ei mikään STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :kuten muut tehtaat STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :koekaivaus STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Kaupungissa voi olla useita samanlaisia teollisuustyyppejä: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Samantyyppistä teollisuutta voidaan rakentaa lähekkäin: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Näytä aina koko päiväys tilapalkissa: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Näytä opastimet ajokaistalla: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Näytä rahoitusikkuna vuoden lopussa: {ORANGE}{STRING} diff --git a/src/lang/french.txt b/src/lang/french.txt index 86e5640c5..d29886d27 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1104,7 +1104,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :aucune STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :comme les autres industries STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospection STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Permettre plusieurs industries similaires par ville{NBSP}: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Permettre plusieurs industries similaires à proximité{NBSP}: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Afficher la date complète dans la barre d'état{NBSP}: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Signaux ferroviaires du côté du sens de conduite{NBSP}: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Afficher le bilan de finances en fin d'année{NBSP}: {ORANGE}{STRING} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 0b454db24..15ec6439a 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1082,7 +1082,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :ningún STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :coma outras industrias STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospección STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Permitir múltiples industrias similares en cada cidade: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Permiti-la construción de industrias iguais cercanas: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Mostrar sempre a data longa na barra de estado: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Mostrar sinais no lado de conducción: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Mostra-la fiestra de finanzas ó final do ano: {ORANGE}{STRING} diff --git a/src/lang/german.txt b/src/lang/german.txt index a03af8aa2..4cad7c433 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1104,7 +1104,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :Nicht erlaubt STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :Wie andere Industrien STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :Durch Prospektion STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Mehrere gleichartige Industrien pro Stadt erlauben: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Gleiche Industrien können nahe beieinander gebaut werden: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Lange Datumsanzeige in der Statusleiste (links unten): {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Signale auf der Seite der Straßenverkehrsrichtung anzeigen: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Zeige Firmenfinanzen am Ende des Jahres: {ORANGE}{STRING} diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 99005c505..c20601cfd 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1198,7 +1198,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :κανένα STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :όπως σε άλλες βιομηχανίες STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :επικείμενη STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Επιτρέπονται πολλαπλές όμοιες βιομηχανίες ανα πόλη: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Βιομηχανίες ίδου τύπου μπορούν να χτιστούν κοντά η μία στην άλλη: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Εμφάνιση ολόκληρης ημερομηνίας στη γραμμή κατάστασης: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Εμφάνιση σήμανσης στην πλευρά οδήγησης: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Εμφάνιση παράθυρου οικονομικών στο τέλος του έτους: {ORANGE}{STRING} diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 97783874d..ed85487b8 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1117,7 +1117,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :בכלל לא STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :כמו שאר התעשיות STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :חיפוש אחר התעשיות STR_CONFIG_SETTING_MULTIPINDTOWN :{ORANGE}{STRING}{LTBLUE} :אפשר יצירת מספר תעשיות זהות בשטחה של עיר אחת -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}:תעשיות מאותו הסוג יכולים להבנות אחד ליד השני {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}תמיד תראה תאריך מלא בסגל הסטטוס: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}הראה רמזורים בצד הנהיגה: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}הראה את חלון מערך הכספים בכל סוף שנה : {ORANGE}{STRING} diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index be733d9dc..18889c0de 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1167,7 +1167,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :nincs STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :mint általában STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :kutatás támogatása STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Több ugyanolyan gazdasági épület településenként: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Több ugyanolyan gazdasági épület építhető közel egymáshoz: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Mindig teljes dátum a képernyőn: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Jelzők a menetirány szerinti oldalon legyenek: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Pénzügyi összesítés minden év végén: {ORANGE}{STRING} diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index dc1acfed1..eadbd890c 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1092,7 +1092,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :engin STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :eins og annarra iðnaða STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :með jarðefnisleit STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Leyfa marga svipaða iðnaði í sama bæ: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Má byggja iðnaði af sömu gerð nálægt hvor öðrum: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Sýna alltaf fulla dagsetningu á upplýsingaslá: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Sýna umferðarljós akstursmegin: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Sýna fjármálaglugga í lok árs: {ORANGE}{STRING} diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 58cd780bd..0028ebea2 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :tidak ada STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :seperti industri lainnya STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :lebih prospektif STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Ijinkan lebih dari satu industri sejenis dalam satu kota: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industri dengan tipe sama dapat dibangun saling berdekatan: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Selalu tampilkan tgl lengkap pada status bar: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Tampilkan sinyal pada lajur kendara: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Tampilkan laporan keuangan pada akhir tahun: {ORANGE}{STRING} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 3ce9f8a5c..245b9a870 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1105,7 +1105,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :Non permessa STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :Come le altre industrie STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :Previa prospezione STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Consenti più industrie dello stesso tipo nella stessa città: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Consenti la costruzione di industrie uguali anche molto vicine: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Mostra sempre la data lunga nella barra di stato: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Mostra i segnali sul lato di guida: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Mostra la finestra delle finanze alla fine dell'anno: {ORANGE}{STRING} diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 09a23297b..491d55990 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1102,7 +1102,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :なし STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :他の産業と同様 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :探鉱 STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}町内に重複している産業の建設を許容：{ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}同類の産業を近くに建設することを許容：{ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}常に状況バーに長型日付を表示：{ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}信号を運転側に表示：{ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}年末に財政ウインドウを表示：{ORANGE}{STRING} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index f26151b40..0695c86d3 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1104,7 +1104,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :없음 (건설 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :건설 가능 (위치 선택 가능, 7배 비용) STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :건설 가능 (무작위 위치) STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}한 도시에 비슷한 산업시설을 여러 개 건설할 수 있게 허용 : {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}같은 종류의 산업 시설을 가깝게 지을 수 있게 허용 : {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}날짜를 일(日)단위까지 상세하게 표시 : {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}신호기를 차량 통행 방향에 설치 : {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}연말에 재정 창을 띄움 : {ORANGE}{STRING} diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index c4ced0715..3b37b4c63 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1075,7 +1075,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :nav STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :kā citas industrijas STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :ienesīga STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Atļaut vairākas līdzīgas rūpnīcas vienā pilsētā : {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Viena veida rūpnīcas var būvēt tuvu vienu otrai: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Vienmēr rādīt garu datumu statusa joslā: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Rādīt signālus braukšanas pusē: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Gada beigās rādīt finanšu pārskatu: {ORANGE}{STRING} diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 3dd6d7feb..791bd28be 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1178,7 +1178,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :nėra STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :kaip kitos gamyklos STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :vaizdavimas STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Leisti kelias panašias pramonės įmones viename mieste: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Leisti statyti to paties tipo fabrikus arti vienas kito: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Rodyti pilną datą būsenos eilutėje: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Šviesoforus rodyti vairuotojo pusėje: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Rodyti finansinę ataskaitą metų pabaigoje: {ORANGE}{STRING} diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index faf6a5310..603ccc586 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :keng STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :wei aaner Industrien STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :Erkundung STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Erlaabt méi der selwecht Industrien pro Stad: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industrien vum gläichen Typ kënnen méi no beieneen gebaut ginn: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Emmer den laangen Datum an der Statusbar uweisen: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Weis d'Signaler op der Fuerersäit: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Weis d'Finanzen um Ënn vum Joër: {ORANGE}{STRING} diff --git a/src/lang/malay.txt b/src/lang/malay.txt index f1cf902d6..bbbf658c6 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -1098,7 +1098,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :tiada STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :seperti industri lain STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :sedang prospek STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Benarkan pelbagai industri sejenis di setiap bandar: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industri sejenis boleh dibina berhampiran satu sama lain: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Sentiasa paparkan tarikh panjang di status bar: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Paparkan isyarat di sebelah pemandu: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Paparkan tetingkap kewangan setiap penghujung tahun: {ORANGE}{STRING} diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 4625c4493..f8efcd35e 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :ingen STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :som andre næringer STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospekterer STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Tillat flere like industrier i samme by: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industrier av samme type kan bygges nær hverandre: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Vis alltid lang dato på statuslinjen: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Vis signaler på kjøresiden: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Vis regnskap ved nyttår: {ORANGE}{STRING} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 2709fcaf0..48d52e995 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1104,7 +1104,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :inga STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :som andre industriar STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospekterar STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Tillet fleire like industriar i samme by: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industriar av same type kan byggjast nær einannan: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Syne alltid lang dato på statuslinja: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Syne signal i køyreretninga: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Syne rekneskap ved nyttår: {ORANGE}{STRING} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 2a1076841..2e3127ea0 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1483,7 +1483,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :budowa niedost STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :jak inne przedsiębiorstwa STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :przez poszukiwanie STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Pozwól na wiele podobnych przedsiębiorstw w mieście: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Przedsiębiorstwa jednego typu mogą być budowane obok siebie: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Zawsze pokazuj datę w długim formacie w pasku statusu: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Pokazuj sygnały po stronie jazdy: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Pokazuj okno finansów na koniec roku: {ORANGE}{STRING} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 2b733ea67..10b3cfb03 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :nenhum STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :como as outras indústrias STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospecção STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Permitir várias indústrias semelhantes por cidade: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Indústrias do mesmo tipo podem ser construídas perto: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Mostrar sempre a data completa na barra de estado: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Mostrar sinais no lado da circulação: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Mostrar janela das finanças no fim do ano: {ORANGE}{STRING} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index ad6311c86..7a8dabec1 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1102,7 +1102,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :niciuna STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :ca alte industrii STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :de prospecţie STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Permite mai multe industrii similare în acelaşi oras: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industrii identice pot fi construite în apropiere una de cealaltă: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Afişează întotdeauna data în format lung în bara de stare: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Afişează semafoarele pe partea de circulaţie: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Afişează finanţele la sfârşitul fiecărui an: {ORANGE}{STRING} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index afef20a49..117c54aeb 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1257,7 +1257,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :не созда STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :как и остальные STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :геологоразведка STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Разрешить несколько предприятий одного типа на город: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Одинаковые предприятия могут быть рядом друг с другом: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Всегда полная дата в панели состояния: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Показывать светофоры на стороне движения: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Показывать финансовую статистику каждый год: {ORANGE}{STRING} diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 1206c01b0..fbf9f606b 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -1298,7 +1298,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :nikakav STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :uobičajan STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :istraživački STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Dozvoljeno više industrija iste vrste na teritoriji jednog naselja: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Dozvoljena gradnja industrije iste vrste u blizini jeda drugoj: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Uvek prikazan pun datum na statusnoj liniji: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Prikazivanje semafora na strani smera voženje: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Prikazivanje finansijskog stanja na kraju godine: {ORANGE}{STRING} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index edd409e4c..8e17dca36 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1095,7 +1095,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :不允许 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :同其他工业 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :探矿式 STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}允许在一个城镇中建设多个同类工业设施：{ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}工业设施可以相邻：{ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}永远在状态栏中显示长日期：{ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}在列车前进的方向显示信号灯：{ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}在年终显示财务报表：{ORANGE}{STRING} diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index d10358ae3..a42f1136f 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1170,7 +1170,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :žiadny STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :normálny STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :vyhladávací STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Umožniť viac priemyslu rovnakého typu pri jednom meste: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Rovnaky priemysel moze byt stavany blizko seba: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Vždy zobraziť dlhý formát dátumu v stavovej lište: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Zobraziť železničné signály na tej strane, ako jazdia vozidlá: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Zobraziť rozpočet na konci roku: {ORANGE}{STRING} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 0897503ba..f677eb6e4 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1145,7 +1145,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :brez STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :kot ostale industrije STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :obetaven STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Dovoli več enakih industrij na mesto: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industrije enakega tipa lahko stojijo skupaj: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Vedno prikaži dolg datum v vrstici stanja: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Prikaz signalov na vozni smeri: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Prikaz okna financ na koncu leta: {ORANGE}{STRING} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 2b36371e1..3911409f0 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1104,7 +1104,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :ninguno STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :como las otras industrias STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospección STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Construcción de más de una industria similar por pueblo: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industrias mismo tipo pueden construirse unas junto a otras: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Mostrar siempre fecha larga en la barra de estado: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Mostrar señales en el lado de conducción: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Mostrar ventana de finanzas al final del año: {ORANGE}{STRING} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 827847ed1..c0868ab8e 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1098,7 +1098,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :Inget STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :Som andra industrier STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :Prospekterande STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Tillåt flera industrier av samma typ per stad: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Industrier av samma typ kan byggas nära varandra: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Visa alltid långt datum i statusfältet: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Visa signaler på körsidan: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Visa finansfönstret vid slutet av året: {ORANGE}{STRING} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 20fa2373d..36d793f37 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :無法建造 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :與其他工業相同 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :需探勘 STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}每個市鎮可擁有多個同類工業：{ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}同類工業興建距離不受限制：{ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}永遠於狀態列顯示長日期格式：{ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}於駕駛側顯示號誌：{ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}於年末顯示財政視窗：{ORANGE}{STRING} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 9a19aca35..031985b97 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1104,7 +1104,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :hiçbiri STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :diğer fabrikalar gibi STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :tetkik aramayla STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Bir şehirde birden fazla aynı fabrika olması izinli: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Aynı tür fabrikalar yan yana yapılabilir: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Durum çubuğunda uzun tarih göster: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Sinyalizasyon sürüş yönünde olsun: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Sene sonunda ekonomik durumu göster: {ORANGE}{STRING} diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index c78f072f3..4ad1b9fb2 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1228,7 +1228,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :немає STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :як інша промисловість STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :перспективний STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Подібна промисловість в одному місті: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Будувати промисловість однакового типу поруч: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Завжди показувати повну дату в рядку стану: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Показувати сигнали за напрямом руху: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Показувати вікно фінансів в кінці року: {ORANGE}{STRING} diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt index 32313bf60..a86dd0018 100644 --- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -1050,7 +1050,6 @@ STR_CONFIG_SETTING_GOTODEPOT :{LTBLUE}อน STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :ไม่เลย STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :ตามอุตสาหกรรมอื่นๆ STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}อนุญาตให้มีหลายอุตสาหกรรมต่อหนึ่งเมือง: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}อุตสาหกรรมชนิดเดียวกันสามารถสร้างใกล้กันได้: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}แสดงวันที่แบบยาวบนแถบสถานะเสมอ: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}แสดงสัญญาณบนฝั่งถนนมีการขับ: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}แสดงหน้าต่างการเงินเมื่อสิ้นสุดแต่ละปี: {ORANGE}{STRING} diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 46492986b..ed8bdb72a 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -1103,7 +1103,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :không STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :như nhà máy khác STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :hứa hẹn STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Cho phép nhiều nhà máy tương tự nhau trong mỗi đô thị: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Nhà máy cùng kiểu có thể xây sát nhau: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Luôn luôn hiện ngày tháng đầy đủ trên thanh trạng thái: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Hiển thị tín hiệu cùng phía làn đường: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Hiện bảng tài chính vào cuối năm: {ORANGE}{STRING} diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 4270d9ca2..b5b644b56 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1067,7 +1067,6 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :dim STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :fel diwydiannau eraill STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :chwilio am adnoddau crai STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Caniatáu nifer o ddiwydiannau bach i bob tref: {ORANGE}{STRING} -STR_CONFIG_SETTING_SAMEINDCLOSE :{LTBLUE}Gall diwydiannau o'r un math gael eu hadeiladu'n agos i'w gilydd: {ORANGE}{STRING} STR_CONFIG_SETTING_LONGDATE :{LTBLUE}Dangos y dyddiad hir yn y bar statws drwy'r amser: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Dangos signalau ar yr ochr yrru: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Dangos y ffenestr gyllid ar ddechrau'r flwyddyn: {ORANGE}{STRING} diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index d8e610b5d..77f1481d4 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1369,7 +1369,6 @@ static SettingsPage _settings_economy_towns_page = {_settings_economy_towns, len static SettingEntry _settings_economy_industries[] = { SettingEntry("construction.raw_industry_construction"), SettingEntry("economy.multiple_industry_per_town"), - SettingEntry("economy.same_industry_close"), SettingEntry("game_creation.oil_refinery_limit"), }; /** Industries sub-page */ diff --git a/src/settings_type.h b/src/settings_type.h index 4adabf0b5..8f22553d0 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -340,7 +340,6 @@ struct EconomySettings { bool give_money; ///< allow giving other companies money bool mod_road_rebuild; ///< roadworks remove unneccesary RoadBits bool multiple_industry_per_town; ///< allow many industries of the same type per town - bool same_industry_close; ///< allow same type industries to be built close to each other uint8 town_growth_rate; ///< town growth rate uint8 larger_towns; ///< the number of cities to build. These start off larger and grow twice as fast uint8 initial_city_size; ///< multiplier for the initial size of the cities compared to towns diff --git a/src/table/settings.h b/src/table/settings.h index 38f13915b..acb2d8522 100644 --- a/src/table/settings.h +++ b/src/table/settings.h @@ -429,7 +429,7 @@ const SettingDesc _settings[] = { SDT_BOOL(GameSettings, economy.inflation, 0, 0, true, STR_CONFIG_SETTING_INFLATION, NULL), SDT_VAR(GameSettings, construction.raw_industry_construction, SLE_UINT8, 0,MS, 0, 0, 2, 0, STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD, InvalidateBuildIndustryWindow), SDT_BOOL(GameSettings, economy.multiple_industry_per_town, 0, 0, false, STR_CONFIG_SETTING_MULTIPINDTOWN, NULL), - SDT_BOOL(GameSettings, economy.same_industry_close, 0, 0, false, STR_CONFIG_SETTING_SAMEINDCLOSE, NULL), + SDT_CONDNULL( 1, 0, 140), SDT_BOOL(GameSettings, economy.bribe, 0, 0, true, STR_CONFIG_SETTING_BRIBE, NULL), SDT_CONDBOOL(GameSettings, economy.exclusive_rights, 79, SL_MAX_VERSION, 0, 0, true, STR_CONFIG_SETTING_ALLOW_EXCLUSIVE, NULL), SDT_CONDBOOL(GameSettings, economy.give_money, 79, SL_MAX_VERSION, 0, 0, true, STR_CONFIG_SETTING_ALLOW_GIVE_MONEY, NULL), |