diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index da40aa5..afdd8e7 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -14,7 +14,7 @@
 #define UID_LABEL _("UID")
 #define LOGIN_LABEL _("Login")
 #define PASSWORD_LABEL _("Password")
-#define USER_NAME_LABEL _("User name")
+#define USER_NAME_LABEL _("User\nname")
 
 #define UID_USER_LABEL _("User UID:")
 #define USERNAME_USER_LABEL _("User name (description):")
@@ -22,7 +22,7 @@
 #define PASSWORD_USER_LABEL _("Password:")
 #define DEFAULT_USER_LABEL _("Default")
 #define MAIN_GROUP_USER_LABEL _("Main group:")
-#define ADDITIONAL_GROUPS_USER_LABEL _("Additional groups")
+#define ADDITIONAL_GROUPS_USER_LABEL _("Additional\ngroups")
 #define PASSWORD_HASH_USER_LABEL _("Password hash algorythm:")
 #define SYNC_SAMBA_USER_LABEL _("Sync with SAMBA user")
 #define EXTRA_OPTIONS_USER_LABEL _("Extra options:")
@@ -30,13 +30,13 @@
 #define OK_LABEL _("Ok")
 
 #define BLOCK_LABEL _("Block")
-#define MAIN_GROUP_LABEL _("Main group")
-#define ADDITIONAL_PARAMETERS_LABEL _("Additional parameters")
-#define PASSWORD_STATUS_LABEL _("Password status")
+#define MAIN_GROUP_LABEL _("Main\ngroup")
+#define ADDITIONAL_PARAMETERS_LABEL _("Additional\nparameters")
+#define PASSWORD_STATUS_LABEL _("Password\nstatus")
 #define USERS_LABEL _("Users")
 #define GID_LABEL _("GID")
-#define GROUP_NAME_LABEL _("Group name")
-#define GROUPS_USERS_LABEL _("Group users")
+#define GROUP_NAME_LABEL _("Group\nname")
+#define GROUPS_USERS_LABEL _("Group\nusers")
 #define GROUPS_LABEL _("Groups")
 
 #define PASSWORD_TITLE_LABEL _("Password input")
@@ -95,8 +95,8 @@
 #define INSPECTOR_TITLE_LABEL _("System users and groups")
 #define BLOCKED_LABEL _("Blocked")
 #define USERNAME_LABEL _("Username")
-#define PRIMARY_GROUP_LABEL _("Primary group")
-#define HOME_DIRECTORY_LABEL _("Home directory")
+#define PRIMARY_GROUP_LABEL _("Primary\ngroup")
+#define HOME_DIRECTORY_LABEL _("Home\ndirectory")
 #define GROUP_LABEL _("Group")
 #define UPDATE_SYSTEM_LABEL _("Update the system users and groups list")
 #define TOGGLE_SYSTEM_LABEL _("Toggle system groups and users")
@@ -104,13 +104,13 @@
 #define PASSWORD_MISMATCH_LABEL _("Password mismatch")
 #define PASSWORD_SHORT_LABEL(min_size_char) yon_char_unite(_("Password must be at least")," ", min_size_char," ",_("characters"))
 #define GROUP_LABEL _("Group")
-#define DAYS_WARNING_TABLE_LABEL _("Days until warning")
-#define DAYS_ACTIVITY_TABLE_LABEL _("Days without activity")
-#define SHALL_TABLE_LABEL _("Shell path")
-#define PASSWORD_CHANGED_TABLE_LABEL _("Password has been changed")
-#define EXPIRATION_TABLE_LABEL _("Expiration date")
-#define INTERVAL_MIN_TABLE_LABEL _("Password change interval (min)")
-#define INTERVAL_MAX_TABLE_LABEL _("Password change interval (max)")
+#define DAYS_WARNING_TABLE_LABEL _("Days until\nwarning")
+#define DAYS_ACTIVITY_TABLE_LABEL _("Days\nwithout activity")
+#define SHALL_TABLE_LABEL _("Shell\npath")
+#define PASSWORD_CHANGED_TABLE_LABEL _("Password has\nbeen changed")
+#define EXPIRATION_TABLE_LABEL _("Expiration\ndate")
+#define INTERVAL_MIN_TABLE_LABEL _("Password change\ninterval (min)")
+#define INTERVAL_MAX_TABLE_LABEL _("Password change\ninterval (max)")
 
 //ubl-settings-usergroups-user.glade
 #define ADD_USER_TITLE_LABEL _("Add user")
@@ -139,7 +139,7 @@
 #define SAVE_LABEL _("Save")
 #define LOGIN_TOOLTIP_NAME_LABEL _("login_name")
 #define GROUP_TOOLTIP_NAME_LABEL _("group_name")
-#define USER_NAME_LABEL _("User name")
+#define USER__NAME_LABEL _("User name")
 
 #define USER_CONFIIGURATION_LABEL _("User configuration")
 #define USERADD_SYNC_LABEL _("User configuration synchronization")
diff --git a/ubl-settings-usergroups-system.glade b/ubl-settings-usergroups-system.glade
index 26ceded..aaeb2e6 100644
--- a/ubl-settings-usergroups-system.glade
+++ b/ubl-settings-usergroups-system.glade
@@ -195,7 +195,8 @@
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="min-width">50</property>
-                        <property name="title" translatable="yes">Primary group</property>
+                        <property name="title" translatable="yes">Primary
+group</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -209,7 +210,8 @@
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="min-width">50</property>
-                        <property name="title" translatable="yes">Additional groups</property>
+                        <property name="title" translatable="yes">Additional
+groups</property>
                         <child>
                           <object class="GtkCellRendererText">
                             <property name="wrap-width">150</property>
@@ -223,7 +225,8 @@
                     <child>
                       <object class="GtkTreeViewColumn">
                         <property name="min-width">50</property>
-                        <property name="title" translatable="yes">Home directory</property>
+                        <property name="title" translatable="yes">Home
+directory</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -234,7 +237,8 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn">
-                        <property name="title" translatable="yes">Shell path</property>
+                        <property name="title" translatable="yes">Shell
+path</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -245,7 +249,8 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn">
-                        <property name="title" translatable="yes">Password has been changed</property>
+                        <property name="title" translatable="yes">Password has
+been changed</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -256,7 +261,8 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn">
-                        <property name="title" translatable="yes">Expiration date</property>
+                        <property name="title" translatable="yes">Expiration
+date</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -267,7 +273,8 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn">
-                        <property name="title" translatable="yes">Password change interval (min)</property>
+                        <property name="title" translatable="yes">Password change
+interval (min)</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -278,7 +285,8 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn">
-                        <property name="title" translatable="yes">Password change interval (max)</property>
+                        <property name="title" translatable="yes">Password change
+interval (max)</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -289,7 +297,8 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn">
-                        <property name="title" translatable="yes">Days until warning</property>
+                        <property name="title" translatable="yes">Days until
+warning</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -300,7 +309,8 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn">
-                        <property name="title" translatable="yes">Days without activity</property>
+                        <property name="title" translatable="yes">Days
+without activity</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -372,7 +382,8 @@
                     <child>
                       <object class="GtkTreeViewColumn">
                         <property name="min-width">50</property>
-                        <property name="title" translatable="yes">Group users</property>
+                        <property name="title" translatable="yes">Group
+users</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
diff --git a/ubl-settings-usergroups.glade b/ubl-settings-usergroups.glade
index 7cba7a4..8061413 100644
--- a/ubl-settings-usergroups.glade
+++ b/ubl-settings-usergroups.glade
@@ -335,7 +335,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
-                        <property name="title" translatable="yes">User name</property>
+                        <property name="title" translatable="yes">User
+name</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -349,7 +350,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
-                        <property name="title" translatable="yes">Main group</property>
+                        <property name="title" translatable="yes">Main
+group</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -363,7 +365,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
-                        <property name="title" translatable="yes">Additional groups</property>
+                        <property name="title" translatable="yes">Additional
+groups</property>
                         <child>
                           <object class="GtkCellRendererText">
                             <property name="wrap-mode">word</property>
