[mxbb-commits] core/includes/shared/phpbb2/language/lang_english lang_main.php, 1.3, 1.4

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_english
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25942

Modified Files:
	lang_main.php 
Log Message:
upgrade

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_english/lang_main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lang_main.php	30 Jul 2008 14:35:48 -0000	1.3
--- lang_main.php	6 Sep 2008 17:24:54 -0000	1.4
***************
*** 34,38 ****
  //
  
! $lang['ENCODING'] = 'Windows-1250';
  $lang['DIRECTION'] = 'ltr';
  $lang['LEFT'] = 'left';
--- 34,38 ----
  //
  
! $lang['ENCODING'] = 'iso-8859-1';
  $lang['DIRECTION'] = 'ltr';
  $lang['LEFT'] = 'left';
***************
*** 174,178 ****
  $lang['Registered_users_total'] = 'We have <b>%d</b> registered users'; // # registered users
  $lang['Registered_user_total'] = 'We have <b>%d</b> registered user'; // # registered users
! $lang['Newest_user'] = 'The newest registered user is <b>%s%s%s</b>'; // a href, username, /a
  
  $lang['No_new_posts_last_visit'] = 'No new posts since your last visit';
--- 174,178 ----
  $lang['Registered_users_total'] = 'We have <b>%d</b> registered users'; // # registered users
  $lang['Registered_user_total'] = 'We have <b>%d</b> registered user'; // # registered users
! $lang['Newest_user'] = 'The newest registered user is <b>%s%s%s</b>'; // a href, username, /a 
  
  $lang['No_new_posts_last_visit'] = 'No new posts since your last visit';
***************
*** 245,249 ****
  $lang['Rules_vote_can'] = 'You <b>can</b> vote in polls in this forum';
  $lang['Rules_vote_cannot'] = 'You <b>cannot</b> vote in polls in this forum';
! $lang['Rules_moderate'] = 'You <b>can</b> %smoderate this forum%s'; // %s replaced by a href links, do not remove!
  
  $lang['No_topics_post_one'] = 'There are no posts in this forum.<br />Click on the <b>Post New Topic</b> link on this page to post one.';
--- 245,249 ----
  $lang['Rules_vote_can'] = 'You <b>can</b> vote in polls in this forum';
  $lang['Rules_vote_cannot'] = 'You <b>cannot</b> vote in polls in this forum';
! $lang['Rules_moderate'] = 'You <b>can</b> %smoderate this forum%s'; // %s replaced by a href links, do not remove! 
  
  $lang['No_topics_post_one'] = 'There are no posts in this forum.<br />Click on the <b>Post New Topic</b> link on this page to post one.';
***************
*** 274,278 ****
  $lang['Back_to_top'] = 'Back to top';
  
! $lang['Read_profile'] = 'View user\'s profile';
  $lang['Visit_website'] = 'Visit poster\'s website';
  $lang['ICQ_status'] = 'ICQ Status';
--- 274,278 ----
  $lang['Back_to_top'] = 'Back to top';
  
! $lang['Read_profile'] = 'View user\'s profile'; 
  $lang['Visit_website'] = 'Visit poster\'s website';
  $lang['ICQ_status'] = 'ICQ Status';
***************
*** 458,462 ****
  $lang['Delete_marked'] = 'Delete Marked';
  $lang['Delete_all'] = 'Delete All';
! $lang['Save_marked'] = 'Save Marked';
  $lang['Save_message'] = 'Save Message';
  $lang['Delete_message'] = 'Delete Message';
--- 458,462 ----
  $lang['Delete_marked'] = 'Delete Marked';
  $lang['Delete_all'] = 'Delete All';
! $lang['Save_marked'] = 'Save Marked'; 
  $lang['Save_message'] = 'Save Message';
  $lang['Delete_message'] = 'Delete Message';
