Merge pull request 'Localisation fix' (#80) from YanTheKaller/libublsettingsui-gtk3:master into master

Reviewed-on: #80

libublsettingsui-gtk3-password.glade

@@ -17,7 +17,7 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="default-width">450</property>
-    <property name="icon-name">com.ublinux.ubl-settings-update</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>

libublsettingsui-gtk3.pot

@@ -489,4 +489,24 @@ msgid "User"
 msgstr ""
 
 msgid "Open configuration file"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:728
+msgid "Password:"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:728
+msgid "Repeat password:"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:728
+msgid "Encryption:"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:728
+msgid "Do not encrypt password"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:728
+msgid "Password hash:"
 msgstr ""

libublsettingsui-gtk3_ru.po

@@ -499,3 +499,23 @@ msgstr "Пользователь"
 
 msgid "Open configuration file"
 msgstr "Открыть файл конфигурации"
+
+#: source/libublsettingsui-gtk3.h:728
+msgid "Password:"
+msgstr "Пароль:"
+
+#: source/libublsettingsui-gtk3.h:728
+msgid "Repeat password:"
+msgstr "Подтверждение пароля:"
+
+#: source/libublsettingsui-gtk3.h:728
+msgid "Encryption:"
+msgstr "Шифрование:"
+
+#: source/libublsettingsui-gtk3.h:728
+msgid "Do not encrypt password"
+msgstr "Не шифровать пароль"
+
+#: source/libublsettingsui-gtk3.h:728
+msgid "Password hash:"
+msgstr "Хэш пароля"

source/libublsettingsui-gtk3.h

@@ -718,6 +718,13 @@ yon_window *yon_window_new();
     #define _SERVICE_INACTIVE_STATUS_LABEL(target) yon_char_unite("\"",target,"\" ",yon_char_get_localised_from_lib(yon_char_get_localised_from_lib("service is inactive")),NULL)
 
     #define _PASSWORD_TITLE_LABEL yon_char_get_localised_from_lib("Password")
+    // #define _PASSWORD_TITLE_LABEL yon_char_get_localised_from_lib("Password input")
+
+    #define _PASSWORD_LABEL yon_char_get_localised_from_lib("Password:")
+    #define _PASSWORD_REPEAT_LABEL yon_char_get_localised_from_lib("Repeat password:")
+    #define _PASSWORD_ENCRYPTION_LABEL yon_char_get_localised_from_lib("Encryption:")
+    #define _PASSWORD_NO_ENCRYPTION_LABEL yon_char_get_localised_from_lib("Do not encrypt password")
+    #define _PASSWORD_HASH_LABEL yon_char_get_localised_from_lib("Password hash:")
 
     #define UNSAVED_LABEL yon_char_get_localised_from_lib("The changes were not saved to either the local or global configuration file.\nQuit without saving?")
     #define EXIT_LABEL yon_char_get_localised_from_lib("Exit")