Manually review chrome translation keys and do some deduplication

2024-01-31 16:50:02 +02:00
parent 1a4f366e4b
commit 2fe13fe442
60 changed files with 420 additions and 690 deletions
--- a/mods/cnc/chrome/assetbrowser.yaml
+++ b/mods/cnc/chrome/assetbrowser.yaml
@@ -223,7 +223,7 @@ Container@ASSETBROWSER_PANEL:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-assetbrowser-panel-close
+			Text: button-back
 		TooltipContainer@TOOLTIP_CONTAINER:

 ScrollPanel@ASSET_TYPES_PANEL:
--- a/mods/cnc/chrome/connection.yaml
+++ b/mods/cnc/chrome/connection.yaml
@@ -90,14 +90,14 @@ Container@CONNECTIONFAILED_PANEL:
 			Y: 84
 			Width: 140
 			Height: 35
-			Text: button-connectionfailed-panel-quit
+			Text: button-quit
 		Button@RETRY_BUTTON:
 			Key: return
 			X: 230
 			Y: 84
 			Width: 140
 			Height: 35
-			Text: button-connectionfailed-panel-retry
+			Text: button-retry

 Container@CONNECTION_SWITCHMOD_PANEL:
 	Logic: ConnectionSwitchModLogic
--- a/mods/cnc/chrome/credits.yaml
+++ b/mods/cnc/chrome/credits.yaml
@@ -12,7 +12,7 @@ Container@CREDITS_PANEL:
 			Font: BigBold
 			Contrast: true
 			Align: Center
-			Text: label-credits-panel-title
+			Text: label-credits-title
 		Background@bg:
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
@@ -32,7 +32,7 @@ Container@CREDITS_PANEL:
 							X: 150
 							Width: 140
 							Height: 35
-							Text: button-tab-container-engine
+							Text: label-openra
 				ScrollPanel@CREDITS_DISPLAY:
 					X: 15
 					Y: 15
@@ -49,6 +49,6 @@ Container@CREDITS_PANEL:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-credits-panel-back
+			Text: button-back
 			Key: escape

--- a/mods/cnc/chrome/dialogs.yaml
+++ b/mods/cnc/chrome/dialogs.yaml
@@ -179,7 +179,7 @@ Background@THREEBUTTON_PROMPT:
 			Y: 40
 			Width: 140
 			Height: 35
-			Text: button-threebutton-prompt-confirm
+			Text: button-prompt-confirm
 			Visible: false
 		Button@OTHER_BUTTON:
 			Key: r
@@ -187,14 +187,14 @@ Background@THREEBUTTON_PROMPT:
 			Y: 40
 			Width: 140
 			Height: 35
-			Text: button-threebutton-prompt-other
+			Text: button-prompt-other
 			Visible: false
 		Button@CANCEL_BUTTON:
 			Key: escape
 			Y: 40
 			Width: 140
 			Height: 35
-			Text: button-threebutton-prompt-cancel
+			Text: button-cancel
 			Visible: false

 Background@TWOBUTTON_PROMPT:
@@ -222,7 +222,7 @@ Background@TWOBUTTON_PROMPT:
 			Y: 30
 			Width: 140
 			Height: 35
-			Text: button-twobutton-prompt-cancel
+			Text: button-cancel
 			Visible: false
 		Button@CONFIRM_BUTTON:
 			Key: return
@@ -230,7 +230,7 @@ Background@TWOBUTTON_PROMPT:
 			Y: 30
 			Width: 140
 			Height: 35
-			Text: button-twobutton-prompt-confirm
+			Text: button-prompt-confirm
 			Visible: false

 Container@TEXT_INPUT_PROMPT:
@@ -276,7 +276,7 @@ Container@TEXT_INPUT_PROMPT:
 			Y: PARENT_BOTTOM - 1
 			Width: 160
 			Height: 35
-			Text: button-text-input-prompt-cancel
+			Text: button-cancel
 			Font: Bold
 			Key: escape

--- a/mods/cnc/chrome/editor.yaml
+++ b/mods/cnc/chrome/editor.yaml
@@ -64,7 +64,7 @@ Container@NEW_MAP_BG:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-new-map-bg-cancel
+			Text: button-cancel
 			Font: Bold
 			Key: escape
 		Button@CREATE_BUTTON:
@@ -172,7 +172,7 @@ Container@SAVE_MAP_PANEL:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-save-map-panel-back
+			Text: button-cancel
 			Font: Bold
 			Key: escape
 		Button@SAVE_BUTTON:
@@ -298,7 +298,7 @@ Container@EDITOR_WORLD_ROOT:
 									Y: 25
 									Width: PARENT_RIGHT - 5
 									Height: 25
-									Text: label-tiles-bg-categories
+									Text: label-bg-filter
 									Align: Right
 									Font: TinyBold
 						TextField@SEARCH_TEXTFIELD:
@@ -381,7 +381,7 @@ Container@EDITOR_WORLD_ROOT:
 									Y: 25
 									Width: PARENT_RIGHT - 5
 									Height: 25
-									Text: label-actors-bg-categories
+									Text: label-bg-filter
 									Align: Right
 									Font: TinyBold
 								Label@OWNERS_LABEL:
@@ -578,7 +578,7 @@ Container@EDITOR_WORLD_ROOT:
 							Y: 222
 							Width: 75
 							Height: 25
-							Text: button-selection-cancel
+							Text: button-cancel
 							Font: Bold
 				Container@ACTOR_EDIT_PANEL:
 					X: 0
@@ -676,7 +676,7 @@ Container@EDITOR_WORLD_ROOT:
 									X: 131
 									Width: 75
 									Height: 25
-									Text: button-container-cancel
+									Text: button-cancel
 									Font: Bold
 								Button@OK_BUTTON:
 									X: 211
@@ -697,7 +697,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorSelectTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-select.tooltip
+					TooltipText: button-map-editor-tab-container-select-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
@@ -711,7 +711,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorTilesTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-tiles.tooltip
+					TooltipText: button-map-editor-tab-container-tiles-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
@@ -725,7 +725,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorOverlaysTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-overlays.tooltip
+					TooltipText: button-map-editor-tab-container-overlays-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
@@ -739,7 +739,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorActorsTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-actors.tooltip
+					TooltipText: button-map-editor-tab-container-actors-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
@@ -753,7 +753,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorToolsTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-tools.tooltip
+					TooltipText: button-map-editor-tab-container-tools-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
@@ -767,7 +767,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorHistoryTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-history.tooltip
+					TooltipText: button-map-editor-tab-container-history-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
--- a/mods/cnc/chrome/gamesave-browser.yaml
+++ b/mods/cnc/chrome/gamesave-browser.yaml
@@ -80,7 +80,7 @@ Container@GAMESAVE_BROWSER_PANEL:
 					Y: PARENT_BOTTOM - 1
 					Width: 140
 					Height: 35
-					Text: button-bg-cancel
+					Text: button-back
 				Button@DELETE_ALL_BUTTON:
 					X: PARENT_RIGHT - 370 - WIDTH
 					Y: PARENT_BOTTOM - 1
--- a/mods/cnc/chrome/ingame-infostats.yaml
+++ b/mods/cnc/chrome/ingame-infostats.yaml
@@ -38,7 +38,7 @@ Container@SKIRMISH_STATS:
 					Y: 1
 					Width: 210
 					Height: 25
-					Text: label-stats-name
+					Text: label-stats-player
 					Font: Bold
 				Label@FACTION:
 					X: 230
--- a/mods/cnc/chrome/lobby-kickdialogs.yaml
+++ b/mods/cnc/chrome/lobby-kickdialogs.yaml
@@ -36,14 +36,14 @@ Background@KICK_CLIENT_DIALOG:
 			Y: 155
 			Width: 120
 			Height: 25
-			Text: button-kick-client-dialog-ok
+			Text: button-kick-client-dialog
 			Font: Bold
 		Button@CANCEL_BUTTON:
 			X: (PARENT_RIGHT - WIDTH) / 2 - 75
 			Y: 155
 			Width: 120
 			Height: 25
-			Text: button-kick-client-dialog-cancel
+			Text: button-cancel
 			Font: Bold

 Background@KICK_SPECTATORS_DIALOG:
@@ -77,7 +77,7 @@ Background@KICK_SPECTATORS_DIALOG:
 			Y: 155
 			Width: 120
 			Height: 25
-			Text: button-kick-spectators-dialog-cancel
+			Text: button-cancel
 			Font: Bold

 Background@FORCE_START_DIALOG:
@@ -130,13 +130,13 @@ Background@FORCE_START_DIALOG:
 			Y: 155
 			Width: 120
 			Height: 25
-			Text: button-force-start-dialog-ok
+			Text: button-force-start-dialog-start
 			Font: Bold
 		Button@CANCEL_BUTTON:
 			X: (PARENT_RIGHT - WIDTH) / 2 - 75
 			Y: 155
 			Width: 120
 			Height: 25
-			Text: button-force-start-dialog-cancel
+			Text: button-cancel
 			Font: Bold

--- a/mods/cnc/chrome/lobby-music.yaml
+++ b/mods/cnc/chrome/lobby-music.yaml
@@ -11,7 +11,7 @@ Container@LOBBY_MUSIC_BIN:
 				Label@MUSIC:
 					Width: 308
 					Height: 25
-					Text: label-container-music
+					Text: label-music-title
 					Align: Center
 					Font: Bold
 				Label@TITLE:
@@ -24,7 +24,7 @@ Container@LOBBY_MUSIC_BIN:
 					X: PARENT_RIGHT - 80
 					Height: 25
 					Width: 50
-					Text: label-container-length
+					Text: label-music-controls-length
 					Font: Bold
 					Align: Right
 		Background@CONTROLS:
@@ -125,20 +125,20 @@ Container@LOBBY_MUSIC_BIN:
 					Width: 85
 					Height: 20
 					Font: Regular
-					Text: checkbox-controls-shuffle
+					Text: checkbox-music-controls-shuffle
 				Checkbox@REPEAT:
 					X: PARENT_RIGHT - 15 - WIDTH
 					Y: 150
 					Width: 70
 					Height: 20
 					Font: Regular
-					Text: checkbox-controls-repeat
+					Text: checkbox-music-controls-loop
 				Label@VOLUME_LABEL:
 					Y: 182
 					Width: 65
 					Height: 25
 					Align: Right
-					Text: label-controls-volume
+					Text: label-music-controls-volume
 				ExponentialSlider@MUSIC_SLIDER:
 					X: 70
 					Y: 186
--- a/mods/cnc/chrome/lobby-players.yaml
+++ b/mods/cnc/chrome/lobby-players.yaml
@@ -11,49 +11,49 @@ Container@LOBBY_PLAYER_BIN:
 				Label@LABEL_LOBBY_NAME:
 					Width: 200
 					Height: 25
-					Text: label-container-lobby-name
+					Text: label-lobby-players-player
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_COLOR:
 					X: 210
 					Width: 94
 					Height: 25
-					Text: label-container-lobby-color
+					Text: label-lobby-players-color
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_FACTION:
 					X: 309
 					Width: 120
 					Height: 25
-					Text: label-container-lobby-faction
+					Text: label-lobby-players-faction
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_TEAM:
 					X: 460 - 25
 					Width: 50
 					Height: 25
-					Text: label-container-lobby-team
+					Text: label-lobby-players-team
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_HANDICAP:
 					X: 491
 					Width: 75
 					Height: 25
-					Text: label-container-lobby-handicap
+					Text: label-lobby-players-handicap
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_SPAWN:
 					X: 571
 					Width: 50
 					Height: 25
-					Text: label-container-lobby-spawn
+					Text: label-lobby-players-spawn
 					Align: Left
 					Font: Bold
 				Label@LABEL_LOBBY_STATUS:
 					X: 627
 					Width: 20 + 24
 					Height: 25
-					Text: label-container-lobby-status
+					Text: label-lobby-players-ready
 					Align: Left
 					Font: Bold
 		ScrollPanel@LOBBY_PLAYERS:
@@ -110,7 +110,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 15
 							Width: 190
 							Height: 25
-							Text: dropdownbutton-template-editable-player-slot-options
+							Text: label-lobby-players-name
 							Font: Regular
 							Visible: false
 						DropDownButton@COLOR:
@@ -143,7 +143,7 @@ Container@LOBBY_PLAYER_BIN:
 									X: 40
 									Width: 50
 									Height: 25
-									Text: label-template-editable-player-factionname
+									Text: label-lobby-players-faction
 						DropDownButton@TEAM_DROPDOWN:
 							X: 435
 							Width: 50
@@ -155,7 +155,7 @@ Container@LOBBY_PLAYER_BIN:
 							Height: 25
 							Font: Regular
 							TooltipContainer: TOOLTIP_CONTAINER
-							TooltipText: dropdownbutton-template-editable-player-handicap-dropdown-tooltip
+							TooltipText: dropdownbutton-lobby-players-handicap-tooltip
 						DropDownButton@SPAWN_DROPDOWN:
 							X: 571
 							Width: 50
@@ -254,7 +254,7 @@ Container@LOBBY_PLAYER_BIN:
 									X: 40
 									Width: 50
 									Height: 25
-									Text: label-faction-factionname
+									Text: label-lobby-players-faction
 						Label@TEAM:
 							X: 435
 							Width: 44
@@ -277,7 +277,7 @@ Container@LOBBY_PLAYER_BIN:
 							Height: 25
 							Font: Regular
 							TooltipContainer: TOOLTIP_CONTAINER
-							TooltipText: dropdownbutton-template-noneditable-player-handicap-dropdown-tooltip
+							TooltipText: dropdownbutton-lobby-players-handicap-tooltip
 						Label@SPAWN:
 							X: 571
 							Width: 25
@@ -307,7 +307,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 15
 							Width: 190
 							Height: 25
-							Text: dropdownbutton-template-empty-slot-options
+							Text: label-lobby-players-name
 							Font: Regular
 							Visible: false
 						Label@NAME:
@@ -319,7 +319,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 210
 							Width: 438
 							Height: 25
-							Text: button-template-empty-join
+							Text: button-lobby-players-join
 							Font: Regular
 				Container@TEMPLATE_EDITABLE_SPECTATOR:
 					X: 5
@@ -368,7 +368,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 210
 							Width: 441
 							Height: 25
-							Text: label-template-editable-spectator
+							Text: label-lobby-players-spectator
 							Align: Center
 							Font: Bold
 						Image@STATUS_IMAGE:
@@ -449,7 +449,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 210
 							Width: 441
 							Height: 25
-							Text: label-template-noneditable-spectator
+							Text: label-lobby-players-spectator
 							Align: Center
 							Font: Bold
 						Image@STATUS_IMAGE:
@@ -471,11 +471,11 @@ Container@LOBBY_PLAYER_BIN:
 							Width: 190
 							Height: 20
 							Font: Regular
-							Text: checkbox-template-new-spectator-toggle-spectators
+							Text: checkbox-lobby-players-new-spectator-toggle
 						Button@SPECTATE:
 							X: 210
 							Width: 438
 							Height: 25
-							Text: button-template-new-spectator-spectate
+							Text: button-lobby-players-spectate
 							Font: Regular

--- a/mods/cnc/chrome/lobby-servers.yaml
+++ b/mods/cnc/chrome/lobby-servers.yaml
@@ -11,7 +11,7 @@ Container@LOBBY_SERVERS_BIN:
 					X: 5
 					Width: 355
 					Height: 25
-					Text: label-container-name
+					Text: label-container-server
 					Align: Center
 					Font: Bold
 				Label@PLAYERS:
--- a/mods/cnc/chrome/lobby.yaml
+++ b/mods/cnc/chrome/lobby.yaml
@@ -62,7 +62,7 @@ Container@SERVER_LOBBY:
 							Y: 248
 							Width: 151
 							Height: 31
-							Text: button-skirmish-tabs-music-tab
+							Text: label-music-title
 				Container@MULTIPLAYER_TABS:
 					X: 697 - WIDTH
 					Width: 465
@@ -84,7 +84,7 @@ Container@SERVER_LOBBY:
 							Y: 248
 							Width: 112
 							Height: 31
-							Text: button-multiplayer-tabs-music-tab
+							Text: label-music-title
 						Button@SERVERS_TAB:
 							X: 354
 							Y: 248
--- a/mods/cnc/chrome/mainmenu-prompts.yaml
+++ b/mods/cnc/chrome/mainmenu-prompts.yaml
@@ -280,7 +280,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
 										Label@BATTLEFIELD_CAMERA:
 											Width: PARENT_RIGHT
 											Height: 20
-											Text: label-battlefield-camera-dropdown-container
+											Text: label-battlefield-camera-dropdown
 										DropDownButton@BATTLEFIELD_CAMERA_DROPDOWN:
 											Y: 25
 											Width: PARENT_RIGHT
@@ -293,7 +293,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
 										Label@UI_SCALE:
 											Width: PARENT_RIGHT
 											Height: 20
-											Text: label-ui-scale-dropdown-container
+											Text: label-ui-scale-dropdown
 										DropDownButton@UI_SCALE_DROPDOWN:
 											Y: 25
 											Width: PARENT_RIGHT
@@ -317,7 +317,7 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-mainmenu-introduction-prompt-continue
+			Text: button-continue
 			Font: Bold
 			Key: return

@@ -380,7 +380,7 @@ Container@MAINMENU_SYSTEM_INFO_PROMPT:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-mainmenu-system-info-prompt-continue
+			Text: button-continue
 			Font: Bold
 			Key: return

--- a/mods/cnc/chrome/mainmenu.yaml
+++ b/mods/cnc/chrome/mainmenu.yaml
@@ -63,25 +63,25 @@ Container@MENU_BACKGROUND:
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-main-menu-singleplayer
+							Text: label-singleplayer-title
 						Button@MULTIPLAYER_BUTTON:
 							X: 150
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-main-menu-multiplayer
+							Text: label-multiplayer-title
 						Button@SETTINGS_BUTTON:
 							X: 300
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-main-menu-settings
+							Text: button-settings-title
 						Button@EXTRAS_BUTTON:
 							X: 450
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-main-menu-extras
+							Text: button-extras-title
 						Button@CONTENT_BUTTON:
 							X: 600
 							Y: 0
@@ -93,7 +93,7 @@ Container@MENU_BACKGROUND:
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-main-menu-quit
+							Text: button-quit
 				Container@SINGLEPLAYER_MENU:
 					Width: PARENT_RIGHT
 					Visible: False
@@ -103,7 +103,7 @@ Container@MENU_BACKGROUND:
 							Y: 0 - 28
 							Width: PARENT_RIGHT
 							Height: 20
-							Text: label-singleplayer-menu-title
+							Text: label-singleplayer-title
 							Align: Center
 							Font: Bold
 							Contrast: True
@@ -118,7 +118,7 @@ Container@MENU_BACKGROUND:
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-singleplayer-menu-missions
+							Text: label-missions-title
 						Button@LOAD_BUTTON:
 							X: 300
 							Y: 0
@@ -131,7 +131,7 @@ Container@MENU_BACKGROUND:
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-singleplayer-menu-back
+							Text: button-back
 				Container@EXTRAS_MENU:
 					Width: PARENT_RIGHT
 					Visible: False
@@ -141,7 +141,7 @@ Container@MENU_BACKGROUND:
 							Y: 0 - 28
 							Width: PARENT_RIGHT
 							Height: 20
-							Text: label-extras-menu-title
+							Text: button-extras-title
 							Align: Center
 							Font: Bold
 							Contrast: True
@@ -156,13 +156,13 @@ Container@MENU_BACKGROUND:
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-extras-menu-music
+							Text: label-music-title
 						Button@MAP_EDITOR_BUTTON:
 							X: 300
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-extras-menu-map-editor
+							Text: label-map-editor-title
 							Font: Bold
 						Button@ASSETBROWSER_BUTTON:
 							X: 450
@@ -175,14 +175,14 @@ Container@MENU_BACKGROUND:
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-extras-menu-credits
+							Text: label-credits-title
 						Button@BACK_BUTTON:
 							Key: escape
 							X: 750
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-extras-menu-back
+							Text: button-back
 				Container@MAP_EDITOR_MENU:
 					Width: PARENT_RIGHT
 					Visible: False
@@ -192,7 +192,7 @@ Container@MENU_BACKGROUND:
 							Y: 0 - 28
 							Width: PARENT_RIGHT
 							Height: 20
-							Text: label-map-editor-menu-title
+							Text: label-map-editor-title
 							Align: Center
 							Font: Bold
 							Contrast: True
@@ -201,21 +201,21 @@ Container@MENU_BACKGROUND:
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-map-editor-menu-new
+							Text: button-map-editor-new-map
 							Font: Bold
 						Button@LOAD_MAP_BUTTON:
 							X: 150
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-map-editor-menu-load
+							Text: button-map-editor-load-map
 							Font: Bold
 						Button@BACK_BUTTON:
 							X: 300
 							Y: 0
 							Width: 140
 							Height: 35
-							Text: button-map-editor-menu-back
+							Text: button-back
 							Font: Bold
 							Key: escape
 		Container@NEWS_BG:
--- a/mods/cnc/chrome/mapchooser.yaml
+++ b/mods/cnc/chrome/mapchooser.yaml
@@ -161,7 +161,7 @@ Container@MAPCHOOSER_PANEL:
 					Y: PARENT_BOTTOM - 1
 					Width: 140
 					Height: 35
-					Text: button-bg-cancel
+					Text: button-back
 				Button@RANDOMMAP_BUTTON:
 					Key: space
 					X: PARENT_RIGHT - 150 - WIDTH
--- a/mods/cnc/chrome/missionbrowser.yaml
+++ b/mods/cnc/chrome/missionbrowser.yaml
@@ -9,7 +9,7 @@ Container@MISSIONBROWSER_PANEL:
 			Y: 0 - 34
 			Width: PARENT_RIGHT
 			Height: 25
-			Text: label-missionbrowser-panel-title
+			Text: label-missions-title
 			Align: Center
 			Contrast: true
 			Font: BigBold
@@ -155,7 +155,7 @@ Container@MISSIONBROWSER_PANEL:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-missionbrowser-panel-back
+			Text: button-back
 			Font: Bold
 			Key: escape
 		Button@START_BRIEFING_VIDEO_BUTTON:
@@ -191,7 +191,7 @@ Container@MISSIONBROWSER_PANEL:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-missionbrowser-panel-startgame
+			Text: button-missionbrowser-panel-play
 			Font: Bold
 		Background@MISSION_BIN:
 			X: 15
--- a/mods/cnc/chrome/multiplayer-browser.yaml
+++ b/mods/cnc/chrome/multiplayer-browser.yaml
@@ -6,7 +6,7 @@ Container@MULTIPLAYER_PANEL:
 	Height: 540
 	Children:
 		Label@TITLE:
-			Text: label-multiplayer-panel-title
+			Text: label-multiplayer-title
 			Width: PARENT_RIGHT
 			Height: 25
 			Y: 0 - 34
@@ -28,7 +28,7 @@ Container@MULTIPLAYER_PANEL:
 							X: 5
 							Width: 355
 							Height: 25
-							Text: label-container-name
+							Text: label-container-server
 							Align: Center
 							Font: Bold
 						Label@PLAYERS:
@@ -259,6 +259,6 @@ Container@MULTIPLAYER_PANEL:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-multiplayer-panel-back
+			Text: button-back
 		TooltipContainer@TOOLTIP_CONTAINER:

--- a/mods/cnc/chrome/multiplayer-createserver.yaml
+++ b/mods/cnc/chrome/multiplayer-createserver.yaml
@@ -215,13 +215,13 @@ Container@MULTIPLAYER_CREATESERVER_PANEL:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-multiplayer-createserver-panel-back
+			Text: button-back
 		Button@MAP_BUTTON:
 			X: PARENT_RIGHT - WIDTH - 150
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-multiplayer-createserver-panel-map
+			Text: button-multiplayer-createserver-panel-change-map
 		Button@CREATE_BUTTON:
 			Key: return
 			X: PARENT_RIGHT - WIDTH
--- a/mods/cnc/chrome/multiplayer-directconnect.yaml
+++ b/mods/cnc/chrome/multiplayer-directconnect.yaml
@@ -49,7 +49,7 @@ Container@DIRECTCONNECT_PANEL:
 			Y: 89
 			Width: 140
 			Height: 35
-			Text: button-directconnect-panel-back
+			Text: button-cancel
 		Button@JOIN_BUTTON:
 			Key: return
 			X: 230
--- a/mods/cnc/chrome/music.yaml
+++ b/mods/cnc/chrome/music.yaml
@@ -13,7 +13,7 @@ Container@MUSIC_PANEL:
 			Font: BigBold
 			Contrast: true
 			Align: Center
-			Text: label-music-panel-title
+			Text: label-music-title-panel-title
 		Background@bg:
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
@@ -59,7 +59,7 @@ Container@MUSIC_PANEL:
 							X: PARENT_RIGHT - 85
 							Height: 25
 							Width: 50
-							Text: label-container-type
+							Text: label-music-controls-length
 							Align: Right
 							Font: Bold
 				Container@BUTTONS:
@@ -150,14 +150,14 @@ Container@MUSIC_PANEL:
 					Width: 85
 					Height: 20
 					Font: Regular
-					Text: checkbox-bg-shuffle
+					Text: checkbox-music-controls-shuffle
 				Checkbox@REPEAT:
 					X: PARENT_RIGHT - 15 - WIDTH
 					Y: PARENT_BOTTOM - HEIGHT - 60
 					Width: 70
 					Height: 20
 					Font: Regular
-					Text: checkbox-bg-repeat
+					Text: checkbox-music-controls-loop
 				Container@NO_MUSIC_LABEL:
 					X: 15
 					Y: (PARENT_BOTTOM - HEIGHT - 60) / 2
@@ -189,7 +189,7 @@ Container@MUSIC_PANEL:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-music-panel-back
+			Text: button-back
 		Label@MUTE_LABEL:
 			X: 100
 			Y: PARENT_BOTTOM - 60 - 3
--- a/mods/cnc/chrome/playerprofile.yaml
+++ b/mods/cnc/chrome/playerprofile.yaml
@@ -26,7 +26,7 @@ Container@LOCAL_PROFILE_PANEL:
 					Width: 60
 					Height: 20
 					Font: TinyBold
-					Text: button-profile-header-destroy-key
+					Text: button-profile-header-logout
 		Background@BADGES_CONTAINER:
 			Width: PARENT_RIGHT
 			Y: 48
@@ -122,14 +122,14 @@ Container@LOCAL_PROFILE_PANEL:
 					Width: 70
 					Height: 20
 					Font: TinyBold
-					Text: button-register-fingerprint-delete-key
+					Text: button-cancel
 				Button@CHECK_KEY:
 					X: 185
 					Y: 70
 					Width: 70
 					Height: 20
 					Font: TinyBold
-					Text: button-register-fingerprint-check-key
+					Text: button-continue
 		Background@CHECKING_FINGERPRINT:
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
@@ -180,7 +180,7 @@ Container@LOCAL_PROFILE_PANEL:
 					Width: 70
 					Height: 20
 					Font: TinyBold
-					Text: button-fingerprint-not-found-continue
+					Text: button-back
 		Background@CONNECTION_ERROR:
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
@@ -206,7 +206,7 @@ Container@LOCAL_PROFILE_PANEL:
 					Width: 70
 					Height: 20
 					Font: TinyBold
-					Text: button-connection-error-retry
+					Text: button-retry

 Container@PLAYER_PROFILE_BADGES_INSERT:
 	Logic: PlayerProfileBadgesLogic
--- a/mods/cnc/chrome/replaybrowser.yaml
+++ b/mods/cnc/chrome/replaybrowser.yaml
@@ -48,7 +48,7 @@ Container@REPLAYBROWSER_PANEL:
 									Y: 15
 									Width: PARENT_RIGHT - 85
 									Height: 25
-									Text: dropdownbutton-filters-flt-gametype
+									Text: dropdownbutton-filters-any
 								Label@FLT_DATE_DESC:
 									X: 0
 									Y: 45
@@ -61,7 +61,7 @@ Container@REPLAYBROWSER_PANEL:
 									Y: 45
 									Width: PARENT_RIGHT - 85
 									Height: 25
-									Text: dropdownbutton-filters-flt-date
+									Text: dropdownbutton-filters-any
 								Label@FLT_DURATION_DESC:
 									X: 0
 									Y: 75
@@ -74,7 +74,7 @@ Container@REPLAYBROWSER_PANEL:
 									Y: 75
 									Width: PARENT_RIGHT - 85
 									Height: 25
-									Text: dropdownbutton-filters-flt-duration
+									Text: dropdownbutton-filters-any
 								Label@FLT_MAPNAME_DESC:
 									X: 0
 									Y: 105
@@ -87,7 +87,7 @@ Container@REPLAYBROWSER_PANEL:
 									Y: 105
 									Width: PARENT_RIGHT - 85
 									Height: 25
-									Text: dropdownbutton-filters-flt-mapname
+									Text: dropdownbutton-filters-any
 								Label@FLT_PLAYER_DESC:
 									X: 0
 									Y: 135
@@ -113,7 +113,7 @@ Container@REPLAYBROWSER_PANEL:
 									Y: 165
 									Width: PARENT_RIGHT - 85
 									Height: 25
-									Text: dropdownbutton-filters-flt-outcome
+									Text: dropdownbutton-filters-any
 								Label@FLT_FACTION_DESC:
 									X: 0
 									Y: 195
@@ -126,7 +126,7 @@ Container@REPLAYBROWSER_PANEL:
 									Y: 195
 									Width: PARENT_RIGHT - 85
 									Height: 25
-									Text: dropdownbutton-filters-flt-faction
+									Text: dropdownbutton-filters-any
 								Button@FLT_RESET_BUTTON:
 									X: 85
 									Y: 235
@@ -262,7 +262,7 @@ Container@REPLAYBROWSER_PANEL:
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-replaybrowser-panel-cancel
+			Text: button-back
 		Button@WATCH_BUTTON:
 			Key: return
 			X: PARENT_RIGHT - 140
--- a/mods/cnc/chrome/settings-audio.yaml
+++ b/mods/cnc/chrome/settings-audio.yaml
@@ -94,7 +94,7 @@ Container@AUDIO_PANEL:
 								Label@MUSIC_LABEL:
 									Width: PARENT_RIGHT
 									Height: 20
-									Text: label-music-volume-container
+									Text: label-music-title-volume-container
 								ExponentialSlider@MUSIC_VOLUME:
 									Y: 25
 									Width: PARENT_RIGHT
--- a/mods/cnc/chrome/settings-display.yaml
+++ b/mods/cnc/chrome/settings-display.yaml
@@ -88,7 +88,7 @@ Container@DISPLAY_PANEL:
 								Label@BATTLEFIELD_CAMERA:
 									Width: PARENT_RIGHT
 									Height: 20
-									Text: label-battlefield-camera-dropdown-container
+									Text: label-battlefield-camera-dropdown
 								DropDownButton@BATTLEFIELD_CAMERA_DROPDOWN:
 									Y: 25
 									Width: PARENT_RIGHT
@@ -118,7 +118,7 @@ Container@DISPLAY_PANEL:
 								LabelForInput@UI_SCALE:
 									Width: PARENT_RIGHT
 									Height: 20
-									Text: label-ui-scale-dropdown-container
+									Text: label-ui-scale-dropdown
 									For: UI_SCALE_DROPDOWN
 								DropDownButton@UI_SCALE_DROPDOWN:
 									Y: 25
--- a/mods/cnc/chrome/settings.yaml
+++ b/mods/cnc/chrome/settings.yaml
@@ -19,13 +19,13 @@ Container@SETTINGS_PANEL:
 			Font: BigBold
 			Contrast: true
 			Align: Center
-			Text: label-settings-panel-title
+			Text: button-settings-title
 		Button@BACK_BUTTON:
 			Key: escape
 			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
-			Text: button-settings-panel-back
+			Text: button-back
 		Button@RESET_BUTTON:
 			X: 150
 			Y: PARENT_BOTTOM - 1
--- a/mods/cnc/languages/chrome/en.ftl
+++ b/mods/cnc/languages/chrome/en.ftl
@@ -7,7 +7,6 @@ label-bg-filename-desc = Filter by name
 label-bg-sprite-scale = Scale:
 label-bg-palette-desc = Palette:
 label-sprite-bg-error = Error displaying file. See assetbrowser.log for details.
-button-assetbrowser-panel-close = Back

 ## color-picker.yaml
 button-color-chooser-random = Random
@@ -24,8 +23,6 @@ button-connecting-panel-abort = Abort
 label-connection-background-connecting-desc = Failed to connect
 label-connection-background-password = Password:
 button-connectionfailed-panel-abort = Abort