@@ -380,7 +383,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
-                        <property name="title" translatable="yes">Additional parameters</property>
+                        <property name="title" translatable="yes">Additional
+parameters</property>
                         <child>
                           <object class="GtkCellRendererText">
                             <property name="wrap-mode">word</property>
@@ -396,7 +400,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                       <object class="GtkTreeViewColumn">
                         <property name="sizing">autosize</property>
                         <property name="fixed-width">10</property>
-                        <property name="title" translatable="yes">Password status</property>
+                        <property name="title" translatable="yes">Password
+status</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -468,7 +473,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
-                        <property name="title" translatable="yes">Group name</property>
+                        <property name="title" translatable="yes">Group
+name</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -482,7 +488,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
-                        <property name="title" translatable="yes">Group users</property>
+                        <property name="title" translatable="yes">Group
+users</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -496,7 +503,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
-                        <property name="title" translatable="yes">Additional parameters</property>
+                        <property name="title" translatable="yes">Additional
+parameters</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -509,7 +517,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                       <object class="GtkTreeViewColumn">
                         <property name="sizing">autosize</property>
                         <property name="fixed-width">10</property>
-                        <property name="title" translatable="yes">Password status</property>
+                        <property name="title" translatable="yes">Password
+status</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
diff --git a/ubl-settings-usergroups.pot b/ubl-settings-usergroups.pot
index ec9a15b..692cc00 100644
--- a/ubl-settings-usergroups.pot
+++ b/ubl-settings-usergroups.pot
@@ -113,8 +113,10 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: source/ubl-strings.h:17 source/ubl-strings.h:142
-msgid "User name"
+#: source/ubl-strings.h:17
+msgid ""
+"User\n"
+"name"
 msgstr ""
 
 #: source/ubl-strings.h:19
@@ -141,8 +143,10 @@ msgstr ""
 msgid "Main group:"
 msgstr ""
 
-#: source/ubl-strings.h:25 source/ubl-strings.h:90
-msgid "Additional groups"
+#: source/ubl-strings.h:25
+msgid ""
+"Additional\n"
+"groups"
 msgstr ""
 
 #: source/ubl-strings.h:27
@@ -165,16 +169,22 @@ msgstr ""
 msgid "Block"
 msgstr ""
 
-#: source/ubl-strings.h:33 source/ubl-strings.h:89
-msgid "Main group"
+#: source/ubl-strings.h:33
+msgid ""
+"Main\n"
+"group"
 msgstr ""
 
 #: source/ubl-strings.h:34
-msgid "Additional parameters"
+msgid ""
+"Additional\n"
+"parameters"
 msgstr ""
 
 #: source/ubl-strings.h:35
-msgid "Password status"
+msgid ""
+"Password\n"
+"status"
 msgstr ""
 
 #: source/ubl-strings.h:36
@@ -186,11 +196,15 @@ msgid "GID"
 msgstr ""
 
 #: source/ubl-strings.h:38
-msgid "Group name"
+msgid ""
+"Group\n"
+"name"
 msgstr ""
 
 #: source/ubl-strings.h:39
-msgid "Group users"
+msgid ""
+"Group\n"
+"users"
 msgstr ""
 
 #: source/ubl-strings.h:40
@@ -297,6 +311,14 @@ msgstr ""
 msgid "Default groups"
 msgstr ""
 
+#: source/ubl-strings.h:89
+msgid "Main group"
+msgstr ""
+
+#: source/ubl-strings.h:90
+msgid "Additional groups"
+msgstr ""
+
 #: source/ubl-strings.h:91
 msgid "Choose groups"
 msgstr ""
@@ -318,11 +340,15 @@ msgid "Username"
 msgstr ""
 
 #: source/ubl-strings.h:98
-msgid "Primary group"
+msgid ""
+"Primary\n"
+"group"
 msgstr ""
 
 #: source/ubl-strings.h:99
-msgid "Home directory"
+msgid ""
+"Home\n"
+"directory"
 msgstr ""
 
 #: source/ubl-strings.h:100 source/ubl-strings.h:106
@@ -350,31 +376,45 @@ msgid "characters"
 msgstr ""
 
 #: source/ubl-strings.h:107
