smeserver-openvpn-s2s/contribs7/smeserver-openvpn-s2s-0.1-tls_locale_1.patch

diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s
--- smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s        2010-10-17 16:10:14.000000000 +0200
+++ mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s      2010-10-17 16:09:42.000000000 +0200
@@ -44,8 +44,71 @@
         <trans>Status</trans>
     </entry>
     <entry>
+        <base>DESC_AUTH</base>
+        <trans>
+            <![CDATA[Choose the authentication mechanism.<br>
+            Shared Key is simple to configure because you don't need to create and manage a PKI. 
+            You just need to create a secret key, and and configure it on both side.<br>
+            TLS authentication is a bit harder to configure, as you'll need to manage a PKI, but
+            provide a better level of security (like the Perfect Forward Secrecy).<br>
+            If you don't care about the extra security provided by TLS, you should choose Shared Key here.]]>
+        </trans>
+    </entry>
+    <entry>
+        <base>LABEL_AUTH</base>
+        <trans>Authentication mechanism</trans>
+    </entry>
+    <entry>
+        <base>DESC_CONFIGURE_CERT</base>
+        <trans>This page lets you configure the authentication of this daemon</trans>
+    </entry>
+    <entry>
+        <base>DESC_CRL_URL</base>
+        <trans>
+           You can enter an URL where the CRL can be find. Your SME Server will update the CRL every hour 
+           and check if the certificate of the remote endpoint is not revoked. If you don't wan't to use 
+           the CRL verification , just let this field emtpy.
+        </trans>
+    </entry>
+    <entry>
+        <base>LABEL_CRL_URL</base>
+        <trans>CRL update URL</trans>
+    </entry>
+    <entry>
+        <base>DESC_CA_PEM</base>
+        <trans>Enter the authoritative certificate in pem format</trans>
+    </entry>
+    <entry>
+        <base>LABEL_CA_PEM</base>
+        <trans>Authoritative certificate</trans>
+    </entry>
+    <entry>
+        <base>DESC_CRT_PEM</base>
+        <trans>Enter the certificate in pem format</trans>
+    </entry>
+    <entry>
+        <base>LABEL_CRT_PEM</base>
+        <trans>Enter the certificate in pem format</trans>
+    </entry>
+    <entry>
         <base>DESC_REMOTE_HOST</base>
-        <trans>Enter the hostname or IP of the remote server</trans>
+        <trans>Certificate</trans>
+    </entry>
+    <entry>
+        <base>DESC_KEY_PEM</base>
+        <trans>Enter the private key in pem format</trans>
+    </entry>
+    <entry>
+        <base>LABEL_KEY_PEM</base>
+        <trans>Private key</trans>
+    </entry>
+    <entry>
+        <base>DESC_DH_PEM</base>
+        <trans>Enter Diffie-Hellman parameters</trans>
+    </entry>
+    <entry>
+        <base>LABEL_DH_PEM</base>
+        <trans>Diffie-Hellman parameters</trans>
     </entry>
     <entry>
         <base>LABEL_REMOTE_HOST</base>
@@ -102,9 +165,19 @@
         </trans>
     </entry>
     <entry>
+        <base>DESC_SHARED_KEY_TLS</base>
+        <trans>
+            <![CDATA[You can enter here a optional secret key.<br>
+            It will provide an extra security layer to your server.<br>
+            You can create keys using this command: openvpn --genkey --secret /dev/stdout<br>
+            This key should be kept secret, and only be stored on the client and the server.]]>
+        </trans>
+    </entry>
+    <entry>
         <base>LABEL_SHARED_KEY</base>
-        <trans>Secret key</trans>
+        <trans>Shared key</trans>
     </entry>
+
     <entry>
         <base>DESC_ADD_SERVER_PAGE</base>
         <trans>This page lets you configure a new daemon acting as a server</trans>
1	diff -Nur -x '.orig' -x '.rej' smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s
2	--- smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s 2010-10-17 16:10:14.000000000 +0200
3	+++ mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s 2010-10-17 16:09:42.000000000 +0200
4	@@ -44,8 +44,71 @@
5	<trans>Status</trans>
6	</entry>
7	<entry>
8	+ <base>DESC_AUTH</base>
9	+ <trans>
10	+ <![CDATA[Choose the authentication mechanism.<br>
11	+ Shared Key is simple to configure because you don't need to create and manage a PKI.
12	+ You just need to create a secret key, and and configure it on both side.<br>
13	+ TLS authentication is a bit harder to configure, as you'll need to manage a PKI, but
14	+ provide a better level of security (like the Perfect Forward Secrecy).<br>
15	+ If you don't care about the extra security provided by TLS, you should choose Shared Key here.]]>
16	+ </trans>
17	+ </entry>
18	+ <entry>
19	+ <base>LABEL_AUTH</base>
20	+ <trans>Authentication mechanism</trans>
21	+ </entry>
22	+ <entry>
23	+ <base>DESC_CONFIGURE_CERT</base>
24	+ <trans>This page lets you configure the authentication of this daemon</trans>
25	+ </entry>
26	+ <entry>
27	+ <base>DESC_CRL_URL</base>
28	+ <trans>
29	+ You can enter an URL where the CRL can be find. Your SME Server will update the CRL every hour
30	+ and check if the certificate of the remote endpoint is not revoked. If you don't wan't to use
31	+ the CRL verification , just let this field emtpy.
32	+ </trans>
33	+ </entry>
34	+ <entry>
35	+ <base>LABEL_CRL_URL</base>
36	+ <trans>CRL update URL</trans>
37	+ </entry>
38	+ <entry>
39	+ <base>DESC_CA_PEM</base>
40	+ <trans>Enter the authoritative certificate in pem format</trans>
41	+ </entry>
42	+ <entry>
43	+ <base>LABEL_CA_PEM</base>
44	+ <trans>Authoritative certificate</trans>
45	+ </entry>
46	+ <entry>
47	+ <base>DESC_CRT_PEM</base>
48	+ <trans>Enter the certificate in pem format</trans>
49	+ </entry>
50	+ <entry>
51	+ <base>LABEL_CRT_PEM</base>
52	+ <trans>Enter the certificate in pem format</trans>
53	+ </entry>
54	+ <entry>
55	<base>DESC_REMOTE_HOST</base>
56	- <trans>Enter the hostname or IP of the remote server</trans>
57	+ <trans>Certificate</trans>
58	+ </entry>
59	+ <entry>
60	+ <base>DESC_KEY_PEM</base>
61	+ <trans>Enter the private key in pem format</trans>
62	+ </entry>
63	+ <entry>
64	+ <base>LABEL_KEY_PEM</base>
65	+ <trans>Private key</trans>
66	+ </entry>
67	+ <entry>
68	+ <base>DESC_DH_PEM</base>
69	+ <trans>Enter Diffie-Hellman parameters</trans>
70	+ </entry>
71	+ <entry>
72	+ <base>LABEL_DH_PEM</base>
73	+ <trans>Diffie-Hellman parameters</trans>
74	</entry>
75	<entry>
76	<base>LABEL_REMOTE_HOST</base>
77	@@ -102,9 +165,19 @@
78	</trans>
79	</entry>
80	<entry>
81	+ <base>DESC_SHARED_KEY_TLS</base>
82	+ <trans>
83	+ <![CDATA[You can enter here a optional secret key.<br>
84	+ It will provide an extra security layer to your server.<br>
85	+ You can create keys using this command: openvpn --genkey --secret /dev/stdout<br>
86	+ This key should be kept secret, and only be stored on the client and the server.]]>
87	+ </trans>
88	+ </entry>
89	+ <entry>
90	<base>LABEL_SHARED_KEY</base>
91	- <trans>Secret key</trans>
92	+ <trans>Shared key</trans>
93	</entry>
94	+
95	<entry>
96	<base>DESC_ADD_SERVER_PAGE</base>
97	<trans>This page lets you configure a new daemon acting as a server</trans>