diff --git a/ChangeLog b/ChangeLog
index 4ce3f57d6..3834becb0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-02-17 Michal Cihar  <nijel@users.sourceforge.net>
+    * lang/czech: Updated.
+    * lang/english: Resorted.
+
 2003-02-25 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/common.lib.php3, libraries/config_import.lib.php3:
       - Backwards compatibility;
diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3
index d6c600406..96735015c 100644
--- a/lang/english-iso-8859-1.inc.php3
+++ b/lang/english-iso-8859-1.inc.php3
@@ -80,6 +80,12 @@ $strCantUseRecodeIconv = 'Can not use iconv nor libiconv nor recode_string funct
 $strCardinality = 'Cardinality';
 $strCarriage = 'Carriage return: \\r';
 $strChange = 'Change';
+$strChangeCopyMode = 'Create a new user with the same privileges and ...';  
+$strChangeCopyModeCopy = '... keep the old one.';  
+$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';  
+$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';  
+$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';  
+$strChangeCopyUser = 'Change Login Information / Copy User';  
 $strChangeDisplay = 'Choose Field to display';
 $strChangePassword = 'Change password';
 $strCharsetOfFile = 'Character set of the file:';
@@ -114,6 +120,7 @@ $strCreatePage = 'Create a new Page';
 $strCreatePdfFeat = 'Creation of PDFs';
 $strCriteria = 'Criteria';
 
+$strDBComment = 'Database comment: ';
 $strDBGContext = 'Context';
 $strDBGContextID = 'Context ID';
 $strDBGHits = 'Hits';
@@ -132,10 +139,11 @@ $strDatabaseWildcard = 'Database (wildcards allowed):';
 $strDatabases = 'Databases';
 $strDatabasesDropped = '%s databases have been dropped successfully.';
 $strDatabasesStats = 'Databases statistics';
-$strDatabasesStatsHeavyTraffic = 'Note: Enabling the Database statistics here might cause heavy traffic between the webserver and the MySQL one.';
 $strDatabasesStatsDisable = 'Disable Statistics';
 $strDatabasesStatsEnable = 'Enable Statistics';
+$strDatabasesStatsHeavyTraffic = 'Note: Enabling the Database statistics here might cause heavy traffic between the webserver and the MySQL one.';
 $strDbPrivileges = 'Database-specific privileges';
+$strDbSpecific = 'database-specific';  
 $strDefault = 'Default';
 $strDefaultValueHelp = 'For default values, please enter just a single value, without backslash escaping or quotes, using this format: a';
 $strDelete = 'Delete';
@@ -160,6 +168,7 @@ $strDropDB = 'Drop database %s';
 $strDropSelectedDatabases = 'Drop Selected Databases';
 $strDropTable = 'Drop table';
 $strDropUsersDb = 'Drop the databases that have the same names as the users.';
+$strDumpComments = 'Include column comments as inline SQL-comments';
 $strDumpXRows = 'Dump %s row(s) starting at record # %s.';
 $strDumpingData = 'Dumping data for table';
 $strDynamic = 'dynamic';
@@ -202,6 +211,7 @@ $strFunction = 'Function';
 $strGenBy = 'Generated by';
 $strGenTime = 'Generation Time';
 $strGeneralRelationFeat = 'General relation features';
+$strGlobal = 'global';  
 $strGlobalPrivileges = 'Global privileges';
 $strGlobalValue = 'Global value';
 $strGo = 'Go';
@@ -267,6 +277,17 @@ $strLogin = 'Login';
 $strLoginInformation = 'Login Information';
 $strLogout = 'Log out';
 