***************
*** 502,507 ****
  
  $lang['Inbox_size'] = 'Your Inbox is %d%% full'; // eg. Your Inbox is 50% full
! $lang['Sentbox_size'] = 'Your Sentbox is %d%% full';
! $lang['Savebox_size'] = 'Your Savebox is %d%% full';
  
  $lang['Click_view_privmsg'] = 'Click %sHere%s to visit your Inbox';
--- 502,507 ----
  
  $lang['Inbox_size'] = 'Your Inbox is %d%% full'; // eg. Your Inbox is 50% full
! $lang['Sentbox_size'] = 'Your Sentbox is %d%% full'; 
! $lang['Savebox_size'] = 'Your Savebox is %d%% full'; 
  
  $lang['Click_view_privmsg'] = 'Click %sHere%s to visit your Inbox';
***************
*** 511,515 ****
  // Profiles/Registration
  //
! $lang['Viewing_user_profile'] = 'Viewing profile :: %s'; // %s is username
  $lang['About_user'] = 'All about %s'; // %s is username
  
--- 511,515 ----
  // Profiles/Registration
  //
! $lang['Viewing_user_profile'] = 'Viewing profile :: %s'; // %s is username 
  $lang['About_user'] = 'All about %s'; // %s is username
  
***************
*** 529,533 ****
  $lang['Hidden_email'] = '[ Hidden ]';
  $lang['Interests'] = 'Interests';
! $lang['Occupation'] = 'Occupation';
  $lang['Poster_rank'] = 'Poster rank';
  
--- 529,533 ----
  $lang['Hidden_email'] = '[ Hidden ]';
  $lang['Interests'] = 'Interests';
! $lang['Occupation'] = 'Occupation'; 
  $lang['Poster_rank'] = 'Poster rank';
  
***************
*** 591,595 ****
  
  $lang['Notify_on_privmsg'] = 'Notify on new Private Message';
! $lang['Popup_on_privmsg'] = 'Pop up window on new Private Message';
  $lang['Popup_on_privmsg_explain'] = 'Some templates may open a new window to inform you when new private messages arrive.';
  $lang['Hide_user'] = 'Hide your online status';
--- 591,595 ----
  
  $lang['Notify_on_privmsg'] = 'Notify on new Private Message';
! $lang['Popup_on_privmsg'] = 'Pop up window on new Private Message'; 
  $lang['Popup_on_privmsg_explain'] = 'Some templates may open a new window to inform you when new private messages arrive.';
  $lang['Hide_user'] = 'Hide your online status';
***************
*** 611,615 ****
  $lang['Avatar_filetype'] = 'The avatar filetype must be .jpg, .gif or .png';
  $lang['Avatar_filesize'] = 'The avatar image file size must be less than %d KB'; // The avatar image file size must be less than 6 KB
! $lang['Avatar_imagesize'] = 'The avatar must be less than %d pixels wide and %d pixels high';
  
  $lang['Welcome_subject'] = 'Welcome to %s Forums'; // Welcome to my.com forums
--- 611,615 ----
  $lang['Avatar_filetype'] = 'The avatar filetype must be .jpg, .gif or .png';
  $lang['Avatar_filesize'] = 'The avatar image file size must be less than %d KB'; // The avatar image file size must be less than 6 KB
! $lang['Avatar_imagesize'] = 'The avatar must be less than %d pixels wide and %d pixels high'; 
  
  $lang['Welcome_subject'] = 'Welcome to %s Forums'; // Welcome to my.com forums
***************
*** 634,638 ****
  
  $lang['Wrong_activation'] = 'The activation key you supplied does not match any in the database.';
! $lang['Send_password'] = 'Send me a new password';
  $lang['Password_updated'] = 'A new password has been created; please check your e-mail for details on how to activate it.';
  $lang['No_email_match'] = 'The e-mail address you supplied does not match the one listed for that username.';
--- 634,638 ----
  
  $lang['Wrong_activation'] = 'The activation key you supplied does not match any in the database.';
