From 7824b1333534e278c4cf75b5b73ffc14277f022e Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Sun, 12 Apr 2020 19:50:14 +0300 Subject: [PATCH] Changed hint_tooltips from the old string formats to actual sentences Besides the timeline buttons and color switch button being ready to have their changed shortcuts (when we implement them for these buttons) in their hint tooltips, there is no new functionality. This is merely to make the lives of translators easier. This is the final commit of weird string IDs being replaced to actual sentences in Translations.pot --- Main.tscn | 48 ++++++++++++++---------------- Prefabs/AnimationTimeline.tscn | 3 +- Prefabs/Dialogs/AboutDialog.tscn | 2 +- Prefabs/Dialogs/ImportSprites.tscn | 10 +++---- Scripts/Global.gd | 26 ++++++++++++++++ Translations/Translations.pot | 27 ++++++++++++----- 6 files changed, 76 insertions(+), 40 deletions(-) diff --git a/Main.tscn b/Main.tscn index 3ca25de..46c1d23 100644 --- a/Main.tscn +++ b/Main.tscn @@ -228,7 +228,6 @@ __meta__ = { ]] margin_right = 32.0 margin_bottom = 32.0 -hint_tooltip = "RECTSELECT_HT" mouse_default_cursor_shape = 2 button_mask = 3 texture_normal = ExtResource( 4 ) @@ -239,7 +238,6 @@ texture_normal = ExtResource( 4 ) margin_top = 36.0 margin_right = 32.0 margin_bottom = 68.0 -hint_tooltip = "COLORPICKER_HT" mouse_default_cursor_shape = 2 button_mask = 3 texture_normal = ExtResource( 5 ) @@ -250,7 +248,6 @@ texture_normal = ExtResource( 5 ) margin_top = 72.0 margin_right = 32.0 margin_bottom = 104.0 -hint_tooltip = "PENCIL_HT" mouse_default_cursor_shape = 2 button_mask = 3 texture_normal = ExtResource( 6 ) @@ -261,7 +258,6 @@ texture_normal = ExtResource( 6 ) margin_top = 108.0 margin_right = 32.0 margin_bottom = 140.0 -hint_tooltip = "ERASER_HT" mouse_default_cursor_shape = 2 button_mask = 3 texture_normal = ExtResource( 7 ) @@ -272,7 +268,6 @@ texture_normal = ExtResource( 7 ) margin_top = 144.0 margin_right = 32.0 margin_bottom = 176.0 -hint_tooltip = "BUCKET_HT" mouse_default_cursor_shape = 2 button_mask = 3 texture_normal = ExtResource( 8 ) @@ -283,7 +278,6 @@ texture_normal = ExtResource( 8 ) margin_top = 180.0 margin_right = 32.0 margin_bottom = 212.0 -hint_tooltip = "LD_HT" mouse_default_cursor_shape = 2 button_mask = 3 texture_normal = ExtResource( 9 ) @@ -470,7 +464,6 @@ margin_bottom = 7.0 margin_left = 137.0 margin_right = 162.0 margin_bottom = 7.0 -hint_tooltip = "COLORSWITCH_HT" mouse_default_cursor_shape = 2 shortcut_in_tooltip = false shortcut = SubResource( 2 ) @@ -491,7 +484,7 @@ custom_constants/separation = 13 margin_right = 64.0 margin_bottom = 32.0 rect_min_size = Vector2( 64, 32 ) -hint_tooltip = "LEFTCOLOR_HT" +hint_tooltip = "Choose a color for the left tool" mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 0 @@ -501,7 +494,7 @@ margin_left = 77.0 margin_right = 141.0 margin_bottom = 32.0 rect_min_size = Vector2( 64, 32 ) -hint_tooltip = "RIGHTCOLOR_HT" +hint_tooltip = "Choose a color for the right tool" mouse_default_cursor_shape = 2 size_flags_horizontal = 0 size_flags_vertical = 0 @@ -519,7 +512,7 @@ size_flags_horizontal = 3 margin_left = 137.0 margin_right = 162.0 margin_bottom = 8.0 -hint_tooltip = "COLORDEFAULTS_HT" +hint_tooltip = "Reset the colors to their default state (black for left, white for right)" mouse_default_cursor_shape = 2 texture_normal = ExtResource( 11 ) @@ -557,7 +550,7 @@ margin_left = 25.0 margin_right = 61.0 margin_bottom = 32.0 rect_min_size = Vector2( 36, 32 ) -hint_tooltip = "BRUSH_HT" +hint_tooltip = "Select a brush" mouse_default_cursor_shape = 2 size_flags_horizontal = 0 texture_normal = ExtResource( 12 ) @@ -607,7 +600,7 @@ alignment = 1 margin_left = 27.0 margin_right = 117.0 margin_bottom = 15.0 -hint_tooltip = "COLORFROM_HT" +hint_tooltip = "0: Color from the brush itself, 100: the currently selected color" mouse_filter = 1 size_flags_horizontal = 4 text = "Brush color from" @@ -617,7 +610,7 @@ margin_left = 45.0 margin_top = 19.0 margin_right = 99.0 margin_bottom = 36.0 -hint_tooltip = "COLORFROM_HT" +hint_tooltip = "0: Color from the brush itself, 100: the currently selected color" size_flags_horizontal = 4 value = 100.0 align = 1 @@ -628,7 +621,7 @@ margin_top = 40.0 margin_right = 117.0 margin_bottom = 56.0 rect_min_size = Vector2( 92, 0 ) -hint_tooltip = "COLORFROM_HT" +hint_tooltip = "0: Color from the brush itself, 100: the currently selected color" size_flags_horizontal = 4 size_flags_vertical = 1 value = 100.0 @@ -690,7 +683,7 @@ margin_left = 45.0 margin_top = 46.0 margin_right = 99.0 margin_bottom = 63.0 -hint_tooltip = "LDAMOUNT_HT" +hint_tooltip = "Lighten/Darken amount" mouse_default_cursor_shape = 2 size_flags_horizontal = 4 value = 10.0 @@ -702,7 +695,7 @@ margin_top = 67.0 margin_right = 117.0 margin_bottom = 83.0 rect_min_size = Vector2( 92, 0 ) -hint_tooltip = "LDAMOUNT_HT" +hint_tooltip = "Lighten/Darken amount" mouse_default_cursor_shape = 2 size_flags_horizontal = 4 size_flags_vertical = 1 @@ -753,7 +746,7 @@ alignment = 1 margin_left = 34.0 margin_right = 49.0 margin_bottom = 17.0 -hint_tooltip = "HORIZMIRROR_HT" +hint_tooltip = "Enable horizontal mirrored drawing" mouse_default_cursor_shape = 2 toggle_mode = true texture_normal = ExtResource( 30 ) @@ -765,7 +758,7 @@ texture_pressed = ExtResource( 40 ) margin_left = 93.0 margin_right = 110.0 margin_bottom = 17.0 -hint_tooltip = "VERTMIRROR_HT" +hint_tooltip = "Enable vertical mirrored drawing" mouse_default_cursor_shape = 2 toggle_mode = true texture_normal = ExtResource( 42 ) @@ -799,7 +792,7 @@ margin_left = 25.0 margin_right = 61.0 margin_bottom = 32.0 rect_min_size = Vector2( 36, 32 ) -hint_tooltip = "BRUSH_HT" +hint_tooltip = "Select a brush" mouse_default_cursor_shape = 2 size_flags_horizontal = 0 texture_normal = ExtResource( 12 ) @@ -810,6 +803,9 @@ margin_bottom = 32.0 texture = SubResource( 6 ) expand = true stretch_mode = 6 +__meta__ = { +"_edit_use_anchors_": false +} [node name="RightBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit/ColorAndToolOptions/ScrollContainer/ToolOptions/RightToolOptions/RightBrushType"] margin_left = 65.0 @@ -846,7 +842,7 @@ alignment = 1 margin_left = 27.0 margin_right = 117.0 margin_bottom = 15.0 -hint_tooltip = "COLORFROM_HT" +hint_tooltip = "0: Color from the brush itself, 100: the currently selected color" mouse_filter = 1 size_flags_horizontal = 4 text = "Brush color from" @@ -856,7 +852,7 @@ margin_left = 45.0 margin_top = 19.0 margin_right = 99.0 margin_bottom = 36.0 -hint_tooltip = "COLORFROM_HT" +hint_tooltip = "0: Color from the brush itself, 100: the currently selected color" mouse_default_cursor_shape = 2 size_flags_horizontal = 4 value = 100.0 @@ -868,7 +864,7 @@ margin_top = 40.0 margin_right = 117.0 margin_bottom = 56.0 rect_min_size = Vector2( 92, 0 ) -hint_tooltip = "COLORFROM_HT" +hint_tooltip = "0: Color from the brush itself, 100: the currently selected color" mouse_default_cursor_shape = 2 size_flags_horizontal = 4 size_flags_vertical = 1 @@ -929,7 +925,7 @@ margin_left = 42.0 margin_top = 46.0 margin_right = 96.0 margin_bottom = 63.0 -hint_tooltip = "LDAMOUNT_HT" +hint_tooltip = "Lighten/Darken amount" mouse_default_cursor_shape = 2 size_flags_horizontal = 4 value = 10.0 @@ -941,7 +937,7 @@ margin_top = 67.0 margin_right = 114.0 margin_bottom = 83.0 rect_min_size = Vector2( 92, 0 ) -hint_tooltip = "LDAMOUNT_HT" +hint_tooltip = "Lighten/Darken amount" mouse_default_cursor_shape = 2 size_flags_horizontal = 4 size_flags_vertical = 1 @@ -992,7 +988,7 @@ alignment = 1 margin_left = 34.0 margin_right = 49.0 margin_bottom = 17.0 -hint_tooltip = "HORIZMIRROR_HT" +hint_tooltip = "Enable horizontal mirrored drawing" mouse_default_cursor_shape = 2 toggle_mode = true texture_normal = ExtResource( 30 ) @@ -1004,7 +1000,7 @@ texture_pressed = ExtResource( 40 ) margin_left = 93.0 margin_right = 110.0 margin_bottom = 17.0 -hint_tooltip = "VERTMIRROR_HT" +hint_tooltip = "Enable vertical mirrored drawing" mouse_default_cursor_shape = 2 toggle_mode = true texture_normal = ExtResource( 42 ) diff --git a/Prefabs/AnimationTimeline.tscn b/Prefabs/AnimationTimeline.tscn index 561dfb9..b5d78ed 100644 --- a/Prefabs/AnimationTimeline.tscn +++ b/Prefabs/AnimationTimeline.tscn @@ -403,7 +403,8 @@ texture_hover = ExtResource( 34 ) margin_left = 62.0 margin_right = 136.0 margin_bottom = 24.0 -hint_tooltip = "FPS_HT" +hint_tooltip = "How many frames per second should the animation preview be? +The more FPS, the faster the animation plays." mouse_default_cursor_shape = 2 min_value = 0.1 step = 0.1 diff --git a/Prefabs/Dialogs/AboutDialog.tscn b/Prefabs/Dialogs/AboutDialog.tscn index 9f00142..9af8733 100644 --- a/Prefabs/Dialogs/AboutDialog.tscn +++ b/Prefabs/Dialogs/AboutDialog.tscn @@ -189,7 +189,7 @@ margin_bottom = 241.0 margin_top = 245.0 margin_right = 488.0 margin_bottom = 259.0 -text = "MADEBY_LABEL" +text = "Developed by Orama Interactive" align = 1 [node name="Copyright" type="Label" parent="AboutUI"] diff --git a/Prefabs/Dialogs/ImportSprites.tscn b/Prefabs/Dialogs/ImportSprites.tscn index 883fd14..dd7afd7 100644 --- a/Prefabs/Dialogs/ImportSprites.tscn +++ b/Prefabs/Dialogs/ImportSprites.tscn @@ -21,18 +21,18 @@ margin_right = 507.0 margin_bottom = 312.0 [node name="ImportAsNewFrame" type="CheckBox" parent="HBoxContainer2"] -margin_right = 156.0 +margin_right = 161.0 margin_bottom = 304.0 mouse_default_cursor_shape = 2 pressed = true -text = "IMPORT_FILE_LABEL" +text = "Import as new frame" [node name="ImportSpritesheet" type="CheckBox" parent="HBoxContainer2"] -margin_left = 160.0 -margin_right = 327.0 +margin_left = 165.0 +margin_right = 343.0 margin_bottom = 304.0 mouse_default_cursor_shape = 2 -text = "IMPORT_SPRITESHEET" +text = "Import as a spritesheet" [node name="Spritesheet" type="HBoxContainer" parent="."] visible = false diff --git a/Scripts/Global.gd b/Scripts/Global.gd index af22720..c223c3a 100644 --- a/Scripts/Global.gd +++ b/Scripts/Global.gd @@ -702,6 +702,32 @@ Hold %s to make a line""") % [InputMap.get_action_list("left_eraser_tool")[0].as %s for left mouse button %s for right mouse button""") % [InputMap.get_action_list("left_lightdark_tool")[0].as_text(), InputMap.get_action_list("right_lightdark_tool")[0].as_text()] + var color_switch : BaseButton = find_node_by_name(root, "ColorSwitch") + color_switch.hint_tooltip = tr("""Switch left and right colors +(%s)""") % "X" + + var first_frame : BaseButton = find_node_by_name(root, "FirstFrame") + first_frame.hint_tooltip = tr("""Jump to the first frame +(%s)""") % "Ctrl+Home" + + var previous_frame : BaseButton = find_node_by_name(root, "PreviousFrame") + previous_frame.hint_tooltip = tr("""Go to the previous frame +(%s)""") % "Ctrl+Left" + + play_backwards.hint_tooltip = tr("""Play the animation backwards (from end to beginning) +(%s)""") % "F4" + + play_forward.hint_tooltip = tr("""Play the animation forward (from beginning to end) +(%s)""") % "F5" + + var next_frame : BaseButton = find_node_by_name(root, "NextFrame") + next_frame.hint_tooltip = tr("""Go to the next frame +(%s)""") % "Ctrl+Right" + + var last_frame : BaseButton = find_node_by_name(root, "LastFrame") + last_frame.hint_tooltip = tr("""Jump to the last frame +(%s)""") % "Ctrl+End" + func create_brush_button(brush_img : Image, brush_type := Brush_Types.CUSTOM, hint_tooltip := "") -> void: var brush_container diff --git a/Translations/Translations.pot b/Translations/Translations.pot index 92d8b2e..2c21a58 100644 --- a/Translations/Translations.pot +++ b/Translations/Translations.pot @@ -486,7 +486,8 @@ msgstr "" msgid "Choose a color for the right tool" msgstr "" -msgid "COLORSWITCH_HT" +msgid "Switch left and right colors\n" +"(%s)" msgstr "" msgid "Reset the colors to their default state (black for left, white for right)" @@ -600,22 +601,28 @@ msgstr "" msgid "Current frame: 1/1" msgstr "" -msgid "FIRSTFRAME_HT" +msgid "Jump to the first frame\n" +"(%s)" msgstr "" -msgid "PREVIOUSFRAME_HT" +msgid "Go to the previous frame\n" +"(%s)" msgstr "" -msgid "PLAYBACKWARDS_HT" +msgid "Play the animation backwards (from end to beginning)\n" +"(%s)" msgstr "" -msgid "PLAYFORWARD_HT" +msgid "Play the animation forward (from beginning to end)\n" +"(%s)" msgstr "" -msgid "NEXTFRAME_HT" +msgid "Go to the next frame\n" +"(%s)" msgstr "" -msgid "LASTFRAME_HT" +msgid "Jump to the last frame\n" +"(%s)" msgstr "" msgid "Onion Skinning settings" @@ -646,6 +653,9 @@ msgstr "" msgid "Future Frames" msgstr "" +msgid "Manage frame tags" +msgstr "" + msgid "Blue-Red Mode" msgstr "" @@ -869,6 +879,9 @@ msgstr "" msgid "Preset" msgstr "" +msgid "Preset:" +msgstr "" + msgid "Default" msgstr ""