+$strMIME_MIMEtype = 'MIME-type';
+$strMIME_available_mime = 'Available MIME-types';
+$strMIME_available_transform = 'Available transformations';
+$strMIME_description = 'Description';
+$strMIME_file = 'Filename';
+$strMIME_nodescription = 'No Description is available for this transformation.<br />Please ask the author, what %s does.';
+$strMIME_transformation = 'Browser transformation';
+$strMIME_transformation_note = 'For a list of available transformation options and their MIME-type transformations, click on %stransformation descriptions%s';
+$strMIME_transformation_options = 'Transformation options';
+$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';
+$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';
 $strMissingBracket = 'Missing Bracket';
 $strModifications = 'Modifications have been saved';
 $strModify = 'Modify';
@@ -387,8 +408,13 @@ $strPutColNames = 'Put fields names at first row';
 $strQBE = 'Query';
 $strQBEDel = 'Del';
 $strQBEIns = 'Ins';
+$strQueryFrame = 'Query window';
+$strQueryFrameDebug = 'Debugging information';
+$strQueryFrameDebugBox = 'Active variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nCurrent variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nOpener location: %s\nFrameset location: %s.';
 $strQueryOnDb = 'SQL-query on database <b>%s</b>:';
+$strQuerySQLHistory = 'SQL-history';
 $strQueryStatistics = '<b>Query statistics</b>: Since its startup, %s queries have been sent to the server.';
+$strQueryTime = 'Query took %01.4f sec';
 $strQueryType = 'Query type';
 
 $strReType = 'Re-type';
@@ -421,6 +447,7 @@ $strRowLength = 'Row length';
 $strRowSize = ' Row size ';
 $strRows = 'Rows';
 $strRowsFrom = 'row(s) starting from record #';
+$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';
 $strRowsModeHorizontal = 'horizontal';
 $strRowsModeOptions = 'in %s mode and repeat headers after %s cells';
 $strRowsModeVertical = 'vertical';
@@ -520,6 +547,11 @@ $strTime = 'Time';
 $strTotal = 'total';
 $strTotalUC = 'Total';
 $strTraffic = 'Traffic';
+$strTransformation_image_jpeg__inline = 'Displays an image directly in the table (uses wrapper, direct blob download, i.e.).';
+$strTransformation_image_jpeg__link = 'Displays a link to this image (direct blob download, i.e.).';
+$strTransformation_image_jpeg__plain = 'Takes an imagefile and outputs a link for it. First options argument is a possible prepended string like http://...';
+$strTransformation_text_plain__formatted = 'Preserves original formatting of the field. No Escaping is done.';
+$strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entities. No HTML formatting is shown.';
 $strType = 'Type';
 
 $strUncheckAll = 'Uncheck All';
@@ -541,6 +573,7 @@ $strUserNotFound = 'The selected user was not found in the privilege table.';
 $strUserOverview = 'User overview';
 $strUsers = 'Users';
 $strUsersDeleted = 'The selected users have been deleted successfully.';
+$strUsersHavingAccessToDb = 'Users having access to &quot;%s&quot;';  
 
 $strValidateSQL = 'Validate SQL';
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.';
@@ -552,6 +585,7 @@ $strViewDumpDB = 'View dump (schema) of database';
 $strWebServerUploadDirectory = 'web-server upload directory';
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';
 $strWelcome = 'Welcome to %s';
+$strWildcard = 'wildcard';  
 $strWithChecked = 'With selected:';
 $strWritingCommentNotPossible = 'Writing of comment not possible';
 $strWritingRelationNotPossible = 'Writing of relation not possible';
@@ -562,38 +596,4 @@ $strYes = 'Yes';
 $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.';
 $strZip = '"zipped"';
 
