Merge branch 'master' into dev

2020-04-03 20:13:54 +08:00
parent 12f02dda98 e350c5f070
commit d625b0d567
36 changed files with 220 additions and 82 deletions
@@ -18,6 +18,8 @@
  "basic_window_size_medium": "Medium",
  "basic_window_size_big": "Large",
  "basic_window_size_larger": "Larger",
+  "basic_to_tray_title": "Minimize it to the system tray without closing the software when closing",
+  "basic_to_tray": "Minimize to system tray when closing",
  "basic_lang_title": "The language displayed in the software",
  "basic_lang": "Language",