Move command friendly names to the strings file

Related to #124

data/gui.xml

@@ -454,6 +454,12 @@
         <param name="format" value="indexed" />
         <param name="dithering" value="old-ordered" />
       </key>
+      <key command="ChangeBrush">
+        <param name="change" value="increment-angle" />
+      </key>
+      <key command="ChangeBrush">
+        <param name="change" value="decrement-angle" />
+      </key>
     </commands>
 
     <!-- Keyboard shortcuts to select tools -->
@@ -992,19 +998,19 @@
     </menu>
 
     <menu id="ink_popup_menu">
-      <item command="SetInkType" text="@.simple_ink">
+      <item command="SetInkType" text="@inks.simple_ink">
         <param name="type" value="simple" />
       </item>
-      <item command="SetInkType" text="@.alpha_compositing">
+      <item command="SetInkType" text="@inks.alpha_compositing">
         <param name="type" value="alpha-compositing" />
       </item>
-      <item command="SetInkType" text="@.copy_color">
+      <item command="SetInkType" text="@inks.copy_color">
         <param name="type" value="copy-color" />
       </item>
-      <item command="SetInkType" text="@.lock_alpha">
+      <item command="SetInkType" text="@inks.lock_alpha">
         <param name="type" value="lock-alpha" />
       </item>
-      <item command="SetInkType" text="@.shading">
+      <item command="SetInkType" text="@inks.shading">
         <param name="type" value="shading" />
       </item>
       <separator />

data/strings/en.ini

@@ -164,10 +164,221 @@ unlink = &Unlink
 link_cels = &Link Cels
 
 [commands]
+About = About
+AddColor = Add {0} Color to Palette
+AddColor_Background = Background
+AddColor_Foreground = Foreground
+AddColor_Specific = Specific
+AdvancedMode = Advanced Mode
+AutocropSprite = Trim Sprite
+BackgroundFromLayer = Background From Layer
+BrightnessContrast = Adjust Brightness/Contrast
+Cancel = Cancel Current Operation
+CanvasSize = Canvas Size
+CelProperties = Cel Properties
+ChangeBrush = Change Brush: {0}
+ChangeBrush_CustomBrush = Custom Brush #{0}
+ChangeBrush_DecrementAngle = Decrement Angle
+ChangeBrush_DecrementSize = Decrement Size
+ChangeBrush_IncrementAngle = Increment Angle
+ChangeBrush_IncrementSize = Increment Size
+ChangeColor = Change Color: {0}
+ChangeColor_IncrementFgIndex = Increment Foreground Index
+ChangeColor_DecrementFgIndex = Decrement Foreground Index
+ChangeColor_IncrementBgIndex = Increment Background Index
+ChangeColor_DecrementBgIndex = Decrement Background Index
+ChangePixelFormat = Change Color Mode: {0}
+ChangePixelFormat_RGB = RGB
+ChangePixelFormat_Grayscale = Grayscale
+ChangePixelFormat_Indexed = Indexed
+ChangePixelFormat_Indexed_OrderedDithering = Indexed with Ordered Dithering
+ChangePixelFormat_Indexed_OldDithering = Indexed with Old Dithering
+ChangePixelFormat_Indexed = Indexed
+Clear = Clear
+ClearCel = Clear Cel
+CloseAllFiles = Close All Files
+CloseFile = Close File
+ColorCurve = Color Curve
+ColorQuantization = Create Palette from Current Sprite (Color Quantization)
+ContiguousFill = Switch Contiguous Fill
+ConvolutionMatrix = Convolution Matrix
+Copy = Copy
+CopyCel = Copy Cel
+CopyMerged = Copy Merged
+CropSprite = Crop Sprite
+Cut = Cut
+DeselectMask = Deselect Mask
+Despeckle = Despeckle
+DeveloperConsole = Developer Console
+DiscardBrush = Discard Brush
+DuplicateLayer = Duplicate Layer
+DuplicateSprite = Duplicate Sprite
+DuplicateView = Duplicate View
+Exit = Exit
+ExportSpriteSheet = Export Sprite Sheet
+Eyedropper = Eyedropper
+FitScreen = Fit on Screen
+FlattenLayers = Flatten Layers
+Flip = Flip {0} {1}
+Flip_Canvas = Canvas
+Flip_Horizontally = Horizontally
+Flip_Selection = Selection
+Flip_Vertically = Vertically
+FrameProperties = Frame Properties
+FrameTagProperties = Frame Tag Properties
+FullscreenPreview = Fullscreen Preview
+GotoFirstFrame = Go to First Frame
+GotoFrame = Go to Frame
+GotoLastFrame = Go to Last Frame
+GotoNextFrame = Go to Next Frame
+GotoNextFrameWithSameTag = Go to Next Frame with same tag
+GotoNextLayer = Go to Next Layer
+GotoNextTab = Go to Next Tab
+GotoPreviousFrame = Go to Previous Frame
+GotoPreviousFrameWithSameTag = Go to Previous Frame with same tag
+GotoPreviousLayer = Go to Previous Layer
+GotoPreviousTab = Go to Previous tab
+GridSettings = Grid Settings
+Home = Home
+HueSaturation = Adjust Hue/Saturation
+ImportSpriteSheet = Import Sprite Sheet
+InvertColor = Invert Color
+InvertMask = Invert Selection
+KeyboardShortcuts = Keyboard Shortcuts
+Launch = Launch
+LayerFromBackground = Layer From Background
+LayerLock = Lock Layers
+LayerOpacity = Set Layer Opacity to {0} ({1}%)
+LayerProperties = Layer Properties
+LayerVisibility = Layer Visibility
+LinkCels = Links Cels
+LoadMask = Load Selection
+LoadPalette = Load Palette
+MaskAll = Mask All
+MaskByColor = Mask By Color
+MaskContent = Mask Content
+MergeDownLayer = Merge Down Layer
+ModifySelection = {0} Selection {1}
+ModifySelection_Border = Border
+ModifySelection_Expand = Expand
+ModifySelection_Contract = Contract
+ModifySelection_Modify = Modify
+ModifySelection_Quantity = by {0} pixel(s)
+Move_Thing = {0} {1} {2}
+Move_Pixel = pixel(s)
+Move_TileWidth = tile(s) width
+Move_TileHeight = tile(s) height
+Move_ZoomedPixel = zoomed pixel(s)
+Move_ZoomedTileWidth = zoomed tile(s) width
+Move_ZoomedTileHeight = zoomed tile(s) height
+Move_ViewportWidth = viewport width
+Move_ViewportHeight = viewport height
+Move_Left = left
+Move_Right = right
+Move_Up = up
+Move_Down = down
+MoveCel = Move Cel
+MoveMask = Move {0} {1}
+MoveMask_Boundaries = Selection Boundaries
+MoveMask_Content = Selection Content
+NewBrush = New Brush
+NewFile = New File
+NewFrame = New Frame
+NewFrame_NewEmptyFrame = New Empty Frame
+NewFrame_DuplicateCels = Duplicate Linked Cels
+NewFrame_DuplicateCelsBlock = Duplicate Cels
+NewFrameTag = New Frame Tag
+NewLayer = New Layer
+NewSpriteFromSelection = New Sprite From Selection
+OpenBrowser = Open Browser
+OpenFile = Open Sprite
+OpenGroup = Open/Close Group
+OpenInFolder = Open In Folder
+OpenWithApp = Open With Associated Application
+Options = Preferences
+PaletteEditor = Switch{0}{1}{2}
+PaletteEditor_Edit = <<<END
+ Edit Palette Mode
+END
+PaletteEditor_And = <<<END
+ and
+END
+PaletteEditor_FgPopup = <<<END
+ Foreground Color Popup
+END
+PaletteEditor_BgPopup = <<<END
+ Background Color Popup
+END
+PaletteSize = Palette Size
+Paste = Paste
+PasteText = Insert Text
+PixelPerfectMode = Switch Pixel Perfect Mode
+PlayAnimation = Play Animation
+Redo = Redo
+Refresh = Refresh
+RemoveFrame = Remove Frame
+RemoveFrameTag = Remove Frame Tag
+RemoveLayer = Remove Layer
+RemoveSlice = Remove Slice
+RepeatLastExport = Repeat Last Export
+ReplaceColor = Replace Color
+ReselectMask = Reselect Mask
+ReverseFrames = Reverse Frames
+Rotate = Rotate {0} {1}
+Rotate_Selection = Selection
+Rotate_Sprite = Sprite
+RunScript = Run Script
+SaveFile = Save File
+SaveFileAs = Save File As
+SaveFileCopyAs = Export
+SaveMask = Save Selection
+SavePalette = Save Palette
+Scroll = Scroll {0}
+ScrollCenter = Scroll to center of canvas
+SelectTile = Select Tile
+SelectTile_Add = Select Tile (Add)
+SelectTile_Subtract = Select Tile (Subtract)
+SelectionAsGrid = Selection as Grid
+SetColorSelector = Set Color Selector
+SetColorSelector_Spectrum = Color Spectrum
+SetColorSelector_TintShadeTone = Color Tint/Shade/Tone
+SetColorSelector_RGBWheel = RGB Color Wheel
+SetColorSelector_RYBWheel = RYB Color Wheel
+SetInkType = Set Ink Type: {0}
+SetLoopSection = Set Loop Section
+SetPalette = Set Palette
+SetPaletteEntrySize = Set Palette Entry Size
+SetSameInk = Same Ink in All Tools
+ShowAutoGuides = Show Auto Guides
+ShowBrushPreview = Show Brush Preview
 ShowBrushes = Show Brushes
