diff --git a/locale/ubl-settings-services.pot b/locale/ubl-settings-services.pot
index 3a2528d..c8290b0 100644
--- a/locale/ubl-settings-services.pot
+++ b/locale/ubl-settings-services.pot
@@ -216,7 +216,7 @@ msgid "Service were not stopped"
 msgstr ""
 
 #: source/ubl-strings.h:68
-msgid "Are you sure want to stop "
+msgid "Are you sure want to stop unit?"
 msgstr ""
 
 #: source/ubl-strings.h:68 source/ubl-strings.h:69 source/ubl-strings.h:70
@@ -226,23 +226,23 @@ msgid "The system may become unstable."
 msgstr ""
 
 #: source/ubl-strings.h:69
-msgid "Are you sure want to start "
+msgid "Are you sure want to start unit?"
 msgstr ""
 
 #: source/ubl-strings.h:70
-msgid "Are you sure want to restart "
+msgid "Are you sure want to restart unit?"
 msgstr ""
 
 #: source/ubl-strings.h:71
-msgid "Are you sure want to reload "
+msgid "Are you sure want to reload unit?"
 msgstr ""
 
 #: source/ubl-strings.h:72
-msgid "Are you sure want to enable "
+msgid "Are you sure want to enable unit?"
 msgstr ""
 
 #: source/ubl-strings.h:73
-msgid "Are you sure want to disable "
+msgid "Are you sure want to disable unit?"
 msgstr ""
 
 #: source/ubl-strings.h:74
diff --git a/locale/ubl-settings-services_ru.po b/locale/ubl-settings-services_ru.po
index 30330ff..921a1ef 100644
--- a/locale/ubl-settings-services_ru.po
+++ b/locale/ubl-settings-services_ru.po
@@ -216,8 +216,8 @@ msgid "Service were not stopped"
 msgstr "Сервис не был остановлен"
 
 #: source/ubl-strings.h:68
-msgid "Are you sure want to stop "
-msgstr "Вы уверены, что хотите выключить "
+msgid "Are you sure want to stop unit?"
+msgstr "Вы уверены, что хотите выключить юнит?"
 
 #: source/ubl-strings.h:68 source/ubl-strings.h:69 source/ubl-strings.h:70
 #: source/ubl-strings.h:71 source/ubl-strings.h:72 source/ubl-strings.h:73
@@ -226,24 +226,24 @@ msgid "The system may become unstable."
 msgstr "Возможна нестабильная работа системы."
 
 #: source/ubl-strings.h:69
-msgid "Are you sure want to start "
-msgstr "Вы уверены, что хотите запустить "
+msgid "Are you sure want to start unit?"
+msgstr "Вы уверены, что хотите запустить юнит?"
 
 #: source/ubl-strings.h:70
-msgid "Are you sure want to restart "
-msgstr "Вы уверены, что хотите перезапустить "
+msgid "Are you sure want to restart unit?"
+msgstr "Вы уверены, что хотите перезапустить юнит?"
 
 #: source/ubl-strings.h:71
-msgid "Are you sure want to reload "
-msgstr "Вы уверены, что хотите перезагрузить "
+msgid "Are you sure want to reload unit?"
+msgstr "Вы уверены, что хотите перезагрузить юнит?"
 
 #: source/ubl-strings.h:72
-msgid "Are you sure want to enable "
-msgstr "Вы уверены, что хотите включить автозапуск для "
+msgid "Are you sure want to enable unit?"
+msgstr "Вы уверены, что хотите включить автозапуск для юнита?"
 
 #: source/ubl-strings.h:73
-msgid "Are you sure want to disable "
-msgstr "Вы уверены, что хотите отключить автозапуск для "
+msgid "Are you sure want to disable unit?"
+msgstr "Вы уверены, что хотите отключить автозапуск для юнита?"
 
 #: source/ubl-strings.h:74
 msgid "Are you sure want to reload system units settings?"
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 011ffeb..324a472 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -65,14 +65,14 @@
 #define ERROR_LABEL _("Error has occured")
 
 #define SWITCH_OFF_ERROR_LABEL _("Service were not stopped")
-#define SERVICE_STOP_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to stop "),"<b>",target,"</b>?\n",_("The system may become unstable."),NULL)
-#define SERVICE_START_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to start "),"<b>",target,"</b>?",NULL)
-#define REEXEC_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to restart "),"<b>",target,"</b>?\n",_("The system may become unstable."),NULL)
-#define RELOAD_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to reload "),"<b>",target,"</b>?\n",_("The system may become unstable."),NULL)
-#define SERVICE_ENABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to enable "),"<b>",target,"</b>?",NULL)
-#define SERVICE_DISABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to disable "),"<b>",target,"</b>?\n",_("The system may become unstable."),NULL)
-#define RELOAD_SYSTEM_SETTINGS_WARNING_LABEL yon_char_unite(_("Are you sure want to reload system units settings?"),"\n",_("The system may become unstable."),NULL)
-#define RELOAD_USER_SETTINGS_WARNING_LABEL yon_char_unite(_("Are you sure want to reload user units settings?"),"\n",_("The system may become unstable."),NULL)
+#define SERVICE_STOP_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to stop unit?"),"\n\n- <b>",target,"</b>\n\n",_("The system may become unstable."),NULL)
+#define SERVICE_START_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to start unit?"),"\n\n- <b>",target,"</b>",NULL)
+#define REEXEC_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to restart unit?"),"\n\n- <b>",target,"</b>\n\n",_("The system may become unstable."),NULL)
+#define RELOAD_SERVICE_WARMING_LABEL(target) yon_char_unite(_("Are you sure want to reload unit?"),"\n\n- <b>",target,"</b>\n\n",_("The system may become unstable."),NULL)
+#define SERVICE_ENABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to enable unit?"),"\n\n- <b>",target,"</b>",NULL)
+#define SERVICE_DISABLE_WARNING_LABEL(target) yon_char_unite(_("Are you sure want to disable unit?"),"\n\n- <b>",target,"</b>\n\n",_("The system may become unstable."),NULL)
+#define RELOAD_SYSTEM_SETTINGS_WARNING_LABEL yon_char_unite(_("Are you sure want to reload system units settings?"),"\n\n",_("The system may become unstable."),NULL)
+#define RELOAD_USER_SETTINGS_WARNING_LABEL yon_char_unite(_("Are you sure want to reload user units settings?"),"\n\n",_("The system may become unstable."),NULL)
 #define SESSION_ACTIVATE_TOOLTIP_LABEL(target) yon_char_unite(_("Are you sure you want to switch on session")," <b>ID-",target,"</b>?",NULL)
 #define SESSION_END_TOOLTIP_LABEL(target)  yon_char_unite("<b>",_("Attention!"),"</b> ",_("You are about to")," <b>",_("end your session")," ID-",target,"</b>. ",_("If this is your active session, you will be taken to the login screen. Make sure to save all files before performing this operation."),NULL)
 #define SESSION_BLOCK_TOOLTIP_LABEL(target)  yon_char_unite(_("Are you sure you want to block session")," <b>ID-",target,"</b>?",NULL)