aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2007-05-20 14:32:23 +0000
committerNils Adermann <naderman@naderman.de>2007-05-20 14:32:23 +0000
commit40e43384d7c1748160c390856b2ef88a4d57d67e (patch)
tree64d8c1af268dd0feb221e1d5b7e206cc0fedcc64 /phpBB/language
parent2f9992bc3abdce909c5e203873a79b1e4786cb00 (diff)
downloadforums-40e43384d7c1748160c390856b2ef88a4d57d67e.tar
forums-40e43384d7c1748160c390856b2ef88a4d57d67e.tar.gz
forums-40e43384d7c1748160c390856b2ef88a4d57d67e.tar.bz2
forums-40e43384d7c1748160c390856b2ef88a4d57d67e.tar.xz
forums-40e43384d7c1748160c390856b2ef88a4d57d67e.zip
- style.php uses default language fallback for the imageset like session.php now
- style.php removes placeholders for non-existant images instead of leaving them alone - automatically try to load a localised part of an imageset if the folder exists and no images for that language were found in the database, thanks PhilippK git-svn-id: file:///svn/phpbb/trunk@7654 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/common.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index f72a8f423d..854dc198af 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -517,13 +517,14 @@ $lang = array_merge($lang, array(
'LOG_USERS_APPROVED' => '<strong>Users approved in usergroup</strong> %1$s<br />» %2$s',
'LOG_USERS_ADDED' => '<strong>Added new members to usergroup</strong> %1$s<br />» %2$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_REFRESHED' => '<strong>Refreshed imageset</strong><br />» %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_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',