From 9b93e4fb51eac97248e68d7433fe6ce62eba21e6 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 20 May 2020 20:46:59 +0300 Subject: [PATCH] Unified capitalization in New Game screen - #2549 --- .../Brazilian_Portuguese.properties | 20 +++++++++---------- .../jsons/translations/Czech.properties | 20 +++++++++---------- .../jsons/translations/Dutch.properties | 20 +++++++++---------- .../jsons/translations/English.properties | 20 +++++++++---------- .../jsons/translations/French.properties | 20 +++++++++---------- .../jsons/translations/German.properties | 20 +++++++++---------- .../jsons/translations/Indonesian.properties | 20 +++++++++---------- .../jsons/translations/Italian.properties | 20 +++++++++---------- .../jsons/translations/Japanese.properties | 20 +++++++++---------- .../jsons/translations/Korean.properties | 20 +++++++++---------- .../jsons/translations/Malay.properties | 20 +++++++++---------- .../jsons/translations/Polish.properties | 20 +++++++++---------- .../jsons/translations/Portuguese.properties | 20 +++++++++---------- .../jsons/translations/Romanian.properties | 20 +++++++++---------- .../jsons/translations/Russian.properties | 20 +++++++++---------- .../Simplified_Chinese.properties | 20 +++++++++---------- .../jsons/translations/Spanish.properties | 20 +++++++++---------- .../assets/jsons/translations/Thai.properties | 18 ++++++++--------- .../Traditional_Chinese.properties | 20 +++++++++---------- .../jsons/translations/Turkish.properties | 20 +++++++++---------- .../jsons/translations/Ukrainian.properties | 20 +++++++++---------- .../jsons/translations/template.properties | 20 +++++++++---------- changelog.md | 4 ++-- .../com/unciv/models/ruleset/tile/Terrain.kt | 4 ++-- .../com/unciv/ui/mapeditor/NewMapScreen.kt | 2 +- .../unciv/ui/newgamescreen/MapOptionsTable.kt | 4 ++-- .../ui/newgamescreen/MapParametersTable.kt | 8 ++++---- ...ametersTable.kt => NewGameOptionsTable.kt} | 16 +++++++-------- .../unciv/ui/newgamescreen/NewGameScreen.kt | 4 ++-- 29 files changed, 240 insertions(+), 240 deletions(-) rename core/src/com/unciv/ui/newgamescreen/{NewGameParametersTable.kt => NewGameOptionsTable.kt} (93%) diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 99b9149b45..e30d5ecffd 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -252,30 +252,30 @@ Promotions = Promoções Load copied data = Carregar dados copiados Could not load game from clipboard! = Não foi possível carregar o jogo! Start game! = Começar partida! -Map options = Opções de mapa -Game options = Opções de jogo -Map type = Tipo de mapa +Map Options = Opções de mapa +Game Options = Opções de jogo +Map Type = Tipo de mapa Generated = Gerado Existing = Existente Custom = Customizado -Map generation type = Tipo de geração de mapa +Map Generation Type = Tipo de geração de mapa Default = Padrão Pangaea = Pangeia Perlin = Perlin Continents = Continentes # Requires translation! Archipelago = -Number of city-states = Número de cidades-estado +Number of City-States = Número de cidades-estado One City Challenge = Desafio - Apenas Uma Cidade -No barbarians = Sem bárbaros -No ancient ruins = Sem ruínas antigas +No Barbarians = Sem bárbaros +No Ancient Ruins = Sem ruínas antigas No Natural Wonders = Sem Maravilhas Naturais -Victory conditions = Condições de vitória +Victory Conditions = Condições de vitória Scientific = Científica Domination = Dominação Cultural = Cultural -Map shape = Formato do mapa +Map Shape = Formato do mapa Hexagonal = Hexagonal Rectangular = Retangular @@ -294,7 +294,7 @@ Reset to default = Resetar para o padrão HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = ESTÁ EM DESENVOLVIMENTO - VOCÊ FOI AVISADO! Online Multiplayer = Multijogador Online -World size = Tamanho do mundo +World Size = Tamanho do mundo Tiny = Minúsculo Small = Pequeno Medium = Médio diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index b369bd13d6..0b3837c41d 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -254,30 +254,30 @@ Promotions = Povýšení Load copied data = Načíst zkopírovaná data Could not load game from clipboard! = Nepodařilo se nahrát hru ze schránky! Start game! = Začít hru! -Map options = Nastavení mapy -Game options = Nastavení hry -Map type = Typ mapy +Map Options = Nastavení mapy +Game Options = Nastavení hry +Map Type = Typ mapy Generated = Generováno Existing = Existující Custom = Vlastní -Map generation type = Typ generované mapy +Map Generation Type = Typ generované mapy Default = Základní Pangaea = Pangea Perlin = Perlin Continents = Kontinenty # Requires translation! Archipelago = -Number of city-states = Počet městských států +Number of City-States = Počet městských států One City Challenge = Výzva - Jen jedno město -No barbarians = Bez barbarů -No ancient ruins = Bez starobylých ruin +No Barbarians = Bez barbarů +No Ancient Ruins = Bez starobylých ruin No Natural Wonders = Bez Přírodních Divů -Victory conditions = Způsoby výhry +Victory Conditions = Způsoby výhry Scientific = Vědecká Domination = Dominance Cultural = Kulturní -Map shape = Tvar mapy +Map Shape = Tvar mapy Hexagonal = Šestiúhelníková Rectangular = Čtvercová @@ -296,7 +296,7 @@ Reset to default = Vrátit do základního nastavení HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = VYSOCE EXPERIMENTÁLNÍ - BYLI JSTE VAROVÁNÍ! Online Multiplayer = Online pro více hráčů -World size = Velikost světa +World Size = Velikost světa Tiny = Miniaturní Small = Malý Medium = Střední diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 043dfb7c1a..48b8fc9cf3 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -384,10 +384,10 @@ Could not load game from clipboard! = Kon game niet van klembord laden! # Requires translation! Start game! = # Requires translation! -Map options = +Map Options = # Requires translation! -Game options = -Map type = Kaarttype +Game Options = +Map Type = Kaarttype # Requires translation! Generated = # Requires translation! @@ -395,7 +395,7 @@ Existing = # Requires translation! Custom = # Requires translation! -Map generation type = +Map Generation Type = # Requires translation! Default = # Requires translation! @@ -407,17 +407,17 @@ Continents = # Requires translation! Archipelago = # Requires translation! -Number of city-states = +Number of City-States = # Requires translation! One City Challenge = # Requires translation! -No barbarians = +No Barbarians = # Requires translation! -No ancient ruins = +No Ancient Ruins = # Requires translation! No Natural Wonders = # Requires translation! -Victory conditions = +Victory Conditions = # Requires translation! Scientific = # Requires translation! @@ -426,7 +426,7 @@ Domination = Cultural = # Requires translation! -Map shape = +Map Shape = # Requires translation! Hexagonal = # Requires translation! @@ -461,7 +461,7 @@ HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = Online Multiplayer = # Requires translation! -World size = +World Size = # Requires translation! Tiny = # Requires translation! diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index ab2008820f..c12b1b4542 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -449,11 +449,11 @@ Could not load game from clipboard! = # Requires translation! Start game! = # Requires translation! -Map options = +Map Options = # Requires translation! -Game options = +Game Options = # Requires translation! -Map type = +Map Type = # Requires translation! Generated = # Requires translation! @@ -461,7 +461,7 @@ Existing = # Requires translation! Custom = # Requires translation! -Map generation type = +Map Generation Type = # Requires translation! Default = # Requires translation! @@ -473,17 +473,17 @@ Continents = # Requires translation! Archipelago = # Requires translation! -Number of city-states = +Number of City-States = # Requires translation! One City Challenge = # Requires translation! -No barbarians = +No Barbarians = # Requires translation! -No ancient ruins = +No Ancient Ruins = # Requires translation! No Natural Wonders = # Requires translation! -Victory conditions = +Victory Conditions = # Requires translation! Scientific = # Requires translation! @@ -492,7 +492,7 @@ Domination = Cultural = # Requires translation! -Map shape = +Map Shape = # Requires translation! Hexagonal = # Requires translation! @@ -527,7 +527,7 @@ HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = Online Multiplayer = # Requires translation! -World size = +World Size = # Requires translation! Tiny = # Requires translation! diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 95771be05a..70d8ac93b8 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -252,30 +252,30 @@ Promotions = Promotions Load copied data = Charger des données copiées Could not load game from clipboard! = Impossible de charger la partie depuis le presse-papier Start game! = Démarrer la partie ! -Map options = Options de carte -Game options = Options de partie -Map type = Type de carte +Map Options = Options de carte +Game Options = Options de partie +Map Type = Type de carte Generated = Générée Existing = Existante Custom = Personnalisée -Map generation type = Type de carte générée +Map Generation Type = Type de carte générée Default = Défaut Pangaea = Pangée Perlin = Perlin Continents = Continents # Requires translation! Archipelago = -Number of city-states = Nombre de cité-état(s) +Number of City-States = Nombre de cité-état(s) One City Challenge = Défi ville unique -No barbarians = Aucun barbare -No ancient ruins = Aucune ruine ancienne +No Barbarians = Aucun barbare +No Ancient Ruins = Aucune ruine ancienne No Natural Wonders = Aucune merveille naturelle -Victory conditions = Conditions de victoire +Victory Conditions = Conditions de victoire Scientific = Scientifique Domination = Domination Cultural = Culturelle -Map shape = Forme de la carte +Map Shape = Forme de la carte Hexagonal = Hexagonale Rectangular = Rectangulaire @@ -294,7 +294,7 @@ Reset to default = Options par défaut HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = HAUTEMENT EXPERIMENTAL - VOUS ÊTES PREVENU ! Online Multiplayer = Multijoueurs en ligne -World size = Taille du monde +World Size = Taille du monde Tiny = Minuscule Small = Petit Medium = Moyen diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 3f4abf15f1..92419c2cc6 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -252,30 +252,30 @@ Promotions = Beförderungen Load copied data = Aus Zwischenablage laden Could not load game from clipboard! = Das Spiel konnte nicht aus der Zwischenablage geladen werden! Start game! = Spiel starten! -Map options = Kartenoptionen -Game options = Spieloptionen -Map type = Kartentyp +Map Options = Kartenoptionen +Game Options = Spieloptionen +Map Type = Kartentyp Generated = Generiert Existing = Bestehende Custom = Benutzerdefiniert -Map generation type = Art der Kartenerstellung +Map Generation Type = Art der Kartenerstellung Default = Standard Pangaea = Pangaea Perlin = Perlin Continents = Kontinente # Requires translation! Archipelago = -Number of city-states = Anzahl Stadtstaaten +Number of City-States = Anzahl Stadtstaaten One City Challenge = Herausforderung eine Stadt -No barbarians = Keine Barbaren -No ancient ruins = Keine alten Ruinen +No Barbarians = Keine Barbaren +No Ancient Ruins = Keine alten Ruinen No Natural Wonders = Keine Naturwunder -Victory conditions = Siegbedingungen +Victory Conditions = Siegbedingungen Scientific = Wissenschaftlich Domination = Vorherrschaft Cultural = Kulturell -Map shape = Kartenform +Map Shape = Kartenform Hexagonal = Sechseckig Rectangular = Rechteckig @@ -294,7 +294,7 @@ Reset to default = Auf Standard zurücksetzen HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = WARNUNG: HOCHGRADIG EXPERIMENTELL! Online Multiplayer = Online Mehrspieler -World size = Kartengröße +World Size = Kartengröße Tiny = Winzig Small = Klein Medium = Mittel diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index e88c8fca8d..635de2a95d 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -252,30 +252,30 @@ Promotions = Promosi Load copied data = Muat data tersalin Could not load game from clipboard! = Tidak bisa memuat game dari papan klip! Start game! = Mulai permainan! -Map options = Opsi peta -Game options = Opsi permainan -Map type = Tipe peta +Map Options = Opsi peta +Game Options = Opsi permainan +Map Type = Tipe peta Generated = Digenerasi Game Existing = Telah Tersedia Custom = Custom -Map generation type = Tipe generasi peta +Map Generation Type = Tipe generasi peta Default = Default Pangaea = Pangaea Perlin = Perlin Continents = Kontinen # Requires translation! Archipelago = -Number of city-states = Banyaknya negara kota +Number of City-States = Banyaknya negara kota One City Challenge = Tantangan satu kota saja -No barbarians = Tanpa orang barbar -No ancient ruins = Tanpa reruntuhan kuno +No Barbarians = Tanpa orang barbar +No Ancient Ruins = Tanpa reruntuhan kuno No Natural Wonders = Tanpa Keajaiban Alam -Victory conditions = Kondisi kemenangan +Victory Conditions = Kondisi kemenangan Scientific = Ilmu Pengetahuan Domination = Dominasi Cultural = Kebudayaan -Map shape = Bentuk peta +Map Shape = Bentuk peta Hexagonal = Segienam Rectangular = Persegi panjang @@ -294,7 +294,7 @@ Reset to default = Atur ulang ke default HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = HANYA EKSPERIMEN - KAMU SUDAH DIPERINGATKAN Online Multiplayer = Bermain bersama -World size = Ukuran Dunia +World Size = Ukuran Dunia Tiny = Sangat Kecil Small = Kecil Medium = Sedang diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 58d589b883..7d594b70b7 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -252,29 +252,29 @@ Promotions = Promozioni Load copied data = Carica i dati copiati Could not load game from clipboard! = Impossibile caricare partita dagli appunti! Start game! = Comincia la tua avventura! -Map options = Opzioni mappa -Game options = Opzioni di gioco -Map type = Tipo di mappa +Map Options = Opzioni mappa +Game Options = Opzioni di gioco +Map Type = Tipo di mappa Generated = Generato Existing = Esistente Custom = Personalizzata -Map generation type = Tipo generazione mappa +Map Generation Type = Tipo generazione mappa Default = Default Pangaea = Pangea Perlin = Perlin Continents = Continenti Archipelago = Arcipelago -Number of city-states = Numero di Città-Stato +Number of City-States = Numero di Città-Stato One City Challenge = Sfida a città singola -No barbarians = Niente barbari -No ancient ruins = Niente antiche rovine +No Barbarians = Niente barbari +No Ancient Ruins = Niente antiche rovine No Natural Wonders = Niente Meraviglie Naturali -Victory conditions = Condizioni di Vittoria +Victory Conditions = Condizioni di Vittoria Scientific = Scientifica Domination = Dominazione Cultural = Culturale -Map shape = Forma della mappa +Map Shape = Forma della mappa Hexagonal = Esagonale Rectangular = Rettangolare @@ -293,7 +293,7 @@ Reset to default = Ripristina default HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = IN FASE SPERIMENTALE - TI ABBIAMO AVVERTITO! Online Multiplayer = Multiplayer online -World size = Dimensioni della mappa +World Size = Dimensioni della mappa Tiny = Minuscola Small = Piccola Medium = Media diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index a5dbb1ee64..70b8e4233d 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -279,30 +279,30 @@ Promotions = 昇進 Load copied data = コピーしたデータを読み込む Could not load game from clipboard! = クリップボードからゲームを読み込めませんでした！ Start game! = ゲーム開始 -Map options = マップ設定 -Game options = ゲーム設定 -Map type = マップタイプ +Map Options = マップ設定 +Game Options = ゲーム設定 +Map Type = マップタイプ Generated = 生成 Existing = 既存 Custom = カスタム -Map generation type = マップ生成タイプ +Map Generation Type = マップ生成タイプ Default = デフォルト Pangaea = パンゲア Perlin = パーリンノイズ Continents = 大陸 # Requires translation! Archipelago = -Number of city-states = 都市国家の数 +Number of City-States = 都市国家の数 One City Challenge = ワンシティチャレンジ -No barbarians = 蛮族なし -No ancient ruins = 古代遺跡なし +No Barbarians = 蛮族なし +No Ancient Ruins = 古代遺跡なし No Natural Wonders = 自然遺産なし -Victory conditions = 勝利条件 +Victory Conditions = 勝利条件 Scientific = 科学 Domination = 覇権 Cultural = 文化 -Map shape = マップ形状 +Map Shape = マップ形状 Hexagonal = 六角形 Rectangular = 長方形 @@ -324,7 +324,7 @@ Reset to default = デフォルトに戻す HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = 非常に実験的-警告を受けました！ Online Multiplayer = オンラインマルチプレイ -World size = マップサイズ +World Size = マップサイズ Tiny = 極小 Small = 小さい Medium = 普通 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 6ca511868b..f0878d2a5e 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -253,29 +253,29 @@ Promotions = 승급 Load copied data = 복사 된 데이터 불러오기 Could not load game from clipboard! = 클립보드에서 게임을 불러 올 수 없습니다! Start game! = 게임 시작! -Map options = 지도 설정 -Game options = 게임 설정 -Map type = 지도 유형 +Map Options = 지도 설정 +Game Options = 게임 설정 +Map Type = 지도 유형 Generated = 생성된 Existing = 기존의 Custom = 사용자 정의 -Map generation type = 지도 생성 유형 +Map Generation Type = 지도 생성 유형 Default = 기본 Pangaea = 판게아 Perlin = 펄린 Continents = 대륙 Archipelago = 군도 -Number of city-states = 도시 국가 수 +Number of City-States = 도시 국가 수 One City Challenge = 단일 도시 도전 -No barbarians = 야만인 없음 -No ancient ruins = 고대 유적 없음 +No Barbarians = 야만인 없음 +No Ancient Ruins = 고대 유적 없음 No Natural Wonders = 자연 경관 없음 -Victory conditions = 승리 조건 +Victory Conditions = 승리 조건 Scientific = 과학 Domination = 정복 Cultural = 문화 -Map shape = 지도 모양 +Map Shape = 지도 모양 Hexagonal = 육각형 Rectangular = 사각형 @@ -294,7 +294,7 @@ Reset to default = 기본값으로 되돌리기 HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = 현재 테스트 중임 - 경고합니다! Online Multiplayer = 온라인 멀티플레이어 -World size = 세계 크기 +World Size = 세계 크기 Tiny = 초소형 Small = 소형 Medium = 중형 diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 948b0fba04..5c0ac187d3 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -401,11 +401,11 @@ Could not load game from clipboard! = # Requires translation! Start game! = # Requires translation! -Map options = +Map Options = # Requires translation! -Game options = +Game Options = # Requires translation! -Map type = +Map Type = # Requires translation! Generated = # Requires translation! @@ -413,7 +413,7 @@ Existing = # Requires translation! Custom = # Requires translation! -Map generation type = +Map Generation Type = # Requires translation! Default = # Requires translation! @@ -425,17 +425,17 @@ Continents = # Requires translation! Archipelago = # Requires translation! -Number of city-states = +Number of City-States = # Requires translation! One City Challenge = # Requires translation! -No barbarians = +No Barbarians = # Requires translation! -No ancient ruins = +No Ancient Ruins = # Requires translation! No Natural Wonders = # Requires translation! -Victory conditions = +Victory Conditions = # Requires translation! Scientific = # Requires translation! @@ -444,7 +444,7 @@ Domination = Cultural = # Requires translation! -Map shape = +Map Shape = # Requires translation! Hexagonal = # Requires translation! @@ -479,7 +479,7 @@ HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = Online Multiplayer = # Requires translation! -World size = +World Size = # Requires translation! Tiny = # Requires translation! diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 26dd9b068c..d09405c3bd 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -253,30 +253,30 @@ Promotions = Awanse Load copied data = Wczytaj skopiowane dane Could not load game from clipboard! = Nie można wczytać danych ze schowka! Start game! = Zacznij grę! -Map options = Ustawienia mapy -Game options = Ustawienia gry -Map type = Rodzaj mapy +Map Options = Ustawienia mapy +Game Options = Ustawienia gry +Map Type = Rodzaj mapy Generated = Wygenerowane Existing = Istniejące Custom = Niestandardowa -Map generation type = Typ generowania mapy +Map Generation Type = Typ generowania mapy Default = Domyślny Pangaea = Pangea Perlin = Perlin Continents = Kontynenty # Requires translation! Archipelago = -Number of city-states = Liczba miast-państw +Number of City-States = Liczba miast-państw One City Challenge = Wyzwanie z limitem 1 miasta -No barbarians = Brak Barbarzyńców -No ancient ruins = Bez Antycznych Ruin +No Barbarians = Brak Barbarzyńców +No Ancient Ruins = Bez Antycznych Ruin No Natural Wonders = Bez Cudów Natury -Victory conditions = Warunki zwycięstwa +Victory Conditions = Warunki zwycięstwa Scientific = Naukowe Domination = Dominacja Cultural = Kulturowe -Map shape = Kształt mapy +Map Shape = Kształt mapy Hexagonal = Sześciokątny Rectangular = Prostokątny @@ -295,7 +295,7 @@ Reset to default = Zresetuj do domyślnych HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = TRYB EKSPERYMENTALNY - NA WŁASNĄ ODPOWIEDZIALNOŚĆ! Online Multiplayer = Tryb wieloosobowy -World size = Rozmiar mapy +World Size = Rozmiar mapy Tiny = Bardzo mały Small = Mały Medium = Średni diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index c29e902fc0..c5babf5472 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -252,30 +252,30 @@ Promotions = Promoções Load copied data = Carregar dados copiados Could not load game from clipboard! = Não foi possivel carregar o jogo! Start game! = Começar partida! -Map options = Opções de mapa -Game options = Opções de jogo -Map type = Tipo de mapa +Map Options = Opções de mapa +Game Options = Opções de jogo +Map Type = Tipo de mapa Generated = Gerado Existing = Existente Custom = Customizado -Map generation type = Tipo de geração de mapa +Map Generation Type = Tipo de geração de mapa Default = Padrão Pangaea = Pangeia Perlin = Perlin Continents = Continentes # Requires translation! Archipelago = -Number of city-states = Número de cidades-estado +Number of City-States = Número de cidades-estado One City Challenge = Desafio - Apenas Uma Cidade -No barbarians = Sem bárbaros -No ancient ruins = Sem ruínas antigas +No Barbarians = Sem bárbaros +No Ancient Ruins = Sem ruínas antigas No Natural Wonders = Sem Maravilhas Naturais -Victory conditions = Condições de vitória +Victory Conditions = Condições de vitória Scientific = Científica Domination = Dominação Cultural = Cultural -Map shape = Formato do mapa +Map Shape = Formato do mapa Hexagonal = Hexagonal Rectangular = Retangular @@ -294,7 +294,7 @@ Reset to default = Reconfigurar para prédifinição HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = ESTÁ EM DESENVOLVIMENTO - VOCÊ FOI AVISADO! Online Multiplayer = Multijogador online -World size = Tamanho do mundo +World Size = Tamanho do mundo Tiny = Minúsculo Small = Pequeno Medium = Médio diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index b08c2b3acb..66018b103c 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -252,30 +252,30 @@ Promotions = Promoții Load copied data = Încarcă date copiate Could not load game from clipboard! = Jocul nu a putut fi încărcat din clipboard! Start game! = Începe jocul! -Map options = Opțiuni ale hărții -Game options = Opțiuni ale jocului -Map type = Tipul hărții +Map Options = Opțiuni ale hărții +Game Options = Opțiuni ale jocului +Map Type = Tipul hărții Generated = Generat Existing = Existent Custom = Personalizat -Map generation type = Tip de generare a hărții +Map Generation Type = Tip de generare a hărții Default = Implicit Pangaea = Pangaea Perlin = Perlin Continents = Continente # Requires translation! Archipelago = -Number of city-states = Numărul de orașe-stat +Number of City-States = Numărul de orașe-stat One City Challenge = Provocare cu un oraș -No barbarians = Fără barbari -No ancient ruins = Fără ruine antice +No Barbarians = Fără barbari +No Ancient Ruins = Fără ruine antice No Natural Wonders = Fără minuni naturale -Victory conditions = Condiții de victorie +Victory Conditions = Condiții de victorie Scientific = Știință Domination = Dominație Cultural = Cultură -Map shape = Forma hărții +Map Shape = Forma hărții Hexagonal = Hexagonală Rectangular = Dreptunghiulară @@ -294,7 +294,7 @@ Reset to default = Resetează la setările prestabilite HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = ATENȚIUNE - E CÂT SE POATE DE EXPERIMENTAL! Online Multiplayer = Multiplayer online -World size = Mărimea lumii +World Size = Mărimea lumii Tiny = Micuț Small = Mic Medium = Mediu diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 1c5b11a95e..210b13d914 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -252,29 +252,29 @@ Promotions = Повышения Load copied data = Загрузить скопированные данные Could not load game from clipboard! = Не удалось загрузить игру из буфера обмена! Start game! = Начать игру! -Map options = Настройка карты -Game options = Настройка игры -Map type = Тип карты +Map Options = Настройка карты +Game Options = Настройка игры +Map Type = Тип карты Generated = Сгенерированная Existing = Существующая Custom = Своя -Map generation type = Тип генерации карты +Map Generation Type = Тип генерации карты Default = По умолчанию Pangaea = Пангея Perlin = Перлин Continents = Континенты Archipelago = Архипелаги -Number of city-states = Число городов-государств +Number of City-States = Число городов-государств One City Challenge = Испытание одного города -No barbarians = Без варваров -No ancient ruins = Без древних руин +No Barbarians = Без варваров +No Ancient Ruins = Без древних руин No Natural Wonders = Без чудес природы -Victory conditions = Условия победы +Victory Conditions = Условия победы Scientific = Научная Domination = Завоевание Cultural = Культурная -Map shape = Форма карты +Map Shape = Форма карты Hexagonal = Шестиугольная Rectangular = Прямоугольная @@ -293,7 +293,7 @@ Reset to default = Сбросить к стандартным настройка HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = В РАЗРАБОТКЕ — ВЫ ПРЕДУПРЕЖДЕНЫ! Online Multiplayer = Сетевая игра -World size = Размер мира +World Size = Размер мира Tiny = Крошечный Small = Маленький Medium = Средний diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 9a9f2fc929..868cc5ce21 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -253,30 +253,30 @@ Promotions = 晋升 Load copied data = 读取剪贴板中的游戏数据 Could not load game from clipboard! = 无法从剪贴板中读取游戏! Start game! = 开始游戏！ -Map options = 地图设置 -Game options = 游戏设置 -Map type = 地图创建方式 +Map Options = 地图设置 +Game Options = 游戏设置 +Map Type = 地图创建方式 Generated = 根据设置生成 Existing = 从文件载入 Custom = 自定义 -Map generation type = 生成地图类型 +Map Generation Type = 生成地图类型 Default = 预设 Pangaea = 盘古大陆 Perlin = 随机(柏林噪声算法) Continents = 大洲 # Requires translation! Archipelago = -Number of city-states = 城邦数量 +Number of City-States = 城邦数量 One City Challenge = 单城市挑战 -No barbarians = 无蛮族 -No ancient ruins = 无远古遗迹 +No Barbarians = 无蛮族 +No Ancient Ruins = 无远古遗迹 No Natural Wonders = 无自然奇观 -Victory conditions = 胜利方式 +Victory Conditions = 胜利方式 Scientific = 科技 Domination = 征服 Cultural = 文化 -Map shape = 地图形状 +Map Shape = 地图形状 Hexagonal = 六边形 Rectangular = 长方形 @@ -295,7 +295,7 @@ Reset to default = 重置为默认 HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = ⚠警告！试验性功能！ Online Multiplayer = 在线多人游戏 -World size = 世界大小 +World Size = 世界大小 Tiny = 极小 Small = 小 Medium = 中 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index bd1d606d8a..510d1f22b3 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -252,30 +252,30 @@ Promotions = Ascensos Load copied data = Cargar datos copiados Could not load game from clipboard! = ¡No se pudo cargar el juego desde el portapapeles! Start game! = ¡Empezar partida! -Map options = Opciones del mapa -Game options = Opciones del juego -Map type = Tipo de mapa +Map Options = Opciones del mapa +Game Options = Opciones del juego +Map Type = Tipo de mapa Generated = Generado Existing = Existente Custom = Personalizado -Map generation type = Tipo de generación de mapa +Map Generation Type = Tipo de generación de mapa Default = Por defecto Pangaea = Pangea Perlin = Aleatorio Continents = Continentes # Requires translation! Archipelago = -Number of city-states = Número de ciudades-estado +Number of City-States = Número de ciudades-estado One City Challenge = Reto de una sola ciudad -No barbarians = Sin bárbaros -No ancient ruins = Sin ruinas antiguas +No Barbarians = Sin bárbaros +No Ancient Ruins = Sin ruinas antiguas No Natural Wonders = Sin maravillas naturales -Victory conditions = Condiciones de victoria +Victory Conditions = Condiciones de victoria Scientific = Científica Domination = Dominación Cultural = Cultural -Map shape = Forma del Mapa +Map Shape = Forma del Mapa Hexagonal = Hexagonal Rectangular = Rectangular @@ -294,7 +294,7 @@ Reset to default = Reiniciar Valores HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = EXPERIMENTAL ¡QUEDAS AVISADO! Online Multiplayer = Multijugador Online -World size = Tamaño del mundo +World Size = Tamaño del mundo Tiny = Diminuto Small = Pequeño Medium = Mediano diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties index 67e0f00fcc..967af18531 100644 --- a/android/assets/jsons/translations/Thai.properties +++ b/android/assets/jsons/translations/Thai.properties @@ -409,18 +409,18 @@ Barbarians = คนเถื่อน Load copied data = โหลดข้อมูลที่ถูกคัดลอกมา Could not load game from clipboard! = ไม่สามารถโหลดเกมส์จากคลิปบอร์ดได้! Start game! = เริ่มเกมส์! -Map options = ตัวเลือกแผนที่ -Game options = ตัวเลือกเกมส์ -Map type = ชนิดของแผนที่ +Map Options = ตัวเลือกแผนที่ +Game Options = ตัวเลือกเกมส์ +Map Type = ชนิดของแผนที่ Generated = สร้างแล้ว Existing = มีอยู่ -Map generation type = ชนิดของแผนที่ที่สร้าง -Number of city-states = จำนวนของเมือง +Map Generation Type = ชนิดของแผนที่ที่สร้าง +Number of City-States = จำนวนของเมือง One City Challenge = การท้าทายทีให้มีแค่เมืองเดี่ยว -No barbarians = ไม่มีคนเถื่อน -No ancient ruins = ไม่มีซากปรักหักพังโบราณ +No Barbarians = ไม่มีคนเถื่อน +No Ancient Ruins = ไม่มีซากปรักหักพังโบราณ -Victory conditions = เงื่อนไขในการได้รับชัยชนะ +Victory Conditions = เงื่อนไขในการได้รับชัยชนะ Scientific = ทางวิทยาศาสตร์ Domination = ยึดครองทั้งหมด Cultural = ทางวัฒนธรรม @@ -428,7 +428,7 @@ Cultural = ทางวัฒนธรรม HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = ต้องมีประสบการ์ณกับเกมส์นี้สูง - นี่ผมเตือนเเล้วนะ Online Multiplayer = ออนไลน์เล่นหลายคน -World size = ขนาดของโลก +World Size = ขนาดของโลก Tiny = เล็กจิ๋วหริ๋ว Small = เล็ก Medium = กลาง diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index ab694e1987..69551712ca 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -253,30 +253,30 @@ Promotions = 晉升 Load copied data = 讀取剪貼簿的遊戲存檔 Could not load game from clipboard! = 無法從剪貼簿讀取存檔! Start game! = 開始遊戲！ -Map options = 地圖設置 -Game options = 遊戲設置 -Map type = 地圖創建方式 +Map Options = 地圖設置 +Game Options = 遊戲設置 +Map Type = 地圖創建方式 Generated = 根據設置生成 Existing = 從文件載入 Custom = 自訂 -Map generation type = 生成地圖類型 +Map Generation Type = 生成地圖類型 Default = 預設 Pangaea = 盤古大陸 Perlin = 隨機(柏林噪聲算法) Continents = 大洲 # Requires translation! Archipelago = -Number of city-states = 城邦數量 +Number of City-States = 城邦數量 One City Challenge = 單城市挑戰 -No barbarians = 無蠻族 -No ancient ruins = 無遠古遺跡 +No Barbarians = 無蠻族 +No Ancient Ruins = 無遠古遺跡 No Natural Wonders = 無自然奇觀 -Victory conditions = 勝利條件 +Victory Conditions = 勝利條件 Scientific = 科技 Domination = 征服 Cultural = 文化 -Map shape = 地圖形狀 +Map Shape = 地圖形狀 Hexagonal = 六邊形 Rectangular = 長方形 @@ -295,7 +295,7 @@ Reset to default = 重設 HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = ⚠警告！實驗性功能！ Online Multiplayer = 線上多人遊戲 -World size = 世界大小 +World Size = 世界大小 Tiny = 極小 Small = 小 Medium = 中 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 09d611d679..dcdf365349 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -255,30 +255,30 @@ Promotions = Terfiler Load copied data = Kopyalanan verileri yükle Could not load game from clipboard! = Panodan oyun yüklenemedi! Start game! = Oyunu başlat! -Map options = Harita seçenekleri -Game options = Oyun seçenekleri -Map type = Harita türü +Map Options = Harita seçenekleri +Game Options = Oyun seçenekleri +Map Type = Harita türü Generated = Oluşturuldu Existing = Mevcut Custom = Elle yapılmış -Map generation type = Harita oluşturma türü +Map Generation Type = Harita oluşturma türü Default = Varsayılan Pangaea = Pangea Perlin = Perlin Continents = Kıtalar # Requires translation! Archipelago = -Number of city-states = Şehir devletlerinin sayısı +Number of City-States = Şehir devletlerinin sayısı One City Challenge = Tek Şehir Meydan Okuması -No barbarians = Barbar yok -No ancient ruins = Antik kalıntı yok +No Barbarians = Barbar yok +No Ancient Ruins = Antik kalıntı yok No Natural Wonders = Doğa Harikaları Yok -Victory conditions = Kazanma koşulları +Victory Conditions = Kazanma koşulları Scientific = Bilimsel Domination = Hakimiyet Cultural = Kültürel -Map shape = Harita şekli +Map Shape = Harita şekli Hexagonal = Altıgen şeklinde Rectangular = Dikdörtgen biçiminde @@ -297,7 +297,7 @@ Reset to default = Varsayılana sıfırla HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = AŞIRI DENEYSEL - UYARILDINIZ! Online Multiplayer = Çevrimiçi Çok Oyunculu -World size = Dünya büyüklüğü +World Size = Dünya büyüklüğü Tiny = Minik Small = Küçük Medium = Orta diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index fd3be328a1..168dd58fa7 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -252,29 +252,29 @@ Promotions = Підвищення Load copied data = Завантажити скопійовані дані Could not load game from clipboard! = Неможливо завантажити гру з буфера обміну! Start game! = Почати! -Map options = Налаштування мапи -Game options = Налаштування гри -Map type = Тип мапи +Map Options = Налаштування мапи +Game Options = Налаштування гри +Map Type = Тип мапи Generated = Створена Existing = Існуюча Custom = Користувацька -Map generation type = Тип генерації мапи +Map Generation Type = Тип генерації мапи Default = Звичайний Pangaea = Пангея Perlin = Перлин Continents = Континенти Archipelago = Архіпелаг -Number of city-states = Міст-держав +Number of City-States = Міст-держав One City Challenge = Випробовування «Одне місто» -No barbarians = Без варварів -No ancient ruins = Без древніх руїн +No Barbarians = Без варварів +No Ancient Ruins = Без древніх руїн No Natural Wonders = Без природних див -Victory conditions = Умови перемоги +Victory Conditions = Умови перемоги Scientific = Наукова Domination = Загарбання Cultural = Культурна -Map shape = Форма мапи +Map Shape = Форма мапи Hexagonal = Шестикутна Rectangular = Прямокутна @@ -293,7 +293,7 @@ Reset to default = Встановити за замовчуванням HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = ПЕРЕБУВАЄ В РОЗРОБЦІ — ВАС ПОПЕРЕДЖЕНО! Online Multiplayer = Багатокористувацька гра -World size = Розмір світу +World Size = Розмір світу Tiny = Крихітний Small = Малий Medium = Середній diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index c80cba6820..f42a4ac14d 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -252,30 +252,30 @@ Promotions = Load copied data = Could not load game from clipboard! = Start game! = -Map options = -Game options = +Map Options = +Game Options = Civilizations = -Map type = +Map Type = Generated = Existing = Custom = -Map generation type = +Map Generation Type = Default = Pangaea = Perlin = Continents = Archipelago = -Number of city-states = +Number of City-States = One City Challenge = -No barbarians = -No ancient ruins = +No Barbarians = +No Ancient Ruins = No Natural Wonders = -Victory conditions = +Victory Conditions = Scientific = Domination = Cultural = -Map shape = +Map Shape = Hexagonal = Rectangular = @@ -294,7 +294,7 @@ Reset to default = HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = Online Multiplayer = -World size = +World Size = Tiny = Small = Medium = diff --git a/changelog.md b/changelog.md index 7a077ec7c2..4703beb7d2 100644 --- a/changelog.md +++ b/changelog.md @@ -179,7 +179,7 @@ Translation updates ## 3.7.6 Can specify a mod as a 'base ruleset' - -supports mods with no techs, alternate tech trees, no barbarians, no workers +supports mods with no techs, alternate tech trees, No Barbarians, no workers Unique units need not replace existing ones @@ -858,7 +858,7 @@ Spain civ added - by r3versi Background work towards enabling mods -Resolved #1598 - we now save map options for new games started +Resolved #1598 - we now save Map Options for new games started Specific AI automation for Missile units means they won't try to move to tiles that they can't move to diff --git a/core/src/com/unciv/models/ruleset/tile/Terrain.kt b/core/src/com/unciv/models/ruleset/tile/Terrain.kt index 74bba37fa5..b007274b23 100644 --- a/core/src/com/unciv/models/ruleset/tile/Terrain.kt +++ b/core/src/com/unciv/models/ruleset/tile/Terrain.kt @@ -39,7 +39,7 @@ class Terrain : NamedStats() { var rough = false - fun getColor(): Color { // Can't be a lazy initialize. because w play around with the resulting color with lerp()s and the like + fun getColor(): Color { // Can't be a lazy initialize, because we play around with the resulting color with lerp()s and the like if (RGB == null) return Color.GOLD return colorFromRGB(RGB!![0], RGB!![1], RGB!![2]) } @@ -52,7 +52,7 @@ class Terrain : NamedStats() { sb.appendln("Occurs on [${occursOn.joinToString(", ")}]".tr()) if (turnsInto != null) - sb.appendln("Placed on [${turnsInto.tr()}]".tr()) + sb.appendln("Placed on [$turnsInto]".tr()) val resourcesFound = ruleset.tileResources.values.filter { it.terrainsCanBeFoundOn.contains(name) } if (resourcesFound.isNotEmpty()) diff --git a/core/src/com/unciv/ui/mapeditor/NewMapScreen.kt b/core/src/com/unciv/ui/mapeditor/NewMapScreen.kt index aaee070bf2..3fb4ac3f5a 100644 --- a/core/src/com/unciv/ui/mapeditor/NewMapScreen.kt +++ b/core/src/com/unciv/ui/mapeditor/NewMapScreen.kt @@ -26,7 +26,7 @@ class NewMapScreen : PickerScreen() { val newMapScreenOptionsTable = Table(skin).apply { pad(10f) - add("Map options".toLabel(fontSize = 24)).row() + add("Map Options".toLabel(fontSize = 24)).row() add(MapParametersTable(mapParameters, isEmptyMapAllowed = true)).row() pack() } diff --git a/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt b/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt index 2b54ef0689..19bb55cc8f 100644 --- a/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt @@ -19,13 +19,13 @@ class MapOptionsTable(val newGameScreen: NewGameScreen): Table() { init { defaults().pad(5f) - add("Map options".toLabel(fontSize = 24)).top().padBottom(20f).colspan(2).row() + add("Map Options".toLabel(fontSize = 24)).top().padBottom(20f).colspan(2).row() addMapTypeSelection() } private fun addMapTypeSelection() { - add("{Map type}:".toLabel()) + add("{Map Type}:".toLabel()) val mapTypes = arrayListOf("Generated") if (MapSaver.getMaps().isNotEmpty()) mapTypes.add(MapType.custom) val mapTypeSelectBox = TranslatedSelectBox(mapTypes, "Generated", CameraStageBaseScreen.skin) diff --git a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt index b05378e90c..080ebf82f9 100644 --- a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt @@ -45,7 +45,7 @@ class MapParametersTable(val mapParameters: MapParameters, val isEmptyMapAllowed mapParameters.shape = mapShapeSelectBox.selected.value } - add ("{Map shape}:".toLabel()).left() + add ("{Map Shape}:".toLabel()).left() add(mapShapeSelectBox).fillX().row() } @@ -70,7 +70,7 @@ class MapParametersTable(val mapParameters: MapParameters, val isEmptyMapAllowed noNaturalWondersCheckbox.isVisible = mapParameters.type != MapType.empty } - add("{Map generation type}:".toLabel()).left() + add("{Map Generation Type}:".toLabel()).left() add(mapTypeSelectBox).fillX().row() } @@ -86,12 +86,12 @@ class MapParametersTable(val mapParameters: MapParameters, val isEmptyMapAllowed mapParameters.size = MapSize.valueOf(worldSizeSelectBox.selected.value) } - add("{World size}:".toLabel()).left() + add("{World Size}:".toLabel()).left() add(worldSizeSelectBox).fillX().row() } private fun addNoRuinsCheckbox() { - noRuinsCheckbox = CheckBox("No ancient ruins".tr(), skin) + noRuinsCheckbox = CheckBox("No Ancient Ruins".tr(), skin) noRuinsCheckbox.isChecked = mapParameters.noRuins noRuinsCheckbox.onChange { mapParameters.noRuins = noRuinsCheckbox.isChecked } add(noRuinsCheckbox).colspan(2).row() diff --git a/core/src/com/unciv/ui/newgamescreen/NewGameParametersTable.kt b/core/src/com/unciv/ui/newgamescreen/NewGameOptionsTable.kt similarity index 93% rename from core/src/com/unciv/ui/newgamescreen/NewGameParametersTable.kt rename to core/src/com/unciv/ui/newgamescreen/NewGameOptionsTable.kt index 7492a865bc..cd909115be 100644 --- a/core/src/com/unciv/ui/newgamescreen/NewGameParametersTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/NewGameOptionsTable.kt @@ -13,7 +13,7 @@ import com.unciv.ui.utils.ImageGetter import com.unciv.ui.utils.onChange import com.unciv.ui.utils.toLabel -class NewGameParametersTable(newGameScreen: NewGameScreen, val updatePlayerPickerTable:(desiredCiv:String)->Unit) +class NewGameOptionsTable(newGameScreen: NewGameScreen, val updatePlayerPickerTable:(desiredCiv:String)->Unit) : Table(CameraStageBaseScreen.skin) { val newGameParameters = newGameScreen.gameSetupInfo.gameParameters val ruleset = newGameScreen.ruleset @@ -22,7 +22,7 @@ class NewGameParametersTable(newGameScreen: NewGameScreen, val updatePlayerPicke top() defaults().pad(5f) - add("Game options".toLabel(fontSize = 24)).padTop(0f).padBottom(20f).colspan(2).row() + add("Game Options".toLabel(fontSize = 24)).padTop(0f).padBottom(20f).colspan(2).row() addDifficultySelectBox() addGameSpeedSelectBox() addEraSelectBox() @@ -48,7 +48,7 @@ class NewGameParametersTable(newGameScreen: NewGameScreen, val updatePlayerPicke } private fun Table.addBarbariansCheckbox() = - addCheckbox("No barbarians", newGameParameters.noBarbarians) + addCheckbox("No Barbarians", newGameParameters.noBarbarians) { newGameParameters.noBarbarians = it } private fun Table.addOneCityChallengeCheckbox() = @@ -66,7 +66,7 @@ class NewGameParametersTable(newGameScreen: NewGameScreen, val updatePlayerPicke updatePlayerPickerTable("") } private fun addCityStatesSelectBox() { - add("{Number of city-states}:".toLabel()) + add("{Number of City-States}:".toLabel()) val cityStatesSelectBox = SelectBox(CameraStageBaseScreen.skin) val numberOfCityStates = ruleset.nations.filter { it.value.isCityState() }.size @@ -89,17 +89,17 @@ class NewGameParametersTable(newGameScreen: NewGameScreen, val updatePlayerPicke add(selectBox).fillX().row() } - private fun addDifficultySelectBox() { + private fun Table.addDifficultySelectBox() { addSelectBox("{Difficulty}:", ruleset.difficulties.keys, newGameParameters.difficulty) { newGameParameters.difficulty = it } } - private fun addGameSpeedSelectBox() { + private fun Table.addGameSpeedSelectBox() { addSelectBox("{Game Speed}:", GameSpeed.values().map { it.name }, newGameParameters.gameSpeed.name) { newGameParameters.gameSpeed = GameSpeed.valueOf(it) } } - private fun addEraSelectBox() { + private fun Table.addEraSelectBox() { val eras = ruleset.technologies.values.map { it.era() }.distinct() addSelectBox("{Starting Era}:", eras, newGameParameters.startingEra) { newGameParameters.startingEra = it } @@ -107,7 +107,7 @@ class NewGameParametersTable(newGameScreen: NewGameScreen, val updatePlayerPicke private fun addVictoryTypeCheckboxes() { - add("{Victory conditions}:".toLabel()).colspan(2).row() + add("{Victory Conditions}:".toLabel()).colspan(2).row() // Create a checkbox for each VictoryType existing var i = 0 diff --git a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt index 6f114f9745..d74a486622 100644 --- a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt +++ b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt @@ -37,13 +37,13 @@ class NewGameScreen(previousScreen:CameraStageBaseScreen, _gameSetupInfo: GameSe scrollPane.setScrollingDisabled(true, true) val playerPickerTable = PlayerPickerTable(this, gameSetupInfo.gameParameters) - val newGameScreenOptionsTable = NewGameParametersTable(this) { desiredCiv: String -> playerPickerTable.update(desiredCiv) } + val newGameOptionsTable = NewGameOptionsTable(this) { desiredCiv: String -> playerPickerTable.update(desiredCiv) } topTable.add(ScrollPane(MapOptionsTable(this)).apply { setOverscroll(false, false) }) .maxHeight(topTable.parent.height).width(stage.width / 3).padTop(20f).top() topTable.addSeparatorVertical() topTable.add(playerPickerTable).maxHeight(topTable.parent.height).width(stage.width / 3).padTop(20f).top() topTable.addSeparatorVertical() - topTable.add(ScrollPane(newGameScreenOptionsTable).apply { setOverscroll(false, false) }) + topTable.add(ScrollPane(newGameOptionsTable).apply { setOverscroll(false, false) }) .maxHeight(topTable.parent.height).width(stage.width / 3).padTop(20f).top() topTable.pack() topTable.setFillParent(true)