smeserver-userpanels/contribs7/smeserver-userpanels-1.0-pootle.patch

--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-userbackup.pootle        2008-03-08 13:22:51.000000000 +1100
+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-userbackup       2008-02-28 21:47:44.000000000 +1100
@@ -0,0 +1,8 @@
+<lexicon lang="en-us">
+
+    <entry>
+      <base>Data Backup</base>
+      <trans>Data Backup</trans>
+    </entry>
+
+</lexicon>
\ No newline at end of file
--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding.pootle        2006-10-31 01:31:52.000000000 +1100
+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding       2008-02-25 19:47:56.000000000 +1100
@@ -1,18 +1,12 @@
 <lexicon lang="en-us">
-
-    <entry>
-        <base>Your Settings</base>
-        <trans>Your Settings</trans>
-    </entry>
     <entry>
-        <base>Forward Mail</base>
-        <trans>Forward Mail</trans>
+      <base>Forward Mail</base>
+      <trans>Forward Mail</trans>
     </entry>
     <entry>
       <base>FORM_TITLE</base>
       <trans>Change email delivery</trans>
     </entry>
-
     <entry>
       <base>DESCRIPTION</base>
       <trans>
@@ -23,60 +17,44 @@
         ]]>
       </trans>
     </entry>
-
     <entry>
       <base>ACCOUNT_NAME</base>
       <trans>Your account: </trans>
     </entry>
-
     <entry>
       <base>LOCAL</base>
       <trans>Deliver email locally</trans>
     </entry>
-
     <entry>
       <base>FORWARD</base>
       <trans>Forward to address below</trans>
     </entry>
-
     <entry>
       <base>BOTH</base>
       <trans>Both deliver locally and forward</trans>
     </entry>
-
-    <entry>
-      <base>SAVE</base>
-      <trans>Save</trans>
-    </entry>
-
     <entry>
       <base>OK</base>
       <trans>OK</trans>
     </entry>
-
     <entry>
       <base>UNACCEPTABLE_CHARS</base>
       <trans>Unacceptable characters, or Domain name missing.</trans>
     </entry>
-
     <entry>
       <base>EMAIL_DELIVERY</base>
       <trans>Email Delivery</trans>
     </entry>
-
     <entry>
       <base>FORWARDING_ADDRESS</base>
       <trans>Forwarding Address</trans>
     </entry>
-
     <entry>
       <base>ERROR_UPDATING</base>
       <trans>Error updating your settings.</trans>
     </entry>
-
     <entry>
       <base>SUCCESS</base>
       <trans>Your settings have been saved.</trans>
     </entry>
-
 </lexicon>
\ No newline at end of file
--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-useraccounts.pootle      2008-03-08 13:23:09.000000000 +1100
+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-useraccounts     2008-02-28 21:47:44.000000000 +1100
@@ -0,0 +1,8 @@
+<lexicon lang="en-us">
+
+    <entry>
+      <base>User accounts</base>
+      <trans>User accounts</trans>
+    </entry>
+
+</lexicon>
\ No newline at end of file
--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-password.pootle  2005-12-18 19:02:50.000000000 +1100
+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-password 2008-02-25 19:47:56.000000000 +1100
@@ -1,10 +1,12 @@
 <lexicon lang="en-us">
-
+    <entry>
+      <base>Change Password</base>
+      <trans>Change Password</trans>
+    </entry>
     <entry>
       <base>FORM_TITLE</base>
       <trans>Change account password</trans>
     </entry>
-
     <entry>
       <base>DESCRIPTION</base>
       <trans>
@@ -20,65 +22,48 @@
         ]]>
       </trans>
     </entry>
-
     <entry>
       <base>ACCOUNT_NAME</base>
       <trans>Your account: </trans>
     </entry>
-
     <entry>
       <base>OLD_SYSTEM_PASSWORD</base>
       <trans>Old password: </trans>
     </entry>
-
     <entry>
       <base>NEW_SYSTEM_PASSWORD</base>
       <trans>New password: </trans>
     </entry>
-
     <entry>
       <base>NEW_SYSTEM_PASSWORD_VERIFY</base>
       <trans>New password (verify): </trans>
     </entry>
-
-    <entry>
-      <base>CHANGE_PASSWORD</base>
-      <trans>Change Password</trans>
-    </entry>
-
     <entry>
       <base>PASSWORD_VERIFY_ERROR</base>
       <trans>The passwords you entered did not match.</trans>
     </entry>
-
     <entry>
       <base>PASSWORD_CHANGE_FAILURE</base>
       <trans>An error occurred while attempting to change your password.  Please make sure that the old password entered is correct.</trans>
     </entry>
-
     <entry>
       <base>PASSWORD_CHANGED</base>
       <trans>Your password has been successfully changed.</trans>
     </entry>
-
     <entry>
       <base>TAINED_OLDPASS</base>
       <trans>The old password you entered contained invalid characters.</trans>
     </entry>
-
     <entry>
       <base>TAINED_PASS</base>
       <trans>The password you entered contained invalid characters.</trans>
     </entry>
-
     <entry>
       <base>TAINED_ACCOUNT</base>
       <trans>The account name you entered contained invalid characters.</trans>
     </entry>
-
     <entry>
       <base>NO_SUCH_USER</base>
       <trans>The account name entered is invalid.</trans>
     </entry>
-
 </lexicon>
