[i18n] Add some hardcoded strings to en.ini (fix #4237)

data/strings/en.ini

@@ -117,6 +117,7 @@ brightness_label = Brightness:
 contrast_label = Contrast:
 
 [brush_slot_params]
+title = Parameters
 brush = Brush:
 brush_type = Type
 brush_size = Size
@@ -135,7 +136,6 @@ save_brush = Save Brush Here
 locked = Locked
 delete = Delete
 delete_all = Delete All
-saved_parameters = Saved Parameters
 
 [cel_movement_popup_menu]
 move = &Move
@@ -351,6 +351,7 @@ NewFrame_NewEmptyFrame = New Empty Frame
 NewFrame_DuplicateCels = Duplicate Cels w/Layer Mode
 NewFrame_DuplicateCelsCopies = Duplicate Cels
 NewFrame_DuplicateCelsLinked = Duplicate Linked Cels
+NewFrame_tooltip = New Frame {}/{}
 NewFrameTag = New Tag
 NewLayer = New {}
 NewLayer_BeforeActiveLayer = New {} Below
@@ -553,6 +554,8 @@ stop_at_grid = Stop at Grid
 refer_active_layer = Refer active layer
 refer_visible_layer = Refer visible layers
 pixel_connectivity = Pixel Connectivity:
+pixel_connectivity_4 = 4-Connected
+pixel_connectivity_8 = 8-Connected
 select_palette_color = Select colors in the palette
 reverse_shade = Reverse Shade
 save_shade = Save Shade
@@ -583,6 +586,7 @@ brush_angle = Brush Angle (in degrees)
 ink = Ink
 opacity = Opacity (paint intensity)
 shades = Shades
+spray = Spray:
 spray_width = Spray Width
 spray_speed = Spray Speed
 rotation_pivot = Rotation Pivot
@@ -591,6 +595,13 @@ dynamics = Dynamics
 freehand_trace_algorithm = Freehand trace algorithm
 contiguous_fill = Fill contiguous areas color
 paint_bucket_option = Extra paint bucket options
+eyedropper_combined = {0} + {1}
+eyedropper_color = Color
+eyedropper_alpha = Alpha
+eyedropper_rgb = RGB
+eyedropper_hsv = HSV
+eyedropper_hsl = HSL
+eyedropper_gray = Gray
 best_fit_index = Best fit Index
 all_layers = All Layers
 current_layer = Current Layer
@@ -605,6 +616,13 @@ reload_stock = &Reload Stock
 width = Width:
 height = Height:
 
+[downsampling]
+label = Downsampling:
+nearest = Nearest
+bilinear = Bilinear
+bilinear_mipmap = Bilinear mipmapping
+trilinear_mipmap = Trilinear mipmapping
+
 [duplicate_sprite]
 title = Duplicate Sprite
 duplicate = Duplicate:
@@ -772,6 +790,8 @@ reset = Reset
 advanced_options = Advanced Options
 unknown = Unknown
 same_in_all_tools = Same in all Tools
+opacity = Opacity:
+tolerance = Tolerance:
 
 [gif_options]
 title = GIF Options
@@ -1626,6 +1646,12 @@ cancel = Cancel
 text = Select File
 browse = ...
 
+[selection_mode]
+replace = Replace selection
+add = Add to selection
+subtract = Subtract from selection
+intersect = Intersect selection
+
 [send_crash]
 title = Crash Report
 send_file = Please send the following file:

src/app/commands/cmd_new_frame.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2022  Igara Studio S.A.
+// Copyright (C) 2018-2023  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -181,9 +181,10 @@ void NewFrameCommand::onExecute(Context* context)
     update_screen_for_document(document);
 
     StatusBar::instance()->showTip(
-      1000, fmt::format("New frame {}/{}",
+      1000, fmt::format(
-                        (int)context->activeSite().frame()+1,
+        Strings::commands_NewFrame_tooltip(),
-                        (int)sprite->totalFrames()));
+        (int)context->activeSite().frame()+1,
+        (int)sprite->totalFrames()));
 
     App::instance()->mainWindow()->popTimeline();
   }

src/app/ui/brush_popup.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2022  Igara Studio S.A.
+// Copyright (C) 2018-2023  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -181,7 +181,7 @@ private:
     menu.addChild(&deleteAllItem);
     menu.addChild(new Label(""));
     menu.addChild(
-      new Separator(Strings::brush_slot_params_saved_parameters(), HORIZONTAL));
+      new Separator(Strings::brush_slot_params_title(), HORIZONTAL));
 
     app::gen::BrushSlotParams params;
     menu.addChild(&params);