-button-connectionfailed-panel-quit = Quit
-button-connectionfailed-panel-retry = Retry
 label-connection-switchmod-panel-title = Switch Mod
 label-connection-background-desc = This server is running a different mod:
 label-connection-background-desc2 = Switch mods and join server?
@@ -33,25 +30,21 @@ button-connection-switchmod-panel-abort = Abort
 button-connection-switchmod-panel-switch = Switch

 ## credits.yaml
-label-credits-panel-title = Credits
-button-tab-container-engine = OpenRA
-button-credits-panel-back = Back
+label-openra = OpenRA
+
+## credits.yaml, mainmenu.yaml
+label-credits-title = Credits

 ## dialogs.yaml
-button-threebutton-prompt-confirm = Confirm
-button-threebutton-prompt-other = Restart
-button-threebutton-prompt-cancel = Cancel
-button-twobutton-prompt-cancel = Cancel
-button-twobutton-prompt-confirm = Confirm
+button-prompt-confirm = Confirm
+button-prompt-other = Restart
 button-text-input-prompt-accept = OK
-button-text-input-prompt-cancel = Cancel

 ## editor.yaml
 label-new-map-bg-title = New Map
 label-bg-tileset = Tileset:
 label-bg-width = Width:
 label-bg-height = Height:
-button-new-map-bg-cancel = Cancel
 button-new-map-bg-create = Create
 label-save-map-panel-title = Save Map
 label-save-map-background-title = Title:
@@ -60,17 +53,14 @@ label-save-map-background-visibility = Visibility:
 dropdownbutton-save-map-background-visibility-dropdown = Map Visibility
 label-save-map-background-directory = Directory:
 label-save-map-background-filename = Filename:
-button-save-map-panel-back = Cancel
 button-save-map-panel = Save
 label-actor-edit-panel-id = ID
 button-container-delete = Delete
-button-container-cancel = Cancel
 button-container-ok = OK
 button-editor-world-root-options-tooltip = Menu
 label-tiles-bg-search = Search:
-label-tiles-bg-categories = Filter:
+label-bg-filter = Filter:
 label-actors-bg-search = Search:
-label-actors-bg-categories = Filter:
 label-actors-bg-owners = Owner:
 label-area-selection = Area Selection
 label-area-info = Area Info
@@ -80,27 +70,15 @@ label-copy-filters = Copy Filters
 label-filter-terrain = Terrain
 label-filter-resources = Resources
 label-filter-actors = Actors
-button-selection-cancel = Cancel
 label-show-tile-grid = Show Tile Grid
 label-show-buildable-area = Show Buildable Area

-button-map-editor-tab-container-select =
-   .tooltip = Select
-
-button-map-editor-tab-container-tiles =
-   .tooltip = Tiles
-
-button-map-editor-tab-container-overlays =
-   .tooltip = Overlays
-
-button-map-editor-tab-container-actors =
-   .tooltip = Actors
-
-button-map-editor-tab-container-tools =
-   .tooltip = Tools
-
-button-map-editor-tab-container-history =
-   .tooltip = History
+button-map-editor-tab-container-select-tooltip = Select
+button-map-editor-tab-container-tiles-tooltip = Tiles
+button-map-editor-tab-container-overlays-tooltip = Overlays
+button-map-editor-tab-container-actors-tooltip = Actors
+button-map-editor-tab-container-tools-tooltip = Tools
+button-map-editor-tab-container-history-tooltip = History

 button-editor-world-root-copy =
   .label = Copy
@@ -179,7 +157,7 @@ label-script-error-panel-descc = Please send this file to the map author so that
 ## ingame-infostats.yaml
 label-objective-mission = Mission:
 checkbox-objective-stats = Destroy all opposition!
-label-stats-name = Player
+label-stats-player = Player
 label-stats-faction = Faction
 label-stats-score = Score
 label-stats-actions = Actions
@@ -354,18 +332,15 @@ productionpalette-player-widgets-production-palette =
 label-kick-client-dialog-texta = You may also apply a temporary ban, preventing
 label-kick-client-dialog-textb = them from joining for the remainder of this game.
 checkbox-kick-client-dialog-prevent-rejoining = Temporarily Ban
-button-kick-client-dialog-ok = Kick
-button-kick-client-dialog-cancel = Cancel
+button-kick-client-dialog = Kick
 label-kick-spectators-dialog-title = Kick Spectators
 button-kick-spectators-dialog-ok = Ok
-button-kick-spectators-dialog-cancel = Cancel
 label-force-start-dialog-title = Start Game?
 label-force-start-dialog-texta = One or more players are not yet ready.
 label-force-start-dialog-textb = Are you sure that you want to force start the game?
 label-kick-warning-a = One or more clients are missing the selected
 label-kick-warning-b = map, and will be kicked from the server.
-button-force-start-dialog-ok = Start
-button-force-start-dialog-cancel = Cancel
+button-force-start-dialog-start = Start

 ## lobby-mappreview.yaml
 label-map-incompatible-status-a = This map is not compatible
@@ -382,13 +357,18 @@ label-map-update-available-a = A new version of the map
 label-map-update-available-b = was found on your computer

 ## lobby-music.yaml
-label-container-music = Music
-label-container-length = Length
-checkbox-controls-shuffle = Shuffle
-checkbox-controls-repeat = Loop
-label-controls-volume = Volume:
+label-music-controls-volume = Volume:
+
+## lobby-music.yaml, lobby.yaml, mainmenu.yaml
+label-music-title = Music
+
+## music.yaml
+label-music-title-panel-title = Music Player

 ## lobby-music.yaml, music.yaml
+label-music-controls-length = Length
+checkbox-music-controls-shuffle = Shuffle
+checkbox-music-controls-loop = Loop
 label-container-title = Track
 label-no-music-title = Music Not Installed
 label-no-music-desca = The game music can be installed
@@ -398,24 +378,19 @@ label-no-music-descb = from the "Manage Content" menu.
 label-lobby-options-bin-title = Map Options

 ## lobby-players.yaml
-label-container-lobby-name = Player
-label-container-lobby-color = Color
-label-container-lobby-faction = Faction
-label-container-lobby-team = Team
-label-container-lobby-handicap = Handicap
-label-container-lobby-spawn = Spawn
-label-container-lobby-status = Ready
-dropdownbutton-template-editable-player-slot-options = Name
-label-template-editable-player-factionname = Faction
-dropdownbutton-template-editable-player-handicap-dropdown-tooltip = A handicap decreases the combat effectiveness of the player's forces
-label-faction-factionname = Faction
-dropdownbutton-template-noneditable-player-handicap-dropdown-tooltip = A handicap decreases the combat effectiveness of the player's forces
-dropdownbutton-template-empty-slot-options = Name
-button-template-empty-join = Play in this slot
-label-template-editable-spectator = Spectator
-label-template-noneditable-spectator = Spectator
-checkbox-template-new-spectator-toggle-spectators = Allow Spectators?
-button-template-new-spectator-spectate = Spectate
+label-lobby-players-player = Player
+label-lobby-players-color = Color
+label-lobby-players-faction = Faction
+label-lobby-players-team = Team
+label-lobby-players-handicap = Handicap
+label-lobby-players-spawn = Spawn
+label-lobby-players-ready = Ready
+label-lobby-players-name = Name
+dropdownbutton-lobby-players-handicap-tooltip = A handicap decreases the combat effectiveness of the player's forces
+button-lobby-players-join = Play in this slot
+label-lobby-players-spectator = Spectator
+checkbox-lobby-players-new-spectator-toggle = Allow Spectators?
+button-lobby-players-spectate = Spectate

 ## lobby-servers.yaml
 image-lobby-servers-bin-password-protected-tooltip = Requires Password
@@ -427,10 +402,8 @@ dropdownbutton-bg-slots = Slot Admin
 button-bg-reset-options = Reset Defaults
 button-skirmish-tabs-players-tab = Players
 button-skirmish-tabs-options-tab = Options
-button-skirmish-tabs-music-tab = Music
 button-multiplayer-tabs-players-tab = Players
 button-multiplayer-tabs-options-tab = Options
-button-multiplayer-tabs-music-tab = Music
 button-multiplayer-tabs-servers-tab = Servers
 button-bg-changemap = Change Map

@@ -445,20 +418,18 @@ button-server-lobby-start-game = Start Game
 label-mainmenu-introduction-prompt-title = Establishing Battlefield Control
 label-bg-desc-a = Welcome back Commander! Initialize combat parameters using the options below.
 label-bg-desc-b = Additional options can be configured later from the Settings menu.
-button-mainmenu-introduction-prompt-continue = Continue
 label-mainmenu-system-info-prompt-title = Establishing Battlefield Control
 label-bg-prompt-text-a = We would like to collect some details that will help us optimize OpenRA.
 label-bg-prompt-text-b = With your permission, the following anonymous system data will be sent:
 checkbox-bg-sysinfo = Send System Information
-button-mainmenu-system-info-prompt-continue = Continue

 ## mainmenu-prompts.yaml, settings-display.yaml
 label-profile-section-header = Profile
 label-player-container = Player Name:
 label-playercolor-container-color = Preferred Color:
 label-display-section-header = Display
-label-battlefield-camera-dropdown-container = Battlefield Camera:
-label-ui-scale-dropdown-container = UI Scale:
+label-battlefield-camera-dropdown = Battlefield Camera:
+label-ui-scale-dropdown = UI Scale:
 checkbox-cursordouble-container = Increase Cursor Size

 ## mainmenu-prompts.yaml, settings-input.yaml
@@ -485,33 +456,30 @@ label-mouse-control-desc-modern-edgescroll = or by moving the cursor to the edge
 checkbox-edgescroll-container = Screen Edge Panning

 ## mainmenu.yaml
+label-singleplayer-title = Singleplayer
 label-main-menu-mainmenu-title = Main Menu
-button-main-menu-singleplayer = Singleplayer
-button-main-menu-multiplayer = Multiplayer
-button-main-menu-settings = Settings
-button-main-menu-extras = Extras
+button-extras-title = Extras
 button-main-menu-content = Manage Content
-button-main-menu-quit = Quit
-label-singleplayer-menu-title = Singleplayer
 button-singleplayer-menu-skirmish = Skirmish
-button-singleplayer-menu-missions = Missions
 button-singleplayer-menu-load = Load
-button-singleplayer-menu-back = Back
-label-extras-menu-title = Extras
 button-extras-menu-replays = Replays
-button-extras-menu-music = Music
-button-extras-menu-map-editor = Map Editor
+label-map-editor-title = Map Editor
 button-extras-menu-assetbrowser = Asset Browser
-button-extras-menu-credits = Credits
-button-extras-menu-back = Back
-label-map-editor-menu-title = Map Editor
-button-map-editor-menu-new = New Map
-button-map-editor-menu-load = Load Map
-button-map-editor-menu-back = Back
+button-map-editor-new-map = New Map
+button-map-editor-load-map = Load Map
 dropdownbutton-news-bg-button = Battlefield News
 label-update-notice-a = You are running an outdated version of OpenRA.
 label-update-notice-b = Download the latest version from www.openra.net

+## mainmenu.yaml, missionbrowser.yaml
+label-missions-title = Missions
+
+## mainmenu.yaml, multiplayer-browser.yaml
+label-multiplayer-title = Multiplayer
+
+## mainmenu.yaml, settings.yaml
+button-settings-title = Settings
+
 ## mapchooser.yaml
 label-mapchooser-panel-title = Select Map
 button-bg-system-maps-tab = Official Maps
@@ -525,32 +493,25 @@ button-bg-delete-map = Delete Map
 button-bg-delete-all-maps = Delete All Maps
 button-bg-ok = Ok

-## mapchooser.yaml, gamesave-browser.yaml
-button-bg-cancel = Back
-
 ## missionbrowser.yaml
-label-missionbrowser-panel-title = Missions
-button-missionbrowser-panel-back = Back
 button-missionbrowser-panel-mission-info = Mission Info
 button-missionbrowser-panel-mission-options = Options
 button-missionbrowser-panel-start-briefing-video = Watch Briefing
 button-missionbrowser-panel-stop-briefing-video = Stop Briefing
 button-missionbrowser-panel-start-info-video = Watch Info Video
 button-missionbrowser-panel-stop-info-video = Stop Info Video
-button-missionbrowser-panel-startgame = Play
+button-missionbrowser-panel-play = Play

 ## multiplayer-browser.yaml
-label-multiplayer-panel-title = Multiplayer
 image-bg-password-protected-tooltip = Requires Password
 image-bg-requires-authentication-tooltip = Requires OpenRA forum account
 button-selected-server-join = Join
 dropdownbutton-bg-filters = Filter Games
 button-bg-directconnect = Direct IP
 button-bg-create = Create
-button-multiplayer-panel-back = Back

 ## multiplayer-browser.yaml, lobby-servers.yaml
-label-container-name = Server
+label-container-server = Server
 label-container-players = Players
 label-container-location = Location
 label-container-status = Status
@@ -586,26 +547,17 @@ label-notices-upnp-advertising = - Game will be advertised to the Local Area Net
 label-notices-upnp-firewall = - You must manually configure your firewall to allow connections.
 label-notices-upnp-portforward-a = - Game will automatically configure port forwarding.
 label-notices-upnp-settings-a = - You can disable UPnP/NAT-PMP in the settings menu.
-button-multiplayer-createserver-panel-back = Back
-button-multiplayer-createserver-panel-map = Change Map
+button-multiplayer-createserver-panel-change-map = Change Map
 button-multiplayer-createserver-panel-create = Create

 ## multiplayer-directconnect.yaml
 label-directconnect-panel-title = Connect to Server
 label-bg-address = Address:
 label-bg-port = Port:
-button-directconnect-panel-back = Back
 button-directconnect-panel-join = Join

-## music.yaml
-label-music-panel-title = Music Player
-label-container-type = Length
-checkbox-bg-shuffle = Shuffle
-checkbox-bg-repeat = Loop
-button-music-panel-back = Back
-
 ## playerprofile.yaml
-button-profile-header-destroy-key = Logout
+button-profile-header-logout = Logout
 label-generate-keys-desc-a = Connect to a forum account to identify
 label-generate-keys-desc-b = yourself to other players, join private
 label-generate-keys-desc-c = servers, and display badges.
@@ -615,41 +567,31 @@ label-generating-keys-desc-b = This will take several seconds...
 label-register-fingerprint-desc-a = An authentication key has been copied to your
 label-register-fingerprint-desc-b = clipboard. Add this to your User Control Panel
 label-register-fingerprint-desc-c = on the OpenRA forum then press Continue.
-button-register-fingerprint-delete-key = Cancel
-button-register-fingerprint-check-key = Continue
 label-checking-fingerprint-desc-a = Querying account details from
 label-checking-fingerprint-desc-b = the OpenRA forum...
 label-fingerprint-not-found-desc-a = Your authentication key is not connected
 label-fingerprint-not-found-desc-b = to an OpenRA forum account.
-button-fingerprint-not-found-continue = Back
 label-connection-error-desc-a = Failed to connect to the OpenRA forum.
 label-connection-error-desc-b = Please check your internet connection.
-button-connection-error-retry = Retry

 ## replaybrowser.yaml
 label-replaybrowser-panel-title = Replay Viewer
 label-filters-title = Filter
 label-filters-flt-gametype-desc = Type:
-dropdownbutton-filters-flt-gametype = Any
+dropdownbutton-filters-any = Any
 label-filters-flt-date-desc = Date:
-dropdownbutton-filters-flt-date = Any
 label-filters-flt-duration-desc = Duration:
-dropdownbutton-filters-flt-duration = Any
 label-filters-flt-mapname-desc = Map:
-dropdownbutton-filters-flt-mapname = Any
 label-filters-flt-player-desc = Player:
 dropdownbutton-filters-flt-player = Anyone
 label-filters-flt-outcome-desc = Outcome:
-dropdownbutton-filters-flt-outcome = Any
 label-filters-flt-faction-desc = Faction:
-dropdownbutton-filters-flt-faction = Any
 button-filters-flt-reset = Reset Filters
 label-management-manage-title = Manage
 button-management-mng-rensel = Rename
 button-management-mng-delsel = Delete
 button-management-mng-delall = Delete All
 label-replay-list-container-replaybrowser-title = Choose Replay
-button-replaybrowser-panel-cancel = Back
 button-replaybrowser-panel-watch = Watch

 ## settings-advanced.yaml
