Skip to content

Commit 5f025a1

Browse files
yairm210yairm210
committed
4.15.9
1 parent bae997f commit 5f025a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1125
-410
lines changed

‎android/assets/ConstructionIcons.atlas

+70-70
Large diffs are not rendered by default.

‎android/assets/ConstructionIcons.png

-31 Bytes
Loading

‎android/assets/Icons.atlas

+23-23
Original file line numberDiff line numberDiff line change
@@ -398,14 +398,14 @@ ImprovementIcons/Road
398398
index: -1
399399
ImprovementIcons/Terrace farm
400400
rotate: false
401-
xy: 328, 788
401+
xy: 328, 680
402402
size: 100, 100
403403
orig: 100, 100
404404
offset: 0, 0
405405
index: -1
406406
ImprovementIcons/Trading post
407407
rotate: false
408-
xy: 328, 572
408+
xy: 328, 464
409409
size: 100, 100
410410
orig: 100, 100
411411
offset: 0, 0
@@ -1075,44 +1075,51 @@ OtherIcons/Shield
10751075
orig: 100, 100
10761076
offset: 0, 0
10771077
index: -1
1078-
OtherIcons/Sleep
1078+
OtherIcons/Skip
10791079
rotate: false
10801080
xy: 1008, 1161
10811081
size: 100, 100
10821082
orig: 100, 100
10831083
offset: 0, 0
10841084
index: -1
1085-
OtherIcons/Speaker
1085+
OtherIcons/Sleep
10861086
rotate: false
10871087
xy: 1116, 1269
10881088
size: 100, 100
10891089
orig: 100, 100
10901090
offset: 0, 0
10911091
index: -1
1092+
OtherIcons/Speaker
1093+
rotate: false
1094+
xy: 1008, 1053
1095+
size: 100, 100
1096+
orig: 100, 100
1097+
offset: 0, 0
1098+
index: -1
10921099
OtherIcons/Spy
10931100
rotate: false
1094-
xy: 1008, 945
1101+
xy: 1116, 1053
10951102
size: 100, 100
10961103
orig: 100, 100
10971104
offset: 0, 0
10981105
index: -1
10991106
OtherIcons/Star
11001107
rotate: false
1101-
xy: 1116, 1059
1108+
xy: 1116, 951
11021109
size: 100, 94
11031110
orig: 100, 94
11041111
offset: 0, 0
11051112
index: -1
11061113
OtherIcons/Swap
11071114
rotate: false
1108-
xy: 335, 896
1115+
xy: 328, 788
11091116
size: 100, 100
11101117
orig: 100, 100
11111118
offset: 0, 0
11121119
index: -1
11131120
OtherIcons/Timer
11141121
rotate: false
1115-
xy: 328, 680
1122+
xy: 328, 572
11161123
size: 100, 100
11171124
orig: 100, 100
11181125
offset: 0, 0
@@ -1126,14 +1133,14 @@ OtherIcons/Triangle
11261133
index: -1
11271134
OtherIcons/Turn right
11281135
rotate: false
1129-
xy: 328, 356
1136+
xy: 328, 248
11301137
size: 100, 100
11311138
orig: 100, 100
11321139
offset: 0, 0
11331140
index: -1
11341141
OtherIcons/Tyrannosaurus
11351142
rotate: false
1136-
xy: 328, 248
1143+
xy: 328, 140
11371144
size: 100, 100
11381145
orig: 100, 100
11391146
offset: 0, 0
@@ -1145,13 +1152,6 @@ OtherIcons/WLTKD
11451152
orig: 83, 65
11461153
offset: 0, 0
11471154
index: -1
1148-
OtherIcons/Wait
1149-
rotate: false
1150-
xy: 328, 32
1151-
size: 100, 100
1152-
orig: 100, 100
1153-
offset: 0, 0
1154-
index: -1
11551155
OtherIcons/Wonders
11561156
rotate: false
11571157
xy: 1555, 1284
@@ -1357,35 +1357,35 @@ ResourceIcons/Silver
13571357
index: -1
13581358
ResourceIcons/Spices
13591359
rotate: false
1360-
xy: 1116, 1161
1360+
xy: 1008, 945
13611361
size: 100, 100
13621362
orig: 100, 100
13631363
offset: 0, 0
13641364
index: -1
13651365
ResourceIcons/Stone
13661366
rotate: false
1367-
xy: 1116, 951
1367+
xy: 343, 1004
13681368
size: 100, 100
13691369
orig: 100, 100
13701370
offset: 0, 0
13711371
index: -1
13721372
ResourceIcons/Sugar
13731373
rotate: false
1374-
xy: 343, 1004
1374+
xy: 335, 896
13751375
size: 100, 100
13761376
orig: 100, 100
13771377
offset: 0, 0
13781378
index: -1
13791379
ResourceIcons/Truffles
13801380
rotate: false
1381-
xy: 328, 464
1381+
xy: 328, 356
13821382
size: 100, 100
13831383
orig: 100, 100
13841384
offset: 0, 0
13851385
index: -1
13861386
ResourceIcons/Uranium
13871387
rotate: false
1388-
xy: 328, 140
1388+
xy: 328, 32
13891389
size: 100, 100
13901390
orig: 100, 100
13911391
offset: 0, 0
@@ -1511,7 +1511,7 @@ StatIcons/Resistance
15111511
index: -1
15121512
StatIcons/Specialist
15131513
rotate: false
1514-
xy: 1008, 1053
1514+
xy: 1116, 1161
15151515
size: 100, 100
15161516
orig: 100, 100
15171517
offset: 0, 0

