Skip to content

Commit

Permalink
Merge pull request #902 from Ultimaker/CURA-10953_introduce_any_color…
Browse files Browse the repository at this point in the history
…_material

Bump version number of container stack
  • Loading branch information
jellespijker authored Sep 12, 2023
2 parents bf0f6b0 + ef8920c commit 24ec6e6
Show file tree
Hide file tree
Showing 19 changed files with 219 additions and 139 deletions.
2 changes: 1 addition & 1 deletion UM/Settings/ContainerStack.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class InvalidContainerStackError(Exception):
class ContainerStack(QObject, ContainerInterface, PluginObject):
"""A stack of setting containers to handle setting value retrieval."""

Version = 5 # type: int
Version = 6 # type: int

def __init__(self, stack_id: str) -> None:
"""Constructor
Expand Down
17 changes: 11 additions & 6 deletions resources/i18n/cs_CZ/uranium.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium 5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-25 09:26+0000\n"
"POT-Creation-Date: 2023-09-12 17:11+0200\n"
"PO-Revision-Date: 2022-04-26 00:14+0200\n"
"Last-Translator: Miroslav Šustek <[email protected]>\n"
"Language-Team: DenyCZ <www.github.com/DenyCZ>\n"
Expand All @@ -22,6 +22,11 @@ msgctxt "@info:version-upgrade"
msgid "A configuration from an older version of {0} was imported."
msgstr "Konfigurace ze starší verze {0} byla nahrána."

#, python-brace-format
msgctxt "@error:Required plugins not found"
msgid "A number of plugins are required, but could not be loaded: {plugins}"
msgstr ""

msgctxt "@option"
msgid "Abort"
msgstr "Zrušit"
Expand Down Expand Up @@ -525,11 +530,6 @@ msgctxt "@option:check"
msgid "Snap Scaling"
msgstr "Škálování po mřížce"

#, python-brace-format
msgctxt "@info:status"
msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
msgstr "Nastala chyba při ukládání do <filename>{0}</filename>: <message>{1}</message>"

#, python-brace-format
msgctxt "@label Don't translate the XML tag <filename>!"
msgid "The file <filename>{0}</filename> already exists. Are you sure you want to overwrite it?"
Expand Down Expand Up @@ -814,6 +814,11 @@ msgstr "{application_name} {version_number} přináší lepší a spolehlivějš
#~ msgid "Save to File"
#~ msgstr "Uložit do souboru"

#, python-brace-format
#~ msgctxt "@info:status"
#~ msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
#~ msgstr "Nastala chyba při ukládání do <filename>{0}</filename>: <message>{1}</message>"

#~ msgctxt "@error"
#~ msgid "The plugin {} could not be loaded. Re-installing the plugin might solve the issue"
#~ msgstr "Modul {} nemohl být načten. Opětovná instalace modulu může problém vyřešit"
Expand Down
17 changes: 11 additions & 6 deletions resources/i18n/de_DE/uranium.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-25 09:26+0000\n"
"POT-Creation-Date: 2023-09-12 17:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -23,6 +23,11 @@ msgctxt "@info:version-upgrade"
msgid "A configuration from an older version of {0} was imported."
msgstr "Eine Konfiguration einer älteren Version von {0} wurde importiert."

#, python-brace-format
msgctxt "@error:Required plugins not found"
msgid "A number of plugins are required, but could not be loaded: {plugins}"
msgstr ""

msgctxt "@option"
msgid "Abort"
msgstr "Abbrechen"
Expand Down Expand Up @@ -526,11 +531,6 @@ msgctxt "@option:check"
msgid "Snap Scaling"
msgstr "Snap-Skalierung"

#, python-brace-format
msgctxt "@info:status"
msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
msgstr "Das Speichern unter <filename>{0}</filename>: <message>{1}</message> hat nicht funktioniert"

#, python-brace-format
msgctxt "@label Don't translate the XML tag <filename>!"
msgid "The file <filename>{0}</filename> already exists. Are you sure you want to overwrite it?"
Expand Down Expand Up @@ -729,3 +729,8 @@ msgstr "{application_name} {version_number} ist verfügbar!"
msgctxt "@info:status"
msgid "{application_name} {version_number} provides a better and more reliable printing experience."
msgstr "{application_name} {version_number} bietet eine bessere und zuverlässigere Druckerfahrung."

#, python-brace-format
#~ msgctxt "@info:status"
#~ msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
#~ msgstr "Das Speichern unter <filename>{0}</filename>: <message>{1}</message> hat nicht funktioniert"
17 changes: 11 additions & 6 deletions resources/i18n/es_ES/uranium.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-25 09:26+0000\n"
"POT-Creation-Date: 2023-09-12 17:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -23,6 +23,11 @@ msgctxt "@info:version-upgrade"
msgid "A configuration from an older version of {0} was imported."
msgstr "Se ha importado una versión anterior de {0}."

#, python-brace-format
msgctxt "@error:Required plugins not found"
msgid "A number of plugins are required, but could not be loaded: {plugins}"
msgstr ""

msgctxt "@option"
msgid "Abort"
msgstr "Cancelar"
Expand Down Expand Up @@ -526,11 +531,6 @@ msgctxt "@option:check"
msgid "Snap Scaling"
msgstr "Ajustar escala"

#, python-brace-format
msgctxt "@info:status"
msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
msgstr "Se ha producido un error al guardar <filename>{0}</filename>: <message>{1}</message>"

#, python-brace-format
msgctxt "@label Don't translate the XML tag <filename>!"
msgid "The file <filename>{0}</filename> already exists. Are you sure you want to overwrite it?"
Expand Down Expand Up @@ -729,3 +729,8 @@ msgstr "¡Está disponible {application_name} {version_number}!"
msgctxt "@info:status"
msgid "{application_name} {version_number} provides a better and more reliable printing experience."
msgstr "{application_name} {version_number} ofrece unos resultados de impresión mejores y más fiables."

#, python-brace-format
#~ msgctxt "@info:status"
#~ msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
#~ msgstr "Se ha producido un error al guardar <filename>{0}</filename>: <message>{1}</message>"
12 changes: 6 additions & 6 deletions resources/i18n/fi_FI/uranium.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium 5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-25 09:26+0000\n"
"POT-Creation-Date: 2023-09-12 17:11+0200\n"
"PO-Revision-Date: 2017-09-27 12:27+0200\n"
"Last-Translator: Bothof <[email protected]>\n"
"Language-Team: Finnish <[email protected]>\n"
Expand All @@ -21,6 +21,11 @@ msgctxt "@info:version-upgrade"
msgid "A configuration from an older version of {0} was imported."
msgstr "Aikaisemman {0} -version määritykset tuotiin."

#, python-brace-format
msgctxt "@error:Required plugins not found"
msgid "A number of plugins are required, but could not be loaded: {plugins}"
msgstr ""

msgctxt "@option"
msgid "Abort"
msgstr ""
Expand Down Expand Up @@ -524,11 +529,6 @@ msgctxt "@option:check"
msgid "Snap Scaling"
msgstr "Kohdista skaalaus"

#, python-brace-format
msgctxt "@info:status"
msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
msgstr ""

#, python-brace-format
msgctxt "@label Don't translate the XML tag <filename>!"
msgid "The file <filename>{0}</filename> already exists. Are you sure you want to overwrite it?"
Expand Down
17 changes: 11 additions & 6 deletions resources/i18n/fr_FR/uranium.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-25 09:26+0000\n"
"POT-Creation-Date: 2023-09-12 17:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -23,6 +23,11 @@ msgctxt "@info:version-upgrade"
msgid "A configuration from an older version of {0} was imported."
msgstr "Une configuration d'une ancienne version de {0} a été importée."

#, python-brace-format
msgctxt "@error:Required plugins not found"
msgid "A number of plugins are required, but could not be loaded: {plugins}"
msgstr ""

msgctxt "@option"
msgid "Abort"
msgstr "Abandonner"
Expand Down Expand Up @@ -526,11 +531,6 @@ msgctxt "@option:check"
msgid "Snap Scaling"
msgstr "Ajustement de l'échelle simplifié"

#, python-brace-format
msgctxt "@info:status"
msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
msgstr "Une erreur est survenue lors de l'enregistrement sur <filename>{0}</filename> : <message>{1}</message>"

#, python-brace-format
msgctxt "@label Don't translate the XML tag <filename>!"
msgid "The file <filename>{0}</filename> already exists. Are you sure you want to overwrite it?"
Expand Down Expand Up @@ -729,3 +729,8 @@ msgstr "{application_name} {version_number} est disponible !"
msgctxt "@info:status"
msgid "{application_name} {version_number} provides a better and more reliable printing experience."
msgstr "{application_name} {version_number} offre une expérience d'impression plus agréable et plus fiable."

#, python-brace-format
#~ msgctxt "@info:status"
#~ msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
#~ msgstr "Une erreur est survenue lors de l'enregistrement sur <filename>{0}</filename> : <message>{1}</message>"
17 changes: 11 additions & 6 deletions resources/i18n/hu_HU/uranium.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Uranium 5.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-25 09:26+0000\n"
"POT-Creation-Date: 2023-09-12 17:11+0200\n"
"PO-Revision-Date: 2019-10-10 22:30+0200\n"
"Last-Translator: Nagy Attila\n"
"Language-Team: AT-VLOG <[email protected]>\n"
Expand All @@ -21,6 +21,11 @@ msgctxt "@info:version-upgrade"
msgid "A configuration from an older version of {0} was imported."
msgstr "A konfiguráció egy régebbi {0} verzióból lett importálva."

#, python-brace-format
msgctxt "@error:Required plugins not found"
msgid "A number of plugins are required, but could not be loaded: {plugins}"
msgstr ""

msgctxt "@option"
msgid "Abort"
msgstr ""
Expand Down Expand Up @@ -524,11 +529,6 @@ msgctxt "@option:check"
msgid "Snap Scaling"
msgstr "Durva méretezés"

#, python-brace-format
msgctxt "@info:status"
msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
msgstr "Valami hiba történt <filename>{0}</filename> mentésekor: <message>{1}</message>"

#, python-brace-format
msgctxt "@label Don't translate the XML tag <filename>!"
msgid "The file <filename>{0}</filename> already exists. Are you sure you want to overwrite it?"
Expand Down Expand Up @@ -809,6 +809,11 @@ msgstr "Az {application_name} {version_number} jobb és megbízhatóbb szolgált
#~ msgid "Save to File"
#~ msgstr "Mentés fájlba"

#, python-brace-format
#~ msgctxt "@info:status"
#~ msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
#~ msgstr "Valami hiba történt <filename>{0}</filename> mentésekor: <message>{1}</message>"

#, python-brace-format
#~ msgctxt "@error:uninstall"
#~ msgid ""
Expand Down
17 changes: 11 additions & 6 deletions resources/i18n/it_IT/uranium.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-25 09:26+0000\n"
"POT-Creation-Date: 2023-09-12 17:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -23,6 +23,11 @@ msgctxt "@info:version-upgrade"
msgid "A configuration from an older version of {0} was imported."
msgstr "È stata importata una configurazione da una versione precedente {0}."

#, python-brace-format
msgctxt "@error:Required plugins not found"
msgid "A number of plugins are required, but could not be loaded: {plugins}"
msgstr ""

msgctxt "@option"
msgid "Abort"
msgstr "Interrompi"
Expand Down Expand Up @@ -526,11 +531,6 @@ msgctxt "@option:check"
msgid "Snap Scaling"
msgstr "Ridimensionamento aggancio (Snap)"

#, python-brace-format
msgctxt "@info:status"
msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
msgstr "Qualcosa non ha funzionato durante il salvataggio su <filename>{0}</filename>: <message>{1}</message>"

#, python-brace-format
msgctxt "@label Don't translate the XML tag <filename>!"
msgid "The file <filename>{0}</filename> already exists. Are you sure you want to overwrite it?"
Expand Down Expand Up @@ -729,3 +729,8 @@ msgstr "{application_name} {version_number} è disponibile!"
msgctxt "@info:status"
msgid "{application_name} {version_number} provides a better and more reliable printing experience."
msgstr "{application_name} {version_number} fornisce un’esperienza di stampa migliore e più affidabile."

#, python-brace-format
#~ msgctxt "@info:status"
#~ msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
#~ msgstr "Qualcosa non ha funzionato durante il salvataggio su <filename>{0}</filename>: <message>{1}</message>"
17 changes: 11 additions & 6 deletions resources/i18n/ja_JP/uranium.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-25 09:26+0000\n"
"POT-Creation-Date: 2023-09-12 17:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -23,6 +23,11 @@ msgctxt "@info:version-upgrade"
msgid "A configuration from an older version of {0} was imported."
msgstr "前のバージョン {0} のコンフィグレーションが取り込まれました。"

#, python-brace-format
msgctxt "@error:Required plugins not found"
msgid "A number of plugins are required, but could not be loaded: {plugins}"
msgstr ""

msgctxt "@option"
msgid "Abort"
msgstr "中止"
Expand Down Expand Up @@ -526,11 +531,6 @@ msgctxt "@option:check"
msgid "Snap Scaling"
msgstr "スナップスケーリング"

#, python-brace-format
msgctxt "@info:status"
msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
msgstr "<filename>{0}</filename>: <message>{1}</message> への保存でエラーが発生"

#, python-brace-format
msgctxt "@label Don't translate the XML tag <filename>!"
msgid "The file <filename>{0}</filename> already exists. Are you sure you want to overwrite it?"
Expand Down Expand Up @@ -726,3 +726,8 @@ msgstr "{application_name} {version_number} が利用可能です!"
msgctxt "@info:status"
msgid "{application_name} {version_number} provides a better and more reliable printing experience."
msgstr "{application_name} {version_number} なら、より優れた信頼性の隊かい印刷体験が得られます。"

#, python-brace-format
#~ msgctxt "@info:status"
#~ msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
#~ msgstr "<filename>{0}</filename>: <message>{1}</message> への保存でエラーが発生"
17 changes: 11 additions & 6 deletions resources/i18n/ko_KR/uranium.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-25 09:26+0000\n"
"POT-Creation-Date: 2023-09-12 17:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -23,6 +23,11 @@ msgctxt "@info:version-upgrade"
msgid "A configuration from an older version of {0} was imported."
msgstr "{0} 이전 버전의 구성을 가져 왔습니다."

#, python-brace-format
msgctxt "@error:Required plugins not found"
msgid "A number of plugins are required, but could not be loaded: {plugins}"
msgstr ""

msgctxt "@option"
msgid "Abort"
msgstr "중단"
Expand Down Expand Up @@ -526,11 +531,6 @@ msgctxt "@option:check"
msgid "Snap Scaling"
msgstr "스냅 크기 조정"

#, python-brace-format
msgctxt "@info:status"
msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
msgstr "<filename>{0}</filename>에 저장하는 중에 다음과 같은 문제가 발생했습니다. <message>{1}</message>"

#, python-brace-format
msgctxt "@label Don't translate the XML tag <filename>!"
msgid "The file <filename>{0}</filename> already exists. Are you sure you want to overwrite it?"
Expand Down Expand Up @@ -726,3 +726,8 @@ msgstr "{application_name} {version_number}을(를) 사용할 수 있습니다!"
msgctxt "@info:status"
msgid "{application_name} {version_number} provides a better and more reliable printing experience."
msgstr "{application_name} {version_number}은(는) 보다 개선된 안정적인 인쇄 환경을 제공합니다."

#, python-brace-format
#~ msgctxt "@info:status"
#~ msgid "Something went wrong saving to <filename>{0}</filename>: <message>{1}</message>"
#~ msgstr "<filename>{0}</filename>에 저장하는 중에 다음과 같은 문제가 발생했습니다. <message>{1}</message>"
Loading

0 comments on commit 24ec6e6

Please sign in to comment.