diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-09-21 18:12:07 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-09-21 18:12:07 +0200 |
| commit | e41f9c932970c81908f28735e0478510f6d1215b (patch) | |
| tree | 35c9939fd5c1b24cb949580874eb181df249f97f /phpBB/language/en/acp/common.php | |
| parent | 47bb42e2f034cdb82e8f8e97b90639af9ed85b74 (diff) | |
| parent | fab0ec64b383c672e91db8524a225671795d4805 (diff) | |
| download | forums-e41f9c932970c81908f28735e0478510f6d1215b.tar forums-e41f9c932970c81908f28735e0478510f6d1215b.tar.gz forums-e41f9c932970c81908f28735e0478510f6d1215b.tar.bz2 forums-e41f9c932970c81908f28735e0478510f6d1215b.tar.xz forums-e41f9c932970c81908f28735e0478510f6d1215b.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into develop
* 'develop' of github.com:phpbb/phpbb3: (44 commits)
[ticket/10374] Remove 'custom template' cache prefix.
[feature/remove-db-styles] Remove forgotten template variables.
[feature/remove-db-styles] Removed style.php!
[feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
[feature/remove-db-styles] Update language to reflect removal of db storage.
[feature/remove-db-styles] Mark log entrys as deprecated.
[feature/remove-db-styles] Add error if template/theme file is unwritable.
[feature/remove-db-styles] Add schema changes sinces 3.0.x.
[feature/remove-db-styles] Readd table constant for upgrades etc.
[feature/remove-db-styles] Update database schemas.
[feature/remove-db-styles] Remove style.php DB storage.
[feature/remove-db-styles] Remove parse_css_file option from themes.
[feature/remove-db-styles] Remove DB theme handling code from session.
[feature/remove-db-styles] ACP has forgotten how to store themes in the DB.
[feature/remove-db-styles] Missed a few template DB bits in acp_styles.
[feature/remove-db-styles] Removing unused methods from acp_style.
[feature/remove-db-styles] Removed database storage of style components.
[ticket/10371] Removing last mentions of imageset
[ticket/10370] Add function documentation for get_stacktrace().
[ticket/10370] Explain that we are not the ones hiding backtrace pieces.
...
Diffstat (limited to 'phpBB/language/en/acp/common.php')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 2a8ed86175..0bc27b780d 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -104,7 +104,6 @@ $lang = array_merge($lang, array( 'ACP_ICONS' => 'Topic icons', 'ACP_ICONS_SMILIES' => 'Topic icons/smilies', - 'ACP_IMAGESETS' => 'Imagesets', 'ACP_INACTIVE_USERS' => 'Inactive users', 'ACP_INDEX' => 'ACP index', @@ -593,16 +592,6 @@ $lang = array_merge($lang, array( 'LOG_IMAGE_GENERATION_ERROR' => '<strong>Error while creating image</strong><br />» Error in %1$s on line %2$s: %3$s', - 'LOG_IMAGESET_ADD_DB' => '<strong>Added new imageset to database</strong><br />» %s', - 'LOG_IMAGESET_ADD_FS' => '<strong>Add new imageset on filesystem</strong><br />» %s', - 'LOG_IMAGESET_DELETE' => '<strong>Deleted imageset</strong><br />» %s', - 'LOG_IMAGESET_EDIT_DETAILS' => '<strong>Edited imageset details</strong><br />» %s', - 'LOG_IMAGESET_EDIT' => '<strong>Edited imageset</strong><br />» %s', - 'LOG_IMAGESET_EXPORT' => '<strong>Exported imageset</strong><br />» %s', - 'LOG_IMAGESET_LANG_MISSING' => '<strong>Imageset misses “%2$s” localisation</strong><br />» %1$s', - 'LOG_IMAGESET_LANG_REFRESHED' => '<strong>Refreshed “%2$s” localisation of imageset</strong><br />» %1$s', - 'LOG_IMAGESET_REFRESHED' => '<strong>Refreshed imageset</strong><br />» %s', - 'LOG_INACTIVE_ACTIVATE' => '<strong>Activated inactive users</strong><br />» %s', 'LOG_INACTIVE_DELETE' => '<strong>Deleted inactive users</strong><br />» %s', 'LOG_INACTIVE_REMIND' => '<strong>Sent reminder e-mails to inactive users</strong><br />» %s', @@ -686,22 +675,28 @@ $lang = array_merge($lang, array( 'LOG_STYLE_EDIT_DETAILS' => '<strong>Edited style</strong><br />» %s', 'LOG_STYLE_EXPORT' => '<strong>Exported style</strong><br />» %s', + // @deprecated 3.1 'LOG_TEMPLATE_ADD_DB' => '<strong>Added new template set to database</strong><br />» %s', + // @deprecated 3.1 'LOG_TEMPLATE_ADD_FS' => '<strong>Add new template set on filesystem</strong><br />» %s', 'LOG_TEMPLATE_CACHE_CLEARED' => '<strong>Deleted cached versions of template files in template set <em>%1$s</em></strong><br />» %2$s', 'LOG_TEMPLATE_DELETE' => '<strong>Deleted template set</strong><br />» %s', 'LOG_TEMPLATE_EDIT' => '<strong>Edited template set <em>%1$s</em></strong><br />» %2$s', 'LOG_TEMPLATE_EDIT_DETAILS' => '<strong>Edited template details</strong><br />» %s', 'LOG_TEMPLATE_EXPORT' => '<strong>Exported template set</strong><br />» %s', + // @deprecated 3.1 'LOG_TEMPLATE_REFRESHED' => '<strong>Refreshed template set</strong><br />» %s', + // @deprecated 3.1 'LOG_THEME_ADD_DB' => '<strong>Added new theme to database</strong><br />» %s', + // @deprecated 3.1 'LOG_THEME_ADD_FS' => '<strong>Add new theme on filesystem</strong><br />» %s', 'LOG_THEME_DELETE' => '<strong>Theme deleted</strong><br />» %s', 'LOG_THEME_EDIT_DETAILS' => '<strong>Edited theme details</strong><br />» %s', 'LOG_THEME_EDIT' => '<strong>Edited theme <em>%1$s</em></strong>', 'LOG_THEME_EDIT_FILE' => '<strong>Edited theme <em>%1$s</em></strong><br />» Modified file <em>%2$s</em>', 'LOG_THEME_EXPORT' => '<strong>Exported theme</strong><br />» %s', + // @deprecated 3.1 'LOG_THEME_REFRESHED' => '<strong>Refreshed theme</strong><br />» %s', 'LOG_UPDATE_DATABASE' => '<strong>Updated Database from version %1$s to version %2$s</strong>', |