Merge branch 'develop' into issue-3833-bad-function-name

RPTools · Apr 12, 2023 · da4258f · da4258f
2 parents db143a3 + 3dbb1fb
commit da4258f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
@@ -1721,6 +1721,7 @@ public void showFullScreenTools() {
         });
 
     initiativeButton.setBorder(btn.getBorder());
+    initiativeButton.setToolTipText(I18N.getText("tools.initiative.tooltip"));
     fullScreenToolPanel.add(initiativeButton);
 
     // set buttons to uniform size

diff --git a/src/main/resources/net/rptools/maptool/language/i18n.properties b/src/main/resources/net/rptools/maptool/language/i18n.properties
@@ -1583,6 +1583,7 @@ initiative.menu.remove          = Remove
 initiative.menu.resume          = Resume
 initiative.menu.setState        = Set Initiative...
 
+
 layer.token      = Token
 layer.gm         = Hidden
 layer.object     = Object
@@ -2496,6 +2497,7 @@ tools.token.fow.npc.tooltip = Show FoW for NPC Tokens you explicitly own or are
 tools.token.fow.pc.tooltip  = Show FoW for PC Tokens you explicitly own or are owned by all.
 tools.topo.tooltip          = Vision Blocking Layer (VBL) Tools
 tools.zoneselector.tooltip  = Select Map
+tools.initiative.tooltip    = Initiative Tools
 
 undefinedmacro.unknownCommand = Unknown command: "{0}".  Try <b>/help</b> for a list of commands.