From 09725e518a84107c8b4ff0658b86c435ba305441 Mon Sep 17 00:00:00 2001
From: zwim <36999612+zwim@users.noreply.github.com>
Date: Thu, 21 Oct 2021 21:47:11 +0200
Subject: [PATCH] Autowarmth: wording, move expert-mode menu entry down (#8350)

---
 plugins/autowarmth.koplugin/main.lua | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/autowarmth.koplugin/main.lua b/plugins/autowarmth.koplugin/main.lua
index ff1cffa10..46f816706 100644
--- a/plugins/autowarmth.koplugin/main.lua
+++ b/plugins/autowarmth.koplugin/main.lua
@@ -328,6 +328,13 @@ function AutoWarmth:getSubMenuItems()
             keep_menu_open = true,
             separator = true,
         },
+        {
+            text = _("Activate"),
+            checked_func = function()
+                return self.activate ~= 0
+            end,
+            sub_item_table = self:getActivateMenu(),
+        },
         {
             text = _("Expert mode"),
             checked_func = function()
@@ -343,19 +350,12 @@ function AutoWarmth:getSubMenuItems()
             end,
             keep_menu_open = true,
         },
-        {
-            text = _("Activate"),
-            checked_func = function()
-                return self.activate ~= 0
-            end,
-            sub_item_table = self:getActivateMenu(),
-        },
         {
             text = _("Location settings"),
             sub_item_table = self:getLocationMenu(),
         },
         {
-            text = _("Time schedule settings"),
+            text = _("Fixed schedule settings"),
             enabled_func = function()
                 return self.activate ~= activate_sun and self.activate ~=0
             end,
@@ -370,9 +370,9 @@ function AutoWarmth:getSubMenuItems()
             sub_item_table = self:getWarmthMenu(),
             separator = true,
         },
-        self:getTimesMenu(_("Active parameters")),
-        self:getTimesMenu(_("Information about the sun in"), true, activate_sun),
-        self:getTimesMenu(_("Information about the time schedule"), false, activate_schedule),
+        self:getTimesMenu(_("Currently active parameters")),
+        self:getTimesMenu(_("Sun position information for"), true, activate_sun),
+        self:getTimesMenu(_("Fixed schedule information"), false, activate_schedule),
     }
 end
 
@@ -395,11 +395,11 @@ function AutoWarmth:getActivateMenu()
     end
 
     return {
-        getActivateMenuEntry(_("Sun position"),
+        getActivateMenuEntry(_("According to the sun's position"),
             _("Only use the times calculated from the position of the sun."),
             activate_sun),
-        getActivateMenuEntry(_("Time schedule"),
-            _("Only use the times from the schedule."),
+        getActivateMenuEntry(_("According to the fixed schedule"),
+            _("Only use the times from the fixed schedule."),
             activate_schedule),
         getActivateMenuEntry(_("Whatever is closer to noon"),
             _("Use the times from the sun position or schedule that are closer to noon."),
@@ -735,7 +735,7 @@ function AutoWarmth:getWarmthMenu()
             enabled_func = function() return false end,
         },
         getWarmthMenuEntry(_("Solar noon"), 6, false),
-        getWarmthMenuEntry(_("Daytime"), 5),
+        getWarmthMenuEntry(_("Sunset and sunrise"), 5),
         getWarmthMenuEntry(_("Darkest time of civil twilight"), 4),
         getWarmthMenuEntry(_("Darkest time of nautical twilight"), 3, false),
         getWarmthMenuEntry(_("Darkest time of astronomical twilight"), 2, false),