-$strGlobal = 'global';  //to translate
-$strDbSpecific = 'database-specific';  //to translate
-$strUsersHavingAccessToDb = 'Users having access to &quot;%s&quot;';  //to translate
-$strChangeCopyUser = 'Change Login Information / Copy User';  //to translate
-$strChangeCopyMode = 'Create a new user with the same privileges and ...';  //to translate
-$strChangeCopyModeCopy = '... keep the old one.';  //to translate
-$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';  //to translate
-$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';  //to translate
-$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';  //to translate
-$strWildcard = 'wildcard';  //to translate
-$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';//to translate
-$strQueryTime = 'Query took %01.4f sec';//to translate
-$strDumpComments = 'Include column comments as inline SQL-comments';//to translate
-$strDBComment = 'Database comment: ';//to translate
-$strQueryFrame = 'Query window';//to translate
-$strQueryFrameDebug = 'Debugging information';//to translate
-$strQueryFrameDebugBox = 'Active variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nCurrent variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nOpener location: %s\nFrameset location: %s.';//to translate
-$strQuerySQLHistory = 'SQL-history';//to translate
-$strMIME_MIMEtype = 'MIME-type';//to translate
-$strMIME_transformation = 'Browser transformation';//to translate
-$strMIME_transformation_options = 'Transformation options';//to translate
-$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';//to translate
-$strMIME_transformation_note = 'For a list of available transformation options and their MIME-type transformations, click on %stransformation descriptions%s';//to translate
-$strMIME_available_mime = 'Available MIME-types';//to translate
-$strMIME_available_transform = 'Available transformations';//to translate
-$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';//to translate
-$strMIME_description = 'Description';//to translate
-$strMIME_nodescription = 'No Description is available for this transformation.<br />Please ask the author, what %s does.';//to translate
-$strMIME_file = 'Filename';//to translate
-$strTransformation_image_jpeg__plain = 'Takes an imagefile and outputs a link for it. First options argument is a possible prepended string like http://...';//to translate
-$strTransformation_text_plain__formatted = 'Preserves original formatting of the field. No Escaping is done.';//to translate
-$strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entities. No HTML formatting is shown.';//to translate
-$strTransformation_image_jpeg__link = 'Displays a link to this image (direct blob download, i.e.).';//to translate
-$strTransformation_image_jpeg__inline = 'Displays an image directly in the table (uses wrapper, direct blob download, i.e.).';//to translate
 ?>
diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3
index 83943a97e..f2c04894e 100644
--- a/lang/english-utf-8.inc.php3
+++ b/lang/english-utf-8.inc.php3
@@ -81,6 +81,12 @@ $strCantUseRecodeIconv = 'Can not use iconv nor libiconv nor recode_string funct
 $strCardinality = 'Cardinality';
 $strCarriage = 'Carriage return: \\r';
 $strChange = 'Change';
+$strChangeCopyMode = 'Create a new user with the same privileges and ...';  
+$strChangeCopyModeCopy = '... keep the old one.';  
+$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';  
+$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';  
+$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';  
+$strChangeCopyUser = 'Change Login Information / Copy User';  
 $strChangeDisplay = 'Choose Field to display';
 $strChangePassword = 'Change password';
 $strCharsetOfFile = 'Character set of the file:';
@@ -115,6 +121,7 @@ $strCreatePage = 'Create a new Page';
 $strCreatePdfFeat = 'Creation of PDFs';
 $strCriteria = 'Criteria';
 
+$strDBComment = 'Database comment: ';
 $strDBGContext = 'Context';
 $strDBGContextID = 'Context ID';
 $strDBGHits = 'Hits';
@@ -133,10 +140,11 @@ $strDatabaseWildcard = 'Database (wildcards allowed):';
 $strDatabases = 'Databases';
 $strDatabasesDropped = '%s databases have been dropped successfully.';
 $strDatabasesStats = 'Databases statistics';
-$strDatabasesStatsHeavyTraffic = 'Note: Enabling the Database statistics here might cause heavy traffic between the webserver and the MySQL one.';
 $strDatabasesStatsDisable = 'Disable Statistics';
 $strDatabasesStatsEnable = 'Enable Statistics';
+$strDatabasesStatsHeavyTraffic = 'Note: Enabling the Database statistics here might cause heavy traffic between the webserver and the MySQL one.';
 $strDbPrivileges = 'Database-specific privileges';
