Merge pull request 'master' (#108) from YanTheKaller/ubl-settings-services:master into master

Reviewed-on: #108

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 unit?"
-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 unit?"
-msgstr "Вы уверены, что хотите запустить юнит?"
+msgid "Are you sure want to start unit"
+msgstr "Вы уверены, что хотите запустить юнит"
 
 #: source/ubl-strings.h:70
-msgid "Are you sure want to restart unit?"
-msgstr "Вы уверены, что хотите перезапустить юнит?"
+msgid "Are you sure want to restart unit"
+msgstr "Вы уверены, что хотите перезапустить юнит"
 
 #: source/ubl-strings.h:71
-msgid "Are you sure want to reload unit?"
-msgstr "Вы уверены, что хотите перезагрузить юнит?"
+msgid "Are you sure want to reload unit"
+msgstr "Вы уверены, что хотите перезагрузить юнит"
 
 #: source/ubl-strings.h:72
-msgid "Are you sure want to enable unit?"
-msgstr "Вы уверены, что хотите включить автозапуск для юнита?"
+msgid "Are you sure want to enable unit"
+msgstr "Вы уверены, что хотите включить автозапуск для юнита"
 
 #: source/ubl-strings.h:73
-msgid "Are you sure want to disable unit?"
-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?"

source/ubl-settings-services.c

@@ -398,7 +398,6 @@ void on_system_autostart_clicked(GtkCellRenderer *, char *path, main_window *wid
         gtk_list_store_set(GTK_LIST_STORE(model),&iter,3,!status,-1);
         }
     }
-
 }
 
 gboolean sort_bool(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,gpointer col){

source/ubl-strings.h

@@ -65,12 +65,12 @@
 #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 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 SERVICE_STOP_WARNING_LABEL(target) yon_char_unite("<b>",target,"</b>\n\n",_("Are you sure want to stop unit"),"?\n\n",_("The system may become unstable."),NULL)
+#define SERVICE_START_WARNING_LABEL(target) yon_char_unite("<b>",target,"</b>\n\n",_("Are you sure want to start unit"),"?\n\n",NULL)
+#define REEXEC_SERVICE_WARMING_LABEL(target) yon_char_unite("<b>",target,"</b>\n\n",_("Are you sure want to restart unit"),"?\n\n",_("The system may become unstable."),NULL)
+#define RELOAD_SERVICE_WARMING_LABEL(target) yon_char_unite("<b>",target,"</b>\n\n",_("Are you sure want to reload unit"),"?\n\n",_("The system may become unstable."),NULL)
+#define SERVICE_ENABLE_WARNING_LABEL(target) yon_char_unite("<b>",target,"</b>\n\n",_("Are you sure want to enable unit"),"?\n\n",NULL)
+#define SERVICE_DISABLE_WARNING_LABEL(target) yon_char_unite("<b>",target,"</b>\n\n",_("Are you sure want to disable unit"),"?\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)