@@ -682,7 +624,7 @@ checkbox-mute-background-music-container =
   .label = Mute Menu Music
   .tooltip = Mute background music when no specific track is playing

-label-music-volume-container = Music Volume:
+label-music-title-volume-container = Music Volume:
 label-audio-device-container = Audio Device:
 label-video-volume-container = Video Volume:
 label-restart-required-container-audio-desc = Device changes will be applied after the game is restarted
@@ -741,8 +683,6 @@ label-zoomspeed-slider-container-zoom-speed = Zoom Speed:
 label-ui-scrollspeed-slider-container-scroll-speed = UI Scroll Speed:

 ## settings.yaml
-label-settings-panel-title = Settings
-button-settings-panel-back = Back
 button-settings-panel-reset = Reset

 ## tooltips.yaml
--- a/mods/common/chrome/assetbrowser.yaml
+++ b/mods/common/chrome/assetbrowser.yaml
@@ -12,7 +12,7 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: Bold
 			Align: Center
-			Text: label-assetbrowser-panel-title
+			Text: label-assetbrowser-title
 		Label@SOURCE_SELECTOR_DESC:
 			X: 20
 			Y: 36
@@ -20,21 +20,21 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: TinyBold
 			Align: Center
-			Text: label-assetbrowser-panel-source-selector-desc
+			Text: label-assetbrowser-source-selector-desc
 		DropDownButton@SOURCE_SELECTOR:
 			X: 20
 			Y: 60
 			Width: 195
 			Height: 25
 			Font: Bold
-			Text: dropdownbutton-assetbrowser-panel-source-selector
+			Text: dropdownbutton-assetbrowser-source-selector
 		DropDownButton@ASSET_TYPES_DROPDOWN:
 			X: 20
 			Y: 90
 			Width: 195
 			Height: 25
 			Font: Bold
-			Text: dropdownbutton-assetbrowser-panel-asset-types-dropdown
+			Text: dropdownbutton-assetbrowser-asset-types-dropdown
 		Label@FILENAME_DESC:
 			X: 20
 			Y: 115
@@ -42,7 +42,7 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: TinyBold
 			Align: Center
-			Text: label-assetbrowser-panel-filename-desc
+			Text: label-assetbrowser-filename-desc
 		TextField@FILENAME_INPUT:
 			X: 20
 			Y: 140
@@ -76,7 +76,7 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: Bold
 			Align: Left
-			Text: label-assetbrowser-panel-sprite-scale
+			Text: label-assetbrowser-sprite-scale
 		Slider@SPRITE_SCALE_SLIDER:
 			X: PARENT_RIGHT - WIDTH - 330
 			Y: 62
@@ -91,7 +91,7 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: Bold
 			Align: Right
-			Text: label-assetbrowser-panel-palette-desc
+			Text: label-assetbrowser-palette-desc
 		DropDownButton@PALETTE_SELECTOR:
 			X: PARENT_RIGHT - WIDTH - 110
 			Y: 60
@@ -128,7 +128,7 @@ Background@ASSETBROWSER_PANEL:
 					Height: PARENT_BOTTOM
 					Align: Center
 					Visible: false
-					Text: label-sprite-bg-error
+					Text: label-assetbrowser-sprite-bg-error
 		Container@FRAME_SELECTOR:
 			X: 226
 			Y: PARENT_BOTTOM - 75
@@ -209,7 +209,7 @@ Background@ASSETBROWSER_PANEL:
 			Width: 160
 			Height: 25
 			Font: Bold
-			Text: button-assetbrowser-panel-close
+			Text: button-back
 		TooltipContainer@TOOLTIP_CONTAINER:

 ScrollPanel@ASSET_TYPES_PANEL:
--- a/mods/common/chrome/confirmation-dialogs.yaml
+++ b/mods/common/chrome/confirmation-dialogs.yaml
@@ -21,7 +21,7 @@ Background@THREEBUTTON_PROMPT:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-threebutton-prompt-confirm
+			Text: button-prompt-confirm
 			Font: Bold
 			Key: return
 			Visible: false
@@ -30,7 +30,7 @@ Background@THREEBUTTON_PROMPT:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-threebutton-prompt-other
+			Text: button-prompt-other
 			Font: Bold
 			Visible: false
 		Button@CANCEL_BUTTON:
@@ -38,7 +38,7 @@ Background@THREEBUTTON_PROMPT:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-threebutton-prompt-cancel
+			Text: button-cancel
 			Font: Bold
 			Key: escape
 			Visible: false
@@ -66,7 +66,7 @@ Background@TWOBUTTON_PROMPT:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-twobutton-prompt-confirm
+			Text: button-prompt-confirm
 			Font: Bold
 			Key: return
 			Visible: false
@@ -75,7 +75,7 @@ Background@TWOBUTTON_PROMPT:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-twobutton-prompt-cancel
+			Text: button-cancel
 			Font: Bold
 			Key: escape
 			Visible: false
@@ -116,7 +116,7 @@ Background@TEXT_INPUT_PROMPT:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-text-input-prompt-cancel
+			Text: button-cancel
 			Font: Bold
 			Key: escape

--- a/mods/common/chrome/connection.yaml
+++ b/mods/common/chrome/connection.yaml
@@ -44,7 +44,7 @@ Background@CONNECTIONFAILED_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-connectionfailed-panel-retry
+			Text: button-retry
 			Font: Bold
 			Key: return
 		Button@ABORT_BUTTON:
@@ -60,7 +60,7 @@ Background@CONNECTIONFAILED_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-connectionfailed-panel-quit
+			Text: button-quit
 			Font: Bold
 			Key: escape

--- a/mods/common/chrome/credits.yaml
+++ b/mods/common/chrome/credits.yaml
@@ -11,7 +11,7 @@ Background@CREDITS_PANEL:
 			Height: 25
 			Font: Bold
 			Align: Center
-			Text: label-credits-panel-title
+			Text: label-credits-title
 		Container@TAB_CONTAINER:
 			Visible: False
 			X: 20
@@ -27,7 +27,7 @@ Background@CREDITS_PANEL:
 					X: 140
 					Width: 140
 					Height: 31
-					Text: button-tab-container-engine
+					Text: label-openra
 					Font: Bold
 		ScrollPanel@CREDITS_DISPLAY:
 			X: 20
@@ -46,7 +46,7 @@ Background@CREDITS_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-credits-panel-back
+			Text: button-back
 			Font: Bold
 			Key: escape

--- a/mods/common/chrome/editor.yaml
+++ b/mods/common/chrome/editor.yaml
@@ -68,7 +68,7 @@ Background@NEW_MAP_BG:
 			Y: PARENT_BOTTOM - 45
 			Width: 120
 			Height: 25
-			Text: button-new-map-bg-cancel
+			Text: button-cancel
 			Font: Bold
 			Key: escape

@@ -168,7 +168,7 @@ Background@SAVE_MAP_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 120
 			Height: 25
-			Text: button-save-map-panel-back
+			Text: button-cancel
 			Font: Bold
 			Key: escape

@@ -271,7 +271,7 @@ Container@EDITOR_WORLD_ROOT:
 					Y: 36
 					Width: 55
 					Height: 25
-					Text: label-tiles-bg-categories
+					Text: label-bg-filter
 					Align: Right
 					Font: TinyBold
 				DropDownButton@CATEGORIES_DROPDOWN:
@@ -345,7 +345,7 @@ Container@EDITOR_WORLD_ROOT:
 					Y: 36
 					Width: 55
 					Height: 25
-					Text: label-actors-bg-categories
+					Text: label-bg-filter
 					Align: Right
 					Font: TinyBold
 				DropDownButton@CATEGORIES_DROPDOWN:
@@ -522,7 +522,7 @@ Container@EDITOR_WORLD_ROOT:
 							Y: 222
 							Width: 75
 							Height: 25
-							Text: button-selection-cancel
+							Text: button-cancel
 							Font: Bold
 				Container@ACTOR_EDIT_PANEL:
 					Width: 310
@@ -617,7 +617,7 @@ Container@EDITOR_WORLD_ROOT:
 									X: 142
 									Width: 75
 									Height: 25
-									Text: button-container-cancel
+									Text: button-cancel
 									Font: Bold
 								Button@OK_BUTTON:
 									X: 222
@@ -638,7 +638,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorSelectTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-select.tooltip
+					TooltipText: button-map-editor-tab-container-select-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
@@ -652,7 +652,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorTilesTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-tiles.tooltip
+					TooltipText: button-map-editor-tab-container-tiles-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
@@ -666,7 +666,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorOverlaysTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-overlays.tooltip
+					TooltipText: button-map-editor-tab-container-overlays-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
@@ -680,7 +680,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorActorsTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-actors.tooltip
+					TooltipText: button-map-editor-tab-container-actors-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
@@ -694,7 +694,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorToolsTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-tools.tooltip
+					TooltipText: button-map-editor-tab-container-tools-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
@@ -708,7 +708,7 @@ Container@EDITOR_WORLD_ROOT:
 					Height: 25
 					Key: EditorHistoryTab
 					TooltipTemplate: BUTTON_TOOLTIP
-					TooltipText: button-map-editor-tab-container-history.tooltip
+					TooltipText: button-map-editor-tab-container-history-tooltip
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
--- a/mods/common/chrome/gamesave-browser.yaml
+++ b/mods/common/chrome/gamesave-browser.yaml
@@ -73,7 +73,7 @@ Background@GAMESAVE_BROWSER_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 100
 			Height: 25
-			Text: button-gamesave-browser-panel-cancel
+			Text: button-back
 			Font: Bold
 		Button@DELETE_ALL_BUTTON:
 			X: PARENT_RIGHT - 350 - WIDTH
--- a/mods/common/chrome/ingame-infostats.yaml
+++ b/mods/common/chrome/ingame-infostats.yaml
@@ -37,7 +37,7 @@ Container@SKIRMISH_STATS:
 					X: 10
 					Width: 210
 					Height: 25
-					Text: label-stats-name
+					Text: label-stats-player
 					Font: Bold
 				Label@FACTION:
 					X: 230
--- a/mods/common/chrome/lobby-kickdialogs.yaml
+++ b/mods/common/chrome/lobby-kickdialogs.yaml
@@ -35,14 +35,14 @@ Background@KICK_CLIENT_DIALOG:
 			Y: 155
 			Width: 120
 			Height: 25
-			Text: button-kick-client-dialog-ok
+			Text: button-kick-client-dialog
 			Font: Bold
 		Button@CANCEL_BUTTON:
 			X: (PARENT_RIGHT - WIDTH) / 2 - 75
 			Y: 155
 			Width: 120
 			Height: 25
-			Text: button-kick-client-dialog-cancel
+			Text: button-cancel
 			Font: Bold

 Background@KICK_SPECTATORS_DIALOG:
@@ -76,7 +76,7 @@ Background@KICK_SPECTATORS_DIALOG:
 			Y: 155
 			Width: 120
 			Height: 25
-			Text: button-kick-spectators-dialog-cancel
+			Text: button-cancel
 			Font: Bold

 Background@FORCE_START_DIALOG:
@@ -129,13 +129,13 @@ Background@FORCE_START_DIALOG:
 			Y: 155
 			Width: 120
 			Height: 25
-			Text: button-force-start-dialog-ok
+			Text: button-force-start-dialog-start
 			Font: Bold
 		Button@CANCEL_BUTTON:
 			X: (PARENT_RIGHT - WIDTH) / 2 - 75
 			Y: 155
 			Width: 120
 			Height: 25
-			Text: button-force-start-dialog-cancel
+			Text: button-cancel
 			Font: Bold

--- a/mods/common/chrome/lobby-music.yaml
+++ b/mods/common/chrome/lobby-music.yaml
@@ -11,7 +11,7 @@ Container@LOBBY_MUSIC_BIN:
 				Label@MUSIC:
 					Width: 268
 					Height: 25
-					Text: label-container-music
+					Text: label-music-title
 					Align: Center
 					Font: Bold
 				Label@TITLE:
@@ -24,7 +24,7 @@ Container@LOBBY_MUSIC_BIN:
 					X: PARENT_RIGHT - 80
 					Height: 25
 					Width: 50
-					Text: label-container-length
+					Text: label-music-controls-length
 					Font: Bold
 					Align: Right
 		Background@CONTROLS:
@@ -115,20 +115,20 @@ Container@LOBBY_MUSIC_BIN:
 					Width: 85
 					Height: 20
 					Font: Regular
-					Text: checkbox-controls-shuffle
+					Text: checkbox-music-controls-shuffle
 				Checkbox@REPEAT:
 					X: PARENT_RIGHT - 15 - WIDTH
 					Y: 150
 					Width: 70
 					Height: 20
 					Font: Regular
-					Text: checkbox-controls-repeat
+					Text: checkbox-music-controls-loop
 				Label@VOLUME_LABEL:
 					Y: 181
 					Width: 65
 					Height: 25
 					Align: Right
-					Text: label-controls-volume
+					Text: label-music-controls-volume
 				ExponentialSlider@MUSIC_SLIDER:
 					X: 70
 					Y: 186
--- a/mods/common/chrome/lobby-players.yaml
+++ b/mods/common/chrome/lobby-players.yaml
@@ -11,49 +11,49 @@ Container@LOBBY_PLAYER_BIN:
 				Label@LABEL_LOBBY_NAME:
 					Width: 180
 					Height: 25
-					Text: label-container-lobby-name
+					Text: label-lobby-players-name
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_COLOR:
 					X: 190
 					Width: 70
 					Height: 25
-					Text: label-container-lobby-color
+					Text: label-lobby-players-color
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_FACTION:
 					X: 270
 					Width: 140
 					Height: 25
-					Text: label-container-lobby-faction
+					Text: label-lobby-players-faction
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_TEAM:
 					X: 420
 					Width: 48
 					Height: 25
-					Text: label-container-lobby-team
+					Text: label-lobby-players-team
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_HANDICAP:
 					X: 478
 					Width: 72
 					Height: 25
-					Text: label-container-lobby-handicap
+					Text: label-lobby-players-handicap
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_SPAWN:
 					X: 560
 					Width: 48
 					Height: 25
-					Text: label-container-lobby-spawn
+					Text: label-lobby-players-spawn
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_STATUS:
 					X: 617
 					Width: 20 + 24
 					Height: 25
-					Text: label-container-lobby-status
+					Text: label-lobby-players-ready
 					Align: Left
 					Font: Bold
 		ScrollPanel@LOBBY_PLAYERS:
@@ -109,7 +109,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 15
 							Width: 165
 							Height: 25
-							Text: dropdownbutton-template-editable-player-slot-options
+							Text: label-lobby-players-name
 							Font: Regular
 							Visible: false
 						DropDownButton@COLOR:
@@ -140,23 +140,23 @@ Container@LOBBY_PLAYER_BIN:
 									X: 40
 									Width: 70
 									Height: 25
-									Text: label-template-editable-player-factionname
+									Text: label-lobby-players-faction
 						DropDownButton@TEAM_DROPDOWN:
 							X: 420
 							Width: 48
 							Height: 25
-							Text: dropdownbutton-template-editable-player-team-dropdown
+							Text: label-lobby-players-team
 						DropDownButton@HANDICAP_DROPDOWN:
 							X: 478
 							Width: 72
 							Height: 25
 							TooltipContainer: TOOLTIP_CONTAINER
-							TooltipText: dropdownbutton-template-editable-player-handicap-dropdown-tooltip
+							TooltipText: dropdownbutton-lobby-players-handicap-tooltip
 						DropDownButton@SPAWN_DROPDOWN:
 							X: 560
 							Width: 48
 							Height: 25
-							Text: dropdownbutton-template-editable-player-spawn-dropdown
+							Text: label-lobby-players-spawn
 						Checkbox@STATUS_CHECKBOX:
 							X: 617
 							Y: 2
@@ -209,7 +209,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 39
 							Width: 146
 							Height: 25
-							Text: label-template-noneditable-player-name
+							Text: label-lobby-players-name
 						DropDownButton@PLAYER_ACTION:
 							X: 15
 							Width: 165
@@ -250,12 +250,12 @@ Container@LOBBY_PLAYER_BIN:
 									X: 40
 									Width: 70
 									Height: 25
-									Text: label-faction-factionname
+									Text: label-lobby-players-faction
 						Label@TEAM:
 							X: 420
 							Width: 42
 							Height: 25
-							Text: label-template-noneditable-player-team
+							Text: label-lobby-players-team
 							Align: Center
 						DropDownButton@TEAM_DROPDOWN:
 							X: 420