+ShowExtras = Show Extras
+ShowGrid = Show Grid
+ShowLayerEdges = Show Layer Edges
+ShowOnionSkin = Show Onion Skin
 ShowPaletteOptions = Show Palette Options
 ShowPalettePresets = Show Palette Presets
 ShowPaletteSortOptions = Show Palette Sort Options
+ShowPixelGrid = Show Pixel Grid
+ShowSelectionEdges = Show Selection Edges
+ShowSlices = Show Slices
+SliceProperties = Slice Properties
+SnapToGrid = Snap to Grid
+SpriteProperties = Sprite Properties
+SpriteSize = Sprite Size
+SwitchColors = Switch Colors
+SymmetryMode = Symmetry Mode
+TiledMode = Tiled Mode
+Timeline = Switch Timeline
+TogglePreview = Toggle Preview
+ToggleTimelineThumbnails = Toggle Timeline Thumbnails
+Undo = Undo
+UndoHistory = Undo History
+UnlinkCel = Unlink Cel
+Zoom = Zoom
+Zoom_In = Zoom In
+Zoom_Out = Zoom Out
+Zoom_Set = Zoom {0}%
 
 [document_tab_popup_menu]
 duplicate_view = Duplicate &View
@@ -338,12 +549,14 @@ partial_tiles = Include partial tiles at bottom/right edges
 import = &Import
 cancel = &Cancel
 
-[ink_popup_menu]
+[inks]
 simple_ink = Simple Ink
 alpha_compositing = Alpha Compositing
 copy_color = Copy Alpha+Color
 lock_alpha = Lock Alpha
 shading = Shading
+
+[ink_popup_menu]
 same_in_all_tools = Same in all Tools
 
 [jpeg_options]

src/app/CMakeLists.txt

@@ -364,6 +364,7 @@ add_library(app-lib
   commands/filters/filter_target_buttons.cpp
   commands/filters/filter_window.cpp
   commands/filters/filter_worker.cpp
+  commands/move_thing.cpp
   commands/quick_command.cpp
   console.cpp
   context.cpp

src/app/commands/cmd_about.cpp

@@ -29,9 +29,7 @@ protected:
 };
 
 AboutCommand::AboutCommand()
-  : Command("About",
+  : Command("About", CmdUIOnlyFlag)
-            "About",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_add_color.cpp

@@ -15,12 +15,14 @@
 #include "app/console.h"
 #include "app/context.h"
 #include "app/context_access.h"
+#include "app/i18n/strings.h"
 #include "app/modules/palettes.h"
 #include "app/transaction.h"
 #include "app/ui/color_bar.h"
 #include "app/ui/context_bar.h"
 #include "app/ui/editor/editor.h"
 #include "doc/palette.h"
+#include "fmt/format.h"
 #include "ui/manager.h"
 
 namespace app {
@@ -43,9 +45,7 @@ protected:
 };
 
 AddColorCommand::AddColorCommand()
-  : Command("AddColor",
+  : Command("AddColor", CmdUIOnlyFlag)
-            "Add Color",
-            CmdUIOnlyFlag)
   , m_source(Source::Fg)
 {
 }
@@ -121,7 +121,7 @@ void AddColorCommand::onExecute(Context* ctx)
     if (document) {
       frame_t frame = writer.frame();
 
-      Transaction transaction(writer.context(), "Add Color", ModifyDocument);
+      Transaction transaction(writer.context(), friendlyName(), ModifyDocument);
       transaction.execute(new cmd::SetPalette(sprite, frame, newPalette));
       transaction.commit();
     }
@@ -136,16 +136,13 @@ void AddColorCommand::onExecute(Context* ctx)
 
 std::string AddColorCommand::onGetFriendlyName() const
 {
-  std::string text = "Add ";
+  std::string source;
-
   switch (m_source) {
-    case Source::Fg: text += "Foreground"; break;
+    case Source::Fg: source = Strings::commands_AddColor_Foreground(); break;
-    case Source::Bg: text += "Background"; break;
+    case Source::Bg: source = Strings::commands_AddColor_Background(); break;
-    case Source::Color: text += "Specific"; break;
+    case Source::Color: source = Strings::commands_AddColor_Specific(); break;
   }
-
+  return fmt::format(getBaseFriendlyName(), source);
-  text += " Color to Palette";
-  return text;
 }
 
 Command* CommandFactory::createAddColorCommand()

src/app/commands/cmd_advanced_mode.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -33,9 +33,7 @@ protected:
 };
 
 AdvancedModeCommand::AdvancedModeCommand()
-  : Command("AdvancedMode",
+  : Command("AdvancedMode", CmdUIOnlyFlag)
-            "Advanced Mode",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_background_from_layer.cpp

@@ -12,8 +12,8 @@
 #include "app/context_access.h"
 #include "app/document_api.h"
 #include "app/modules/gui.h"
-#include "app/ui/color_bar.h"
 #include "app/transaction.h"
+#include "app/ui/color_bar.h"
 #include "doc/layer.h"
 #include "doc/sprite.h"
 
@@ -30,9 +30,7 @@ protected:
 };
 
 BackgroundFromLayerCommand::BackgroundFromLayerCommand()
-  : Command("BackgroundFromLayer",
+  : Command("BackgroundFromLayer", CmdRecordableFlag)
-            "Background From Layer",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_cancel.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015, 2017  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -38,9 +38,7 @@ private:
 };
 
 CancelCommand::CancelCommand()
-  : Command("Cancel",
+  : Command("Cancel", CmdUIOnlyFlag)
-            "Cancel Current Operation",
-            CmdUIOnlyFlag)
   , m_type(NoOp)
 {
 }

src/app/commands/cmd_canvas_size.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -281,9 +281,7 @@ protected:
 };
 
 CanvasSizeCommand::CanvasSizeCommand()
-  : Command("CanvasSize",
+  : Command("CanvasSize", CmdRecordableFlag)
-            "Canvas Size",
-            CmdRecordableFlag)
 {
   m_left = m_right = m_top = m_bottom = 0;
 }

src/app/commands/cmd_cel_properties.cpp

@@ -282,9 +282,7 @@ protected:
 };
 
 CelPropertiesCommand::CelPropertiesCommand()