! $lang['Send_password'] = 'Send me a new password'; 
  $lang['Password_updated'] = 'A new password has been created; please check your e-mail for details on how to activate it.';
  $lang['No_email_match'] = 'The e-mail address you supplied does not match the one listed for that username.';
***************
*** 681,684 ****
--- 681,753 ----
  $lang['Order'] = 'Order';
  
+ 
+ //
+ // Group control panel
+ //
+ $lang['Group_Control_Panel'] = 'Group Control Panel';
+ $lang['Group_member_details'] = 'Group Membership Details';
+ $lang['Group_member_join'] = 'Join a Group';
+ 
+ $lang['Group_Information'] = 'Group Information';
+ $lang['Group_name'] = 'Group name';
+ $lang['Group_description'] = 'Group description';
+ $lang['Group_membership'] = 'Group membership';
+ $lang['Group_Members'] = 'Group Members';
+ $lang['Group_Moderator'] = 'Group Moderator';
+ $lang['Pending_members'] = 'Pending Members';
+ 
+ $lang['Group_type'] = 'Group type';
+ $lang['Group_open'] = 'Open group';
+ $lang['Group_closed'] = 'Closed group';
+ $lang['Group_hidden'] = 'Hidden group';
+ 
+ $lang['Current_memberships'] = 'Current memberships';
+ $lang['Non_member_groups'] = 'Non-member groups';
+ $lang['Memberships_pending'] = 'Memberships pending';
+ 
+ $lang['No_groups_exist'] = 'No Groups Exist';
+ $lang['Group_not_exist'] = 'That user group does not exist';
+ 
+ $lang['Join_group'] = 'Join Group';
+ $lang['No_group_members'] = 'This group has no members';
+ $lang['Group_hidden_members'] = 'This group is hidden; you cannot view its membership';
+ $lang['No_pending_group_members'] = 'This group has no pending members';
+ $lang['Group_joined'] = 'You have successfully subscribed to this group.<br />You will be notified when your subscription is approved by the group moderator.';
+ $lang['Group_request'] = 'A request to join your group has been made.';
+ $lang['Group_approved'] = 'Your request has been approved.';
+ $lang['Group_added'] = 'You have been added to this usergroup.'; 
+ $lang['Already_member_group'] = 'You are already a member of this group';
+ $lang['User_is_member_group'] = 'User is already a member of this group';
+ $lang['Group_type_updated'] = 'Successfully updated group type.';
+ 
+ $lang['Could_not_add_user'] = 'The user you selected does not exist.';
+ $lang['Could_not_anon_user'] = 'You cannot make Anonymous a group member.';
+ 
+ $lang['Confirm_unsub'] = 'Are you sure you want to unsubscribe from this group?';
+ $lang['Confirm_unsub_pending'] = 'Your subscription to this group has not yet been approved; are you sure you want to unsubscribe?';
+ 
+ $lang['Unsub_success'] = 'You have been un-subscribed from this group.';
+ 
+ $lang['Approve_selected'] = 'Approve Selected';
+ $lang['Deny_selected'] = 'Deny Selected';
+ $lang['Not_logged_in'] = 'You must be logged in to join a group.';
+ $lang['Remove_selected'] = 'Remove Selected';
+ $lang['Add_member'] = 'Add Member';
+ $lang['Not_group_moderator'] = 'You are not this group\'s moderator, therefore you cannot perform that action.';
+ 
+ $lang['Login_to_join'] = 'Log in to join or manage group memberships';
+ $lang['This_open_group'] = 'This is an open group: click to request membership';
+ $lang['This_closed_group'] = 'This is a closed group: no more users accepted';
+ $lang['This_hidden_group'] = 'This is a hidden group: automatic user addition is not allowed';
+ $lang['Member_this_group'] = 'You are a member of this group';
+ $lang['Pending_this_group'] = 'Your membership of this group is pending';
+ $lang['Are_group_moderator'] = 'You are the group moderator';
+ $lang['None'] = 'None';
+ 
+ $lang['Subscribe'] = 'Subscribe';
+ $lang['Unsubscribe'] = 'Unsubscribe';
+ $lang['View_Information'] = 'View Information';
+ 
+ 
  //
  // Search
