Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/5.9' into CURA-12188_build_plate…
Browse files Browse the repository at this point in the history
…_z_fighting
  • Loading branch information
rburema committed Nov 5, 2024
2 parents cc1630f + 78d76d4 commit 37ca703
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
3 changes: 3 additions & 0 deletions UM/Qt/qml/UM/TextField.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conandata.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version: "5.9.0-beta.1"
version: "5.9.0-beta.2"
requirements:
- "pyarcus/5.4.1"
15 changes: 7 additions & 8 deletions resources/i18n/ja_JP/uranium.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>\n"
"Language-Team: Japanese <https://github.com/h1data/Cura/wiki>\n"
"Language: ja_JP\n"
Expand Down Expand Up @@ -78,7 +78,7 @@ msgstr "構成エラー"

msgctxt "@title:window"
msgid "Confirm Remove"
msgstr "モデルを取り除きました"
msgstr "モデルを削除しました"

msgctxt "name"
msgid "Console Logger"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -322,7 +322,7 @@ msgstr "プラグイン{}は検証できなかったため、読み込まれて

msgctxt "@title:window"
msgid "Preferences"
msgstr "プレファレンス"
msgstr "環境設定"

msgctxt "@title:tab"
msgid "Printers"
Expand Down Expand Up @@ -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>."
Expand Down Expand Up @@ -609,7 +608,7 @@ msgstr "アップデートチェッカー"

msgctxt "@info:progress"
msgid "Updating configuration..."
msgstr "コンフィグレーションをアップデートする..."
msgstr "コンフィグレーションをアップデート中..."

msgctxt "@info:title"
msgid "Updating error"
Expand Down

0 comments on commit 37ca703

Please sign in to comment.