diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-29 04:13:33 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-29 04:13:33 +0200 |
| commit | 7a9177c9df49d6fc02280df02d6e7f6d52531382 (patch) | |
| tree | 518ecb9df491374faa1062fee2d32dca61ba74a3 /languages/en.php | |
| parent | f9e9c6cb5950ccf1d1d5396caa9dbb2803aacdad (diff) | |
| parent | 24ff6662195222479b4d83d41fa89edc8a3c05d1 (diff) | |
| download | elgg-7a9177c9df49d6fc02280df02d6e7f6d52531382.tar.gz elgg-7a9177c9df49d6fc02280df02d6e7f6d52531382.tar.bz2 | |
Merge branch 'no-flash-uploader' of git://github.com/sembrestels/Tidypics
Diffstat (limited to 'languages/en.php')
| -rw-r--r-- | languages/en.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/languages/en.php b/languages/en.php index 62b43673d..1c40e5e0a 100644 --- a/languages/en.php +++ b/languages/en.php @@ -68,7 +68,6 @@ $english = array( 'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)", 'tidypics:settings:exif' => "Display EXIF data", 'tidypics:settings:view_count' => "Display view count", - 'tidypics:settings:uploader' => "Use Flash uploader", '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", @@ -101,8 +100,7 @@ $english = array( 'tidypics:server_info:post_max_size_desc' => 'Max post size = sum of images + html form', 'tidypics:server_info:max_input_time_desc' => 'Time script waits for upload to finish', 'tidypics:server_info:max_execution_time_desc' => 'Max time a script will run', - 'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions may affect the Flash uploader', - + 'tidypics:server_info:php_version' => 'PHP Version', 'tidypics:server_info:memory_limit' => 'Memory Available to PHP', 'tidypics:server_info:peak_usage' => 'Memory Used to Load This Page', |