@@ -290,7 +290,8 @@ private:
   void onClick() override {
     Menu menu;
 
-    menu.addChild(new Separator("Parameters to Save", HORIZONTAL));
+    menu.addChild(
+      new Separator(Strings::brush_slot_params_title(), HORIZONTAL));
 
     app::gen::BrushSlotParams params;
     menu.addChild(&params);

src/app/ui/context_bar.cpp

@@ -411,8 +411,8 @@ protected:
 
     HBox box;
     ButtonSet buttonset(2);
-    buttonset.addItem("4-Connected");
+    buttonset.addItem(Strings::context_bar_pixel_connectivity_4());
-    buttonset.addItem("8-connected");
+    buttonset.addItem(Strings::context_bar_pixel_connectivity_8());
     box.addChild(&buttonset);
     menu.addChild(&box);
 
@@ -1432,17 +1432,33 @@ protected:
 class ContextBar::EyedropperField : public HBox {
 public:
   EyedropperField() {
-    m_channel.addItem("Color+Alpha");
+    const auto combined = Strings::context_bar_eyedropper_combined();
-    m_channel.addItem("Color");
+    m_channel.addItem(fmt::format(
-    m_channel.addItem("Alpha");
+                        combined,
-    m_channel.addItem("RGB+Alpha");
+                        Strings::context_bar_eyedropper_color(),
-    m_channel.addItem("RGB");
+                        Strings::context_bar_eyedropper_alpha()));
-    m_channel.addItem("HSV+Alpha");
+    m_channel.addItem(Strings::context_bar_eyedropper_color());
-    m_channel.addItem("HSV");
+    m_channel.addItem(Strings::context_bar_eyedropper_alpha());
-    m_channel.addItem("HSL+Alpha");
+    m_channel.addItem(fmt::format(
-    m_channel.addItem("HSL");
+                        combined,
-    m_channel.addItem("Gray+Alpha");
+                        Strings::context_bar_eyedropper_rgb(),
-    m_channel.addItem("Gray");
+                        Strings::context_bar_eyedropper_alpha()));
+    m_channel.addItem(Strings::context_bar_eyedropper_rgb());
+    m_channel.addItem(fmt::format(
+                        combined,
+                        Strings::context_bar_eyedropper_hsv(),
+                        Strings::context_bar_eyedropper_alpha()));
+    m_channel.addItem(Strings::context_bar_eyedropper_hsv());
+    m_channel.addItem(fmt::format(
+                        combined,
+                        Strings::context_bar_eyedropper_hsl(),
+                        Strings::context_bar_eyedropper_alpha()));
+    m_channel.addItem(Strings::context_bar_eyedropper_hsl());
+    m_channel.addItem(fmt::format(
+                        combined,
+                        Strings::context_bar_eyedropper_gray(),
+                        Strings::context_bar_eyedropper_alpha()));
+    m_channel.addItem(Strings::context_bar_eyedropper_gray());
     m_channel.addItem(Strings::context_bar_best_fit_index());
 
     m_sample.addItem(Strings::context_bar_all_layers());
@@ -1854,7 +1870,7 @@ ContextBar::ContextBar(TooltipManager* tooltipManager,
   addChild(m_brushAngle = new BrushAngleField(m_brushType));
   addChild(m_brushPatternField = new BrushPatternField());
 
-  addChild(m_toleranceLabel = new Label("Tolerance:"));
+  addChild(m_toleranceLabel = new Label(Strings::general_tolerance()));
   addChild(m_tolerance = new ToleranceField());
   addChild(m_contiguous = new ContiguousField());
   addChild(m_paintBucketSettings = new PaintBucketSettingsField());
@@ -1863,7 +1879,7 @@ ContextBar::ContextBar(TooltipManager* tooltipManager,
   m_ditheringSelector->setUseCustomWidget(false); // Disable custom widget because the context bar is too small
 
   addChild(m_inkType = new InkTypeField(this));
-  addChild(m_inkOpacityLabel = new Label("Opacity:"));
+  addChild(m_inkOpacityLabel = new Label(Strings::general_opacity()));
   addChild(m_inkOpacity = new InkOpacityField());
   addChild(m_inkShades = new InkShadesField(colorBar));
 
@@ -1872,7 +1888,7 @@ ContextBar::ContextBar(TooltipManager* tooltipManager,
   addChild(m_autoSelectLayer = new AutoSelectLayerField());
 
   addChild(m_sprayBox = new HBox());
-  m_sprayBox->addChild(m_sprayLabel = new Label("Spray:"));
+  m_sprayBox->addChild(m_sprayLabel = new Label(Strings::context_bar_spray()));
   m_sprayBox->addChild(m_sprayWidth = new SprayWidthField());
   m_sprayBox->addChild(m_spraySpeed = new SpraySpeedField());
 
@@ -2604,12 +2620,14 @@ void ContextBar::setupTooltips(TooltipManager* tooltipManager)
     m_rotAlgo, Strings::context_bar_rotation_algorithm(), BOTTOM);
   tooltipManager->addTooltipFor(
     m_dynamics->at(0), Strings::context_bar_dynamics(), BOTTOM);
-  tooltipManager->addTooltipFor(m_freehandAlgo,
+  tooltipManager->addTooltipFor(
-                                key_tooltip("Freehand trace algorithm",
+    m_freehandAlgo,
-                                            CommandId::PixelPerfectMode()), BOTTOM);
+    key_tooltip(Strings::context_bar_freehand_trace_algorithm().c_str(),
-  tooltipManager->addTooltipFor(m_contiguous,
+                CommandId::PixelPerfectMode()), BOTTOM);
-                                key_tooltip("Fill contiguous areas color",
+  tooltipManager->addTooltipFor(
-                                            CommandId::ContiguousFill()), BOTTOM);
+    m_contiguous,
+    key_tooltip(Strings::context_bar_contiguous_fill().c_str(),
+                CommandId::ContiguousFill()), BOTTOM);
   tooltipManager->addTooltipFor(
     m_paintBucketSettings->at(0), Strings::context_bar_paint_bucket_option(), BOTTOM);
 

src/app/ui/sampling_selector.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2022  Igara Studio S.A.
+// Copyright (C) 2022-2023  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -10,6 +10,7 @@
 
 #include "app/ui/sampling_selector.h"
 
+#include "app/i18n/strings.h"
 #include "ui/listitem.h"
 
 namespace app {
@@ -18,15 +19,15 @@ using namespace ui;
 
 SamplingSelector::SamplingSelector(Behavior behavior)
   : m_behavior(behavior)
-  , m_downsamplingLabel("Downsampling:")
+  , m_downsamplingLabel(Strings::downsampling_label())
 {
   addChild(&m_downsamplingLabel);
   addChild(&m_downsampling);
 
-  m_downsampling.addItem(new ListItem("Nearest"));
+  m_downsampling.addItem(new ListItem(Strings::downsampling_nearest()));
-  m_downsampling.addItem(new ListItem("Bilinear"));
+  m_downsampling.addItem(new ListItem(Strings::downsampling_bilinear()));
-  m_downsampling.addItem(new ListItem("Bilinear mipmapping"));
+  m_downsampling.addItem(new ListItem(Strings::downsampling_bilinear_mipmap()));
-  m_downsampling.addItem(new ListItem("Trilinear mipmapping"));
+  m_downsampling.addItem(new ListItem(Strings::downsampling_trilinear_mipmap()));
   m_downsampling.setSelectedItemIndex(
     (int)Preferences::instance().editor.downsampling());
 

src/app/ui/selection_mode_field.cpp

@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2022  Igara Studio S.A.
+// Copyright (C) 2018-2023  Igara Studio S.A.
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -10,6 +10,7 @@
 
 #include "app/ui/selection_mode_field.h"
 
+#include "app/i18n/strings.h"
 #include "app/ui/keyboard_shortcuts.h"
 #include "app/ui/skin/skin_theme.h"
 #include "ui/tooltips.h"
@@ -36,16 +37,19 @@ SelectionModeField::SelectionModeField()
 void SelectionModeField::setupTooltips(TooltipManager* tooltipManager)
 {
   tooltipManager->addTooltipFor(
-    at(0), "Replace selection", BOTTOM);
+    at(0), Strings::selection_mode_replace(), BOTTOM);
 
   tooltipManager->addTooltipFor(
-    at(1), key_tooltip("Add to selection", KeyAction::AddSelection), BOTTOM);
+    at(1), key_tooltip(Strings::selection_mode_add().c_str(),
+                       KeyAction::AddSelection), BOTTOM);
 
   tooltipManager->addTooltipFor(
-    at(2), key_tooltip("Subtract from selection", KeyAction::SubtractSelection), BOTTOM);
+    at(2), key_tooltip(Strings::selection_mode_subtract().c_str(),
+                       KeyAction::SubtractSelection), BOTTOM);
 
   tooltipManager->addTooltipFor(
-    at(3), key_tooltip("Intersect selection", KeyAction::IntersectSelection), BOTTOM);
+    at(3), key_tooltip(Strings::selection_mode_intersect().c_str(),
+                       KeyAction::IntersectSelection), BOTTOM);
 }
 
 gen::SelectionMode SelectionModeField::selectionMode()