Localisation edits, User description fixes

source/ubl-settings-usergroups.c

@@ -72,6 +72,8 @@ void yon_interface_update(main_window *widgets){
 					login = yon_char_divide_search(parameters[0],"=",-1);
 					login[strlen(login)-1]='\0';
 				}
+				if(!strcmp(parameters[0],"x"))
+					parameters[0]="";
 				if (parameters_size>1&&!strcmp(parameters[1],"x")) parameters[1]=AUTOMATICALLY_LABEL;
 				if (parameters_size>2&&!strcmp(parameters[2],"x")) parameters[2]=login;
 				char *pars = "";
@@ -1823,7 +1825,8 @@ void on_parameter_changed(GtkWidget *self,ubl_settings_usergroups_user_window *w
 	} else {
 		main_group = "";
 	}
-	char *final_string = yon_char_unite(yon_char_return_if_exist(user_home,""),
+	char *final_string = user_home;
+	final_string = yon_char_unite(!yon_char_is_empty(final_string)?" ":"",
 	yon_char_return_if_exist(user_shell,""),
 	!yon_char_is_empty(user_shell)?" ":"",
 	yon_char_return_if_exist(create_system_user,""),

ubl-settings-usergroups.glade

@@ -330,6 +330,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="sizing">fixed</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">Disabled</property>
+                        <property name="sort-column-id">0</property>
                         <child>
                           <object class="GtkCellRendererToggle"/>
                         </child>
@@ -388,6 +389,7 @@ name</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">Main
 group</property>
+                        <property name="sort-column-id">4</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -403,9 +405,10 @@ group</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">Additional
 groups</property>
+                        <property name="sort-column-id">5</property>
                         <child>
                           <object class="GtkCellRendererText">
-                            <property name="wrap-mode">word</property>
+                            <property name="wrap-mode">word-char</property>
                             <property name="wrap-width">150</property>
                           </object>
                           <attributes>
@@ -421,10 +424,11 @@ groups</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">Additional
 parameters</property>
+                        <property name="sort-column-id">6</property>
                         <child>
                           <object class="GtkCellRendererText">
                             <property name="wrap-mode">word</property>
-                            <property name="wrap-width">150</property>
+                            <property name="wrap-width">100</property>
                           </object>
                           <attributes>
                             <attribute name="text">6</attribute>
@@ -438,6 +442,7 @@ parameters</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">Password
 status</property>
+                        <property name="sort-column-id">7</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -529,8 +534,11 @@ name</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">Group
 users</property>
+                        <property name="sort-column-id">2</property>
                         <child>
-                          <object class="GtkCellRendererText"/>
+                          <object class="GtkCellRendererText">
+                            <property name="wrap-width">150</property>
+                          </object>
                           <attributes>
                             <attribute name="text">2</attribute>
                           </attributes>
@@ -544,6 +552,7 @@ users</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">Additional
 parameters</property>
+                        <property name="sort-column-id">3</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>
@@ -558,6 +567,7 @@ parameters</property>
                         <property name="fixed-width">10</property>
                         <property name="title" translatable="yes">Password
 status</property>
+                        <property name="sort-column-id">4</property>
                         <child>
                           <object class="GtkCellRendererText"/>
                           <attributes>

ubl-settings-usergroups_ru.po

@@ -560,11 +560,11 @@ msgstr "Синхронизация настроек пользователя"
 
 #: source/ubl-strings.h:157
 msgid "During system startup, load the user from the configuration"
-msgstr "При загрузке системы загрузить пользователя из конфигурации"
+msgstr "При запуске операционной системы применять настройки пользователя из конфигурации"
 
 #: source/ubl-strings.h:158
 msgid "When shutting down the system, save the user into the configuration"
-msgstr "При завершении работы системы сохранить пользователя в конфигурацию"
+msgstr "При завершении работы операционной системы сохранить настройки пользователя в конфигурацию"
 
 #: source/ubl-strings.h:159
 msgid "User password configuration syncronization"