[gentoo-commits] gentoo-projects commit in forums/htdocs/language/lang_english: lang_admin.php lang_faq.php

[Dean Stephens (desultory)]

desultory    09/07/30 06:38:51

  Modified:             lang_admin.php lang_faq.php
  Log:
  Upgrade to 2.0.23, add some proxy fixes, fix bug 191626 and bug 170166.

Revision  Changes    Path
1.6                  forums/htdocs/language/lang_english/lang_admin.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/language/lang_english/lang_admin.php?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/language/lang_english/lang_admin.php?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/language/lang_english/lang_admin.php?r1=1.5&r2=1.6

Index: lang_admin.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/language/lang_english/lang_admin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lang_admin.php	9 Apr 2006 14:10:45 -0000	1.5
+++ lang_admin.php	30 Jul 2009 06:38:51 -0000	1.6
@@ -7,7 +7,7 @@
  *     copyright            : (C) 2001 The phpBB Group
  *     email                : support@×××××.com
  *
- *     $Id: lang_admin.php,v 1.5 2006/04/09 14:10:45 tomk Exp $
+ *     $Id: lang_admin.php,v 1.6 2009/07/30 06:38:51 desultory Exp $
  *
  ****************************************************************************/
 
@@ -216,7 +216,7 @@
 $lang['Ban_email'] = 'Ban one or more email addresses';
 $lang['Ban_email_explain'] = 'To specify more than one email address, separate them with commas. To specify a wildcard username, use * like *@hotmail.com';
 
-$lang['Unban_username'] = 'Un-ban one more specific users';
+$lang['Unban_username'] = 'Un-ban one or more specific users';
 $lang['Unban_username_explain'] = 'You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser';
 
 $lang['Unban_IP'] = 'Un-ban one or more IP addresses';
@@ -574,7 +574,7 @@
 
 $lang['Delete_disallow'] = 'Delete';
 $lang['Delete_disallow_title'] = 'Remove a Disallowed Username';
-$lang['Delete_disallow_explain'] = 'You can remove a disallowed username by selecting the username from this list and clicking submit';
+$lang['Delete_disallow_explain'] = 'You can remove a disallowed username by selecting the username from this list and clicking delete';
 
 $lang['Add_disallow'] = 'Add';
 $lang['Add_disallow_title'] = 'Add a disallowed username';



1.4                  forums/htdocs/language/lang_english/lang_faq.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/language/lang_english/lang_faq.php?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/language/lang_english/lang_faq.php?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/language/lang_english/lang_faq.php?r1=1.3&r2=1.4

Index: lang_faq.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/language/lang_english/lang_faq.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lang_faq.php	13 Aug 2006 15:31:43 -0000	1.3
+++ lang_faq.php	30 Jul 2009 06:38:51 -0000	1.4
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: lang_faq.php,v 1.3 2006/08/13 15:31:43 tomk Exp $
+ *   $Id: lang_faq.php,v 1.4 2009/07/30 06:38:51 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -77,7 +77,8 @@
 $faq[] = array("What is BBCode?", "BBCode is a special implementation of HTML. Whether you can use BBCode is determined by the administrator. You can also disable it on a per post basis from the posting form. BBCode itself is similar in style to HTML: tags are enclosed in square braces [ and ] rather than < and > and it offers greater control over what and how something is displayed. For more information on BBCode see the guide which can be accessed from the posting page.");
 $faq[] = array("Can I use HTML?", "That depends on whether the administrator allows you to; they have complete control over it. If you are allowed to use it, you will probably find only certain tags work. This is a <i>safety</i> feature to prevent people from abusing the board by using tags which may destroy the layout or cause other problems. If HTML is enabled you can disable it on a per post basis from the posting form.");
 $faq[] = array("What are Smileys?", "Smileys, or Emoticons, are small graphical images which can be used to express some feeling using a short code, e.g. :) means happy, :( means sad. The full list of emoticons can be seen via the posting form. Try not to overuse smileys, though, as they can quickly render a post unreadable and a moderator may decide to edit them out or remove the post altogether.");
-$faq[] = array("Can I post Images?", "Images can indeed be shown in your posts. However, there is no facility at present for uploading images directly to this board. Therefore you must link to an image stored on a publicly accessible web server, e.g. http://www.some-unknown-place.net/my-picture.gif. You cannot link to pictures stored on your own PC (unless it is a publicly accessible server) nor to images stored behind authentication mechanisms such as Hotmail or Yahoo mailboxes, password-protected sites, etc. To display the image use either the BBCode [img] tag or appropriate HTML (if allowed).");
+# 2009-03 desultory -- Fix bug 191626.
+#$faq[] = array("Can I post Images?", "Images can indeed be shown in your posts. However, there is no facility at present for uploading images directly to this board. Therefore you must link to an image stored on a publicly accessible web server, e.g. http://www.some-unknown-place.net/my-picture.gif. You cannot link to pictures stored on your own PC (unless it is a publicly accessible server) nor to images stored behind authentication mechanisms such as Hotmail or Yahoo mailboxes, password-protected sites, etc. To display the image use either the BBCode [img] tag or appropriate HTML (if allowed).");
 $faq[] = array("What are Announcements?", "Announcements often contain important information and you should read them as soon as possible. Announcements appear at the top of every page in the forum to which they are posted. Whether or not you can post an announcement depends on the permissions required, which are set by the administrator.");
 $faq[] = array("What are Sticky topics?", "Sticky topics appear below any announcements in viewforum and only on the first page. They are often quite important so you should read them where possible. As with announcements the board administrator determines what permissions are required to post sticky topics in each forum.");
 $faq[] = array("What are Locked topics?", "Locked topics are set this way by either the forum moderator or board administrator. You cannot reply to locked topics and any poll contained inside is automatically ended. Topics may be locked for many reasons.");