3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix forgotten merge conflicts

Browse source 
I forgot to save this file.

Contributes to issue CURA-8472.
This commit is contained in:
Ghostkeeper 2021-09-06 17:26:29 +02:00
parent 8209bdd866
commit 81eb09966d
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
1 changed files with 0 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

31
resources/i18n/zh_TW/fdmprinter.def.json.po
View file

@ -688,11 +688,7 @@ msgstr "每毫米的步數（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."
<<<<<<< HEAD
msgstr "How many steps of the stepper motors will result in moving the feeder wheel by one millimeter around its circumference."
=======
msgstr "在擠出輪旋轉一毫米時，步進馬達所需移動的步數."
>>>>>>> 4.11
#: fdmprinter.def.json
msgctxt "machine_endstop_positive_direction_x label"
@ -1442,21 +1438,12 @@ msgstr "將頂部/底部表層路徑相鄰的位置連接。同心模式時啟
#: fdmprinter.def.json
msgctxt "skin_monotonic label"
msgid "Monotonic Top/Bottom Order"
<<<<<<< HEAD
msgstr "Monotonic Top/Bottom Order"
=======
msgstr "Monotonic列印 頂層/底層 順序"
>>>>>>> 4.11
#: 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."
<<<<<<< HEAD
msgstr "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 "再列印頂層/底層線條時，命令相鄰線條於單方向重疊. 雖然會花更多時間列印，但會使平面更平整."
>>>>>>> 4.11
#: fdmprinter.def.json
msgctxt "skin_angles label"
@ -1531,21 +1518,12 @@ msgstr "鋸齒狀"
#: fdmprinter.def.json
msgctxt "ironing_monotonic label"
msgid "Monotonic Ironing Order"
<<<<<<< HEAD
msgstr "Monotonic Ironing Order"
=======
msgstr "Monotonous燙平順序"
>>>>>>> 4.11
#: 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."
<<<<<<< HEAD
msgstr "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 "再使用燙平列印線條時，命令相鄰線條於單方向重疊。雖然會花更多時間列印，但會使平面更平整."
>>>>>>> 4.11
#: fdmprinter.def.json
msgctxt "ironing_line_spacing label"
@ -5348,21 +5326,12 @@ msgstr "鋸齒狀"
#: fdmprinter.def.json
msgctxt "roofing_monotonic label"
msgid "Monotonic Top Surface Order"
<<<<<<< HEAD
msgstr "Monotonic Top Surface Order"
=======
msgstr "頂層Monotonic列印順序"
>>>>>>> 4.11
#: 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."
<<<<<<< HEAD
msgstr "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 "再列印頂層表面線條時，命令相鄰線條於單方向重疊. 雖然會花更多時間列印，但會使平面更平整."
>>>>>>> 4.11
#: fdmprinter.def.json
msgctxt "roofing_angles label"