@@ -272,7 +272,7 @@ Container@LOBBY_PLAYER_BIN:
 							Width: 72
 							Height: 25
 							TooltipContainer: TOOLTIP_CONTAINER
-							TooltipText: dropdownbutton-template-noneditable-player-handicap-dropdown-tooltip
+							TooltipText: dropdownbutton-lobby-players-handicap-tooltip
 						Label@SPAWN:
 							X: 560
 							Width: 23
@@ -301,16 +301,16 @@ Container@LOBBY_PLAYER_BIN:
 							Width: 165
 							Height: 25
 							X: 20
-							Text: label-template-empty-name
+							Text: label-lobby-players-name
 						DropDownButton@SLOT_OPTIONS:
 							X: 15
 							Width: 165
 							Height: 25
-							Text: dropdownbutton-template-empty-slot-options
+							Text: label-lobby-players-name
 							Visible: false
 						Button@JOIN:
 							X: 190
-							Text: button-template-empty-join
+							Text: button-lobby-players-join
 							Width: 418
 							Height: 25
 				Container@TEMPLATE_EDITABLE_SPECTATOR:
@@ -359,7 +359,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 190
 							Width: 418
 							Height: 25
-							Text: label-template-editable-spectator
+							Text: label-lobby-players-spectator
 							Align: Center
 							Font: Bold
 						Checkbox@STATUS_CHECKBOX:
@@ -414,7 +414,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 39
 							Width: 179
 							Height: 25
-							Text: label-template-noneditable-spectator-name
+							Text: label-lobby-players-name
 						DropDownButton@PLAYER_ACTION:
 							X: 15
 							Width: 165
@@ -440,7 +440,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 190
 							Width: 418
 							Height: 25
-							Text: label-template-noneditable-spectator
+							Text: label-lobby-players-spectator
 							Align: Center
 							Font: Bold
 						Image@STATUS_IMAGE:
@@ -462,12 +462,12 @@ Container@LOBBY_PLAYER_BIN:
 							Width: 165
 							Height: 20
 							Font: Regular
-							Text: checkbox-template-new-spectator-toggle-spectators
+							Text: checkbox-lobby-players-new-spectator-toggle
 						Button@SPECTATE:
 							X: 190
 							Width: 418
 							Height: 25
-							Text: button-template-new-spectator-spectate
+							Text: button-lobby-players-spectate
 							Font: Regular

 ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
--- a/mods/common/chrome/lobby-servers.yaml
+++ b/mods/common/chrome/lobby-servers.yaml
@@ -11,7 +11,7 @@ Container@LOBBY_SERVERS_BIN:
 					X: 5
 					Width: 347
 					Height: 25
-					Text: label-container-name
+					Text: label-container-server
 					Align: Center
 					Font: Bold
 				Label@PLAYERS:
--- a/mods/common/chrome/lobby.yaml
+++ b/mods/common/chrome/lobby.yaml
@@ -61,7 +61,7 @@ Background@SERVER_LOBBY:
 					Width: 162
 					Height: 31
 					Font: Bold
-					Text: button-skirmish-tabs-music-tab
+					Text: label-music-title
 		Container@MULTIPLAYER_TABS:
 			X: 695 - WIDTH
 			Width: 486
@@ -86,7 +86,7 @@ Background@SERVER_LOBBY:
 					Width: 121
 					Height: 31
 					Font: Bold
-					Text: button-multiplayer-tabs-music-tab
+					Text: label-music-title
 				Button@SERVERS_TAB:
 					X: 364
 					Y: 285
--- a/mods/common/chrome/mainmenu-prompts.yaml
+++ b/mods/common/chrome/mainmenu-prompts.yaml
@@ -274,7 +274,7 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
 								Label@BATTLEFIELD_CAMERA:
 									Width: PARENT_RIGHT
 									Height: 20
-									Text: label-battlefield-camera-dropdown-container
+									Text: label-battlefield-camera-dropdown
 								DropDownButton@BATTLEFIELD_CAMERA_DROPDOWN:
 									Y: 25
 									Width: PARENT_RIGHT
@@ -287,7 +287,7 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
 								Label@UI_SCALE:
 									Width: PARENT_RIGHT
 									Height: 20
-									Text: label-ui-scale-dropdown-container
+									Text: label-ui-scale-dropdown
 								DropDownButton@UI_SCALE_DROPDOWN:
 									Y: 25
 									Width: PARENT_RIGHT
@@ -311,7 +311,7 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-mainmenu-introduction-prompt-continue
+			Text: button-continue
 			Font: Bold
 			Key: return

@@ -368,7 +368,7 @@ Background@MAINMENU_SYSTEM_INFO_PROMPT:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-mainmenu-system-info-prompt-continue
+			Text: button-continue
 			Font: Bold
 			Key: return

--- a/mods/common/chrome/mainmenu.yaml
+++ b/mods/common/chrome/mainmenu.yaml
@@ -43,7 +43,7 @@ Container@MAINMENU:
 							Y: 22
 							Width: 200
 							Height: 30
-							Text: label-main-menu-mainmenu-title
+							Text: label-openra
 							Align: Center
 							Font: Bold
 						Button@SINGLEPLAYER_BUTTON:
@@ -51,28 +51,28 @@ Container@MAINMENU:
 							Y: 60
 							Width: 140
 							Height: 30
-							Text: button-main-menu-singleplayer
+							Text: label-singleplayer-title
 							Font: Bold
 						Button@MULTIPLAYER_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
 							Y: 100
 							Width: 140
 							Height: 30
-							Text: button-main-menu-multiplayer
+							Text: label-multiplayer-title
 							Font: Bold
 						Button@SETTINGS_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
 							Y: 140
 							Width: 140
 							Height: 30
-							Text: button-main-menu-settings
+							Text: button-settings-title
 							Font: Bold
 						Button@EXTRAS_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
 							Y: 180
 							Width: 140
 							Height: 30
-							Text: button-main-menu-extras
+							Text: button-extras-title
 							Font: Bold
 						Button@CONTENT_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -86,7 +86,7 @@ Container@MAINMENU:
 							Y: 260
 							Width: 140
 							Height: 30
-							Text: button-main-menu-quit
+							Text: button-quit
 							Font: Bold
 				Background@SINGLEPLAYER_MENU:
 					Width: PARENT_RIGHT
@@ -97,7 +97,7 @@ Container@MAINMENU:
 							Y: 20
 							Width: 200
 							Height: 30
-							Text: label-singleplayer-menu-title
+							Text: label-singleplayer-title
 							Align: Center
 							Font: Bold
 						Button@SKIRMISH_BUTTON:
@@ -112,7 +112,7 @@ Container@MAINMENU:
 							Y: 100
 							Width: 140
 							Height: 30
-							Text: button-singleplayer-menu-missions
+							Text: label-missions-title
 							Font: Bold
 						Button@LOAD_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -127,7 +127,7 @@ Container@MAINMENU:
 							Y: 260
 							Width: 140
 							Height: 30
-							Text: button-singleplayer-menu-back
+							Text: button-back
 							Font: Bold
 				Background@EXTRAS_MENU:
 					Width: PARENT_RIGHT
@@ -138,7 +138,7 @@ Container@MAINMENU:
 							Y: 20
 							Width: 200
 							Height: 30
-							Text: label-extras-menu-title
+							Text: button-extras-title
 							Align: Center
 							Font: Bold
 						Button@REPLAYS_BUTTON:
@@ -153,14 +153,14 @@ Container@MAINMENU:
 							Y: 100
 							Width: 140
 							Height: 30
-							Text: button-extras-menu-music
+							Text: label-music-title
 							Font: Bold
 						Button@MAP_EDITOR_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
 							Y: 140
 							Width: 140
 							Height: 30
-							Text: button-extras-menu-map-editor
+							Text: label-map-editor-title
 							Font: Bold
 						Button@ASSETBROWSER_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -174,7 +174,7 @@ Container@MAINMENU:
 							Y: 220
 							Width: 140
 							Height: 30
-							Text: button-extras-menu-credits
+							Text: label-credits-title
 							Font: Bold
 						Button@BACK_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -182,7 +182,7 @@ Container@MAINMENU:
 							Y: 260
 							Width: 140
 							Height: 30
-							Text: button-extras-menu-back
+							Text: button-back
 							Font: Bold
 				Background@MAP_EDITOR_MENU:
 					Width: PARENT_RIGHT
@@ -193,7 +193,7 @@ Container@MAINMENU:
 							Y: 20
 							Width: 200
 							Height: 30
-							Text: label-map-editor-menu-title
+							Text: label-map-editor-title
 							Align: Center
 							Font: Bold
 						Button@NEW_MAP_BUTTON:
@@ -201,14 +201,14 @@ Container@MAINMENU:
 							Y: 60
 							Width: 140
 							Height: 30
-							Text: button-map-editor-menu-new
+							Text: button-map-editor-new-map
 							Font: Bold
 						Button@LOAD_MAP_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
 							Y: 100
 							Width: 140
 							Height: 30
-							Text: button-map-editor-menu-load
+							Text: button-map-editor-load-map
 							Font: Bold
 						Button@BACK_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -216,7 +216,7 @@ Container@MAINMENU:
 							Y: 260
 							Width: 140
 							Height: 30
-							Text: button-map-editor-menu-back
+							Text: button-back
 							Font: Bold
 		Container@PERFORMANCE_INFO:
 			Logic: PerfDebugLogic
--- a/mods/common/chrome/map-chooser.yaml
+++ b/mods/common/chrome/map-chooser.yaml
@@ -184,7 +184,7 @@ Background@MAPCHOOSER_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 120
 			Height: 25
-			Text: button-mapchooser-panel-cancel
+			Text: button-back
 			Font: Bold
 			Key: escape
 		TooltipContainer@TOOLTIP_CONTAINER:
--- a/mods/common/chrome/missionbrowser.yaml
+++ b/mods/common/chrome/missionbrowser.yaml
@@ -9,7 +9,7 @@ Background@MISSIONBROWSER_PANEL:
 			Y: 21
 			Width: PARENT_RIGHT
 			Height: 25
-			Text: label-missionbrowser-panel-title
+			Text: label-missions-title
 			Align: Center
 			Font: Bold
 		ScrollPanel@MISSION_LIST:
@@ -177,14 +177,14 @@ Background@MISSIONBROWSER_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 120
 			Height: 25
-			Text: button-missionbrowser-panel-startgame
+			Text: button-missionbrowser-panel-play
 			Font: Bold
 		Button@BACK_BUTTON:
 			X: PARENT_RIGHT - 140
 			Y: PARENT_BOTTOM - 45
 			Width: 120
 			Height: 25
-			Text: button-missionbrowser-panel-back
+			Text: button-back
 			Font: Bold
 			Key: escape
 		Background@MISSION_BIN:
--- a/mods/common/chrome/multiplayer-browser.yaml
+++ b/mods/common/chrome/multiplayer-browser.yaml
@@ -9,7 +9,7 @@ Background@MULTIPLAYER_PANEL:
 			Y: 16
 			Width: PARENT_RIGHT
 			Height: 25
-			Text: label-multiplayer-panel-title
+			Text: label-multiplayer-title
 			Align: Center
 			Font: Bold
 		Container@LABEL_CONTAINER:
@@ -22,7 +22,7 @@ Background@MULTIPLAYER_PANEL:
 					X: 5
 					Width: 347
 					Height: 25
-					Text: label-container-name
+					Text: label-container-server
 					Align: Center
 					Font: Bold
 				Label@PLAYERS:
@@ -253,7 +253,7 @@ Background@MULTIPLAYER_PANEL:
 			Y: PARENT_BOTTOM - HEIGHT - 20
 			Width: 174
 			Height: 25
-			Text: button-multiplayer-panel-back
+			Text: button-back
 			Font: Bold
 		TooltipContainer@TOOLTIP_CONTAINER:

--- a/mods/common/chrome/multiplayer-createserver.yaml
+++ b/mods/common/chrome/multiplayer-createserver.yaml
@@ -209,14 +209,14 @@ Background@MULTIPLAYER_CREATESERVER_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 120
 			Height: 25
-			Text: button-multiplayer-createserver-panel-map
+			Text: button-multiplayer-createserver-panel-change-map
 			Font: Bold
 		Button@BACK_BUTTON:
 			X: PARENT_RIGHT - WIDTH - 20
 			Y: PARENT_BOTTOM - 45
 			Width: 120
 			Height: 25
-			Text: button-multiplayer-createserver-panel-back
+			Text: button-back
 			Font: Bold
 			Key: escape
 		Button@CREATE_BUTTON:
--- a/mods/common/chrome/multiplayer-directconnect.yaml
+++ b/mods/common/chrome/multiplayer-directconnect.yaml
@@ -53,7 +53,7 @@ Background@DIRECTCONNECT_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-directconnect-panel-back
+			Text: button-cancel
 			Font: Bold
 			Key: escape

--- a/mods/common/chrome/musicplayer.yaml
+++ b/mods/common/chrome/musicplayer.yaml
@@ -46,7 +46,7 @@ Background@MUSIC_PANEL:
 					X: PARENT_RIGHT - WIDTH
 					Height: 25
 					Width: 95
-					Text: label-container-type
+					Text: label-music-controls-length
 					Align: Center
 					Font: Bold
 		Container@BUTTONS:
@@ -127,13 +127,13 @@ Background@MUSIC_PANEL:
 			Y: PARENT_BOTTOM - HEIGHT - 95
 			Width: 85
 			Height: 20
-			Text: checkbox-music-panel-shuffle
+			Text: checkbox-music-controls-shuffle
 		Checkbox@REPEAT:
 			X: PARENT_RIGHT - 15 - WIDTH
 			Y: PARENT_BOTTOM - HEIGHT - 95
 			Width: 70
 			Height: 20
-			Text: checkbox-music-panel-repeat
+			Text: checkbox-music-controls-loop
 		Container@NO_MUSIC_LABEL:
 			X: 20
 			Y: (PARENT_BOTTOM - HEIGHT - 95) / 2
@@ -164,7 +164,7 @@ Background@MUSIC_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-music-panel-back
+			Text: button-back
 			Font: Bold
 			Key: escape
 		Label@MUTE_LABEL:
--- a/mods/common/chrome/playerprofile.yaml
+++ b/mods/common/chrome/playerprofile.yaml
@@ -26,7 +26,7 @@ Container@LOCAL_PROFILE_PANEL:
 					Width: 60
 					Height: 20
 					Font: TinyBold
-					Text: button-profile-header-destroy-key
+					Text: button-profile-header-logout
 		Background@BADGES_CONTAINER:
 			Width: PARENT_RIGHT
 			Y: 48
@@ -122,14 +122,14 @@ Container@LOCAL_PROFILE_PANEL:
 					Width: 70
 					Height: 20
 					Font: TinyBold
-					Text: button-register-fingerprint-delete-key
+					Text: button-cancel
 				Button@CHECK_KEY:
 					X: 185
 					Y: 70
 					Width: 70
 					Height: 20
 					Font: TinyBold
-					Text: button-register-fingerprint-check-key
+					Text: button-continue
 		Background@CHECKING_FINGERPRINT:
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
@@ -180,7 +180,7 @@ Container@LOCAL_PROFILE_PANEL:
 					Width: 70
 					Height: 20
 					Font: TinyBold
-					Text: button-fingerprint-not-found-continue
+					Text: button-back
 		Background@CONNECTION_ERROR:
 			Width: PARENT_RIGHT
 			Height: PARENT_BOTTOM
@@ -206,7 +206,7 @@ Container@LOCAL_PROFILE_PANEL:
 					Width: 70
 					Height: 20
 					Font: TinyBold
-					Text: button-connection-error-retry
+					Text: button-retry

 Container@PLAYER_PROFILE_BADGES_INSERT:
 	Logic: PlayerProfileBadgesLogic
--- a/mods/common/chrome/replaybrowser.yaml
+++ b/mods/common/chrome/replaybrowser.yaml
@@ -42,7 +42,7 @@ Background@REPLAYBROWSER_PANEL:
 							Y: 30
 							Width: PARENT_RIGHT - 85
 							Height: 25
-							Text: dropdownbutton-filters-flt-gametype
+							Text: dropdownbutton-filters-any
 						Label@FLT_DATE_DESC:
 							X: 0
 							Y: 60
@@ -55,7 +55,7 @@ Background@REPLAYBROWSER_PANEL:
 							Y: 60
 							Width: PARENT_RIGHT - 85
 							Height: 25
