aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-05-02 16:19:35 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-05-02 16:19:35 +0000
commit15aee8920041aeaf3c9d8893341bc5470ec63ff8 (patch)
tree4494c33edf3c0961a93969688a9ef3e347ce1365 /phpBB/language/en/acp
parentf4b6f87641e60e8a2d746c8ac2e7b96bccf6d25d (diff)
downloadforums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar
forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.gz
forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.bz2
forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.tar.xz
forums-15aee8920041aeaf3c9d8893341bc5470ec63ff8.zip
fixes for search button in header - #10389, #10225, #9548
added missing colour swatch to prosilver - #8657 language changes - #10387, #10375, #10373, #10353, #10279 line-height for font size (still not ideal) - #10317 Search load setting checked in sessions.php along with limit_load and also reset if not possible to determine load - #10383 Fix editing issues - #9660 git-svn-id: file:///svn/phpbb/trunk@7451 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/profile.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 9c82013390..2bb8d64e1b 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -50,7 +50,7 @@ $lang = array_merge($lang, array(
'CP_LANG_NAME' => 'Field name/title presented to the user',
'CP_LANG_OPTIONS' => 'Options',
'CREATE_NEW_FIELD' => 'Create new field',
- 'CUSTOM_FIELDS_NOT_TRANSLATED' => 'At least one custom profile field has not yet been translated. Please enter the required information by clicking on the &quot;Translate&quot; link.',
+ 'CUSTOM_FIELDS_NOT_TRANSLATED' => 'At least one custom profile field has not yet been translated. Please enter the required information by clicking on the “Translate” link.',
'DEFAULT_ISO_LANGUAGE' => 'Default language [%s]',
'DEFAULT_LANGUAGE_NOT_FILLED' => 'The language entries for the default language are not filled for this profile field.',
@@ -62,7 +62,7 @@ $lang = array_merge($lang, array(
'DISPLAY_AT_REGISTER' => 'Display at registration screen',
'DISPLAY_AT_REGISTER_EXPLAIN' => 'If this option is enabled, the field will be displayed on registration and able to be changed within the user control panel.',
'DISPLAY_PROFILE_FIELD' => 'Display profile field',
- 'DISPLAY_PROFILE_FIELD_EXPLAIN' => 'The profile field will be shown on viewtopic/viewprofile/memberlist. if this is enabled within the load settings. Only showing within the users profile is enabled by default.',
+ 'DISPLAY_PROFILE_FIELD_EXPLAIN' => 'The profile field will be shown on viewtopic/viewprofile/memberlist, if this is enabled within the load settings. Only showing within the users profile is enabled by default.',
'DROPDOWN_ENTRIES_EXPLAIN' => 'Enter your options now, every option in one line',
'EDIT_DROPDOWN_LANG_EXPLAIN' => 'Please note that you are able to change your options text and also able to add new options to the end. It is not advised to add new options between existing options - this could result in wrong options assigned to your users. This can also happen if you remove options in-between. Removing options from the end result in users having assigned this item now reverting back to the default one.',