***************
*** 726,734 ****
  // Note the %s will be replaced with one of the following 'user' arrays
  $lang['Sorry_auth_announce'] = 'Sorry, but only %s can post announcements in this forum.';
! $lang['Sorry_auth_sticky'] = 'Sorry, but only %s can post sticky messages in this forum.';
! $lang['Sorry_auth_read'] = 'Sorry, but only %s can read topics in this forum.';
! $lang['Sorry_auth_post'] = 'Sorry, but only %s can post topics in this forum.';
  $lang['Sorry_auth_reply'] = 'Sorry, but only %s can reply to posts in this forum.';
! $lang['Sorry_auth_edit'] = 'Sorry, but only %s can edit posts in this forum.';
  $lang['Sorry_auth_delete'] = 'Sorry, but only %s can delete posts in this forum.';
  $lang['Sorry_auth_vote'] = 'Sorry, but only %s can vote in polls in this forum.';
--- 795,803 ----
  // Note the %s will be replaced with one of the following 'user' arrays
  $lang['Sorry_auth_announce'] = 'Sorry, but only %s can post announcements in this forum.';
! $lang['Sorry_auth_sticky'] = 'Sorry, but only %s can post sticky messages in this forum.'; 
! $lang['Sorry_auth_read'] = 'Sorry, but only %s can read topics in this forum.'; 
! $lang['Sorry_auth_post'] = 'Sorry, but only %s can post topics in this forum.'; 
  $lang['Sorry_auth_reply'] = 'Sorry, but only %s can reply to posts in this forum.';
! $lang['Sorry_auth_edit'] = 'Sorry, but only %s can edit posts in this forum.'; 
  $lang['Sorry_auth_delete'] = 'Sorry, but only %s can delete posts in this forum.';
  $lang['Sorry_auth_vote'] = 'Sorry, but only %s can vote in polls in this forum.';
***************
*** 950,959 ****
  $lang['Please_remove_install_contrib'] = 'Please ensure both the install/ and contrib/ directories are deleted';
  
! //
! // That's all, Folks!
! // -------------------------------------------------
  
  // Begin Simple Subforums MOD
  $lang['Subforums'] = 'Subforums';
  // End Simple Subforums MOD
  ?>
\ No newline at end of file
--- 1019,1046 ----
  $lang['Please_remove_install_contrib'] = 'Please ensure both the install/ and contrib/ directories are deleted';
  
! $lang['Session_invalid'] = 'Invalid Session. Please resubmit the form.';
! 
! //====================================================================== |
! //==== Start Advanced BBCode Box MOD =================================== |
! //==== v5.1.0 ========================================================== |
! //====
! $lang['BBCode_box_hidden'] = 'Hidden';
! $lang['BBcode_box_view'] = 'Click to View Content';
! $lang['BBcode_box_hide'] = 'Click to Hide Content';
! $lang['bbcode_help']['GVideo'] = 'GVideo: [GVideo]GVideo URL[/GVideo]';
! $lang['GVideo_link'] = 'Link';
! $lang['bbcode_help']['youtube'] = 'YouTube: [youtube]YouTube URL[/youtube]';
! $lang['youtube_link'] = 'Link';
! //====
! //==== End Advanced BBCode Box MOD ==================================== |
! //===================================================================== |
  
  // Begin Simple Subforums MOD
  $lang['Subforums'] = 'Subforums';
  // End Simple Subforums MOD
+ 
+ //
+ // That's all, Folks!
+ // -------------------------------------------------
+ 
  ?>
\ No newline at end of file