-							Text: dropdownbutton-filters-flt-date
+							Text: dropdownbutton-filters-any
 						Label@FLT_DURATION_DESC:
 							X: 0
 							Y: 90
@@ -68,7 +68,7 @@ Background@REPLAYBROWSER_PANEL:
 							Y: 90
 							Width: PARENT_RIGHT - 85
 							Height: 25
-							Text: dropdownbutton-filters-flt-duration
+							Text: dropdownbutton-filters-any
 						Label@FLT_MAPNAME_DESC:
 							X: 0
 							Y: 120
@@ -81,7 +81,7 @@ Background@REPLAYBROWSER_PANEL:
 							Y: 120
 							Width: PARENT_RIGHT - 85
 							Height: 25
-							Text: dropdownbutton-filters-flt-mapname
+							Text: dropdownbutton-filters-any
 						Label@FLT_PLAYER_DESC:
 							X: 0
 							Y: 150
@@ -107,7 +107,7 @@ Background@REPLAYBROWSER_PANEL:
 							Y: 180
 							Width: PARENT_RIGHT - 85
 							Height: 25
-							Text: dropdownbutton-filters-flt-outcome
+							Text: dropdownbutton-filters-any
 						Label@FLT_FACTION_DESC:
 							X: 0
 							Y: 210
@@ -120,7 +120,7 @@ Background@REPLAYBROWSER_PANEL:
 							Y: 210
 							Width: PARENT_RIGHT - 85
 							Height: 25
-							Text: dropdownbutton-filters-flt-faction
+							Text: dropdownbutton-filters-any
 						Button@FLT_RESET_BUTTON:
 							X: 85
 							Y: 250
@@ -263,7 +263,7 @@ Background@REPLAYBROWSER_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 120
 			Height: 25
-			Text: button-replaybrowser-panel-cancel
+			Text: button-back
 			Font: Bold
 			Key: escape
 		TooltipContainer@TOOLTIP_CONTAINER:
--- a/mods/common/chrome/settings-audio.yaml
+++ b/mods/common/chrome/settings-audio.yaml
@@ -94,7 +94,7 @@ Container@AUDIO_PANEL:
 								Label@MUSIC_LABEL:
 									Width: PARENT_RIGHT
 									Height: 20
-									Text: label-music-volume-container
+									Text: label-music-title-volume-container
 								ExponentialSlider@MUSIC_VOLUME:
 									Y: 25
 									Width: PARENT_RIGHT
--- a/mods/common/chrome/settings-display.yaml
+++ b/mods/common/chrome/settings-display.yaml
@@ -88,7 +88,7 @@ Container@DISPLAY_PANEL:
 								Label@BATTLEFIELD_CAMERA:
 									Width: PARENT_RIGHT
 									Height: 20
-									Text: label-battlefield-camera-dropdown-container
+									Text: label-battlefield-camera-dropdown
 								DropDownButton@BATTLEFIELD_CAMERA_DROPDOWN:
 									Y: 25
 									Width: PARENT_RIGHT
@@ -118,7 +118,7 @@ Container@DISPLAY_PANEL:
 								LabelForInput@UI_SCALE:
 									Width: PARENT_RIGHT
 									Height: 20
-									Text: label-ui-scale-dropdown-container
+									Text: label-ui-scale-dropdown
 									For: UI_SCALE_DROPDOWN
 								DropDownButton@UI_SCALE_DROPDOWN:
 									Y: 25
--- a/mods/common/chrome/settings.yaml
+++ b/mods/common/chrome/settings.yaml
@@ -16,7 +16,7 @@ Background@SETTINGS_PANEL:
 			Y: 20
 			Width: PARENT_RIGHT
 			Height: 25
-			Text: label-settings-panel-title
+			Text: button-settings-title
 			Align: Center
 			Font: Bold
 		Button@RESET_BUTTON:
@@ -32,7 +32,7 @@ Background@SETTINGS_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 160
 			Height: 25
-			Text: button-settings-panel-back
+			Text: button-back
 			Font: Bold
 		Container@SETTINGS_TAB_CONTAINER:
 			X: 20
--- a/mods/common/languages/chrome/en.ftl
+++ b/mods/common/languages/chrome/en.ftl
@@ -1,13 +1,12 @@
 ## assetbrowser.yaml
-label-assetbrowser-panel-title = Asset Browser
-label-assetbrowser-panel-source-selector-desc = Select asset source
-dropdownbutton-assetbrowser-panel-source-selector = Folders
-dropdownbutton-assetbrowser-panel-asset-types-dropdown = Asset types
-label-assetbrowser-panel-filename-desc = Filter by name
-label-assetbrowser-panel-sprite-scale = Scale:
-label-assetbrowser-panel-palette-desc = Palette:
-label-sprite-bg-error = Error displaying file. See assetbrowser.log for details.
-button-assetbrowser-panel-close = Close
+label-assetbrowser-title = Asset Browser
+label-assetbrowser-source-selector-desc = Select asset source
+dropdownbutton-assetbrowser-source-selector = Folders
+dropdownbutton-assetbrowser-asset-types-dropdown = Asset types
+label-assetbrowser-filename-desc = Filter by name
+label-assetbrowser-sprite-scale = Scale:
+label-assetbrowser-palette-desc = Palette:
+label-assetbrowser-sprite-bg-error = Error displaying file. See assetbrowser.log for details.

 ## color-picker.yaml
 button-color-chooser-random = Random
@@ -18,19 +17,13 @@ label-preset-header = Preset Colors
 label-custom-header = Custom Colors

 ## confirmation-dialogs.yaml
-button-threebutton-prompt-confirm = Confirm
-button-threebutton-prompt-other = Restart
-button-threebutton-prompt-cancel = Cancel
-button-twobutton-prompt-confirm = Confirm
-button-twobutton-prompt-cancel = Cancel
+button-prompt-confirm = Confirm
+button-prompt-other = Restart
 button-text-input-prompt-accept = OK
-button-text-input-prompt-cancel = Cancel

 ## connection.yaml
 label-connectionfailed-panel-password = Password:
-button-connectionfailed-panel-retry = Retry
 button-connectionfailed-panel-abort = Abort
-button-connectionfailed-panel-quit = Quit
 label-connecting-panel-title = Connecting
 button-connecting-panel-abort = Abort
 label-connection-switchmod-panel-title = Switch Mod
@@ -39,10 +32,9 @@ label-connection-switchmod-panel-desc2 = Switch mods and join server?
 button-connection-switchmod-panel-switch = Switch
 button-connection-switchmod-panel-abort = Abort

-## credits.yaml
-label-credits-panel-title = Credits
-button-tab-container-engine = OpenRA
-button-credits-panel-back = Close
+## credits.yaml, mainmenu.yaml
+label-openra = OpenRA
+label-credits-title = Credits

 ## editor.yaml
 label-new-map-bg-title = New Map
@@ -50,7 +42,6 @@ label-new-map-bg-tileset = Tileset:
 label-new-map-bg-width = Width:
 label-new-map-bg-height = Height:
 button-new-map-bg-create = Create
-button-new-map-bg-cancel = Cancel

 label-save-map-panel-title =
   .label = Save Map
@@ -62,15 +53,12 @@ dropdownbutton-save-map-panel-visibility-dropdown = Map Visibility
 label-save-map-panel-directory = Directory:
 label-save-map-panel-filename = Filename:
 button-save-map-panel = Save
-button-save-map-panel-back = Cancel
 label-actor-edit-panel-id = ID
 button-container-delete = Delete
-button-container-cancel = Cancel
 button-container-ok = OK
 label-tiles-bg-search = Search:
-label-tiles-bg-categories = Filter:
+label-bg-filter = Filter:
 label-actors-bg-search = Search:
-label-actors-bg-categories = Filter:
 label-actors-bg-owners = Owner:
 label-area-selection = Area Selection
 label-area-info = Area Info
@@ -80,27 +68,15 @@ label-copy-filters = Copy Filters
 label-filter-terrain = Terrain
 label-filter-resources = Resources
 label-filter-actors = Actors
-button-selection-cancel = Cancel
 label-show-tile-grid = Show Tile Grid
 label-show-buildable-area = Show Buildable Area

-button-map-editor-tab-container-select =
-   .tooltip = Select
-
-button-map-editor-tab-container-tiles =
-   .tooltip = Tiles
-
-button-map-editor-tab-container-overlays =
-   .tooltip = Overlays
-
-button-map-editor-tab-container-actors =
-   .tooltip = Actors
-
-button-map-editor-tab-container-tools =
-   .tooltip = Tools
-
-button-map-editor-tab-container-history =
-   .tooltip = History
+button-map-editor-tab-container-select-tooltip = Select
+button-map-editor-tab-container-tiles-tooltip = Tiles
+button-map-editor-tab-container-overlays-tooltip = Overlays
+button-map-editor-tab-container-actors-tooltip = Actors
+button-map-editor-tab-container-tools-tooltip = Tools
+button-map-editor-tab-container-history-tooltip = History

 button-editor-world-root-options =
   .label = Menu
@@ -129,7 +105,6 @@ button-select-categories-buttons-none = None
 label-gamesave-browser-panel-load-title = Load game
 label-gamesave-browser-panel-save-title = Save game
 label-gamesave-browser-panel-title = [CREATE NEW FILE]
-button-gamesave-browser-panel-cancel = Back
 button-gamesave-browser-panel-delete-all = Delete All
 button-gamesave-browser-panel-delete = Delete
 button-gamesave-browser-panel-rename = Rename
@@ -177,7 +152,7 @@ label-script-error-panel-descc = Please send this file to the map author so that
 ## ingame-infostats.yaml
 label-objective-mission = Mission:
 checkbox-objective-stats = Destroy all opposition!
-label-stats-name = Player
+label-stats-player = Player
 label-stats-faction = Faction
 label-stats-score = Score
 label-stats-actions = Actions
@@ -189,18 +164,15 @@ label-menu-buttons-title = Options
 label-kick-client-dialog-texta = You may also apply a temporary ban, preventing
 label-kick-client-dialog-textb = them from joining for the remainder of this game.
 checkbox-kick-client-dialog-prevent-rejoining = Temporarily Ban
-button-kick-client-dialog-ok = Kick
-button-kick-client-dialog-cancel = Cancel
+button-kick-client-dialog = Kick
 label-kick-spectators-dialog-title = Kick Spectators
 button-kick-spectators-dialog-ok = Ok
-button-kick-spectators-dialog-cancel = Cancel
 label-force-start-dialog-title = Start Game?
 label-force-start-dialog-texta = One or more players are not yet ready.
 label-force-start-dialog-textb = Are you sure that you want to force start the game?
 label-kick-warning-a = One or more clients are missing the selected
 label-kick-warning-b = map, and will be kicked from the server.
-button-force-start-dialog-ok = Start
-button-force-start-dialog-cancel = Cancel
+button-force-start-dialog-start = Start

 ## lobby-mappreview.yaml
 label-map-incompatible-status-a = This map is not compatible
@@ -217,13 +189,15 @@ label-map-update-available-a = A new version of the map
 label-map-update-available-b = was found on your computer

 ## lobby-music.yaml
-label-container-music = Music
-label-container-length = Length
-checkbox-controls-shuffle = Shuffle
-checkbox-controls-repeat = Loop
-label-controls-volume = Volume:
+label-music-controls-volume = Volume:
+
+## lobby-music.yaml, lobby.yaml, mainmenu.yaml
+label-music-title = Music

 ## lobby-music.yaml, musicplayer.yaml
+label-music-controls-length = Length
+checkbox-music-controls-shuffle = Shuffle
+checkbox-music-controls-loop = Loop
 label-container-title = Track
 label-no-music-title = Music Not Installed
 label-no-music-desca = The game music can be installed
@@ -233,30 +207,18 @@ label-no-music-descb = from the "Manage Content" menu.
 label-lobby-options-bin-title = Map Options

 ## lobby-players.yaml
-label-container-lobby-name = Name
-label-container-lobby-color = Color
-label-container-lobby-faction = Faction
-label-container-lobby-team = Team
-label-container-lobby-handicap = Handicap
-label-container-lobby-spawn = Spawn
-label-container-lobby-status = Ready
-dropdownbutton-template-editable-player-slot-options = Name
-label-template-editable-player-factionname = Faction
-dropdownbutton-template-editable-player-team-dropdown = Team
-dropdownbutton-template-editable-player-handicap-dropdown-tooltip = A handicap decreases the combat effectiveness of the player's forces
-dropdownbutton-template-editable-player-spawn-dropdown = Spawn
-label-template-noneditable-player-name = Name
-label-faction-factionname = Faction
-label-template-noneditable-player-team = Team
-dropdownbutton-template-noneditable-player-handicap-dropdown-tooltip = A handicap decreases the combat effectiveness of the player's forces
-label-template-empty-name = Name
-dropdownbutton-template-empty-slot-options = Name
-button-template-empty-join = Play in this slot
-label-template-editable-spectator = Spectator
-label-template-noneditable-spectator-name = Name
-label-template-noneditable-spectator = Spectator
-checkbox-template-new-spectator-toggle-spectators = Allow Spectators?
-button-template-new-spectator-spectate = Spectate
+label-lobby-players-name = Name
+label-lobby-players-color = Color
+label-lobby-players-faction = Faction
+label-lobby-players-team = Team
+label-lobby-players-handicap = Handicap
+label-lobby-players-spawn = Spawn
+label-lobby-players-ready = Ready
+dropdownbutton-lobby-players-handicap-tooltip = A handicap decreases the combat effectiveness of the player's forces
+button-lobby-players-join = Play in this slot
+label-lobby-players-spectator = Spectator
+checkbox-lobby-players-new-spectator-toggle = Allow Spectators?
+button-lobby-players-spectate = Spectate

 ## lobby-servers.yaml
 image-lobby-servers-bin-password-protected-tooltip = Requires Password
@@ -264,7 +226,7 @@ image-lobby-servers-bin-requires-authentication-tooltip = Requires OpenRA forum
 dropdownbutton-lobby-servers-bin-filters = Filter Games

 ## lobby-servers.yaml, multiplayer-browser.yaml
-label-container-name = Server
+label-container-server = Server
 label-container-players = Players
 label-container-location = Location
 label-container-status = Status
@@ -277,10 +239,8 @@ dropdownbutton-server-lobby-slots = Slot Admin
 button-server-lobby-reset-options = Reset Defaults
 button-skirmish-tabs-players-tab = Players
 button-skirmish-tabs-options-tab = Options
-button-skirmish-tabs-music-tab = Music
 button-multiplayer-tabs-players-tab = Players
 button-multiplayer-tabs-options-tab = Options
-button-multiplayer-tabs-music-tab = Music
 button-multiplayer-tabs-servers-tab = Servers
 button-server-lobby-changemap = Change Map

@@ -295,20 +255,18 @@ button-server-lobby-disconnect = Leave Game
 label-mainmenu-introduction-prompt-title = Establishing Battlefield Control
 label-mainmenu-introduction-prompt-desc-a = Welcome back Commander! Initialize combat parameters using the options below.
 label-mainmenu-introduction-prompt-desc-b = Additional options can be configured later from the Settings menu.
-button-mainmenu-introduction-prompt-continue = Continue
 label-mainmenu-system-info-prompt-title = Establishing Battlefield Control
 label-mainmenu-system-info-prompt-text-a = We would like to collect some system details that will help us optimize OpenRA.
 label-mainmenu-system-info-prompt-text-b = With your permission, the following anonymous data will be sent each game launch:
 checkbox-mainmenu-system-info-prompt-sysinfo = Send System Information
-button-mainmenu-system-info-prompt-continue = Continue

 ## mainmenu-prompts.yaml, settings-display.yaml
 label-profile-section-header = Profile
 label-player-container = Player Name:
 label-playercolor-container-color = Preferred Color:
 label-display-section-header = Display
-label-battlefield-camera-dropdown-container = Battlefield Camera:
-label-ui-scale-dropdown-container = UI Scale:
+label-battlefield-camera-dropdown = Battlefield Camera:
+label-ui-scale-dropdown = UI Scale:
 checkbox-cursordouble-container = Increase Cursor Size

 ## mainmenu-prompts.yaml, settings-input.yaml
@@ -335,33 +293,29 @@ label-mouse-control-desc-modern-edgescroll = or by moving the cursor to the edge
 checkbox-edgescroll-container = Screen Edge Panning

 ## mainmenu.yaml