-msgid "Days until warning"
+msgid ""
+"Days until\n"
+"warning"
 msgstr ""
 
 #: source/ubl-strings.h:108
-msgid "Days without activity"
+msgid ""
+"Days\n"
+"without activity"
 msgstr ""
 
 #: source/ubl-strings.h:109
-msgid "Shell path"
+msgid ""
+"Shell\n"
+"path"
 msgstr ""
 
 #: source/ubl-strings.h:110
-msgid "Password has been changed"
+msgid ""
+"Password has\n"
+"been changed"
 msgstr ""
 
 #: source/ubl-strings.h:111
-msgid "Expiration date"
+msgid ""
+"Expiration\n"
+"date"
 msgstr ""
 
 #: source/ubl-strings.h:112
-msgid "Password change interval (min)"
+msgid ""
+"Password change\n"
+"interval (min)"
 msgstr ""
 
 #: source/ubl-strings.h:113
-msgid "Password change interval (max)"
+msgid ""
+"Password change\n"
+"interval (max)"
 msgstr ""
 
 #: source/ubl-strings.h:116
@@ -481,6 +521,10 @@ msgstr ""
 msgid "group_name"
 msgstr ""
 
+#: source/ubl-strings.h:142
+msgid "User name"
+msgstr ""
+
 #: source/ubl-strings.h:144
 msgid "User configuration"
 msgstr ""
diff --git a/ubl-settings-usergroups_ru.po b/ubl-settings-usergroups_ru.po
index a938f48..177f3f4 100644
--- a/ubl-settings-usergroups_ru.po
+++ b/ubl-settings-usergroups_ru.po
@@ -22,7 +22,6 @@ msgid "Version:"
 msgstr "Версия:"
 
 #: source/ubl-strings.h:2
-#, fuzzy
 msgid "ubl-settings-usergroups version:"
 msgstr "Версия ubl-ubl-settings-usergroups: "
 
@@ -116,9 +115,13 @@ msgstr "Логин"
 msgid "Password"
 msgstr "Пароль"
 
-#: source/ubl-strings.h:17 source/ubl-strings.h:142
-msgid "User name"
-msgstr "Имя пользователя"
+#: source/ubl-strings.h:17
+msgid ""
+"User\n"
+"name"
+msgstr ""
+"Имя\n"
+"пользователя"
 
 #: source/ubl-strings.h:19
 msgid "User UID:"
@@ -144,9 +147,11 @@ msgstr "По умолчанию"
 msgid "Main group:"
 msgstr "Основная группа:"
 
-#: source/ubl-strings.h:25 source/ubl-strings.h:90
-msgid "Additional groups"
-msgstr "Дополнительные группы"
+#: source/ubl-strings.h:25
+msgid ""
+"Additional\n"
+"groups"
+msgstr "Дополнительные\nгруппы"
 
 #: source/ubl-strings.h:27
 msgid "Sync with SAMBA user"
@@ -168,17 +173,29 @@ msgstr "Ок"
 msgid "Block"
 msgstr "Заблокировано"
 
-#: source/ubl-strings.h:33 source/ubl-strings.h:89
-msgid "Main group"
-msgstr "Основная группа"
+#: source/ubl-strings.h:33
+msgid ""
+"Main\n"
+"group"
+msgstr ""
+"Основная\n"
+"группа"
 
 #: source/ubl-strings.h:34
-msgid "Additional parameters"
-msgstr "Дополнительные параметры"
+msgid ""
+"Additional\n"
+"parameters"
+msgstr ""
+"Дополнительные\n"
+"параметры"
 
 #: source/ubl-strings.h:35
-msgid "Password status"
-msgstr "Статус пароля"
+msgid ""
+"Password\n"
+"status"
+msgstr ""
+"Статус\n"
+"пароля"
 
 #: source/ubl-strings.h:36
 msgid "Users"
@@ -189,12 +206,20 @@ msgid "GID"
 msgstr "GID"
 
 #: source/ubl-strings.h:38
