Merge branch 'master' into palette_updates

This commit is contained in:
Overloaded 2019-12-15 13:36:46 +02:00 committed by GitHub
commit 52f9683223
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 207 additions and 185 deletions

View file

@ -1578,7 +1578,7 @@ margin_left = 61.0
margin_right = 142.0
margin_bottom = 21.0
text = "System Language"
items = [ "System Language", null, false, 0, null, "Greek [el]", null, false, 1, null, "English [en]", null, false, 2, null ]
items = [ "System Language", null, false, 0, null, "German [de]", null, false, 1, null, "Greek [el]", null, false, 2, null, "English [en]", null, false, 3, null, "French [fr]", null, false, 4, null ]
selected = 0
[node name="GridOptionsLabel" type="Label" parent="PreferencesDialog/VBoxContainer"]