diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-08-10 13:33:06 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-08-10 13:33:06 +0000 |
| commit | 83e6dcb1ce086c2d01060ce37c2a921c80632cb0 (patch) | |
| tree | 3584018174c26f846e9563392779c75694a55dc9 /phpBB/language | |
| parent | 53085a4c78b3004d1e4adf8e06b0617f7f8a288b (diff) | |
| download | forums-83e6dcb1ce086c2d01060ce37c2a921c80632cb0.tar forums-83e6dcb1ce086c2d01060ce37c2a921c80632cb0.tar.gz forums-83e6dcb1ce086c2d01060ce37c2a921c80632cb0.tar.bz2 forums-83e6dcb1ce086c2d01060ce37c2a921c80632cb0.tar.xz forums-83e6dcb1ce086c2d01060ce37c2a921c80632cb0.zip | |
- removed a useless line [Bug #3656]
- do not reuse session ids [Bug #3626]
- Bug #3684
- added refresh imageset option
git-svn-id: file:///svn/phpbb/trunk@6257 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/styles.php | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 8c2a97dbf0..0847ff44c9 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -473,6 +473,7 @@ $lang = array_merge($lang, array( 'LOG_IMAGESET_EDIT_DETAILS' => '<b>Edited imageset details</b><br />» %s', 'LOG_IMAGESET_EDIT' => '<b>Edited imageset</b><br />» %s', 'LOG_IMAGESET_EXPORT' => '<b>Exported imageset</b><br />» %s', + 'LOG_IMAGESET_REFRESHED' => '<b>Refreshed imageset</b><br />» %s', 'LOG_INDEX_ACTIVATE' => '<b>Activated inactive users</b><br />» %s', 'LOG_INDEX_DELETE' => '<b>Deleted inactive users</b><br />» %s', @@ -560,6 +561,7 @@ $lang = array_merge($lang, array( 'LOG_THEME_EDIT' => '<b>Edited theme <i>%1$s</i></b><br />» Modified class <i>%2$s</i>', 'LOG_THEME_EDIT_ADD' => '<b>Edited theme <i>%1$s</i></b><br />» Added class <i>%2$s</i>', 'LOG_THEME_EXPORT' => '<b>Exported theme</b><br />» %s', + 'LOG_THEME_REFRESHED' => '<b>Refreshed theme</b><br />» %s', 'LOG_USER_ACTIVE' => '<b>User activated</b><br />» %s', 'LOG_USER_BAN_USER' => '<b>Banned User via user management</b> for reason "<i>%1$s</i>"<br />» %2$s', diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index f8dfe9419e..abf3685cf0 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -54,6 +54,7 @@ $lang = array_merge($lang, array( 'CACHE_FILENAME' => 'Template file', 'CACHE_FILESIZE' => 'Filesize', 'CACHE_MODIFIED' => 'Modified', + 'CONFIRM_IMAGESET_REFRESH' => 'Are you sure you wish to refresh all imageset data? The settings from the imageset configuration file will overwrite all modifications to the imageset which have been carried out with the imageset editor.', 'CONFIRM_TEMPLATE_CLEAR_CACHE' => 'Are you sure you wish to clear all cached versions of your template files?', 'CONFIRM_TEMPLATE_REFRESH' => 'Are you sure you wish to refresh all template data in the database with the contents of the template files on the filesystem? This will overwrite all modifications which have been carried out with the template editor while the template was stored in the database.', 'CONFIRM_THEME_REFRESH' => 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.', @@ -133,6 +134,7 @@ $lang = array_merge($lang, array( 'IMAGESET_EXPORT_EXPLAIN' => 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', 'IMAGESET_EXPORTED' => 'Imageset exported succesfully and stored in %s', 'IMAGESET_NAME' => 'Imageset Name', + 'IMAGESET_REFRESHED' => 'Imageset refreshed successfully', 'IMAGESET_UPDATED' => 'Imageset updated successfully', 'ITALIC' => 'Italic', |