* French translation fixes (#2484)
* Replace tile improvement term in FR to match Civ terminology
* FR fixes for tutorial
* FR fixes for buildings and diplomacy
* FR fixes for Trade, Nation and City-State
* FR fixes for Menus and notifications
* FR - Removed particles in front of civ names
* FR - fix non translated string (419 -> 335)
Most of the fixes here are city or place names.
These were extracted from Wikipedia French articles matching the
corresponding english article.
Thanks goes to https://wikipedia.org
* FR - fix space before "!", typo, translate falsely translated tutorial lines
* Translations (#2490)
* Translations are added and corrected
* Translations for the main screen
* Update Indonesian.properties (#2487)
* Update Indonesian.properties
Finished all required translations
Some tweaks and corrections
Enjoy, Indonesians
* Update Indonesian.properties
* Update Indonesian.properties
* Update Indonesian.properties
Co-authored-by: Luke Marlin <luke.marlin@viacesi.fr>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
* A lot of cities are translated (#2472)
* Update Indonesian.properties (#2475)
* Update Indonesian.properties
Added most of the Lines from Nations.json
* Update Indonesian.properties
Added all if not most of the quotes translations (phew it's exhausting to translate it all)
Finished the cities and policies translation
Plus some other corrections
This should be it (99%)
Thanks for all your support, especially yairm210 for keeping this game updated with my translation work <3
* Update Italian.properties (#2477)
* Update Italian.properties
* Update Italian.properties
* Some more german translations (#2480)
Co-authored-by: proteus-anguinus <16001896+rh-github-2015@users.noreply.github.com>
* fixed a spelling mistake (#2476)
* fixe a spelling mistake
* Update German.properties
* Update Czech.properties (#2473)
- new texts (tutorials mostly)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: proteus-anguinus <16001896+rh-github-2015@users.noreply.github.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Update Italian.properties (#2451)
* Spanish.properties (#2464)
* Update Indonesian.properties (#2457)
* Update Indonesian.properties
I've done a lot of translations and correction to some things in this Indonesian translation. May this helps. I will continue updating this in the upcoming days ASAP.
* Second update of Indonesian properties
Added: Tutorials.json translation
and some correction
* Translations (#2454)
* Translations
* Translations of era are already included from Tech.json
* More tutorial translations
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: WillianBlack <63936035+WillianBlack@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
* Allow building the citadels either next to or within friendly tiles only
* Citadel acquire the tiles around it
* AI uses the citadels to get the tiles back + improved AI for the forts
Removed Era enum - too restrictive to tech tree variations (atomic era, anyone?)
As a side bonus, mods can now add their own eras, that'll be interesting?
This means that you can 'start from scratch' and build whatever you want - example "Scenario" in unciv-mod-example repo
Obviously we'll have to change around a lot of things or this to work well, but it's a start
* Update Italian.properties (#2429)
You also forgot Denmark's ability
* Update Spanish.properties (#2432)
Small contribution to translation. I could finish it but I'm sleepy and I want to save the progress. It will be 100% in a couple of days.
* Update German.properties (#2440)
* Update German.properties
Meint Zeile 3434 wirklich besetzte Stadt?
bei Nations etwas weitergemacht, genderung der Sprache entfernt (versucht).
siehe git diff
* Update German.properties
added translation to a part of the tutorials
* simplified Chinese translations (#2443)
* simplified Chinese translations
* simplified Chinese translations
* simplified Chinese translations
Co-authored-by: SheepYang <332594623@qq..com>
* Update Dutch.properties (#2447)
I added some new translations, fixed some typo's and turned Tevredenheid in to Blijheid which I think is more fitting. Also n.Chr. (the Dutch version of AD) is rarely used, so it may be more fitting to just remove it after you pass v.Chr. (BC).
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CodeBlizzard <62041843+CodeBlizzard@users.noreply.github.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
Co-authored-by: SheepYang <332594623@qq.com>
Co-authored-by: SheepYang <332594623@qq..com>
Co-authored-by: SrirachaGamer87 <58479947+SrirachaGamer87@users.noreply.github.com>
* Update Italian.properties (#2402)
* Update Czech.properties (#2416)
new texts, terminology improved and synced
* Update Traditional_Chinese.properties (#2420)
Updates part of the untranslated items
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
* Enable the Denmark civilization
* Nation unique ability is implemented
* Units unique abilities are implemented
* Unit icons
* Misprint in the tech name is corrected
* Update Tutorials.json
Added tutorial for Natural Wonders
* Enable displaying the Natural Wonders tutorial
* Display the tutorial when the wonder is found automatically
* Minor performance optimization
* Removing debug leftovers
See also 33da0e3a7f
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)
* Update Nations.json
* Back button fix, ESC, and behaviour of them in popups
* ESC/Back now work if there's no exitEvent
* ESC/Back: JackRainy is right, exit prompt now cancellable with same key
* Update Italian.properties (#2338)
* Update German.properties until line 2433 (#2351)
* Update German.properties until line 2433
line 2306, i add in german like carefully consider this proposalt "and agree" , if you dont want that, delete "und ihn anzunehmen."
line 2310, context is probably need, so I added in brackets the english version
i think there is another line in which I added the english version in brackets.
ends in line 2433
* Done most of the requested Changes.
* \n for newline, source for poem, requested changes
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
* Update Polish.properties (#2275)
* Update Italian.properties (#2276)
* Update French.properties (#2279)
* Traditional Chinese Update (#2283)
Update for the traditional Chinese translations.
* Update translations + notification about generated translation files (#2280)
* Translations
* Notify about successful creation of the files
* A few more translations
* Misprint is corrected
* Translations for Inca
* Translation updates
* Update Italian.properties (#2290)
* Translations (#2288)
* Update Polish.properties (#2275)
* Update Italian.properties (#2276)
* Update French.properties (#2279)
* Traditional Chinese Update (#2283)
Update for the traditional Chinese translations.
* Update translations + notification about generated translation files (#2280)
* Translations
* Notify about successful creation of the files
* A few more translations
* Misprint is corrected
* Translations for Inca
* Translation updates
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
* Update Italian.properties
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
* Update Ukrainian.properties (#2291)
* Translations (#2288)
* Update Polish.properties (#2275)
* Update Italian.properties (#2276)
* Update French.properties (#2279)
* Traditional Chinese Update (#2283)
Update for the traditional Chinese translations.
* Update translations + notification about generated translation files (#2280)
* Translations
* Notify about successful creation of the files
* A few more translations
* Misprint is corrected
* Translations for Inca
* Translation updates
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
* Update Ukrainian.properties
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
* Translation updates
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
* Update Polish.properties (#2275)
* Update Italian.properties (#2276)
* Update French.properties (#2279)
* Traditional Chinese Update (#2283)
Update for the traditional Chinese translations.
* Update translations + notification about generated translation files (#2280)
* Translations
* Notify about successful creation of the files
* A few more translations
* Misprint is corrected
* Translations for Inca
* Translation updates
Co-authored-by: RadioMagnetofonStereofoniczny <remixionmix@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
* Inca abilities for Terrace farm and Great Andean Road
* Language files re-done by manual pull and merge
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* For #2200: Avoid MacOS tripping us
* Second hidden test in packImages
* Clearer message for a specific mod error, UI message for savegames missing mods
* Fixed obsolete imports from rejected experiments
* Tiny lint issue
* Irrelevant change to test push after rebase
* A little more information in civilopedia for improvements and nations
* Differentiate civilopedia and picker use
* Missing lines in translations template
* allTranslationsEndWithASpace test
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Update Ukrainian.properties
Some cities was translated
Updated some tech names
Another minor fix
* Update Ukrainian.properties
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Changes to existing translations are I hope well thought out: I tried to limit myself to clear inconsistencies (e.g. marsh appears exactly twice and had two different translations before), stuff where I looked up the game context to best match what a native german would understand comfortably in the UI, and so on. There are still several inconsitencies - if I noticed one and couldn't bother to guarantee matching them all I left them.
Note I 'fixed' some spanish city names where the _english_ side is clearly wrong. Particularly Elche (https://goo.gl/maps/jtqPqGG2mkVbFxCe6). Actual translations are only about three where we krauts have fixed expectations deviating from the proper name. Mail me if I should fix those properly in jsons and template?
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Unit can now only be purchased if no other unit of same type is stationed in city center #2081
* #2081
Added unique to landsknecht and changed condition for movement panelty
* Refactored when statement to if
#2081
* Only one plane at a time can be purchased to a maximum of 6 that are NOT transported in a single city
#2081
* removed duplicate code
#2081
* refactor canPurchase() and now track bought units in a city in a mutableList
#2081
* refactor canPurchase() it basicly just tracks if the unit can be placed on the center tile! if it cant then we dont allow the purchase!
#2081
* Changed wording of unique and added translations
#2081
* Changed wording of unique
#2081
* removed unneeded imports
#2081
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Refactoring: Split reading and writing of translation files
* New generator of translation strings from JSONs
* Switch to the new strings generation approach
* Using the regex for similar strings + bugfix for Submarines
* Transfer of the existing translations
* Clean up of the template file and translated files based on it
* Unit tests are updated
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Update Italian.properties (#2169)
* Update Romanian.properties (#2183)
* Update Turkish.properties (#2172)
Co-authored-by: rayray61 <54810477+rayray61@users.noreply.github.com>
* Romanian Tutorial tasks translated (#2174)
Hello, I have translated the Romanian Tutorial tasks and probably the right way this time.
* some french translations (#2185)
* Update Indonesian.properties (#2186)
Kinda lazy this time cuz i'm tired, probably gonna continue later
* Update Czech.properties (#2189)
synced translation terms
some new translations - nations, uniques, babylon, grece
* Update Simplified_Chinese.properties (#2194)
Completed the diplomatic languages of India, Germany, Iloko, Persia, etc
* Update Simplified_Chinese.properties (#2195)
Translated the city states and their diplomatic languages, as well as the diplomatic languages of Sanghai, Siam, Spain and Mongolia.
* Translation updates
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: rayray61 <54810477+rayray61@users.noreply.github.com>
Co-authored-by: Vasile Stefan <62265162+FierulMare@users.noreply.github.com>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: F4R3LB3ST <superfarel2ymail.com@gmail.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: tianshidoubi <48427744+tianshidoubi@users.noreply.github.com>
* Make TranslationFileReader as object class
* Generate strings from Tutorials.json
* Simplified storage and loading of the tutorials
* Transfer existing translations
* Snow, Atoll & Ice
* Fix White Hexagon + Small NW refactor
* More Land in Continents #1886
* Atoll can spawn only on Coast
* Added new constants and turned Constant into an object
* Latitude and Longitude utility methods
* New MapGenerator steps
* New MapParameters & MapGenerator cleanup
* Added New Map option to MapEditor menu
* New parameters default values and limits
* archipelagos map type
* Translations & Atlas
* removing unneeded octave displacement
* Fix Archipelago
* Perlin noise parameters & no-elvis in TileMap
* Rebuilt Atlas
Co-authored-by: Eddh <remi.dufour@protonmail.com>
* Rename "translationsByLanguage" folder
* Minor refactoring
* Generate Nations strings
* Use the nations strings while creating the translation files
* Clean up of Nations files
* Transfer existing translations
* Get rid of the nation's translated name
* Transfer just few nations' translations for languages without Nations_Language.json
* Clean up of not used greetings
* Correct marking of not translated strings
* Unique abilities moved to enums
* remove diplomatic victory type WIP
* Address review comments. Translations for unique abilities names aren't used anywhere as far as I can tell, but added them to relevant translation files just in case.
Co-authored-by: nmeze <nicolas.mezeret@gmail.com>
* Initial preparations
* Moving to the separate package
* Calculation and visualization
* Translations
* Using a local function instead of additional class
* Using a local function instead of additional class (part 2)
* Rankings French.properties
* Fixup of the leftover
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
* Update Polish.properties (#1997)
* Update Polish.properties
* Update Polish.properties
This should solve the problem (and correct a small translation error)
* Update Polish.properties
Next corrections, thanks @rprzystasz
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* New french translation (#2014)
* Update Italian.properties (#2016)
* Update German.properties (#2017)
* Update German.properties
* Create Nations_German.json
Start new file for nations translation in german
* Update Nations_German.json
* Extensive correction of French translation (#2022)
* Resolved#1986 - research agreement cost consistency
* Tile stats are shown on a row, rather than on a column (#1946)
* Feature/refactor actions (#2008)
* Fixes Issue #1697 by adding information to the special production constructions.
* Get rid of extra $ sign in the SpecialConstruction tooltips
* Major refactor to use Sequences instead of List to try to improve logic whenever getting a list of tiles at a distance.
* Get rid of extraneous parameter
* get rid of extra exception. slight refactor placeUnitNearTile for readability
* Fix bug of doing intersection instead of union
* Add an extra method to get tiles in distance range
* Refactor the UnitActions to use more sequences and also to grab the actions needed by Automation directly.
* Update based on comments
* Redo to be more easily compared
* use elvis operator for assignment
* resolve merge conflicts
* Fix typo
* Fix one more typo
* Get rid of one more search for great person actions
* Get rid of one more search for pillage action
* Try to realign methods names for better diff
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Resolved#2012 - manually place starting locations are no longer visible in-game
* Extensive correction of French translation
Many, many several little corrections to the French translation. A few mistakes marred gameplay a little bit, but most of them were simple grammar mistakes. But the details are always important.
* Modifications to resolve conflict
* Modifications to resolve conflict (bus)
* Modifications to resolve conflict MK3
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
Co-authored-by: Kentalot <Kentalot@users.noreply.github.com>
* Updates
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CarpeLuxNoctem <61473456+CarpeLuxNoctem@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
Co-authored-by: Kentalot <Kentalot@users.noreply.github.com>
* Reworked Notification service to remove Nullpointer crashes due to non-final static variables being null. Instead moved all state to Worker specific architecture. Also switched to Android based localization because core-based one can be unavailable to worker.
* Added missing blanks
* Added more internationalization
Added missing androidX declaration (neccessary for newer Gradle versions)
Updated Gradle for new Android Studio Version
* Optimization
* Removed missing translations error
* Place the unit at the current position firstly
* More simple solution
* Try to place unit with traceability taken into account
* Return money and notify about the problem
* Popup dialog instead of notification
* Refactoring: Split UI and logic
* Update Polish.properties (#1931)
* Update Russian.properties (#1932)
* Update Italian.properties (#1933)
Also added Research Agreement
* Update Japanese.properties (#1942)
* Update Japanese.properties
* Update Japanese.properties
* Update Japanese.properties
* Translations update (#1943)
* Translations update
* Render some missing characters in the Ukrainian translations
* More translations
* Fixed typo: Otto von Bismark -> Otto von Bismarck (#1954)
* Translation updates, added test to assure that translations in template file end with a space
* Disabled Maven - hopefully Travis check will not take 10 minutes and will pass
Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: schnippl0r <58435847+schnippl0r@users.noreply.github.com>
* Added MultiplayerScreen
Added MultiplayerScreen Class to replace openMultiplayerPopup()
Added Sessionbrowser UI elements
* Added Session Browser functionality
* Added ResponsePopup
is used for "copy UserID" among others to be more responsive
* Added "Edit Session" and Help Button
Changed saving Multiplayer Session to seperate Folder
-TODO? Help Button chould be in every pickerscreen
* removed function for Turn Check
heard tobo is working on a Turn checker so no need for the function
* Added delete to editScreen + Cleanup and Comments
delete should be a "give up" instead
* creating new game as multiplayer now saves to multiplayer folder
+ gameId gets copied to clipboard
* Delete unintended save file
delete a save file which got falsely commited
* Added helpPopup Text and refresh Button
* Cleanup + Translation
* More Cleanup
Refresh List doesn't flicker anymore
Response PopUp time for new Game reduced
* Fixed Game crashing on reload
* Added Add Current Game
Games you don't know the gameID of can now be saved when running
* Added Translations entry
* adding requested changes
+ added addCurrentGameButton() for readability and to reduce indentation
- removed unnecessary returns
+ sequentialised try catch for better readability
+ added comments to responsePopup for better unstanding
* Adding requested indent changes
- removed all unnecessary indents
* Cleaned up Unit Actions
* Resolved#1902 - buildings requiring worked resources can be built in cities that are built on that resource
* Legalism grants enqueued buildings (#1906)
* Update German.properties
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
* Cleaned up Unit Actions
* Resolved#1902 - buildings requiring worked resources can be built in cities that are built on that resource
* Legalism grants enqueued buildings (#1906)
* Update Turkish.properties
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
* Add support for loading mods
* Move mod folder copying into its own function
* Only request permission to read storage, not write
* Only allow mods on KK+ (removes storage permission)
* Mongolia
* Translation & Atlas
* Remove debug option
* Remove erroneous import
* Promotions.addXP
* Khan heals 15 HP
* XP bonus fix
* Added 'Mongol Terror' which is the term used for the mongolian combat bonus
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Add missing Forge and Seaport production bonus uniques
Parital fix for #1762
- Forge gets "+15% production of land units"
- Seaport gets "+15% production of naval units"
* Adds missing translation "+15% production of land units"
* Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions
* Template for the translation strings
* New icons are added
Co-authored-by: ltrcao <ltrcao@users.noreply.github.com>
