diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-02 16:19:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-02 16:19:35 +0000 |
| commit | 15aee8920041aeaf3c9d8893341bc5470ec63ff8 (patch) | |
| tree | 4494c33edf3c0961a93969688a9ef3e347ce1365 /phpBB/language | |
| parent | f4b6f87641e60e8a2d746c8ac2e7b96bccf6d25d (diff) | |
| download | forums-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')
| -rw-r--r-- | phpBB/language/en/acp/profile.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/help_bbcode.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 3 |
4 files changed, 11 insertions, 5 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 "Translate" 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.', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5bd6a0579a..d78ae62769 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -29,6 +29,10 @@ if (empty($lang) || !is_array($lang)) // You do not need this where single placeholders are used, e.g. 'Message %d' is fine // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine +// +// Some characters you may want to copy&paste: +// ’ » “ ” +// $lang = array_merge($lang, array( 'TRANSLATION_INFO' => '', @@ -635,6 +639,7 @@ $lang = array_merge($lang, array( 'WRONG_DATA_WEBSITE' => 'The website address has to be a valid URL, including the protocol. For example http://www.example.com/.', 'YEAR' => 'Year', + 'YEAR_MONTH_DAY' => '(YYYY-MM-DD)', 'YES' => 'Yes', 'YIM' => 'YIM', 'YOU_LAST_VISIT' => 'Last visit was: %s', diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php index b663776782..7e7a7dffe9 100644 --- a/phpBB/language/en/help_bbcode.php +++ b/phpBB/language/en/help_bbcode.php @@ -56,11 +56,11 @@ $help = array( ), array( 0 => 'Quoting text in replies', - 1 => 'There are two ways you can quote text, with a reference or without.<ul><li>When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a <strong>[quote=""][/quote]</strong> block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter:<br /><br /><strong>[quote="Mr. Blobby"]</strong>The text Mr. Blobby wrote would go here<strong>[/quote]</strong><br /><br />The resulting output will automatically add, Mr. Blobby wrote: before the actual text. Remember you <strong>must</strong> include the parenthesis "" around the name you are quoting, they are not optional.</li><li>The second method allows you to blindly quote something. To utilise this enclose the text in <strong>[quote][/quote]</strong> tags. When you view the message it will simply show the text within a quotation block.</li></ul>' + 1 => 'There are two ways you can quote text, with a reference or without.<ul><li>When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a <strong>[quote=""][/quote]</strong> block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter:<br /><br /><strong>[quote="Mr. Blobby"]</strong>The text Mr. Blobby wrote would go here<strong>[/quote]</strong><br /><br />The resulting output will automatically add, Mr. Blobby wrote: before the actual text. Remember you <strong>must</strong> include the quotation marks "" around the name you are quoting, they are not optional.</li><li>The second method allows you to blindly quote something. To utilise this enclose the text in <strong>[quote][/quote]</strong> tags. When you view the message it will simply show the text within a quotation block.</li></ul>' ), array( 0 => 'Outputting code or fixed width data', - 1 => 'If you want to output a piece of code or in fact anything that requires a fixed width, eg. Courier type font you should enclose the text in <strong>[code][/code]</strong> tags, eg.<br /><br /><strong>[code]</strong>echo "This is some code";<strong>[/code]</strong><br /><br />All formatting used within <strong>[code][/code]</strong> tags is retained when you later view it.' + 1 => 'If you want to output a piece of code or in fact anything that requires a fixed width, eg. Courier type font you should enclose the text in <strong>[code][/code]</strong> tags, eg.<br /><br /><strong>[code]</strong>echo "This is some code";<strong>[/code]</strong><br /><br />All formatting used within <strong>[code][/code]</strong> tags is retained when you later view it.' ), array( 0 => '--', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 94f7cdfb3f..cce00674f7 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -91,6 +91,7 @@ $lang = array_merge($lang, array( 'FLASH_IS_ON' => '[flash] is <em>ON</em>', 'FLOOD_ERROR' => 'You cannot make another post so soon after your last.', 'FONT_COLOR' => 'Font color', + 'FONT_COLOR_HIDE' => 'Hide font color', 'FONT_HUGE' => 'Huge', 'FONT_LARGE' => 'Large', 'FONT_NORMAL' => 'Normal', @@ -179,7 +180,7 @@ $lang = array_merge($lang, array( 'TOO_FEW_CHARS' => 'Your message contains too few characters.', 'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options', - 'TOO_MANY_ATTACHMENTS' => 'Cannot add another attachment, %d is the maxmimum.', + 'TOO_MANY_ATTACHMENTS' => 'Cannot add another attachment, %d is the maximum.', 'TOO_MANY_CHARS' => 'Your message contains too many characters.', 'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options', 'TOO_MANY_SMILIES' => 'Your message contains too many smilies. The maximum number of smilies allowed is %d.', |