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
--- 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
+++ 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
@@ -1,6 +1,4 @@
 <lexicon lang="fr-fr">
-	    <!-- vim: ft=xml: 
-	    -->
 	<entry>
     	<base>FORM_TITLE</base>
     	<trans>Bridged OpenVPN daemon configuration</trans>
@@ -168,21 +166,11 @@
     </entry>
 
 	<entry>
-    	<base>LABEL_COMMON_NAME</base>
-    	<trans>Common Name</trans>
-    </entry>
-
-	<entry>
     	<base>DESC_COMMENT</base>
     	<trans>Enter a comment (Optionnal)</trans>
    </entry>
 
 	<entry>
-    	<base>LABEL_COMMENT</base>
-    	<trans>Comment</trans>
-    </entry>
-
-	<entry>
     	<base>DESC_RESERVED_IP</base>
     	<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>
     </entry>
@@ -211,11 +199,6 @@
     </entry>
 
 	<entry>
-    	<base>LABEL_ACCESS</base>
-    	<trans>Access</trans>
-    </entry>
-
-	<entry>
     	<base>DESC_REMOVE_PAGE</base>
     	<trans><![CDATA[<b>You are about to remove the following rule:</b>]]></trans>
     </entry>
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
--- 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
+++ 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
@@ -168,21 +168,11 @@
     </entry>
 
 	<entry>
-    	<base>LABEL_COMMON_NAME</base>
-    	<trans>Nom commun</trans>
-    </entry>
-
-	<entry>
     	<base>DESC_COMMENT</base>
     	<trans>Entrez un commentaire (optionnel)</trans>
     </entry>
 
 	<entry>
-    	<base>LABEL_COMMENT</base>
-    	<trans>Commentaire</trans>
-    </entry>
-
-	<entry>
     	<base>DESC_RESERVED_IP</base>
     	<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>
     </entry>
@@ -209,11 +199,6 @@
     </entry>
 
 	<entry>
-    	<base>LABEL_ACCESS</base>
-    	<trans>Accès</trans>
-    </entry>
-
-	<entry>
     	<base>DESC_REMOVE_PAGE</base>
     	<trans><![CDATA[<b>Vous êtes sur le point de supprimer la règle suivante:</b>]]></trans>
     </entry>
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
--- smeserver-openvpn-bridge-2.0.orig/root/etc/e-smith/web/functions/openvpnbridge	2009-03-03 09:36:29.000000000 -0700
+++ smeserver-openvpn-bridge-2.0/root/etc/e-smith/web/functions/openvpnbridge	2009-03-03 09:35:46.000000000 -0700
@@ -193,7 +193,7 @@
 		<subroutine src="print_common_name_field()" />
 
 		<field type="text" id="comment">
-			<label>LABEL_COMMENT</label>
+			<label>COMMENT</label>
 			<description>DESC_COMMENT</description>
     	</field>
     	
@@ -213,7 +213,7 @@
 		<field type="select" 
 	     	id="access"
 	     	options="'allowed' => 'ALLOWED', 'denied' => 'DENIED'" >
-			<label>LABEL_ACCESS</label>
+			<label>ACCESS</label>
 			<description>DESC_ACCESS</description>
     	</field>
 
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
--- 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
+++ smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm	2009-03-03 09:34:43.000000000 -0700
@@ -319,7 +319,7 @@
     my $action = $fm->{cgi}->param('action') || '';
  	print qq(<tr><td colspan="2">) . $fm->localise('DESC_COMMON_NAME').qq(</td></tr>);
     print qq(<tr><td class="sme-noborders-label">) . 
-        $fm->localise('LABEL_COMMON_NAME') . qq(</td>\n);
+        $fm->localise('COMMON_NAME') . qq(</td>\n);
     if ($action eq 'modify' and $rule) {
         print qq(
             <td class="sme-noborders-content">$rule