diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index ee183a3d97..fb1b08419b 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -75,21 +75,21 @@ Hydro Plant = Centrale Hydroélectrique # Diplomacy,Trade,Nations -Requires [buildingName] to be built in the city = Nécessite la construction de [buildingName] dans la ville -Requires [buildingName] to be built in all cities = Nécessite la construction de [buildingName] dans toutes les villes +Requires [buildingName] to be built in the city = Nécessite de construire un(e) [buildingName] dans la ville +Requires [buildingName] to be built in all cities = Nécessite de construire un(e) [buildingName] dans toutes les villes Provides a free [buildingName] in the city = Fournit un(e) [buildingName] gratuit(e) dans la ville Requires worked [resource] near city = Nécessite l'exploitation de [resource] près de la ville Requires at least one of the following resources worked near the city: = Nécessite qu'au moins une des ressources suivantes soit exploitée près de la ville : Wonder is being built elsewhere = Merveille déjà en construction ailleurs National Wonder is being built elsewhere = Merveille Nationale déjà en construction ailleurs -Requires a [buildingName] in all cities = Nécessite un(e) [buildingName] dans toutes les villes +Requires a [buildingName] in all cities = Nécessite [buildingName] dans toutes les villes [buildingName] required: = [buildingName] requis(e) : -Requires a [buildingName] in this city = Nécessite un(e) [buildingName] dans cette ville +Requires a [buildingName] in this city = Nécessite [buildingName] dans cette ville Cannot be built with [buildingName] = Ne peut pas être construit avec [buildingName] Consumes [amount] [resource] = Consomme [amount] [resource] Need [amount] more [resource] = Nécessite [amount] [resource] de plus [amount] available = [amount] disponibles -Required tech: [requiredTech] = Nécessite la technologie : [requiredTech] +Required tech: [requiredTech] = Technologie requise : [requiredTech] Requires [PolicyOrNationalWonder] = Nécessite [PolicyOrNationalWonder] Cannot be purchased = Ne peut pas être acheté Can only be purchased = Peut uniquement être acheté @@ -116,7 +116,7 @@ Cancel = Annuler Diplomacy = Diplomatie War = Guerre Peace = Paix -Research Agreement = Accord de Recherche +Research Agreement = Accords de Recherche Declare war = Déclarer la guerre Declare war on [civName]? = Déclarer la guerre à [civName] ? Go to on map = Aller sur la carte @@ -825,30 +825,30 @@ Your Golden Age has ended. = Votre Âge d'Or a pris fin. [cityName] has been razed to the ground! = [cityName] a été rasée ! We have conquered the city of [cityName]! = Nous avons conquis la ville de [cityName] ! Your citizens are revolting due to very high unhappiness! = Vos citoyens se révoltent en raison du très fort mécontentement ! -An enemy [unit] has attacked [cityName] = Un(e) [unit] ennemi(e) a attaqué [cityName] -An enemy [unit] ([amount] HP) has attacked [cityName] ([amount2] HP) = Un(e) [unit] ennemi(e) ([amount] PV) a attaqué [cityName] ([amount2] PV) -An enemy [unit] has attacked our [ourUnit] = Un(e) [unit] ennemi(e) a attaqué notre [ourUnit] -An enemy [unit] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) = Un(e) [unit] ennemi(e) ([amount] PV) a attaqué notre [ourUnit] ([amount2] PV) -Enemy city [cityName] has attacked our [ourUnit] = La ville ennemie [cityName] a attaqué notre [ourUnit] -Enemy city [cityName] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) = La ville ennemie [cityName] ([amount] PV) a attaqué notre [ourUnit] ([amount2] PV) -An enemy [unit] has captured [cityName] = Un(e) [unit] ennemi(e) a conquis [cityName] -An enemy [unit] ([amount] HP) has captured [cityName] ([amount2] HP) = Un(e) [unit] ennemi(e) ([amount] PV) a conquis [cityName] ([amount2] PV) -An enemy [unit] has raided [cityName] = Un(e) [unit] ennemi(e) a mis à sac [cityName] -An enemy [unit] ([amount] HP) has raided [cityName] ([amount2] HP) = Un(e) [unit] ennemi(e) ([amount] PV) a mis à sac [cityName] ([amount2] PV) -An enemy [unit] has captured our [ourUnit] = Un(e) [unit] ennemi(e) a capturé notre [ourUnit] -An enemy [unit] ([amount] HP) has captured our [ourUnit] ([amount2] HP) = Un(e) [unit] ennemi(e) ([amount] PV) a capturé notre [ourUnit] ([amount2] PV) -An enemy [unit] has destroyed our [ourUnit] = Un(e) [unit] ennemi(e) a détruit notre [ourUnit] -An enemy [unit] ([amount] HP) has destroyed our [ourUnit] ([amount2] HP) = Un(e) [unit] ennemi(e) ([amount] PV) a détruit notre [ourUnit] ([amount2] PV) +An enemy [unit] has attacked [cityName] = [unit] ennemi(e) a attaqué [cityName] +An enemy [unit] ([amount] HP) has attacked [cityName] ([amount2] HP) = [unit] ennemi(e) ([amount] PV) a attaqué [cityName] ([amount2] PV) +An enemy [unit] has attacked our [ourUnit] = [unit] ennemi(e) a attaqué notre [ourUnit] +An enemy [unit] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) = [unit] ennemi(e) ([amount] PV) a attaqué notre [ourUnit] ([amount2] PV) +Enemy city [cityName] has attacked our [ourUnit] = Ville ennemie [cityName] a attaqué notre [ourUnit] +Enemy city [cityName] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) = Ville ennemie [cityName] ([amount] PV) a attaqué notre [ourUnit] ([amount2] PV) +An enemy [unit] has captured [cityName] = [unit] ennemi(e) a conquis [cityName] +An enemy [unit] ([amount] HP) has captured [cityName] ([amount2] HP) = [unit] ennemi(e) ([amount] PV) a conquis [cityName] ([amount2] PV) +An enemy [unit] has raided [cityName] = [unit] ennemi(e) a mis à sac [cityName] +An enemy [unit] ([amount] HP) has raided [cityName] ([amount2] HP) = [unit] ennemi(e) ([amount] PV) a mis à sac [cityName] ([amount2] PV) +An enemy [unit] has captured our [ourUnit] = [unit] ennemi(e) a capturé notre [ourUnit] +An enemy [unit] ([amount] HP) has captured our [ourUnit] ([amount2] HP) = [unit] ennemi(e) ([amount] PV) a capturé notre [ourUnit] ([amount2] PV) +An enemy [unit] has destroyed our [ourUnit] = [unit] ennemi(e) a détruit notre [ourUnit] +An enemy [unit] ([amount] HP) has destroyed our [ourUnit] ([amount2] HP) = [unit] ennemi(e) ([amount] PV) a détruit notre [ourUnit] ([amount2] PV) Your [ourUnit] has destroyed an enemy [unit] = Votre [ourUnit] a détruit un(e) [unit] ennemi(e) Your [ourUnit] ([amount] HP) has destroyed an enemy [unit] ([amount2] HP) = Votre [ourUnit] ([amount] PV) a détruit un(e) [unit] ennemi(e) ([amount2] PV) -An enemy [RangedUnit] has destroyed the defence of [cityName] = Un(e) [RangedUnit] ennemi(e) a détruit la défense de [cityName] -An enemy [RangedUnit] ([amount] HP) has destroyed the defence of [cityName] ([amount2] HP) = Un(e) [RangedUnit] ennemi(e) ([amount] PV) a détruit la défense de [cityName] ([amount2] PV) -Enemy city [cityName] has destroyed our [ourUnit] = La ville ennemie [cityName] a détruit notre [ourUnit] -Enemy city [cityName] ([amount] HP) has destroyed our [ourUnit] ([amount2] HP) = La ville ennemie [cityName] ([amount] PV) a détruit notre [ourUnit] ([amount2] PV) -An enemy [unit] was destroyed while attacking [cityName] = Un(e) [unit] ennemi(e) a été détruit(e) en attaquant [cityName] -An enemy [unit] ([amount] HP) was destroyed while attacking [cityName] ([amount2] HP) = Un(e) [unit] ennemi(e) ([amount] PV) a été détruit(e) en attaquant [cityName] ([amount2] PV) -An enemy [unit] was destroyed while attacking our [ourUnit] = Un(e) [unit] ennemi(e) a été détruit(e) en attaquant notre [ourUnit] -An enemy [unit] ([amount] HP) was destroyed while attacking our [ourUnit] ([amount2] HP) = Un(e) [unit] ennemi(e) ([amount] PV) a été détruit(e) en attaquant notre [ourUnit] ([amount2] PV) +An enemy [RangedUnit] has destroyed the defence of [cityName] = [RangedUnit] ennemi(e) a détruit la défense de [cityName] +An enemy [RangedUnit] ([amount] HP) has destroyed the defence of [cityName] ([amount2] HP) = [RangedUnit] ennemi(e) ([amount] PV) a détruit la défense de [cityName] ([amount2] PV) +Enemy city [cityName] has destroyed our [ourUnit] = Ville ennemie [cityName] a détruit notre [ourUnit] +Enemy city [cityName] ([amount] HP) has destroyed our [ourUnit] ([amount2] HP) = Ville ennemie [cityName] ([amount] PV) a détruit notre [ourUnit] ([amount2] PV) +An enemy [unit] was destroyed while attacking [cityName] = [unit] ennemi(e) a été détruit(e) en attaquant [cityName] +An enemy [unit] ([amount] HP) was destroyed while attacking [cityName] ([amount2] HP) = [unit] ennemi(e) ([amount] PV) a été détruit(e) en attaquant [cityName] ([amount2] PV) +An enemy [unit] was destroyed while attacking our [ourUnit] = [unit] ennemi(e) a été détruit(e) en attaquant notre [ourUnit] +An enemy [unit] ([amount] HP) was destroyed while attacking our [ourUnit] ([amount2] HP) = [unit] ennemi(e) ([amount] PV) a été détruit(e) en attaquant notre [ourUnit] ([amount2] PV) Our [attackerName] ([amount] HP) was destroyed by an intercepting [interceptorName] ([amount2] HP) = Notre [attackerName] ([amount] PV) a été intercepté(e) et détruit(e) par un(e) [interceptorName] ([amount2] PV) Our [attackerName] ([amount] HP) was destroyed by an unknown interceptor = Notre [attackerName] ([amount] PV) a été détruit(e) par une unité d'interception inconnue Our [interceptorName] ([amount] HP) intercepted and destroyed an enemy [attackerName] ([amount2] HP) = Notre [interceptorName] ([amount] PV) a intercepté et détruit un(e) [attackerName] ennemi(e) ([amount2] PV) @@ -859,12 +859,12 @@ Our [attackerName] ([amount] HP) was attacked by an intercepting [interceptorNam Our [attackerName] ([amount] HP) was attacked by an unknown interceptor = Notre [attackerName] ([amount] PV) a été attaqué(e) par une unité d'interception inconnue Our [interceptorName] ([amount] HP) intercepted and attacked an enemy [attackerName] ([amount2] HP) = Notre [interceptorName] ([amount] PV) a intercepté et attaqué un(e) [attackerName] ennemi(e) ([amount2] PV) Nothing tried to intercept our [attackerName] = Rien n'a tenté d'intercepter notre [attackerName] -An enemy [unit] was spotted near our territory = Un(e) [unit] ennemi(e) a été repéré(e) près de notre territoire -An enemy [unit] was spotted in our territory = Un(e) [unit] ennemi(e) a été repéré(e) sur notre territoire +An enemy [unit] was spotted near our territory = [unit] ennemi(e) repéré(e) près de notre territoire +An enemy [unit] was spotted in our territory = [unit] ennemi(e) repéré(e) sur notre territoire Your city [cityName] can bombard the enemy! = Votre ville [cityName] peut bombarder l'ennemi ! [amount] of your cities can bombard the enemy! = [amount] de vos villes peuvent bombarder l'ennemi ! -[amount] enemy units were spotted near our territory = [amount] unités ennemies ont été repérées près de notre territoire -[amount] enemy units were spotted in our territory = [amount] unités ennemies ont été repérées sur notre territoire +[amount] enemy units were spotted near our territory = [amount] unités ennemies repérées près de notre territoire +[amount] enemy units were spotted in our territory = [amount] unités ennemies repérées sur notre territoire A(n) [nukeType] exploded in our territory! = Un(e) [nukeType] a explosé sur notre territoire ! After being hit by our [nukeType], [civName] has declared war on us! = Apres avoir été frappé par notre [nukeType], [civName] nous a déclaré la guerre ! The civilization of [civName] has been destroyed! = La civilisation [civName] a été détruite ! diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index 85016dbe1a..26d7409631 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -2052,8 +2052,7 @@ Rough terrain = Nehéz terep Deposits in [tileFilter] tiles always provide [amount] resources = A [tileFilter] mezőkön lévő készletekből mindig [amount] erőforráshoz lehet jutni Can only be created by Mercantile City-States = Csak kereskedő városállamok tudják létrehozni Stockpiled = Készleten - # Requires translation! -Cannot be traded = +Cannot be traded = Nem lehet vele kereskedni Guaranteed with Strategic Balance resource option = A stratégiai egyensúly opció által garantált Can also be built on tiles adjacent to fresh water = Édesvíz melletti mezőkre is építhető [stats] from [tileFilter] tiles = [stats] [tileFilter] mezőkből @@ -2075,8 +2074,7 @@ for [amount] turns = [amount] körig with [amount]% chance = [amount]% eséllyel before [amount] turns = [amount] körrel korábban after [amount] turns = [amount] körrel később - # Requires translation! -for [nationFilter] = +for [nationFilter] = [nationFilter] számára when at war = háborúban when not at war = , ha nem állsz hadban senkivel during a Golden Age = az Aranykor időtartama alatt @@ -2149,10 +2147,8 @@ Free Technology = Ajándék technológia Reveals the entire map = Felfedi az egész térképet Gain a free [beliefType] belief = [beliefType] tant megkapod ajándékba Triggers voting for the Diplomatic Victory = Elindítja a diplomáciai győzelemhez szükséges szavazást - # Requires translation! -Instantly consumes [amount] [resource] = - # Requires translation! -Instantly provides [amount] [resource] = +Instantly consumes [amount] [resource] = Azonnal felhasznál [amount] [resource] erőforrást +Instantly provides [amount] [resource] = Azonnal biztosít [amount] [resource] erőforrást Gain [amount] [stat/resource] = [amount] [stat/resource] lesz a tiéd Gain [amount]-[amount2] [stat] = [amount]-[amount2] [stat] lesz a tiéd Gain enough Faith for a Pantheon = A panteon alapításához elegendő hithez jutsz @@ -3289,20 +3285,13 @@ Karachi = Karacsi India = India Otto von Bismarck = Otto von Bismarck - # Requires translation! -I cannot wait until ye grow even mightier. Therefore, prepare for war! = - # Requires translation! -Corrupted villain! We will bring you into the ground! = - # Requires translation! -Germany has been destroyed. I weep for the future generations. = - # Requires translation! -Guten Tag. In the name of the great German people, I bid you welcome. = - # Requires translation! -It would be in your best interest, to carefully consider this proposal. = - # Requires translation! -What now? = - # Requires translation! -So, out with it! = +I cannot wait until ye grow even mightier. Therefore, prepare for war! = Nem várhatok, míg még nagyobb hatalomra teszel szert. Készülj tehát a háborúra! +Corrupted villain! We will bring you into the ground! = Mocskos gazember! A sírba fogunk küldeni! +Germany has been destroyed. I weep for the future generations. = Németország elpusztult. Könnybe lábad a szemem, ha a következő generációkra gondolok. +Guten Tag. In the name of the great German people, I bid you welcome. = Guten Tag! Üdvözletünket küldjük a hatalmas német nép nevében! +It would be in your best interest, to carefully consider this proposal. = A te érdekedet is az szolgálná a legjobban, ha alaposan megfontolnád ezt az ajánlatot. +What now? = Mi az megint? +So, out with it! = Szóval, ki vele! # Requires translation! Furor Teutonicus = Berlin = Berlin diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 97495cf196..e99d5f2be8 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -694,7 +694,7 @@ Auto (sensor adjusted) = Autoobracanie # Requires translation! Map mouse auto-scroll = # Requires translation! -Map panning speed = +Map panning speed = Szybkość przesuwania mapy Order trade offers by amount = Sortuj oferty handlowe według kwoty Experimental Demographics scoreboard = Eksperymentalna tablica Demografii Unit icon opacity = Przezroczystość ikonek jednostek @@ -969,9 +969,9 @@ You may choose [amount] free Policies = Można wybrać [amount] darmowe ustroje You gain the [policy] Policy = Otrzymujesz ustrój [policy] You enter a Golden Age = Twoja cywilizacja weszła w Złoty Wiek # Requires translation! -You have gained [amount] [resourceName] = +You have gained [amount] [resourceName] = Zdobyłeś [amount] [resourceName] # Requires translation! -You have lost [amount] [resourceName] = +You have lost [amount] [resourceName] = Straciłeś [amount] [resourceName] ## Trigger causes @@ -1816,7 +1816,7 @@ City-State Influence recovers at twice the normal rate = Wpływy w Wolnych Miast [amount] units cost no maintenance = Darmowe utrzymanie dla [amount] jednostek Cannot build [baseUnitFilter] units = Nie można zbudować jednostek [baseUnitFilter] # Requires translation! -Costs [amount] [resource] = +Costs [amount] [resource] = Kosztuje [amount] [resource] [relativeAmount]% growth [cityFilter] = [relativeAmount]% wzrostu Populacji [cityFilter] [relativeAmount]% Food is carried over after population increases [cityFilter] = [relativeAmount]% ⁂Żywności zostaje zachowane po wzroście populacji [cityFilter] [relativeAmount]% Great Person generation [cityFilter] = [relativeAmount]% więcej punktów do generowania Wielkich Ludzi [cityFilter] @@ -2056,9 +2056,9 @@ Rough terrain = Teren Trudny Deposits in [tileFilter] tiles always provide [amount] resources = Złoża na polach [tileFilter] zawsze dostarczają [amount] zasobu Can only be created by Mercantile City-States = Może być stworzone tylko przez miasta kupieckie # Requires translation! -Stockpiled = +Stockpiled = Składowane # Requires translation! -Cannot be traded = +Cannot be traded = Nie może być handlowane Guaranteed with Strategic Balance resource option = Gwarantowane z opcją strategicznego balansu surowców Can also be built on tiles adjacent to fresh water = Można zbudować także na innych polach, jeśli mają dostęp do wody pitnej. [stats] from [tileFilter] tiles = [stats] za każde pole z [tileFilter] @@ -2081,7 +2081,7 @@ with [amount]% chance = z szansą [amount]% before [amount] turns = przed [amount] turą after [amount] turns = po [amount] turach # Requires translation! -for [nationFilter] = +for [nationFilter] = dla [nationFilter] when at war = podczas wojny when not at war = w czasie trwania pokoju during a Golden Age = podczas Złotej Ery @@ -2155,9 +2155,9 @@ Reveals the entire map = Odkrywa mapę całego Świata Gain a free [beliefType] belief = Zdobądź darmowe wierzenie [beliefType] Triggers voting for the Diplomatic Victory = Rozpoczyna głosowanie za Zwycięstwem Dyplomatycznym # Requires translation! -Instantly consumes [amount] [resource] = +Instantly consumes [amount] [resource] = Natychmiastowo zużywa [amount] [resource] # Requires translation! -Instantly provides [amount] [resource] = +Instantly provides [amount] [resource] = Natychmiastowo zapewnia [amount] [resource] Gain [amount] [stat/resource] = Zdobądź [amount] [stat/resource] Gain [amount]-[amount2] [stat] = Zdobądź [amount]-[amount2] [stat] Gain enough Faith for a Pantheon = Zdobądź wystarczającą ilość Wiary dla Panteonu @@ -2166,7 +2166,7 @@ Reveal up to [amount/'all'] [tileFilter] within a [amount] tile radius = Odsłan From a randomly chosen tile [amount] tiles away from the ruins, reveal tiles up to [amount2] tiles away with [amount3]% chance = Od losowo wybranego miejsca odległego [amount] pól od Ruin, odsłoni obszar w promieniu [amount2] pól z szansą [amount3]% Triggers the following global alert: [comment] = Inicjujesz następujący alert globalny: [comment] # Requires translation! -Every major Civilization gains a spy once a civilization enters this era = +Every major Civilization gains a spy once a civilization enters this era = Każda cywilizacja zdobywa szpiega gdy wkroczy w tą erę Heal this unit by [amount] HP = Jednostka odzyskuje +[amount] PŻ This Unit gains [amount] XP = Ta jednostka otrzymuje [amount] PD This Unit upgrades for free including special upgrades = Ta jednostka ulepszana jest za darmo (w tym ulepszania specjalne) @@ -6363,7 +6363,7 @@ Using the Keys page = Używanie zakładki Klawisze Each binding has a button with an image looking like this: = While hovering the mouse over the key button, you can press a desired key directly to assign it. = Gdy najedziesz myszką na przycisk klawisza możesz nacisnąć klawisz który zostanie następnie przypisany. # Requires translation! -Double-click the image to reset the binding to default. = +Double-click the image to reset the binding to default. = Kliknij podwójnie obrazek, żeby przywrócić domyślne przypisanie klawisza. Bindings mapped to their default keys are displayed in gray, those reassigned by you in white. = Skróty przypisane do ich domyślnych klawiszy są wyświetlane na szaro, a te przypisane przez ciebie na biało. For discussion about missing entries, see the linked github issue. = Aby przedyskutować brakujące funkcje zobacz link do problemu Github. diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 077d4739ae..9d2a3f78e2 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -1369,7 +1369,7 @@ Vote for [civilizationName] = 给[civilizationName]投票 Continue = 继续 Abstained = 弃权 Vote for World Leader = 选举世界领袖 -Replay = 重放 +Replay = 回放 # Capturing a city @@ -6332,29 +6332,29 @@ City Blockade = 城市封锁 One of your cities is under a naval blockade! When all adjacent water tiles of a coastal city are blocked - city loses harbor connection to all other cities, including capital. Make sure to de-blockade cities by deploying friendly military naval units to fight off invaders. = 你的某些城市被水路封锁了! —— 当沿海城市的所有相邻水域被封锁时，该城市将失去与所有其他城市的港口联系，包括首都。请确保通过部署友好的海军部队来解除对城市的封锁，击退入侵者。 Keyboard Bindings = 快捷键绑定 -Limitations = 限制 -This is a work in progress. = 现工作尚未完结。 -For technical reasons, only direct keys or Ctrl-Letter combinations can be used. = 由于技术原因，现仅可用单个按键或加Ctrl，作为快捷键 -The Escape key is intentionally excluded from being reassigned. = 不可重定义Esc键 -Currently, there are no checks to prevent conflicting assignments. = 目前，系统无法侦测快捷键间冲突 -Using the Keys page = 使用密钥页面 -Each binding has a button with an image looking like this: = 每一个绑定都有一个像这样的图标： -While hovering the mouse over the key button, you can press a desired key directly to assign it. = 移动鼠标至功能键上，然后按下键盘按键即可定义快捷键。 -Double-click the image to reset the binding to default. = 双击图标重制。 +Limitations = 局限性 +This is a work in progress. = 此工作正在进行中。 +For technical reasons, only direct keys or Ctrl-Letter combinations can be used. = 由于技术原因，快捷键仅支持单个按键或Ctrl+字母组合键。 +The Escape key is intentionally excluded from being reassigned. = 不可重新分配Esc键。 +Currently, there are no checks to prevent conflicting assignments. = 目前，系统无法侦测快捷键间冲突。 +Using the Keys page = 使用按键页面 +Each binding has a button with an image looking like this: = 每个绑定都有一个按钮，其图标看起来像这样： +While hovering the mouse over the key button, you can press a desired key directly to assign it. = 将鼠标悬停在键位按钮上，然后直接按下所需的按键即可分配快捷键。 +Double-click the image to reset the binding to default. = 双击图标重置。 Bindings mapped to their default keys are displayed in gray, those reassigned by you in white. = 默认设置为灰色，自定义快捷键为白色。 -For discussion about missing entries, see the linked github issue. = 如果有缺失，请提交Github Issue +For discussion about missing entries, see the linked github issue. = 如有漏项，请提交Github Issue。 -Welcome to the Civilopedia! = 欢迎来到文明维基 -Here you can find information - general help, rules, and what makes up the game world. = 你可以在这里找到你需要的信息，帮助、规则和游戏世界 +Welcome to the Civilopedia! = 欢迎来到文明百科 +Here you can find information - general help, rules, and what makes up the game world. = 在这里，您可以找到所需的信息，包括帮助、规则和游戏世界的构成。 How to find information = 如何检索信息 -Select categories with the buttons on top of the screen. Also up there is the button to leave Civilopedia and go back to where you were before. = 于屏幕上方选择对应分类，另外，屏幕上方还有回退键 -Each category has a list of entries on the left of the screen, sorted alphabetically (with few exceptions). Clicking an entry will update the center pane were you are currently reading this. = 每个分类都含有一列排好的条目，点击条目即可阅读。 -Lines can link to other Civilopedia entries, they are marked with a chain link symbol like this one. You can click anywhere on the line to follow the link. = 线可以链接到其他Civilopedia条目，它们被标记为像这样的链接符号。您可以单击该行上的任何位置来跟踪该链接。 -The current category is special - all articles on general concepts are here. It is called 'Tutorials' because you can revisit these here, too. = 当前类别是特殊的-所有关于一般概念的文章都在这里。它被称为“教程”，因为你也可以在这里重温这些内容。 +Select categories with the buttons on top of the screen. Also up there is the button to leave Civilopedia and go back to where you were before. = 在屏幕上方可以选择相应的类别，另外，屏幕上方还有回退键。 +Each category has a list of entries on the left of the screen, sorted alphabetically (with few exceptions). Clicking an entry will update the center pane were you are currently reading this. = 每个类别都含有一列排好的条目，点击条目即可阅读。 +Lines can link to other Civilopedia entries, they are marked with a chain link symbol like this one. You can click anywhere on the line to follow the link. = 文明百科中的某些行可以链接到其他条目，它们通常被标记为类似于像这样的链接符号。您可以单击该行上的任何位置来跟踪该链接。 +The current category is special - all articles on general concepts are here. It is called 'Tutorials' because you can revisit these here, too. = 当前类别是特殊的——所有关于一般概念的文章都在这里。它被称为“教程”，因为您可以在此处重温这些内容。 What information can I find = 我可以检索到什么样的信息 -The data shown is not dependent on your current game's situation, e.g. bonuses for the nation you are playing or difficulty modifiers will not affect the numbers. = 这里的数据并不等同于你游戏状态的数据，因为有些民族或有些模组数据会不同。 -However, it will reflect the mods you are playing! The combination of base ruleset and extension mods you select define the rules of a game, what objects exist and how they interact, and the Civilopedia mirrors these rules. = 然而，它将反映你正在玩的mod !你选择的基本规则集和扩展mod的组合定义了游戏规则，存在什么对象以及它们如何交互，而Civilopedia反映了这些规则 -If you opened the Civilopedia from the main menu, the "Ruleset" will be that of the last game you started. = 如果从主页打开文明维基，规则级会显示为你上一个游戏选择的。 -Letters can select categories, and when there are multiple categories matching the same letter, you can press that repeatedly to cycle between these. = 字母可以选择类别，当有多个类别匹配同一个字母时，您可以重复按下该按钮，在这些类别之间循环。 -The arrow keys allow navigation as well - left/right for categories, up/down for entries. = 方向键也可以用来在文明维基导航，左右切换分类，上下切换条目。 +The data shown is not dependent on your current game's situation, e.g. bonuses for the nation you are playing or difficulty modifiers will not affect the numbers. = 这里的数据并不等同于您游戏状态的数据，例如国家加成或难度修正并不会改变文明百科中的数据。 +However, it will reflect the mods you are playing! The combination of base ruleset and extension mods you select define the rules of a game, what objects exist and how they interact, and the Civilopedia mirrors these rules. = 然而，它将反映您正在玩的模组！您选择的基本规则集和扩展模组的组合定义了游戏规则，存在什么对象以及它们如何交互，而文明百科反映了这些规则。 +If you opened the Civilopedia from the main menu, the "Ruleset" will be that of the last game you started. = 如果您从主页打开文明百科，那么所适用的规则集将是您在之前游戏中选择的。 +Letters can select categories, and when there are multiple categories matching the same letter, you can press that repeatedly to cycle between these. = 您可以使用字母键来选择类别。当有多个类别与同一个字母匹配时，您可以重复按下该按钮，在这些类别之间循环。 +The arrow keys allow navigation as well - left/right for categories, up/down for entries. = 方向键也可以用来在文明百科导航，左右切换类别，上下切换条目。 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index ccfdeaabb3..f458b1746a 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -964,9 +964,9 @@ You may choose [amount] free Policies = Puedes escoger [amount] Políticas grati You gain the [policy] Policy = Obtuviste la Política [policy] You enter a Golden Age = Entraste a una Edad Dorada # Requires translation! -You have gained [amount] [resourceName] = +You have gained [amount] [resourceName] = Has obtenido [amount] [resourceName] # Requires translation! -You have lost [amount] [resourceName] = +You have lost [amount] [resourceName] = Has perdido [amount] [resourceName] ## Trigger causes @@ -1809,7 +1809,7 @@ City-State Influence recovers at twice the normal rate = La influencia de Ciudad [amount] units cost no maintenance = [amount] unidades no cuestan mantenimiento Cannot build [baseUnitFilter] units = No se puede construír unidades [baseUnitFilter] # Requires translation! -Costs [amount] [resource] = +Costs [amount] [resource] = Cuesta [amount] [resource] [relativeAmount]% growth [cityFilter] = [relativeAmount]% crecimiento [cityFilter] [relativeAmount]% Food is carried over after population increases [cityFilter] = [relativeAmount]% La comida se transfiere después de que aumenta la población [cityFilter] [relativeAmount]% Great Person generation [cityFilter] = [relativeAmount]% Aparición de Gran Personaje [cityFilter] @@ -2048,9 +2048,9 @@ Rough terrain = Terreno Abrupto Deposits in [tileFilter] tiles always provide [amount] resources = Depósitos en casillas de [tileFilter] siempre brindan [amount] recursos Can only be created by Mercantile City-States = Solo puede ser creado por Ciudades-Estados Mercantiles # Requires translation! -Stockpiled = +Stockpiled = Acumulado # Requires translation! -Cannot be traded = +Cannot be traded = No se puede comerciar Guaranteed with Strategic Balance resource option = Garantizado con la opción de recurso Equilibrado Estratégico Can also be built on tiles adjacent to fresh water = También se puede construir sobre casillas adyacentes al agua dulce. [stats] from [tileFilter] tiles = [stats] de casillas con [tileFilter] @@ -2073,7 +2073,7 @@ with [amount]% chance = con una probabilidad de [amount]% before [amount] turns = antes de [amount] ⏳turnos after [amount] turns = después de [amount] ⏳turnos # Requires translation! -for [nationFilter] = +for [nationFilter] = para [nationFilter] when at war = si está en guerra when not at war = si no está en guerra during a Golden Age = durante una Edad Dorada @@ -2147,9 +2147,9 @@ Reveals the entire map = Revela todo el mapa Gain a free [beliefType] belief = Gana una creencia [beliefType] gratis Triggers voting for the Diplomatic Victory = Activa las votaciones para la victoria diplomática # Requires translation! -Instantly consumes [amount] [resource] = +Instantly consumes [amount] [resource] = Consume de inmediato [amount] [resource] # Requires translation! -Instantly provides [amount] [resource] = +Instantly provides [amount] [resource] = Provee de inmediato [amount] [resource] Gain [amount] [stat/resource] = Ganar [amount] [stat/resource] Gain [amount]-[amount2] [stat] = Ganar [amount]-[amount2] [stat] Gain enough Faith for a Pantheon = Gana suficiente fe para un panteón @@ -5814,7 +5814,7 @@ Londonderry = Londonderry Llanfairpwllgwyngyll = Llanfairpwllgwyngyll Falmouth = Falmouth Lorient = Lorient -Celts = Celts +Celts = Celtas Haile Selassie = Haile Selassie I have tried all other avenues, but yet you persist in this madness. I hope, for your sake, your end is swift. = He probado todas las otras vías, pero aún persistes en esta locura. Espero, por tu bien, que tu final sea rápido. @@ -5870,7 +5870,7 @@ Ethiopia = Etiopía Pacal = Pacal A sacrifice unlike all others must be made! = ¡Se debe hacer un sacrificio diferente a todos los demás! -Muahahahahahaha! = Muahahahahahaha! +Muahahahahahaha! = ¡Muahahahahahaha! Today comes a great searing pain. With you comes the path to the black storm. = Hoy viene un gran dolor lacerante. Contigo viene el camino a la tormenta negra. Greetings, wayward one. I am known as Pacal. = Saludos, descarriado. Soy conocido como Pacal. Friend, I believe I may have found a way to save us all! Look, look and accept my offering! = ¡Amigo, creo que pude haber encontrado una manera de salvarnos a todos! ¡Mira, mira y acepta mi ofrenda! diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 5d127614bb..0b79baccd2 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -400,8 +400,7 @@ Disable starting bias = Başlangıç eğilimini kapat Raging Barbarians = Öfkeli Barbarlar No Ancient Ruins = Antik kalıntı yok No Natural Wonders = Doğal Harika Yok - # Requires translation! -Allow anyone to spectate = +Allow anyone to spectate = Herkesin izlemesine izin ver Victory Conditions = Kazanma şartları Scientific = Bilimsel Domination = Hakimiyet @@ -423,8 +422,7 @@ Rectangular = Dikdörtgen Height = Uzunluk Width = Genişlik Radius = Çap - # Requires translation! -Enable Espionage = +Enable Espionage = Casusu Etkinleştir Resource Setting = Kaynak Ayarı # Requires translation! diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index d6fd7a045c..d1edba568a 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.8.0" const val appName = "Unciv" - const val appCodeNumber = 848 - const val appVersion = "4.6.1-patch2" + const val appCodeNumber = 849 + const val appVersion = "4.6.2" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/changelog.md b/changelog.md index 3530d56abc..08e85e17e2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,38 @@ +## 4.6.2 + +Hide icons in game file names - see + +Removed icons from city names, removed icons from notifications for performance reasons + +Added "in this city", "in other cities" conditionals for city-based uniques + +Resolves + +4.6.1-patch2 + +4.6.1-patch1 + +More UI cleanup + +Removed more double icons + +Resolved - Return error when cannot upload game to Dropbox + +Resolved - Can again spectate games where not an original participant + +Resolved - Tileset no longer reverts to default on Android after restarting game + +Retreat chance is savescum-safe - + +Resolved - 'unit gain from defeating unit' takes attacking/defending units into account for randomness + +By SomeTroglodyte: +- Unhappiness effects +- Fix more leaks of the actual Player count in random mode +- Allow city- or tile- related conditionals on PerpetualStatConversion enabling unique + +Make new "Charts" button translatable - By Ouaz + ## 4.6.1 All game object images shown in text! diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index f9150c0672..5526243efc 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -531,7 +531,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.6.1-patch2", 848) + val VERSION = Version("4.6.2", 849) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/849.txt b/fastlane/metadata/android/en-US/changelogs/849.txt new file mode 100644 index 0000000000..6dcd81a2f7 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/849.txt @@ -0,0 +1,34 @@ + + +Hide icons in game file names - see + +Removed icons from city names, removed icons from notifications for performance reasons + +Added "in this city", "in other cities" conditionals for city-based uniques + +Resolves + +4.6.1-patch2 + +4.6.1-patch1 + +More UI cleanup + +Removed more double icons + +Resolved - Return error when cannot upload game to Dropbox + +Resolved - Can again spectate games where not an original participant + +Resolved - Tileset no longer reverts to default on Android after restarting game + +Retreat chance is savescum-safe - + +Resolved - 'unit gain from defeating unit' takes attacking/defending units into account for randomness + +By SomeTroglodyte: +- Unhappiness effects +- Fix more leaks of the actual Player count in random mode +- Allow city- or tile- related conditionals on PerpetualStatConversion enabling unique + +Make new "Charts" button translatable - By Ouaz \ No newline at end of file