From 837833e450453a8b5cd492d3f9303f7b81454f42 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 26 Mar 2023 21:55:23 +0300 Subject: [PATCH] 4.5.13 --- .../jsons/translations/Afrikaans.properties | 5 ++++ .../jsons/translations/Belarusian.properties | 5 ++++ .../Brazilian_Portuguese.properties | 5 ++++ .../jsons/translations/Bulgarian.properties | 5 ++++ .../jsons/translations/Catalan.properties | 5 ++++ .../jsons/translations/Czech.properties | 5 ++++ .../jsons/translations/Dutch.properties | 23 ++++------------ .../jsons/translations/English.properties | 5 ++++ .../jsons/translations/Filipino.properties | 5 ++++ .../jsons/translations/Finnish.properties | 5 ++++ .../jsons/translations/French.properties | 6 ++++- .../jsons/translations/German.properties | 4 ++- .../jsons/translations/Greek.properties | 5 ++++ .../jsons/translations/Hungarian.properties | 5 ++++ .../jsons/translations/Indonesian.properties | 5 ++++ .../jsons/translations/Italian.properties | 5 ++++ .../jsons/translations/Japanese.properties | 5 ++++ .../jsons/translations/Korean.properties | 5 ++++ .../jsons/translations/Lithuanian.properties | 5 ++++ .../jsons/translations/Malay.properties | 5 ++++ .../Persian_(Pinglish-DIN).properties | 5 ++++ .../Persian_(Pinglish-UN).properties | 5 ++++ .../jsons/translations/Polish.properties | 6 ++++- .../jsons/translations/Portuguese.properties | 5 ++++ .../jsons/translations/Romanian.properties | 5 ++++ .../jsons/translations/Russian.properties | 5 ++++ .../Simplified_Chinese.properties | 5 ++++ .../jsons/translations/Spanish.properties | 5 ++++ .../jsons/translations/Swedish.properties | 5 ++++ .../Traditional_Chinese.properties | 5 ++++ .../jsons/translations/Turkish.properties | 5 ++++ .../jsons/translations/Ukrainian.properties | 5 ++++ .../jsons/translations/Vietnamese.properties | 5 ++++ .../completionPercentages.properties | 10 +++---- changelog.md | 24 ++++++----------- .../com/unciv/logic/trade/TradeEvaluation.kt | 2 +- docs/Modders/Creating-a-UI-skin.md | 5 ---- .../metadata/android/en-US/changelogs/838.txt | 26 ++++++------------- 38 files changed, 185 insertions(+), 66 deletions(-) diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties index 93e551bf9e..828661daa0 100644 --- a/android/assets/jsons/translations/Afrikaans.properties +++ b/android/assets/jsons/translations/Afrikaans.properties @@ -346,6 +346,8 @@ Four Corners = Vier Hoeke Archipelago = Argipel Inner Sea = Binnesee # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -914,9 +916,12 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = # Requires translation! +Map panning speed = + # Requires translation! Order trade offers by amount = # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties index c97c54385a..f07c8206a6 100644 --- a/android/assets/jsons/translations/Belarusian.properties +++ b/android/assets/jsons/translations/Belarusian.properties @@ -481,6 +481,8 @@ Archipelago = # Requires translation! Inner Sea = # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -1141,9 +1143,12 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = # Requires translation! +Map panning speed = + # Requires translation! Order trade offers by amount = # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 109144fb64..9b4576bb95 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -335,6 +335,8 @@ Three Continents = Três Continentes Four Corners = Quatro Cantos Archipelago = Arquipélago Inner Sea = Mar interno + # Requires translation! +Perlin = Random number of Civilizations = Número aleatório de civilizações Min number of Civilizations = Número mínimo de civilizações Max number of Civilizations = Número máximo de civilizações @@ -686,7 +688,10 @@ Landscape (fixed) = Paisagem (fixo) Portrait (fixed) = Retrato (fixo) Auto (sensor adjusted) = Automático (sensor ajustado) +### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = Rolagem automática do mapa com o mouse + # Requires translation! +Map panning speed = Order trade offers by amount = Ordenar ofertas de comércio por quantidade Experimental Demographics scoreboard = Placar de dados demográficos experimentais Unit icon opacity = Opacidade do ícone da unidade diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index bc5e20204f..cb8e60b60c 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -366,6 +366,8 @@ Three Continents = Три Континента Four Corners = Четири Ъгли Archipelago = Острови Inner Sea = Вътрешно Море + # Requires translation! +Perlin = Random number of Civilizations = Случаен брой Цивилизации Min number of Civilizations = Минимален брой Цивилизации Max number of Civilizations = Максимален брой Цивилизации @@ -792,8 +794,11 @@ Landscape (fixed) = Пейзаж (фиксиран) Portrait (fixed) = Портрет (фиксиран) Auto (sensor adjusted) = Автоматично (регулирано от сензора) +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Подредба на офертите за търговия по стойност # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index c4c9c5f587..b5d5a4f860 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -335,6 +335,8 @@ Three Continents = Tres continents Four Corners = Quatre cantonades Archipelago = Arxipèlag Inner Sea = Mar interior + # Requires translation! +Perlin = Random number of Civilizations = Nombre aleatori de civilitzacions Min number of Civilizations = Nombre mínim de civilitzacions Max number of Civilizations = Nombre màxim de civilitzacions @@ -692,7 +694,10 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = Moviment del mapa amb el ratolí + # Requires translation! +Map panning speed = Order trade offers by amount = Ordena les ofertes comercials per quantitat Experimental Demographics scoreboard = Utilitza la puntuació demogràfica experimental Unit icon opacity = Opacitat de les icones d’unitats diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index df547044a5..61d0642a16 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -335,6 +335,8 @@ Three Continents = Tři kontinenty Four Corners = Čtyři rohy Archipelago = Souostroví Inner Sea = Vnitřní moře + # Requires translation! +Perlin = Random number of Civilizations = Náhodný počet civilizací Min number of Civilizations = Minimální počet civilizací Max number of Civilizations = Maximální počet civilizací @@ -694,8 +696,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Řadit obchodní nabídky dle množství Experimental Demographics scoreboard = Experimentální demografický žebříček Unit icon opacity = Průhlednost ikony jednotky diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 8d08619943..bdebe85b77 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -101,9 +101,7 @@ Requires at least one of the following: = Vereist minstens één van de volgende Requires all of the following: = Vereist alle van de volgende: Leads to [techName] = Leidt tot [techName] Leads to: = Leidt tot: - # Requires translation! Enables: = Maakt mogelijk - # Requires translation! Disables: = Schakelt uit Current construction = Huidige bouwwerk @@ -340,6 +338,8 @@ Three Continents = 3 Continenten Four Corners = Vier Hoeken Archipelago = Archipel Inner Sea = Binnenzee + # Requires translation! +Perlin = Random number of Civilizations = Willekeurig aantal Beschavingen Min number of Civilizations = Minimaal aantal Beschavingen Max number of Civilizations = Maximaal aantal Beschavingen @@ -369,7 +369,6 @@ Time = Tijd Map Shape = Kaartvorm Enabled Map Shapes = Toegelaten kaartvormen Hexagonal = Hexagonaal - # Requires translation! Flat Earth Hexagonal = Hegagonaal platte aarde Rectangular = Vierkant Height = Hoogte @@ -379,7 +378,6 @@ Enable Espionage = Schakel spionage in Resource Setting = Grondstofinstelling Enabled Resource Settings = Toegelaten grondstofinstellingen - # Requires translation! Other Settings = Andere instellingen Sparse = Schaars Abundant = Overvloedig @@ -390,7 +388,6 @@ Advanced Settings = Geavanceerde instellingen RNG Seed = RNG kiemgetal Map Elevation = Maphoogte Temperature extremeness = Temparatuurextreemheid - # Requires translation! Temperature shift = Temperatuur verandering Resource richness = Grondstofrijkheid Vegetation richness = Vegetatierijkheid @@ -494,7 +491,6 @@ Tile Matching Criteria = # Requires translation! Complete match = Except improvements = Zonder verbeteringen - # Requires translation! Base and terrain features = Basis en terrein eigenschappen Base terrain only = Enkel basisterrein Land or water only = Enkel land of water @@ -632,24 +628,16 @@ Days = Dagen Server limit reached! Please wait for [time] seconds = Serverlimiet bereikt! Wacht alsjeblieft [time] seconden File could not be found on the multiplayer server = Het bestand bestaat niet op de multiplayer server Unhandled problem, [errorMessage] = Onbekend probleem: [errorMessage] - # Requires translation! Please enter your server password = Voer uw server wachtwoord in Set password = Zet wachtwoord Password must be at least 6 characters long = Wachtwoord moet ten minste 6 tekens lang zijn - # Requires translation! Failed to set password! = Kon geen wachtwoord instellen! - # Requires translation! Password set successfully for server [serverURL] = Wachtwoord succesvol ingesteld voor server [serverURL] Password = Wachtwoord - # Requires translation! Your userId is password secured = Uw gebruikersID is wachtwoord beveiligd - # Requires translation! Set a password to secure your userId = Stel wachtwoord in om uw gebruikersID te beveiligen - # Requires translation! Authenticate = Authenticeren - # Requires translation! This server does not support authentication = Deze server ondersteunt geen authenticatie - # Requires translation! Authentication failed = Authenticatie mislukt # Save game menu @@ -720,8 +708,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Sorteer handelsaanbiedingen naar hoeveelheid # Requires translation! Experimental Demographics scoreboard = @@ -736,7 +727,6 @@ Show tile yields = Toon tegelopbrengsten Show unit movement arrows = Toon eenheid bewegingspijlen Show pixel units = Toon gepixeleerde eenheden Show pixel improvements = Toon gepixeleerde verbeteringen - # Requires translation! Minimap size = Grootte minimap Show tutorials = Toon handleidingen @@ -1034,7 +1024,6 @@ due to our [unitName] being defeated by a [otherUnitName] = due to our [unitName] losing [amount] HP = # Requires translation! due to our [unitName] being promoted = - # Requires translation! from the ruins = van de ruines # World Screen UI @@ -1598,9 +1587,7 @@ Pillaging this improvement yields approximately [stats] = Deze verbetering plund # Requires translation! Needs removal of terrain features to be built = Unit type = Eenheidstype - # Requires translation! Units: = Eenheden - # Requires translation! Unit types = Eenheidstypes # Requires translation! Domain: [param] = diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index f208b307c9..f94857c634 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -604,6 +604,8 @@ Archipelago = # Requires translation! Inner Sea = # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -1263,9 +1265,12 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = # Requires translation! +Map panning speed = + # Requires translation! Order trade offers by amount = # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index 42e8af1ff9..7e1ad4fb70 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -339,6 +339,8 @@ Three Continents = Tatlong Kontinente Four Corners = Apat na Sulok Archipelago = Kapuluan Inner Sea = Panloob na Dagat + # Requires translation! +Perlin = Random number of Civilizations = Sapalarang bilang nga mga Sibilisasyon Min number of Civilizations = Pinakamababang bilang ng mga Sibilisasyon Max number of Civilizations = Pinakamataas na bilang ng mga Sibilisasyon @@ -692,7 +694,10 @@ Landscape (fixed) = Pahalang (di-nagbabago) Portrait (fixed) = Patayo (di-nagbabago) Auto (sensor adjusted) = Awtomatiko (inaayos ng sensor) +### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = Kusang pagscroll ng mouse sa mapa + # Requires translation! +Map panning speed = Order trade offers by amount = Magbigay ng alok ayon sa dami Experimental Demographics scoreboard = Eksperimental na Talaan ng mga Demograpiko Unit icon opacity = Linaw ng icon ng yunit diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 30839fbad7..259d96b4f2 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -396,6 +396,8 @@ Archipelago = Saaristo # Requires translation! Inner Sea = # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -929,8 +931,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Listaa kauppatarjoukset määrän mukaan # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index c431a44501..fa713f1a91 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -335,6 +335,8 @@ Three Continents = Trois continents Four Corners = Quatre coins Archipelago = Archipel Inner Sea = Mer intérieure + # Requires translation! +Perlin = Random number of Civilizations = Nombre aléatoire de Civilisations Min number of Civilizations = Nombre min. de Civilisations Max number of Civilizations = Nombre max. de Civilisations @@ -686,7 +688,10 @@ Landscape (fixed) = Paysage (fixe) Portrait (fixed) = Portrait (fixe) Auto (sensor adjusted) = Auto (capteurs) +### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = Défilement auto. de la carte avec la souris + # Requires translation! +Map panning speed = Order trade offers by amount = Classer les offres d'échange par valeur Experimental Demographics scoreboard = Tableau comparatif des scores Unit icon opacity = Opacité de l'icône des unités @@ -788,7 +793,6 @@ You need to restart the game for this change to take effect. = Redémarrage du j # Notifications Research of [technologyName] has completed! = Recherche de [technologyName] terminée ! - # Requires translation! We gained [amount] Science from Research Agreement = Nous avons gagné [amount] Science suite à notre Accord de Recherche [construction] has become obsolete and was removed from the queue in [cityName]! = [construction] est devenu(e) obsolète et a été retiré(e) de la file de construction de [cityName] ! [construction] has become obsolete and was removed from the queue in [amount] cities! = [construction] est devenu(e) obsolète et a été retiré(e) de la file de construction dans [amount] villes ! diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 7e8deac373..5b11875d3e 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -335,6 +335,8 @@ Three Continents = Drei Kontinente Four Corners = Vier Ecken Archipelago = Archipele Inner Sea = Binnenmeer + # Requires translation! +Perlin = Random number of Civilizations = Zufällige Anzahl von Zivilisationen Min number of Civilizations = Minimale Anzahl von Zivilisationen Max number of Civilizations = Maximale Anzahl von Zivilisationen @@ -686,6 +688,7 @@ Landscape (fixed) = Quer (fixiert) Portrait (fixed) = Hochkant (fixiert) Auto (sensor adjusted) = Auto (durch Sensor justiert) +### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = Karte durch Maus am Fensterrand verschieben Map panning speed = Geschwindigkeit der Kartenverschiebung Order trade offers by amount = Handelsangebote nach Menge sortieren @@ -789,7 +792,6 @@ You need to restart the game for this change to take effect. = Diese Änderung w # Notifications Research of [technologyName] has completed! = [technologyName] wurde erforscht! - # Requires translation! We gained [amount] Science from Research Agreement = Wir haben [amount] Wissenschaft von einer Forschungsvereinbarung erhalten [construction] has become obsolete and was removed from the queue in [cityName]! = [construction] ist veraltet und wurde in [cityName] aus der Warteschlange entfernt! [construction] has become obsolete and was removed from the queue in [amount] cities! = [construction] ist veraltet und wurde in [amount] Städten aus der Warteschlange entfernt! diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index 075c536c51..537a3bd47a 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -482,6 +482,8 @@ Four Corners = Τέσσερεις γωνίες Archipelago = Αρχιπέλαγο Inner Sea = Εσωτερική θάλασσα # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -1056,9 +1058,12 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = # Requires translation! +Map panning speed = + # Requires translation! Order trade offers by amount = # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index b8c7e5348d..1e3e80ce2a 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -335,6 +335,8 @@ Three Continents = Három földrész Four Corners = Négy sarok Archipelago = Szigetcsoport Inner Sea = Belső tenger + # Requires translation! +Perlin = Random number of Civilizations = Véletlen számú civilizáció Min number of Civilizations = A civilizációk számának minimuma Max number of Civilizations = A civilizációk számának maximuma @@ -686,7 +688,10 @@ Landscape (fixed) = Fekvő (rögzített) Portrait (fixed) = Álló (rögzített) Auto (sensor adjusted) = Automatikus (érzékelő választja) +### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = A pálya széle kövesse az egérkurzort + # Requires translation! +Map panning speed = Order trade offers by amount = Kereskedelmi ajánlatok mennyiség szerinti rendezése Experimental Demographics scoreboard = Demográfiai eredményjelző (kísérleti) Unit icon opacity = Egységek rajzainak átlátszatlansága diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index ddb3b0ab57..f5ba68062e 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -340,6 +340,8 @@ Three Continents = Tiga Benua Four Corners = Empat Penjuru Archipelago = Kepulauan Inner Sea = Laut Pedalaman + # Requires translation! +Perlin = Random number of Civilizations = Jumlah Peradaban acak Min number of Civilizations = Jumlah min Peradaban Max number of Civilizations = Jumlah maks Peradaban @@ -710,8 +712,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Susun penawaran perdagangan berdasarkan jumlah Experimental Demographics scoreboard = Papan Skor Demografik Eksperimental Unit icon opacity = Kegelapan ikon unit diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index bc85cf2348..43d7d96c01 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -338,6 +338,8 @@ Three Continents = Tre continenti Four Corners = Quattro angoli Archipelago = Arcipelago Inner Sea = Mare interno + # Requires translation! +Perlin = Random number of Civilizations = Numero casuale di Civiltà Min number of Civilizations = Limite minimo di Civiltà Max number of Civilizations = Limite massimo di Civiltà @@ -690,7 +692,10 @@ Landscape (fixed) = Panorama (fisso) Portrait (fixed) = Ritratto (fisso) Auto (sensor adjusted) = Automatico (sensori sistemati) +### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = Auto-scorrimento mappa col mouse + # Requires translation! +Map panning speed = Order trade offers by amount = Ordina offerte per quantità Experimental Demographics scoreboard = Punteggio demografico sperimentale Unit icon opacity = Opacità icone unità diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index db5a0bdc20..3eb7e7458f 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -347,6 +347,8 @@ Four Corners = 四大陸 Archipelago = 多島海 Inner Sea = 内海 # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -732,8 +734,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = 取引オファーを金額で注文 # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index baf2d2d651..b811e90a3e 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -340,6 +340,8 @@ Three Continents = 삼대륙 Four Corners = 사합점 Archipelago = 군도 Inner Sea = 내해 + # Requires translation! +Perlin = Random number of Civilizations = 문명 수 랜덤 Min number of Civilizations = 문명 수 최소 Max number of Civilizations = 문명 수 최대 @@ -710,8 +712,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = 거래 품목 갯수순 정렬 Experimental Demographics scoreboard = 인구통계학적 순위 보기 Unit icon opacity = 유닛 아이콘 투명도 diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index f7cea3d9e2..4056c992e6 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -349,6 +349,8 @@ Four Corners = Keturi Kampai Archipelago = Archipelagai Inner Sea = Vidinė jūra # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -732,8 +734,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Rūšiuoti prek. siūlymus pagal kiekį # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index ee84a1bd47..54de5c9925 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -434,6 +434,8 @@ Archipelago = Kepulauan # Requires translation! Inner Sea = # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -959,8 +961,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Pesan tawaran perdagangan mengikut jumlah # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 9e870cbcba..6098ec32d9 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -469,6 +469,8 @@ Archipelago = Majma’ol Jazāyer # Requires translation! Inner Sea = # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -1031,8 +1033,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Morattab kardan e pišnahād hāye tejāri az meğdārešoon # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index 089445a0cb..7a021ac6a9 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -425,6 +425,8 @@ Archipelago = Majma’ol Jazaayer # Requires translation! Inner Sea = # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -962,8 +964,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Morattab kardan e pishnahaad haaye tejaari az meghdaareshoon # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 9f27f7e2ae..116fe71318 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -335,6 +335,8 @@ Three Continents = Trzy kontynenty Four Corners = Cztery krańce Archipelago = Archipelag Inner Sea = Morze wewnętrzne + # Requires translation! +Perlin = Random number of Civilizations = Losowa liczba cywilizacji Min number of Civilizations = Minimalna liczba cywilizacji Max number of Civilizations = Maksymalna liczba cywlizizacji @@ -686,8 +688,11 @@ Landscape (fixed) = Pionowa (zablokowane) Portrait (fixed) = Pozioma (zablokowane) Auto (sensor adjusted) = Autoobracanie +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Sortuj oferty handlowe według kwoty Experimental Demographics scoreboard = Eksperymentalna tablica Demografii Unit icon opacity = Przezroczystość ikonek jednostek @@ -789,7 +794,6 @@ You need to restart the game for this change to take effect. = Muisz zrestartowa # Notifications Research of [technologyName] has completed! = Ukończono badania nad [technologyName]! - # Requires translation! We gained [amount] Science from Research Agreement = Otrzymaliśmy [amount] Nauki z Umowy Naukowej [construction] has become obsolete and was removed from the queue in [cityName]! = [construction] - to przestarzała konstrukcja dlatego zostanie usunięta z kolejki produkcji w [cityName]! [construction] has become obsolete and was removed from the queue in [amount] cities! = [construction] to przestarzała konstrukcja dlatego zostanie usunięta z kolejki produkcji w [amount] miastach! diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 71352e1024..eb7048c6b3 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -341,6 +341,8 @@ Three Continents = Três Continentes Four Corners = Quatro Cantos Archipelago = Arquipélago Inner Sea = Mar Interior + # Requires translation! +Perlin = Random number of Civilizations = Número aleatório de civilizações Min number of Civilizations = Número mínimo de civilizações Max number of Civilizations = Número máximo de civilizações @@ -711,8 +713,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Ordenar ofertas de comércio por quantidade Experimental Demographics scoreboard = Placar de Demografia Experimental Unit icon opacity = Opacidade do ícone da unidade diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 8cfe426cbb..c136785e2f 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -352,6 +352,8 @@ Four Corners = Patru Colțuri Archipelago = Arhipeleag Inner Sea = Mare interioară # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -742,8 +744,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Comandați oferte comercial după cantitate # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index c836f17257..7054026a0c 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -345,6 +345,8 @@ Four Corners = Четыре Угла Archipelago = Архипелаги Inner Sea = Внутреннее Море # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -728,8 +730,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Сортировать торговые предложения по количеству # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index e99337a4f8..2dcfd7b494 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -335,6 +335,8 @@ Three Continents = 三个大洲 Four Corners = 四岛 Archipelago = 群岛 Inner Sea = 内海 + # Requires translation! +Perlin = Random number of Civilizations = 随机的文明数量 Min number of Civilizations = 最小文明数量 Max number of Civilizations = 最大文明数量 @@ -691,7 +693,10 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = 地图鼠标自动滚动 + # Requires translation! +Map panning speed = Order trade offers by amount = 交易方贸易项目按数量排序 Experimental Demographics scoreboard = 启用实验性统计记分板 Unit icon opacity = 单位图标不透明度 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 42018b42a9..cf08b0b831 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -335,6 +335,8 @@ Three Continents = Tres Continentes Four Corners = Cuatro Esquinas Archipelago = Archipiélago Inner Sea = Mar Interior + # Requires translation! +Perlin = Random number of Civilizations = Cantidad aleatoria de Civs Min number of Civilizations = Civs Mínimas Max number of Civilizations = Civs Máximas @@ -686,7 +688,10 @@ Landscape (fixed) = Horizontal (fijo) Portrait (fixed) = Vertical (fijo) Auto (sensor adjusted) = Autom. (de acuerdo al sensor) +### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = Mover mapa con el ratón + # Requires translation! +Map panning speed = Order trade offers by amount = Ordenar ofertas comerciales por cantidad Experimental Demographics scoreboard = Tabla de Puntaje Demográfica Unit icon opacity = Transparencia de los iconos de Unidad diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index a2a3969af6..acfb597f67 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -347,6 +347,8 @@ Three Continents = Tre Kontinenter Four Corners = Fyra hörn Archipelago = Skärgård Inner Sea = Innanhav + # Requires translation! +Perlin = Random number of Civilizations = Slumpat antal Civilisationer Min number of Civilizations = Minsta antal Civilisationer Max number of Civilizations = Största antal Civilisationer @@ -722,8 +724,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Sortera handelserbjudanden efter mängd # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 965b602f63..e3188b6264 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -340,6 +340,8 @@ Three Continents = 三島 Four Corners = 四島 Archipelago = 群島 Inner Sea = 內海 + # Requires translation! +Perlin = Random number of Civilizations = 文明數量隨機 Min number of Civilizations = 最低文明數 Max number of Civilizations = 最高文明數 @@ -710,8 +712,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = 交易方貿易項目按數量排序 Experimental Demographics scoreboard = 啟用實驗性人口統計面板 Unit icon opacity = 單位圖示透明度 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index ccbd072877..fbd338357b 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -380,6 +380,8 @@ Four Corners = Dört Kısım Archipelago = Takımadalar Inner Sea = İç Deniz # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -802,8 +804,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Kaynakları ticaret penceresinde sayıya göre büyükten küçüğe sırala # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 36fff27ae5..e1d64406ab 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -335,6 +335,8 @@ Three Continents = Три континенти Four Corners = Чотири кути Archipelago = Архіпелаг Inner Sea = Внутрішнє море + # Requires translation! +Perlin = Random number of Civilizations = Випадкова кількість Цивілізацій Min number of Civilizations = Мін. Цивілізацій Max number of Civilizations = Макс. Цивілізацій @@ -686,7 +688,10 @@ Landscape (fixed) = Ландшафтна Portrait (fixed) = Портретна Auto (sensor adjusted) = Автоматична +### Enable panning the map when you move the mouse to the edge of the window Map mouse auto-scroll = Авто прокручування карти мишкою + # Requires translation! +Map panning speed = Order trade offers by amount = Сортувати торгові пропозиції за кількістю Experimental Demographics scoreboard = Експериментальний Демографічний рейтинг Unit icon opacity = Прозорість іконок підрозділів diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 4111afc64e..bf951be83f 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -349,6 +349,8 @@ Four Corners = Bốn góc Archipelago = Quần đảo Inner Sea = Nội Hải # Requires translation! +Perlin = + # Requires translation! Random number of Civilizations = # Requires translation! Min number of Civilizations = @@ -732,8 +734,11 @@ Portrait (fixed) = # Requires translation! Auto (sensor adjusted) = +### Enable panning the map when you move the mouse to the edge of the window # Requires translation! Map mouse auto-scroll = + # Requires translation! +Map panning speed = Order trade offers by amount = Yêu cầu giao dịch theo số lượng # Requires translation! Experimental Demographics scoreboard = diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 48dcf00a77..0faabeaaa4 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -6,8 +6,8 @@ Afrikaans = 7 German = 99 Swedish = 88 Turkish = 69 -Ukrainian = 100 -Filipino = 96 +Ukrainian = 99 +Filipino = 97 French = 99 Portuguese = 64 Indonesian = 97 @@ -16,18 +16,18 @@ Finnish = 37 Spanish = 99 Malay = 23 Brazilian_Portuguese = 99 -Traditional_Chinese = 98 +Traditional_Chinese = 97 Polish = 99 Lithuanian = 96 Romanian = 73 Simplified_Chinese = 99 Bulgarian = 38 -Korean = 98 +Korean = 97 Persian_(Pinglish-DIN) = 13 Japanese = 70 English = 0 Vietnamese = 96 Czech = 83 Hungarian = 76 -Dutch = 66 +Dutch = 67 Greek = 15 diff --git a/changelog.md b/changelog.md index c797a7a86e..c30f4e5690 100644 --- a/changelog.md +++ b/changelog.md @@ -1,29 +1,21 @@ ## 4.5.13 -GPT calculation fixed 2 - -GPT calculation fixed - -Gold per turn is worth less the more turns 'in the future' we're talking about +Gold per turn is evaluated less the more turns 'in the future' it will be payed Returned Perlin map type By SomeTroglodyte: -- Prevent duplicate lines from UiElementDocsWriter -- Fix MiscLayer not respecting fog of war for spectator -- TechPickerScreen colors - skinnable and prettier Future Tech -- VictoryScreen code reorg -- Omit irrelevant warnings from startup console log -- Map scroll speed -- More Spectator/Barbarians fixes related to income +- Map scroll speed +- Fix MiscLayer not respecting fog of war for spectator +- More Spectator/Barbarians fixes related to income By itanasi: -- Automated Civilians don't multi-turn path through Enemy Territory -- More variety in Main Menu map +- Automated Civilians don't multi-turn path through Enemy Territory +- More variety in Main Menu map -City-state music plays when first meeting them - By Skekdog +City-state music plays when first meeting them - By Skekdog -Add AbsoluteUnits license info - By letstalkaboutdune +Add AbsoluteUnits license info - By letstalkaboutdune ## 4.5.12 diff --git a/core/src/com/unciv/logic/trade/TradeEvaluation.kt b/core/src/com/unciv/logic/trade/TradeEvaluation.kt index 2a2ccb0799..555a0d4bc3 100644 --- a/core/src/com/unciv/logic/trade/TradeEvaluation.kt +++ b/core/src/com/unciv/logic/trade/TradeEvaluation.kt @@ -82,7 +82,7 @@ class TradeEvaluation { when (offer.type) { TradeType.Gold -> return offer.amount // GPT loses 1% of value for each 'future' turn, meaning: gold now is more valuable than gold in the future - TradeType.Gold_Per_Turn -> return (1..offer.duration).sumOf { (offer.amount * 0.99.pow(it)) }.toInt() + TradeType.Gold_Per_Turn -> return (1..offer.duration).sumOf { offer.amount * 0.99.pow(it) }.toInt() TradeType.Treaty -> { return when (offer.name) { // Since it will be evaluated twice, once when they evaluate our offer and once when they evaluate theirs diff --git a/docs/Modders/Creating-a-UI-skin.md b/docs/Modders/Creating-a-UI-skin.md index d4a4b2a74e..301969a323 100644 --- a/docs/Modders/Creating-a-UI-skin.md +++ b/docs/Modders/Creating-a-UI-skin.md @@ -54,9 +54,6 @@ These shapes are used all over Unciv and can be replaced to make a lot of UI ele | CityScreen/ConstructionInfoTable/ | SelectedConstructionTable | null | | | CivilopediaScreen/ | EntryButton | null | | | General/ | Border | null | | -| General/ | Border | null | | -| General/ | Border | null | | -| General/ | Border | null | | | General/ | ExpanderTab | null | | | General/ | HealthBar | null | | | General/ | KeyCapturingButton | null | | @@ -92,7 +89,6 @@ These shapes are used all over Unciv and can be replaced to make a lot of UI ele | OverviewScreen/UnitOverviewTab/ | UnitSupplyTable | null | | | PlayerReadyScreen/ | Background | null | | | TechPickerScreen/ | Background | null | | -| TechPickerScreen/ | Background | null | | | TechPickerScreen/ | BottomTable | null | | | TechPickerScreen/ | CurrentTechColor | 72, 147, 175 | | | TechPickerScreen/ | QueuedTechColor | 7*2, 46*2, 43*2 | | @@ -108,7 +104,6 @@ These shapes are used all over Unciv and can be replaced to make a lot of UI ele | WorldScreen/ | TileInfoTable | null | | | WorldScreen/ | TutorialTaskTable | null | | | WorldScreen/ | UnitTable | roundedEdgeRectangleMid | | -| WorldScreen/ | UnitTable | roundedEdgeRectangleMid | | | WorldScreen/CityButton/ | InfluenceBar | null | | | WorldScreen/Minimap/ | Background | null | | | WorldScreen/Minimap/ | Border | null | | diff --git a/fastlane/metadata/android/en-US/changelogs/838.txt b/fastlane/metadata/android/en-US/changelogs/838.txt index 6a22e9292b..9eb8ebcd47 100644 --- a/fastlane/metadata/android/en-US/changelogs/838.txt +++ b/fastlane/metadata/android/en-US/changelogs/838.txt @@ -1,26 +1,16 @@ - - -GPT calculation fixed 2 - -GPT calculation fixed - -Gold per turn is worth less the more turns 'in the future' we're talking about +Gold per turn is evaluated less the more turns 'in the future' it will be payed Returned Perlin map type By SomeTroglodyte: -- Prevent duplicate lines from UiElementDocsWriter -- Fix MiscLayer not respecting fog of war for spectator -- TechPickerScreen colors - skinnable and prettier Future Tech -- VictoryScreen code reorg -- Omit irrelevant warnings from startup console log -- Map scroll speed -- More Spectator/Barbarians fixes related to income +- Map scroll speed +- Fix MiscLayer not respecting fog of war for spectator +- More Spectator/Barbarians fixes related to income By itanasi: -- Automated Civilians don't multi-turn path through Enemy Territory -- More variety in Main Menu map +- Automated Civilians don't multi-turn path through Enemy Territory +- More variety in Main Menu map -City-state music plays when first meeting them - By Skekdog +City-state music plays when first meeting them - By Skekdog -Add AbsoluteUnits license info - By letstalkaboutdune \ No newline at end of file +Add AbsoluteUnits license info - By letstalkaboutdune \ No newline at end of file