+$strDbSpecific = 'database-specific';  
 $strDefault = 'Default';
 $strDefaultValueHelp = 'For default values, please enter just a single value, without backslash escaping or quotes, using this format: a';
 $strDelete = 'Delete';
@@ -161,6 +169,7 @@ $strDropDB = 'Drop database %s';
 $strDropSelectedDatabases = 'Drop Selected Databases';
 $strDropTable = 'Drop table';
 $strDropUsersDb = 'Drop the databases that have the same names as the users.';
+$strDumpComments = 'Include column comments as inline SQL-comments';
 $strDumpXRows = 'Dump %s row(s) starting at record # %s.';
 $strDumpingData = 'Dumping data for table';
 $strDynamic = 'dynamic';
@@ -203,6 +212,7 @@ $strFunction = 'Function';
 $strGenBy = 'Generated by';
 $strGenTime = 'Generation Time';
 $strGeneralRelationFeat = 'General relation features';
+$strGlobal = 'global';  
 $strGlobalPrivileges = 'Global privileges';
 $strGlobalValue = 'Global value';
 $strGo = 'Go';
@@ -268,6 +278,17 @@ $strLogin = 'Login';
 $strLoginInformation = 'Login Information';
 $strLogout = 'Log out';
 
+$strMIME_MIMEtype = 'MIME-type';
+$strMIME_available_mime = 'Available MIME-types';
+$strMIME_available_transform = 'Available transformations';
+$strMIME_description = 'Description';
+$strMIME_file = 'Filename';
+$strMIME_nodescription = 'No Description is available for this transformation.<br />Please ask the author, what %s does.';
+$strMIME_transformation = 'Browser transformation';
+$strMIME_transformation_note = 'For a list of available transformation options and their MIME-type transformations, click on %stransformation descriptions%s';
+$strMIME_transformation_options = 'Transformation options';
+$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';
+$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';
 $strMissingBracket = 'Missing Bracket';
 $strModifications = 'Modifications have been saved';
 $strModify = 'Modify';
@@ -388,8 +409,13 @@ $strPutColNames = 'Put fields names at first row';
 $strQBE = 'Query';
 $strQBEDel = 'Del';
 $strQBEIns = 'Ins';
+$strQueryFrame = 'Query window';
+$strQueryFrameDebug = 'Debugging information';
+$strQueryFrameDebugBox = 'Active variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nCurrent variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nOpener location: %s\nFrameset location: %s.';
 $strQueryOnDb = 'SQL-query on database <b>%s</b>:';
+$strQuerySQLHistory = 'SQL-history';
 $strQueryStatistics = '<b>Query statistics</b>: Since its startup, %s queries have been sent to the server.';
+$strQueryTime = 'Query took %01.4f sec';
 $strQueryType = 'Query type';
 
 $strReType = 'Re-type';
@@ -422,6 +448,7 @@ $strRowLength = 'Row length';
 $strRowSize = ' Row size ';
 $strRows = 'Rows';
 $strRowsFrom = 'row(s) starting from record #';
+$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';
 $strRowsModeHorizontal = 'horizontal';
 $strRowsModeOptions = 'in %s mode and repeat headers after %s cells';
 $strRowsModeVertical = 'vertical';
@@ -521,6 +548,11 @@ $strTime = 'Time';
 $strTotal = 'total';
 $strTotalUC = 'Total';
 $strTraffic = 'Traffic';
+$strTransformation_image_jpeg__inline = 'Displays an image directly in the table (uses wrapper, direct blob download, i.e.).';
+$strTransformation_image_jpeg__link = 'Displays a link to this image (direct blob download, i.e.).';
+$strTransformation_image_jpeg__plain = 'Takes an imagefile and outputs a link for it. First options argument is a possible prepended string like http://...';
+$strTransformation_text_plain__formatted = 'Preserves original formatting of the field. No Escaping is done.';
+$strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entities. No HTML formatting is shown.';
 $strType = 'Type';
 
 $strUncheckAll = 'Uncheck All';
