Merge remote-tracking branch 'upstream/3.0'

This commit is contained in:
Lipu Fei 2017-10-16 14:54:40 +02:00
commit 38b9df80f3
13 changed files with 196 additions and 17 deletions

View File

@ -118,23 +118,22 @@ class VersionUpgrade27to30(VersionUpgrade):
if not parser.has_section("general"):
parser.add_section("general")
# Need to exclude the following names:
# - ultimaker2_plus
# - ultimaker2_go
# - ultimaker2_extended
# - ultimaker2_extended_plus
exclude_prefix_list = ["ultimaker2_plus_",
# The ultimaker 2 family
ultimaker2_prefix_list = ["ultimaker2_extended_",
"ultimaker2_go_",
"ultimaker2_extended_",
"ultimaker2_extended_plus_"]
"ultimaker2_"]
# ultimaker 2+ is a different family, so don't do anything with those
exclude_prefix_list = ["ultimaker2_extended_plus_",
"ultimaker2_plus_"]
# set machine definition to "ultimaker2" for the custom quality profiles that can be for the ultimaker 2 family
file_base_name = os.path.basename(filename)
if file_base_name.startswith("ultimaker2_"):
skip_this = False
for exclude_prefix in exclude_prefix_list:
if file_base_name.startswith(exclude_prefix):
skip_this = True
break
if not skip_this:
is_ultimaker2_family = not any(file_base_name.startswith(ep) for ep in exclude_prefix_list)
if not is_ultimaker2_family:
is_ultimaker2_family = any(file_base_name.startswith(ep) for ep in ultimaker2_prefix_list)
# ultimaker2 family quality profiles used to set as "fdmprinter" profiles
if is_ultimaker2_family and parser["general"]["definition"] == "fdmprinter":
parser["general"]["definition"] = "ultimaker2"
# Update version numbers

View File

@ -63,6 +63,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr ""
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr ""
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr ""
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr ""
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -61,6 +61,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "Druck vollendet"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "&Plugins"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "Plugins durchsuchen..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "Installierte plugins..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -61,6 +61,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "Impresión terminada"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "&Complementos"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "Examinar complementos..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "Complementos instalados..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -61,6 +61,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "Tulosta valmis"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "&Lisäosat"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "Selaa lisäosia..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "Asennetut lisäoset..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -61,6 +61,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "Impression terminée"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "&Plug-ins"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "Parcourir les plug-ins..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "Plug-ins installés..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -61,6 +61,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "Stampa finita"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "&Plugin"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "Sfoglia plugin..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "Plugin installati..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -61,6 +61,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "Print klaar"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "&Plugins"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "Door invoegtoepassingen bladeren..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "Geïnstalleerde plugins..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -63,6 +63,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "Drukowanie zakończone"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "W&tyczki"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "Przeglądaj wtyczki..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "Zainstalowane wtyczki..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -62,6 +62,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "Impressão Concluída"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "&Complementos"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "Navegar complementos..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "Complementos instalados..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -63,6 +63,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "Печать завершена"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "Плагины"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "Просмотр плагинов..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "Установленные плагины..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -61,6 +61,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "Baskı tamamlandı"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "&Eklentiler"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "Eklentilere göz at..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "Yüklü eklentiler..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"

View File

@ -63,6 +63,21 @@ msgctxt "@info:status"
msgid "Print finished"
msgstr "打印完成"
#: Manually added for resources/Cura/Cura.qml
msgctxt "@title:menu menubar:toplevel"
msgid "P&lugins"
msgstr "插件"
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Browse plugins..."
msgstr "浏览插件..."
#: Manually added for resources/Cura/Actions.qml
msgctxt "@action:menu"
msgid "Installed plugins..."
msgstr "已安装插件..."
#: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29
msgctxt "@action"
msgid "Machine Settings"