diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-04-08 23:03:17 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-04-08 23:03:17 +0200 |
| commit | 9165a045c5dee06bb5c163281bb817369a1733a3 (patch) | |
| tree | 7e27a3e6720eb9943e0d344d92dc443cd5be77a9 /phpBB/language | |
| parent | e78fbfef9c6aac1349d18454a4292781d661795c (diff) | |
| parent | 26e7dd98b71655c7e09be02ebd3ef84765ce27b8 (diff) | |
| download | forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar.gz forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar.bz2 forums-9165a045c5dee06bb5c163281bb817369a1733a3.tar.xz forums-9165a045c5dee06bb5c163281bb817369a1733a3.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (76 commits)
[ticket/10561] Removed extra tabs, changes made to $db->sql_query()
[ticket/10561] Changed $temp_style_id to $style_id
[ticket/10561] Added function desc for phpbb_style_is_active()
[ticket/10561] Casted $config['default_style'] to int
[ticket/10561] Reverted to phpbb_style_is_active()
[ticket/10561] Added to database_update:database_update_info()
[ticket/10561] Added section in database_update.php
[ticket/10764] FAQ now mentions Area51 instead of SourceForge
[ticket/10764] FAQ now mentions GitHub instead of SourceForge
[ticket/10455] Removed NOTE from prosilver overall_header.html.
[ticket/10561] Moved and renamed the funtion validate_style().
[ticket/10575] Adding public visibility to the methods.
[ticket/10575] Fixing non-static access to static functions get_instance
[ticket/10547] User is not logged in as admin after installation
[ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
[ticket/10650] Added checking for empty subjects
[ticket/10650] Corrected intendation
[ticket/10650]Added permission checking and utf8 functions
[ticket/10650] Cropped subject and inserted newline
[ticket/10650] Corrected space before true
...
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/common.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/help_faq.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/viewtopic.php | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index b92b915623..12f8edad9e 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -207,7 +207,7 @@ $lang = array_merge($lang, array( 'FORM_INVALID' => 'The submitted form was invalid. Try submitting again.', 'FORUM' => 'Forum', 'FORUMS' => 'Forums', - 'FORUMS_MARKED' => 'The selected forums have been marked read.', + 'FORUMS_MARKED' => 'Forums have been marked read.', 'FORUM_CAT' => 'Forum category', 'FORUM_INDEX' => 'Board index', 'FORUM_LINK' => 'Forum link', @@ -482,6 +482,7 @@ $lang = array_merge($lang, array( 'POST_TIME' => 'Post time', 'POST_TOPIC' => 'Post a new topic', 'POST_UNAPPROVED' => 'Post awaiting approval:', + 'POWERED_BY' => 'Powered by %s', 'PREVIEW' => 'Preview', 'PREVIOUS' => 'Previous', // Used in pagination 'PREVIOUS_STEP' => 'Previous', diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index fa536e5b91..b14f155f3a 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -332,7 +332,7 @@ $help = array( ), array( 0 => 'Why isn’t X feature available?', - 1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the group uses SourceForge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.' + 1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, or you want to report a bug, please visit the phpBB <a href="http://area51.phpbb.com/">Area51</a> website, where you will find resources to do so.' ), array( 0 => 'Who do I contact about abusive and/or legal matters related to this board?', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index bd25d403ab..3ee619ea16 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -389,7 +389,7 @@ $lang = array_merge($lang, array( 'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]', 'WARNING_PM_SUBJECT' => 'Board warning issued', 'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s .', - 'WARNINGS_ZERO_TOTAL' => 'No warnings exist.', + 'NO_WARNINGS' => 'No warnings exist.', 'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s.', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 933287dde3..086bd6ffb0 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -41,6 +41,7 @@ $lang = array_merge($lang, array( 'ADD_POLL' => 'Poll creation', 'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank.', 'ALREADY_DELETED' => 'Sorry but this message is already deleted.', + 'ATTACH_DISK_FULL' => 'There is not enough free disk space to post this attachment.', 'ATTACH_QUOTA_REACHED' => 'Sorry, the board attachment quota has been reached.', 'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)', diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index 1460490672..184f88ed3c 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -62,7 +62,7 @@ $lang = array_merge($lang, array( 'FILE_NOT_FOUND_404' => 'The file <strong>%s</strong> does not exist.', 'FORK_TOPIC' => 'Copy topic', - 'FULL_EDITOR' => 'Full Editor', + 'FULL_EDITOR' => 'Full Editor & Preview', 'LINKAGE_FORBIDDEN' => 'You are not authorised to view, download or link from/to this site.', 'LOGIN_NOTIFY_TOPIC' => 'You have been notified about this topic, please login to view it.', |