Updated texts

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@7242 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/class_servDHCP.inc
index 6390172a5e29219982fee87d728fbf361a885bba..33c7acf77aa89e29a005434faa0d973d13917fa0 100644 (file)
--- a/plugins/admin/systems/class_servDHCP.inc
+++ b/plugins/admin/systems/class_servDHCP.inc
@@ -140,8 +140,8 @@ class servdhcp extends plugin
       $info = $this->get_dhcp_info_string($id);
       $smarty->assign("dns_take_over",TRUE);
       $smarty->assign("info",$info);
-      $warning = sprintf(_("You are going to take over the dhcp setup from server '%s'."),$this->dhcp_server_list['ENTRIES'][$id]['cn'][0]);
-      $warning2 = _("The take over will be startet when you save this system. To abort this action, use the cancel button below."); 
+      $warning = sprintf(_("You are going to migrate the DHCP setup from server '%s'."),$this->dhcp_server_list['ENTRIES'][$id]['cn'][0]);
+      $warning2 = _("The migration will be startet when you save this system. To cancel this action, use the cancel button below."); 
       $smarty->assign("warning",$warning);
       $smarty->assign("warning2",$warning2);
       return($smarty->fetch(get_template_path('servdhcp.tpl', TRUE)));

diff --git a/plugins/admin/systems/servdhcp.tpl b/plugins/admin/systems/servdhcp.tpl
index 1c2e4433225dbd1e381f635754b0742e15f25901..b911f3202ccea4505144a97bafc640924ef5b4a0 100644 (file)
--- a/plugins/admin/systems/servdhcp.tpl
+++ b/plugins/admin/systems/servdhcp.tpl
@@ -24,11 +24,11 @@
 {if $dhcp_server_list_cnt}
 <tr>
        <td style="width:100%;vertical-align:top;">
-               <b>{t}Take over dhcp configuration from following server{/t}</b>&nbsp;
+               <b>{t}Take over DHCP configuration from{/t}</b>&nbsp;
                <select name='take_over_src'>
                        {html_options options=$dhcp_server_list}
                </select>
-               <input type="submit" name="take_over" value="{t}Apply{/t}">
+               <input type="submit" name="take_over" value="{t}Take over{/t}">
        </td>
 </tr>
 {/if}
@@ -36,7 +36,6 @@
        <td style="width:100%;vertical-align:top;">
        <h2>{t}DHCP sections{/t}</h2>
                {$DhcpList}
-<!--           <input type="submit" name="takeOver" value="{t}Take over{/t}" {$dhcpACL}>-->
        </td>
 </tr>
 </table>