Added a function to merge language files.

tbrehm

2008-09-21 8dd29e227f44e2379a0a72a4f60130b24e54a14b

 interface/web/admin/templates/server_config_server_edit.htm

@@ -1,5 +1,9 @@
<table width="500" border="0" cellspacing="0" cellpadding="2">
  <tr>
    <td width="126" class="frmText11">{tmpl_var name='auto_network_configuration_txt'}:</td>
    <td width="366" class="frmText11">{tmpl_var name='auto_network_configuration'}</td>
  </tr>
  <tr>
    <td class="frmText11">{tmpl_var name='ip_address_txt'}:</td>
    <td class="frmText11"><input name="ip_address" type="text" class="text" value="{tmpl_var name='ip_address'}" size="15" maxlength="255"></td>
  </tr>
@@ -27,6 +31,6 @@
    <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/server_config_edit.php');"><div class="buttonEnding"></div>&nbsp;
      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_config_list.php');"><div class="buttonEnding"></div>
    </td>
  </tr>

</table>

  </tr>
</table>
<input type="hidden" name="id" value="{tmpl_var name='id'}">