diff --git a/phpBB/language/lang_chinese_simplified/lang_admin.php b/phpBB/language/lang_chinese_simplified/lang_admin.php
index 4dcb583b81..b818fa921c 100644
--- a/phpBB/language/lang_chinese_simplified/lang_admin.php
+++ b/phpBB/language/lang_chinese_simplified/lang_admin.php
@@ -1,7 +1,7 @@
 <?php
 
 /***************************************************************************
- *                            lang_admin.php [English]
+ *                            lang_admin.php [chinese simplified]
  *                              -------------------
  *     begin                : Sat Dec 16 2000
  *     copyright            : (C) 2001 The phpBB Group
@@ -22,16 +22,13 @@
  ***************************************************************************/
 
 //
-// Chinese GB Simplified Translation by inker
-// http://www.byink.com    
-// last modify : 2002/2/26                           
+// Translation by:
+//      inker    :: http://www.byink.com
 //
-
-//
-// Format is same as lang_main
+//      For questions and comments use: support@byink.com
+//      last modify   : 2002/3/1                      
 //
  
-
 //
 // Modules, this replaces the keys used
 // in the modules[][] arrays in each module file
@@ -160,6 +157,14 @@ $lang['Registered'] = "×¢
 $lang['Administrators'] = "ÂÛ̳¹ÜÀíÔ±";
 $lang['Hidden'] = "Òþ²Ø";
 
+// These are displayed in the drop down boxes for advanced
+// mode forum auth, try and keep them short!
+$lang['Forum_ALL'] = "È«²¿";
+$lang['Forum_REG'] = "REG";
+$lang['Forum_PRIVATE'] = "PRIVATE";
+$lang['Forum_MOD'] = "MOD";
+$lang['Forum_ADMIN'] = "¹ÜÀí";
+
 $lang['View'] = "ä¯ÀÀ";
 $lang['Read'] = "ÔĶÁ";
 $lang['Post'] = "·¢±í";
@@ -696,6 +701,10 @@ $lang['Upgrade'] = "ϵͳ
 
 $lang['Install_Method'] = 'ÇëÑ¡Ôñ°²×°Ä£Ê½';
 
+$lang['Install_No_Ext'] = "Äú·þÎñÆ÷ÉϵÄphpÅäÖò»Ö§³ÖÄúËùÑ¡ÔñµÄÊý¾Ý¿âÀàÐÍ";
+
+$lang['Install_No_PCRE'] = "ÄúµÄphpÅäÖò»Ö§³Ö°²×°phpBB2ËùÐèÒªµÄPerlÓïÑÔ±ê×¼±í´ïģʽµÄ¼æÈÝÐÔ";
+
 
 
 //
diff --git a/phpBB/language/lang_chinese_simplified/lang_bbcode.php b/phpBB/language/lang_chinese_simplified/lang_bbcode.php
index 83fbc294c1..7bc4046a0e 100644
--- a/phpBB/language/lang_chinese_simplified/lang_bbcode.php
+++ b/phpBB/language/lang_chinese_simplified/lang_bbcode.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                         lang_bbcode.php [english]
+ *                         lang_bbcode.php [chinese simplified]
  *                            -------------------
  *   begin                : Wednesday Oct 3, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -21,29 +21,14 @@
  ***************************************************************************/
 
 //
-// Chinese GB Simplified Translation by inker
-// http://www.byink.com    
-// last modify : 2002/2/26                           
+// Translation by:
+//      inker    :: http://www.byink.com
+//
+//      For questions and comments use: support@byink.com
+//      last modify   : 2002/2/26                      
 //
 
-// 
-// To add an entry to your BBCode guide simply add a line to this file in this format:
-// $faq[] = array("question", "answer");
-// If you want to separate a section enter $faq[] = array("--","Block heading goes here if wanted");
-// Links will be created automatically
-//
-// DO NOT forget the ; at the end of the line.
-// Do NOT put double quotes (") in your BBCode guide entries, if you absolutely must then escape them ie. \"something\"
-//
-// The BBCode guide items will appear on the BBCode guide page in the same order they are listed in this file
-//
-// 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("--","½éÉÜ");
 $faq[] = array("ʲôÊÇ BBCode ´úÂë?", "BBCode ´úÂëÊÇÒ»ÖÖ HTML µÄÌرðÓï·¨, ÄúÊÇ·ñʹÓà BBCode ´úÂëÈ¡¾öÓÚ¹ÜÀíÔ±µÄ¿ª·ÅÓë·ñ, ÁíÍâÄúÒ²¿ÉÒÔÔÚÿ¸öÎÄÕµķ¢±í°æÃæÖÐÈ¡ÏûÕâ¸ö¹¦ÄÜ. BBCode´úÂëµÄÐÍʽÀàËÆHTMLÓï·¨, ¿ÉÒÔʹÓà [ and ] ¶ø²»¿ÉÒÔʹÓà &lt; and &gt;±êÇ©, ËüÌṩÁ˸üºÃµÄ²Ù×÷·½±ãÐԺͿØÖÆÃæ°åµÄ±àÅÅ. Äú¿ÉÒÔÔÚÎÄÕ·¢±íµÄ±í¸ñÉÏ·½·¢ÏÖ BBCode ´úÂëµÄ±ã½Ý°´Å¥ (Ö÷ÅλÖûáÒÀ²»Í¬µÄ²¼¾°Ñùʽ¶øÓÐËù²»Í¬). ÒÔÏ»¹ÓиüÏêϸµÄ½éÉÜ.");
 
diff --git a/phpBB/language/lang_chinese_simplified/lang_faq.php b/phpBB/language/lang_chinese_simplified/lang_faq.php
index 1061a88c20..da2c2f6acb 100644
--- a/phpBB/language/lang_chinese_simplified/lang_faq.php
+++ b/phpBB/language/lang_chinese_simplified/lang_faq.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                          lang_faq.php [english]
+ *                          lang_faq.php [chinese simplified]
  *                            -------------------
  *   begin                : Wednesday Oct 3, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -21,21 +21,11 @@
  ***************************************************************************/
 
 //
-// Chinese GB Simplified Translation by inker
-// http://www.byink.com    
-// last modify : 2002/2/26                           
+// Translation by:
+//      inker    :: http://www.byink.com
 //
- 
-// 
-// To add an entry to your FAQ simply add a line to this file in this format:
-// $faq[] = array("question", "answer");
-// If you want to separate a section enter $faq[] = array("--","Block heading goes here if wanted");
-// Links will be created automatically
-//
-// DO NOT forget the ; at the end of the line.
-// Do NOT put double quotes (") in your FAQ entries, if you absolutely must then escape them ie. \"something\"
-//
-// The FAQ items will appear on the FAQ page in the same order they are listed in this file
+//      For questions and comments use: support@byink.com
+//      last modify   : 2002/2/26                      
 //
  
   
diff --git a/phpBB/language/lang_chinese_simplified/lang_main.php b/phpBB/language/lang_chinese_simplified/lang_main.php
index eb9f3564b5..b52d58563c 100644
--- a/phpBB/language/lang_chinese_simplified/lang_main.php
+++ b/phpBB/language/lang_chinese_simplified/lang_main.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                            lang_main.php [English]
+ *                            lang_main.php [chinese simplified]
  *                              -------------------
  *     begin                : Sat Dec 16 2000
  *     copyright            : (C) 2001 The phpBB Group
@@ -20,22 +20,13 @@
  ***************************************************************************/
 
 //
-// Chinese GB Simplified Translation by inker
-// http://www.byink.com    
-// last modify : 2002/2/26                           
+// Translation by:
+//      inker    :: http://www.byink.com
+//
+//      For questions and comments use: support@byink.com
+//      last modify   : 2002/3/1                      
 //
 
-//
-// The format of this file is:
-//
-// ---> $lang['message'] = "text";
-//
-// You should also try to set a locale and a character
-// encoding (plus direction). The encoding and direction
-// will be sent to the template. The locale may or may
-// not work, it's dependent on OS support and the syntax
-// varies ... give it your best guess!
-//
 
 //setlocale(LC_ALL, "en");
 $lang['ENCODING'] = "gb2312";
@@ -126,6 +117,7 @@ $lang['Board_disable'] = "
 // Global Header strings
 //
 $lang['Registered_users'] = "×¢²á»áÔ±:";
+$lang['Browsing_forum'] = "ÕýÔÚä¯ÀÀÕâ¸ö°æÃæµÄ»áÔ±:";
 $lang['Online_users_zero_total'] = "×ܼÆÓÐ <b>0</b> λÅóÓÑÔÚÏß :: ";
 $lang['Online_users_total'] = "×ܼÆÓÐ <b>%d</b> λÅóÓÑÔÚÏß :: ";
 $lang['Online_user_total'] = "×ܼÆÓÐ <b>%d</b> λÅóÓÑÔÚÏß :: ";
@@ -298,6 +290,7 @@ $lang['Start_watching_topic'] = "
 $lang['No_longer_watching'] = "Äú²»ÔÙ¶©Ôı¾Ö÷Ìâ";
 $lang['You_are_watching'] = "ÄúÒѶ©ÔÄÁ˱¾Ö÷Ìâ";
 
+$lang['Total_votes'] = "ͶƱ¹²¼Æ";
 
 //
 // Posting/Replying (Not private messaging!)
@@ -523,13 +516,13 @@ $lang['Occupation'] = "Ö°Òµ";
 $lang['Poster_rank'] = "Óû§¼¶±ð";
 
 $lang['Total_posts'] = "·¢Ìù×ܼÆ";
-$lang['user_post_pct_stats'] = "%.2f%% of total"; // 1.25% of total
-$lang['user_post_day_stats'] = "ƽ¾ù %.2f ·âÌû×ÓÿÌì"; // 1.5 posts per day
+$lang['User_post_pct_stats'] = "%.2f%% of total"; // 1.25% of total
+$lang['User_post_day_stats'] = "ƽ¾ù %.2f ·âÌû×ÓÿÌì"; // 1.5 posts per day
 $lang['Search_user_posts'] = "²éÕÒ%s·¢±íµÄËùÓÐÌû×Ó"; // Find all posts by username
 
 $lang['No_user_id_specified'] = "¶Ô²»ÆðÕâ¸öÓû§²»´æÔÚ";
 $lang['Wrong_Profile'] = "Äú²»¿ÉÒԱ༭ȥËûÓû§µÄ¸öÈË×ÊÁÏ";
-$lang['Sorry_banned_or_taken_email'] = "¶Ô²»ÆðÄúÌṩµÄµç×ÓÓʼþµØÖ·ÎÞЧ, Ëü¿ÉÄܱ»ÆäËûÓû§×¢²á¹ý»òÕßËü±¾ÉíÎÞЧ,ÇëÌṩÆäËûµÄµç×ÓÓʼþµØÖ·,Èç¹û»¹ÊÇÎÞЧÇëÄúÁªÂçÂÛ̳¹ÜÀíÔ±.";
+
 $lang['Only_one_avatar'] = "ÄúÖ»ÄÜÑ¡ÔñÒ»¸öÍ·Ïñ";
 $lang['File_no_data'] = "ÄúÌṩµÄÁ¬½ÓµØÖ·²»´æÔÚÊý¾Ý";
 $lang['No_connection_URL'] = "ÎÞ·¨Á¬½ÓÄúÌṩµÄÁ¬½ÓµØÖ·";
@@ -557,6 +550,7 @@ $lang['Public_view_email'] = "
 $lang['Current_password'] = "ÏÖÔÚµÄÃÜÂë";
 $lang['New_password'] = "еÄÃÜÂë";
 $lang['Confirm_password'] = "È·ÈÏÐÂÃÜÂë";
+$lang['Confirm_password_explain'] = "µ±ÄúÏ£Íû¸Ä±äÃÜÂë»òÊÇÄúµÄµç×ÓÓʼþµØַʱÄú±ØÐëÈ·ÈÏÏÖÔÚÕýÔÚʹÓõÄÃÜÂë";
 $lang['password_if_changed'] = "Ö»Óе±ÄúÏ£Íû¸ü¸ÄÃÜÂëʱ²ÅÐèÒªÌṩеÄÃÜÂë";
 $lang['password_confirm_if_changed'] = "Ö»Óе±ÄúÏ£Íû¸ü¸ÄÃÜÂëʱ²ÅÐèҪȷÈÏеÄÃÜÂë";
 
@@ -588,7 +582,13 @@ $lang['Profile_updated_inactive'] = "
 
 $lang['Password_mismatch'] = "ÄúÌṩµÄÃÜÂ벻ƥÅä";
 $lang['Current_password_mismatch'] = "ÄúÏÖÔÚʹÓõÄÃÜÂëÓë×¢²áʱÌṩµÄ²»Æ¥Åä";
-$lang['Invalid_username'] = "ÄúÑ¡ÔñµÄÓû§ÃûÒѾ­ÓÐÈËʹÓÃÁË,»òÕßÊÇÄúÑ¡ÔñµÄÓû§Ãû°üº¬ÁËÎÞЧµÄ×Ö·û,Ïñ \" character";
+$lang['Password_long'] = "ÃÜÂë²»ÄܶàÓÚ32¸ö×Ó·û";
+$lang['Username_taken'] = "¶Ô²»ÆðÄúÑ¡ÔñµÄÓû§ÃûÒѾ­ÓÐÈËʹÓÃÁË";
+$lang['Username_invalid'] = "ÄúÑ¡ÔñµÄÓû§Ãû°üº¬ÁËÎÞЧµÄ×Ö·û,Ïñ \"";
+$lang['Username_disallowed'] = "¶Ô²»ÆðÄúÑ¡ÔñµÄÓû§ÃûÒѾ­±»½ûÓÃ";
+$lang['Email_taken'] = "¶Ô²»ÆðÄúÌṩµÄµç×ÓÓʼþµØÖ·ÒѾ­±»Ä³¸öÓû§×¢²áÁË";
+$lang['Email_banned'] = "¶Ô²»ÆðÄúÌṩµÄµç×ÓÓʼþµØÖ·ÒѾ­±»½ûÓÃ";
+$lang['Email_invalid'] = "¶Ô²»ÆðÄúÌṩµÄµç×ÓÓʼþµØÖ·²»ÕýÈ·";
 $lang['Signature_too_long'] = "ÄúµÄ¸öÈËÇ©ÃûÌ«³¤ÁË";
 $lang['Fields_empty'] = "Äú±ØÐëÌîд±ØÐëÌîдµÄÏîÄ¿(*)";
 $lang['Avatar_filetype'] = "Í·ÏñͼƬµÄÀàÐͱØÐëÊÇ .jpg, .gif or .png";
@@ -623,8 +623,8 @@ $lang['Password_activated'] = "
 
 $lang['Send_email_msg'] = "·¢ËÍÒ»·âµç×ÓÓʼþ";
 $lang['No_user_specified'] = "ûÓÐÑ¡ÔñÓû§";
-$lang['user_prevent_email'] = "ÕâÃûÓû§²»Ï£ÍûÊÕµ½µç×ÓÓʼþ,Äú¿ÉÒÔ·¢ËÍÕ¾ÄÚÐżþ¸øÕâÃûÓû§";
-$lang['user_not_exist'] = "Óл§²»´æÔÚ";
+$lang['User_prevent_email'] = "ÕâÃûÓû§²»Ï£ÍûÊÕµ½µç×ÓÓʼþ,Äú¿ÉÒÔ·¢ËÍÕ¾ÄÚÐżþ¸øÕâÃûÓû§";
+$lang['User_not_exist'] = "Óл§²»´æÔÚ";
 $lang['CC_email'] = "¸´ÖÆÕâ·âµç×ÓÓʼþ·¢Ë͸ø×Ô¼º";
 $lang['Email_message_desc'] = "Õâ·âÓʼþ½«±»ÒÔ´¿Îı¾¸ñʽ·¢ËÍ,Çë²»Òª°üº¬ÈκΠHTML »òÕß BBCode.ÕâƪÓʼþµÄ»Ø¸´µØÖ·½«Ö¸ÏòÄúµÄµç×ÓÓʼþµØÖ·.";
 $lang['Flood_email_limit'] = "Äú²»ÄÜÏÖÔÚ·¢ËÍÆäËûµÄµç×ÓÓʼþ,Çë¹ýÒ»»áÔÙÊÔ.";
@@ -688,11 +688,11 @@ $lang['Group_request'] = "
 $lang['Group_approved'] = "ÄúµÄÉêÇëÒѾ­±»Åú×¼ÁË";
 $lang['Group_added'] = "ÄúÒѾ­±»¼ÓÈëÕâ¸öÍŶÓ"; 
 $lang['Already_member_group'] = "ÄúÒѾ­ÊÇÕâ¸öÍŶӵijÉÔ±";
-$lang['user_is_member_group'] = "Óû§ÒѾ­ÊÇÕâ¸öÍŶӵijÉÔ±";
+$lang['User_is_member_group'] = "Óû§ÒѾ­ÊÇÕâ¸öÍŶӵijÉÔ±";
 $lang['Group_type_updated'] = "³É¹¦¸üÐÂÍŶÓÀàÐÍ";
 
 $lang['Could_not_add_user'] = "ÄúÑ¡ÔñµÄÓû§²»´æÔÚ";
-$lang['Could_not_anon_user'] = "Äú²»Äܽ¨Á¢ÄÄúûµÄÍŶӳÉÔ±";
+$lang['Could_not_anon_user'] = "Äú²»Äܽ«ÄäÃûÓοÍÁÐΪÍŶӳÉÔ±";
 
 $lang['Confirm_unsub'] = "ÄúÈ·¶¨Òª´ÓÕâ¸öÍŶӽâ³ýÉêÇëÂð?";
 $lang['Confirm_unsub_pending'] = "ÄúµÄÍŶÓÉêÇ뻹ûÓб»Åú×¼,ÄúÈ·¶¨Òª½â³ýÉêÇëÂð?";
@@ -771,9 +771,9 @@ $lang['Sorry_auth_delete'] = "
 $lang['Sorry_auth_vote'] = "¶Ô²»ÆðÖ»ÓÐ %s ¿ÉÒÔÔÚÕâ¸öÂÛ̳·¢±íͶƱ"; 
 
 // These replace the %s in the above strings
-$lang['Auth_Anonymous_users'] = "<b>ÄÄúûÓû§</b>";
-$lang['Auth_Registered_users'] = "<b>×¢²áÓû§</b>";
-$lang['Auth_users_granted_access'] = "<b>ÌØȨÓû§</b>";
+$lang['Auth_Anonymous_Users'] = "<b>ÄäÃûÓοÍ</b>";
+$lang['Auth_Registered_Users'] = "<b>×¢²áÓû§</b>";
+$lang['Auth_Users_granted_access'] = "<b>ÌØȨÓû§</b>";
 $lang['Auth_Moderators'] = "<b>°ßÖñ</b>";
 $lang['Auth_Administrators'] = "<b>¹ÜÀíÔ±</b>";
 
@@ -854,7 +854,7 @@ $lang['New_forum'] = "
 
 $lang['This_posts_IP'] = "Õâ¸öÌû×ÓµÄIPµØÖ·";
 $lang['Other_IP_this_user'] = "Õâ¸ö×÷ÕßµÄÆäËûµÄµØÖ·";
-$lang['users_this_IP'] = "À´´ÓÕâ¸öIPµÄÓû§";
+$lang['Users_this_IP'] = "À´´ÓÕâ¸öIPµÄÓû§";
 $lang['IP_info'] = "IPµØÖ·ÐÅÏ¢";
 $lang['Lookup_IP'] = "ËÑË÷IPµØÖ·";
 
@@ -911,7 +911,7 @@ $lang['tz']['-2'] = "(GMT -2:00 hours) 
 $lang['tz']['-1'] = "(GMT -1:00 hours) ÑÇËÙ¶ûȺµº, άµÂ½Çµº";
 $lang['tz']['0'] = "(GMT) ¿¨Èø²¼À¼¿¨, ¶¼°ØÁÖ, °®¶¡±¤, Â׶Ø, Àï˹±¾, ÃÉÂÞάÑÇ";
 $lang['tz']['1'] = "(GMT +1:00 hours) °¢Ä·Ë¹Ìص¤, °ØÁÖ, ²¼Â³Èû¶û, ¸ç±¾¹þ¸ù, ÂíµÂÀï, °ÍÀè, ÂÞÂí";
-$lang['tz']['2'] = "(GMT +2:00 hours) ¿ªÂÞ, ºÕ¶ûÐÁ»ù, ¼ÓÀïÄþ¸ñÀÕ, ÄÏ·Ç, »ªÉ³";
+$lang['tz']['2'] = "(GMT +2:00 hours) ¿ªÂÞ, ºÕ¶ûÐÁ»ù, ¼ÓÀïÄþ¸ñÀÕ, ÄÏ·Ç";
 $lang['tz']['3'] = "(GMT +3:00 hours) °Í¸ñ´ï, ÀûÑŵÂ, Ī˹¿Æ, ÄÚÂÞ±Ï";
 $lang['tz']['3.5'] = "(GMT +3:30 hours) µÂºÚÀ¼";
 $lang['tz']['4'] = "(GMT +4:00 hours) °¢²¼Ôú±È, °Í¿â, Âí˹¿¦ÌØ, µÚ±ÈÀû˹";
@@ -980,7 +980,7 @@ $lang['Critical_Information'] = "
 $lang['General_Error'] = "ÆÕͨ´íÎó";
 $lang['Critical_Error'] = "¹Ø¼ü´íÎó";
 $lang['An_error_occured'] = "·¢ÉúÁËÒ»¸ö´íÎó";
-$lang['A_critical_error'] = "·¢ÉúÁËÒ»¸ö¹Ø¼ü´íÎó";
+$lang['A_critical_error'] = "·¢ÉúÁËÒ»¸ö¹Ø¼üÐÔ´íÎó";
 
 //
 // That's all Folks!
diff --git a/phpBB/language/lang_polish/lang_admin.php b/phpBB/language/lang_polish/lang_admin.php
index 815ed527fd..daea5d97e1 100644
--- a/phpBB/language/lang_polish/lang_admin.php
+++ b/phpBB/language/lang_polish/lang_admin.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************************
  *                            lang_admin.php [Polish]
  *                              -------------------
@@ -24,7 +25,10 @@
 // http://www.phpbb.pl/
 //
 
-
+//
+// Modules, this replaces the keys used
+// in the modules[][] arrays in each module file
+//
 $lang['General'] = "Ogólne";
 $lang['Users'] = "U¿ytkownicy";
 $lang['Groups'] = "Grupy";
@@ -234,6 +238,12 @@ $lang['Config_explain'] = "Poni
 $lang['Click_return_config'] = "Kliknij %sTutaj%s aby powróciæ do Ustawieñ G³ównych";
 
 $lang['General_settings'] = "Generalne Ustawienia Forum";
+$lang['Server_name'] = "Nazwa Domeny";
+$lang['Server_name_explain'] = "Nazwa domeny, z której dzia³a to forum";
+$lang['Script_path'] = "¦cie¿ka skryptu";
+$lang['Script_path_explain'] = "¦cie¿ka pod któr± znajduje siê phpBB2 relatywnie do nazwy domeny";
+$lang['Server_port'] = "Port Serwera";
+$lang['Server_port_explain'] = "Port na którym dzia³a twój serwer, zwykle 80, zmieñ tylko je¶li jest inny";
 $lang['Site_name'] = "Nazwa Strony";
 $lang['Site_desc'] = "Opis Strony";
 $lang['Board_disable'] = "Wy³±cz forum";
@@ -298,6 +308,10 @@ $lang['Email_sig_explain'] = "Ten tekst b
 $lang['Use_SMTP'] = "U¿ywaj Serwera SMTP";
 $lang['Use_SMTP_explain'] = "Powiedz tak, je¶li chcesz aby wiadomo¶ci email by³y przesy³ane przez odpowiedni serwer zamiast lokalnej funkcji mail";
 $lang['SMTP_server'] = "Adres Serwera SMTP";
+$lang['SMTP_username'] = "Nazwa U¿ytkownika SMTP";
+$lang['SMTP_username_explain'] = "Wpisz nazwê tylko je¶li twój serwer smtp wymaga tego";
+$lang['SMTP_password'] = "Has³o SMTP";
+$lang['SMTP_password_explain'] = "Wpisz has³o tylko je¶li twój serwer smtp wymaga tego";
 
 $lang['Disable_privmsg'] = "Prywatne Wiadomo¶ci";
 $lang['Inbox_limits'] = "Maks. wiadomo¶ci w Skrzynce";
@@ -306,12 +320,12 @@ $lang['Savebox_limits'] = "Maks. wiadomo
 
 $lang['Cookie_settings'] = "Ustawienia Cookies"; 
 $lang['Cookie_settings_explain'] = "Kontroluj± w jaki sposób zdefiniowane zostanie cookie wys³ane do przegl±darki. W wiêkszo¶ci przypadków powinny wystarczyæ warto¶ci domy¶lne. Je¶li zechcesz je zmieniæ rób to ostro¿nie, nieprawid³owe ustawienia mog± uniemo¿liwiæ logowanie.";
-$lang['Cookie_name'] = "Nazwa Cookie";
 $lang['Cookie_domain'] = "Domena Cookie";
+$lang['Cookie_name'] = "Nazwa Cookie";
 $lang['Cookie_path'] = "¦cie¿ka Cookie";
-$lang['Session_length'] = "D³ugo¶æ Sesji [ sekundy ]";
 $lang['Cookie_secure'] = "Bezpieczne Cookie [ https ]";
-
+$lang['Cookie_secure_explain'] = "Je¶li twój serwer dzia³a na SSL ustaw to na w³±czone, inaczej pozostaw wy³±czone";
+$lang['Session_length'] = "D³ugo¶æ Sesji [ sekundy ]";
 
 //
 // Forum Management
@@ -696,7 +710,7 @@ $lang['Install_Method'] = "Wybierz metod
 
 $lang['Install_No_Ext'] = "Konfiguracja php na serwerze nie obs³uguje wybranej bazy danych";
 
-$lang['Install_No_PCRE'] = "phpBB2 wymaga kompatybilnego z Perlem Modu³u Wyra¿eñ Regularnych, którego twoja konfiguracja php najwyraŸniej nie obs³uguje!";
+$lang['Install_No_PCRE'] = "phpBB2 wymaga kompatybilnego z Perlem Modu³u Wyra¿eñ Regularnych, którego twoja konfiguracja php najwyra¼niej nie obs³uguje!";
 
 //
 // That's all Folks!
diff --git a/phpBB/language/lang_polish/lang_bbcode.php b/phpBB/language/lang_polish/lang_bbcode.php
index 627324a2fd..e9357e4840 100644
--- a/phpBB/language/lang_polish/lang_bbcode.php
+++ b/phpBB/language/lang_polish/lang_bbcode.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                         lang_bbcode.php [polish]
+ *                         lang_bbcode.php [Polish]
  *                            -------------------
  *   begin                : Wednesday Oct 3, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -11,13 +11,6 @@
  *
  ***************************************************************************/
 
-/***************************************************************************
- *
- *   Translation by: Mike Paluchowski, Radek Kmiecicki
- *   See website: www.phpbb.pl
- *
- ***************************************************************************/
-
 /***************************************************************************
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -26,6 +19,11 @@
  *   (at your option) any later version.
  *
  ***************************************************************************/
+
+//
+// Translation by Mike Paluchowski and Radek Kmiecicki
+// http://www.phpbb.pl/
+//
  
   
 $faq[] = array("--","Wprowadzenie");
diff --git a/phpBB/language/lang_polish/lang_faq.php b/phpBB/language/lang_polish/lang_faq.php
index 35feb32836..23c6713e55 100644
--- a/phpBB/language/lang_polish/lang_faq.php
+++ b/phpBB/language/lang_polish/lang_faq.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *                          lang_faq.php [polish]
+ *                          lang_faq.php [Polish]
  *                            -------------------
  *   begin                : Wednesday Oct 3, 2001
  *   copyright            : (C) 2001 The phpBB Group
@@ -11,13 +11,6 @@
  *
  ***************************************************************************/
 
-/***************************************************************************
- *
- *   Translation by: Mike Paluchowski, Radek Kmiecicki
- *   See website: www.phpbb.pl
- *
- ***************************************************************************/
-
 /***************************************************************************
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -26,7 +19,11 @@
  *   (at your option) any later version.
  *
  ***************************************************************************/
- 
+
+//
+// Translation by Mike Paluchowski and Radek Kmiecicki
+// http://www.phpbb.pl/
+// 
   
 $faq[] = array("--","Problemy Logowania i Rejestracji");
 $faq[] = array("Dlaczego nie mogê siê zalogowaæ?", "A zarejestrowa³e¶ siê? Naprawdê musisz siê zarejestrowaæ aby móc siê logowaæ. A mo¿e zosta³e¶ wyrzucony z forum (je¶li tak siê sta³o zobaczysz odpowiedni± informacjê)? W takim wypadku skontaktuj siê z webmasterem lub administratorem forum aby poznaæ powód tego. Je¿eli zarejestrowa³e¶ siê, nie zosta³e¶ wyrzucony a i tak nie mo¿esz siê logowaæ sprawd¼ ponownie swój login i has³o. Zazwyczaj to w³a¶nie b³êdny login lub has³o s± problemem, ale je¶li tak nie jest skontaktuj siê z administratorem forum, gdy¿ problem mo¿e le¿eæ po stronie b³êdnej konfiguracji skryptu.");
diff --git a/phpBB/language/lang_polish/lang_main.php b/phpBB/language/lang_polish/lang_main.php
index d121c0d9bc..939385383c 100644
--- a/phpBB/language/lang_polish/lang_main.php
+++ b/phpBB/language/lang_polish/lang_main.php
@@ -287,6 +287,7 @@ $lang['Start_watching_topic'] = "
 $lang['No_longer_watching'] = "Przesta³e¶ ¶ledziæ ten temat";
 $lang['You_are_watching'] = "Rozpocz±³e¶ ¶ledzenie tego tematu";
 
+$lang['Total_votes'] = "Wszystkich G³osów";
 
 //
 // Posting/Replying (Not private messaging!)