-label-main-menu-mainmenu-title = OpenRA
-button-main-menu-singleplayer = Singleplayer
-button-main-menu-multiplayer = Multiplayer
-button-main-menu-settings = Settings
-button-main-menu-extras = Extras
+label-singleplayer-title = Singleplayer
+button-extras-title = Extras
 button-main-menu-content = Manage Content
-button-main-menu-quit = Quit
-label-singleplayer-menu-title = Singleplayer
 button-singleplayer-menu-skirmish = Skirmish
-button-singleplayer-menu-missions = Missions
 button-singleplayer-menu-load = Load
-button-singleplayer-menu-back = Back
-label-extras-menu-title = Extras
 button-extras-menu-replays = Replays
-button-extras-menu-music = Music
-button-extras-menu-map-editor = Map Editor
+label-map-editor-title = Map Editor
 button-extras-menu-assetbrowser = Asset Browser
-button-extras-menu-credits = Credits
-button-extras-menu-back = Back
-label-map-editor-menu-title = Map Editor
-button-map-editor-menu-new = New Map
-button-map-editor-menu-load = Load Map
-button-map-editor-menu-back = Back
+button-map-editor-new-map = New Map
+button-map-editor-load-map = Load Map
 dropdownbutton-news-bg-button = Battlefield News
 label-update-notice-a = You are running an outdated version of OpenRA.
 label-update-notice-b = Download the latest version from www.openra.net

+## mainmenu.yaml, missionbrowser.yaml
+label-missions-title = Missions
+
+## mainmenu.yaml, multiplayer-browser.yaml
+label-multiplayer-title = Multiplayer
+
+## mainmenu.yaml, settings.yaml
+button-settings-title = Settings
+
 ## map-chooser.yaml
 label-mapchooser-panel-title = Choose Map
 button-mapchooser-panel-system-maps-tab = Official Maps
@@ -374,28 +328,23 @@ button-mapchooser-panel-randommap = Random Map
 button-mapchooser-panel-delete-map = Delete Map
 button-mapchooser-panel-delete-all-maps = Delete All Maps
 button-mapchooser-panel-ok = Ok
-button-mapchooser-panel-cancel = Back

 ## missionbrowser.yaml
-label-missionbrowser-panel-title = Missions
 button-missionbrowser-panel-start-briefing-video = Watch Briefing
 button-missionbrowser-panel-stop-briefing-video = Stop Briefing
 button-missionbrowser-panel-start-info-video = Watch Info Video
 button-missionbrowser-panel-stop-info-video = Stop Info Video
-button-missionbrowser-panel-startgame = Play
-button-missionbrowser-panel-back = Back
+button-missionbrowser-panel-play = Play
 button-missionbrowser-panel-mission-info = Mission Info
 button-missionbrowser-panel-mission-options = Options

 ## multiplayer-browser.yaml
-label-multiplayer-panel-title = Multiplayer
 image-multiplayer-panel-password-protected-tooltip = Requires Password
 image-multiplayer-panel-requires-authentication-tooltip = Requires OpenRA forum account
 button-selected-server-join = Join
 dropdownbutton-multiplayer-panel-filters = Filter Games
 button-multiplayer-panel-directconnect = Direct IP
 button-multiplayer-panel-create = Create
-button-multiplayer-panel-back = Back

 ## multiplayer-browserpanels.yaml
 checkbox-multiplayer-filter-panel-waiting-for-players = Waiting
@@ -425,24 +374,16 @@ label-notices-upnp-advertising = - Game will be advertised to the Local Area Net
 label-notices-upnp-firewall = - You must manually configure your firewall to allow connections.
 label-notices-upnp-portforward-a = - Game will automatically configure port forwarding.
 label-notices-upnp-settings-a = - You can disable UPnP/NAT-PMP in the settings menu.
-button-multiplayer-createserver-panel-map = Change Map
-button-multiplayer-createserver-panel-back = Back
+button-multiplayer-createserver-panel-change-map = Change Map
 button-multiplayer-createserver-panel-create = Create

 ## multiplayer-directconnect.yaml
 label-directconnect-panel-title = Connect to Server
 label-directconnect-panel-address = Server Address:
 button-directconnect-panel-join = Join
-button-directconnect-panel-back = Cancel
-
-## musicplayer.yaml
-label-container-type = Length
-checkbox-music-panel-shuffle = Shuffle
-checkbox-music-panel-repeat = Loop
-button-music-panel-back = Close

 ## playerprofile.yaml
-button-profile-header-destroy-key = Logout
+button-profile-header-logout = Logout
 label-generate-keys-desc-a = Connect to a forum account to identify
 label-generate-keys-desc-b = yourself to other players, join private
 label-generate-keys-desc-c = servers, and display badges.
@@ -452,34 +393,25 @@ label-generating-keys-desc-b = This will take several seconds...
 label-register-fingerprint-desc-a = An authentication key has been copied to your
 label-register-fingerprint-desc-b = clipboard. Add this to your User Control Panel
 label-register-fingerprint-desc-c = on the OpenRA forum then press Continue.
-button-register-fingerprint-delete-key = Cancel
-button-register-fingerprint-check-key = Continue
 label-checking-fingerprint-desc-a = Querying account details from
 label-checking-fingerprint-desc-b = the OpenRA forum...
 label-fingerprint-not-found-desc-a = Your authentication key is not connected
 label-fingerprint-not-found-desc-b = to an OpenRA forum account.
-button-fingerprint-not-found-continue = Back
 label-connection-error-desc-a = Failed to connect to the OpenRA forum.
 label-connection-error-desc-b = Please check your internet connection.
-button-connection-error-retry = Retry

 ## replaybrowser.yaml
 label-replaybrowser-panel-title = Replay Viewer
 label-filters-title = Filter
 label-filters-flt-gametype-desc = Type:
-dropdownbutton-filters-flt-gametype = Any
+dropdownbutton-filters-any = Any
 label-filters-flt-date-desc = Date:
-dropdownbutton-filters-flt-date = Any
 label-filters-flt-duration-desc = Duration:
-dropdownbutton-filters-flt-duration = Any
 label-filters-flt-mapname-desc = Map:
-dropdownbutton-filters-flt-mapname = Any
 label-filters-flt-player-desc = Player:
 dropdownbutton-filters-flt-player = Anyone
 label-filters-flt-outcome-desc = Outcome:
-dropdownbutton-filters-flt-outcome = Any
 label-filters-flt-faction-desc = Faction:
-dropdownbutton-filters-flt-faction = Any
 button-filters-flt-reset = Reset Filters
 label-management-manage-title = Manage
 button-management-mng-rensel = Rename
@@ -487,7 +419,6 @@ button-management-mng-delsel = Delete
 button-management-mng-delall = Delete All
 label-replay-list-container-replaybrowser-title = Choose Replay
 button-replaybrowser-panel-watch = Watch
-button-replaybrowser-panel-cancel = Back

 ## settings-advanced.yaml
 label-network-section-header = Advanced
@@ -519,7 +450,7 @@ checkbox-mute-background-music-container =
   .label = Mute Menu Music
   .tooltip = Mute background music when no specific track is playing

-label-music-volume-container = Music Volume:
+label-music-title-volume-container = Music Volume:
 label-audio-device-container = Audio Device:
 label-video-volume-container = Video Volume:
 label-restart-required-container-audio-desc = Device changes will be applied after the game is restarted
@@ -579,9 +510,7 @@ label-zoomspeed-slider-container-zoom-speed = Zoom Speed:
 label-ui-scrollspeed-slider-container-scroll-speed = UI Scroll Speed:

 ## settings.yaml
-label-settings-panel-title = Settings
 button-settings-panel-reset = Reset
-button-settings-panel-back = Back

 ## tooltips.yaml
 label-latency-tooltip-prefix = Latency:
--- a/mods/d2k/chrome/encyclopedia.yaml
+++ b/mods/d2k/chrome/encyclopedia.yaml
@@ -14,7 +14,7 @@ Background@ENCYCLOPEDIA_PANEL:
 				Label@ENCYCLOPEDIA_TITLE:
 					Width: PARENT_RIGHT
 					Height: 25
-					Text: label-encyclopedia-content-title
+					Text: label-mentat-title
 					Align: Center
 					Font: Bold
 				ScrollPanel@ACTOR_LIST:
--- a/mods/d2k/chrome/ingame-infostats.yaml
+++ b/mods/d2k/chrome/ingame-infostats.yaml
@@ -38,7 +38,7 @@ Container@SKIRMISH_STATS:
 					Y: 1
 					Width: 210
 					Height: 25
-					Text: label-stats-name
+					Text: label-stats-player
 					Font: Bold
 				Label@FACTION:
 					X: 230
@@ -138,7 +138,6 @@ Container@SKIRMISH_STATS:
 							Height: 25
 							Background: checkbox-toggle
 							TooltipContainer: TOOLTIP_CONTAINER
-							TooltipText: button-player-template-kick-tooltip
 							Children:
 								Image:
 									ImageCollection: lobby-bits
@@ -181,7 +180,6 @@ Container@SKIRMISH_STATS:
 							Height: 25
 							Background: checkbox-toggle
 							TooltipContainer: TOOLTIP_CONTAINER
-							TooltipText: button-spectator-template-kick-tooltip
 							Children:
 								Image:
 									ImageCollection: lobby-bits
--- a/mods/d2k/chrome/lobby-players.yaml
+++ b/mods/d2k/chrome/lobby-players.yaml
@@ -11,49 +11,49 @@ Container@LOBBY_PLAYER_BIN:
 				Label@LABEL_LOBBY_NAME:
 					Width: 180
 					Height: 25
-					Text: label-container-lobby-name
+					Text: label-lobby-players-name
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_COLOR:
 					X: 190
 					Width: 70
 					Height: 25
-					Text: label-container-lobby-color
+					Text: label-lobby-players-color
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_FACTION:
 					X: 270
 					Width: 140
 					Height: 25
-					Text: label-container-lobby-faction
+					Text: label-lobby-players-faction
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_TEAM:
 					X: 420
 					Width: 48
 					Height: 25
-					Text: label-container-lobby-team
+					Text: label-lobby-players-team
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_HANDICAP:
 					X: 478
 					Width: 72
 					Height: 25
-					Text: label-container-lobby-handicap
+					Text: label-lobby-players-handicap
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_SPAWN:
 					X: 560
 					Width: 48
 					Height: 25
-					Text: label-container-lobby-spawn
+					Text: label-lobby-players-spawn
 					Align: Center
 					Font: Bold
 				Label@LABEL_LOBBY_STATUS:
 					X: 617
 					Width: 20 + 24
 					Height: 25
-					Text: label-container-lobby-status
+					Text: label-lobby-players-ready
 					Align: Left
 					Font: Bold
 		ScrollPanel@LOBBY_PLAYERS:
@@ -109,7 +109,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 15
 							Width: 165
 							Height: 25
-							Text: dropdownbutton-template-editable-player-slot-options
+							Text: label-lobby-players-name
 							Font: Regular
 							Visible: false
 						DropDownButton@COLOR:
@@ -140,23 +140,23 @@ Container@LOBBY_PLAYER_BIN:
 									X: 34
 									Width: 80
 									Height: 25
-									Text: label-template-editable-player-factionname
+									Text: label-lobby-players-faction
 						DropDownButton@TEAM_DROPDOWN:
 							X: 420
 							Width: 48
 							Height: 25
-							Text: dropdownbutton-template-editable-player-team-dropdown
+							Text: label-lobby-players-team
 						DropDownButton@HANDICAP_DROPDOWN:
 							X: 478
 							Width: 72
 							Height: 25
 							TooltipContainer: TOOLTIP_CONTAINER
-							TooltipText: dropdownbutton-template-editable-player-handicap-dropdown-tooltip
+							TooltipText: dropdownbutton-lobby-players-handicap-tooltip
 						DropDownButton@SPAWN_DROPDOWN:
 							X: 560
 							Width: 48
 							Height: 25
-							Text: dropdownbutton-template-editable-player-spawn-dropdown
+							Text: label-lobby-players-spawn
 						Checkbox@STATUS_CHECKBOX:
 							X: 617
 							Y: 2
@@ -209,7 +209,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 39
 							Width: 146
 							Height: 25
-							Text: label-template-noneditable-player-name
+							Text: label-lobby-players-name
 						DropDownButton@PLAYER_ACTION:
 							X: 15
 							Width: 165
@@ -250,13 +250,13 @@ Container@LOBBY_PLAYER_BIN:
 									X: 34
 									Width: 80
 									Height: 25
-									Text: label-faction-factionname
+									Text: label-lobby-players-faction
 						Label@TEAM:
 							X: 420
 							Width: 42
 							Height: 25
 							Align: Center
-							Text: label-template-noneditable-player-team
+							Text: label-lobby-players-team
 						DropDownButton@TEAM_DROPDOWN:
 							X: 420
 							Width: 48
@@ -272,7 +272,7 @@ Container@LOBBY_PLAYER_BIN:
 							Width: 72
 							Height: 25
 							TooltipContainer: TOOLTIP_CONTAINER
-							TooltipText: dropdownbutton-template-noneditable-player-handicap-dropdown-tooltip
+							TooltipText: dropdownbutton-lobby-players-handicap-tooltip
 						Label@SPAWN:
 							X: 560
 							Width: 23
@@ -301,18 +301,18 @@ Container@LOBBY_PLAYER_BIN:
 							X: 20
 							Width: 165
 							Height: 25
-							Text: label-template-empty-name
+							Text: label-lobby-players-name
 						DropDownButton@SLOT_OPTIONS:
 							X: 15
 							Width: 165
 							Height: 25
-							Text: dropdownbutton-template-empty-slot-options
+							Text: label-lobby-players-name
 							Visible: false
 						Button@JOIN:
 							X: 190
 							Width: 418
 							Height: 25
-							Text: button-template-empty-join
+							Text: button-lobby-players-join
 				Container@TEMPLATE_EDITABLE_SPECTATOR:
 					X: 5
 					Width: 475
@@ -359,7 +359,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 190
 							Width: 418
 							Height: 25
-							Text: label-template-editable-spectator
+							Text: label-lobby-players-spectator
 							Align: Center
 							Font: Bold
 						Checkbox@STATUS_CHECKBOX:
@@ -414,7 +414,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 39
 							Width: 160
 							Height: 25
-							Text: label-template-noneditable-spectator-name
+							Text: label-lobby-players-name
 						DropDownButton@PLAYER_ACTION:
 							X: 15
 							Width: 165
@@ -440,7 +440,7 @@ Container@LOBBY_PLAYER_BIN:
 							X: 190
 							Width: 418
 							Height: 25
-							Text: label-template-noneditable-spectator
+							Text: label-lobby-players-spectator
 							Align: Center
 							Font: Bold
 						Image@STATUS_IMAGE:
@@ -461,13 +461,13 @@ Container@LOBBY_PLAYER_BIN:
 							X: 15
 							Width: 165
 							Height: 20
-							Text: checkbox-template-new-spectator-toggle-spectators
+							Text: checkbox-lobby-players-new-spectator-toggle
 							Font: Regular
 						Button@SPECTATE:
 							X: 190
 							Width: 418
 							Height: 25
-							Text: button-template-new-spectator-spectate
+							Text: button-lobby-players-spectate
 							Font: Regular

 ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
--- a/mods/d2k/chrome/mainmenu.yaml
+++ b/mods/d2k/chrome/mainmenu.yaml
@@ -30,7 +30,7 @@ Container@MAINMENU:
 							Y: 21
 							Width: 200
 							Height: 30
-							Text: label-main-menu-mainmenu-title
+							Text: label-openra
 							Align: Center
 							Font: Bold
 						Button@SINGLEPLAYER_BUTTON:
@@ -38,28 +38,28 @@ Container@MAINMENU:
 							Y: 60
 							Width: 140
 							Height: 30
-							Text: button-main-menu-singleplayer
+							Text: label-singleplayer-title
 							Font: Bold
 						Button@MULTIPLAYER_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
 							Y: 100
 							Width: 140
 							Height: 30
-							Text: button-main-menu-multiplayer
+							Text: label-multiplayer-title
 							Font: Bold
 						Button@SETTINGS_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
 							Y: 140
 							Width: 140
 							Height: 30
-							Text: button-main-menu-settings
+							Text: button-settings-title
 							Font: Bold
 						Button@EXTRAS_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
 							Y: 180
 							Width: 140
 							Height: 30
