Merge remote-tracking branch 'origin/5.9'

Ultimaker · Nov 7, 2024 · 3fa3396 · 3fa3396
2 parents 24954ff + 78d76d4
commit 3fa3396
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/UM/Qt/qml/UM/TextField.qml b/UM/Qt/qml/UM/TextField.qml
@@ -30,6 +30,9 @@ TextField
     placeholderTextColor: UM.Theme.getColor("text_field_text_disabled")
     selectionColor: UM.Theme.getColor("text_selection")
 
+    // Force getting focus on press to fix selection by triple-click
+    onPressed: forceActiveFocus()
+
     background: UM.UnderlineBackground
     {
         id: background

diff --git a/resources/i18n/ja_JP/uranium.po b/resources/i18n/ja_JP/uranium.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-07-08 09:10+0200\n"
-"PO-Revision-Date: 2024-08-03 02:34+0000\n"
+"PO-Revision-Date: 2024-10-30 02:17+0000\n"
 "Last-Translator: h1data <h1data@users.noreply.github.com>\n"
 "Language-Team: Japanese <https://github.com/h1data/Cura/wiki>\n"
 "Language: ja_JP\n"
@@ -78,7 +78,7 @@ msgstr "構成エラー"
 
 msgctxt "@title:window"
 msgid "Confirm Remove"
-msgstr "モデルを取り除きました"
+msgstr "モデルを削除しました"
 
 msgctxt "name"
 msgid "Console Logger"
@@ -198,11 +198,11 @@ msgstr "プラグイン{plugin_id}をロード中..."
 
 msgctxt "@info:progress"
 msgid "Loading plugins..."
-msgstr "プラグインをロードする..."
+msgstr "プラグインをロード中..."
 
 msgctxt "@info:progress"
 msgid "Loading preferences..."
-msgstr "プレファレンスをロード中..."
+msgstr "環境設定をロード中..."
 
 msgctxt "name"
 msgid "Local Container Provider"
@@ -322,7 +322,7 @@ msgstr "プラグイン{}は検証できなかったため、読み込まれて
 
 msgctxt "@title:window"
 msgid "Preferences"
-msgstr "プレファレンス"
+msgstr "環境設定"
 
 msgctxt "@title:tab"
 msgid "Printers"
@@ -560,8 +560,7 @@ msgstr ""
 
 msgctxt "@error:uninstall"
 msgid "There were some errors uninstalling the following packages: {packages}"
-msgstr "次のパッケージのアンインストールでエラーが発生しました:"
-"{packages}"
+msgstr "次のパッケージのアンインストールでエラーが発生しました:{packages}"
 
 msgctxt "@info:status Don't translate the XML tag <filename>!"
 msgid "There where no models in <filename>{0}</filename>."
@@ -609,7 +608,7 @@ msgstr "アップデートチェッカー"
 
 msgctxt "@info:progress"
 msgid "Updating configuration..."
-msgstr "コンフィグレーションをアップデートする..."
+msgstr "コンフィグレーションをアップデート中..."
 
 msgctxt "@info:title"
 msgid "Updating error"