smeserver-remoteuseraccess/contribs7/smeserver-remoteuseraccess-1.2-add2general.patch

--- smeserver-remoteuseraccess-1.2/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteuseraccess.pm.add2general 2006-11-23 10:11:14.000000000 +0100
+++ smeserver-remoteuseraccess-1.2/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteuseraccess.pm     2008-04-26 22:38:14.000000000 +0200
@@ -49,7 +49,7 @@
 
     my $user_table =
     {
-       title => $self->localise('CURRENT_LIST_OF_USERS'),
+       title => $self->localise('USER_LIST_CURRENT'),
 
        stripe => '#D4D0C8',
 
@@ -59,10 +59,10 @@
 
        field_attr => {
                        User          => {
-                                           label => $self->localise('LABEL_USER')
+                                           label => $self->localise('ACCOUNT')
                                         },
                        FullName      => {
-                                           label => $self->localise('LABEL_FULLNAME')
+                                           label => $self->localise('USER_NAME')
                                         },
                        shell         => {
                                            label => $self->localise('SHELL_ACCESS')
@@ -89,7 +89,7 @@
     my @data = ();
     my @users = $adb->users;
 
-    return $self->localise("NO_ACCOUNTS") if (@users == 0);
+    return $self->localise("ACCOUNT_USER_NONE") if (@users == 0);
 
     for my $user (@users)
     {
--- smeserver-remoteuseraccess-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteuseraccess.add2general 2008-04-26 22:33:59.000000000 +0200
+++ smeserver-remoteuseraccess-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteuseraccess     2008-04-26 22:43:25.000000000 +0200
@@ -12,18 +12,6 @@
       <trans>Change user remote access settings</trans>
     </entry>
     <entry>
-      <base>CURRENT_LIST_OF_USERS</base>
-      <trans>Current list of users</trans>
-    </entry>
-    <entry>
-      <base>LABEL_USER</base>
-      <trans>Account</trans>
-    </entry>
-    <entry>
-      <base>LABEL_FULLNAME</base>
-      <trans>User Name</trans>
-    </entry>
-    <entry>
       <base>SHELL_ACCESS</base>
       <trans>Shell</trans>
     </entry>
@@ -64,14 +52,6 @@
       <trans>Sudo Access</trans>
     </entry>
     <entry>
-      <base>NO_ACCOUNTS</base>
-      <trans>There are no user accounts in the system.</trans>
-    </entry>
-    <entry>
-      <base>SUCCESS</base>
-      <trans>Success</trans>
-    </entry>
-    <entry>
       <base>MODIFY_DESCRIPTION</base>
          <trans>  <![CDATA[
              <p>
@@ -108,8 +88,4 @@
              but they will wrap onto three or more lines in the display.
              To delete all keys type "deletekeys". </trans>
     </entry>
-    <entry>
-      <base>INVALID_USER</base>
-      <trans>Invalid user</trans>
-    </entry>
 </lexicon>
--- smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/remoteuseraccess.add2general  2006-11-10 05:35:44.000000000 +0100
+++ smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/remoteuseraccess      2008-04-26 22:39:18.000000000 +0200
@@ -42,11 +42,11 @@
         <description>MODIFY_DESCRIPTION</description>
 
         <field type="literal" id="User" >
-            <label>LABEL_USER</label>
+            <label>ACCOUNT</label>
         </field>
 
         <field type="literal" id="FullName">
-            <label>LABEL_FULLNAME</label>
+            <label>USER_NAME</label>
         </field>
 
         <field
--- smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/userpanel-sshkeys.add2general 2006-11-10 05:35:50.000000000 +0100
+++ smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/userpanel-sshkeys     2008-04-26 22:39:58.000000000 +0200
@@ -40,11 +40,11 @@
         <description>SSHKEYS_DESCRIPTION</description>
 
         <field type="literal" id="User" value="get_panel_user()">
-            <label>LABEL_USER</label>
+            <label>ACCOUNT</label>
         </field>
 
         <field type="literal" id="FullName" value="get_full_name()">
-            <label>LABEL_FULLNAME</label>
+            <label>USER_NAME</label>
         </field>
 
         <field type="textarea"
1	--- smeserver-remoteuseraccess-1.2/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteuseraccess.pm.add2general 2006-11-23 10:11:14.000000000 +0100
2	+++ smeserver-remoteuseraccess-1.2/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteuseraccess.pm 2008-04-26 22:38:14.000000000 +0200
3	@@ -49,7 +49,7 @@
4
5	my $user_table =
6	{
7	- title => $self->localise('CURRENT_LIST_OF_USERS'),
8	+ title => $self->localise('USER_LIST_CURRENT'),
9
10	stripe => '#D4D0C8',
11
12	@@ -59,10 +59,10 @@
13
14	field_attr => {
15	User => {
16	- label => $self->localise('LABEL_USER')
17	+ label => $self->localise('ACCOUNT')
18	},
19	FullName => {
20	- label => $self->localise('LABEL_FULLNAME')
21	+ label => $self->localise('USER_NAME')
22	},
23	shell => {
24	label => $self->localise('SHELL_ACCESS')
25	@@ -89,7 +89,7 @@
26	my @data = ();
27	my @users = $adb->users;
28
29	- return $self->localise("NO_ACCOUNTS") if (@users == 0);
30	+ return $self->localise("ACCOUNT_USER_NONE") if (@users == 0);
31
32	for my $user (@users)
33	{
34	--- smeserver-remoteuseraccess-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteuseraccess.add2general 2008-04-26 22:33:59.000000000 +0200
35	+++ smeserver-remoteuseraccess-1.2/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteuseraccess 2008-04-26 22:43:25.000000000 +0200
36	@@ -12,18 +12,6 @@
37	<trans>Change user remote access settings</trans>
38	</entry>
39	<entry>
40	- <base>CURRENT_LIST_OF_USERS</base>
41	- <trans>Current list of users</trans>
42	- </entry>
43	- <entry>
44	- <base>LABEL_USER</base>
45	- <trans>Account</trans>
46	- </entry>
47	- <entry>
48	- <base>LABEL_FULLNAME</base>
49	- <trans>User Name</trans>
50	- </entry>
51	- <entry>
52	<base>SHELL_ACCESS</base>
53	<trans>Shell</trans>
54	</entry>
55	@@ -64,14 +52,6 @@
56	<trans>Sudo Access</trans>
57	</entry>
58	<entry>
59	- <base>NO_ACCOUNTS</base>
60	- <trans>There are no user accounts in the system.</trans>
61	- </entry>
62	- <entry>
63	- <base>SUCCESS</base>
64	- <trans>Success</trans>
65	- </entry>
66	- <entry>
67	<base>MODIFY_DESCRIPTION</base>
68	<trans> <![CDATA[
69	<p>
70	@@ -108,8 +88,4 @@
71	but they will wrap onto three or more lines in the display.
72	To delete all keys type "deletekeys". </trans>
73	</entry>
74	- <entry>
75	- <base>INVALID_USER</base>
76	- <trans>Invalid user</trans>
77	- </entry>
78	</lexicon>
79	--- smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/remoteuseraccess.add2general 2006-11-10 05:35:44.000000000 +0100
80	+++ smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/remoteuseraccess 2008-04-26 22:39:18.000000000 +0200
81	@@ -42,11 +42,11 @@
82	<description>MODIFY_DESCRIPTION</description>
83
84	<field type="literal" id="User" >
85	- <label>LABEL_USER</label>
86	+ <label>ACCOUNT</label>
87	</field>
88
89	<field type="literal" id="FullName">
90	- <label>LABEL_FULLNAME</label>
91	+ <label>USER_NAME</label>
92	</field>
93
94	<field
95	--- smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/userpanel-sshkeys.add2general 2006-11-10 05:35:50.000000000 +0100
96	+++ smeserver-remoteuseraccess-1.2/root/etc/e-smith/web/functions/userpanel-sshkeys 2008-04-26 22:39:58.000000000 +0200
97	@@ -40,11 +40,11 @@
98	<description>SSHKEYS_DESCRIPTION</description>
99
100	<field type="literal" id="User" value="get_panel_user()">
101	- <label>LABEL_USER</label>
102	+ <label>ACCOUNT</label>
103	</field>
104
105	<field type="literal" id="FullName" value="get_full_name()">
106	- <label>LABEL_FULLNAME</label>
107	+ <label>USER_NAME</label>
108	</field>
109
110	<field type="textarea"