diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties
index fd39e187ae..605ca6497f 100644
--- a/android/assets/jsons/translations/template.properties
+++ b/android/assets/jsons/translations/template.properties
@@ -342,6 +342,7 @@ Random number of City-States =
 Min number of City-States = 
 Max number of City-States = 
 One City Challenge = 
+Enable Nuclear Weapons = 
 No City Razing = 
 No Barbarians = 
 Disable starting bias = 
@@ -665,19 +666,70 @@ Could not find a mod named "[modName]". =
 # Options
 
 Options = 
-About = 
-Display = 
-Gameplay = 
-Sound = 
-Advanced = 
-Keys = 
-Locate mod errors = 
-Debug = 
 
+## About tab
+About = 
 Version = 
 See online Readme = 
 Visit repository = 
-Turns between autosaves = 
+
+## Display tab
+Display = 
+
+Screen Mode = 
+Windowed = 
+Fullscreen = 
+Borderless = 
+
+Screen orientation = 
+Landscape (fixed) = 
+Portrait (fixed) = 
+Auto (sensor adjusted) = 
+
+Map mouse auto-scroll = 
+Order trade offers by amount = 
+Experimental Demographics scoreboard = 
+Unit icon opacity = 
+Enable display cutout (requires restart) = 
+
+Show zoom buttons in world screen = 
+Show worked tiles = 
+Show resources and improvements = 
+Show tile yields = 
+Show unit movement arrows = 
+Show pixel units = 
+Show pixel improvements = 
+Minimap size = 
+
+Show tutorials = 
+Reset tutorials = 
+Do you want to reset completed tutorials? = 
+Reset = 
+
+Continuous rendering = 
+Experimental rendering improvements = 
+When disabled, saves battery life but certain animations will be suspended = 
+
+## Gameplay tab
+Gameplay = 
+Auto-assign city production = 
+Auto-build roads = 
+Automated workers replace improvements = 
+Automated units move on turn start = 
+Check for idle units = 
+Auto Unit Cycle = 
+Move units with a single tap = 
+Ask for confirmation when pressing next turn = 
+Notifications log max turns = 
+
+## Language tab
+
+Language = 
+Please note that translations are a community-based work in progress and are INCOMPLETE! The percentage shown is how much of the language is translated in-game. If you want to help translating the game into your language, click here. = 
+
+
+## Sound tab
+Sound = 
 Sound effects volume = 
 Music volume = 
 City ambient sound volume = 
@@ -689,39 +741,24 @@ Currently playing: [title] =
 Download music = 
 Downloading... = 
 Could not download music! = 
-Show = 
-Hide = 
-Show worked tiles = 
-Show resources and improvements = 
-Check for idle units = 
-Auto Unit Cycle = 
-Move units with a single tap = 
-Show tutorials = 
-Reset tutorials = 
-Do you want to reset completed tutorials? = 
-Reset = 
-Auto-assign city production = 
-Auto-build roads = 
-Automated workers replace improvements = 
-Automated units move on turn start = 
-Minimap size = 
-off = 
-Map mouse auto-scroll = 
-Show pixel units = 
-Show pixel improvements = 
-Enable Nuclear Weapons = 
-Experimental Demographics scoreboard = 
-Unit icon opacity = 
-Show zoom buttons in world screen = 
-Enable display cutout (requires restart) = 
-Show tile yields = 
-Show unit movement arrows = 
-Continuous rendering = 
-Experimental rendering improvements = 
-When disabled, saves battery life but certain animations will be suspended = 
-Order trade offers by amount = 
-Ask for confirmation when pressing next turn = 
-Notifications log max turns = 
+
+## Advanced tab
+Advanced = 
+Generate translation files = 
+Translation files are generated successfully. = 
+Fastlane files are generated successfully. = 
+
+Font family = 
+Font size multiplier = 
+Default Font = 
+
+Enable Easter Eggs = 
+
+## Keys tab
+Keys = 
+
+## Locate mod errors tab
+Locate mod errors = 
 Check extension mods based on: = 
 -none- = 
 Reload mods = 
@@ -730,18 +767,22 @@ No problems found. =
 Autoupdate mod uniques = 
 Uniques updated! = 
 
+## Debug tab
+Debug = 
+
+## Unsorted - please help us sort these!
+
+Turns between autosaves = 
+Show = 
+Hide = 
+
+off = 
+
 Max zoom out = 
 HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = 
 Enable portrait orientation = 
-Generate translation files = 
-Translation files are generated successfully. = 
-Fastlane files are generated successfully. = 
-Please note that translations are a community-based work in progress and are INCOMPLETE! The percentage shown is how much of the language is translated in-game. If you want to help translating the game into your language, click here. = 
-Font family = 
-Font size multiplier = 
-Default Font = 
+
 You need to restart the game for this change to take effect. = 
-Enable Easter Eggs = 
 
 # Notifications
 
@@ -1380,20 +1421,12 @@ Can be created instantly by =
 Defence bonus = 
 Movement cost = 
 for = 
-Landscape (fixed) = 
-Portrait (fixed) = 
-Auto (sensor adjusted) = 
 Missing translations: = 
 Screen Size = 
-Screen Mode = 
-Windowed = 
-Fullscreen = 
-Borderless = 
 Tileset = 
 Unitset = 
 UI Skin = 
 Create = 
-Language = 
 Improvements = 
 Loading... = 
 Filter: = 
diff --git a/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt b/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt
index 2cfc7a3675..6c86f37d43 100644
--- a/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt
+++ b/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt
@@ -229,10 +229,6 @@ class PolicyManager : IsPartOfGameInfoSerialization {
     private fun triggerGlobalAlerts(
         policy: Policy, extraNotificationText: String = ""
     ) {
-        var extraNotificationTextCopy = extraNotificationText
-        if (extraNotificationText != "") {
-            extraNotificationTextCopy = " ${extraNotificationText}"
-        }
         for (civ in civInfo.gameInfo.civilizations.filter { it.isMajorCiv() }) {
             if (civ == civInfo) continue
             val defaultNotificationText = if (civ.getKnownCivs().contains(civInfo)) {
@@ -241,7 +237,7 @@ class PolicyManager : IsPartOfGameInfoSerialization {
                 "An unknown civilization has adopted the [${policy.name}] policy"
             }
             civ.addNotification(
-                "{${defaultNotificationText}}{${extraNotificationTextCopy}}",
+                "{${defaultNotificationText}} {${extraNotificationText}}",
                 NotificationCategory.General,
                 NotificationIcon.Culture
             )