1	dungog	1.1	--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-userbackup.pootle 2008-03-08 13:22:51.000000000 +1100
2			+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-userbackup 2008-02-28 21:47:44.000000000 +1100
3			@@ -0,0 +1,8 @@
4			+<lexicon lang="en-us">
5			+
6			+ <entry>
7			+ <base>Data Backup</base>
8			+ <trans>Data Backup</trans>
9			+ </entry>
10			+
11			+</lexicon>
12			\ No newline at end of file
13			--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding.pootle 2006-10-31 01:31:52.000000000 +1100
14			+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding 2008-02-25 19:47:56.000000000 +1100
15			@@ -1,18 +1,12 @@
16			<lexicon lang="en-us">
17			-
18			- <entry>
19			- <base>Your Settings</base>
20			- <trans>Your Settings</trans>
21			- </entry>
22			<entry>
23			- <base>Forward Mail</base>
24			- <trans>Forward Mail</trans>
25			+ <base>Forward Mail</base>
26			+ <trans>Forward Mail</trans>
27			</entry>
28			<entry>
29			<base>FORM_TITLE</base>
30			<trans>Change email delivery</trans>
31			</entry>
32			-
33			<entry>
34			<base>DESCRIPTION</base>
35			<trans>
36			@@ -23,60 +17,44 @@
37			]]>
38			</trans>
39			</entry>
40			-
41			<entry>
42			<base>ACCOUNT_NAME</base>
43			<trans>Your account: </trans>
44			</entry>
45			-
46			<entry>
47			<base>LOCAL</base>
48			<trans>Deliver email locally</trans>
49			</entry>
50			-
51			<entry>
52			<base>FORWARD</base>
53			<trans>Forward to address below</trans>
54			</entry>
55			-
56			<entry>
57			<base>BOTH</base>
58			<trans>Both deliver locally and forward</trans>
59			</entry>
60			-
61			- <entry>
62			- <base>SAVE</base>
63			- <trans>Save</trans>
64			- </entry>
65			-
66			<entry>
67			<base>OK</base>
68			<trans>OK</trans>
69			</entry>
70			-
71			<entry>
72			<base>UNACCEPTABLE_CHARS</base>
73			<trans>Unacceptable characters, or Domain name missing.</trans>
74			</entry>
75			-
76			<entry>
77			<base>EMAIL_DELIVERY</base>
78			<trans>Email Delivery</trans>
79			</entry>
80			-
81			<entry>
82			<base>FORWARDING_ADDRESS</base>
83			<trans>Forwarding Address</trans>
84			</entry>
85			-
86			<entry>
87			<base>ERROR_UPDATING</base>
88			<trans>Error updating your settings.</trans>
89			</entry>
90			-
91			<entry>
92			<base>SUCCESS</base>
93			<trans>Your settings have been saved.</trans>
94			</entry>
95			-
96			</lexicon>
97			\ No newline at end of file
98			--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-useraccounts.pootle 2008-03-08 13:23:09.000000000 +1100
99			+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-useraccounts 2008-02-28 21:47:44.000000000 +1100
100			@@ -0,0 +1,8 @@
101			+<lexicon lang="en-us">
102			+
103			+ <entry>
104			+ <base>User accounts</base>
105			+ <trans>User accounts</trans>
106			+ </entry>
107			+
108			+</lexicon>
109			\ No newline at end of file
110			--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-password.pootle 2005-12-18 19:02:50.000000000 +1100
111			+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-password 2008-02-25 19:47:56.000000000 +1100
112			@@ -1,10 +1,12 @@
113			<lexicon lang="en-us">
114			-
115			+ <entry>
116			+ <base>Change Password</base>
117			+ <trans>Change Password</trans>
118			+ </entry>
119			<entry>
120			<base>FORM_TITLE</base>
121			<trans>Change account password</trans>
122			</entry>
123			-
124			<entry>
125			<base>DESCRIPTION</base>
126			<trans>
127			@@ -20,65 +22,48 @@
128			]]>
129			</trans>
130			</entry>
131			-
132			<entry>
133			<base>ACCOUNT_NAME</base>
134			<trans>Your account: </trans>
135			</entry>
136			-
137			<entry>
138			<base>OLD_SYSTEM_PASSWORD</base>
139			<trans>Old password: </trans>
140			</entry>
141			-
142			<entry>
143			<base>NEW_SYSTEM_PASSWORD</base>
144			<trans>New password: </trans>
145			</entry>
146			-
147			<entry>
148			<base>NEW_SYSTEM_PASSWORD_VERIFY</base>
149			<trans>New password (verify): </trans>
150			</entry>
151			-
152			- <entry>
153			- <base>CHANGE_PASSWORD</base>
154			- <trans>Change Password</trans>
155			- </entry>
156			-
157			<entry>
158			<base>PASSWORD_VERIFY_ERROR</base>
159			<trans>The passwords you entered did not match.</trans>
160			</entry>
161			-
162			<entry>
163			<base>PASSWORD_CHANGE_FAILURE</base>
164			<trans>An error occurred while attempting to change your password. Please make sure that the old password entered is correct.</trans>
165			</entry>
166			-
167			<entry>
168			<base>PASSWORD_CHANGED</base>
169			<trans>Your password has been successfully changed.</trans>
170			</entry>
171			-
172			<entry>
173			<base>TAINED_OLDPASS</base>
174			<trans>The old password you entered contained invalid characters.</trans>
175			</entry>
176			-
177			<entry>
178			<base>TAINED_PASS</base>
179			<trans>The password you entered contained invalid characters.</trans>
180			</entry>
181			-
182			<entry>
183			<base>TAINED_ACCOUNT</base>
184			<trans>The account name you entered contained invalid characters.</trans>
185			</entry>
186			-
187			<entry>
188			<base>NO_SUCH_USER</base>
189			<trans>The account name entered is invalid.</trans>
190			</entry>
191			-
192			</lexicon>