diff --git a/android/assets/game.png b/android/assets/game.png index 3ff21f77dc..242625c2da 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 73c8866712..2fe56e549f 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -3988,6 +3988,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 672186efbd..519aba9626 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -5175,6 +5175,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 63b88b22d8..acab769e0d 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -5481,6 +5481,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 4d5aaad6ad..aa8c1c63ef 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -3336,6 +3336,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 694a1a9afb..da21324318 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -317,7 +317,6 @@ Starting Era = Startzeitalter It looks like we can't make a map with the parameters you requested! = Mit den von dir angegebenen Parametern kann keine Karte erzeugt werden! Maybe you put too many players into too small a map? = Vielleicht hast du zu viele SpielerInnen in eine zu kleine Karte gepackt? No human players selected! = Keine menschlichen SpielerInnen ausgewählt! - # Requires translation! Mods: = Modifikationen # Multiplayer @@ -403,9 +402,7 @@ Enable nuclear weapons = Atomwaffen aktivieren Fontset = Schriftart Continuous rendering = Kontinuierliches Rendern Order trade offers by amount = Handelsangebote nach Menge sortieren - # Requires translation! Generate translation files = Erstelle Übersetzungsdateien - # Requires translation! Translation files are generated successfully. = Die Übersetzungsdateien wurden erfolgreich erstellt. # Notifications @@ -484,7 +481,6 @@ Received [goldAmount] Gold for capturing [cityName] = [goldAmount] Gold für die Our proposed trade request is no longer relevant! = Unsere vorgeschlagene Handelsanfrage ist nicht mehr relevant! [defender] could not withdraw from a [attacker] - blocked. = Rückzug von [defender] vor [attacker] wurde blockiert. [defender] withdrew from a [attacker] = [defender] hat sich vor einem [attacker] zurückgezogen - # Requires translation! [building] has provided [amount] Gold! = [building] hat [amount] Gold bereitgestellt. @@ -737,15 +733,12 @@ Placed on [terrainType] = Platziert auf [terrainType] Can be found on = Kann gefunden werden in Improved by [improvement] = Wird verbessert durch [improvement] Bonus stats for improvement: = Boni für Verbesserung: - # Requires translation! Buildings that consume this resource: = Gebäude welche diese Ressource brauchen: - # Requires translation! Units that consume this resource: = Einheiten welche diese Ressource brauchen: Can be built on = Kann gebaut werden auf Defence bonus = Verteidigungsbonus Movement cost = Bewegungskosten Rough Terrain = Unwegsames Gelände - # Requires translation! for = für Missing translations: = Fehlende Übersetzungen: Version = Version @@ -804,7 +797,6 @@ Free for [units] = Frei für [units] # Policies Adopt policy = Grundsatz verabschieden -# probably "Grundsatz kostenlos verabschiden" Adopt free policy = Grundsatz verabschieden Unlocked at = Freigeschaltet bei Gain 2 free technologies = 2 kostenlose Technologien @@ -852,7 +844,6 @@ Melee = Nahkampf WaterMelee = Wassernahkampf Ranged = Fernkampf WaterRanged = Wasserfernkampf -#why "Wasser-U-Boot" and not "U-Boot" WaterSubmarine = Wasser-U-Boot Mounted = Beritten Armor = Rüstung @@ -940,18 +931,13 @@ Krepost = Krepost # Requires translation! 'He spoke, the son of Kronos, and nodded his head with the dark brows, and the immortally anointed hair of the great god swept from his divine head, and all Olympos was shaken' - The Iliad = - # Requires translation! +15% Combat Strength for all units when attacking Cities = +15% Angiffsstärke für Einheiten beim angreifen einer Stadt - # Requires translation! Statue of Zeus = Statue des Zeus # Requires translation! 'The whole earth is the tomb of heroic men and their story is not given only on stone over their clay but abides everywhere without visible symbol woven into the stuff of other men's lives.' - Pericles = - # Requires translation! Provides a sum of gold each time you spend a Great Person = Gibt dir jedes mal beim benutztes (english spend) einer großen Persönlichkeit etwas Gold - # Requires translation! +2 Gold for each source of Marble and Stone = +2 Gold für jede Quelle von Mamor und Stein - # Requires translation! Mausoleum of Halicarnassus = Mausoleum von Halikarnassos +1 food from Ocean and Coast tiles = +1 Nahrung von Ozean- und Küstenfeldern @@ -1225,31 +1211,19 @@ Are you real or a phantom? = Bist du real oder ein Phantom? It appears that you do have a reason for existing – to make this deal with me. = Es scheint, dass Ihr eine Existenzberechtigung habt – um diesen Handel mit mir zu machen. Greetings. = Seid gegrüßt. What do YOU want?! = Was wollt IHR?! - # Requires translation! Akkad = Akkad - # Requires translation! Dur-Kurigalzu = Dur Kurigalzu (KUR-TI) - # Requires translation! Nippur = Nippur - # Requires translation! Borsippa = Borsippa - # Requires translation! Sippar = Sippar - # Requires translation! Opis = Opis - # Requires translation! Mari = Mari - # Requires translation! Shushan = Susa - # Requires translation! Eshnunna = Eschnunna - # Requires translation! Ellasar = Larsa - # Requires translation! Erech = Uruk # Requires translation! Kutha = - # Requires translation! Sirpurla = Lagas # Requires translation! Neribtum = @@ -1316,7 +1290,6 @@ What? = Was? Athens = Athen Sparta = Sparta Corinth = Korinth - # Requires translation! Argos = Argos Knossos = Knossos Mycenae = Mycene @@ -1389,9 +1362,7 @@ Nafplion = # Requires translation! Apolyton = - # Requires translation! China = China - # Requires translation! Wu Zetian = Wu Zetian You won't ever be able to bother me again. Go meet Yama. = Du wirst nie mehr in der Lage sein mich zu belästigen. Geh in die Hölle. Fool! I will disembowel you all! = Narr! Ich werde Euch alle ausweiden! @@ -1400,19 +1371,12 @@ Greetings, I am Empress Wu Zetian. China desires peace and development. You leav My friend, do you think you can accept this request? = Mein Freund, denkt Ihr, Ihr könnt diesen Vorschlag annehmen? How are you today? = Wie geht es Euch heute? Oh. It's you? = Oh. Ihr seid es? - # Requires translation! Beijing = Peking - # Requires translation! Shanghai = Shanghai - # Requires translation! Guangzhou = Guangzhou - # Requires translation! Nanjing = Nanjing - # Requires translation! Xian = Xi’an - # Requires translation! Chengdu = Chengdu - # Requires translation! Hangzhou = Hangzhou # Requires translation! Tianjin = @@ -1826,15 +1790,10 @@ Magnitogorsk = Rome = Rom Augustus Caesar = Julius Cäsar - # Requires translation! My treasury contains little and my soldiers are getting impatient... ...therefore you must die. = Meine Schatzkammer ist fast leer, meine Soldaten werden ungeduldig ... ... und deshalb musst du sterben. - # Requires translation! So brave, yet so stupid! If only you had a brain similar to your courage. = So mutig, so dumm! Wenn du nur einen Verstand wie deine Tapferkeit hättest. - # Requires translation! The gods have deprived Rome of their favour. We have been defeated. = Die Götter haben Rom verlassen. Wir haben verloren. - # Requires translation! I greet you. I am Augustus, Imperator and Pontifex Maximus of Rome. If you are a friend of Rome, you are welcome. = I grüße dich. Ich bin Julius, Imperator und Pontifex Maximus von Rom - # Requires translation! I offer this, for your consideration. = Ich biete Ihnen dies, überlegen Sie es sich. # Requires translation! Hail. = @@ -1917,22 +1876,13 @@ Interrama = Adria = Arabia = Arabien - # Requires translation! Harun al-Rashid = Harun Al-Rashid - # Requires translation! The world will be more beautiful without you. Prepare for war. = Die Welt wird ohne Sie schöner sein. Bereiten Sie sich auf einen Krieg vor. - # Requires translation! Fool! You will soon regret dearly! I swear it! = Narr! Sie werden es bald schrecklich bereuen. Das verspreche ich Ihnen. - # Requires translation! You have won, congratulations. My palace is now in your possession, and I beg that you care well for the peacock. = Gratulation, Sie haben gewonnen. Mein Palast gehört jetzt Ihnen, und kümmern Sie sich bitte um den Pfau. - # Requires translation! Welcome foreigner, I am Harun Al-Rashid, Caliph of the Arabs. Come and tell me about your empire. = Willkommen Fremder, ich bin Harun Al-Rashid, Kalif von Arabien. Komm und erzählen Sie mir von Ihrem Reich. - # Requires translation! Come forth, let's do business. = Komm, lass uns Handel treiben. - # Requires translation! - # Dir wegen des Zitates aus der Bibel. Peace be upon you. = Friede sei mit dir. - # Requires translation! Mecca = Mekka # Requires translation! Medina = @@ -2000,38 +1950,22 @@ Algiers = Oran = America = Amerika - # Requires translation! George Washington = George Washington - # Requires translation! Your wanton aggression leaves us no choice. Prepare for war! = Ihre mutwillige Aggression lässt mir keine Wahl. Rechnen Sie mit einem Krieg. - # Requires translation! You have mistaken our love of peace for weakness. You shall regret this! = Sie haben unsere Sehnsucht nach Frieden falsch als Schwäche gesehen. Das werden Sie bereuen. - # Requires translation! The day...is yours. I hope you will be merciful in your triumph. = Dies ist Ihr Tag. Ich hoffe sie werden in Ihrem Triumph barmherzig sein. - # Requires translation! The people of the United States of America welcome you. = Die Einwohner der Vereinigten Staaten von Amerika heißen Sie herzlich Willkommen. -# Requires translation! Is the following trade of interest to you? = Interessiert sie folgender Tausch? -# probably "gut?" bzw "und?" need the situation -# Requires translation! -Well? = # Requires translation! +Well? = Washington = Washington - # Requires translation! New York = New York - # Requires translation! Boston = Boston - # Requires translation! Philadelphia = Philadelphia - # Requires translation! Atlanta = Atlanta - # Requires translation! Chicago = Chicago - # Requires translation! Seattle = Seattle - # Requires translation! San Francisco = San Francisco - # Requires translation! Los Angeles = Los Angeles # Requires translation! Houston = @@ -2039,13 +1973,9 @@ Houston = Portland = # Requires translation! St. Louis = - # Requires translation! Miami = Miami - # Requires translation! Buffalo = Buffalo - # Requires translation! Detroit = Detroit - # Requires translation! New Orleans = New Orleans # Requires translation! Baltimore = @@ -2057,11 +1987,8 @@ Cincinnati = Dallas = # Requires translation! Cleveland = - # Requires translation! Kansas City = Kansas City - # Requires translation! San Diego = San Diego - # Requires translation! Las Vegas = Las Vegas # Requires translation! Phoenix = @@ -2118,29 +2045,17 @@ Santa Cruz = # Requires translation! Little Rock = - # Requires translation! Japan = Japan - # Requires translation! Oda Nobunaga = Oda Nobunaga - # Requires translation! I hereby inform you of our intention to wipe out your civilization from this world. = Hiermit informiere ich Sie, dass ich plane Ihre Zivilisation auszulöschen. -# Requires translation! Pitiful fool! Now we shall destroy you! = Mitleidiger Dummkopf! Jetzt werden wir Sie zerstören! - # Requires translation! You were much wiser than I thought. = Sie sind viel weiser als ich dachte. - # Requires translation! We hope for a fair and just relationship with you, who are renowned for military bravery. = Wir hoffen auf eine faire und gerechte Beziehung zu Ihnen, wo Sie für Ihre militärische Tapferkeit bekannt sind. - # Requires translation! I would be grateful if you agreed on the following proposal. = Ich wäre dankbar, wenn sie folgendem Vorschlag zustimmen. - # Requires translation! Oh, it's you... = Oh, Sie sind es... - # Requires translation! Kyoto = Kyōto - # Requires translation! Osaka = Osaka - # Requires translation! Tokyo = Tokyo - # Requires translation! Satsuma = Satsuma # Requires translation! Kagoshima = @@ -2217,18 +2132,11 @@ Tottori = India = Indien Gandhi = Mahatma Gandhi - # Requires translation! I have just received a report that large numbers of my troops have crossed your borders. = Ich habe gerade gehört, daß viele Truppen von mir Ihre Grenzen übertreten haben. - # Requires translation! My attempts to avoid violence have failed. An eye for an eye only makes the world blind. = Meine Versuche Gewalt zu vermeiden haben versagt. Auge um Auge führt nur dazu, daß am Ende niemand mehr sehen kann. -# siehe https://de.wikipedia.org/wiki/Die_Gedanken_sind_frei , 3. Strophe Fassung 1856/1865 , Stand 7.4.2020 -# Requires translation! You can chain me, you can torture me, you can even destroy this body, but you will never imprison my mind. = Und sperrt man mich ein \nIm finsteren Kerker, \nDas alles sind rein \nVergebliche Werke; \nDenn meine Gedanken \nZerreißen die Schranken \nUnd Mauern entzwei: \nDie Gedanken sind frei. - # Requires translation! Hello, I am Mohandas Gandhi. My people call me Bapu, but please, call me friend. = Hallo, ich bin Mahatma Gandhi. Meine Leute nennen mich Bapu, aber nennen sich mich bitte Freund. - # Requires translation! My friend, are you interested in this arrangement? = Mein Freund, sind sie an diesem Tausch interessiert? - # Requires translation! I wish you peace. = Ich wünsche dir Frieden. # Requires translation! Delhi = @@ -2294,140 +2202,79 @@ Jaipur = Karachi = Germany = Deutschland - # Requires translation! Otto von Bismarck = Otto von Bismarck - # Requires translation! 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 Krieg vor. - # Requires translation! Corrupted villain! We will bring you into the ground! = Verdammter Bösewicht! Wir werden Sie zu Boden werfen.. - # Requires translation! Germany has been destroyed. I weep for the future generations. = Deutschland wurde zerstört. Ich trauere um die zukünftigen Generationen. - # Requires translation! Guten tag. In the name of the great German people, I bid you welcome. = Guten Tag, im Namen des großartigen deutschem Volke heiße ich sie willkommen. - # Requires translation! It would be in your best interest, to carefully consider this proposal. = Es wäre in Ihrem besten Intresse diesen Vorschlag genau zu erwägen, und ihn anzunehmen. - # Requires translation! What now? = Was nun? - # Requires translation! So, out with it! = Raus damit! - # Requires translation! Berlin = Berlin - # Requires translation! Hamburg = Hamburg - # Requires translation! Munich = München - # Requires translation! Cologne = Köln - # Requires translation! Frankfurt = Frankfurt - # Requires translation! Essen = Essen - # Requires translation! Dortmund = Dortmund - # Requires translation! Stuttgart = Stuttgart - # Requires translation! Dusseldorf = Düsseldorf - # Requires translation! Bremen = Bremen - # Requires translation! Hannover = Hannover # Requires translation! Duisburg = - # Requires translation! Leipzig = Leipzig - # Requires translation! Dresden = Dresden - # Requires translation! Bonn = Bonn - # Requires translation! Bochum = Bochum - # Requires translation! Bielefeld = Bielefeld - # Requires translation! Karlsruhe = Karlsruhe - # Requires translation! Gelsenkirchen = Gelsenkirchen - # Requires translation! Wiesbaden = Wiesbaden - # Requires translation! Munster = Munster - # Requires translation! Rostok = Rostok - # Requires translation! Chemnitz = Chemnitz - # Requires translation! Braunschweig = Braunschweig - # Requires translation! Halle = Halle - # Requires translation! Mצnchengladbach = Mönchengladbach - # Requires translation! Kiel = Kiel - # Requires translation! Wuppertal = Wuppertal - # Requires translation! Freiburg = Freiburg - # Requires translation! Hagen = Hagen - # Requires translation! Erfurt = Erfurt - # Requires translation! Kaiserslautern = Kaiserslautern - # Requires translation! Kassel = Kassel - # Requires translation! Oberhausen = Oberhausen - # Requires translation! Hamm = Hamm - # Requires translation! Saarbrucken = Saarbrücken - # Requires translation! Krefeld = Krefeld - # Requires translation! Pirmasens = Pirmasens - # Requires translation! Potsdam = Potsdam # Requires translation! Solingen = - # Requires translation! Osnabruck = Osnabrück - # Requires translation! Ludwingshafen = Ludwingshafen - # Requires translation! Leverkusen = Leverkusen - # Requires translation! Oldenburg = Oldenburg # Requires translation! Neuss = # Requires translation! Mulheim = - # Requires translation! Darmstadt = Darmstadt # Requires translation! Herne = - # Requires translation! Wurzburg = Würzburg - # Requires translation! Recklinghausen = Recklinghausen - # Requires translation! Gצttingen = Göttingen - # Requires translation! Wolfsburg = Wolfsburg - # Requires translation! Koblenz = Koblenz - # Requires translation! Hildesheim = Hildesheim - # Requires translation! Erlangen = Erlangen The Ottomans = Die Osmanen Suleiman I = Suleiman der Prächtige - # Requires translation! Your continued insolence and failure to recognize and preeminence leads us to war. = Ihre nicht enden wollende Insolenz und ihr Unvermögen unsere Vormacht anzuerkennen, führen uns in den Krieg. - # Requires translation! Good. The world shall witness the incontestable might of my armies and the glory of the Empire. = Gut, die Welt wird Zeuge der unbestreitbaren Macht meiner Armeen und der Herrlichkeit des Reiches. - # Requires translation! Ruin! Ruin! Istanbul becomes Iram of the Pillars, remembered only by the melancholy poets. = Ruin! Ruin! Istanbul wird von Fremden ausgelöscht, nur noch ein paar melancholische Poeten erinnern daran. # Requires translation! From the magnificence of Topkapi, the Ottoman nation greets you, stranger! I'm Suleiman, Kayser-I Rum, and I bestow upon you my welcome! = @@ -4054,6 +3901,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index ee0c5403aa..e77dee54a8 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -4548,6 +4548,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 9b962b1ab2..f61a074d35 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2989,6 +2989,13 @@ Ranged attacks can be done from a distance, dependant on the 'Range' value of th In research agreements, you and another civilization decide to jointly research technology.\nAt the end of the agreeent, you will both recieve a 'lump sum' of Science, which will go towards one of your unresearched technologies. = Negli accordi di ricerca, tu e un'altra civiltà ricercherete tecnologie in modo unito.\nAlla fine dell'accordo, riceverete entrambi una tantum di Scienza, che si sommerà a una delle tecnologie ancora non scoperte. The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = La quantità di Scienza che ricevi alla fine dipende da quella generata dalle città tue e dell'altra civiltà durante l'accordo. Più è alta, meglio è! + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 3b895b14a9..493daa2250 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -4028,6 +4028,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 1b4a929d03..2b1f65c76a 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -3484,6 +3484,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 4749b65d5b..da95bc40bf 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -5341,6 +5341,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 58e89e1418..219e59fa2c 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -3084,6 +3084,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 5c4cad7c86..4b59b1f627 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -4516,6 +4516,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 4635b92208..f067cc8295 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -4480,6 +4480,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index 448e766498..1d53042f38 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -3308,6 +3308,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 9a4204f181..ed74a11023 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -3294,6 +3294,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index e82b1325cb..1d326b2714 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -4298,6 +4298,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index 3d03361662..36eace8046 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -4098,6 +4098,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 15ff62b848..b91642c90a 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -3651,6 +3651,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 08bf5e3490..173232b2c8 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -3155,6 +3155,13 @@ In research agreements, you and another civilization decide to jointly research # Requires translation! The amount of Science you recieve at the end is dependant on the science generated by your cities and the other civilization's cities during the agreement - the more, the better! = + # Requires translation! +Not all nations are contending with you for victory.\nCity-states are nations that can't win, don't conquer other cities and can't be traded with. = + # Requires translation! +Instead, diplomatic relations with city-states are determined by Influence - a meter of 'how much the City-state likes you'.\nInfluence can be increased by attacking their enemies, liberating their city, and giving them sums of gold. = + # Requires translation! +Certain bonuses are given when you are at above 30 influence.\nWhen you have above 60 Influence, and you have the highest influence with them of all civilizations, you are considered their 'Ally', and gain further bonuses and access to the Luxury and Strategic resources in their lands. = + #################### Lines from UnitPromotions.json #################### diff --git a/android/assets/jsons/translations/completionPercentages.properties b/android/assets/jsons/translations/completionPercentages.properties index 92b621340a..48317c93c6 100644 --- a/android/assets/jsons/translations/completionPercentages.properties +++ b/android/assets/jsons/translations/completionPercentages.properties @@ -5,7 +5,7 @@ Russian = 88 Romanian = 43 Simplified_Chinese = 88 Korean = 81 -German = 61 +German = 66 Japanese = 62 Turkish = 75 English = 2 diff --git a/build.gradle b/build.gradle index a906fcc4e0..3819d6f329 100644 --- a/build.gradle +++ b/build.gradle @@ -33,8 +33,8 @@ allprojects { version = '1.0.1' ext { appName = "Unciv" - appCodeNumber = 405 - appVersion = "3.7.0" + appCodeNumber = 406 + appVersion = "3.7.1" gdxVersion = '1.9.10' roboVMVersion = '2.3.1' diff --git a/changelog.md b/changelog.md index 7355bd8185..fad2d7cd79 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,23 @@ +## 3.7.1 + +Hopefully resolved #2361 - should work on 32-bit linux + +By Jack Rainy: +- Better colors for Katmandu and Almaty +- Autosize of the tech buttons +- Display the crosshair in alternate color for distant targets +- Display price for unavailable purchases + +By rh-github-2015: +- Fortify until healed disabled if no more movement +- Better thread handling + +Resolved #2340 - cannot open multiple 'disband' popups for cash hack + +Resolved #2305 - Added city-states and influence tutorial + +Translation updates + ## 3.7.0 By Jack Rainy: