aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-06-11 12:39:51 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-06-11 12:39:51 +0000
commit0d074672fa8209c85af75ef7d7cdfbaf8e16cbab (patch)
treec8628246d3131dbf338fe9702edcb73712432dcc /phpBB/language
parent13a02f6cc5bcdb0654642135b2981633ac3996b5 (diff)
downloadforums-0d074672fa8209c85af75ef7d7cdfbaf8e16cbab.tar
forums-0d074672fa8209c85af75ef7d7cdfbaf8e16cbab.tar.gz
forums-0d074672fa8209c85af75ef7d7cdfbaf8e16cbab.tar.bz2
forums-0d074672fa8209c85af75ef7d7cdfbaf8e16cbab.tar.xz
forums-0d074672fa8209c85af75ef7d7cdfbaf8e16cbab.zip
Introducing the ability to manually set the dimensions of an image in the imageset editor.
A little spelling. Introduces new language variable(s). #11925 #11675 git-svn-id: file:///svn/phpbb/trunk@7750 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/common.php4
-rw-r--r--phpBB/language/en/acp/styles.php1
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index aada3a4ee0..92e6d77dfb 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -466,8 +466,8 @@ $lang = array_merge($lang, array(
'LOG_POST_EDITED' => '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
'LOG_REPORT_CLOSED' => '<strong>Closed report</strong><br />» %s',
'LOG_REPORT_DELETED' => '<strong>Deleted report</strong><br />» %s',
- 'LOG_SPLIT_DESTINATION' => '<strong>Moved splitted posts</strong><br />» to %s',
- 'LOG_SPLIT_SOURCE' => '<strong>Splitted posts</strong><br />» from %s',
+ 'LOG_SPLIT_DESTINATION' => '<strong>Moved split posts</strong><br />» to %s',
+ 'LOG_SPLIT_SOURCE' => '<strong>Split posts</strong><br />» from %s',
'LOG_TOPIC_DELETED' => '<strong>Deleted topic</strong><br />» %s',
'LOG_TOPIC_APPROVED' => '<strong>Approved topic</strong><br />» %s',
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 8dc5d21775..4f7472e5ff 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -44,6 +44,7 @@ $lang = array_merge($lang, array(
'ADD_THEME' => 'Create theme',
'ADD_THEME_EXPLAIN' => 'Here you can add a new theme. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this theme on an existing one. You may also be able to upload or import (from the store directory) a theme archive. If you upload or import an archive the theme name can be optionally taken from the archive name (to do this leave the theme name blank).',
'ARCHIVE_FORMAT' => 'Archive file type',
+ 'AUTOMATIC_EXPLAIN' => 'Leave blank to attempt automatic detection.',
'BACKGROUND' => 'Background',
'BACKGROUND_COLOUR' => 'Background colour',