merge sandbox to trunk for 1.4.4

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7723 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-09-28 07:24:47 +00:00
parent 200d63636c
commit b8299c8a65
683 changed files with 70982 additions and 69716 deletions

View file

@ -1,17 +1,17 @@
<?php
/**
* @file en.lang.php
* @author zero (zero@nzeo.com)
* @brief English Language Pack
**/
$lang->addon = "Addon";
$lang->addon_info = 'Summary of this Addon';
$lang->addon_maker = 'Author of this Addon';
$lang->addon_license = 'License';
$lang->addon_history = 'Addon History';
$lang->about_addon_mid = "Addons can select targets.<br />(All targets will be selected when nothing is selected)";
$lang->about_addon = 'Addon is for controlling actions rather than displaying the HTML results.<br />Simply by toggling any addons you want on or off, you can use very useful functions to administer your website';
?>
<?php
/**
* @file en.lang.php
* @author NHN (developers@xpressengine.com)
* @brief English Language Pack
**/
$lang->addon = "Addon";
$lang->addon_info = 'Summary of this Addon';
$lang->addon_maker = 'Author of this Addon';
$lang->addon_license = 'License';
$lang->addon_history = 'Addon History';
$lang->about_addon_mid = "Addons can select targets.<br />(All targets will be selected when nothing is selected)";
$lang->about_addon = 'Addon is for controlling actions rather than displaying the HTML results.<br />Simply by toggling any addons you want on or off, you can use very useful functions to administer your website';
?>