Fixed minor merge conflict between dutch and other languages

This commit is contained in:
Yair Morgenstern
2018-07-01 16:59:41 +03:00
parent a9b33f1322
commit 837195293c
3 changed files with 32 additions and 24 deletions

View File

@ -190,7 +190,7 @@
name:"Education",
row:3,
prerequisites:["Theology","Civil Service"],
baseDescription:"Allows cities to convert production to science,"
baseDescription:"Enables conversion of city production to science"
},
{
name:"Chivalry",
@ -201,7 +201,7 @@
name:"Machinery",
row:8,
prerequisites:["Guilds","Engineering"],
baseDescription:"Speeds movement speed on roads"
baseDescription:"Improves movement speed on roads"
},
{
name:"Physics",

View File

@ -160,12 +160,13 @@
German:"Gesundheit"
Dutch:"Gezondheid"
}
"Disband unit":{
Italian:"Disbandare"
Russian:"Расформировать"
French:"Dissoudre unité"
Romanian:"Desfaceți unitatea"
Dutch:"Eenheid opheffen"
}
"Do you really want to disband this unit?":{
@ -173,18 +174,21 @@
Russian:"Вы действительно хотите распустить этот блок?"
French:"Voulez-vous vraiment dissoudre cette unité?"
Romanian:""
Dutch:"Wil je echt deze eenheid opheffen"
}
"Yes":{
Italian:"Si"
Russian:"Да"
French:"Oui"
Romanian:"Da"
Dutch:"Ja"
}
"No":{
Italian:"No"
Russian:"Нет"
French:"Non"
Romanian:"Nu"
Dutch:"Nee"
}
@ -461,7 +465,7 @@
French:"Choisissez une technologie"
Romanian:"Alege o tehnologie"
German:"Technologie auswählen"
DUtch:"Technologie kiezen"
Dutch:"Technologie kiezen"
}
"Pick a free tech":{
@ -487,7 +491,7 @@
Russian:"Выберите [technology] как бесплатную технику"
French:"Choisissez [technology] comme technologie libre"
Romanian:"Alegeți [tehnology] ca tehnologie gratuită"
DUtch:"[technologie] kiezen als gratis technologie"
Dutch:"[technologie] kiezen als gratis technologie"
}
"Units enabled":{
@ -1899,6 +1903,10 @@
Dutch:"Wie weet wat de toekomst inhoud?"
}
"Improves movement speed on roads":{}
"Enables conversion of city production to science":{}
"Enables conversion of city production to gold":{}
// Tech Eras
// In case of foreign languages it becomes gender sensitive words
//Also in russian "Medieval Era" becomes "Средневековье" or italian for "Renaissance Era" becomes "Rinascimento". So they got a single world to replace 2 english ones