Design fixes; Localisation fixes

pull/91/head
parent 96f64905f3
commit 5fe77a06a6

@ -630,7 +630,7 @@ void on_session_unlock(GtkWidget *self, main_window *widgets){
gtk_tree_model_get(model,&iter,0,&id,-1);
dialog_confirmation_data *data = malloc(sizeof(dialog_confirmation_data));
char *convert = yon_char_from_int(id);
data->action_text = SESSION_ACTIVATE_TOOLTIP_LABEL(convert);
data->action_text = SESSION_UNLOCK_TOOLTIP_LABEL(convert);
data->data = NULL;
data->function = NULL;
if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){

@ -50,9 +50,10 @@
#define SHOW_LOG_LABEL _("Show log")
#define SHOW_SOURCE_LABEL _("Show source")
#define PROPERTIES_LABEL _("Properties")
#define ACTIVATE_SESSION_LABEL _("Activate session")
#define ACTIVATE_SESSION_LABEL _("Switch to session")
#define END_SESSION_LABEL _("Terminate session")
#define BLOCK_SESSION_LABEL _("Block session")
#define BLOCK_SESSION_LABEL _("Lock session")
#define UNLOCK_SESSION_LABEL _("Unlock session")
#define SOURCE_UNFOUND_LABEL _("Service source were not loaded")
#define SERVICE_START_FAILED_LABEL _("Failed to launch service")
@ -72,8 +73,9 @@
#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 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_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)
#define DAYS_LABEL _("Days")
#define HOURS_LABEL _("Hours")
#define MINUTES_LABEL _("Minutes")

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<!-- Generated with glade 3.40.0 -->
<interface domain="ubl-settings-services">
<requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubl-settings-services.css -->
@ -434,7 +434,7 @@
<object class="GtkImage" id="image22">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">com.ublinux.ubl-settings-services.sync-symbolic</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.sync-symbolic</property>
</object>
<object class="GtkImage" id="image23">
<property name="visible">True</property>
@ -775,7 +775,7 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Service information</property>
<property name="tooltip-text" translatable="yes">Unit information</property>
<property name="image">image3</property>
<style>
<class name="thin"/>
@ -793,7 +793,7 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Service log</property>
<property name="tooltip-text" translatable="yes">Unit log</property>
<property name="image">image4</property>
<style>
<class name="thin"/>
@ -811,7 +811,7 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Service source file</property>
<property name="tooltip-text" translatable="yes">Unit source file</property>
<property name="image">image5</property>
<style>
<class name="thin"/>
@ -829,7 +829,7 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Service properties</property>
<property name="tooltip-text" translatable="yes">Unit properties</property>
<property name="image">image7</property>
<style>
<class name="thin"/>
@ -1380,7 +1380,7 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Show service information</property>
<property name="tooltip-text" translatable="yes">Unit information</property>
<property name="image">image15</property>
<style>
<class name="thin"/>
@ -1398,7 +1398,7 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Show service log</property>
<property name="tooltip-text" translatable="yes">Unit log</property>
<property name="image">image16</property>
<style>
<class name="thin"/>
@ -1416,7 +1416,7 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Show service source file</property>
<property name="tooltip-text" translatable="yes">Unit source file</property>
<property name="image">image17</property>
<style>
<class name="thin"/>
@ -1434,7 +1434,7 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Show service properties</property>
<property name="tooltip-text" translatable="yes">Unit properties</property>
<property name="image">image18</property>
<style>
<class name="thin"/>
@ -1463,7 +1463,7 @@
<property name="can-focus">True</property>
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Show...</property>
<property name="tooltip-text" translatable="yes">Additional information</property>
<property name="popup">menu2</property>
<child>
<object class="GtkImage">
@ -1803,6 +1803,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Update</property>
<property name="image">image23</property>
<style>
<class name="thin"/>
@ -1980,7 +1981,7 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Terminate session</property>
<property name="tooltip-text" translatable="yes">Switch to session</property>
<property name="image">image24</property>
<style>
<class name="thin"/>
@ -2016,7 +2017,7 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Activate session</property>
<property name="tooltip-text" translatable="yes">Unlock session</property>
<property name="image">image11</property>
<style>
<class name="thin"/>
@ -2208,6 +2209,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Update</property>
<property name="image">image19</property>
<style>
<class name="thin"/>

@ -170,7 +170,7 @@ msgid "Properties"
msgstr ""
#: source/ubl-strings.h:53
msgid "Activate session"
msgid "Switch to session"
msgstr ""
#: source/ubl-strings.h:54
@ -178,7 +178,11 @@ msgid "Terminate session"
msgstr ""
#: source/ubl-strings.h:55
msgid "Block session"
msgid "Lock session"
msgstr ""
#: source/ubl-strings.h:55
msgid "Unlock session"
msgstr ""
#: source/ubl-strings.h:57
@ -254,6 +258,9 @@ msgstr ""
msgid "Are you sure you want to block session"
msgstr ""
msgid "Are you sure you want to unlock session"
msgstr ""
#: source/ubl-strings.h:75
msgid ""
"If this is your active session, you will be taken to the login screen. Make "

@ -170,17 +170,21 @@ msgid "Properties"
msgstr "Свойства"
#: source/ubl-strings.h:53
msgid "Activate session"
msgstr "Активировать сессию"
msgid "Switch to session"
msgstr "Переключиться на сессию"
#: source/ubl-strings.h:54
msgid "Terminate session"
msgstr "Завершить сессию"
#: source/ubl-strings.h:55
msgid "Block session"
msgid "Lock session"
msgstr "Заблокировать сессию"
#: source/ubl-strings.h:55
msgid "Unlock session"
msgstr "Разблокировать сессию"
#: source/ubl-strings.h:57
msgid "Service source were not loaded"
msgstr "Сервис не был загружен"
@ -246,7 +250,7 @@ msgstr ""
#: source/ubl-strings.h:74
msgid "Are you sure you want to switch on session"
msgstr "Вы уверены, что хотите включить сессию"
msgstr "Вы уверены, что хотите переключиться на сессию"
#: source/ubl-strings.h:75
msgid "You are about to end your session"
@ -345,24 +349,24 @@ msgid "Reexec systemd"
msgstr "Перезапустить systemd"
#: source/ubl-strings.h:102
msgid "Service information"
msgstr "Информация о сервисе"
msgid "Unit information"
msgstr "Информация о юните"
#: source/ubl-strings.h:103
msgid "Relaunch with new configuration"
msgstr "Перезапустить с новой конфигурацией"
#: source/ubl-strings.h:104
msgid "Service log"
msgstr "Лог сервиса"
msgid "Unit log"
msgstr "Лог юнита"
#: source/ubl-strings.h:105
msgid "Service source file"
msgstr "Конфигурационный файл сервиса"
msgid "Unit source file"
msgstr "Конфигурационный файл юнита"
#: source/ubl-strings.h:106
msgid "Service properties"
msgstr "Свойства сервиса"
msgid "Unit properties"
msgstr "Свойства юнита"
#: source/ubl-strings.h:107
msgid "Additional information"
@ -420,10 +424,6 @@ msgstr "Запустить сессию"
msgid "Stop session"
msgstr "Остановить сессию"
#: source/ubl-strings.h:126
msgid "Lock session"
msgstr "Заблокировать сессию"
#: source/ubl-strings.h:128
msgid "Timer"
msgstr "Таймер"
@ -625,3 +625,6 @@ msgstr "Файл конфигурации, управляющий синхрон
msgid "Are you sure you want to block session"
msgstr "Вы уверены, что хотите заблокировать сессию"
msgid "Are you sure you want to unlock session"
msgstr "Вы уверены, что хотите разблокировать сессию"

Loading…
Cancel
Save