diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index 2e8c9c6939..786871013a 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -360,8 +360,7 @@ Domination = Dominação Cultural = Cultural Diplomatic = Diplomático Time = Tempo - # Requires translation! -Your previous options needed to be reset to defaults. = +Your previous options needed to be reset to defaults. = Suas opções anteriores precisavam ser redefinidas para os padrões. # Used for random nation indicator in empire selector and unknown nation icons in various overview screens. # Should be a single character, or at least visually square. @@ -1878,8 +1877,7 @@ City-State Influence recovers at twice the normal rate = Influência nas Cidades [relativeAmount]% growth [cityFilter] = [relativeAmount]% de crescimento em [cityFilter] [amount]% Food is carried over after population increases [cityFilter] = [amount]% de alimentos são transportados após o aumento da população [cityFilter] [relativeAmount]% Food consumption by specialists [cityFilter] = [relativeAmount]% de consumo de alimentos por especialistas [cityFilter] - # Requires translation! -[relativeAmount]% unhappiness from the number of cities = +[relativeAmount]% unhappiness from the number of cities = [relativeAmount]% de infelicidade do número de cidades [relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [relativeAmount]% de infelicidade de [populationFilter] [cityFilter] [amount] Happiness from each type of luxury resource = [amount] de Felicidade a cada tipo de recurso de luxo Retain [relativeAmount]% of the happiness from a luxury after the last copy has been traded away = Retenha [relativeAmount]% da felicidade de um luxo após a última cópia ter sido trocada @@ -2096,8 +2094,7 @@ Religious Unit = Unidade Religiosa Spaceship part = Parte de Nave Espacial Takes your religion over the one in their birth city = Leva sua religião sobre a de sua cidade natal Great Person - [comment] = Grande Pessoa - [comment] - # Requires translation! -Is part of Great Person group [comment] = +Is part of Great Person group [comment] = Faz parte do grupo Grande Pessoa [comment] by consuming this unit = Por consumir esta unidade for [amount] movement = para [amount] movimento once = uma vez @@ -3367,9 +3364,7 @@ Gwalior = Gwalior Jaipur = Jaipur Karachi = Carachi India = Índia - # Requires translation! -[amount]% unhappiness from the number of Cities = - +[amount]% unhappiness from the number of Cities = [amount]% de infelicidade do número de cidades Otto von Bismarck = Otto von Bismarck I cannot wait until ye grow even mightier. Therefore, prepare for war! = Eu não esperarei por seu avanço. Portanto, prepare-se para guerra! Corrupted villain! We will bring you into the ground! = Vilão corrupto! Nós o levaremos ao chão! diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index cecb72f6fc..5a899c83e0 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -361,7 +361,7 @@ Cultural = Culturelle Diplomatic = Diplomatique Time = Temps # Requires translation! -Your previous options needed to be reset to defaults. = +Your previous options needed to be reset to defaults. = Vos options ont été réinitialisées à leurs réglages par défaut. # Used for random nation indicator in empire selector and unknown nation icons in various overview screens. # Should be a single character, or at least visually square. @@ -1879,7 +1879,7 @@ City-State Influence recovers at twice the normal rate = L'influence sur les Cit [amount]% Food is carried over after population increases [cityFilter] = [amount]% de la nourriture est conservée après augmentation de la population [cityFilter] [relativeAmount]% Food consumption by specialists [cityFilter] = [relativeAmount]% consommation de nourriture par les spécialistes [cityFilter] # Requires translation! -[relativeAmount]% unhappiness from the number of cities = +[relativeAmount]% unhappiness from the number of cities = [relativeAmount]% Mécontentement dû au nombre de villes [relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [relativeAmount]% Mécontentement de [populationFilter] [cityFilter] [amount] Happiness from each type of luxury resource = [amount] Bonheur pour chaque type de ressource de luxe Retain [relativeAmount]% of the happiness from a luxury after the last copy has been traded away = Conserver [relativeAmount]% du Bonheur d'une ressource de luxe après que le dernier item ait été échangé @@ -2097,7 +2097,7 @@ Spaceship part = Composant de Vaisseau Spatial Takes your religion over the one in their birth city = Impose votre religion sur celle actuelle dans sa ville de naissance Great Person - [comment] = Personnage Illustre - [comment] # Requires translation! -Is part of Great Person group [comment] = +Is part of Great Person group [comment] = Fait partie d'un groupe de Personnages Illustres [comment] by consuming this unit = en consommant cette unité for [amount] movement = pour [amount] mouvement(s) once = une fois @@ -3368,7 +3368,7 @@ Jaipur = Jaipur Karachi = Karachi India = Inde # Requires translation! -[amount]% unhappiness from the number of Cities = +[amount]% unhappiness from the number of Cities = [amount]% Mécontentement dû au nombre de villes Otto von Bismarck = Otto von Bismarck I cannot wait until ye grow even mightier. Therefore, prepare for war! = Je ne peux rester ainsi en attendant que vous gagniez en puissance. Préparez-vous à la guerre ! diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 1b651e7c14..8a4c921dde 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -360,8 +360,7 @@ Domination = Vorherrschaft Cultural = Kulturell Diplomatic = Diplomatisch Time = Zeit - # Requires translation! -Your previous options needed to be reset to defaults. = +Your previous options needed to be reset to defaults. = Deine vorherigen Optionen mussten auf die Standardeinstellungen zurückgesetzt werden. # Used for random nation indicator in empire selector and unknown nation icons in various overview screens. # Should be a single character, or at least visually square. @@ -445,11 +444,11 @@ Base ruleset: = Basisregelwerk The mod you selected is incorrectly defined! = Die gewählte Modifikation ist fehlerhaft! The mod you selected is «RED»incorrectly defined!«» = Die Mod, die du gewählt hast, ist »RED«fehlerhaft definiert!»« The mod combination you selected is incorrectly defined! = Die gewählte Kombination von Mods ist fehlerhaft! -The mod combination you selected is «RED»incorrectly defined!«» = Die Modkombination, die du gewählt hast ist »RED«fehlerhaft definiert!»« +The mod combination you selected is «RED»incorrectly defined!«» = Die Modkombination, die du gewählt hast, ist »RED«fehlerhaft definiert!»« The mod combination you selected has problems. = Die gewählte Kombination von Mods hat Probleme. You can play it, but don't expect everything to work! = Du kannst sie spielen, aber erwarte nicht, dass alles perfekt funktioniert! The mod combination you selected «GOLD»has problems«». = Die Modkombination, die du gewählt hast, »GOLD«hat Probleme»« -You can play it, but «GOLDENROD»don't expect everything to work!«» = Du kannst es spielen, aber »GOLDENROD«erwarte nicht, dassalles funktioniert!»« +You can play it, but «GOLDENROD»don't expect everything to work!«» = Du kannst es spielen, aber »GOLDENROD«erwarte nicht, dass alles funktioniert!»« This base ruleset is not compatible with the previously selected\nextension mods. They have been disabled. = Dieses Basisregelwerk ist nicht mit den zuvor ausgewählten\nErweiterungs-Modifikationen kompatibel. Sie wurden deaktiviert. Are you really sure you want to play with the following known problems? = Bist du dir sicher, dass du mit den folgenden bekannten Problemen spielen willst? Base Ruleset = Basisregelwerk @@ -1879,8 +1878,7 @@ City-State Influence recovers at twice the normal rate = Stadtstaaten-Einfluss e [relativeAmount]% growth [cityFilter] = [relativeAmount]% Wachstum [cityFilter] [amount]% Food is carried over after population increases [cityFilter] = [amount]% der Nahrung wird übertragen nachdem die Bevölkerung [cityFilter] gewachsen ist [relativeAmount]% Food consumption by specialists [cityFilter] = [relativeAmount]% Nahrungsverbrauch von Spezialisten [cityFilter] - # Requires translation! -[relativeAmount]% unhappiness from the number of cities = +[relativeAmount]% unhappiness from the number of cities = [relativeAmount]% Unzufriedenheit durch die Anzahl der Städte [relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [relativeAmount]% Unzufriedenheit durch [populationFilter] [cityFilter] [amount] Happiness from each type of luxury resource = [amount] Zufriedenheit für jeden Typ der Luxusressourcen Retain [relativeAmount]% of the happiness from a luxury after the last copy has been traded away = Behalte [relativeAmount]% der Zufriedenheit eines Luxusguts, nachdem das letzte Exemplar weggehandelt worden ist @@ -2097,8 +2095,7 @@ Religious Unit = Religiöse Einheit Spaceship part = Raumschiffteil Takes your religion over the one in their birth city = Übernimmt deine Religion anstelle der seiner Geburtsstadt Great Person - [comment] = Große Persönlichkeit - [comment] - # Requires translation! -Is part of Great Person group [comment] = +Is part of Great Person group [comment] = Ist Teil der Gruppe Großer Persönlichkeiten [comment] by consuming this unit = durch Verbrauch dieser Einheit for [amount] movement = für [amount] Bewegung(en) once = einmalig @@ -2390,16 +2387,11 @@ UnitActionModifier = EinheitAktionsModifikator #################### Lines from spy actions ####################### - # Requires translation! -Establishing Network = - # Requires translation! -Observing City = - # Requires translation! -Stealing Tech = - # Requires translation! -Rigging Elections = - # Requires translation! -Conducting Counter-intelligence = +Establishing Network = Netzwerk aufbauen +Observing City = Stadt beobachten +Stealing Tech = Technologie stehlen +Rigging Elections = Wahlen manipulieren +Conducting Counter-intelligence = Spionageabwehr durchführen #################### Lines from diplomatic modifiers ####################### @@ -3373,8 +3365,7 @@ Gwalior = Gwalior Jaipur = Jaipur Karachi = Karatschi India = Indien - # Requires translation! -[amount]% unhappiness from the number of Cities = +[amount]% unhappiness from the number of Cities = [amount]% Unzufriedenheit durch die Anzahl der Städte Otto von Bismarck = Otto von Bismarck I cannot wait until ye grow even mightier. Therefore, prepare for war! = Ich kann nicht warten, bis ihr noch mächtiger werdet. Deshalb: Bereitet euch auf den Krieg vor! diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 9926c744d9..0f0de4053a 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -363,8 +363,7 @@ Domination = Dominazione Cultural = Culturale Diplomatic = Diplomatica Time = A tempo - # Requires translation! -Your previous options needed to be reset to defaults. = +Your previous options needed to be reset to defaults. = Le tue opzioni precedenti vanno ripristinate a default. # Used for random nation indicator in empire selector and unknown nation icons in various overview screens. # Should be a single character, or at least visually square. @@ -1885,8 +1884,7 @@ City-State Influence recovers at twice the normal rate = L'influenza delle Citt [relativeAmount]% growth [cityFilter] = [relativeAmount]% crescita [cityFilter] [amount]% Food is carried over after population increases [cityFilter] = [amount]% di cibo viene immagazzinato alla nascita di un nuovo cittadino [cityFilter] [relativeAmount]% Food consumption by specialists [cityFilter] = [relativeAmount]% consumo di cibo dagli specialisti [cityFilter] - # Requires translation! -[relativeAmount]% unhappiness from the number of cities = +[relativeAmount]% unhappiness from the number of cities = [relativeAmount]% Infelicità dal numero di città [relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [relativeAmount]% Infelicità da [populationFilter] [cityFilter] [amount] Happiness from each type of luxury resource = [amount] Felicità per ogni tipo di risorsa di lusso Retain [relativeAmount]% of the happiness from a luxury after the last copy has been traded away = Conservi il [relativeAmount]% della Felciità apportata da una risorsa di lusso quando anche l'ultima copia viene scambiata @@ -2103,8 +2101,7 @@ Religious Unit = Unità religiosa Spaceship part = Parte dell'astronave Takes your religion over the one in their birth city = Porta la tua religione sopra quella nella loro città natale Great Person - [comment] = Grande Personaggio - [comment] - # Requires translation! -Is part of Great Person group [comment] = +Is part of Great Person group [comment] = È parte del gruppo Grandi Personaggi [comment] by consuming this unit = consumando questa unità for [amount] movement = per [amount] movimento once = una volta @@ -3378,8 +3375,7 @@ Gwalior = Gwalior Jaipur = Jaipur Karachi = Karachi India = India - # Requires translation! -[amount]% unhappiness from the number of Cities = +[amount]% unhappiness from the number of Cities = [amount]% Infelicità dal numero di Città Otto von Bismarck = Otto von Bismarck I cannot wait until ye grow even mightier. Therefore, prepare for war! = Lascia che tu lo sappia: tu sei un nemico della Germania e come tale vai combattuto. Che Dio abbia pietà di te, perché io non ne avrò. diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 52ef3f861a..fb0679de41 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -361,7 +361,7 @@ Cultural = kulturowe Diplomatic = dyplomatyczne Time = czasowe # Requires translation! -Your previous options needed to be reset to defaults. = +Your previous options needed to be reset to defaults. = Twoje poprzednie ustawienia musiały zostać przywrócone do domyślnych. # Used for random nation indicator in empire selector and unknown nation icons in various overview screens. # Should be a single character, or at least visually square. @@ -1876,12 +1876,12 @@ Resting point for Influence with City-States is increased by [amount] = Zwiększ Allied City-States provide [stat] equal to [relativeAmount]% of what they produce for themselves = Sojusznicze Wolne Miasta zapewniają premię do [stat] równą [relativeAmount]% tego, co wytwarzają dla siebie [relativeAmount]% resources gifted by City-States = Ilość surowców otrzymywanych od Wolnych Miast zwiększa się o [relativeAmount]% [relativeAmount]% Happiness from luxury resources gifted by City-States = [relativeAmount]% więcej ⌣Zadowolenia z produktów Luksusowych otrzymywanych od Wolnych Miast -City-State Influence recovers at twice the normal rate = Wpływy w Wolnych Miastach odnawiają się 2x szybciej +City-State Influence recovers at twice the normal rate = Wpływy w Wolnych Miastach odnawiają się 2 razy szybciej [relativeAmount]% growth [cityFilter] = [relativeAmount]% wzrostu Populacji [cityFilter] [amount]% Food is carried over after population increases [cityFilter] = [amount]% ⁂Żywności zostaje zachowane po wzroście populacji [cityFilter] [relativeAmount]% Food consumption by specialists [cityFilter] = Specjaliści [cityFilter] wymagają o [relativeAmount]% mniej ⁂Żywności # Requires translation! -[relativeAmount]% unhappiness from the number of cities = +[relativeAmount]% unhappiness from the number of cities = [relativeAmount]% niezadowolenia z miast [relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [relativeAmount]% niezadowolenia od [populationFilter] [cityFilter] [amount] Happiness from each type of luxury resource = [amount] ⌣Zadowolenia z każdego rodzaju Surowców Luksusowych Retain [relativeAmount]% of the happiness from a luxury after the last copy has been traded away = Zachowuje [relativeAmount]% ⌣Zadowolenia z Surowca Luksusowego po sprzedaży jego ostatniej sztuki @@ -2099,7 +2099,7 @@ Spaceship part = Moduł Statku Kosmicznego Takes your religion over the one in their birth city = Narzuca własną religię ponad inne w mieście z którego pochodzi. Great Person - [comment] = Wielki Człowiek związany z [comment] # Requires translation! -Is part of Great Person group [comment] = +Is part of Great Person group [comment] = Jest częścią grupy Wielkich Ludzi [comment] by consuming this unit = przez wykorzystanie tej jednostki for [amount] movement = na [amount] ruchy once = jeden raz @@ -3373,7 +3373,7 @@ Jaipur = Dźajpur Karachi = Karaczi India = Indie # Requires translation! -[amount]% unhappiness from the number of Cities = +[amount]% unhappiness from the number of Cities = [amount]% niezadowolenia z miast Otto von Bismarck = Otto von Bismarck I cannot wait until ye grow even mightier. Therefore, prepare for war! = Nie mogę czekać, aż staniecie się jeszcze potężniejsi. Dlatego szykuj się na wojnę! diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 0c5bd28005..b03ee3ef38 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -299,15 +299,15 @@ Non-existent city = Несуществующий город [resourceName] not required = Не требуется: [resourceName] # Requires translation! -Lost ability (vs [originalUnit]): [ability] = +Lost ability (vs [originalUnit]): [ability] = Утраченная способность (vs [originalUnit]): [ability] # Requires translation! Upgrade all [count] [unit] ([cost] gold) = National ability = Национальная особенность [firstValue] vs [secondValue] = [firstValue] вместо [secondValue] # Requires translation! -Gained = +Gained = Получено # Requires translation! -Lost = +Lost = Утрачено # New game screen @@ -525,7 +525,7 @@ Position: [param] = Позиция: [param] Starting location(s): [param] = Начальное положение: [param] Continent: [param] ([amount] tiles) = Континент: [param] ([amount] клеток) # Requires translation! -Resource abundance = +Resource abundance = Изобилие ресурсов Change map to fit selected ruleset? = Изменить карту, чтобы она соответствовала выбранному набору правил? Area: [amount] tiles, [amount2] continents/islands = Территория: [amount] клеток, [amount2] континентов/островов Area: [amount] tiles, [amount2]% water, [amount3] continents/islands = Территория: [amount] клеток, [amount2]% воды, [amount3] континентов/островов @@ -844,18 +844,18 @@ Generate translation files = Создать файлы перевода Translation files are generated successfully. = Файлы перевода успешно созданы. Fastlane files are generated successfully. = Файлы Fastlane успешно созданы. # Requires translation! -Update Mod categories = +Update Mod categories = Обновить категории модов Enable Easter Eggs = Включить секреты # Requires translation! -Enlarge selected notifications = +Enlarge selected notifications = Увеличить размер выбранных уведомлений ## Keys tab # Requires translation! -Keys = +Keys = Клавиши Please see the Tutorial. = Пожалуйста, посмотрите обучение. # Requires translation! -Hit the desired key now = +Hit the desired key now = Теперь нажмите нужную клавишу ## Locate mod errors tab Locate mod errors = Найти ошибки модов @@ -1050,9 +1050,9 @@ You may choose [amount] free Policies = Вы можете выбрать [amount You gain the [policy] Policy = Вы получили общественный институт [policy] You enter a Golden Age = Вы вошли в золотой век # Requires translation! -You have gained [amount] [resourceName] = +You have gained [amount] [resourceName] = Вы получили [amount] [resourceName] # Requires translation! -You have lost [amount] [resourceName] = +You have lost [amount] [resourceName] = Вы потеряли [amount] [resourceName] ## Trigger causes @@ -1114,9 +1114,9 @@ Add to [comment] = Вставить в [comment] Upgrade to [unitType] ([goldCost] gold) = Модернизировать до [unitType] ([goldCost] золота) Upgrade to [unitType]\n([goldCost] gold, [resources]) = Модернизировать до [unitType]\n([goldCost] золота, [resources]) # Requires translation! -Transform to [unitType] = +Transform to [unitType] = Трансформировать в [unitType] # Requires translation! -Transform to [unitType]\n([resources]) = +Transform to [unitType]\n([resources]) = Трансформировать в [unitType]\n([resources]) Found city = Основать город Promote = Повысить Health = Здоровье @@ -1267,9 +1267,9 @@ Invalid input! Please enter a different string. = Ошибка ввода! Вв Invalid input! Please enter a valid number. = Ошибка ввода! Введите корректное число. Please enter some text = Введите текст # Requires translation! -Please enter a file name = +Please enter a file name = Пожалуйста, введите имя файла # Requires translation! -File name: = +File name: = Имя файла # Technology UI @@ -1428,7 +1428,7 @@ Civilization Info = Информация о цивилизации Relations = Отношения Trade request = Торговое предложение # Requires translation! -Garrisoned by unit = +Garrisoned by unit = Юнит в гарнизоне # Victory @@ -1479,7 +1479,7 @@ Annex = Аннексировать Annexed cities become part of your regular empire. = Аннексированные города станут частью вашей империи. Their citizens generate 2x the unhappiness, unless you build a courthouse. = До постройки здания суда их жители будут генерировать в 2 раза больше несчастья. # Requires translation! -Your civilization may not annex this city. = +Your civilization may not annex this city. = Ваша цивилизация не может аннексировать этот город. Puppet = Создать сателлита Puppeted cities do not increase your tech or policy cost. = Города-сателлиты не увеличивают стоимость технологий или общественных институтов. You have no control over the the production of puppeted cities. = Вы не имеете контроля над их производством. @@ -1490,7 +1490,7 @@ Liberating a city returns it to its original owner, giving you a massive relatio Raze = Разрушить Razing the city annexes it, and starts burning the city to the ground. = Присоединяет город к вашей империи и начинает разрушать его до состояния выжженной земли. # Requires translation! -Razing the city puppets it, and starts burning the city to the ground. = +Razing the city puppets it, and starts burning the city to the ground. = Делает город сателлитом и начинает разрушать его до состояния выжженной земли. The population will gradually dwindle until the city is destroyed. = Население будет постепенно сокращаться до полного уничтожения города. Original capitals and holy cities cannot be razed. = Первоначальные столицы и священные города не могут быть разрушены. Destroy = Уничтожить @@ -1522,7 +1522,7 @@ Can upgrade from: = Можно модернизировать из: Upgrades to [upgradedUnit] = Модернизируется до: [upgradedUnit] Obsolete with [obsoleteTech] = Устаревает при открытии технологии [obsoleteTech] # Requires translation! -Can Transform to [upgradedUnit] = +Can Transform to [upgradedUnit] = Можно трансформировать в [upgradedUnit] Occurs on [listOfTerrains] = Возникает на: [listOfTerrains] Occurs on: = Возникает на: Placed on [terrainType] = Появляется вместо: [terrainType] @@ -1705,20 +1705,20 @@ Move = Переместить After an unknown civilization entered the [eraName], we have recruited [spyName] as a spy! = После того, как неизвестная цивилизация вошла в эпоху [eraName], мы наняли [spyName] в качестве шпиона! We have recruited [spyName] as a spy! = Мы наняли [spyName] в качестве шпиона! # Requires translation! -A spy from [civilization] stole the Technology [techName] from [cityName]! = +A spy from [civilization] stole the Technology [techName] from [cityName]! = Шпион из [civilization] украл технологию [techName] у [cityName]! # Requires translation! -An unidentified spy stole the Technology [techName] from [cityName]! = +An unidentified spy stole the Technology [techName] from [cityName]! = Неизвестный шпион украл технологию [techName] у [CityName]! # Requires translation! -Your spy [name] stole the Technology [techName] from [cityName]! = +Your spy [name] stole the Technology [techName] from [cityName]! = Ваш шпион [name] украл технологию [techName] у [cityName]! # Requires translation! -Your spy [name] cannot steal any more techs from [civilization] as we've already researched all the technology they know! = +Your spy [name] cannot steal any more techs from [civilization] as we've already researched all the technology they know! = Ваш шпион [name] больше не сможет красть технологии у [civilization], поскольку мы уже исследовали все известные им технологии! # Requires translation! -After the city of [cityName] was destroyed, your spy [spyName] has fled back to our hideout. = +After the city of [cityName] was destroyed, your spy [spyName] has fled back to our hideout. = После разрушения [cityName], ваш шпион [spyName] укрылся. # Requires translation! -After the city of [cityName] was conquered, your spy [spyName] has fled back to our hideout. = +After the city of [cityName] was conquered, your spy [spyName] has fled back to our hideout. = После захвата [cityName], ваш шпион [spyName] укрылся. # Requires translation! -Due to the chaos ensuing in [cityName], your spy [spyname] has fled back to our hideout. = +Due to the chaos ensuing in [cityName], your spy [spyname] has fled back to our hideout. = Из-за хаоса, воцарившегося в [cityName], ваш шпион [spyName] укрылся. # Promotions @@ -1931,7 +1931,7 @@ City-State Influence recovers at twice the normal rate = Влияние на г [amount]% Food is carried over after population increases [cityFilter] = Сберегает [amount]% еды при появлении нового жителя [cityFilter] [relativeAmount]% Food consumption by specialists [cityFilter] = [relativeAmount]% к потреблению еды специалистами [cityFilter] # Requires translation! -[relativeAmount]% unhappiness from the number of cities = +[relativeAmount]% unhappiness from the number of cities = [relativeAmount]% недовольство от числа городов [relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [relativeAmount]% к недовольству от [populationFilter] [cityFilter] [amount] Happiness from each type of luxury resource = [amount] счастья за каждый вид редкого ресурса Retain [relativeAmount]% of the happiness from a luxury after the last copy has been traded away = [relativeAmount]% счастья от редкого ресурса сохраняется при продаже последней его единицы @@ -1985,7 +1985,7 @@ All newly-trained [baseUnitFilter] units [cityFilter] receive the [promotion] pr [relativeAmount]% City Strength from defensive buildings = [relativeAmount]% к мощи города от защитных сооружений [relativeAmount]% Strength for cities = [relativeAmount]% к мощи городов # Requires translation! -Costs [amount] [stockpiledResource] = +Costs [amount] [stockpiledResource] = Стоит [amount] [stockpiledResource] Quantity of strategic resources produced by the empire +[relativeAmount]% = Количество стратегических ресурсов в империи увеличивается на [relativeAmount]% Double quantity of [resource] produced = Удваивается количество [resource] Enables Open Borders agreements = Позволяет заключать договор об открытых границах @@ -2014,7 +2014,7 @@ Starts with [policy] adopted = Начинает с принятым инстит Triggers victory = Приводит к победе Triggers a Cultural Victory upon completion = Приводит к культурной победе при завершении # Requires translation! -May not annex cities = +May not annex cities = Не может аннексировать города "Borrows" city names from other civilizations in the game = "Одалживает" названия городов у других цивилизаций в игре Cities are razed [amount] times as fast = Города разрушаются в [amount] раз(а) быстрее Receive a tech boost when scientific buildings/wonders are built in capital = Ускорение изучения технологий при построенных научных зданиях/чудесах в столице @@ -2046,7 +2046,7 @@ Doubles Gold given to enemy if city is captured = Удваивает золот Remove extra unhappiness from annexed cities = Убирает дополнительное недовольство в аннексированных городах Connects trade routes over water = Создает морские торговые пути # Requires translation! -Automatically built in all cities where it is buildable = +Automatically built in all cities where it is buildable = Автоматически строится во всех городах, где его можно построить Creates a [improvementName] improvement on a specific tile = Создает улучшение [improvementName] на определенной клетке Founds a new city = Может основать город Can instantly construct a [improvementFilter] improvement = Может мгновенно создать [improvementFilter] @@ -2065,7 +2065,7 @@ Can speed up the construction of a wonder = Может ускорить стро Can hurry technology research = Может ускорить изучение технологии Can undertake a trade mission with City-State, giving a large sum of gold and [amount] Influence = Может заключить торговый договор с городом-государством, что принесет большое количество золота и [amount] влияния # Requires translation! -Can transform to [unit] = +Can transform to [unit] = Можно трансформировать в [unit] [relativeAmount]% Strength = [relativeAmount]% к боевой мощи [relativeAmount]% Strength decreasing with distance from the capital = Боевая мощь уменьшается на [relativeAmount]% с отдалением от столицы [relativeAmount]% to Flank Attack bonuses = [relativeAmount]% к бонусу атаки с фланга @@ -2138,7 +2138,7 @@ Cannot move = Не может передвигаться Double movement in [terrainFilter] = Двукратная скорость перемещения через [terrainFilter] All tiles cost 1 movement = Все клетки обходятся в 1 передвижение # Requires translation! -May travel on Water tiles without embarking = +May travel on Water tiles without embarking = Может перемещаться по водным клеткам без погружения Can pass through impassable tiles = Может проходить через непроходимые клетки Ignores terrain cost = Игнорирует штрафы ОП за местность Ignores Zone of Control = Игнорирует зоны контроля @@ -2178,9 +2178,9 @@ Rough terrain = Пересечённая местность Deposits in [tileFilter] tiles always provide [amount] resources = Месторождения на клетках [tileFilter] всегда предоставляют [amount] ресурса Can only be created by Mercantile City-States = Может быть создано только торговыми городами-государствами # Requires translation! -Stockpiled = +Stockpiled = Накапливаемый # Requires translation! -Cannot be traded = +Cannot be traded = Не подлежит обмену Guaranteed with Strategic Balance resource option = Гарантируется при стратегическом балансе ресурсов Can also be built on tiles adjacent to fresh water = Также можно построить на клетках, прилегающих к пресной воде [stats] from [tileFilter] tiles = [stats] от клеток [tileFilter] @@ -2204,7 +2204,7 @@ with [amount]% chance = с [amount]% шансом before [amount] turns = до [amount] ходов after [amount] turns = после [amount] ходов # Requires translation! -for [nationFilter] = +for [nationFilter] = для [nationFilter] when at war = во время войны when not at war = в мирное время during a Golden Age = во время золотого века @@ -2216,7 +2216,7 @@ during the [era] = во время эпохи: [era] before the [era] = до эпохи: [era] starting from the [era] = начиная с эпохи: [era] # Requires translation! -if starting in the [era] = +if starting in the [era] = если начинать в [era] if no other Civilization has researched this = если никакая другая цивилизация не исследовала after discovering [tech] = после исследования: [tech] before discovering [tech] = до исследования: [tech] @@ -2235,14 +2235,14 @@ when above [amount] [resource] = когда больше [amount] [resource] when below [amount] [resource] = когда меньше [amount] [resource] in this city = в этом городе # Requires translation! -in other cities = +in other cities = В других городах in cities with a [buildingFilter] = в городах, имеющих [buildingFilter] in cities without a [buildingFilter] = в городах, не имеющих [buildingFilter] in cities with at least [amount] [populationFilter] = в городах, имеющих как минимум [amount] [populationFilter] with a garrison = с гарнизоном for [mapUnitFilter] units = для юнитов: [mapUnitFilter] # Requires translation! -when [mapUnitFilter] = +when [mapUnitFilter] = когда [mapUnitFilter] for units with [promotion] = для юнитов с повышением [promotion] for units without [promotion] = для юнитов без повышения [promotion] vs cities = против городов @@ -2284,9 +2284,9 @@ Reveals the entire map = Открывает всю карту Gain a free [beliefType] belief = Даёт бесплатное верование: [beliefType] Triggers voting for the Diplomatic Victory = Начинает голосование за дипломатическую победу # Requires translation! -Instantly consumes [amount] [stockpiledResource] = +Instantly consumes [amount] [stockpiledResource] = Мгновенно потребляет [amount] [stockpiledResource] # Requires translation! -Instantly provides [amount] [stockpiledResource] = +Instantly provides [amount] [stockpiledResource] = Мгновенно предоставляет [amount] [stockpiledResource] Gain [amount] [stat/resource] = Даёт [amount] [stat/resource] Gain [amount]-[amount2] [stat] = Даёт [amount]-[amount2] [stat] Gain enough Faith for a Pantheon = Даёт очки веры, достаточных для пантеона @@ -2428,7 +2428,7 @@ The Spaceship = Космический корабль Maya Long Count calendar cycle = Календарный цикл Длинного счета майя Triggerable = Приводится в действие # Requires translation! -UnitTriggerable = +UnitTriggerable = Срабатывание юнита Global = Глобальный Nation = Нация Era = Эпоха @@ -2449,25 +2449,25 @@ CityState = Город-государство ModOptions = Параметры мода Conditional = Условие # Requires translation! -TriggerCondition = +TriggerCondition = Условие срабатывания # Requires translation! -UnitTriggerCondition = +UnitTriggerCondition = Условие срабатывания юнита # Requires translation! -UnitActionModifier = +UnitActionModifier = Модификатор действия юнита #################### Lines from spy actions ####################### # Requires translation! -Establishing Network = +Establishing Network = Установка сети # Requires translation! -Observing City = +Observing City = Наблюдение за городом # Requires translation! -Stealing Tech = +Stealing Tech = Кража технологии # Requires translation! -Rigging Elections = +Rigging Elections = Фальсификация выборов # Requires translation! -Conducting Counter-intelligence = +Conducting Counter-intelligence = Контрразведка #################### Lines from diplomatic modifiers ####################### @@ -2505,65 +2505,65 @@ You returned captured units to us = Вы вернули нам захвачен World Screen = Экран мира # Requires translation! -Map Panning = +Map Panning = Панорамирование карты # Requires translation! -Unit Actions = +Unit Actions = Действия юнита # Requires translation! -Popups = +Popups = Всплывающие окна # Requires translation! -Menu = +Menu = Меню Next Turn = Следующий ход Next Turn Alternate = Следующий ход (альтернативно) Empire Overview = Обзор империи # Requires translation! -Music Player = +Music Player = Музыкальный проигрыватель # Requires translation! -Empire Overview Trades = +Empire Overview Trades = Обзор сделок империи # Requires translation! -Empire Overview Units = +Empire Overview Units = Обзор юнитов империи # Requires translation! -Empire Overview Politics = +Empire Overview Politics = Обзор институтов империи # Requires translation! -Social Policies = +Social Policies = Общественные институты # Requires translation! -Technology Tree = +Technology Tree = Древо технологий # Requires translation! -Empire Overview Notifications = +Empire Overview Notifications = Обзор уведомлений империи # Requires translation! -Empire Overview Stats = +Empire Overview Stats = Обзор статистики империи # Requires translation! -Empire Overview Resources = +Empire Overview Resources = Обзор ресурсов империи # Requires translation! -Quick Save = +Quick Save = Быстрое сохранение # Requires translation! -Quick Load = +Quick Load = Быстрая загрузка # Requires translation! -View Capital City = +View Capital City = Обзор столицы # Requires translation! -Save Game = +Save Game = Сохранить игру # Requires translation! -Load Game = +Load Game = Загрузить игру # Requires translation! Toggle Resource Display = # Requires translation! Toggle Yield Display = # Requires translation! -Quit Game = +Quit Game = Выйти из игры New Game = Новая игра # Requires translation! -Espionage = +Espionage = Шпионаж # Requires translation! -Undo = +Undo = Отмена # Requires translation! -Toggle UI = +Toggle UI = Переключить ПИ # Requires translation! Toggle Worked Tiles Display = # Requires translation! Toggle Movement Display = # Requires translation! -Zoom In = +Zoom In = Увеличить # Requires translation! -Zoom Out = +Zoom Out = Отдалить # Requires translation! Pan Up = # Requires translation! @@ -2581,7 +2581,7 @@ Pan Down Alternate = # Requires translation! Pan Right Alternate = # Requires translation! -Transform = +Transform = Трансформировать Repair = Отремонтировать Confirm Dialog = Подтвердить Cancel Dialog = Отклонить diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index b6c2a3d1ea..3e8910f291 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -361,7 +361,7 @@ Cultural = Cultural Diplomatic = Diplomática Time = Tiempo # Requires translation! -Your previous options needed to be reset to defaults. = +Your previous options needed to be reset to defaults. = Tus configuraciones previas tuvieron que ser reseteadas. # Used for random nation indicator in empire selector and unknown nation icons in various overview screens. # Should be a single character, or at least visually square. @@ -1879,7 +1879,7 @@ City-State Influence recovers at twice the normal rate = La influencia de Ciudad [amount]% Food is carried over after population increases [cityFilter] = [amount]% La comida se transfiere después de que aumenta la población [cityFilter] [relativeAmount]% Food consumption by specialists [cityFilter] = [relativeAmount]% Consumo de Comida por especialistas [cityFilter] # Requires translation! -[relativeAmount]% unhappiness from the number of cities = +[relativeAmount]% unhappiness from the number of cities = [relativeAmount]% infelicidad por número de ciudades [relativeAmount]% Unhappiness from [populationFilter] [cityFilter] = [relativeAmount]% Infelicidad de [populationFilter] [cityFilter] [amount] Happiness from each type of luxury resource = [amount] Felicidad de cada tipo de recurso de lujo Retain [relativeAmount]% of the happiness from a luxury after the last copy has been traded away = Mantiene [relativeAmount]% de la Felicidad de la última copia de un Recurso de Lujo después de haber sido negociado. @@ -2097,7 +2097,7 @@ Spaceship part = Parte de Nave Espacial Takes your religion over the one in their birth city = Adquiere tu religión sobre aquella en la que nació Great Person - [comment] = Gran Personaje - [comment] # Requires translation! -Is part of Great Person group [comment] = +Is part of Great Person group [comment] = Es parte del grupo [comment] de Grandes Personas by consuming this unit = al consumar esta unidad for [amount] movement = por [amount] movimiento once = una vez @@ -3368,7 +3368,7 @@ Jaipur = Yaipur Karachi = Karachi India = India # Requires translation! -[amount]% unhappiness from the number of Cities = +[amount]% unhappiness from the number of Cities = [amount]% infelicidad por número de Ciudades Otto von Bismarck = Otto von Bismarck I cannot wait until ye grow even mightier. Therefore, prepare for war! = No puedo aguardar hasta que te vuelvas más poderoso, por lo tanto, ¡Preparate para la guerra! diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 46f74ca38f..2b089c010c 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -4,8 +4,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.21" const val appName = "Unciv" - const val appCodeNumber = 883 - const val appVersion = "4.7.4" + const val appCodeNumber = 884 + const val appVersion = "4.7.5" const val gdxVersion = "1.11.0" const val ktorVersion = "2.2.3" diff --git a/changelog.md b/changelog.md index aa1bc64af4..87b63f9e24 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,23 @@ +## 4.7.5 + +Solved strange concurrency crashes due to players keypress-activating disabled buttons + +chore: Removed vestigal city.apply{} for CityInfoConquestFunctions, for clarity on what is actually for the city and what is not + +Resolved - 'liberate city and resurrect civ' no longer crashes + +AI no longer purchases non-contiguous tiles + +Resolved - city name translation for conquered popup does not get icon + +By SomeTroglodyte: +- Promotion picker allowing picking chains in one go +- More defensive coding of speedupWonderConstruction + +Fixing workers dying in mountains bug for Carthage - By random271 + +Check for trigger uniques when starting and recaluating population - By SeventhM + ## 4.7.4 Zoom in/out of history charts - By JackRainy diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index 20c7ba86e6..04ff92d576 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -536,7 +536,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.7.4", 883) + val VERSION = Version("4.7.5", 884) //endregion lateinit var Current: UncivGame diff --git a/fastlane/metadata/android/en-US/changelogs/884.txt b/fastlane/metadata/android/en-US/changelogs/884.txt new file mode 100644 index 0000000000..ea1c38a7f2 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/884.txt @@ -0,0 +1,19 @@ + + +Solved strange concurrency crashes due to players keypress-activating disabled buttons + +chore: Removed vestigal city.apply{} for CityInfoConquestFunctions, for clarity on what is actually for the city and what is not + +Resolved - 'liberate city and resurrect civ' no longer crashes + +AI no longer purchases non-contiguous tiles + +Resolved - city name translation for conquered popup does not get icon + +By SomeTroglodyte: +- Promotion picker allowing picking chains in one go +- More defensive coding of speedupWonderConstruction + +Fixing workers dying in mountains bug for Carthage - By random271 + +Check for trigger uniques when starting and recaluating population - By SeventhM \ No newline at end of file