Merge branch 'master' into layer_view3_cleanup

2025-11-23 19:01:05 -07:00 · 2017-01-17 15:16:50 +01:00 · 2017-01-17 15:16:50 +01:00 · abe7a8e9a3
commit abe7a8e9a3
parent cd8eaf7759 5766e2728f
42 changed files with 12101 additions and 89 deletions
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@ -97,6 +97,7 @@ UM.PreferencesPage
                        append({ text: "Français", code: "fr" })
                        append({ text: "Italiano", code: "it" })
                        append({ text: "Nederlands", code: "nl" })
+                        append({ text: "Русский", code: "ru" })
                        append({ text: "Türkçe", code: "tr" })
                    }
                }