aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-07-30 14:09:52 +0000
committerNils Adermann <naderman@naderman.de>2006-07-30 14:09:52 +0000
commit0815df3c58df315bc3bdcfdbd4462281b9a2b2f2 (patch)
treea8ad92a7c49ce44a6a988c5020dbfc74e4c27201 /phpBB/language
parent7bff8d1096652cb1749943b6eae2593c3f664e59 (diff)
downloadforums-0815df3c58df315bc3bdcfdbd4462281b9a2b2f2.tar
forums-0815df3c58df315bc3bdcfdbd4462281b9a2b2f2.tar.gz
forums-0815df3c58df315bc3bdcfdbd4462281b9a2b2f2.tar.bz2
forums-0815df3c58df315bc3bdcfdbd4462281b9a2b2f2.tar.xz
forums-0815df3c58df315bc3bdcfdbd4462281b9a2b2f2.zip
- removed an accidentaly pasted line [Bug #3227]
- added missing images to acp_styles [Bug #2623] and added a new image btn_warn - use the style name when exporting a style instead of the non existant path [Bug #2343] - fixed an incorrect call of acp_styles::install_style() [Bug #2325] - always define $search_query in fulltext_mysql [Bug #3476] git-svn-id: file:///svn/phpbb/trunk@6216 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/styles.php17
1 files changed, 17 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 9e9a44a703..40232e28b2 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -136,6 +136,8 @@ $lang = array_merge($lang, array(
'IMAGESET_UPDATED' => 'Imageset updated successfully',
'ITALIC' => 'Italic',
+ 'IMG_ATTACH_PROGRESS_BAR' => 'Attachment upload progress bar',
+
'IMG_BTN_POST' => 'New topic',
'IMG_BTN_REPLY' => 'Reply topic',
'IMG_BTN_LOCKED' => 'Topic locked',
@@ -157,9 +159,11 @@ $lang = array_merge($lang, array(
'IMG_BTN_ONLINE' => 'User online',
'IMG_BTN_OFFLINE' => 'User offline',
'IMG_BTN_REPORT' => 'Report post',
+ 'IMG_BTN_WARN' => 'Warn user',
'IMG_BTN_PM' => 'Send message',
'IMG_BTN_FRIEND' => 'Add as friend',
'IMG_BTN_FOE' => 'Add as foe',
+
'IMG_CAT_BUTTONS' => 'Localised buttons',
'IMG_CAT_CUSTOM' => 'Custom images',
'IMG_CAT_FOLDERS' => 'Topic icons',
@@ -168,6 +172,8 @@ $lang = array_merge($lang, array(
'IMG_CAT_KARMA' => 'Karma images',
'IMG_CAT_LOGOS' => 'Logos',
'IMG_CAT_POLLS' => 'Polling images',
+ 'IMG_CAT_UI' => 'General user interface elements',
+ 'IMG_CAT_USER' => 'Additional images',
'IMG_FOLDER' => 'Topic',
'IMG_FOLDER_ANNOUNCE' => 'Announcement',
@@ -228,6 +234,17 @@ $lang = array_merge($lang, array(
'IMG_SUB_FORUM' => 'Subforum',
'IMG_SUB_FORUM_NEW' => 'Subforum new posts',
+ 'IMG_USER_ICON1' => 'User defined image 1',
+ 'IMG_USER_ICON2' => 'User defined image 2',
+ 'IMG_USER_ICON3' => 'User defined image 3',
+ 'IMG_USER_ICON4' => 'User defined image 4',
+ 'IMG_USER_ICON5' => 'User defined image 5',
+ 'IMG_USER_ICON6' => 'User defined image 6',
+ 'IMG_USER_ICON7' => 'User defined image 7',
+ 'IMG_USER_ICON8' => 'User defined image 8',
+ 'IMG_USER_ICON9' => 'User defined image 9',
+ 'IMG_USER_ICON10' => 'User defined image 10',
+
'INCLUDE_DIMENSIONS' => 'Include dimensions',
'INCLUDE_IMAGESET' => 'Include imageset',
'INCLUDE_TEMPLATE' => 'Include template',