diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-05 20:55:16 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-05 20:55:16 +0000 |
| commit | 42ae90cd1e0245645208b9f54b75097a91295bbe (patch) | |
| tree | 65b25f443caaa2b75ef245de1b7cbe05ff694661 /languages | |
| parent | 6eb504bde19818be812e6ba78c6c56a501405fec (diff) | |
| download | elgg-42ae90cd1e0245645208b9f54b75097a91295bbe.tar.gz elgg-42ae90cd1e0245645208b9f54b75097a91295bbe.tar.bz2 | |
Missed language string from last commit.
git-svn-id: http://code.elgg.org/elgg/trunk@8035 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'languages')
| -rw-r--r-- | languages/en.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/languages/en.php b/languages/en.php index 406679d58..db0811b60 100644 --- a/languages/en.php +++ b/languages/en.php @@ -86,6 +86,7 @@ $english = array( 'ElggPlugin:Dependencies:Requires' => 'Requires', 'ElggPlugin:Dependencies:Conflicts' => 'Conflicts', + 'ElggPlugin:Dependencies:Conflicted' => 'Conflicted', 'ElggPlugin:Dependencies:Provides' => 'Provides', 'ElggPlugin:Dependencies:Priority' => 'Priority', |