mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-08 17:56:52 +02:00
This is a mass commit ... expect trouble! Changes made here are primarily to how login is handled, schema changes necessary!
git-svn-id: file:///svn/phpbb/trunk@4970 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -32,7 +32,7 @@ $lang += array(
|
||||
'DIRECTION' => 'ltr',
|
||||
'LEFT' => 'left',
|
||||
'RIGHT' => 'right',
|
||||
'DATE_FORMAT' => 'd M Y',
|
||||
'DATE_FORMAT' => '|d M Y|',
|
||||
|
||||
|
||||
'1_DAY' => '1 Day',
|
||||
@@ -415,6 +415,9 @@ $lang += array(
|
||||
'YOU_NO_NEW_PM' => 'No new private messages are waiting for you',
|
||||
|
||||
'datetime' => array(
|
||||
'TODAY' => 'Today, ',
|
||||
'YESTERDAY' => 'Yesterday, ',
|
||||
|
||||
'Sunday' => 'Sunday',
|
||||
'Monday' => 'Monday',
|
||||
'Tuesday' => 'Tuesday',
|
||||
|
@@ -28,17 +28,23 @@ if (empty($lang) || !is_array($lang))
|
||||
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
|
||||
|
||||
$lang += array(
|
||||
'GROUP_AVATAR' => 'Group avatar',
|
||||
'GROUP_CLOSED' => 'Closed',
|
||||
'GROUP_DESC' => 'Group description',
|
||||
'GROUP_HIDDEN' => 'Hidden',
|
||||
'GROUP_INFORMATION' => 'Usergroup Information',
|
||||
'GROUP_MEMBERS' => 'Group members',
|
||||
'GROUP_NAME' => 'Group name',
|
||||
'GROUP_OPEN' => 'Open',
|
||||
'GROUP_RANK' => 'Group rank',
|
||||
'GROUP_TYPE' => 'Group type',
|
||||
'GROUP_IS_CLOSED' => 'This is a closed group, new members cannot automatically join.',
|
||||
'GROUP_IS_OPEN' => 'This is an open group, members can apply to join.',
|
||||
'GROUP_IS_HIDDEN' => 'This is a hidden group, only members of this group can view its membership.',
|
||||
'GROUP_IS_FREE' => 'This is a freely open group, all new members are welcome.',
|
||||
'GROUP_IS_SPECIAL' => 'This is a special group, special groups are managed by the board administrators.',
|
||||
|
||||
'No_groups_exist' => 'No Groups Exist',
|
||||
|
||||
'REMOVE_SELECTED' => 'Remove selected'
|
||||
'REMOVE_SELECTED' => 'Remove selected',
|
||||
);
|
||||
|
||||
?>
|
@@ -362,8 +362,27 @@ $lang += array(
|
||||
'REPORTED' => 'Reported',
|
||||
'TO_GROUP' => 'Usergroup',
|
||||
'TO_ME' => 'Me'
|
||||
)
|
||||
),
|
||||
|
||||
|
||||
'UCP_GROUPS_MEMBERSHIP' => 'Memberships',
|
||||
'UCP_GROUPS_MANAGE' => 'Manage groups',
|
||||
'GROUPS_EXPLAIN' => 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you extra rights to view content or increase your capabilities in other areas.',
|
||||
'GROUP_LEADER' => 'Leaderships',
|
||||
'GROUP_MEMBER' => 'Memberships',
|
||||
'GROUP_PENDING' => 'Pending memberships',
|
||||
'GROUP_NONMEMBER' => 'Non-memberships',
|
||||
'GROUP_DETAILS' => 'Group details',
|
||||
|
||||
'NO_LEADER' => 'No group leaderships',
|
||||
'NO_MEMBER' => 'No group memberships',
|
||||
'NO_PENDING' => 'No pending memberships',
|
||||
'NO_NONMEMBER' => 'No non-member groups',
|
||||
|
||||
'QUIT_ALL' => 'Quit all',
|
||||
'QUIT_MARKED' => 'Quit marked',
|
||||
'JOIN_ALL' => 'Join all',
|
||||
'JOIN_MARKED' => 'Join marked',
|
||||
);
|
||||
|
||||
?>
|
Reference in New Issue
Block a user