-							Text: button-main-menu-extras
+							Text: button-extras-title
 							Font: Bold
 						Button@CONTENT_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -73,7 +73,7 @@ Container@MAINMENU:
 							Y: 260
 							Width: 140
 							Height: 30
-							Text: button-main-menu-quit
+							Text: button-quit
 							Font: Bold
 				Background@SINGLEPLAYER_MENU:
 					Width: PARENT_RIGHT
@@ -84,7 +84,7 @@ Container@MAINMENU:
 							Y: 21
 							Width: 200
 							Height: 30
-							Text: label-singleplayer-menu-title
+							Text: label-singleplayer-title
 							Align: Center
 							Font: Bold
 						Button@SKIRMISH_BUTTON:
@@ -99,7 +99,7 @@ Container@MAINMENU:
 							Y: 100
 							Width: 140
 							Height: 30
-							Text: button-singleplayer-menu-missions
+							Text: label-missions-title
 							Font: Bold
 						Button@LOAD_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -113,7 +113,7 @@ Container@MAINMENU:
 							Y: 180
 							Width: 140
 							Height: 30
-							Text: button-singleplayer-menu-encyclopedia
+							Text: label-mentat-title
 							Font: Bold
 						Button@BACK_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -121,7 +121,7 @@ Container@MAINMENU:
 							Y: 260
 							Width: 140
 							Height: 30
-							Text: button-singleplayer-menu-back
+							Text: button-back
 							Font: Bold
 				Background@EXTRAS_MENU:
 					Width: PARENT_RIGHT
@@ -132,7 +132,7 @@ Container@MAINMENU:
 							Y: 21
 							Width: 200
 							Height: 30
-							Text: label-extras-menu-title
+							Text: button-extras-title
 							Align: Center
 							Font: Bold
 						Button@REPLAYS_BUTTON:
@@ -147,14 +147,14 @@ Container@MAINMENU:
 							Y: 100
 							Width: 140
 							Height: 30
-							Text: button-extras-menu-music
+							Text: label-music-title
 							Font: Bold
 						Button@MAP_EDITOR_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
 							Y: 140
 							Width: 140
 							Height: 30
-							Text: button-extras-menu-map-editor
+							Text: label-map-editor-title
 							Font: Bold
 						Button@ASSETBROWSER_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -168,7 +168,7 @@ Container@MAINMENU:
 							Y: 220
 							Width: 140
 							Height: 30
-							Text: button-extras-menu-credits
+							Text: label-credits-title
 							Font: Bold
 						Button@BACK_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -176,7 +176,7 @@ Container@MAINMENU:
 							Y: 260
 							Width: 140
 							Height: 30
-							Text: button-extras-menu-back
+							Text: button-back
 							Font: Bold
 				Background@MAP_EDITOR_MENU:
 					Width: PARENT_RIGHT
@@ -187,7 +187,7 @@ Container@MAINMENU:
 							Y: 21
 							Width: 200
 							Height: 30
-							Text: label-map-editor-menu-title
+							Text: label-map-editor-title
 							Align: Center
 							Font: Bold
 						Button@NEW_MAP_BUTTON:
@@ -195,14 +195,14 @@ Container@MAINMENU:
 							Y: 60
 							Width: 140
 							Height: 30
-							Text: button-map-editor-menu-new
+							Text: button-map-editor-new-map
 							Font: Bold
 						Button@LOAD_MAP_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
 							Y: 100
 							Width: 140
 							Height: 30
-							Text: button-map-editor-menu-load
+							Text: button-map-editor-load-map
 							Font: Bold
 						Button@BACK_BUTTON:
 							X: PARENT_RIGHT / 2 - WIDTH / 2
@@ -210,7 +210,7 @@ Container@MAINMENU:
 							Y: 260
 							Width: 140
 							Height: 30
-							Text: button-map-editor-menu-back
+							Text: button-back
 							Font: Bold
 		Background@NEWS_BG:
 			X: (WINDOW_RIGHT - WIDTH) / 2
--- a/mods/d2k/chrome/missionbrowser.yaml
+++ b/mods/d2k/chrome/missionbrowser.yaml
@@ -9,7 +9,7 @@ Background@MISSIONBROWSER_PANEL:
 			Y: 20
 			Width: PARENT_RIGHT
 			Height: 25
-			Text: label-missionbrowser-panel-title
+			Text: label-missions-title
 			Align: Center
 			Font: Bold
 		ScrollPanel@MISSION_LIST:
@@ -177,14 +177,14 @@ Background@MISSIONBROWSER_PANEL:
 			Y: PARENT_BOTTOM - 45
 			Width: 120
 			Height: 25
-			Text: button-missionbrowser-panel-startgame
+			Text: button-missionbrowser-panel-play
 			Font: Bold
 		Button@BACK_BUTTON:
 			X: PARENT_RIGHT - 140
 			Y: PARENT_BOTTOM - 45
 			Width: 120
 			Height: 25
-			Text: button-missionbrowser-panel-back
+			Text: button-back
 			Font: Bold
 			Key: escape
 		Background@MISSION_BIN:
--- a/mods/d2k/languages/chrome/en.ftl
+++ b/mods/d2k/languages/chrome/en.ftl
@@ -1,16 +1,8 @@
 ## encyclopedia.yaml
-label-encyclopedia-content-title = Mentat
 button-encyclopedia-panel-back = Back

-## ingame-infostats.yaml
-label-objective-mission = Mission:
-checkbox-objective-stats = Destroy all opposition!
-label-stats-name = Player
-label-stats-faction = Faction
-label-stats-score = Score
-label-stats-actions = Actions
-button-player-template-kick-tooltip = Kick this player
-button-spectator-template-kick-tooltip = Kick this player
+## encyclopedia.yaml, mainmenu.yaml
+label-mentat-title = Mentat

 ## ingame-menu.yaml
 label-menu-buttons-title = Options
@@ -187,80 +179,3 @@ button-production-types-starport-tooltip = Starport
 button-production-types-upgrade-tooltip = Upgrades
 button-production-types-scroll-up-tooltip = Scroll up
 button-production-types-scroll-down-tooltip = Scroll down
-
-## lobby-players.yaml
-label-container-lobby-name = Name
-label-container-lobby-color = Color
-label-container-lobby-faction = Faction
-label-container-lobby-team = Team
-label-container-lobby-handicap = Handicap
-label-container-lobby-spawn = Spawn
-label-container-lobby-status = Ready
-dropdownbutton-template-editable-player-slot-options = Name
-label-template-editable-player-factionname = Faction
-dropdownbutton-template-editable-player-team-dropdown = Team
-dropdownbutton-template-editable-player-handicap-dropdown-tooltip = A handicap decreases the combat effectiveness of the player's forces
-dropdownbutton-template-editable-player-spawn-dropdown = Spawn
-label-template-noneditable-player-name = Name
-label-faction-factionname = Faction
-label-template-noneditable-player-team = Team
-dropdownbutton-template-noneditable-player-handicap-dropdown-tooltip = A handicap decreases the combat effectiveness of the player's forces
-label-template-empty-name = Name
-dropdownbutton-template-empty-slot-options = Name
-button-template-empty-join = Play in this slot
-label-template-editable-spectator = Spectator
-label-template-noneditable-spectator-name = Name
-label-template-noneditable-spectator = Spectator
-checkbox-template-new-spectator-toggle-spectators = Allow Spectators?
-button-template-new-spectator-spectate = Spectate
-
-## mainmenu.yaml
-label-main-menu-mainmenu-title = OpenRA
-button-main-menu-singleplayer = Singleplayer
-button-main-menu-multiplayer = Multiplayer
-button-main-menu-settings = Settings
-button-main-menu-extras = Extras
-button-main-menu-content = Manage Content
-button-main-menu-quit = Quit
-label-singleplayer-menu-title = Singleplayer
-button-singleplayer-menu-skirmish = Skirmish
-button-singleplayer-menu-missions = Missions
-button-singleplayer-menu-load = Load
-button-singleplayer-menu-encyclopedia = Mentat
-button-singleplayer-menu-back = Back
-label-extras-menu-title = Extras
-button-extras-menu-replays = Replays
-button-extras-menu-music = Music
-button-extras-menu-map-editor = Map Editor
-button-extras-menu-assetbrowser = Asset Browser
-button-extras-menu-credits = Credits
-button-extras-menu-back = Back
-label-map-editor-menu-title = Map Editor
-button-map-editor-menu-new = New Map
-button-map-editor-menu-load = Load Map
-button-map-editor-menu-back = Back
-dropdownbutton-news-bg-button = Battlefield News
-label-update-notice-a = You are running an outdated version of OpenRA.
-label-update-notice-b = Download the latest version from www.openra.net
-
-## missionbrowser.yaml
-label-missionbrowser-panel-title = Missions
-button-missionbrowser-panel-start-briefing-video = Watch Briefing
-button-missionbrowser-panel-stop-briefing-video = Stop Briefing
-button-missionbrowser-panel-start-info-video = Watch Info Video
-button-missionbrowser-panel-stop-info-video = Stop Info Video
-button-missionbrowser-panel-startgame = Play
-button-missionbrowser-panel-back = Back
-
-## multiplayer-browserpanels.yaml
-checkbox-multiplayer-filter-panel-waiting-for-players = Waiting
-checkbox-multiplayer-filter-panel-empty = Empty
-checkbox-multiplayer-filter-panel-password-protected = Protected
-checkbox-multiplayer-filter-panel-already-started = Started
-checkbox-multiplayer-filter-panel-incompatible-version = Incompatible
-
-## tooltips.yaml
-label-latency-tooltip-prefix = Latency:
-label-anonymous-player-tooltip-name = Anonymous Player
-label-game-admin = Game Admin
-
--- a/mods/ts/chrome/assetbrowser.yaml
+++ b/mods/ts/chrome/assetbrowser.yaml
@@ -12,7 +12,7 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: Bold
 			Align: Center
-			Text: label-assetbrowser-panel-title
+			Text: label-assetbrowser-title
 		Label@SOURCE_SELECTOR_DESC:
 			X: 20
 			Y: 36
@@ -20,21 +20,21 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: TinyBold
 			Align: Center
-			Text: label-assetbrowser-panel-source-selector-desc
+			Text: label-assetbrowser-source-selector-desc
 		DropDownButton@SOURCE_SELECTOR:
 			X: 20
 			Y: 60
 			Width: 195
 			Height: 25
 			Font: Bold
-			Text: dropdownbutton-assetbrowser-panel-source-selector
+			Text: dropdownbutton-assetbrowser-source-selector
 		DropDownButton@ASSET_TYPES_DROPDOWN:
 			X: 20
 			Y: 90
 			Width: 195
 			Height: 25
 			Font: Bold
-			Text: dropdownbutton-assetbrowser-panel-asset-types-dropdown
+			Text: dropdownbutton-assetbrowser-asset-types-dropdown
 		Label@FILENAME_DESC:
 			X: 20
 			Y: 115
@@ -42,7 +42,7 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: TinyBold
 			Align: Center
-			Text: label-assetbrowser-panel-filename-desc
+			Text: label-assetbrowser-filename-desc
 		TextField@FILENAME_INPUT:
 			X: 20
 			Y: 140
@@ -76,7 +76,7 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: Bold
 			Align: Left
-			Text: label-assetbrowser-panel-sprite-scale
+			Text: label-assetbrowser-sprite-scale
 		Slider@SPRITE_SCALE_SLIDER:
 			X: PARENT_RIGHT - WIDTH - 330
 			Y: 62
@@ -91,7 +91,7 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: Bold
 			Align: Left
-			Text: label-assetbrowser-panel-model-scale
+			Text: label-assetbrowser-model-scale
 		Slider@MODEL_SCALE_SLIDER:
 			X: PARENT_RIGHT - WIDTH - 330
 			Y: 62
@@ -106,7 +106,7 @@ Background@ASSETBROWSER_PANEL:
 			Height: 25
 			Font: Bold
 			Align: Right
-			Text: label-assetbrowser-panel-palette-desc
+			Text: label-assetbrowser-palette-desc
 		DropDownButton@PALETTE_SELECTOR:
 			X: PARENT_RIGHT - WIDTH - 110
 			Y: 60
@@ -150,7 +150,7 @@ Background@ASSETBROWSER_PANEL:
 					Height: PARENT_BOTTOM
 					Align: Center
 					Visible: false
-					Text: label-sprite-bg-error
+					Text: label-assetbrowser-sprite-bg-error
 		Container@FRAME_SELECTOR:
 			X: 226
 			Y: PARENT_BOTTOM - 75
@@ -279,7 +279,7 @@ Background@ASSETBROWSER_PANEL:
 			Width: 160
 			Height: 25
 			Font: Bold
-			Text: button-assetbrowser-panel-close
+			Text: button-back
 		TooltipContainer@TOOLTIP_CONTAINER:

 ScrollPanel@ASSET_TYPES_PANEL:
--- a/mods/ts/languages/chrome/en.ftl
+++ b/mods/ts/languages/chrome/en.ftl
@@ -1,47 +1,11 @@
 ## assetbrowser.yaml
-label-assetbrowser-panel-title = Asset Browser
-label-assetbrowser-panel-source-selector-desc = Select asset source
-dropdownbutton-assetbrowser-panel-source-selector = Folders
-dropdownbutton-assetbrowser-panel-asset-types-dropdown = Asset types
-label-assetbrowser-panel-filename-desc = Filter by name
-label-assetbrowser-panel-sprite-scale = Scale:
-label-assetbrowser-panel-model-scale = Scale:
-label-assetbrowser-panel-palette-desc = Palette:
-label-sprite-bg-error = Error displaying file. See assetbrowser.log for details.
+label-assetbrowser-model-scale = Scale:
 label-voxel-selector-roll = Roll
 label-voxel-selector-pitch = Pitch
 label-voxel-selector-yaw = Yaw
-button-assetbrowser-panel-close = Close
-
-## color-picker.yaml
-button-color-chooser-random = Random
-button-color-chooser-store = Store
-button-color-chooser-mixer-tab = Mixer
-button-color-chooser-palette-tab = Palette
-label-preset-header = Preset Colors
-label-custom-header = Custom Colors

 ## ingame-debug.yaml
-label-debug-panel-title = Debug Options
-checkbox-debug-panel-instant-build = Instant Build Speed
-checkbox-debug-panel-enable-tech = Build Everything
-checkbox-debug-panel-build-anywhere = Build Anywhere
-checkbox-debug-panel-unlimited-power = Unlimited Power
-checkbox-debug-panel-instant-charge = Instant Charge Time
-checkbox-debug-panel-disable-visibility-checks = Disable Visibility Checks
-button-debug-panel-give-cash = Give $20,000
-button-debug-panel-grow-resources = Grow Resources
-button-debug-panel-give-exploration = Clear Shroud
-button-debug-panel-reset-exploration = Reset Shroud
-label-debug-panel-visualizations-title = Visualizations
-checkbox-debug-panel-show-unit-paths = Show Unit Paths
-checkbox-debug-panel-show-customterrain-overlay = Show Custom Terrain
-checkbox-debug-panel-show-actor-tags = Show Actor Tags
 checkbox-debug-panel-show-depth-preview = Show Depth Data
-checkbox-debug-panel-show-combatoverlay = Show Combat Geometry
-checkbox-debug-panel-show-geometry = Show Render Geometry
-checkbox-debug-panel-show-terrain-overlay = Show Terrain Geometry
-checkbox-debug-panel-show-screenmap = Show Screen Map

 ## ingame-observer.yaml
 button-observer-widgets-options = Options (Esc)
@@ -226,19 +190,3 @@ label-mainmenu-prerelease-notification-prompt-text-b = for the community to foll
 label-mainmenu-prerelease-notification-prompt-text-c = Many features are missing or incomplete, performance has not been
 label-mainmenu-prerelease-notification-prompt-text-d = optimized, and balance will not be addressed until a future beta.
 button-mainmenu-prerelease-notification-continue = I Understand
-
-## settings-hotkeys.yaml
-label-hotkeys-panel-filter-input = Filter by name:
-label-hotkeys-panel-context-dropdown = Context:
-label-hotkey-empty-list-message = No hotkeys match the filter criteria.
-label-notices-readonly-notice = This hotkey cannot be modified
-button-hotkey-remap-dialog-override = Override
-
-button-hotkey-remap-dialog-clear =
-   .label = Clear
-   .tooltip = Unbind the hotkey
-
-button-hotkey-remap-dialog-reset =
-   .label = Reset
-   .tooltip = Reset to default
-