‎android/assets/Icons.png

303 Bytes
Loading

‎android/assets/jsons/translations/Afrikaans.properties

+22-7
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,8 @@ Existing = Bestaande
427427
Custom = Pasgemaak
428428
Map Generation Type = Kaart Generasie Tipe
429429
Enabled Map Generation Types = Geaktiveerde Kaart Generasie Tipes
430+
# Requires translation!
431+
Example map =
430432

431433
# Map types
432434
Default = Verstek
@@ -1363,17 +1365,18 @@ We have conquered the city of [cityName]! =
13631365
# Requires translation!
13641366
Your citizens are revolting due to very high unhappiness! =
13651367
1366-
# Possible HP loss loss when attacking, e.g. (-5 HP)
1367-
# Requires translation!
1368-
([amount] HP) =
13691368
1369+
# Requires translation!
1370+
An enemy [unit] has attacked [cityName] ([amount2] HP) =
13701371
# Requires translation!
13711372
An enemy [unit] ([amount] HP) has attacked [cityName] ([amount2] HP) =
13721373
# Requires translation!
13731374
An enemy [unit] ([amount] HP) has [battleAction] our [ourUnit] ([amount2] HP) =
13741375
# Requires translation!
13751376
An enemy [unit] has attacked our [ourUnit] ([amount] HP) =
13761377
# Requires translation!
1378+
An enemy [unit] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) =
1379+
# Requires translation!
13771380
Enemy city [cityName] has attacked our [ourUnit] =
13781381
# Requires translation!
13791382
Enemy city [cityName] has attacked our [ourUnit] ([amount2] HP) =
@@ -1716,7 +1719,9 @@ Next unit =
17161719
# Requires translation!
17171720
[idleCount] idle =
17181721
# Requires translation!
1719-
[waitingCount] waiting =
1722+
[skipCount] skipping =
1723+
# Requires translation!
1724+
Cycle =
17201725
# Requires translation!
17211726
Fog of War =
17221727
# Requires translation!
@@ -1816,7 +1821,7 @@ Pillage [improvement] =
18161821
# Requires translation!
18171822
Repair [improvement] - [turns] =
18181823
# Requires translation!
1819-
Wait =
1824+
Skip turn =
18201825
# Requires translation!
18211826
Are you sure you want to pillage this [improvement]? =
18221827
# Requires translation!
@@ -4288,6 +4293,8 @@ upon gaining a [baseUnitFilter] unit =
42884293
# Requires translation!
42894294
upon turn end =
42904295
# Requires translation!
4296+
upon turn start =
4297+
# Requires translation!
42914298
upon founding a Pantheon =
42924299
# Requires translation!
42934300
upon founding a Religion =
@@ -12028,7 +12035,15 @@ Units are defenseless while embarked (cannot use modifiers), and have a fixed De
1202812035
# Requires translation!
1202912036
Idle Units =
1203012037
# Requires translation!
12031-
If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Wait'.\nIf you won't be moving it for a while, you can have the unit enter Fortify or Sleep mode - \n units in Fortify or Sleep are not considered idle units.\nIf you want to disable the 'Next unit' feature entirely, you can toggle it in Menu -> Check for idle units. =
12038+
Clicking 'Next unit' move to the next unit in the queue. =
12039+
# Requires translation!
12040+
If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'. =
12041+
# Requires translation!
12042+
If you want to disable the 'Next unit' feature entirely, you can toggle it in Menu -> Check for idle units. =
12043+
# Requires translation!
12044+
If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu. =
12045+
# Requires translation!
12046+
You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. =
1203212047
1203312048
# Requires translation!
1203412049
Contact Me =
@@ -12151,7 +12166,7 @@ This is where you spend most of your time playing Unciv. See the world, control
1215112166
# Requires translation!
1215212167
⑧: The name (and unit icon) of the selected unit or city, with current health if wounded. Clicking a unit name or icon will open its civilopedia entry. =
1215312168
# Requires translation!
12154-
⑨: The arrow buttons allow jumping to the next/previous unit. =
12169+
⑨: The arrow buttons allow jumping to the next/previous idle unit. =
1215512170
# Requires translation!
1215612171
⑩: For a selected unit, its promotions appear here, and clicking leads to the promotions screen for that unit. =
1215712172
# Requires translation!

‎android/assets/jsons/translations/Bangla.properties

