diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-01 19:28:37 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-01 19:28:37 +0300 |
| commit | b548389207fbf8e7c0d3287cd8704f05119d853a (patch) | |
| tree | b463fab12ef66897d6c392d104ad618bfb5a6646 /phpBB/language | |
| parent | 4b2ede433e9336cf115fdd41e5c88738b03aa448 (diff) | |
| parent | 2b3cfa0f7b9690907e5a72f6e94e2dc51afbe96b (diff) | |
| download | forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar.gz forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar.bz2 forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar.xz forums-b548389207fbf8e7c0d3287cd8704f05119d853a.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/10665
* upstream/develop:
[ticket/10733] Fixing test
[ticket/10733] Removing static from data providers
[ticket/10731] Fixed addquote() to work on opera browser.
[ticket/10731] Fixed addquote() to work on opera browser.
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
[ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
[ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
[ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
[ticket/10675] Add disk full language string when posting attachments
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/mcp.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 1 |
2 files changed, 2 insertions, 1 deletions
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)', |