diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-29 04:49:57 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-29 04:49:57 +0200 |
| commit | f900e1e3cd0384aade0594ceffb6e4f51ce71415 (patch) | |
| tree | 058fb6fd76c0aa865f1d08013c196b693cc205ba /languages/en.php | |
| parent | e4c742e5ce21ae857ad28e0ec24fbe6e267adfaa (diff) | |
| parent | 3cc5e98299630bf2acae83ec964343309d16392e (diff) | |
| download | elgg-f900e1e3cd0384aade0594ceffb6e4f51ce71415.tar.gz elgg-f900e1e3cd0384aade0594ceffb6e4f51ce71415.tar.bz2 | |
Merge branch 'no-watermark' of git://github.com/sembrestels/Tidypics
Diffstat (limited to 'languages/en.php')
| -rw-r--r-- | languages/en.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/languages/en.php b/languages/en.php index 7042d4d98..32174e278 100644 --- a/languages/en.php +++ b/languages/en.php @@ -70,7 +70,6 @@ $english = array( 'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums", 'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):", 'tidypics:settings:quota' => "User Quota (MB) - 0 equals no quota", - 'tidypics:settings:watermark' => "Enter text to appear in the watermark", 'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands", 'tidypics:settings:img_river_view' => "How many entries in activity river for each batch of uploaded images", 'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album", |