diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 0634b02823..d2fcebde5f 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -685,12 +685,9 @@ Sound effects volume = Volume dos efeitos sonoros Music volume = Volume da música City ambient sound volume = Volume do som ambiente da cidade Pause between tracks = Pausa entre as faixas - # Requires translation! -Pause = - # Requires translation! -Music = - # Requires translation! -Skip = +Pause = Pausa +Music = Música +Skip = Pular Currently playing: [title] = Atualmente tocando: [title] Download music = Baixar música Downloading... = Baixando... diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index a869d52245..4e261def51 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -686,11 +686,11 @@ Music volume = Volume de la musique City ambient sound volume = Volume de l'ambiance des villes Pause between tracks = Pause entre les musiques # Requires translation! -Pause = +Pause = Pause # Requires translation! -Music = +Music = Musique # Requires translation! -Skip = +Skip = Passer Currently playing: [title] = En cours de lecture : [title] Download music = Télécharger la musique Downloading... = Téléchargement... @@ -996,7 +996,7 @@ Start new game = Nouvelle partie Save game = Sauvegarder la partie Load game = Charger une partie Main menu = Menu principal -Resume = Continuer la partie +Resume = Reprendre Cannot resume game! = Impossible de reprendre cette partie ! Not enough memory on phone to load game! = Mémoire insuffisante sur le téléphone pour charger la partie ! Quickstart = Départ rapide diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 294d28dac5..91d1ec3974 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -261,8 +261,7 @@ Personality = Persönlichkeit Influence = Einfluss Ally: [civilization] with [amount] Influence = Bündnis: [civilization] mit [amount] Einfluss - # Requires translation! -Unknown civilization = +Unknown civilization = Unbekannte Zivilisation Reach 30 for friendship. = Erreiche einen Einfluss von 30 für Freundschaft. Reach highest influence above 60 for alliance. = Erreiche einen Einfluss von über 60 für ein Bündnis. When Friends: = Wenn Freunde: @@ -360,8 +359,7 @@ Archipelago = Archipele Inner Sea = Binnenmeer Number of City-States = Anzahl Stadtstaaten One City Challenge = Herausforderung nur eine Stadt - # Requires translation! -No City Razing = +No City Razing = Kein Niederreißen von Städten No Barbarians = Keine Barbaren Disable starting bias = Keine Startvorgaben Raging Barbarians = Wütende Barbaren @@ -642,8 +640,7 @@ Copy saved game to clipboard = Gespeichertes Spiel in die Zwischenablage kopiere Could not load game! = Das Spiel konnte nicht geladen werden! Could not load game from clipboard! = Das Spiel konnte nicht aus der Zwischenablage geladen werden! Could not load game from custom location! = Das Spiel konnte nicht von einem externen Speicherort geladen werden! - # Requires translation! -The file data seems to be corrupted. = +The file data seems to be corrupted. = Die Daten der Datei scheinen beschädigt zu sein. The save was created with an incompatible version of Unciv: [version]. Please update Unciv to this version or later and try again. = Der Speicherstand wurde mit einer inkompatiblen Version von Unciv erstellt: [version]. Bitte aktualisiere dein Unciv auf diese oder eine neuere Version und versuche es anschließend erneut. Load [saveFileName] = [saveFileName] laden Are you sure you want to delete this save? = Bist du dir sicher, dass du diesen Speicherstand löschen möchtest? @@ -688,12 +685,9 @@ Sound effects volume = Lautstärke Soundeffekte Music volume = Lautstärke Musik City ambient sound volume = Lautstärke der Stadt-Hintergrundgeräusche Pause between tracks = Pause zwischen den Titeln - # Requires translation! -Pause = - # Requires translation! -Music = - # Requires translation! -Skip = +Pause = Pause +Music = Musik +Skip = Überspringen Currently playing: [title] = Aktuelle Wiedergabe: [title] Download music = Musik herunterladen Downloading... = Lade herunter... @@ -715,8 +709,7 @@ off = aus Show pixel units = Pixel-Einheiten anzeigen Show pixel improvements = Pixel-Verbesserungen anzeigen Enable Nuclear Weapons = Aktiviere Atomwaffen - # Requires translation! -Experimental Demographics scoreboard = +Experimental Demographics scoreboard = Experimentelle Demographien-Übersicht Unit icon opacity = Deckkraft des Einheitensymbols Show zoom buttons in world screen = Zoom-Tasten in der Weltansicht anzeigen Enable display cutout (requires restart) = Aktiviere Bildschirmausschnitt (Neustart erforderlich) @@ -746,8 +739,7 @@ Font family = Schriftart Font size multiplier = Schriftgrößen-Multiplikator Default Font = Standardschrift You need to restart the game for this change to take effect. = Diese Änderung wird erst beim nächsten Start des Spiels wirksam. - # Requires translation! -Enable Easter Eggs = +Enable Easter Eggs = 'Easter Eggs' aktivieren # Notifications @@ -1243,8 +1235,7 @@ Show global politics = Zeige globale Politiken Show diagram = Zeige Diagramm At war with [enemy] = Im Krieg mit [enemy] Friends with [civName] = Befreundet mit [civName] - # Requires translation! -an unknown civilization = +an unknown civilization = eine unbekannte Zivilisation [numberOfTurns] Turns Left = [numberOfTurns] Runden verbleiben Denounced [otherCiv] = [otherCiv] angeprangert Allied with [civName] = Verbündet mit [civName] @@ -1270,10 +1261,8 @@ Capture [cityName] = Nimm [cityName] ein Our status = Unser Status Global status = Globaler Status Rankings = Ranglisten - # Requires translation! -Demographics = - # Requires translation! -Demographic = +Demographics = Demographien +Demographic = Demographie Rank = Rang Value = Wert Best = Bester @@ -1435,30 +1424,23 @@ Pillaging this improvement yields [stats] = Plünderung dieser Verbesserung ergi Pillaging this improvement yields approximately [stats] = Plünderung dieser Verbesserung ergibt ungefähr [stats] Needs removal of terrain features to be built = Benötigt die Entfernung von Geländefunktionen um gebaut werden zu können Unit type = Einheitentyp - # Requires translation! -Toggle UI (World Screen only) = +Toggle UI (World Screen only) = Oberfläche umschalten (Nur die Weltansicht) # Policies - # Requires translation! -Adopt = - # Requires translation! -Completed = - # Requires translation! -On adoption = - # Requires translation! -On completion = - # Requires translation! -Cannot be adopted together with = +Adopt = Verabschieden +Completed = Vollständig +On adoption = Beim Verabschieden +On completion = Bei Vervollständigung +Cannot be adopted together with = Kann nicht zusammen verabschiedet werden mit Adopt policy = Politik verabschieden Adopt free policy = Freie Politik verabschieden Unlocked at = Freigeschaltet bei Gain 2 free technologies = 2 kostenlose Technologien All policies adopted = Alle Politiken sind bereits verabschiedet Policy branch: [branchName] = Politikzweig: [branchName] - # Requires translation! -Are you sure you want to adopt [branchName]? = +Are you sure you want to adopt [branchName]? = Bist du dir sicher, dass du [branchName] verabschieden möchtest? # Religions @@ -4024,8 +4006,7 @@ Can be built outside your borders = Kann außerhalb der eigenen Grenzen gebaut w Gives a defensive bonus of [relativeAmount]% = Gibt einen Verteidigungsbonus von [relativeAmount]% Road = Straße - # Requires translation! -Costs [amount] [stat] per turn when in your territory = +Costs [amount] [stat] per turn when in your territory = Kosten von [amount] [stat] je Runde, wenn in deinem Territorium Reduces movement cost to ½ if the other tile also has a Road or Railroad = Reduziert die Bewegungskosten auf ½, wenn das andere Feld auch eine Straße oder Schiene hat Reduces movement cost to ⅓ with Machinery = Reduziert die Bewegungskosten auf ⅓ mit Maschinenbau Requires Engineering to bridge rivers = Erfordert Ingenieurswesen zur Überbrückung von Flüssen @@ -5755,8 +5736,7 @@ Uluru = Uluru #################### Lines from TileImprovements from Civ V - Gods & Kings #################### - # Requires translation! -Costs [amount] [stat] per turn = +Costs [amount] [stat] per turn = Kosten von [amount] [stat] je Runde Polder = Polder @@ -5973,8 +5953,7 @@ If you have a keyboard, some shortcut keys become available. Unit command or imp On the world screen the hotkeys are as follows: = In der Weltansicht sind die Tastenkombinationen wie folgt: Space or 'N' - Next unit or turn\n'E' - Empire overview (last viewed page)\n'+', '-' - Zoom in / out\nHome - center on capital or open its city screen if already centered = Leertaste oder 'N' - Nächste Einheit oder nächste Runde\n'E' - Reichsübersicht (zuletzt angesehene Seite)\n'+', '-' - Vergrößern / Verkleinern\nHome - Zentrieren auf Hauptstadt bzw. Stadt öffnen wenn dies bereits erfogt ist F1 - Open Civilopedia\nF2 - Empire overview Trades\nF3 - Empire overview Units\nF4 - Empire overview Diplomacy\nF5 - Social policies\nF6 - Technologies\nF7 - Empire overview Cities\nF8 - Victory Progress\nF9 - Empire overview Stats\nF10 - Empire overview Resources\nF11 - Quicksave\nF12 - Quickload = F1 - Civilopedia öffnen\nF2 - Reichsübersicht Handel\nF3 - Reichsübersicht Einheiten\nF4 - Reichsübersicht Diplomatie\nF5 - Sozialpolitik\nF6 - Technologien\nF7 - Reichsübersicht Städte\nF8 - Siegesfortschritt\nF9 - Reichsübersicht Statistiken\nF10 - Reichsübersicht Ressourcen\nF11 - Schnellspeichern\nF12 - Schnellladen - # Requires translation! -Ctrl-R - Toggle tile resource display\nCtrl-Y - Toggle tile yield display\nCtrl-O - Game options\nCtrl-S - Save game\nCtrl-L - Load game\nCtrl-U - Toggle UI (World Screen only) = +Ctrl-R - Toggle tile resource display\nCtrl-Y - Toggle tile yield display\nCtrl-O - Game options\nCtrl-S - Save game\nCtrl-L - Load game\nCtrl-U - Toggle UI (World Screen only) = Strg-R - Anzeige der Feldressourcen umschalten\nStrg-Y - Anzeige der Felderträge umschalten\nStrg-O - Spieloptionen\nStrg-S - Spiel speichern\nStrg-L - Spiel laden\nStrg-U - Oberfläche umschalten (Nur die Weltansicht) World Screen = Weltansicht This is where you spend most of your time playing Unciv. See the world, control your units, access other screens from here. = Hier verbringst du die meiste Zeit beim Spielen von Unciv. Von hier aus siehst du die Welt, steuerst deine Einheiten und rufst andere Ansichten auf. diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index e5e8d22f4f..f213dd4e19 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -262,7 +262,7 @@ Influence = Pengaruh Ally: [civilization] with [amount] Influence = Sekutu: [civilization] dengan [amount] Pengaruh # Requires translation! -Unknown civilization = +Unknown civilization = Peradaban yang tidak diketahui Reach 30 for friendship. = Capai 30 untuk persahabatan. Reach highest influence above 60 for alliance. = Capai pengaruh di atas 60 untuk persekutuan. When Friends: = Saat Berteman: @@ -361,7 +361,7 @@ Inner Sea = Laut Pedalaman Number of City-States = Jumlah Negara-Kota One City Challenge = Tantangan Satu(1) Kota # Requires translation! -No City Razing = +No City Razing = Tanpa Peruntuhan Kota No Barbarians = Tanpa Orang Barbar Disable starting bias = Matikan bias mulai Raging Barbarians = Orang Barbar Gila @@ -643,7 +643,7 @@ Could not load game! = Tidak dapat memuat gim! Could not load game from clipboard! = Tidak dapat memuat game dari papan klip! Could not load game from custom location! = Tidak dapat memuat dari lokasi tertentu # Requires translation! -The file data seems to be corrupted. = +The file data seems to be corrupted. = Data berkasnya sepertinya rusak. The save was created with an incompatible version of Unciv: [version]. Please update Unciv to this version or later and try again. = File yang disimpan tidak cocok dengan versi Unciv: [version]. Harap memperbarui Unciv ke versi ini atau versi yang lebih baru dan coba lagi. Load [saveFileName] = Muat [saveFileName] Are you sure you want to delete this save? = Apakah kamu yakin kamu ingin menghapus simpanan ini? @@ -689,11 +689,11 @@ Music volume = Volume suara musik City ambient sound volume = Volume suara suasana kota Pause between tracks = Jeda antarlagu # Requires translation! -Pause = +Pause = Jeda # Requires translation! -Music = +Music = Musik # Requires translation! -Skip = +Skip = Lewati Currently playing: [title] = Saat ini memutar: [title] Download music = Unduh lagu Downloading... = Mengunduh... @@ -716,7 +716,7 @@ Show pixel units = Tampilkan gambar unit Show pixel improvements = Tampilkan gambar peningkatan Enable Nuclear Weapons = Perbolehkan Senjata Nuklir # Requires translation! -Experimental Demographics scoreboard = +Experimental Demographics scoreboard = Papan Skor Demografik Eksperimental Unit icon opacity = Kegelapan ikon unit Show zoom buttons in world screen = Tampilkan tombol perbesaran di layar dunia Enable display cutout (requires restart) = Izinkan pemotongan tampilan (memerlukan restart) @@ -747,7 +747,7 @@ Font size multiplier = Pengganda ukuran font Default Font = Font Standar You need to restart the game for this change to take effect. = Kamu harus memulai ulang gimnya supaya perubahannya dapat diberlakukan. # Requires translation! -Enable Easter Eggs = +Enable Easter Eggs = Nyalakan Telur Paskah # Notifications @@ -1244,7 +1244,7 @@ Show diagram = Tunjukkan diagram At war with [enemy] = Berperang dengan [enemy] Friends with [civName] = Berteman dengan [civName] # Requires translation! -an unknown civilization = +an unknown civilization = peradaban yang tidak diketahui [numberOfTurns] Turns Left = [numberOfTurns] Giliran Lagi Denounced [otherCiv] = Menghina [otherCiv] Allied with [civName] = Bersekutu dengan [civName] @@ -1271,9 +1271,9 @@ Our status = Status kita Global status = Status global Rankings = Peringkat # Requires translation! -Demographics = +Demographics = Demografik # Requires translation! -Demographic = +Demographic = Demografik Rank = Peringkat Value = Nilai Best = Terbaik @@ -1436,21 +1436,21 @@ Pillaging this improvement yields approximately [stats] = Menjarah peningkatan i Needs removal of terrain features to be built = Memerlukan penyingkiran fitur-fitur medan supaya bisa dibangun Unit type = Jenis unit # Requires translation! -Toggle UI (World Screen only) = +Toggle UI (World Screen only) = Ubah UI (Layar Dunia saja) # Policies # Requires translation! -Adopt = +Adopt = Terapkan # Requires translation! -Completed = +Completed = Lengkap # Requires translation! -On adoption = +On adoption = Saat diterapkan # Requires translation! -On completion = +On completion = Saat lengkap # Requires translation! -Cannot be adopted together with = +Cannot be adopted together with = Tidak bisa diterapkan bersama dengan Adopt policy = Terapkan kebijakan Adopt free policy = Terapkan kebijakan gratis Unlocked at = Terbuka di @@ -1458,7 +1458,7 @@ Gain 2 free technologies = Mendapatkan 2 teknologi gratis All policies adopted = Semua kebijakan telah diterapkan Policy branch: [branchName] = Cabang kebijakan: [branchName] # Requires translation! -Are you sure you want to adopt [branchName]? = +Are you sure you want to adopt [branchName]? = Apakah Anda yakin Anda ingin menerapkan [branchName]? # Religions @@ -4025,7 +4025,7 @@ Gives a defensive bonus of [relativeAmount]% = Memberikan bonus pertahanan sebes Road = Jalan # Requires translation! -Costs [amount] [stat] per turn when in your territory = +Costs [amount] [stat] per turn when in your territory = Kamu harus membayar [amount] [stat] per giliran jika ini ada di dalam teritori kamu Reduces movement cost to ½ if the other tile also has a Road or Railroad = Mengurangi biaya pergerakan menjadi ½nya jika daerah lainnya memiliki Jalan atau Rel Kereta juga Reduces movement cost to ⅓ with Machinery = Mengurangi biaya pergerakan menjadi ⅓nya dengan Permesinan Requires Engineering to bridge rivers = Membutuhkan Keinsinyuran untuk membangun jembatan melintasi sungai @@ -5756,7 +5756,7 @@ Uluru = Uluru # Requires translation! -Costs [amount] [stat] per turn = +Costs [amount] [stat] per turn = Kamu harus membayar [amount] [stat] per giliran Polder = Polder @@ -5974,7 +5974,7 @@ On the world screen the hotkeys are as follows: = Di layar dunia, hotkeynya seba Space or 'N' - Next unit or turn\n'E' - Empire overview (last viewed page)\n'+', '-' - Zoom in / out\nHome - center on capital or open its city screen if already centered = Spasi atau 'N' - Unit atau giliran selanjutnya\n'E' - Gambaran kekaisaran (halaman terakhir yang dilihat)\n'+', '-' - Perbesar/Perkecil\nBeranda - memperlihatkan ibu kota atau membuka layar kotanya jika sudah diperlihatkan F1 - Open Civilopedia\nF2 - Empire overview Trades\nF3 - Empire overview Units\nF4 - Empire overview Diplomacy\nF5 - Social policies\nF6 - Technologies\nF7 - Empire overview Cities\nF8 - Victory Progress\nF9 - Empire overview Stats\nF10 - Empire overview Resources\nF11 - Quicksave\nF12 - Quickload = F1 - Buka Civilopedia\nF2 - Gambaran Perdagangan kekaisaran\nF3 - Gambaran Unit kekaisaran\nF4 - Gambaran Diplomasi kekaisaran\nF5 - Kebijakan Sosial\nF6 - Teknologi\nF7 - Gambaran Kota-kota kekaisaran\nF8 - Progres Kemenangan\nF9 - Gambaran Statistik kekaisaran\nF10 - Gambaran Sumber Daya kekaisaran\nF11 - Simpan kilat\nF12 - Muat kilat # Requires translation! -Ctrl-R - Toggle tile resource display\nCtrl-Y - Toggle tile yield display\nCtrl-O - Game options\nCtrl-S - Save game\nCtrl-L - Load game\nCtrl-U - Toggle UI (World Screen only) = +Ctrl-R - Toggle tile resource display\nCtrl-Y - Toggle tile yield display\nCtrl-O - Game options\nCtrl-S - Save game\nCtrl-L - Load game\nCtrl-U - Toggle UI (World Screen only) = Ctrl-R - Ubah tampilan sumber daya daerah\nCtrl-Y - Ubah tampilan penghasilan daerah\nCtrl-O - Pengaturan gim\nCtrl-S - Simpan gim\nCtrl-L - Muat gim\nCtrl-U - Ubah UI (Layar Dunia saja) World Screen = Layar Dunia This is where you spend most of your time playing Unciv. See the world, control your units, access other screens from here. = Di sinilah tempat di mana kamu akan menghabiskan sebagian besar waktumu saat bermain Unciv. Lihatlah dunia, perintahkan unitmu, dan akses layer-layar lainnya dari sini. diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 018945a356..e744d9b285 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -689,12 +689,9 @@ Sound effects volume = Volume effetti Music volume = Volume musica City ambient sound volume = Volume sonoro ambiente cittadino Pause between tracks = Pausa tra tracce musicali - # Requires translation! -Pause = - # Requires translation! -Music = - # Requires translation! -Skip = +Pause = Pausa +Music = Musica +Skip = Salta Currently playing: [title] = Traccia in riproduzione: [title] Download music = Scarica musica Downloading... = Download in corso... diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index e2f2ee0394..72b1208598 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -345,9 +345,12 @@ Map file = 지도 파일 Max Turns = 최대 턴수 Could not load map! = 지도를 불러올 수 없습니다! Generated = 새 지도 +Random Generated = 랜덤 생성 +Which options should be available to the random selection? = 랜덤 생성 시 어떤 설정을 허용하겠습니까? Existing = 기존 지도 Custom = 커스텀 Map Generation Type = 지도 유형 +Enabled Map Generation Types = 허용된 지도 유형 Default = 기본 Pangaea = 판게아 Smoothed Random = 평활 무작위 @@ -378,6 +381,7 @@ Time = 시간 ? = ? Map Shape = 지도 모양 +Enabled Map Shapes = 허용된 지도 모양 Hexagonal = 육각형 Flat Earth Hexagonal = 육각 평면설지구 Rectangular = 사각형 @@ -387,6 +391,8 @@ Radius = 반경 Enable Espionage = 스파이 활성화 Resource Setting = 자원 설정 +Enabled Resource Settings = 허용된 자원 설정 +Other Settings = 기타 설정 Sparse = 드묾 Abundant = 풍족함 Strategic Balance = 전략적 균형 @@ -410,6 +416,7 @@ Open Documentation = 도움말 보기 Don't show again = 다시 보지 않음 World Size = 지도 크기 +Enabled World Sizes = 허용된 지도 크기 Tiny = 초소형 Small = 소형 Medium = 중형 @@ -1060,6 +1067,7 @@ In resistance for another [numberOfTurns] turns = [numberOfTurns]턴 동안 저 We Love The King Day for another [numberOfTurns] turns = [numberOfTurns]턴 동안 국왕 경축일 Demanding [resource] = [resource] 요구 Sell for [sellAmount] gold = [sellAmount]골드에 판매 +Sell = 판매 Are you sure you want to sell this [building]? = [building]을(를) 판매하겠습니까? Free = 무료 [greatPerson] points = [greatPerson] 위인 점수 @@ -1434,6 +1442,7 @@ Completed = 완성함 On adoption = 채택 시 On completion = 완성 시 Cannot be adopted together with = 동시 채택 불가: +Cannot be adopted before = 선행조건: Adopt policy = 정책 채택 Adopt free policy = 무료 정책 채택 Unlocked at = 등장 시대: diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 2a592d7ab6..e4ec5e185b 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -238,8 +238,8 @@ You have broken your Pledge to Protect [civName]! = 你违背了保护[civName] City-States grow wary of your aggression. The resting point for Influence has decreased by [amount] for [civName]. = 城邦对你的侵略越来越警惕。你对[civName]的影响力减少了[amount]。 [cityState] is being attacked by [civName] and asks all major civilizations to help them out by gifting them military units. = [cityState]正受到[civName]的攻击,并希望所有主要文明通过向他们赠送军事单位来帮助他们。 -[cityState] is being invaded by Barbarians! Destroy Barbarians near their territory to earn Influence. = [cityState]正被蛮族入侵!摧毁他们附近的蛮族营地以获得影响力。 -[cityState] is grateful that you killed a Barbarian that was threatening them! = [cityState]感谢你摧毁了一个威胁他们的野蛮营地! +[cityState] is being invaded by Barbarians! Destroy Barbarians near their territory to earn Influence. = [cityState]正遭受蛮族的入侵!清理他们附近的蛮族单位、蛮族营地将获得影响力。 +[cityState] is grateful that you killed a Barbarian that was threatening them! = [cityState]感谢你摧毁了一个威胁他们的蛮族! [cityState] is being attacked by [civName]! Kill [amount] of the attacker's military units and they will be immensely grateful. = [cityState]正受到[civName]的攻击!杀死[amount]个攻击者的军事单位,他们将非常感激。 [cityState] is deeply grateful for your assistance in the war against [civName]! = [cityState]非常感谢您在对[civName]的战争中提供的帮助! [cityState] no longer needs your assistance against [civName]. = [cityState]不再需要您对[civName]的帮助。 @@ -569,7 +569,7 @@ Friend name = 好友名称 Player ID = 玩家ID Please input a name for your friend! = 给您的好友取一个名字! Please input a player ID for your friend! = 请输入或在右边复制您的好友ID! -Are you sure you want to delete this friend? = 您确定要和这位好友决断吗?(其实不会的,TA反正不知道你删了) +Are you sure you want to delete this friend? = 您确定要和这位好友决断吗?(其实不必顾虑的,TA反正不知道你删了) Paste player ID from clipboard = 从剪切板粘贴 Player name already used! = 真是的,怎么取名字对你这么难,这个名字已经用过了(狗头保命) Player ID already used! = 玩家ID已使用! @@ -613,7 +613,7 @@ Couldn't download the latest game state! = 无法下载最新的游戏状态! Resign = 放弃游戏 Are you sure you want to resign? = 您确定要放弃游戏吗? You can only resign if it's your turn = 你只能在你的回合放弃游戏 -[civName] resigned and is now controlled by AI = [civName]已放弃游戏,现在由 AI 控制 +[civName] resigned and is now controlled by AI = [civName]已放弃游戏,现在已由 AI 控制 Last refresh: [duration] ago = 上次刷新是在:[duration]前 Current Turn: [civName] since [duration] ago = 当前回合:[civName] 已持续[duration] Seconds = 秒 @@ -685,12 +685,9 @@ Sound effects volume = 音效音量 Music volume = 音乐音量 City ambient sound volume = 城市环境音量 Pause between tracks = 音轨间停顿 - # Requires translation! -Pause = - # Requires translation! -Music = - # Requires translation! -Skip = +Pause = 暂停 +Music = 音乐 +Skip = 跳过 Currently playing: [title] = 当前播放: [title] Download music = 下载音乐 Downloading... = 正在下载... @@ -712,8 +709,7 @@ off = 关闭 Show pixel units = 显示像素单位 Show pixel improvements = 显示像素设施 Enable Nuclear Weapons = 启用核武器 - # Requires translation! -Experimental Demographics scoreboard = +Experimental Demographics scoreboard = 新的人口计数器(实验性) Unit icon opacity = 单位图标不透明度 Show zoom buttons in world screen = 在游戏界面显示缩放按钮 Enable display cutout (requires restart) = 启用切边显示(需要重启) @@ -743,8 +739,7 @@ Font family = 字体 Font size multiplier = 字体大小倍率 Default Font = 默认字体 You need to restart the game for this change to take effect. = 您需要重新启动游戏才能使此更改生效。 - # Requires translation! -Enable Easter Eggs = +Enable Easter Eggs = 启用复活节彩蛋 # Notifications @@ -1266,10 +1261,8 @@ Capture [cityName] = 占领[cityName] Our status = 我们的进度 Global status = 全球进度 Rankings = 排名 - # Requires translation! -Demographics = - # Requires translation! -Demographic = +Demographics = 人口统计 +Demographic = 人口 Rank = 排名 Value = 数值 Best = 全球领先 @@ -1290,11 +1283,11 @@ Vote for World Leader = 选举世界领袖 What would you like to do with the city of [cityName]? = 你想对[cityName]做些什么呢? Annex = 吞并 -Annexed cities become part of your regular empire. = “吞并城市” 意味着该城市将成为您的帝国直辖的一部分。 +Annexed cities become part of your regular empire. = “吞并城市” 意味着该城市将成为您帝国直辖的一部分。 Their citizens generate 2x the unhappiness, unless you build a courthouse. = 该城市人口导致的不满将是正常值的 2 倍,建造 “法庭” 可以使该值降低到正常值。 Puppet = 傀儡城市 Puppeted cities do not increase your tech or policy cost. = 傀儡城市 -You have no control over the the production of puppeted cities. = 您无法控制已傀儡城市的产能。 +You have no control over the the production of puppeted cities. = 您无法控制已傀儡城市的产能分配。 Puppeted cities also generate 25% less Gold and Science. = 已傀儡城市的金钱和科研产出 -25%。 A puppeted city can be annexed at any time. = 可以在任何时候选择吞并已傀儡城市。 Liberate (city returns to [originalOwner]) = 解放(城市归还[originalOwner]) diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 06b699185d..c23ff888c5 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.7.21" const val appName = "Unciv" - const val appCodeNumber = 789 - const val appVersion = "4.3.15" + const val appCodeNumber = 790 + const val appVersion = "4.3.16" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 3dc61aa65f..ac5c5aa105 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,26 @@ +## 4.3.16 + +Resolve - Humidity/Temperature restrictions work on terrain features + +Resolve - Allow mass unit upgrades from the unit overview screen + +Resolve - Calculate 'tiles can reach this turn' correctly with combinations of roads + railroads + +Resolve - If several improvements can provide a resource, workers pick the one that gives the most yields + +By FiretronP75: +- Use removeTerrainFeatures and addTerrainFeature instead of setTerrainFeatures so serialization will work. +- Add new game option to randomly select from map options. + +By vegeta1k95: +- Added various styles for displaying resource icons +- Modding: allow for custom TechPortraits +- Barbarian Civ icon +- Fixed PolicyScreen branches requirements text +- Fix connecting lines edges + +Translate "Sell" in city screen - By Ouaz + ## 4.3.15 Modding: Validate unique parameters for mods diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index ea77dae89a..43066b2cd6 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -470,7 +470,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() { companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.3.15", 789) + val VERSION = Version("4.3.16", 790) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/790.txt b/fastlane/metadata/android/en-US/changelogs/790.txt new file mode 100644 index 0000000000..0da9cb041c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/790.txt @@ -0,0 +1,22 @@ + + +Resolve - Humidity/Temperature restrictions work on terrain features + +Resolve - Allow mass unit upgrades from the unit overview screen + +Resolve - Calculate 'tiles can reach this turn' correctly with combinations of roads + railroads + +Resolve - If several improvements can provide a resource, workers pick the one that gives the most yields + +By FiretronP75: +- Use removeTerrainFeatures and addTerrainFeature instead of setTerrainFeatures so serialization will work. +- Add new game option to randomly select from map options. + +By vegeta1k95: +- Added various styles for displaying resource icons +- Modding: allow for custom TechPortraits +- Barbarian Civ icon +- Fixed PolicyScreen branches requirements text +- Fix connecting lines edges + +Translate "Sell" in city screen - By Ouaz \ No newline at end of file