diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json
index af40aa358a..215d78e4b3 100644
--- a/android/assets/jsons/Translations/Notifications.json
+++ b/android/assets/jsons/Translations/Notifications.json
@@ -621,6 +621,10 @@
 		Russian:"Предложение [tradeOffer] из [otherCivName] завершилось",
 		Czech:"[tradeOffer] s civilizací [otherCivName] je u konce."
 	}
+	
+	"[tradeOffer] to [otherCivName] has ended":{
+	}
+
 
 
 	"One of our trades with [nation] has ended": {
diff --git a/android/build.gradle b/android/build.gradle
index 0a4930aeab..e1cfa07793 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 316
-        versionName "3.1.11"
+        versionCode 317
+        versionName "3.1.12"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
index 60f8242fd7..7882a8af94 100644
--- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
+++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
@@ -248,7 +248,9 @@ class DiplomacyManager() {
             for (offer in trade.ourOffers.union(trade.theirOffers).filter { it.duration > 0 }) {
                 offer.duration--
                 if (offer.duration == 0) {
-                    civInfo.addNotification("[" + offer.name + "] from [$otherCivName] has ended", null, Color.GOLD)
+                    if(offer in trade.theirOffers)
+                        civInfo.addNotification("[" + offer.name + "] from [$otherCivName] has ended", null, Color.GOLD)
+                    else civInfo.addNotification("[" + offer.name + "] to [$otherCivName] has ended", null, Color.GOLD)
 
                     civInfo.updateStatsForNextTurn() // if they were bringing us gold per turn
                     civInfo.updateDetailedCivResources() // if they were giving us resources
diff --git a/core/src/com/unciv/models/gamebasics/Translations.kt b/core/src/com/unciv/models/gamebasics/Translations.kt
index 5c60d260ac..b6a0b52466 100644
--- a/core/src/com/unciv/models/gamebasics/Translations.kt
+++ b/core/src/com/unciv/models/gamebasics/Translations.kt
@@ -43,9 +43,9 @@ class Translations : HashMap<String, TranslationEntry>(){
     fun getLanguages(): List<String> {
         val toReturn =  mutableListOf<String>()
 
-        for(value in values)
-            for(key in keys)
-                if(!toReturn.contains(key)) toReturn.add(key)
+        for(entry in values)
+            for(languageName in entry.keys)
+                if(!toReturn.contains(languageName)) toReturn.add(languageName)
 
         toReturn.remove("Japanese") // These were for tests but were never actually seriously translated
         toReturn.remove("Thai")