aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-16 23:20:32 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-16 23:20:32 +0000
commita32c084507f26423a87b4ffd049e406e4039870c (patch)
tree185b3b16c5264baddd2bd7ccba408930c7e7d197
parentd4a2bec8d3c83b3e10ed128875acef886c908cd8 (diff)
downloadforums-a32c084507f26423a87b4ffd049e406e4039870c.tar
forums-a32c084507f26423a87b4ffd049e406e4039870c.tar.gz
forums-a32c084507f26423a87b4ffd049e406e4039870c.tar.bz2
forums-a32c084507f26423a87b4ffd049e406e4039870c.tar.xz
forums-a32c084507f26423a87b4ffd049e406e4039870c.zip
anyone want to buy a C?
git-svn-id: file:///svn/phpbb/trunk@6076 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat
-rw-r--r--phpBB/includes/acp/acp_ban.php4
-rw-r--r--phpBB/includes/mcp/mcp_ban.php4
-rw-r--r--phpBB/language/en/acp/ban.php2
-rw-r--r--phpBB/language/en/acp/common.php2
-rw-r--r--phpBB/language/en/common.php1
-rw-r--r--phpBB/language/en/email/user_activate_passwd.txt2
-rw-r--r--phpBB/language/en/mcp.php4
-rw-r--r--phpBB/styles/subSilver/template/memberlist_body.html4
8 files changed, 13 insertions, 10 deletions
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php
index 4923b64a71..420deb975f 100644
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -42,7 +42,7 @@ class acp_ban
user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason);
- trigger_error($user->lang['BAN_UPDATE_SUCESSFUL'] . adm_back_link($this->u_action));
+ trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action));
}
else if ($unbansubmit)
{
@@ -50,7 +50,7 @@ class acp_ban
user_unban($mode, $ban);
- trigger_error($user->lang['BAN_UPDATE_SUCESSFUL'] . adm_back_link($this->u_action));
+ trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action));
}
// Define language vars
diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php
index 7878e4912c..510943aa45 100644
--- a/phpBB/includes/mcp/mcp_ban.php
+++ b/phpBB/includes/mcp/mcp_ban.php
@@ -45,7 +45,7 @@ class mcp_ban
user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason);
- trigger_error($user->lang['BAN_UPDATE_SUCESSFUL'] . '<br /><br /><a href="' . $this->u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>');
+ trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . '<br /><br /><a href="' . $this->u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>');
}
else if ($unbansubmit)
{
@@ -53,7 +53,7 @@ class mcp_ban
user_unban($mode, $ban);
- trigger_error($user->lang['BAN_UPDATE_SUCESSFUL'] . '<br /><br /><a href="' . $this->u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>');
+ trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . '<br /><br /><a href="' . $this->u_action . '">&laquo; ' . $user->lang['BACK_TO_PREV'] . '</a>');
}
// Ban length options
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 6def9cdf6b..683baf03c1 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -40,7 +40,7 @@ $lang = array_merge($lang, array(
'BAN_LENGTH' => 'Length of ban',
'BAN_REASON' => 'Reason for ban',
'BAN_GIVE_REASON' => 'Reason shown to the banned',
- 'BAN_UPDATE_SUCESSFUL' => 'The banlist has been updated successfully',
+ 'BAN_UPDATE_SUCCESSFUL' => 'The banlist has been updated successfully',
'EMAIL_BAN' => 'Ban one or more email addresses',
'EMAIL_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered email address from all current bans.',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index a42e0fdd05..5b875b4916 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -356,7 +356,7 @@ $lang = array_merge($lang, array(
'LOG_ACL_RESTORE_PERMISSIONS' => '<b>Own permissions restored after using permissions from</b><br />&#187; %s',
'LOG_ADMIN_AUTH_FAIL' => '<b>Failed administration login attempt</b>',
- 'LOG_ADMIN_AUTH_SUCCESS' => '<b>Sucessful administration login</b>',
+ 'LOG_ADMIN_AUTH_SUCCESS' => '<b>Successful administration login</b>',
'LOG_ATTACH_EXT_ADD' => '<b>Added or edited attachment extension</b><br />&#187; %s',
'LOG_ATTACH_EXT_DEL' => '<b>Removed attachment extension</b><br />&#187; %s',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6b39a74aa0..ef9da82592 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -307,6 +307,7 @@ $lang = array_merge($lang, array(
'NO_FORUM' => 'The forum you selected does not exist',
'NO_FORUMS' => 'This board has no forums',
'NO_GROUP' => 'The requested usergroup does not exist.',
+ 'NO_GROUP_MEMBERS' => 'This group is currently not having any members assigned',
'NO_MEMBERS' => 'No members found for this search criteria',
'NO_MESSAGES' => 'No messages',
'NO_NEW_MESSAGES' => 'No new messages',
diff --git a/phpBB/language/en/email/user_activate_passwd.txt b/phpBB/language/en/email/user_activate_passwd.txt
index 8c45d032fe..0c2adc82ec 100644
--- a/phpBB/language/en/email/user_activate_passwd.txt
+++ b/phpBB/language/en/email/user_activate_passwd.txt
@@ -9,7 +9,7 @@ To use the new password you need to activate it. To do this click the link provi
{U_ACTIVATE}
-If sucessful you will be able to login using the following password:
+If successful you will be able to login using the following password:
Password: {PASSWORD}
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 468c744814..14f28a90d1 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -35,7 +35,7 @@ $lang = array_merge($lang, array(
'ADD_WARNING' => 'Add warning',
'ADD_WARNING_EXPLAIN' => 'To send a warning to this user please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.',
'ALL_ENTRIES' => 'All entries',
- 'ALL_NOTES_DELETED' => 'Sucessfully removed all user notes',
+ 'ALL_NOTES_DELETED' => 'Successfully removed all user notes',
'ALL_REPORTS' => 'All reports',
'ALREADY_REPORTED' => 'This post has already been reported',
'ALREADY_WARNED' => 'A warning has already been issued for this post',
@@ -119,7 +119,7 @@ $lang = array_merge($lang, array(
'LOOKUP_ALL' => 'Look up all IPs',
'LOOKUP_IP' => 'Look up IP',
- 'MARKED_NOTES_DELETED' => 'Sucessfully removed all marked user notes',
+ 'MARKED_NOTES_DELETED' => 'Successfully removed all marked user notes',
'MCP_ADD' => 'Add a warning',
diff --git a/phpBB/styles/subSilver/template/memberlist_body.html b/phpBB/styles/subSilver/template/memberlist_body.html
index 832aec3c36..755176b25d 100644
--- a/phpBB/styles/subSilver/template/memberlist_body.html
+++ b/phpBB/styles/subSilver/template/memberlist_body.html
@@ -72,7 +72,9 @@
<!-- BEGINELSE -->
<tr>
- <td class="row1" colspan="<!-- IF S_SEARCH_USER and S_FORM_NAME -->9<!-- ELSE -->8<!-- ENDIF -->" height="28" align="center"><span class="gen">{L_NO_MEMBERS}</span></td>
+ <td class="row1" colspan="<!-- IF S_SEARCH_USER and S_FORM_NAME -->9<!-- ELSE -->8<!-- ENDIF -->" height="28" align="center">
+ <span class="gen"><!-- IF S_SHOW_GROUP -->{L_NO_GROUP_MEMBERS}<!-- ELSE -->{L_NO_MEMBERS}<!-- ENDIF --></span>
+ </td>
</tr>
<!-- END memberrow -->
generated by cgit v1.2.1 (git 2.21.0) at 2025-05-05 07:20:31 +0000