Localisation fixes

source/ubl-settings-services.c

@@ -666,7 +666,7 @@ void on_session_end(GtkWidget *self, main_window *widgets){
         dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
         char *convert = yon_char_from_int(id);
         data->action_text = SESSION_END_TOOLTIP_LABEL(convert);
-        data->title = SESSION_TERMINATE_TITLE_LABEL;
+        data->title = SESSION_TERMINATE_TITLE_LABEL(convert);
         if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){ 
             if (!system(session_terminate_session(convert))){
                 GtkTreeModel *model;
@@ -692,7 +692,7 @@ void on_session_unlock(GtkWidget *self, main_window *widgets){
         data->action_text = SESSION_UNLOCK_TOOLTIP_LABEL(convert);
         data->data = NULL;
         data->function = NULL;
-        data->title = SESSION_UNLOCK_TITLE_LABEL;
+        data->title = SESSION_UNLOCK_TITLE_LABEL(convert);
         if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){ 
             yon_launch(session_unlock_session(convert));
             free(convert);
@@ -712,7 +712,7 @@ void on_session_block(GtkWidget *self, main_window *widgets){
         data->action_text = SESSION_BLOCK_TOOLTIP_LABEL(convert);
         data->data = NULL;
         data->function = NULL;
-        data->title = SESSION_LOCK_TITLE_LABEL;
+        data->title = SESSION_LOCK_TITLE_LABEL(convert);
         if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){ 
             yon_launch(session_lock_session(convert));
             free(convert);

source/ubl-strings.h

@@ -73,7 +73,7 @@
 #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 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 end your session")," <b>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_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)
 #define SESSION_UNLOCK_TOOLTIP_LABEL(target)  yon_char_unite(_("Are you sure you want to unlock session")," <b>ID-",target,"</b>?",NULL)
 
@@ -83,9 +83,9 @@
 #define SERVICE_AUTOSTOP_TITLE_LABEL _("Service disabling")
 
 #define SESSION_SWITCH_TITLE_LABEL(target) yon_char_unite(_("Switching to session")," ID-",target,NULL)
-#define SESSION_LOCK_TITLE_LABEL _("Session locking")
+#define SESSION_LOCK_TITLE_LABEL(target) yon_char_unite(_("Lock session")," ID-",target,NULL)
-#define SESSION_UNLOCK_TITLE_LABEL _("Session unlocking")
+#define SESSION_UNLOCK_TITLE_LABEL(target) yon_char_unite(_("Unlock session")," ID-",target,NULL)
-#define SESSION_TERMINATE_TITLE_LABEL _("Session termination")
+#define SESSION_TERMINATE_TITLE_LABEL(target) yon_char_unite(_("Terminate session")," ID-",target,NULL)
 
 #define DAYS_LABEL _("Days")
 #define HOURS_LABEL _("Hours")

ubl-settings-services.pot

@@ -256,7 +256,12 @@ msgid "Attention!"
 msgstr ""
 
 #: source/ubl-strings.h:76
-msgid "You are about to end your session"
+msgid "You are about to"
+msgstr ""
+msgstr ""
+
+#: source/ubl-strings.h:76
+msgid "end your session"
 msgstr ""
 
 #: source/ubl-strings.h:76

ubl-settings-services_ru.po

@@ -257,8 +257,12 @@ msgid "Attention!"
 msgstr "Внимание!"
 
 #: source/ubl-strings.h:76
-msgid "You are about to end your session"
+msgid "You are about to"
-msgstr "Вы собираетесь завершить сессию"
+msgstr "Вы собираетесь"
+
+#: source/ubl-strings.h:76
+msgid "end your session"
+msgstr "завершить сессию"
 
 #: source/ubl-strings.h:76
 msgid ""