Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into mb-testing
Browse files Browse the repository at this point in the history
  • Loading branch information
burtoogle committed Sep 8, 2021
2 parents 9e0f6ea + 7eeae4d commit abcccdb
Show file tree
Hide file tree
Showing 43 changed files with 1,729 additions and 3,235 deletions.
6 changes: 4 additions & 2 deletions plugins/Toolbox/src/CloudSync/DownloadPresenter.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from PyQt5.QtNetwork import QNetworkReply

from UM import i18n_catalog
from UM.i18n import i18nCatalog
from UM.Logger import Logger
from UM.Message import Message
from UM.Signal import Signal
Expand All @@ -15,6 +15,8 @@
from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
from .SubscribedPackagesModel import SubscribedPackagesModel

i18n_catalog = i18nCatalog("cura")


class DownloadPresenter:
"""Downloads a set of packages from the Ultimaker Cloud Marketplace
Expand Down Expand Up @@ -90,7 +92,7 @@ def _createProgressMessage(self) -> Message:
lifetime = 0,
use_inactivity_timer = False,
progress = 0.0,
title = i18n_catalog.i18nc("@info:title", "Changes detected from your Ultimaker account", ))
title = i18n_catalog.i18nc("@info:title", "Changes detected from your Ultimaker account"))

def _onFinished(self, package_id: str, reply: QNetworkReply) -> None:
self._progress[package_id]["received"] = self._progress[package_id]["total"]
Expand Down
2 changes: 1 addition & 1 deletion resources/definitions/fdmprinter.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -1967,7 +1967,7 @@
"honeycomb": "Honeycomb"
},
"default_value": "grid",
"enabled": "infill_sparse_density > 0",
"enabled": "infill_line_distance > 0",
"value": "'lines' if infill_sparse_density > 25 else 'grid'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
Expand Down
38 changes: 19 additions & 19 deletions resources/i18n/cs_CZ/cura.po
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ msgstr "Jiné"
#: /home/trin/Gedeeld/Projects/Cura/cura/UI/TextManager.py:61
msgctxt "@text:window"
msgid "The release notes could not be opened."
msgstr ""
msgstr "Poznámky k vydání nelze otevřít."

#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:56
#: /home/trin/Gedeeld/Projects/Cura/cura/UI/WelcomePagesModel.py:259
Expand Down Expand Up @@ -864,22 +864,22 @@ msgstr "Spravovat zálohy"
#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:161
msgctxt "@message"
msgid "Slicing failed with an unexpected error. Please consider reporting a bug on our issue tracker."
msgstr ""
msgstr "Slicování selhalo na neočekávané chybě. Zvažte, prosím, nahlášení chyby v našem issue trackeru."

#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:162
msgctxt "@message:title"
msgid "Slicing failed"
msgstr ""
msgstr "Slicování selhalo"

#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:166
msgctxt "@message:button"
msgid "Report a bug"
msgstr ""
msgstr "Nahlásit chybu"

#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:167
msgctxt "@message:description"
msgid "Report a bug on Ultimaker Cura's issue tracker."
msgstr ""
msgstr "Nahlásit chybu v Ultimaker Cura issue trackeru."

#: /home/trin/Gedeeld/Projects/Cura/plugins/CuraEngineBackend/CuraEngineBackend.py:394
msgctxt "@info:status"
Expand Down Expand Up @@ -958,13 +958,13 @@ msgstr "Nemohu načíst informace o aktualizaci."
#, python-brace-format
msgctxt "@info Don't translate {machine_name}, since it gets replaced by a printer name!"
msgid "New features or bug-fixes may be available for your {machine_name}! If you haven't done so already, it is recommended to update the firmware on your printer to version {latest_version}."
msgstr ""
msgstr "K dispozici mohou být nové funkce nebo opravy chyb pro zařízení {machine_name}! Pokud jste tak už neučinili, je doporučeno zaktualizovat firmware vaší tiskárny na verzi {latest_version}."

#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:22
#, python-format
msgctxt "@info:title The %s gets replaced with the printer name."
msgid "New %s stable firmware available"
msgstr ""
msgstr "Nový stabilní firmware je k dispozici pro %s"

#: /home/trin/Gedeeld/Projects/Cura/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py:28
msgctxt "@action:button"
Expand Down Expand Up @@ -1241,7 +1241,7 @@ msgstr "Pohled vrstev"
#: /home/trin/Gedeeld/Projects/Cura/plugins/SliceInfoPlugin/SliceInfo.py:95
msgctxt "@text"
msgid "Unable to read example data file."
msgstr ""
msgstr "Nelze načíst ukázkový datový soubor."

#: /home/trin/Gedeeld/Projects/Cura/plugins/SolidView/SolidView.py:71
msgctxt "@info:status"
Expand Down Expand Up @@ -1343,7 +1343,7 @@ msgstr "gITF binární soubor"
#: /home/trin/Gedeeld/Projects/Cura/plugins/TrimeshReader/__init__.py:27
msgctxt "@item:inlistbox"
msgid "glTF Embedded JSON"
msgstr "gITF Embedded JSON"
msgstr "glTF Embedded JSON"

#: /home/trin/Gedeeld/Projects/Cura/plugins/TrimeshReader/__init__.py:36
msgctxt "@item:inlistbox"
Expand Down Expand Up @@ -1398,12 +1398,12 @@ msgstr "Připojen přes cloud"
#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:261
msgctxt "@action:button"
msgid "Monitor print"
msgstr ""
msgstr "Sledovat tisk"

#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:263
msgctxt "@action:tooltip"
msgid "Track the print in Ultimaker Digital Factory"
msgstr ""
msgstr "Sledujte tisk v Ultimaker Digital Factory"

#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py:279
#, python-brace-format
Expand Down Expand Up @@ -3106,7 +3106,7 @@ msgstr "Aktualizujte firmware tiskárny a spravujte frontu vzdáleně."
#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:288
msgctxt "@info"
msgid "Webcam feeds for cloud printers cannot be viewed from Ultimaker Cura."
msgstr ""
msgstr "Vstup z webových kamer pro cloudové tiskárny nemůže být v Ultimaker Cura zobrazen."

#: /home/trin/Gedeeld/Projects/Cura/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml:348
msgctxt "@label:status"
Expand Down Expand Up @@ -4629,7 +4629,7 @@ msgstr "Více informací"
#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:811
msgctxt "@label"
msgid "Updates"
msgstr ""
msgstr "Aktualizace"

#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:818
msgctxt "@info:tooltip"
Expand All @@ -4644,32 +4644,32 @@ msgstr "Zkontrolovat aktualizace při zapnutí"
#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:834
msgctxt "@info:tooltip"
msgid "When checking for updates, only check for stable releases."
msgstr ""
msgstr "Při kontrole aktualizací kontrolovat pouze stabilní vydání."

#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:839
msgctxt "@option:radio"
msgid "Stable releases only"
msgstr ""
msgstr "Pouze stabilní vydání"

#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:850
msgctxt "@info:tooltip"
msgid "When checking for updates, check for both stable and for beta releases."
msgstr ""
msgstr "Při kontrole aktualizací kontrolovat stabilní i beta vydání."

#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:855
msgctxt "@option:radio"
msgid "Stable and Beta releases"
msgstr ""
msgstr "Stabilní a beta vydání"

#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:866
msgctxt "@info:tooltip"
msgid "Should an automatic check for new plugins be done every time Cura is started? It is highly recommended that you do not disable this!"
msgstr ""
msgstr "Mají být při každém startu Cury automaticky kontrolovány nové moduly? Důrazně doporučujeme tuto možnost nevypínat!"

#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/GeneralPage.qml:871
msgctxt "@option:check"
msgid "Get notifications for plugin updates"
msgstr ""
msgstr "Získávat oznámení o aktualizacích modulů"

#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/MachinesPage.qml:40
#: /home/trin/Gedeeld/Projects/Cura/resources/qml/Preferences/Materials/MaterialsPage.qml:108
Expand Down
14 changes: 7 additions & 7 deletions resources/i18n/cs_CZ/fdmprinter.def.json.po
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ msgstr "Kroků za milimetr (E)"
#: fdmprinter.def.json
msgctxt "machine_steps_per_mm_e description"
msgid "How many steps of the stepper motors will result in moving the feeder wheel by one millimeter around its circumference."
msgstr ""
msgstr "Kolik kroků krokového motoru povede k pohybu kolečka feederu o jeden milimetr po jeho obvodu."

#: fdmprinter.def.json
msgctxt "machine_endstop_positive_direction_x label"
Expand Down Expand Up @@ -1436,12 +1436,12 @@ msgstr "Propojte horní / dolní povrchové cesty tam, kde běží vedle sebe. P
#: fdmprinter.def.json
msgctxt "skin_monotonic label"
msgid "Monotonic Top/Bottom Order"
msgstr ""
msgstr "Monotónní pořadí horních / dolních povrchů"

#: fdmprinter.def.json
msgctxt "skin_monotonic description"
msgid "Print top/bottom lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent."
msgstr ""
msgstr "Tisknout horní / dolní linky v takovém pořadí, aby se navazující linky překrývaly ve stejném směru. Tisk zabere trochu více času, ale hladké povrchy budou vypadat více jednolité."

#: fdmprinter.def.json
msgctxt "skin_angles label"
Expand Down Expand Up @@ -1516,12 +1516,12 @@ msgstr "Zig Zag"
#: fdmprinter.def.json
msgctxt "ironing_monotonic label"
msgid "Monotonic Ironing Order"
msgstr ""
msgstr "Monotónní pořadí žehlení"

#: fdmprinter.def.json
msgctxt "ironing_monotonic description"
msgid "Print ironing lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent."
msgstr ""
msgstr "Tisknout žehlící linky v takovém pořadí, aby se navazující linky překrývaly ve stejném směru. Tisk zabere trochu více času, ale hladké povrchy budou vypadat více jednolité."

#: fdmprinter.def.json
msgctxt "ironing_line_spacing label"
Expand Down Expand Up @@ -5324,12 +5324,12 @@ msgstr "Zig Zag"
#: fdmprinter.def.json
msgctxt "roofing_monotonic label"
msgid "Monotonic Top Surface Order"
msgstr ""
msgstr "Monotónní pořadí horního povrchu"

#: fdmprinter.def.json
msgctxt "roofing_monotonic description"
msgid "Print top surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent."
msgstr ""
msgstr "Tisknout linky horního povrchu v takovém pořadí, aby se navazující linky překrývaly ve stejném směru. Tisk zabere trochu více času, ale hladké povrchy budou vypadat více jednolité."

#: fdmprinter.def.json
msgctxt "roofing_angles label"
Expand Down
Loading

0 comments on commit abcccdb

Please sign in to comment.