-  : Command("CelProperties",
+  : Command("CelProperties", CmdUIOnlyFlag)
-            "Cel Properties",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_change_brush.cpp

@@ -14,12 +14,14 @@
 #include "app/commands/command.h"
 #include "app/commands/params.h"
 #include "app/context.h"
+#include "app/i18n/strings.h"
 #include "app/pref/preferences.h"
 #include "app/tools/active_tool.h"
 #include "app/tools/tool.h"
 #include "app/ui/context_bar.h"
 #include "base/convert_to.h"
 #include "doc/brush.h"
+#include "fmt/format.h"
 
 namespace app {
 
@@ -48,9 +50,7 @@ private:
 };
 
 ChangeBrushCommand::ChangeBrushCommand()
-  : Command("ChangeBrush",
+  : Command("ChangeBrush", CmdUIOnlyFlag)
-            "Change Brush",
-            CmdUIOnlyFlag)
 {
   m_change = None;
   m_slot = 0;
@@ -108,30 +108,18 @@ void ChangeBrushCommand::onExecute(Context* context)
 
 std::string ChangeBrushCommand::onGetFriendlyName() const
 {
-  std::string text = "Brush";
+  std::string change;
-
   switch (m_change) {
-    case None:
+    case None: break;
-      break;
+    case IncrementSize: change = Strings::commands_ChangeBrush_IncrementSize(); break;
-    case IncrementSize:
+    case DecrementSize: change = Strings::commands_ChangeBrush_DecrementSize(); break;
-      text += ": Increment Size";
+    case IncrementAngle: change = Strings::commands_ChangeBrush_IncrementAngle(); break;
-      break;
+    case DecrementAngle: change = Strings::commands_ChangeBrush_DecrementAngle(); break;
-    case DecrementSize:
-      text += ": Decrement Size";
-      break;
-    case IncrementAngle:
-      text += ": Increment Angle";
-      break;
-    case DecrementAngle:
-      text += ": Decrement Angle";
-      break;
     case CustomBrush:
-      text += ": Custom Brush #";
+      change = fmt::format(Strings::commands_ChangeBrush_CustomBrush(), m_slot);
-      text += base::convert_to<std::string>(m_slot);
       break;
   }
-
+  return fmt::format(getBaseFriendlyName(), change);
-  return text;
 }
 
 Command* CommandFactory::createChangeBrushCommand()

src/app/commands/cmd_change_color.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -13,9 +13,11 @@
 #include "app/app.h"
 #include "app/commands/command.h"
 #include "app/commands/params.h"
+#include "app/i18n/strings.h"
 #include "app/modules/palettes.h"
 #include "app/ui/color_bar.h"
 #include "doc/palette.h"
+#include "fmt/format.h"
 
 namespace app {
 
@@ -45,9 +47,7 @@ protected:
 };
 
 ChangeColorCommand::ChangeColorCommand()
-  : Command("ChangeColor",
+  : Command("ChangeColor", CmdUIOnlyFlag)
-            "Change Color",
-            CmdUIOnlyFlag)
 {
   m_background = false;
   m_change = None;
@@ -96,25 +96,26 @@ void ChangeColorCommand::onExecute(Context* context)
 
 std::string ChangeColorCommand::onGetFriendlyName() const
 {
-  std::string text = "Color";
+  std::string action;
 
   switch (m_change) {
     case None:
-      return text;
+      break;
     case IncrementIndex:
-      text += ": Increment";
+      if (m_background)
+        action = Strings::commands_ChangeColor_IncrementBgIndex();
+      else
+        action = Strings::commands_ChangeColor_IncrementFgIndex();
       break;
     case DecrementIndex:
-      text += ": Decrement";
+      if (m_background)
+        action = Strings::commands_ChangeColor_DecrementBgIndex();
+      else
+        action = Strings::commands_ChangeColor_DecrementFgIndex();
       break;
   }
 
-  if (m_background)
+  return fmt::format(getBaseFriendlyName(), action);
-    text += " Background Index";
-  else
-    text += " Foreground Index";
-
-  return text;
 }
 
 Command* CommandFactory::createChangeColorCommand()

src/app/commands/cmd_change_pixel_format.cpp

@@ -15,6 +15,7 @@
 #include "app/commands/params.h"
 #include "app/context_access.h"
 #include "app/extensions.h"
+#include "app/i18n/strings.h"
 #include "app/load_matrix.h"
 #include "app/modules/editors.h"
 #include "app/modules/gui.h"
@@ -28,6 +29,7 @@
 #include "base/thread.h"
 #include "doc/image.h"
 #include "doc/sprite.h"
+#include "fmt/format.h"
 #include "render/dithering_algorithm.h"
 #include "render/ordered_dither.h"
 #include "render/quantization.h"
@@ -349,9 +351,7 @@ private:
 };
 
 ChangePixelFormatCommand::ChangePixelFormatCommand()
-  : Command("ChangePixelFormat",
+  : Command("ChangePixelFormat", CmdUIOnlyFlag)
-            "Change Pixel Format",
-            CmdUIOnlyFlag)
 {
   m_useUI = true;
   m_format = IMAGE_RGB;
@@ -488,33 +488,33 @@ void ChangePixelFormatCommand::onExecute(Context* context)
 
 std::string ChangePixelFormatCommand::onGetFriendlyName() const
 {
-  std::string text = "Change Color Mode";
+  std::string conversion;
 
   if (!m_useUI) {
     switch (m_format) {
       case IMAGE_RGB:
-        text += " to RGB";
+        conversion = Strings::commands_ChangePixelFormat_RGB();
-        break;
-      case IMAGE_INDEXED:
-        text += " to Indexed";
-        switch (m_ditheringAlgorithm) {
-          case render::DitheringAlgorithm::None:
-            break;
-          case render::DitheringAlgorithm::Ordered:
-            text += " with Ordered Dithering";
-            break;
-          case render::DitheringAlgorithm::Old:
-            text += " with Old Dithering";
-            break;
-        }
         break;
       case IMAGE_GRAYSCALE:
-        text += " to Grayscale";
+        conversion = Strings::commands_ChangePixelFormat_Grayscale();
+        break;
+      case IMAGE_INDEXED:
+        switch (m_ditheringAlgorithm) {
+          case render::DitheringAlgorithm::None:
+            conversion = Strings::commands_ChangePixelFormat_Indexed();
+            break;
+          case render::DitheringAlgorithm::Ordered:
+            conversion = Strings::commands_ChangePixelFormat_Indexed_OrderedDithering();
+            break;
+          case render::DitheringAlgorithm::Old:
+            conversion = Strings::commands_ChangePixelFormat_Indexed_OldDithering();
+            break;
+        }
         break;
     }
   }
 
-  return text;
+  return fmt::format(getBaseFriendlyName(), conversion);
 }
 
 Command* CommandFactory::createChangePixelFormatCommand()

src/app/commands/cmd_clear.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -25,9 +25,7 @@ protected:
 };
 
 ClearCommand::ClearCommand()
-  : Command("Clear",
+  : Command("Clear", CmdUIOnlyFlag)
-            "Clear",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_clear_cel.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -32,9 +32,7 @@ protected:
 };
 
 ClearCelCommand::ClearCelCommand()
-  : Command("ClearCel",
+  : Command("ClearCel", CmdRecordableFlag)
-            "Clear Cel",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_close_file.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -30,9 +30,7 @@ using namespace ui;
 class CloseFileCommand : public Command {
 public:
   CloseFileCommand()
-    : Command("CloseFile",
+    : Command("CloseFile", CmdUIOnlyFlag) {
-              "Close File",
-              CmdUIOnlyFlag) {
   }
 
   Command* clone() const override { return new CloseFileCommand(*this); }
@@ -56,9 +54,7 @@ protected:
 class CloseAllFilesCommand : public Command {
 public:
   CloseAllFilesCommand()
-    : Command("CloseAllFiles",
+    : Command("CloseAllFiles", CmdRecordableFlag) {
-              "Close All Files",
-              CmdRecordableFlag) {
     m_quitting = false;
   }
 

src/app/commands/cmd_color_quantization.cpp

@@ -43,9 +43,7 @@ protected:
 };
 
 ColorQuantizationCommand::ColorQuantizationCommand()
-  : Command("ColorQuantization",
+  : Command("ColorQuantization", CmdRecordableFlag)
-            "Create Palette from Current Sprite (Color Quantization)",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_contiguous_fill.cpp

@@ -26,9 +26,7 @@ protected:
 };
 
 ContiguousFillCommand::ContiguousFillCommand()
-  : Command("ContiguousFill",
+  : Command("ContiguousFill", CmdUIOnlyFlag)
-            "Switch Contiguous Fill",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_copy.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -25,9 +25,7 @@ protected:
 };
 
 CopyCommand::CopyCommand()
-  : Command("Copy",
+  : Command("Copy", CmdUIOnlyFlag)
-            "Copy",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_copy_cel.cpp

@@ -27,9 +27,7 @@ protected:
 };
 
 CopyCelCommand::CopyCelCommand()
-  : Command("CopyCel",
+  : Command("CopyCel", CmdUIOnlyFlag)
-            "Copy Cel",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_copy_merged.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2016  David Capello
+// Copyright (C) 2016-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -25,9 +25,7 @@ protected:
 };
 
 CopyMergedCommand::CopyMergedCommand()
-  : Command("CopyMerged",
+  : Command("CopyMerged", CmdUIOnlyFlag)
-            "Copy Merged",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_crop.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -37,9 +37,7 @@ private:
 };
 
 CropSpriteCommand::CropSpriteCommand()
-  : Command("CropSprite",
+  : Command("CropSprite", CmdRecordableFlag)
-            "Crop Sprite",
-            CmdRecordableFlag)
 {
 }
 
@@ -92,9 +90,7 @@ protected:
 };
 
 AutocropSpriteCommand::AutocropSpriteCommand()
-  : Command("AutocropSprite",
+  : Command("AutocropSprite", CmdRecordableFlag)
-            "Trim Sprite",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_cut.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -25,9 +25,7 @@ protected:
 };
 
 CutCommand::CutCommand()
-  : Command("Cut",
+  : Command("Cut", CmdUIOnlyFlag)
-            "Cut",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_deselect_mask.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-42017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -29,9 +29,7 @@ protected:
 };
 
 DeselectMaskCommand::DeselectMaskCommand()
-  : Command("DeselectMask",
+  : Command("DeselectMask", CmdRecordableFlag)
-            "Deselect Mask",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_developer_console.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -30,9 +30,7 @@ protected:
 };
 
 DeveloperConsoleCommand::DeveloperConsoleCommand()
-  : Command("DeveloperConsole",
+  : Command("DeveloperConsole", CmdUIOnlyFlag)
-            "Developer Console",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_discard_brush.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -30,9 +30,7 @@ protected:
 };
 
 DiscardBrushCommand::DiscardBrushCommand()
-  : Command("DiscardBrush",
+  : Command("DiscardBrush", CmdUIOnlyFlag)
-            "Discard Brush",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_duplicate_layer.cpp

@@ -35,9 +35,7 @@ protected:
 };
 
 DuplicateLayerCommand::DuplicateLayerCommand()
-  : Command("DuplicateLayer",
+  : Command("DuplicateLayer", CmdRecordableFlag)
-            "Duplicate Layer",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_duplicate_sprite.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -37,9 +37,7 @@ protected:
 };
 
 DuplicateSpriteCommand::DuplicateSpriteCommand()
-  : Command("DuplicateSprite",
+  : Command("DuplicateSprite", CmdUIOnlyFlag)
-            "Duplicate Sprite",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_duplicate_view.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -30,9 +30,7 @@ protected:
 };
 
 DuplicateViewCommand::DuplicateViewCommand()
-  : Command("DuplicateView",
+  : Command("DuplicateView", CmdUIOnlyFlag)
-            "Duplicate View",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_exit.cpp

@@ -29,9 +29,7 @@ protected:
 };
 
 ExitCommand::ExitCommand()
-  : Command("Exit",
+  : Command("Exit", CmdUIOnlyFlag)
-            "Exit",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_export_sprite_sheet.cpp

@@ -593,9 +593,7 @@ private:
 };
 
 ExportSpriteSheetCommand::ExportSpriteSheetCommand()
-  : Command("ExportSpriteSheet",
+  : Command("ExportSpriteSheet", CmdRecordableFlag)
-            "Export Sprite Sheet",
-            CmdRecordableFlag)
   , m_useUI(true)
   , m_askOverwrite(true)
 {

src/app/commands/cmd_eyedropper.cpp

@@ -32,9 +32,7 @@ namespace app {
 using namespace ui;
 
 EyedropperCommand::EyedropperCommand()
-  : Command("Eyedropper",
+  : Command("Eyedropper", CmdUIOnlyFlag)
-            "Eyedropper",
-            CmdUIOnlyFlag)
 {
   m_background = false;
 }

src/app/commands/cmd_fit_screen.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -27,9 +27,7 @@ protected:
 };
 
 FitScreenCommand::FitScreenCommand()
-  : Command("FitScreen",
+  : Command("FitScreen", CmdUIOnlyFlag)
-            "Fit on Screen",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_flatten_layers.cpp

@@ -29,9 +29,7 @@ protected:
 };
 
 FlattenLayersCommand::FlattenLayersCommand()
-  : Command("FlattenLayers",
+  : Command("FlattenLayers", CmdUIOnlyFlag)
-            "Flatten Layers",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_flip.cpp

@@ -20,6 +20,7 @@
 #include "app/context_access.h"
 #include "app/document_api.h"
 #include "app/document_range.h"
+#include "app/i18n/strings.h"
 #include "app/modules/gui.h"
 #include "app/transaction.h"
 #include "app/ui/timeline/timeline.h"
@@ -32,14 +33,13 @@
 #include "doc/layer.h"
 #include "doc/mask.h"
 #include "doc/sprite.h"
+#include "fmt/format.h"
 #include "gfx/size.h"
 
 namespace app {
 
 FlipCommand::FlipCommand()
-  : Command("Flip",
+  : Command("Flip", CmdRecordableFlag)
-            "Flip",
-            CmdRecordableFlag)
 {
   m_flipMask = false;
   m_flipType = doc::algorithm::FlipHorizontal;
@@ -210,19 +210,20 @@ void FlipCommand::onExecute(Context* context)
 
 std::string FlipCommand::onGetFriendlyName() const
 {
-  std::string text = "Flip";
+  std::string content;
+  std::string orientation;
 
   if (m_flipMask)
-    text += " Selection";
+    content = Strings::commands_Flip_Selection();
   else
-    text += " Canvas";
+    content = Strings::commands_Flip_Canvas();
 
   if (m_flipType == doc::algorithm::FlipHorizontal)
-    text += " Horizontal";
+    content = Strings::commands_Flip_Horizontally();
   else
-    text += " Vertical";
+    content = Strings::commands_Flip_Vertically();
 
-  return text;
+  return fmt::format(getBaseFriendlyName(), content, orientation);
 }
 
 Command* CommandFactory::createFlipCommand()

src/app/commands/cmd_frame_properties.cpp

@@ -51,9 +51,7 @@ private:
 };
 
 FramePropertiesCommand::FramePropertiesCommand()
-  : Command("FrameProperties",
+  : Command("FrameProperties", CmdUIOnlyFlag)
-            "Frame Properties",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_frame_tag_properties.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -44,9 +44,7 @@ private:
 };
 
 FrameTagPropertiesCommand::FrameTagPropertiesCommand()
-  : Command("FrameTagProperties",
+  : Command("FrameTagProperties", CmdUIOnlyFlag)
-            "Frame Tag Properties",
-            CmdUIOnlyFlag)
   , m_tagId(NullId)
 {
 }

src/app/commands/cmd_fullscreen_preview.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -264,9 +264,7 @@ protected:
 };
 
 FullscreenPreviewCommand::FullscreenPreviewCommand()
-  : Command("FullscreenPreview",
+  : Command("FullscreenPreview", CmdUIOnlyFlag)
-            "Fullscreen Preview",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_goto_frame.cpp

@@ -30,8 +30,8 @@ using namespace doc;
 
 class GotoCommand : public Command {
 protected:
-  GotoCommand(const char* short_name, const char* friendly_name)
+  GotoCommand(const char* id)
-    : Command(short_name, friendly_name, CmdRecordableFlag) { }
+    : Command(id, CmdRecordableFlag) { }
 
   bool onEnabled(Context* context) override {
     return (current_editor != NULL);
@@ -49,8 +49,7 @@ protected:
 class GotoFirstFrameCommand : public GotoCommand {
 public:
   GotoFirstFrameCommand()
-    : GotoCommand("GotoFirstFrame",
+    : GotoCommand("GotoFirstFrame") { }
-                  "Go to First Frame") { }
   Command* clone() const override { return new GotoFirstFrameCommand(*this); }
 
 protected:
@@ -62,8 +61,7 @@ protected:
 class GotoPreviousFrameCommand : public GotoCommand {
 public:
   GotoPreviousFrameCommand()
-    : GotoCommand("GotoPreviousFrame",
+    : GotoCommand("GotoPreviousFrame") { }
-                  "Go to Previous Frame") { }
   Command* clone() const override { return new GotoPreviousFrameCommand(*this); }
 
 protected:
@@ -77,8 +75,7 @@ protected:
 
 class GotoNextFrameCommand : public GotoCommand {
 public:
-  GotoNextFrameCommand() : GotoCommand("GotoNextFrame",
+  GotoNextFrameCommand() : GotoCommand("GotoNextFrame") { }
-                                       "Go to Next Frame") { }
   Command* clone() const override { return new GotoNextFrameCommand(*this); }
 
 protected:
@@ -92,8 +89,7 @@ protected:
 
 class GotoNextFrameWithSameTagCommand : public GotoCommand {
 public:
-  GotoNextFrameWithSameTagCommand() : GotoCommand("GotoNextFrameWithSameTag",
+  GotoNextFrameWithSameTagCommand() : GotoCommand("GotoNextFrameWithSameTag") { }
-                                                  "Go to Next Frame with same tag") { }
   Command* clone() const override { return new GotoNextFrameWithSameTagCommand(*this); }
 
 protected:
@@ -112,8 +108,7 @@ protected:
 
 class GotoPreviousFrameWithSameTagCommand : public GotoCommand {
 public:
-  GotoPreviousFrameWithSameTagCommand() : GotoCommand("GotoPreviousFrameWithSameTag",
+  GotoPreviousFrameWithSameTagCommand() : GotoCommand("GotoPreviousFrameWithSameTag") { }
-                                                      "Go to Previous Frame with same tag") { }
   Command* clone() const override { return new GotoPreviousFrameWithSameTagCommand(*this); }
 
 protected:
@@ -132,8 +127,7 @@ protected:
 
 class GotoLastFrameCommand : public GotoCommand {
 public:
-  GotoLastFrameCommand() : GotoCommand("GotoLastFrame",
+  GotoLastFrameCommand() : GotoCommand("GotoLastFrame") { }
-                                       "Go to Last Frame") { }
   Command* clone() const override { return new GotoLastFrameCommand(*this); }
 
 protected:
@@ -144,8 +138,7 @@ protected:
 
 class GotoFrameCommand : public GotoCommand {
 public:
-  GotoFrameCommand() : GotoCommand("GotoFrame",
+  GotoFrameCommand() : GotoCommand("GotoFrame")
-                                   "Go to Frame")
                      , m_showUI(true) { }
   Command* clone() const override { return new GotoFrameCommand(*this); }
 

src/app/commands/cmd_goto_layer.cpp

@@ -24,10 +24,9 @@ namespace app {
 class GotoLayerCommand : public Command {
 public:
   GotoLayerCommand(int offset,
-                   const char* shortName,
+                   const char* id,
-                   const char* friendlyName,
                    CommandFlags flags)
-    : Command(shortName, friendlyName, flags),
+    : Command(id, flags),
       m_offset(offset) {
   }
 
@@ -87,7 +86,6 @@ class GotoPreviousLayerCommand : public GotoLayerCommand {
 public:
   GotoPreviousLayerCommand()
     : GotoLayerCommand(-1, "GotoPreviousLayer",
-                       "Go to Previous Layer",
                        CmdUIOnlyFlag) {
   }
   Command* clone() const override {
@@ -99,7 +97,6 @@ class GotoNextLayerCommand : public GotoLayerCommand {
 public:
   GotoNextLayerCommand()
     : GotoLayerCommand(+1, "GotoNextLayer",
-                       "Go to Next Layer",
                        CmdUIOnlyFlag) {
   }
   Command* clone() const override {

src/app/commands/cmd_goto_tab.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -26,9 +26,7 @@ protected:
 };
 
 GotoNextTabCommand::GotoNextTabCommand()
-  : Command("GotoNextTab",
+  : Command("GotoNextTab", CmdUIOnlyFlag)
-            "Go to Next Tab",
-            CmdUIOnlyFlag)
 {
 }
 
@@ -53,9 +51,7 @@ protected:
 };
 
 GotoPreviousTabCommand::GotoPreviousTabCommand()
-  : Command("GotoPreviousTab",
+  : Command("GotoPreviousTab", CmdRecordableFlag)
-            "Go to Previous tab",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_grid.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -31,9 +31,7 @@ using namespace gfx;
 class SnapToGridCommand : public Command {
 public:
   SnapToGridCommand()
-    : Command("SnapToGrid",
+    : Command("SnapToGrid", CmdUIOnlyFlag) {
-              "Snap to Grid",
-              CmdUIOnlyFlag) {
   }
 
   Command* clone() const override { return new SnapToGridCommand(*this); }
@@ -56,9 +54,7 @@ protected:
 class SelectionAsGridCommand : public Command {
 public:
   SelectionAsGridCommand()
-    : Command("SelectionAsGrid",
+    : Command("SelectionAsGrid", CmdUIOnlyFlag) {
-              "Selection as Grid",
-              CmdUIOnlyFlag) {
   }
 
   Command* clone() const override { return new SelectionAsGridCommand(*this); }
@@ -95,9 +91,7 @@ protected:
 };
 
 GridSettingsCommand::GridSettingsCommand()
-  : Command("GridSettings",
+  : Command("GridSettings", CmdUIOnlyFlag)
-            "Grid Settings",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_home.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -27,9 +27,7 @@ protected:
 };
 
 HomeCommand::HomeCommand()
-  : Command("Home",
+  : Command("Home", CmdUIOnlyFlag)
-            "Home",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_import_sprite_sheet.cpp

@@ -297,9 +297,7 @@ protected:
 };
 
 ImportSpriteSheetCommand::ImportSpriteSheetCommand()
-  : Command("ImportSpriteSheet",
+  : Command("ImportSpriteSheet", CmdRecordableFlag)
-            "Import Sprite Sheet",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_invert_mask.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015, 2017  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -33,9 +33,7 @@ protected:
 };
 
 InvertMaskCommand::InvertMaskCommand()
-  : Command("InvertMask",
+  : Command("InvertMask", CmdRecordableFlag)
-            "Invert Mask",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_keyboard_shortcuts.cpp

@@ -749,9 +749,7 @@ private:
 };
 
 KeyboardShortcutsCommand::KeyboardShortcutsCommand()
-  : Command("KeyboardShortcuts",
+  : Command("KeyboardShortcuts", CmdUIOnlyFlag)
-            "Keyboard Shortcuts",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_launch.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -32,9 +32,7 @@ private:
 };
 
 LaunchCommand::LaunchCommand()
-  : Command("Launch",
+  : Command("Launch", CmdUIOnlyFlag)
-            "Launch",
-            CmdUIOnlyFlag)
   , m_type(Url)
   , m_path("")
 {

src/app/commands/cmd_layer_from_background.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -30,9 +30,7 @@ protected:
 };
 
 LayerFromBackgroundCommand::LayerFromBackgroundCommand()
-  : Command("LayerFromBackground",
+  : Command("LayerFromBackground", CmdRecordableFlag)
-            "Layer From Background",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_layer_lock.cpp

@@ -32,9 +32,7 @@ protected:
 };
 
 LayerLockCommand::LayerLockCommand()
-  : Command("LayerLock",
+  : Command("LayerLock", CmdRecordableFlag)
-            "Lock Layers",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_layer_opacity.cpp

@@ -14,11 +14,12 @@
 #include "app/commands/params.h"
 #include "app/context.h"
 #include "app/context_access.h"
+#include "app/i18n/strings.h"
 #include "app/modules/gui.h"
 #include "app/transaction.h"
 #include "app/ui/timeline/timeline.h"
-#include "base/convert_to.h"
 #include "doc/layer.h"
+#include "fmt/format.h"
 
 #include <string>
 
@@ -40,9 +41,7 @@ private:
 };
 
 LayerOpacityCommand::LayerOpacityCommand()
-  : Command("LayerOpacity",
+  : Command("LayerOpacity", CmdUIOnlyFlag)
-            "Layer Opacity",
-            CmdUIOnlyFlag)
 {
   m_opacity = 255;
 }
@@ -95,12 +94,9 @@ void LayerOpacityCommand::onExecute(Context* context)
 
 std::string LayerOpacityCommand::onGetFriendlyName() const
 {
-  std::string text = "Set Layer Opacity to ";
+  return fmt::format(getBaseFriendlyName(),
-  text += base::convert_to<std::string>(m_opacity);
+                     m_opacity,
-  text += " (";
+                     int(100.0 * m_opacity / 255.0));
-  text += base::convert_to<std::string>(int(100.0 * m_opacity / 255.0));
-  text += "%)";
-  return text;
 }
 
 Command* CommandFactory::createLayerOpacityCommand()

src/app/commands/cmd_layer_properties.cpp

@@ -353,9 +353,7 @@ private:
 };
 
 LayerPropertiesCommand::LayerPropertiesCommand()
-  : Command("LayerProperties",
+  : Command("LayerProperties", CmdRecordableFlag)
-            "Layer Properties",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_layer_visibility.cpp

@@ -32,9 +32,7 @@ protected:
 };
 
 LayerVisibilityCommand::LayerVisibilityCommand()
-  : Command("LayerVisibility",
+  : Command("LayerVisibility", CmdRecordableFlag)
-            "Layer Visibility",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_link_cels.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -32,9 +32,7 @@ protected:
 };
 
 LinkCelsCommand::LinkCelsCommand()
-  : Command("LinkCels",
+  : Command("LinkCels", CmdRecordableFlag)
-            "Links Cels",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_load_mask.cpp

@@ -38,9 +38,7 @@ protected:
 };
 
 LoadMaskCommand::LoadMaskCommand()
-  : Command("LoadMask",
+  : Command("LoadMask", CmdRecordableFlag)
-            "Load Mask",
-            CmdRecordableFlag)
 {
   m_filename = "";
 }

src/app/commands/cmd_load_palette.cpp

@@ -41,9 +41,7 @@ private:
 };
 
 LoadPaletteCommand::LoadPaletteCommand()
-  : Command("LoadPalette",
+  : Command("LoadPalette", CmdRecordableFlag)
-            "Load Palette",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_mask_all.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -29,9 +29,7 @@ protected:
 };
 
 MaskAllCommand::MaskAllCommand()
-  : Command("MaskAll",
+  : Command("MaskAll", CmdRecordableFlag)
-            "Mask All",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_mask_by_color.cpp

@@ -63,9 +63,7 @@ private:
 };
 
 MaskByColorCommand::MaskByColorCommand()
-  : Command("MaskByColor",
+  : Command("MaskByColor", CmdUIOnlyFlag)
-            "Mask By Color",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_mask_content.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -40,9 +40,7 @@ protected:
 };
 
 MaskContentCommand::MaskContentCommand()
-  : Command("MaskContent",
+  : Command("MaskContent", CmdRecordableFlag)
-            "Mask Content",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_merge_down_layer.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -42,9 +42,7 @@ protected:
 };
 
 MergeDownLayerCommand::MergeDownLayerCommand()
-  : Command("MergeDownLayer",
+  : Command("MergeDownLayer", CmdRecordableFlag)
-            "Merge Down Layer",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_modify_selection.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2015, 2016  David Capello
+// Copyright (C) 2015-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -13,6 +13,7 @@
 #include "app/commands/params.h"
 #include "app/context_access.h"
 #include "app/document.h"
+#include "app/i18n/strings.h"
 #include "app/modules/gui.h"
 #include "app/pref/preferences.h"
 #include "app/transaction.h"
@@ -20,6 +21,7 @@
 #include "doc/brush_type.h"
 #include "doc/mask.h"
 #include "filters/neighboring_pixels.h"
+#include "fmt/format.h"
 
 #include "modify_selection.xml.h"
 
@@ -57,9 +59,7 @@ private:
 };
 
 ModifySelectionCommand::ModifySelectionCommand()
-  : Command("ModifySelection",
+  : Command("ModifySelection", CmdRecordableFlag)
-            "Modify Selection",
-            CmdRecordableFlag)
   , m_modifier(Expand)
   , m_quantity(0)
   , m_brushType(doc::kCircleBrushType)
@@ -141,7 +141,7 @@ void ModifySelectionCommand::onExecute(Context* context)
 
   // Set the new mask
   Transaction transaction(writer.context(),
-                          getActionName() + " Selection",
+                          friendlyName(),
                           DoesntModifyDocument);
   transaction.execute(new cmd::SetMask(document, mask));
   transaction.commit();
@@ -152,29 +152,22 @@ void ModifySelectionCommand::onExecute(Context* context)
 
 std::string ModifySelectionCommand::onGetFriendlyName() const
 {
-  std::string text;
+  std::string quantity;
+  if (m_quantity > 0)
+    quantity = fmt::format(Strings::commands_ModifySelection_Quantity(), m_quantity);
 
-  text += getActionName();
+  return fmt::format(getBaseFriendlyName(),
-  text += " Selection";
+                     getActionName(),
-
+                     quantity);
-  if (m_quantity > 0) {
-    text += " by ";
-    text += base::convert_to<std::string>(m_quantity);
-    text += " pixel";
-    if (m_quantity > 1)
-      text += "s";
-  }
-
-  return text;
 }
 
 std::string ModifySelectionCommand::getActionName() const
 {
   switch (m_modifier) {
-    case Border: return "Border";
+    case Border: return Strings::commands_ModifySelection_Border();
-    case Expand: return "Expand";
+    case Expand: return Strings::commands_ModifySelection_Expand();
-    case Contract: return "Contract";
+    case Contract: return Strings::commands_ModifySelection_Contract();
-    default: return "Modify";
+    default: return Strings::commands_ModifySelection_Modify();
   }
 }
 

src/app/commands/cmd_move_cel.cpp

@@ -27,9 +27,7 @@ protected:
 };
 
 MoveCelCommand::MoveCelCommand()
-  : Command("MoveCel",
+  : Command("MoveCel", CmdUIOnlyFlag)
-            "Move Cel",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_move_mask.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -15,6 +15,7 @@
 #include "app/commands/params.h"
 #include "app/context_access.h"
 #include "app/document_api.h"
+#include "app/i18n/strings.h"
 #include "app/modules/editors.h"
 #include "app/modules/gui.h"
 #include "app/pref/preferences.h"
@@ -25,14 +26,13 @@
 #include "base/convert_to.h"
 #include "doc/mask.h"
 #include "doc/sprite.h"
+#include "fmt/format.h"
 #include "ui/view.h"
 
 namespace app {
 
 MoveMaskCommand::MoveMaskCommand()
-  : Command("MoveMask",
+  : Command("MoveMask", CmdRecordableFlag)
-            "Move Mask",
-            CmdRecordableFlag)
 {
 }
 
@@ -42,29 +42,12 @@ void MoveMaskCommand::onLoadParams(const Params& params)
   if (target == "boundaries") m_target = Boundaries;
   else if (target == "content") m_target = Content;
 
-  std::string direction = params.get("direction");
-  if (direction == "left") m_direction = Left;
-  else if (direction == "right") m_direction = Right;
-  else if (direction == "up") m_direction = Up;
-  else if (direction == "down") m_direction = Down;
-
-  std::string units = params.get("units");
-  if (units == "pixel") m_units = Pixel;
-  else if (units == "tile-width") m_units = TileWidth;
-  else if (units == "tile-height") m_units = TileHeight;
-  else if (units == "zoomed-pixel") m_units = ZoomedPixel;
-  else if (units == "zoomed-tile-width") m_units = ZoomedTileWidth;
-  else if (units == "zoomed-tile-height") m_units = ZoomedTileHeight;
-  else if (units == "viewport-width") m_units = ViewportWidth;
-  else if (units == "viewport-height") m_units = ViewportHeight;
-
-  int quantity = params.get_as<int>("quantity");
-  m_quantity = std::max<int>(1, quantity);
-
   if (params.has_param("wrap"))
     m_wrap = params.get_as<bool>("wrap");
   else
     m_wrap = false;
+
+  m_moveThing.onLoadParams(params);
 }
 
 bool MoveMaskCommand::onEnabled(Context* context)
@@ -90,7 +73,7 @@ bool MoveMaskCommand::onEnabled(Context* context)
 
 void MoveMaskCommand::onExecute(Context* context)
 {
-  gfx::Point delta = getDelta(context);
+  gfx::Point delta = m_moveThing.getDelta(context);
 
   switch (m_target) {
 
@@ -128,114 +111,15 @@ void MoveMaskCommand::onExecute(Context* context)
   }
 }
 
-gfx::Point MoveMaskCommand::getDelta(Context* context) const
-{
-  DocumentView* view = static_cast<UIContext*>(context)->activeView();
-  if (!view)
-    return gfx::Point(0, 0);
-
-  DocumentPreferences& docPref = Preferences::instance().document(view->document());
-  Editor* editor = view->editor();
-  gfx::Rect vp = view->viewWidget()->viewportBounds();
-  gfx::Rect gridBounds = docPref.grid.bounds();
-  int dx = 0;
-  int dy = 0;
-  int pixels = 0;
-
-  switch (m_units) {
-    case Pixel:
-      pixels = 1;
-      break;
-    case TileWidth:
-      pixels = gridBounds.w;
-      break;
-    case TileHeight:
-      pixels = gridBounds.h;
-      break;
-    case ZoomedPixel:
-      pixels = editor->zoom().apply(1);
-      break;
-    case ZoomedTileWidth:
-      pixels = editor->zoom().apply(gridBounds.w);
-      break;
-    case ZoomedTileHeight:
-      pixels = editor->zoom().apply(gridBounds.h);
-      break;
-    case ViewportWidth:
-      pixels = vp.h;
-      break;
-    case ViewportHeight:
-      pixels = vp.w;
-      break;
-  }
-
-  switch (m_direction) {
-    case Left:  dx = -m_quantity * pixels; break;
-    case Right: dx = +m_quantity * pixels; break;
-    case Up:    dy = -m_quantity * pixels; break;
-    case Down:  dy = +m_quantity * pixels; break;
-  }
-
-  return gfx::Point(dx, dy);
-}
-
 std::string MoveMaskCommand::onGetFriendlyName() const
 {
-  std::string text = "Move";
+  std::string content;
-
   switch (m_target) {
-
+    case Boundaries: content = Strings::commands_MoveMask_Boundaries(); break;
-    case Boundaries: {
+    case Content: content = Strings::commands_MoveMask_Content(); break;
-      text += " Selection Boundaries";
-      break;
   }
-
+  return fmt::format(getBaseFriendlyName(),
-    case Content: {
+                     content, m_moveThing.getFriendlyString());
-      text += " Selection Content";
-      break;
-    }
-
-  }
-
-  text += " " + base::convert_to<std::string>(m_quantity);
-
-  switch (m_units) {
-    case Pixel:
-      text += " pixel";
-      break;
-    case TileWidth:
-      text += " horizontal tile";
-      break;
-    case TileHeight:
-      text += " vertical tile";
-      break;
-    case ZoomedPixel:
-      text += " zoomed pixel";
-      break;
-    case ZoomedTileWidth:
-      text += " zoomed horizontal tile";
-      break;
-    case ZoomedTileHeight:
-      text += " zoomed vertical tile";
-      break;
-    case ViewportWidth:
-      text += " viewport width";
-      break;
-    case ViewportHeight:
-      text += " viewport height";
-      break;
-  }
-  if (m_quantity != 1)
-    text += "s";
-
-  switch (m_direction) {
-    case Left:  text += " left"; break;
-    case Right: text += " right"; break;
-    case Up:    text += " up"; break;
-    case Down:  text += " down"; break;
-  }
-
-  return text;
 }
 
 Command* CommandFactory::createMoveMaskCommand()

src/app/commands/cmd_move_mask.h

@@ -9,23 +9,13 @@
 #pragma once
 
 #include "app/commands/command.h"
+#include "app/commands/move_thing.h"
 
 namespace app {
 
   class MoveMaskCommand : public Command {
   public:
     enum Target { Boundaries, Content };
-    enum Direction { Left, Up, Right, Down, }; // TODO join this enum with scroll command
-    enum Units {
-      Pixel,
-      TileWidth,
-      TileHeight,
-      ZoomedPixel,
-      ZoomedTileWidth,
-      ZoomedTileHeight,
-      ViewportWidth,
-      ViewportHeight
-    };
 
     MoveMaskCommand();
     Command* clone() const override { return new MoveMaskCommand(*this); }
@@ -42,9 +32,7 @@ namespace app {
 
   private:
     Target m_target;
-    Direction m_direction;
+    MoveThing m_moveThing;
-    Units m_units;
-    int m_quantity;
     bool m_wrap;
   };
 

src/app/commands/cmd_new_brush.cpp

@@ -55,9 +55,7 @@ private:
 };
 
 NewBrushCommand::NewBrushCommand()
-  : Command("NewBrush",
+  : Command("NewBrush", CmdUIOnlyFlag)
-            "New Brush",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_new_file.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -14,6 +14,7 @@
 #include "app/commands/command.h"
 #include "app/console.h"
 #include "app/document.h"
+#include "app/i18n/strings.h"
 #include "app/modules/editors.h"
 #include "app/modules/palettes.h"
 #include "app/pref/preferences.h"
@@ -50,9 +51,7 @@ protected:
 static int _sprite_counter = 0;
 
 NewFileCommand::NewFileCommand()
-  : Command("NewFile",
+  : Command("NewFile", CmdRecordableFlag)
-            "New File",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_new_frame.cpp

@@ -15,6 +15,7 @@
 #include "app/console.h"
 #include "app/context_access.h"
 #include "app/document_api.h"
+#include "app/i18n/strings.h"
 #include "app/modules/gui.h"
 #include "app/transaction.h"
 #include "app/ui/document_view.h"
@@ -27,6 +28,7 @@
 #include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/sprite.h"
+#include "fmt/format.h"
 #include "ui/ui.h"
 
 #include <stdexcept>
@@ -56,9 +58,7 @@ private:
 };
 
 NewFrameCommand::NewFrameCommand()
-  : Command("NewFrame",
+  : Command("NewFrame", CmdRecordableFlag)
-            "New Frame",
-            CmdRecordableFlag)
 {
 }
 
@@ -191,20 +191,20 @@ void NewFrameCommand::onExecute(Context* context)
 
 std::string NewFrameCommand::onGetFriendlyName() const
 {
-  std::string text = "New Frame";
+  std::string text;
 
   switch (m_content) {
     case Content::DUPLICATE_FRAME:
-      text = "New Frame";
+      text = Strings::commands_NewFrame();
       break;
     case Content::NEW_EMPTY_FRAME:
-      text = "New Empty Frame";
+      text = Strings::commands_NewFrame_NewEmptyFrame();
       break;
     case Content::DUPLICATE_CELS:
-      text = "Duplicate Linked Cels";
+      text = Strings::commands_NewFrame_DuplicateCels();
       break;
     case Content::DUPLICATE_CELS_BLOCK:
-      text = "Duplicate Cels";
+      text = Strings::commands_NewFrame_DuplicateCelsBlock();
       break;
   }
 

src/app/commands/cmd_new_frame_tag.cpp

@@ -35,9 +35,7 @@ protected:
 };
 
 NewFrameTagCommand::NewFrameTagCommand()
-  : Command("NewFrameTag",
+  : Command("NewFrameTag", CmdRecordableFlag)
-            "New Frame Tag",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_new_layer.cpp

@@ -65,9 +65,7 @@ private:
 };
 
 NewLayerCommand::NewLayerCommand()
-  : Command("NewLayer",
+  : Command("NewLayer", CmdRecordableFlag)
-            "New Layer",
-            CmdRecordableFlag)
 {
   m_name = "";
   m_type = Type::Layer;

src/app/commands/cmd_new_sprite_from_selection.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -38,9 +38,7 @@ protected:
 };
 
 NewSpriteFromSelectionCommand::NewSpriteFromSelectionCommand()
-  : Command("NewSpriteFromSelection",
+  : Command("NewSpriteFromSelection", CmdUIOnlyFlag)
-            "New Sprite From Selection",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_onionskin.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -21,9 +21,7 @@ using namespace gfx;
 class ShowOnionSkinCommand : public Command {
 public:
   ShowOnionSkinCommand()
-    : Command("ShowOnionSkin",
+    : Command("ShowOnionSkin", CmdUIOnlyFlag)
-              "Show Onion Skin",
-              CmdUIOnlyFlag)
   {
   }
 

src/app/commands/cmd_open_browser.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2016  David Capello
+// Copyright (C) 2016-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -30,9 +30,7 @@ private:
 };
 
 OpenBrowserCommand::OpenBrowserCommand()
-  : Command("OpenBrowser",
+  : Command("OpenBrowser", CmdUIOnlyFlag)
-            "Open Browser",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_open_file.cpp

@@ -75,9 +75,7 @@ private:
 };
 
 OpenFileCommand::OpenFileCommand()
-  : Command("OpenFile",
+  : Command("OpenFile", CmdRecordableFlag)
-            "Open Sprite",
-            CmdRecordableFlag)
   , m_repeatCheckbox(false)
   , m_oneFrame(false)
   , m_seqDecision(SequenceDecision::Ask)

src/app/commands/cmd_open_group.cpp

@@ -33,9 +33,7 @@ protected:
 };
 
 OpenGroupCommand::OpenGroupCommand()
-  : Command("OpenGroup",
+  : Command("OpenGroup", CmdRecordableFlag)
-            "Open/Close Group",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_open_in_folder.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -27,9 +27,7 @@ protected:
 };
 
 OpenInFolderCommand::OpenInFolderCommand()
-  : Command("OpenInFolder",
+  : Command("OpenInFolder", CmdUIOnlyFlag)
-            "Open In Folder",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_open_with_app.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -27,9 +27,7 @@ protected:
 };
 
 OpenWithAppCommand::OpenWithAppCommand()
-  : Command("OpenWithApp",
+  : Command("OpenWithApp", CmdUIOnlyFlag)
-            "Open With Associated Application",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_options.cpp

@@ -1037,9 +1037,7 @@ protected:
 };
 
 OptionsCommand::OptionsCommand()
-  : Command("Options",
+  : Command("Options", CmdUIOnlyFlag)
-            "Options",
-            CmdUIOnlyFlag)
 {
   Preferences& preferences = Preferences::instance();
 

src/app/commands/cmd_palette_editor.cpp

@@ -10,7 +10,9 @@
 
 #include "app/commands/command.h"
 #include "app/commands/params.h"
+#include "app/i18n/strings.h"
 #include "app/ui/color_bar.h"
+#include "fmt/format.h"
 
 namespace app {
 
@@ -32,9 +34,7 @@ private:
 };
 
 PaletteEditorCommand::PaletteEditorCommand()
-  : Command("PaletteEditor",
+  : Command("PaletteEditor", CmdRecordableFlag)
-            "Edit Palette",
-            CmdRecordableFlag)
 {
   m_edit = true;
   m_popup = false;
@@ -91,21 +91,20 @@ void PaletteEditorCommand::onExecute(Context* context)
 
 std::string PaletteEditorCommand::onGetFriendlyName() const
 {
-  std::string text = "Switch";
+  std::string edit, plus, popup;
   if (m_edit) {
-    text += " Edit Palette Mode";
+    edit = Strings::commands_PaletteEditor_Edit();
   }
   if (m_edit && m_popup) {
-    text += " and";
+    plus = Strings::commands_PaletteEditor_And();
   }
   if (m_popup) {
     if (m_background)
-      text += " Background";
+      popup = Strings::commands_PaletteEditor_BgPopup();
     else
-      text += " Foreground";
+      popup = Strings::commands_PaletteEditor_FgPopup();
-    text += " Color Popup";
   }
-  return text;
+  return fmt::format(getBaseFriendlyName(), edit, plus, popup);
 }
 
 Command* CommandFactory::createPaletteEditorCommand()

src/app/commands/cmd_palette_size.cpp

@@ -37,9 +37,7 @@ private:
 };
 
 PaletteSizeCommand::PaletteSizeCommand()
-  : Command("PaletteSize",
+  : Command("PaletteSize", CmdRecordableFlag)
-            "Palette Size",
-            CmdRecordableFlag)
 {
   m_size = 0;
 }

src/app/commands/cmd_paste.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -25,9 +25,7 @@ protected:
 };
 
 PasteCommand::PasteCommand()
-  : Command("Paste",
+  : Command("Paste", CmdUIOnlyFlag)
-            "Paste",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_paste_text.cpp

@@ -45,9 +45,7 @@ protected:
 };
 
 PasteTextCommand::PasteTextCommand()
-  : Command("PasteText",
+  : Command("PasteText", CmdUIOnlyFlag)
-            "Insert Text",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_pixel_perfect_mode.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -30,9 +30,7 @@ protected:
 };
 
 PixelPerfectModeCommand::PixelPerfectModeCommand()
-  : Command("PixelPerfectMode",
+  : Command("PixelPerfectMode", CmdUIOnlyFlag)
-            "Switch Pixel Perfect Mode",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_play_animation.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -30,9 +30,7 @@ protected:
 };
 
 PlayAnimationCommand::PlayAnimationCommand()
-  : Command("PlayAnimation",
+  : Command("PlayAnimation", CmdUIOnlyFlag)
-            "Play Animation",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_refresh.cpp

@@ -33,9 +33,7 @@ protected:
 };
 
 RefreshCommand::RefreshCommand()
-  : Command("Refresh",
+  : Command("Refresh", CmdUIOnlyFlag)
-            "Refresh",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_remove_frame.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -30,9 +30,7 @@ protected:
 };
 
 RemoveFrameCommand::RemoveFrameCommand()
-  : Command("RemoveFrame",
+  : Command("RemoveFrame", CmdRecordableFlag)
-            "Remove Frame",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_remove_frame_tag.cpp

@@ -38,9 +38,7 @@ private:
 };
 
 RemoveFrameTagCommand::RemoveFrameTagCommand()
-  : Command("RemoveFrameTag",
+  : Command("RemoveFrameTag", CmdRecordableFlag)
-            "Remove Frame Tag",
-            CmdRecordableFlag)
   , m_tagId(NullId)
 {
 }

src/app/commands/cmd_remove_layer.cpp

@@ -34,9 +34,7 @@ protected:
 };
 
 RemoveLayerCommand::RemoveLayerCommand()
-  : Command("RemoveLayer",
+  : Command("RemoveLayer", CmdRecordableFlag)
-            "Remove Layer",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_remove_slice.cpp

@@ -41,9 +41,7 @@ private:
 };
 
 RemoveSliceCommand::RemoveSliceCommand()
-  : Command("RemoveSlice",
+  : Command("RemoveSlice", CmdRecordableFlag)
-            "Remove Slice",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_repeat_last_export.cpp

@@ -29,9 +29,7 @@ protected:
 };
 
 RepeatLastExportCommand::RepeatLastExportCommand()
-  : Command("RepeatLastExport",
+  : Command("RepeatLastExport", CmdRecordableFlag)
-            "Repeat Last Export",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_reselect_mask.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -29,9 +29,7 @@ protected:
 };
 
 ReselectMaskCommand::ReselectMaskCommand()
-  : Command("ReselectMask",
+  : Command("ReselectMask", CmdRecordableFlag)
-            "Reselect Mask",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_reverse_frames.cpp

@@ -28,9 +28,7 @@ protected:
 };
 
 ReverseFramesCommand::ReverseFramesCommand()
-  : Command("ReverseFrames",
+  : Command("ReverseFrames", CmdUIOnlyFlag)
-            "Reverse Frames",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_rotate.cpp

@@ -15,6 +15,7 @@
 #include "app/context_access.h"
 #include "app/document_api.h"
 #include "app/document_range.h"
+#include "app/i18n/strings.h"
 #include "app/modules/editors.h"
 #include "app/modules/gui.h"
 #include "app/sprite_job.h"
@@ -31,6 +32,7 @@
 #include "doc/image.h"
 #include "doc/mask.h"
 #include "doc/sprite.h"
+#include "fmt/format.h"
 #include "ui/ui.h"
 
 namespace app {
@@ -165,9 +167,7 @@ protected:
 };
 
 RotateCommand::RotateCommand()
-  : Command("Rotate",
+  : Command("Rotate", CmdRecordableFlag)
-            "Rotate Canvas",
-            CmdRecordableFlag)
 {
   m_flipMask = false;
   m_angle = 0;
@@ -241,16 +241,13 @@ void RotateCommand::onExecute(Context* context)
 
 std::string RotateCommand::onGetFriendlyName() const
 {
-  std::string text = "Rotate";
+  std::string content;
-
   if (m_flipMask)
-    text += " Selection";
+    content = Strings::commands_Rotate_Selection();
   else
-    text += " Sprite";
+    content = Strings::commands_Rotate_Sprite();
-
+  return fmt::format(getBaseFriendlyName(),
-  text += " " + base::convert_to<std::string>(m_angle) + "\xc2\xb0";
+                     content, base::convert_to<std::string>(m_angle));
-
-  return text;
 }
 
 Command* CommandFactory::createRotateCommand()

src/app/commands/cmd_rotate.h

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -21,6 +21,7 @@ namespace app {
     int angle() const { return m_angle; }
 
   protected:
+    bool onNeedsParams() const override { return true; }
     void onLoadParams(const Params& params) override;
     bool onEnabled(Context* context) override;
     void onExecute(Context* context) override;

src/app/commands/cmd_run_script.cpp

@@ -49,9 +49,7 @@ private:
 };
 
 RunScriptCommand::RunScriptCommand()
-  : Command("RunScript",
+  : Command("RunScript", CmdRecordableFlag)
-            "Run Script",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_save_file.cpp

@@ -141,8 +141,8 @@ private:
 
 //////////////////////////////////////////////////////////////////////
 
-SaveFileBaseCommand::SaveFileBaseCommand(const char* short_name, const char* friendly_name, CommandFlags flags)
+SaveFileBaseCommand::SaveFileBaseCommand(const char* id, CommandFlags flags)
-  : Command(short_name, friendly_name, flags)
+  : Command(id, flags)
 {
 }
 
@@ -357,7 +357,7 @@ protected:
 };
 
 SaveFileCommand::SaveFileCommand()
-  : SaveFileBaseCommand("SaveFile", "Save File", CmdRecordableFlag)
+  : SaveFileBaseCommand("SaveFile", CmdRecordableFlag)
 {
 }
 
@@ -393,7 +393,7 @@ protected:
 };
 
 SaveFileAsCommand::SaveFileAsCommand()
-  : SaveFileBaseCommand("SaveFileAs", "Save File As", CmdRecordableFlag)
+  : SaveFileBaseCommand("SaveFileAs", CmdRecordableFlag)
 {
 }
 
@@ -412,7 +412,7 @@ protected:
 };
 
 SaveFileCopyAsCommand::SaveFileCopyAsCommand()
-  : SaveFileBaseCommand("SaveFileCopyAs", "Export", CmdRecordableFlag)
+  : SaveFileBaseCommand("SaveFileCopyAs", CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_save_file.h

@@ -19,7 +19,7 @@ namespace app {
 
   class SaveFileBaseCommand : public Command {
   public:
-    SaveFileBaseCommand(const char* shortName, const char* friendlyName, CommandFlags flags);
+    SaveFileBaseCommand(const char* id, CommandFlags flags);
 
     std::string selectedFilename() const {
       return m_selectedFilename;

src/app/commands/cmd_save_mask.cpp

@@ -32,9 +32,7 @@ protected:
 };
 
 SaveMaskCommand::SaveMaskCommand()
-  : Command("SaveMask",
+  : Command("SaveMask", CmdUIOnlyFlag)
-            "Save Mask",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_save_palette.cpp

@@ -39,9 +39,7 @@ private:
 };
 
 SavePaletteCommand::SavePaletteCommand()
-  : Command("SavePalette",
+  : Command("SavePalette", CmdRecordableFlag)
-            "Save Palette",
-            CmdRecordableFlag)
 {
 }
 

src/app/commands/cmd_scroll.cpp

@@ -10,30 +10,20 @@
 
 #include "app/app.h"
 #include "app/commands/command.h"
+#include "app/commands/move_thing.h"
 #include "app/commands/params.h"
 #include "app/context_access.h"
+#include "app/i18n/strings.h"
 #include "app/modules/editors.h"
-#include "app/pref/preferences.h"
 #include "app/ui/editor/editor.h"
 #include "base/convert_to.h"
+#include "fmt/format.h"
 #include "ui/view.h"
 
 namespace app {
 
 class ScrollCommand : public Command {
 public:
-  enum Direction { Left, Up, Right, Down, };
-  enum Units {
-    Pixel,
-    TileWidth,
-    TileHeight,
-    ZoomedPixel,
-    ZoomedTileWidth,
-    ZoomedTileHeight,
-    ViewportWidth,
-    ViewportHeight
-  };
-
   ScrollCommand();
   Command* clone() const override { return new ScrollCommand(*this); }
 
@@ -45,38 +35,17 @@ protected:
   std::string onGetFriendlyName() const override;
 
 private:
-  Direction m_direction;
+  MoveThing m_moveThing;
-  Units m_units;
-  int m_quantity;
 };
 
 ScrollCommand::ScrollCommand()
-  : Command("Scroll",
+  : Command("Scroll", CmdUIOnlyFlag)
-            "Scroll",
-            CmdUIOnlyFlag)
 {
 }
 
 void ScrollCommand::onLoadParams(const Params& params)
 {
-  std::string direction = params.get("direction");
+  m_moveThing.onLoadParams(params);
-  if (direction == "left") m_direction = Left;
-  else if (direction == "right") m_direction = Right;
-  else if (direction == "up") m_direction = Up;
-  else if (direction == "down") m_direction = Down;
-
-  std::string units = params.get("units");
-  if (units == "pixel") m_units = Pixel;
-  else if (units == "tile-width") m_units = TileWidth;
-  else if (units == "tile-height") m_units = TileHeight;
-  else if (units == "zoomed-pixel") m_units = ZoomedPixel;
-  else if (units == "zoomed-tile-width") m_units = ZoomedTileWidth;
-  else if (units == "zoomed-tile-height") m_units = ZoomedTileHeight;
-  else if (units == "viewport-width") m_units = ViewportWidth;
-  else if (units == "viewport-height") m_units = ViewportHeight;
-
-  int quantity = params.get_as<int>("quantity");
-  m_quantity = std::max<int>(1, quantity);
 }
 
 bool ScrollCommand::onEnabled(Context* context)
@@ -87,92 +56,17 @@ bool ScrollCommand::onEnabled(Context* context)
 
 void ScrollCommand::onExecute(Context* context)
 {
-  DocumentPreferences& docPref = Preferences::instance().document(context->activeDocument());
   ui::View* view = ui::View::getView(current_editor);
-  gfx::Rect vp = view->viewportBounds();
   gfx::Point scroll = view->viewScroll();
-  gfx::Rect gridBounds = docPref.grid.bounds();
+  gfx::Point delta = m_moveThing.getDelta(context);
-  gfx::Point delta(0, 0);
-  int pixels = 0;
-
-  switch (m_units) {
-    case Pixel:
-      pixels = 1;
-      break;
-    case TileWidth:
-      pixels = gridBounds.w;
-      break;
-    case TileHeight:
-      pixels = gridBounds.h;
-      break;
-    case ZoomedPixel:
-      pixels = current_editor->zoom().apply(1);
-      break;
-    case ZoomedTileWidth:
-      pixels = current_editor->zoom().apply(gridBounds.w);
-      break;
-    case ZoomedTileHeight:
-      pixels = current_editor->zoom().apply(gridBounds.h);
-      break;
-    case ViewportWidth:
-      pixels = vp.h;
-      break;
-    case ViewportHeight:
-      pixels = vp.w;
-      break;
-  }
-
-  switch (m_direction) {
-    case Left:  delta.x = -m_quantity * pixels; break;
-    case Right: delta.x = +m_quantity * pixels; break;
-    case Up:    delta.y = -m_quantity * pixels; break;
-    case Down:  delta.y = +m_quantity * pixels; break;
-  }
 
   current_editor->setEditorScroll(scroll+delta);
 }
 
 std::string ScrollCommand::onGetFriendlyName() const
 {
-  std::string text = "Scroll " + base::convert_to<std::string>(m_quantity);
+  return fmt::format(getBaseFriendlyName(),
-
+                     m_moveThing.getFriendlyString());
-  switch (m_units) {
-    case Pixel:
-      text += " pixel";
-      break;
-    case TileWidth:
-      text += " horizontal tile";
-      break;
-    case TileHeight:
-      text += " vertical tile";
-      break;
-    case ZoomedPixel:
-      text += " zoomed pixel";
-      break;
-    case ZoomedTileWidth:
-      text += " zoomed horizontal tile";
-      break;
-    case ZoomedTileHeight:
-      text += " zoomed vertical tile";
-      break;
-    case ViewportWidth:
-      text += " viewport width";
-      break;
-    case ViewportHeight:
-      text += " viewport height";
-      break;
-  }
-  if (m_quantity != 1)
-    text += "s";
-
-  switch (m_direction) {
-    case Left:  text += " left"; break;
-    case Right: text += " right"; break;
-    case Up:    text += " up"; break;
-    case Down:  text += " down"; break;
-  }
-
-  return text;
 }
 
 Command* CommandFactory::createScrollCommand()

src/app/commands/cmd_scroll_center.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -27,9 +27,7 @@ protected:
 };
 
 ScrollCenterCommand::ScrollCenterCommand()
-  : Command("ScrollCenter",
+  : Command("ScrollCenter", CmdUIOnlyFlag)
-            "Scroll to center of canvas",
-            CmdUIOnlyFlag)
 {
 }
 

src/app/commands/cmd_select_tile.cpp

@@ -12,6 +12,7 @@
 #include "app/commands/command.h"
 #include "app/context_access.h"
 #include "app/document.h"
+#include "app/i18n/strings.h"
 #include "app/modules/editors.h"
 #include "app/modules/gui.h"
 #include "app/pref/preferences.h"
@@ -19,6 +20,7 @@
 #include "app/transaction.h"
 #include "app/ui/editor/editor.h"
 #include "doc/mask.h"
+#include "fmt/format.h"
 #include "ui/system.h"
 
 namespace app {
@@ -41,9 +43,7 @@ private:
 };
 
 SelectTileCommand::SelectTileCommand()
-  : Command("SelectTile",
+  : Command("SelectTile", CmdRecordableFlag)
-            "Select Tile",
-            CmdRecordableFlag)
   , m_mode(gen::SelectionMode::DEFAULT)
 {
 }
@@ -94,7 +94,7 @@ void SelectTileCommand::onExecute(Context* ctx)
 
   // Set the new mask
   Transaction transaction(writer.context(),
-                          "Select Tile",
+                          friendlyName(),
                           DoesntModifyDocument);
   transaction.execute(new cmd::SetMask(doc, mask));
   transaction.commit();
@@ -105,13 +105,18 @@ void SelectTileCommand::onExecute(Context* ctx)
 
 std::string SelectTileCommand::onGetFriendlyName() const
 {
-  std::string text = "Select Tile";
+  std::string text;
-
   switch (m_mode) {
-    case gen::SelectionMode::ADD: text += " (Add)"; break;
+    case gen::SelectionMode::ADD:
-    case gen::SelectionMode::SUBTRACT: text += " (Subtract)"; break;
+      text = Strings::commands_SelectTile_Add();
+      break;
+    case gen::SelectionMode::SUBTRACT:
+      text = Strings::commands_SelectTile_Subtract();
+      break;
+    default:
+      text = getBaseFriendlyName();;
+      break;
   }
-
   return text;
 }