Left side of diplomacy screen now scrolls

android/assets/jsons/Translations.json

@@ -822,6 +822,8 @@
 		French:"Un [greatPerson] est né!"
 		Romanian:"Sa născut un [greatPerson]!"
 	}
+	
+	"We have encountered [civName]!":{}
 
 	
 	// Save and load game
@@ -2387,11 +2389,12 @@
 	} // EG Rationalism policy branch unlocked!
 	
 	// Trade
-	"Trade with [otherCiv]":{	
-		Italian:"Scambia con [otherCiv]"
-		Russian:"Торговля с [otherCiv]"
-		French:"Échanger avec [otherCiv]"
-		Romanian:"Comerțul cu [otherCiv]"
+	
+	"Trade":{	
+		Italian:"Scambia"
+		Russian:"Торговля"
+		French:"Échanger"
+		Romanian:"Comerțul"
 	}
 	"Offer trade":{	
 		Italian:"Offerta commerciale"
@@ -2412,16 +2415,16 @@
 		Romanian:"Articolele noastre"
 	}
 	"Our trade offer":{	
-		Italian:"La nostra offerta commerciale"
-		Russian:"Наше торговое предложение"
-		French:"Notre offre commerciale"
-		Romanian:"Oferta noastră comercială"
+		Italian:"La nostra \n offerta commerciale"
+		Russian:"Наше торговое\n  предложение"
+		French:"Notre offre \n commerciale"
+		Romanian:"Oferta noastră \n comercială"
 	}
 	"[otherCiv]'s trade offer":{
-		Italian:"Offerta commerciale di [otherCiv]"
-		Russian:"Коммерческое предложение [otherCiv]"
-		French:"L'offre commerciale de [otherCiv]"
-		Romanian:"ofertă de schimb a [otherCiv]"
+		Italian:"Offerta commerciale \n di [otherCiv]"
+		Russian:"Коммерческое \n предложение [otherCiv]"
+		French:"L'offre commerciale \n de [otherCiv]"
+		Romanian:"ofertă de \n schimb a [otherCiv]"
 	}
 	"[otherCiv]'s items":{	
 		Italian:"Gli articoli di [otherCiv]"
@@ -2453,6 +2456,11 @@
 		French:"Accept"
 		Romanian:"Accepta"
 	}
+	"There's nothing on the table":{}
+
+	
+	"Peace treaty":{}
+	"Gold per turn":{}
 
 
 	//civilisations
@@ -2597,6 +2605,11 @@
 		Romanian:"Diplomaţie"
 	}
 	
+	"War":{}
+	"Peace":{}
+	
+	"Declare war":{}
+	
 	// Overview screen
 	"Overview":{	
 		Italian:"Panoramica"

android/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.game"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 115
-        versionName "2.7.3.2"
+        versionCode 116
+        versionName "2.7.4"
     }
     buildTypes {
         release {

core/src/com/unciv/logic/city/CityConstructions.kt

@@ -50,7 +50,7 @@ class CityConstructions {
     }
 
     fun getProductionForTileInfo(): String {
-        var result = currentConstruction
+        var result = currentConstruction.tr()
         if (SpecialConstruction.getSpecialConstructions().none { it.name==result })
             result += "\r\n{in} ".tr() + turnsToConstruction(currentConstruction) + " {turns}".tr()
         return result

core/src/com/unciv/ui/trade/DiplomacyScreen.kt

@@ -1,10 +1,7 @@
 package com.unciv.ui.trade
 
 import com.badlogic.gdx.graphics.Color
-import com.badlogic.gdx.scenes.scene2d.ui.Label
-import com.badlogic.gdx.scenes.scene2d.ui.SplitPane
-import com.badlogic.gdx.scenes.scene2d.ui.Table
-import com.badlogic.gdx.scenes.scene2d.ui.TextButton
+import com.badlogic.gdx.scenes.scene2d.ui.*
 import com.unciv.UnCivGame
 import com.unciv.ui.utils.*
 
@@ -14,7 +11,7 @@ class DiplomacyScreen():CameraStageBaseScreen(){
     val rightSideTable = Table()
 
     init{
-        val splitPane = SplitPane(leftSideTable,rightSideTable,false, skin)
+        val splitPane = SplitPane(ScrollPane(leftSideTable),rightSideTable,false, skin)
         splitPane.setSplitAmount(0.2f)
 
         updateLeftSideTable()
@@ -64,7 +61,6 @@ class DiplomacyScreen():CameraStageBaseScreen(){
                 }
                 civTable.add(declareWarButton).row()
             }
-
             leftSideTable.add(civTable).row()
         }
     }