@@ -542,6 +574,7 @@ $strUserNotFound = 'The selected user was not found in the privilege table.';
 $strUserOverview = 'User overview';
 $strUsers = 'Users';
 $strUsersDeleted = 'The selected users have been deleted successfully.';
+$strUsersHavingAccessToDb = 'Users having access to &quot;%s&quot;';  
 
 $strValidateSQL = 'Validate SQL';
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.';
@@ -553,6 +586,7 @@ $strViewDumpDB = 'View dump (schema) of database';
 $strWebServerUploadDirectory = 'web-server upload directory';
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';
 $strWelcome = 'Welcome to %s';
+$strWildcard = 'wildcard';  
 $strWithChecked = 'With selected:';
 $strWritingCommentNotPossible = 'Writing of comment not possible';
 $strWritingRelationNotPossible = 'Writing of relation not possible';
@@ -563,38 +597,4 @@ $strYes = 'Yes';
 $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.';
 $strZip = '"zipped"';
 
-$strGlobal = 'global';  //to translate
-$strDbSpecific = 'database-specific';  //to translate
-$strUsersHavingAccessToDb = 'Users having access to &quot;%s&quot;';  //to translate
-$strChangeCopyUser = 'Change Login Information / Copy User';  //to translate
-$strChangeCopyMode = 'Create a new user with the same privileges and ...';  //to translate
-$strChangeCopyModeCopy = '... keep the old one.';  //to translate
-$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';  //to translate
-$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';  //to translate
-$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';  //to translate
-$strWildcard = 'wildcard';  //to translate
-$strRowsModeFlippedHorizontal = 'horizontal (rotated headers)';//to translate
-$strQueryTime = 'Query took %01.4f sec';//to translate
-$strDumpComments = 'Include column comments as inline SQL-comments';//to translate
-$strDBComment = 'Database comment: ';//to translate
-$strQueryFrame = 'Query window';//to translate
-$strQueryFrameDebug = 'Debugging information';//to translate
-$strQueryFrameDebugBox = 'Active variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nCurrent variables for the query form:\nDB: %s\nTable: %s\nServer: %s\n\nOpener location: %s\nFrameset location: %s.';//to translate
-$strQuerySQLHistory = 'SQL-history';//to translate
-$strMIME_MIMEtype = 'MIME-type';//to translate
-$strMIME_transformation = 'Browser transformation';//to translate
-$strMIME_transformation_options = 'Transformation options';//to translate
-$strMIME_transformation_options_note = 'Please enter the values for transformation options using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';//to translate
-$strMIME_transformation_note = 'For a list of available transformation options and their MIME-type transformations, click on %stransformation descriptions%s';//to translate
-$strMIME_available_mime = 'Available MIME-types';//to translate
-$strMIME_available_transform = 'Available transformations';//to translate
-$strMIME_without = 'MIME-types printed in italics do not have a seperate transformation function';//to translate
-$strMIME_description = 'Description';//to translate
-$strMIME_nodescription = 'No Description is available for this transformation.<br />Please ask the author, what %s does.';//to translate
-$strMIME_file = 'Filename';//to translate
-$strTransformation_image_jpeg__plain = 'Takes an imagefile and outputs a link for it. First options argument is a possible prepended string like http://...';//to translate
-$strTransformation_text_plain__formatted = 'Preserves original formatting of the field. No Escaping is done.';//to translate
-$strTransformation_text_plain__unformatted = 'Displays HTML code as HTML entities. No HTML formatting is shown.';//to translate
-$strTransformation_image_jpeg__link = 'Displays a link to this image (direct blob download, i.e.).';//to translate
-$strTransformation_image_jpeg__inline = 'Displays an image directly in the table (uses wrapper, direct blob download, i.e.).';//to translate
 ?>