SoftFever 59bab91da9 Merge branch 'merge-upstream' ... Signed-off-by: SoftFever <softfeverever@gmail.com> # Conflicts: # src/libslic3r/Preset.cpp # src/libslic3r/PrintConfig.cpp # src/libslic3r/PrintConfig.hpp		2023-09-30 09:51:56 +08:00
..
cs	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00
de	add new german translation (#2131)	2023-09-16 22:40:52 +08:00
en	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00
es	Update Spanish translation (#2102)	2023-09-14 21:01:02 +08:00
fr	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00
hu	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00
it	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00
ja	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00
ko	Update Korean translation (#2187)	2023-09-24 10:06:43 +08:00
nl	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00
ru	Update Russian translation (#2190)	2023-09-24 10:10:33 +08:00
sv	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00
tr	Turkish Language String Updates For v1.7 (#2130)	2023-09-16 22:33:42 +08:00
uk	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00
zh_cn	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00
zh_TW	Updated TW translation (#2242)	2023-09-27 21:49:29 +08:00
list.txt	Merge branch 'v1.7.2-remote'	2023-09-29 19:46:49 +08:00
OrcaSlicer.pot	revert backing missing translations for hints.ini	2023-09-12 20:35:40 +08:00