/[smecontribs]/rpms/smeserver-openvpn-bridge/contribs8/smeserver-openvpn-bridge-2.0-removedups.patch
ViewVC logotype

Contents of /rpms/smeserver-openvpn-bridge/contribs8/smeserver-openvpn-bridge-2.0-removedups.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Sun Mar 3 21:14:34 2013 UTC (11 years, 2 months ago) by unnilennium
Branch: MAIN
CVS Tags: smeserver-openvpn-bridge-2_0-49_el5_sme, smeserver-openvpn-bridge-2_0-55_el5_sme, smeserver-openvpn-bridge-2_0-48_el5_sme, smeserver-openvpn-bridge-2_0-56_el5_sme, smeserver-openvpn-bridge-2_0-51_el5_sme, smeserver-openvpn-bridge-2_0-52_el5_sme, smeserver-openvpn-bridge-2_0-53_el5_sme, smeserver-openvpn-bridge-2_0-54_el5_sme, smeserver-openvpn-bridge-2_0-47_el5_sme, smeserver-openvpn-bridge-2_0-50_el5_sme, HEAD 
Initial import
1 diff -ruN smeserver-openvpn-bridge-2.0.orig/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpnbridge smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpnbridge
2 --- smeserver-openvpn-bridge-2.0.orig/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpnbridge 2009-03-03 09:36:29.000000000 -0700
3 +++ smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpnbridge 2009-03-03 09:37:41.000000000 -0700
4 @@ -1,6 +1,4 @@
5 <lexicon lang="fr-fr">
6 - <!-- vim: ft=xml:
7 - -->
8 <entry>
9 <base>FORM_TITLE</base>
10 <trans>Bridged OpenVPN daemon configuration</trans>
11 @@ -168,21 +166,11 @@
12 </entry>
13
14 <entry>
15 - <base>LABEL_COMMON_NAME</base>
16 - <trans>Common Name</trans>
17 - </entry>
18 -
19 - <entry>
20 <base>DESC_COMMENT</base>
21 <trans>Enter a comment (Optionnal)</trans>
22 </entry>
23
24 <entry>
25 - <base>LABEL_COMMENT</base>
26 - <trans>Comment</trans>
27 - </entry>
28 -
29 - <entry>
30 <base>DESC_RESERVED_IP</base>
31 <trans>If you enter an IP address, it will allways be affected to the client connecting with this certificate. This IP address must be in your local network (but can be out of the VPN range). Be sure this IP isn't used by another host on your network.</trans>
32 </entry>
33 @@ -211,11 +199,6 @@
34 </entry>
35
36 <entry>
37 - <base>LABEL_ACCESS</base>
38 - <trans>Access</trans>
39 - </entry>
40 -
41 - <entry>
42 <base>DESC_REMOVE_PAGE</base>
43 <trans><![CDATA[<b>You are about to remove the following rule:</b>]]></trans>
44 </entry>
45 diff -ruN smeserver-openvpn-bridge-2.0.orig/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge
46 --- smeserver-openvpn-bridge-2.0.orig/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge 2009-03-03 09:36:29.000000000 -0700
47 +++ smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge 2009-03-03 09:35:49.000000000 -0700
48 @@ -168,21 +168,11 @@
49 </entry>
50
51 <entry>
52 - <base>LABEL_COMMON_NAME</base>
53 - <trans>Nom commun</trans>
54 - </entry>
55 -
56 - <entry>
57 <base>DESC_COMMENT</base>
58 <trans>Entrez un commentaire (optionnel)</trans>
59 </entry>
60
61 <entry>
62 - <base>LABEL_COMMENT</base>
63 - <trans>Commentaire</trans>
64 - </entry>
65 -
66 - <entry>
67 <base>DESC_RESERVED_IP</base>
68 <trans>Si vous entrez une adresse IP, elle sera toujours affectée au client présentant ce certificat. L'adresse doit faire partie du réseau local.</trans>
69 </entry>
70 @@ -209,11 +199,6 @@
71 </entry>
72
73 <entry>
74 - <base>LABEL_ACCESS</base>
75 - <trans>Accès</trans>
76 - </entry>
77 -
78 - <entry>
79 <base>DESC_REMOVE_PAGE</base>
80 <trans><![CDATA[<b>Vous êtes sur le point de supprimer la règle suivante:</b>]]></trans>
81 </entry>
82 diff -ruN smeserver-openvpn-bridge-2.0.orig/root/etc/e-smith/web/functions/openvpnbridge smeserver-openvpn-bridge-2.0/root/etc/e-smith/web/functions/openvpnbridge
83 --- smeserver-openvpn-bridge-2.0.orig/root/etc/e-smith/web/functions/openvpnbridge 2009-03-03 09:36:29.000000000 -0700
84 +++ smeserver-openvpn-bridge-2.0/root/etc/e-smith/web/functions/openvpnbridge 2009-03-03 09:35:46.000000000 -0700
85 @@ -193,7 +193,7 @@
86 <subroutine src="print_common_name_field()" />
87
88 <field type="text" id="comment">
89 - <label>LABEL_COMMENT</label>
90 + <label>COMMENT</label>
91 <description>DESC_COMMENT</description>
92 </field>
93
94 @@ -213,7 +213,7 @@
95 <field type="select"
96 id="access"
97 options="'allowed' => 'ALLOWED', 'denied' => 'DENIED'" >
98 - <label>LABEL_ACCESS</label>
99 + <label>ACCESS</label>
100 <description>DESC_ACCESS</description>
101 </field>
102
103 diff -ruN smeserver-openvpn-bridge-2.0.orig/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm
104 --- smeserver-openvpn-bridge-2.0.orig/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm 2009-03-03 09:36:29.000000000 -0700
105 +++ smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm 2009-03-03 09:34:43.000000000 -0700
106 @@ -319,7 +319,7 @@
107 my $action = $fm->{cgi}->param('action') || '';
108 print qq(<tr><td colspan="2">) . $fm->localise('DESC_COMMON_NAME').qq(</td></tr>);
109 print qq(<tr><td class="sme-noborders-label">) .
110 - $fm->localise('LABEL_COMMON_NAME') . qq(</td>\n);
111 + $fm->localise('COMMON_NAME') . qq(</td>\n);
112 if ($action eq 'modify' and $rule) {
113 print qq(
114 <td class="sme-noborders-content">$rule
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed