[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_bbcode.php,1.2,1.3 lang_main.php,1.68,1.69

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpbb/phpBB2/language/lang_english
In directory usw-pr-cvs1:/tmp/cvs-serv23197

Modified Files:
	lang_bbcode.php lang_main.php 
Log Message:
Tentative freeze(?)

Index: lang_bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_bbcode.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lang_bbcode.php	2001/12/17 00:30:36	1.2
--- lang_bbcode.php	2001/12/18 01:53:26	1.3
***************
*** 34,59 ****
  // If just translating this file please do not alter the actual HTML unless absolutely necessary, thanks :)
  //

  $faq[] = array("--","Introduction");
! $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 &lt; and &gt; and it offers greater control over what and how something is displayed. Depending on the template you are using you may find adding BBCode to your posts is made much easier through a clickable interface above the message area on the posting form. Even with this you may find the following guide useful.");

$faq[] = array("--","Text Formatting");
! $faq[] = array("How to create bold, italic and underlined text", "BBCode includes tags to enable you to change the basic look of your text. This is achieved in the following ways: <ul><li>To make a piece of text bold enclose it in [b][/b], eg. [b]Hello[/b] will become Hello</li><li>For underlining use [u][/u], for example: [u]Good Morning[/u] becomes Good Morning</li><li>To italicise text use [i][/i], eg. This is [i]Great![/i] would give This is Great!</li></ul>");
! $faq[] = array("How to change the text colour or size", "To alter the text colour or size the following tags are used, keep in mind that how the output appears will depend on the persons browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in [color=][/color], you can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, eg. #FFFFFF, #000000. For example, to create red text you could use: [color=red]Hello![/color] or [color=#FF0000]Hello![/color] will both output Hello!</li><li>Changing the text size is achieved in a similar way using [size=][/size]. This tag is dependent on the template you are using but the recommended format is a numerical value representing the text size in pixels, starting at 1 (so tiny you will not see it!) through to 29 (very large!). For example: [size=9]SMALL[/size] will generally be SMALL whereas: [size=24]HUGE![/size] will be HUGE!</li></ul>");
 $faq[] = array("Can I combine formatting tags?", "Yes, of course you can, for example to get someones attention you may write: [size=18][color=red][b]LOOK AT ME![/b][/color][/size] this would output LOOK AT ME! We don't recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect: [b][u]This is wrong[/b][/u]");

$faq[] = array("--","Quoting and outputting fixed-width text");
! $faq[] = array("Quoting text in replies", "There are two ways you can quote someone elses text, with a reference or without. When you hit use the quote function of the board you should notice that the post you are responding too is automatically added to the text window enclosed in a [quote=\"\"][/quote] block. This method allows you to quote with a reference to a person, thing, whatever. For example to quote a piece of text Mr. Blobby wrote you would enter: [quote=\"Mr. Blobby\"]The text Mr. Blobby wrote would go here[/quote] The resulting output will automatically add, Mr. Blobby wrote: before the actual text. Remember to include the parenthesis \"\" around the name you are quoting! The second method allows you to blindly quote something, in this case just enclose the text in [quote][/quote]. The output generated will simply add, Quote: before the text itself.");
! $faq[] = array("Outputting code or fixed width data", "If you want to output a piece of code or in fact anything that requires a fixed width, eg. Courier type font then you should enclose the text in [code][/code], eg. [code]echo \"This is some code\";[/code] All the formatting used within those tags will be retained.");

$faq[] = array("--","Generating lists");
! $faq[] = array("Creating an Un-ordered list", "BBCode supports two types of lists, unordered and ordered, they are essentially the same as their HTML equivalents. An unordered list just ouputs your text one by one with only a bullet character to separate them. To create an unordered list you use [list][/list] and define each item within the list using [*]. For example to list your favorite colours you could use something like: [list] [*]Red [*]Blue [*]Yellow [/list] This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>");
! $faq[] = array("Creating an Ordered list", "The second type of list, an ordered list gives you control over what is output before each item. To create an ordered list you use [list=1][/list] or alternatively [list=a][/list] items are still specified using [*]. The first list will output a numbered list while the second will use letters of the alphabet. For example: [list=1] [*]Go to the shops [*]Buy a new computer [*]Swear at computer when it crashes [/list] will generate the following:<ol type=\"1\"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use: [list=a] [*]The first possible answer [*]The second possible answer [*]The third possible answer [/list] giving<ol type=\"a\"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>");

$faq[] = array("--", "Creating Links");
! $faq[] = array("Linking to another site", "phpBB BBCode supports a number of ways of creating URIs, Uniform Resource Indicators better known as URLs. The first of these uses the [url=][/url] tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use: [url=http://www.phpbb.com/]Visit phpBB![/url] This would generate the following link, <a href=\"http://www.phpbb.com/\" target=\"_blank\">Visit phpBB!</a> You will notice the link opens in a new window so the user can continue browsing the forums if they wish. If you want the URL itself displayed as the link you can do this simply using: [url]http://www.phpbb.com/[/url] This would generate the following link, <a href=\"http://www.phpbb.com/\" target=\"_blank\">http://www.phpbb.com/</a>. Alternatively phpBB features something called Magic Links, this will turn any syntatically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href=\"http://www.phpbb.com/\" target=\"_blank\">www.phpbb.com</a> being output when you view the message. The same thing applies equally to email addresses, you can either specify an address explicitly for example: [email]no...@do...[/email] which will output <a href=\"emailto:no...@do...\">no...@do...</a> or you can just type no...@do... into your message and it will be automatically converted when you view. In addition you can wrap URLs around any of the other tags such as [img][/img] (see next entry), [b][/b], etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example: [url=http://www.phpbb.com/][img]http://www.phpbb.com/images/phplogo.gif[/url][/img] is not correct which may lead to your post being deleted so take care.");

$faq[] = array("--", "Showing images in posts");
! $faq[] = array("Adding an image to a post", "phpBB BBCode includes a tag for including images in your posts. Two very important things to remember when using this tag are, many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot only exist on your computer for example, unless you run a webserver!) there is no present way of storing images locally with phpBB (both of these issues will be addressed in the next release of phpBB). To display an image you must surround the URL pointing to the image with [img][/img] tags. For example: [img]http://www.phpbb.com/images/phplogo.gif[/img] As noted in the URL section above you can wrap an image in a [url][/url] tag if you wish, eg. [url=http://www.phpbb.com/][img]http://www.phpbb.com/images/phplogo.gif[/img][/url] would generate: <a href=\"http://www.phpbb.com/\" target=\"_blank\"><img src=\"http://www.phpbb.com/images/phplogo.gif\" border=\"0\" alt=\"\" /></a> ");

  $faq[] = array("--", "Other matters");
--- 34,63 ----
  // If just translating this file please do not alter the actual HTML unless absolutely necessary, thanks :)
  //
+ // In addition please do not translate the colours referenced in relation to BBCode any section, if you do
+ // users browsing in your language may be confused to find they're BBCode doesn't work :D You can change
+ // references which are 'in-line' within the text though.
+ //

  $faq[] = array("--","Introduction");
! $faq[] = array("What is BBCode?", "BBCode is a special implementation of HTML. Whether you can actually use BBCode in your posts on the forum is determined by the administrator. In addition you can disable BBCode on a per post basis via the posting form. BBCode itself is similar in style to HTML, tags are enclosed in square braces [ and ] rather than &lt; and &gt; and it offers greater control over what and how something is displayed. Depending on the template you are using you may find adding BBCode to your posts is made much easier through a clickable interface above the message area on the posting form. Even with this you may find the following guide useful.");

$faq[] = array("--","Text Formatting");
! $faq[] = array("How to create bold, italic and underlined text", "BBCode includes tags to allow you to quickly change the basic style of your text. This is achieved in the following ways: <ul><li>To make a piece of text bold enclose it in [b][/b], eg. [b]Hello[/b] will become Hello</li><li>For underlining use [u][/u], for example: [u]Good Morning[/u] becomes Good Morning</li><li>To italicise text use [i][/i], eg. This is [i]Great![/i] would give This is Great!</li></ul>");
! $faq[] = array("How to change the text colour or size", "To alter the color or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system: <ul><li>Changing the colour of text is achieved by wrapping it in [color=][/color]. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, eg. #FFFFFF, #000000. For example, to create red text you could use: [color=red]Hello![/color] or [color=#FF0000]Hello![/color] will both output Hello!</li><li>Changing the text size is achieved in a similar way using [size=][/size]. This tag is dependent on the template you are using but the recommended format is a numerical value representing the text size in pixels, starting at 1 (so tiny you will not see it) through to 29 (very large). For example: [size=9]SMALL[/size] will generally be SMALL whereas: [size=24]HUGE![/size] will be HUGE!</li></ul>");
 $faq[] = array("Can I combine formatting tags?", "Yes, of course you can, for example to get someones attention you may write: [size=18][color=red][b]LOOK AT ME![/b][/color][/size] this would output LOOK AT ME! We don't recommend you output lots of text that looks like this though! Remember it is up to you, the poster to ensure tags are closed correctly. For example the following is incorrect: [b][u]This is wrong[/b][/u]");

$faq[] = array("--","Quoting and outputting fixed-width text");
! $faq[] = array("Quoting text in replies", "There are two ways you can quote text, with a reference or without.<ul><li>When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a [quote=\"\"][/quote] block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter: [quote=\"Mr. Blobby\"]The text Mr. Blobby wrote would go here[/quote] The resulting output will automatically add, Mr. Blobby wrote: before the actual text. Remember you must include the parenthesis \"\" around the name you are quoting, they are not optional.</li><li>The second method allows you to blindly quote something. To utilise this enclose the text in [quote][/quote] tags. When you view the message it will simply show, Quote: before the text itself.</li></ul>");
! $faq[] = array("Outputting code or fixed width data", "If you want to output a piece of code or in fact anything that requires a fixed width, eg. Courier type font you should enclose the text in [code][/code] tags, eg. [code]echo \"This is some code\";[/code] All formatting used within [code][/code] tags is retained when you later view it.");

$faq[] = array("--","Generating lists");
! $faq[] = array("Creating an Un-ordered list", "BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list ouputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use [list][/list] and define each item within the list using [*]. For example to list your favorite colours you could use: [list] [*]Red [*]Blue [*]Yellow [/list] This would generate the following list:<ul><li>Red</li><li>Blue</li><li>Yellow</li></ul>");
! $faq[] = array("Creating an Ordered list", "The second type of list, an ordered list gives you control over what is output before each item. To create an ordered list you use [list=1][/list] to create a numbered list or alternatively [list=a][/list] for an alphabetical list. As with the unordered list items are specified using [*]. For example: [list=1] [*]Go to the shops [*]Buy a new computer [*]Swear at computer when it crashes [/list] will generate the following:<ol type=\"1\"><li>Go to the shops</li><li>Buy a new computer</li><li>Swear at computer when it crashes</li></ol>Whereas for an alphabetical list you would use: [list=a] [*]The first possible answer [*]The second possible answer [*]The third possible answer [/list] giving<ol type=\"a\"><li>The first possible answer</li><li>The second possible answer</li><li>The third possible answer</li></ol>");

$faq[] = array("--", "Creating Links");
! $faq[] = array("Linking to another site", "phpBB BBCode supports a number of ways of creating URIs, Uniform Resource Indicators better known as URLs.<ul><li>The first of these uses the [url=][/url] tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use: [url=http://www.phpbb.com/]Visit phpBB![/url] This would generate the following link, <a href=\"http://www.phpbb.com/\" target=\"_blank\">Visit phpBB!</a> You will notice the link opens in a new window so the user can continue browsing the forums if they wish.</li><li>If you want the URL itself displayed as the link you can do this by simply using: [url]http://www.phpbb.com/[/url] This would generate the following link, <a href=\"http://www.phpbb.com/\" target=\"_blank\">http://www.phpbb.com/</a></li><li>Additionally phpBB features something called Magic Links, this will turn any syntatically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href=\"http://www.phpbb.com/\" target=\"_blank\">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example: [email]no...@do...[/email] which will output <a href=\"emailto:no...@do...\">no...@do...</a> or you can just type no...@do... into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as [img][/img] (see next entry), [b][/b], etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example: [url=http://www.phpbb.com/][img]http://www.phpbb.com/images/phplogo.gif[/url][/img] is not correct which may lead to your post being deleted so take care.");

$faq[] = array("--", "Showing images in posts");
! $faq[] = array("Adding an image to a post", "phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are; many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). There is currently no way of storing images locally with phpBB (all these issues are expected to be addressed in the next release of phpBB). To display an image you must surround the URL pointing to the image with [img][/img] tags. For example: [img]http://www.phpbb.com/images/phplogo.gif[/img] As noted in the URL section above you can wrap an image in a [url][/url] tag if you wish, eg. [url=http://www.phpbb.com/][img]http://www.phpbb.com/images/phplogo.gif[/img][/url] would generate: <a href=\"http://www.phpbb.com/\" target=\"_blank\"><img src=\"http://www.phpbb.com/images/phplogo.gif\" border=\"0\" alt=\"\" /></a> ");

  $faq[] = array("--", "Other matters");

Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/language/lang_english/lang_main.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** lang_main.php	2001/12/17 00:39:47	1.68
--- lang_main.php	2001/12/18 01:53:26	1.69
***************
*** 33,37 ****

  //setlocale(LC_ALL, "en");
! $lang['ENCODING'] = "utf-8";
  $lang['DIRECTION'] = "LTR";
  $lang['LEFT'] = "LEFT";
--- 33,37 ----

  //setlocale(LC_ALL, "en");
! $lang['ENCODING'] = "iso-8859-1";
  $lang['DIRECTION'] = "LTR";
  $lang['LEFT'] = "LEFT";
***************
*** 449,454 ****
  $lang['Click_return_index'] = "Click %sHere%s to return to the Index";

- $lang['Re'] = "Re"; // Re as in 'Response to'
- 
  $lang['Send_a_new_message'] = "Send a new private message";
  $lang['Send_a_reply'] = "Reply to a private message";
--- 449,452 ----
***************
*** 876,893 ****
  $lang['tz']['-12'] = "(GMT -12:00 hours) Eniwetok, Kwajalein";
  $lang['tz']['-11'] = "(GMT -11:00 hours) Midway Island, Samoa";
! $lang['tz']['10'] = "(GMT -10:00 hours) Hawaii";
  $lang['tz']['-9'] = "(GMT -9:00 hours) Alaska";
! $lang['tz']['-8'] = "(GMT -8:00 hours) Pacific Time (US &amp; Canada)";
! $lang['tz']['-7'] = "(GMT -7:00 hours) Mountain Time (US &amp; Canada)";
  $lang['tz']['-6'] = "(GMT -6:00 hours) Central Time (US &amp; Canada), Mexico City";
  $lang['tz']['-5'] = "(GMT -5:00 hours) Eastern Time (US &amp; Canada), Bogota, Lima, Quito";
  $lang['tz']['-4'] = "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz";
  $lang['tz']['-3.5'] = "(GMT -3:30 hours) Newfoundland";
! $lang['tz']['-3'] = "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown, Falkland Is";
  $lang['tz']['-2'] = "(GMT -2:00 hours) Mid-Atlantic, Ascension Is., St. Helena";
  $lang['tz']['-1'] = "(GMT -1:00 hours) Azores, Cape Verde Islands";
  $lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
! $lang['tz']['1'] = "(GMT +1:00 hours) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome";
! $lang['tz']['2'] = "(GMT +2:00 hours) Kaliningrad, South Africa, Warsaw";
  $lang['tz']['3'] = "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi";
  $lang['tz']['3.5'] = "(GMT +3:30 hours) Tehran";
--- 874,891 ----
  $lang['tz']['-12'] = "(GMT -12:00 hours) Eniwetok, Kwajalein";
  $lang['tz']['-11'] = "(GMT -11:00 hours) Midway Island, Samoa";
! $lang['tz']['-10'] = "(GMT -10:00 hours) Hawaii";
  $lang['tz']['-9'] = "(GMT -9:00 hours) Alaska";
! $lang['tz']['-8'] = "(GMT -8:00 hours) Pacific Time (US &amp; Canada), Tijuana";
! $lang['tz']['-7'] = "(GMT -7:00 hours) Mountain Time (US &amp; Canada), Arizona";
  $lang['tz']['-6'] = "(GMT -6:00 hours) Central Time (US &amp; Canada), Mexico City";
  $lang['tz']['-5'] = "(GMT -5:00 hours) Eastern Time (US &amp; Canada), Bogota, Lima, Quito";
  $lang['tz']['-4'] = "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz";
  $lang['tz']['-3.5'] = "(GMT -3:30 hours) Newfoundland";
! $lang['tz']['-3'] = "(GMT -3:00 hours) Brassila, Buenos Aires, Georgetown, Falkland Is";
  $lang['tz']['-2'] = "(GMT -2:00 hours) Mid-Atlantic, Ascension Is., St. Helena";
  $lang['tz']['-1'] = "(GMT -1:00 hours) Azores, Cape Verde Islands";
  $lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
! $lang['tz']['1'] = "(GMT +1:00 hours) Amsterdam, Berlin, Brussels, Madrid, Paris, Rome";
! $lang['tz']['2'] = "(GMT +2:00 hours) Cairo, Helsinki, Kaliningrad, South Africa, Warsaw";
  $lang['tz']['3'] = "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi";
  $lang['tz']['3.5'] = "(GMT +3:30 hours) Tehran";
***************
*** 896,905 ****
  $lang['tz']['5'] = "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent";
  $lang['tz']['5.5'] = "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi";
! $lang['tz']['6'] = "(GMT +6:00 hours) Almaty, Colombo, Dhaka";
  $lang['tz']['7'] = "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta";
  $lang['tz']['8'] = "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei";
  $lang['tz']['9'] = "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
  $lang['tz']['9.5'] = "(GMT +9:30 hours) Adelaide, Darwin";
! $lang['tz']['10'] = "(GMT +10:00 hours) Melbourne, Papua New Guinea, Sydney, Vladivostok";
  $lang['tz']['11'] = "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands";
  $lang['tz']['12'] = "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island";
--- 894,904 ----
  $lang['tz']['5'] = "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent";
  $lang['tz']['5.5'] = "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi";
! $lang['tz']['6'] = "(GMT +6:00 hours) Almaty, Colombo, Dhaka, Novosibirsk";
! $lang['tz']['6.5'] = "(GMT +6:30 hours) Rangoon";
  $lang['tz']['7'] = "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta";
  $lang['tz']['8'] = "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei";
  $lang['tz']['9'] = "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
  $lang['tz']['9.5'] = "(GMT +9:30 hours) Adelaide, Darwin";
! $lang['tz']['10'] = "(GMT +10:00 hours) Canberra, Guam, Melbourne, Sydney, Vladivostok";
  $lang['tz']['11'] = "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands";
  $lang['tz']['12'] = "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island";

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_bbcode.php,1.2,1.3 lang_main.php,1.68,1.69

phpBB is the world's leading open source discussion forum software.

[Phpbb-checkins] CVS: phpBB2/language/lang_english lang_bbcode.php,1.2,1.3 lang_main.php,1.68,1.69