Skip to content

Commit

Permalink
Merge pull request DFHack#1052 from Bumber64/Bumber64-patch-1
Browse files Browse the repository at this point in the history
Fix "seize" typo in confirm, focus_string in gui/teleport
  • Loading branch information
myk002 authored Mar 20, 2024
2 parents a0c66cb + e480e07 commit f3caae6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gui/teleport.lua
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ end

TeleportScreen = defclass(TeleportScreen, gui.ZScreen)
TeleportScreen.ATTRS {
focus_path='autodump',
focus_path='teleport',
pass_movement_keys=true,
pass_mouse_clicks=false,
force_pause=true,
Expand Down
6 changes: 3 additions & 3 deletions internal/confirm/specs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ ConfirmSpec{
}

ConfirmSpec{
id='trade-sieze',
title='Sieze merchant goods',
message='Are you sure you want size marked merchant goods? This will make the merchant unwilling to trade further and will damage relations with the merchant\'s civilization.',
id='trade-seize',
title='Seize merchant goods',
message='Are you sure you want seize marked merchant goods? This will make the merchant unwilling to trade further and will damage relations with the merchant\'s civilization.',
intercept_keys='_MOUSE_L',
intercept_frame={l=0, r=73, b=4, w=11, h=3},
context='dwarfmode/Trade',
Expand Down

0 comments on commit f3caae6

Please sign in to comment.