Makefile

@@ -12,10 +12,6 @@ DEPENDS = /bin/cmake
 PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
 FILE_VER = source/${PKGNAME}.h
-<<<<<<< HEAD
-=======
-PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
->>>>>>> 99554f5a8990d7e4a6abea8fe763c3ba03bdc358
 
 default_target: all
 

locale/ubl-settings-update.pot

@@ -217,6 +217,10 @@ msgstr ""
 msgid "Automatic update"
 msgstr ""
 
+#: source/ubl-strings.h:62
+msgid "Last update:"
+msgstr ""
+
 #: source/ubl-strings.h:63
 msgid "Update mode:"
 msgstr ""

locale/ubl-settings-update_ru.po

@@ -236,6 +236,10 @@ msgstr "Дата последнего автообновления"
 msgid "Automatic update"
 msgstr "Автоматическое обновление"
 
+#: source/ubl-strings.h:62
+msgid "Last update:"
+msgstr "Последнее обновление:"
+
 #: source/ubl-strings.h:63
 msgid "Update mode:"
 msgstr "Режим обновления:"

source/ubl-strings.h

@@ -62,6 +62,7 @@ mirrorlist - mirrors file, make sure server URL is NOT included in this file! Si
     #define _LABEL _("Automatic update")
     #define _LABEL _("Update mode:")
     #define _LABEL _("Update interval:")
+    #define _LABEL _("Last update:")
 
     #define _LABEL _("Update mode")
     #define _LABEL _("Update interval")

ubl-settings-update-password.glade

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="ubl-settings-update">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-update.css -->
   <object class="GtkImage" id="image4">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.ubl-settings-usergroups.cancel-symbolic</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.cancel-uncolored-symbolic</property>
   </object>
   <object class="GtkImage" id="image5">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">com.ublinux.ubl-settings-usergroups.accept-symbolic</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.accept-symbolic</property>
   </object>
   <object class="GtkWindow" id="PasswordWindow">
     <property name="can-focus">False</property>

ubl-settings-update.glade

@@ -218,6 +218,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="can-focus">False</property>
                         <property name="editable">False</property>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack-type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes">Last update:</property>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>