From 3a8226c3f16f826b48933c4cf9fed0961ba87970 Mon Sep 17 00:00:00 2001 From: h1data Date: Wed, 30 Oct 2024 13:18:40 +0900 Subject: [PATCH 1/3] tweaks common terms for Japanese translation --- resources/i18n/ja_JP/uranium.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/resources/i18n/ja_JP/uranium.po b/resources/i18n/ja_JP/uranium.po index 8dd67bd8d..c83ed69ef 100644 --- 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 \n" "Language-Team: Japanese \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 !" msgid "There where no models in {0}." @@ -609,7 +608,7 @@ msgstr "アップデートチェッカー" msgctxt "@info:progress" msgid "Updating configuration..." -msgstr "コンフィグレーションをアップデートする..." +msgstr "コンフィグレーションをアップデート中..." msgctxt "@info:title" msgid "Updating error" From 1ec052a193175ba403e752e09fe426ce5080e3f4 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 31 Oct 2024 16:06:54 +0100 Subject: [PATCH 2/3] Allow keep focus after triple-click selection CURA-9314 --- UM/Qt/qml/UM/TextField.qml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UM/Qt/qml/UM/TextField.qml b/UM/Qt/qml/UM/TextField.qml index 786893429..a8bd64df6 100644 --- 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 From 78d76d45477770bdddad978307d9b52d3d2c1b1b Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 5 Nov 2024 13:05:12 +0000 Subject: [PATCH 3/3] Set conan package version 5.9.0-beta.2 --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index ad43f7d97..be7eca064 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,3 +1,3 @@ -version: "5.9.0-beta.1" +version: "5.9.0-beta.2" requirements: - "pyarcus/5.4.1"