-msgid "Group name"
-msgstr "Имя группы"
+msgid ""
+"Group\n"
+"name"
+msgstr ""
+"Имя\n"
+"группы"
 
 #: source/ubl-strings.h:39
-msgid "Group users"
-msgstr "Пользователи группы"
+msgid ""
+"Group\n"
+"users"
+msgstr ""
+"Пользователи\n"
+"группы"
 
 #: source/ubl-strings.h:40
 msgid "Groups"
@@ -300,6 +325,14 @@ msgstr "Дополнительные настройки"
 msgid "Default groups"
 msgstr "Группы пользователей по умолчанию"
 
+#: source/ubl-strings.h:89
+msgid "Main group"
+msgstr "Основная группа"
+
+#: source/ubl-strings.h:90
+msgid "Additional groups"
+msgstr "Дополнительные группы"
+
 #: source/ubl-strings.h:91
 msgid "Choose groups"
 msgstr "Выбрать группы"
@@ -321,12 +354,16 @@ msgid "Username"
 msgstr "Имя пользователя"
 
 #: source/ubl-strings.h:98
-msgid "Primary group"
-msgstr "Основная группа"
+msgid ""
+"Primary\n"
+"group"
+msgstr "Основная\nгруппа"
 
 #: source/ubl-strings.h:99
-msgid "Home directory"
-msgstr "Домашний каталог"
+msgid ""
+"Home\n"
+"directory"
+msgstr "Домашний\nкаталог"
 
 #: source/ubl-strings.h:100 source/ubl-strings.h:106
 msgid "Group"
@@ -353,32 +390,46 @@ msgid "characters"
 msgstr "символов"
 
 #: source/ubl-strings.h:107
-msgid "Days until warning"
-msgstr "Дней до предупреждения"
+msgid ""
+"Days until\n"
+"warning"
+msgstr "Дней до\nпредупреждения"
 
 #: source/ubl-strings.h:108
-msgid "Days without activity"
-msgstr "Дней без активности"
+msgid ""
+"Days\n"
+"without activity"
+msgstr "Дней без\nактивности"
 
 #: source/ubl-strings.h:109
-msgid "Shell path"
-msgstr "Путь до оболочки"
+msgid ""
+"Shell\n"
+"path"
+msgstr "Путь до\nоболочки"
 
 #: source/ubl-strings.h:110
-msgid "Password has been changed"
-msgstr "Пароль изменён"
+msgid ""
+"Password has\n"
+"been changed"
+msgstr "Пароль\nизменён"
 
 #: source/ubl-strings.h:111
-msgid "Expiration date"
-msgstr "Дата устаревания"
+msgid ""
+"Expiration\n"
+"date"
+msgstr "Дата\nустаревания"
 
 #: source/ubl-strings.h:112
-msgid "Password change interval (min)"
-msgstr "Интервал смены пароля (мин.)"
+msgid ""
+"Password change\n"
+"interval (min)"
+msgstr "Интервал смены\nпароля (мин.)"
 
 #: source/ubl-strings.h:113
-msgid "Password change interval (max)"
-msgstr "Интервал смены пароля (макс.)"
+msgid ""
+"Password change\n"
+"interval (max)"
+msgstr "Интервал смены\nпароля (макс.)"
 
 #: source/ubl-strings.h:116
 msgid "Add user"
@@ -437,7 +488,6 @@ msgid "Days until warning:"
 msgstr "Дней до предупреждения:"
 
 #: source/ubl-strings.h:130
-#, fuzzy
 msgid "Days without activity:"
 msgstr "Дней без активности:"
 
@@ -446,7 +496,6 @@ msgid "Force change at next login"
 msgstr "Принудительно сменить при следующем входе в систему"
 
 #: source/ubl-strings.h:132
-#, fuzzy
 msgid "User shell:"
 msgstr "Оболочка пользователя:"
 
@@ -486,6 +535,10 @@ msgstr "Имя_логина"
 msgid "group_name"
 msgstr "Имя_группы"
 
+#: source/ubl-strings.h:142
+msgid "User name"
+msgstr "Имя пользователя"
+
 #: source/ubl-strings.h:144
 msgid "User configuration"
 msgstr "Настройка пользователя"