mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-23 13:09:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict that I have no idea why happened

Browse Source
This commit is contained in:
Tunacan427 2019-09-25 20:06:12 +03:00
commit 7683fdb9cb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/bundles/bundle_tr.properties
View File

@ -213,7 +213,7 @@ map.random = [accent]Rastgele Harita
map.nospawn = This map does not have any cores for the player to spawn in! Add a[accent] orange[] core to this map in the editor. map.nospawn = This map does not have any cores for the player to spawn in! Add a[accent] orange[] core to this map in the editor.
map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-orange[] cores to this map in the editor. map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-orange[] cores to this map in the editor.
map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor. map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
map.invalid = Haritayı açarken hata oldu: bozulmuş ya da geçersiz harita dosyası. map.invalid = Haritayı açarken hata oldu: bozulmuş ya da geçersiz harita dosyası.-
map.publish.error = Error publishing map: {0} map.publish.error = Error publishing map: {0}
map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up! map.publish.confirm = Are you sure you want to publish this map?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your maps will not show up!
eula = Steam EULA eula = Steam EULA
@ -233,7 +233,7 @@ editor.generation = Oluşum:
editor.ingame = Oyun içinde düzenle editor.ingame = Oyun içinde düzenle
editor.publish.workshop = Workshop'da Yayınla editor.publish.workshop = Workshop'da Yayınla
editor.newmap = Yeni Harita editor.newmap = Yeni Harita
workshop = Workshop workshop = Workshop-
waves.title = Dalgalar waves.title = Dalgalar
waves.remove = Kaldır waves.remove = Kaldır
waves.never = <asla> waves.never = <asla>