3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch '2.6'

Browse source
This commit is contained in:
Ghostkeeper 2017-06-21 12:29:23 +02:00
commit 1d23d659f0
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
3 changed files with 114 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Preferences/GeneralPage.qml
View file

@ -152,7 +152,7 @@ UM.PreferencesPage
append({ text: "Suomi", code: "fi" })
append({ text: "Français", code: "fr" })
append({ text: "Italiano", code: "it" })
//append({ text: "日本語", code: "jp" })
append({ text: "日本語", code: "jp" })
//append({ text: "한국어", code: "ko" })
append({ text: "Nederlands", code: "nl" })
append({ text: "Português do Brasil", code: "ptbr" })
@ -260,7 +260,7 @@ UM.PreferencesPage
Label
Label
{
id: languageCaption