Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2017-04-13 16:36:17 +02:00
commit 12ec7a5bc9
8 changed files with 24 additions and 34 deletions

View File

@ -1,16 +1,16 @@
# Cura # SOME DESCRIPTIVE TITLE.
# Copyright (C) 2017 Ultimaker # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the Cura package. # This file is distributed under the same license as the PACKAGE package.
# Ruben Dulek <r.dulek@ultimaker.com>, 2017. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 2.5\n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/Ultimaker/Cura\n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-03-27 17:27+0200\n" "POT-Creation-Date: 2017-03-27 17:27+0200\n"
"PO-Revision-Date: 2017-03-30 12:10+0300\n" "PO-Revision-Date: 2017-03-30 12:10+0300\n"
"Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n" "Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n"
"Language-Team: Ruslan Popov <ruslan.popov@gmail.com>\n" "Language-Team: \n"
"Language: ru\n" "Language: ru\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"

View File

@ -1,17 +1,12 @@
# Cura JSON setting files
# Copyright (C) 2017 Ultimaker
# This file is distributed under the same license as the Cura package.
# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
#
#, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 2.5\n" "Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: http://github.com/Ultimaker/Cura\n" "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
"POT-Creation-Date: 2017-03-27 17:27+0000\n" "POT-Creation-Date: 2017-03-27 17:27+0000\n"
"PO-Revision-Date: 2017-03-28 04:33+0300\n" "PO-Revision-Date: 2017-01-08 04:33+0300\n"
"Language-Team: Ruslan Popov <ruslan.popov@gmail.com>\n" "Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n"
"Language: ru\n" "Language-Team: \n"
"Language: ru_RU\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

View File

@ -1,17 +1,12 @@
# Cura JSON setting files
# Copyright (C) 2017 Ultimaker
# This file is distributed under the same license as the Cura package.
# Ruben Dulek <r.dulek@ultimaker.com>, 2017.
#
#, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Cura 2.5\n" "Project-Id-Version: Uranium json setting files\n"
"Report-Msgid-Bugs-To: http://github.com/Ultimaker/Cura\n" "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
"POT-Creation-Date: 2017-03-27 17:27+0000\n" "POT-Creation-Date: 2017-03-27 17:27+0000\n"
"PO-Revision-Date: 2017-03-28 04:41+0300\n" "PO-Revision-Date: 2017-03-30 15:05+0300\n"
"Language-Team: Ruslan Popov <ruslan.popov@gmail.com>\n" "Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n"
"Language: ru\n" "Language-Team: \n"
"Language: ru_RU\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

View File

@ -299,7 +299,7 @@ Item
} }
} }
UM.I18nCatalog { id: catalog; name: "uranium"; } UM.I18nCatalog { id: catalog; name: "cura"; }
add: Transition { add: Transition {
SequentialAnimation { SequentialAnimation {

View File

@ -54,7 +54,7 @@ speed_travel = 250
speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 25 / 40) speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
support_bottom_distance = =support_z_distance support_bottom_distance = =support_z_distance
support_interface_line_distance = 0.4 support_interface_density = 87.5
support_interface_pattern = lines support_interface_pattern = lines
switch_extruder_prime_speed = 15 switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20 switch_extruder_retraction_amount = 20

View File

@ -53,7 +53,7 @@ speed_travel = 250
speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 25 / 40) speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
support_bottom_distance = =support_z_distance support_bottom_distance = =support_z_distance
support_interface_line_distance = 0.4 support_interface_density = 87.5
support_interface_pattern = lines support_interface_pattern = lines
switch_extruder_prime_speed = 15 switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20 switch_extruder_retraction_amount = 20

View File

@ -54,7 +54,7 @@ speed_travel = 250
speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 25 / 40) speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
support_bottom_distance = =support_z_distance support_bottom_distance = =support_z_distance
support_interface_line_distance = 0.4 support_interface_density = 87.5
support_interface_pattern = lines support_interface_pattern = lines
switch_extruder_prime_speed = 15 switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20 switch_extruder_retraction_amount = 20

View File

@ -52,7 +52,7 @@ speed_travel = 250
speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall = =math.ceil(speed_print * 40 / 50)
speed_wall_0 = =math.ceil(speed_wall * 25 / 40) speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
support_bottom_distance = =support_z_distance support_bottom_distance = =support_z_distance
support_interface_line_distance = 0.4 support_interface_density = 87.5
support_interface_pattern = lines support_interface_pattern = lines
switch_extruder_prime_speed = 15 switch_extruder_prime_speed = 15
switch_extruder_retraction_amount = 20 switch_extruder_retraction_amount = 20