diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml index e1aadcce68..8e5f860de2 100644 --- a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml +++ b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.xml @@ -45,7 +45,7 @@ 3 100%-33 103 100%-3 - + Continue var joinPlayerName = Engine.GetGUIObjectByName("joinPlayerName").caption; @@ -91,7 +91,7 @@ - + Continue var hostPlayerName = Engine.GetGUIObjectByName("hostPlayerName").caption; @@ -105,7 +105,7 @@ - + Cancel cancelSetup(); diff --git a/binaries/data/mods/public/gui/locale/locale.xml b/binaries/data/mods/public/gui/locale/locale.xml index 75bae856a7..3e73043c90 100644 --- a/binaries/data/mods/public/gui/locale/locale.xml +++ b/binaries/data/mods/public/gui/locale/locale.xml @@ -33,8 +33,8 @@ - Accept - applySelectedLocale(); + Cancel + cancelSetup(); @@ -43,8 +43,8 @@ - Cancel - cancelSetup(); + Accept + applySelectedLocale(); diff --git a/binaries/data/mods/public/gui/locale/locale_advanced.xml b/binaries/data/mods/public/gui/locale/locale_advanced.xml index 6c0d7d025c..b42d0529ad 100644 --- a/binaries/data/mods/public/gui/locale/locale_advanced.xml +++ b/binaries/data/mods/public/gui/locale/locale_advanced.xml @@ -62,8 +62,8 @@ - Accept - applySelectedLocale(); + Cancel + cancelSetup(); @@ -72,8 +72,8 @@ - Cancel - cancelSetup(); + Accept + applySelectedLocale(); diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.js b/binaries/data/mods/public/gui/pregame/mainmenu.js index 3693cf21f0..3167cf56a6 100644 --- a/binaries/data/mods/public/gui/pregame/mainmenu.js +++ b/binaries/data/mods/public/gui/pregame/mainmenu.js @@ -305,8 +305,8 @@ function getBuildString() function exitGamePressed() { closeMenu(); - var btCaptions = [translate("Yes"), translate("No")]; - var btCode = [Engine.Exit, null]; + var btCaptions = [translate("No"), translate("Yes")]; + var btCode = [null, Engine.Exit]; messageBox(400, 200, translate("Are you sure you want to quit 0 A.D.?"), translate("Confirmation"), 0, btCaptions, btCode); } diff --git a/binaries/data/mods/public/gui/savedgames/load.xml b/binaries/data/mods/public/gui/savedgames/load.xml index 28c82af969..64f39c960a 100644 --- a/binaries/data/mods/public/gui/savedgames/load.xml +++ b/binaries/data/mods/public/gui/savedgames/load.xml @@ -22,8 +22,8 @@ - Load - loadGame(); + Cancel + Engine.PopGuiPage(); @@ -32,8 +32,8 @@ - Cancel - Engine.PopGuiPage(); + Load + loadGame(); diff --git a/binaries/data/mods/public/gui/savedgames/save.xml b/binaries/data/mods/public/gui/savedgames/save.xml index cc818ad274..d6e7da719e 100644 --- a/binaries/data/mods/public/gui/savedgames/save.xml +++ b/binaries/data/mods/public/gui/savedgames/save.xml @@ -34,8 +34,8 @@ - Save - saveGame(); + Cancel + closeSave(true); @@ -44,8 +44,8 @@ - Cancel - closeSave(true); + Save + saveGame(); diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml index ab43772b9e..0790330100 100644 --- a/binaries/data/mods/public/gui/session/session.xml +++ b/binaries/data/mods/public/gui/session/session.xml @@ -399,13 +399,13 @@ - Send - submitChatInput(); + Cancel + closeChat(); - Cancel - closeChat(); + Send + submitChatInput();