+23-7
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,8 @@ Existing = বিদ্যমান
389389
Custom = কাস্টম
390390
Map Generation Type = মানচিত্র উৎপন্নের ধরণ
391391
Enabled Map Generation Types = উৎপন্নের জন্য সক্রিয় করা ধরণগুলো
392+
# Requires translation!
393+
Example map =
392394
393395
# Map types
394396
Default = ডিফল্ট
@@ -1029,16 +1031,17 @@ We have conquered the city of [cityName]! = আমরা [cityName]কে দখ
10291031
# Requires translation!
10301032
Your citizens are revolting due to very high unhappiness! =
10311033

1032-
# Possible HP loss loss when attacking, e.g. (-5 HP)
1033-
# Requires translation!
1034-
([amount] HP) =
10351034

1035+
# Requires translation!
1036+
An enemy [unit] has attacked [cityName] ([amount2] HP) =
10361037
# Requires translation!
10371038
An enemy [unit] ([amount] HP) has attacked [cityName] ([amount2] HP) =
10381039
# Requires translation!
10391040
An enemy [unit] ([amount] HP) has [battleAction] our [ourUnit] ([amount2] HP) =
10401041
# Requires translation!
10411042
An enemy [unit] has attacked our [ourUnit] ([amount] HP) =
1043+
# Requires translation!
1044+
An enemy [unit] ([amount] HP) has attacked our [ourUnit] ([amount2] HP) =
10421045
Enemy city [cityName] has attacked our [ourUnit] = আমাদের [ourUnit]কে শত্রু শহর [cityName] আক্রমণ করেছে
10431046
# Requires translation!
10441047
Enemy city [cityName] has attacked our [ourUnit] ([amount2] HP) =
@@ -1367,7 +1370,9 @@ Next unit = পরবর্তী ইউনিট
13671370
# Requires translation!
13681371
[idleCount] idle =
13691372
# Requires translation!
1370-
[waitingCount] waiting =
1373+
[skipCount] skipping =
1374+
# Requires translation!
1375+
Cycle =
13711376
Fog of War = যুদ্ধের কুয়াশা
13721377
Pick a policy = একটি নীতি নির্বাচন করুন
13731378
Move Spies = গুপ্তচরদের সরান
@@ -1424,7 +1429,8 @@ Pillage = লুট করুন
14241429
Pillage [improvement] = [improvement] লুট করুন
14251430
[improvement] (Pillaged!) = [improvement] (লুট করা হয়েছে!)
14261431
Repair [improvement] - [turns] = [improvement] সংস্কার করুন - [turns]
1427-
Wait = অপেক্ষা করুন
1432+
# Requires translation!
1433+
Skip turn =
14281434
Are you sure you want to pillage this [improvement]? = আপনি কি নিশ্চিত যে আপনি এই [improvement] লুট করতে চান?
14291435
We have looted [amount] from a [improvement] = আমরা একটি [improvement] থেকে [amount] লুট করেছি
14301436
We have looted [amount] from a [improvement] which has been sent to [cityName] = আমরা একটি [improvement] থেকে [amount] লুট করেছি যা [cityName] এ পাঠানো হয়েছে
@@ -3793,6 +3799,8 @@ upon gaining a [baseUnitFilter] unit =
37933799
# Requires translation!
37943800
upon turn end =
37953801
# Requires translation!
3802+
upon turn start =
3803+
# Requires translation!
37963804
upon founding a Pantheon =
37973805
# Requires translation!
37983806
upon founding a Religion =
@@ -11277,7 +11285,15 @@ Units are defenseless while embarked (cannot use modifiers), and have a fixed De
1127711285
# Requires translation!
1127811286
Idle Units =
1127911287
# Requires translation!
11280-
If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Wait'.\nIf you won't be moving it for a while, you can have the unit enter Fortify or Sleep mode - \n units in Fortify or Sleep are not considered idle units.\nIf you want to disable the 'Next unit' feature entirely, you can toggle it in Menu -> Check for idle units. =
11288+
Clicking 'Next unit' move to the next unit in the queue. =
11289+
# Requires translation!
11290+
If you don't want to move a unit this turn, you can skip it by clicking 'Next unit' again, or command the unit to 'Skip turn'. =
11291+
# Requires translation!
11292+
If you want to disable the 'Next unit' feature entirely, you can toggle it in Menu -> Check for idle units. =
11293+
# Requires translation!
11294+
If you'd rather 'Next unit' cycle the units and not mark them as Done, you can change it in the Options -> Gameplay menu. =
11295+
# Requires translation!
11296+
You can also cycle through the idle units using the left and right triangles on the Unit Table in the lower left of the screen. =
1128111297
1128211298
# Requires translation!
1128311299
Contact Me =
@@ -11400,7 +11416,7 @@ This is where you spend most of your time playing Unciv. See the world, control
1140011416
# Requires translation!
1140111417
⑧: The name (and unit icon) of the selected unit or city, with current health if wounded. Clicking a unit name or icon will open its civilopedia entry. =
1140211418
# Requires translation!
11403-
⑨: The arrow buttons allow jumping to the next/previous unit. =
11419+
⑨: The arrow buttons allow jumping to the next/previous idle unit. =
1140411420
# Requires translation!
1140511421
⑩: For a selected unit, its promotions appear here, and clicking leads to the promotions screen for that unit. =
1140611422
# Requires translation!

0 commit comments

Comments
 (0)