From 1f1912d49f6d6889ea5fccfeacdc9dce53e50659 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Sun, 8 Dec 2002 21:26:45 +0000 Subject: [PATCH] (en) Reordered strings --- ChangeLog | 1 + lang/english-iso-8859-1.inc.php3 | 58 +++++++++++++++----------------- lang/english-utf-8.inc.php3 | 58 +++++++++++++++----------------- 3 files changed, 57 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index 285971a26..408b3a5ba 100755 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ $Source$ Started working on a new interface to server related pages. * lang/thai-*.inc.php3: Updates, thanks to Arthit Suriyawongkul (bacteria). * lang/german-*.inc.php3: Updates. + * lang/english-*.inc.php3: Reordered strings. 2002-12-07 Marc Delisle * db_search.php3, libraries/display_tbl.lib.php3, libraries/common.lib.php3 diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3 index 256bc8b01..b8bec4ee4 100644 --- a/lang/english-iso-8859-1.inc.php3 +++ b/lang/english-iso-8859-1.inc.php3 @@ -15,8 +15,9 @@ $month = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'O // See http://www.php.net/manual/en/function.strftime.php to define the // variable below $datefmt = '%B %d, %Y at %I:%M %p'; +$timespanfmt = '%s days, %s hours, %s minutes and %s seconds'; -$strAPrimaryKey = 'A primary key has been added on %s'; +$strAbortedClients = 'Aborted'; $strAccessDenied = 'Access denied'; $strAction = 'Action'; $strAddDeleteColumn = 'Add/Delete Field Columns'; @@ -44,6 +45,7 @@ $strAnyDatabase = 'Any database'; $strAnyHost = 'Any host'; $strAnyTable = 'Any table'; $strAnyUser = 'Any user'; +$strAPrimaryKey = 'A primary key has been added on %s'; $strAscending = 'Ascending'; $strAtBeginningOfTable = 'At Beginning of Table'; $strAtEndOfTable = 'At End of Table'; @@ -86,6 +88,7 @@ $strCompression = 'Compression'; $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; $strConfigureTableCoord = 'Please configure the coordinates for table %s'; $strConfirm = 'Do you really want to do it?'; +$strConnections = 'Connections'; $strCookiesRequired = 'Cookies must be enabled past this point.'; $strCopyTable = 'Copy table to (database.table):'; $strCopyTableOK = 'Table %s has been copied to %s.'; @@ -146,6 +149,7 @@ $strExportToXML = 'Export to XML format'; $strExtendedInserts = 'Extended inserts'; $strExtra = 'Extra'; +$strFailedAttempts = 'Failed attempts'; $strField = 'Field'; $strFieldHasBeenDropped = 'Field %s has been dropped'; $strFields = 'Fields'; @@ -163,6 +167,7 @@ $strFunction = 'Function'; $strGenBy = 'Generated by'; $strGenTime = 'Generation Time'; $strGeneralRelationFeat = 'General relation features'; +$strGlobalValue = 'Global value'; $strGo = 'Go'; $strGrants = 'Grants'; $strGzip = '"gzipped"'; @@ -199,6 +204,7 @@ $strKeepPass = 'Do not change the password'; $strKeyname = 'Keyname'; $strKill = 'Kill'; +$strLandscape = 'Landscape'; $strLength = 'Length'; $strLengthSet = 'Length/Values*'; $strLimitNumRows = 'Number of rows per page'; @@ -217,6 +223,7 @@ $strMissingBracket = 'Missing Bracket'; $strModifications = 'Modifications have been saved'; $strModify = 'Modify'; $strModifyIndexTopic = 'Modify an index'; +$strMoreStatusVars = 'More status variables'; $strMoveTable = 'Move table to (database.table):'; $strMoveTableOK = 'Table %s has been moved to %s.'; $strMySQLCharset = 'MySQL charset'; @@ -266,8 +273,6 @@ $strOptions = 'Options'; $strOr = 'Or'; $strOverhead = 'Overhead'; -$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; -$strPHPVersion = 'PHP Version'; $strPageNumber = 'Page number:'; $strPartialText = 'Partial Texts'; $strPassword = 'Password'; @@ -277,9 +282,13 @@ $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; $strPdfInvalidPageNum = 'Undefined PDF page number!'; $strPdfInvalidTblName = 'The "%s" table doesn\'t exist!'; $strPdfNoTables = 'No tables'; +$strPerHour = 'per hour'; $strPhp = 'Create PHP Code'; +$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; +$strPHPVersion = 'PHP Version'; $strPmaDocumentation = 'phpMyAdmin documentation'; $strPmaUriError = 'The $cfg[\'PmaAbsoluteUri\'] directive MUST be set in your configuration file!'; +$strPortrait = 'Portrait'; $strPos1 = 'Begin'; $strPrevious = 'Previous'; $strPrimary = 'Primary'; @@ -297,8 +306,10 @@ $strQBE = 'Query'; $strQBEDel = 'Del'; $strQBEIns = 'Ins'; $strQueryOnDb = 'SQL-query on database %s:'; +$strQueryStatistics = 'Query statistics: Since its startup, %s queries have been sent to the server.'; +$strQueryType = 'Query type'; -$strReType = 'Re-type'; +$strReceived = 'Received'; $strRecords = 'Records'; $strReferentialIntegrity = 'Check referential integrity:'; $strRelationNotWorking = 'The additional Features for working with linked Tables have been deactivated. To find out why click %shere%s.'; @@ -313,6 +324,7 @@ $strRepairTable = 'Repair table'; $strReplace = 'Replace'; $strReplaceTable = 'Replace table data with file'; $strReset = 'Reset'; +$strReType = 'Re-type'; $strRevoke = 'Revoke'; $strRevokeGrant = 'Revoke Grant'; $strRevokeGrantMessage = 'You have revoked the Grant privilege for %s'; @@ -357,14 +369,24 @@ $strSelectFields = 'Select fields (at least one):'; $strSelectNumRows = 'in query'; $strSelectTables = 'Select Tables'; $strSend = 'Save as file'; +$strSent = 'Sent'; $strServer = 'Server %s'; $strServerChoice = 'Server Choice'; +$strServerStatus = 'Runtime Information'; +$strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.'; +$strServerTabStatus = 'Status'; +$strServerTabVariables = 'Variables'; +$strServerTabProcesslist = 'Processes'; +$strServerTrafficNotes = 'Server traffic: These tables show the network traffic statistics of this MySQL server since its startup.'; +$strServerVars = 'Server variables and settings'; $strServerVersion = 'Server version'; +$strSessionValue = 'Session value'; $strSetEnumVal = 'If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...
If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').'; $strShow = 'Show'; $strShowAll = 'Show all'; $strShowColor = 'Show color'; $strShowCols = 'Show columns'; +$strShowDatadictAs = 'Data Dictionary Format'; $strShowGrid = 'Show grid'; $strShowPHPInfo = 'Show PHP information'; $strShowTableDimension = 'Show dimension of tables'; @@ -405,6 +427,7 @@ $strTheContents = 'The contents of the file replaces the contents of the selecte $strTheTerminator = 'The terminator of the fields.'; $strTotal = 'total'; $strTotalUC = 'Total'; +$strTraffic = 'Traffic'; $strType = 'Type'; $strUncheckAll = 'Uncheck All'; @@ -425,6 +448,7 @@ $strUsers = 'Users'; $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.'; $strValue = 'Value'; +$strVar = 'Variable'; $strViewDump = 'View dump (schema) of table'; $strViewDumpDB = 'View dump (schema) of database'; @@ -438,30 +462,4 @@ $strYes = 'Yes'; $strZip = '"zipped"'; -$strShowDatadictAs = 'Data Dictionary Format'; //to translate -$strLandscape = 'Landscape'; //to translate -$strPortrait = 'Portrait'; //to translate - -$timespanfmt = '%s days, %s hours, %s minutes and %s seconds'; //to translate - -$strAbortedClients = 'Aborted'; //to translate -$strConnections = 'Connections'; //to translate -$strFailedAttempts = 'Failed attempts'; //to translate -$strGlobalValue = 'Global value'; //to translate -$strMoreStatusVars = 'More status variables'; //to translate -$strPerHour = 'per hour'; //to translate -$strQueryStatistics = 'Query statistics: Since its startup, %s queries have been sent to the server.'; -$strQueryType = 'Query type'; //to translate -$strReceived = 'Received'; //to translate -$strSent = 'Sent'; //to translate -$strServerStatus = 'Runtime Information'; //to translate -$strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.'; //to translate -$strServerTabStatus = 'Status'; //to translate -$strServerTabVariables = 'Variables'; //to translate -$strServerTabProcesslist = 'Processes'; //to translate -$strServerTrafficNotes = 'Server traffic: These tables show the network traffic statistics of this MySQL server since its startup.'; -$strServerVars = 'Server variables and settings'; //to translate -$strSessionValue = 'Session value'; //to translate -$strTraffic = 'Traffic'; //to translate -$strVar = 'Variable'; //to translate ?> diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3 index 74c07a3af..099a1889e 100644 --- a/lang/english-utf-8.inc.php3 +++ b/lang/english-utf-8.inc.php3 @@ -16,8 +16,9 @@ $month = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'O // See http://www.php.net/manual/en/function.strftime.php to define the // variable below $datefmt = '%B %d, %Y at %I:%M %p'; +$timespanfmt = '%s days, %s hours, %s minutes and %s seconds'; -$strAPrimaryKey = 'A primary key has been added on %s'; +$strAbortedClients = 'Aborted'; $strAccessDenied = 'Access denied'; $strAction = 'Action'; $strAddDeleteColumn = 'Add/Delete Field Columns'; @@ -45,6 +46,7 @@ $strAnyDatabase = 'Any database'; $strAnyHost = 'Any host'; $strAnyTable = 'Any table'; $strAnyUser = 'Any user'; +$strAPrimaryKey = 'A primary key has been added on %s'; $strAscending = 'Ascending'; $strAtBeginningOfTable = 'At Beginning of Table'; $strAtEndOfTable = 'At End of Table'; @@ -87,6 +89,7 @@ $strCompression = 'Compression'; $strConfigFileError = 'phpMyAdmin was unable to read your configuration file!
This might happen if php finds a parse error in it or php cannot find the file.
Please call the configuration file directly using the link below and read the php error message(s) that you recieve. In most cases a quote or a semicolon is missing somewhere.
If you recieve a blank page, everything is fine.'; $strConfigureTableCoord = 'Please configure the coordinates for table %s'; $strConfirm = 'Do you really want to do it?'; +$strConnections = 'Connections'; $strCookiesRequired = 'Cookies must be enabled past this point.'; $strCopyTable = 'Copy table to (database.table):'; $strCopyTableOK = 'Table %s has been copied to %s.'; @@ -147,6 +150,7 @@ $strExportToXML = 'Export to XML format'; $strExtendedInserts = 'Extended inserts'; $strExtra = 'Extra'; +$strFailedAttempts = 'Failed attempts'; $strField = 'Field'; $strFieldHasBeenDropped = 'Field %s has been dropped'; $strFields = 'Fields'; @@ -164,6 +168,7 @@ $strFunction = 'Function'; $strGenBy = 'Generated by'; $strGenTime = 'Generation Time'; $strGeneralRelationFeat = 'General relation features'; +$strGlobalValue = 'Global value'; $strGo = 'Go'; $strGrants = 'Grants'; $strGzip = '"gzipped"'; @@ -200,6 +205,7 @@ $strKeepPass = 'Do not change the password'; $strKeyname = 'Keyname'; $strKill = 'Kill'; +$strLandscape = 'Landscape'; $strLength = 'Length'; $strLengthSet = 'Length/Values*'; $strLimitNumRows = 'Number of rows per page'; @@ -218,6 +224,7 @@ $strMissingBracket = 'Missing Bracket'; $strModifications = 'Modifications have been saved'; $strModify = 'Modify'; $strModifyIndexTopic = 'Modify an index'; +$strMoreStatusVars = 'More status variables'; $strMoveTable = 'Move table to (database.table):'; $strMoveTableOK = 'Table %s has been moved to %s.'; $strMySQLCharset = 'MySQL charset'; @@ -267,8 +274,6 @@ $strOptions = 'Options'; $strOr = 'Or'; $strOverhead = 'Overhead'; -$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; -$strPHPVersion = 'PHP Version'; $strPageNumber = 'Page number:'; $strPartialText = 'Partial Texts'; $strPassword = 'Password'; @@ -278,9 +283,13 @@ $strPdfDbSchema = 'Schema of the the "%s" database - Page %s'; $strPdfInvalidPageNum = 'Undefined PDF page number!'; $strPdfInvalidTblName = 'The "%s" table doesn\'t exist!'; $strPdfNoTables = 'No tables'; +$strPerHour = 'per hour'; $strPhp = 'Create PHP Code'; +$strPHP40203 = 'You are using PHP 4.2.3, which has a serious bug with multi-byte strings (mbstring). See PHP bug report 19404. This version of PHP is not recommended for use with phpMyAdmin.'; +$strPHPVersion = 'PHP Version'; $strPmaDocumentation = 'phpMyAdmin documentation'; $strPmaUriError = 'The $cfg[\'PmaAbsoluteUri\'] directive MUST be set in your configuration file!'; +$strPortrait = 'Portrait'; $strPos1 = 'Begin'; $strPrevious = 'Previous'; $strPrimary = 'Primary'; @@ -298,8 +307,10 @@ $strQBE = 'Query'; $strQBEDel = 'Del'; $strQBEIns = 'Ins'; $strQueryOnDb = 'SQL-query on database %s:'; +$strQueryStatistics = 'Query statistics: Since its startup, %s queries have been sent to the server.'; +$strQueryType = 'Query type'; -$strReType = 'Re-type'; +$strReceived = 'Received'; $strRecords = 'Records'; $strReferentialIntegrity = 'Check referential integrity:'; $strRelationNotWorking = 'The additional Features for working with linked Tables have been deactivated. To find out why click %shere%s.'; @@ -314,6 +325,7 @@ $strRepairTable = 'Repair table'; $strReplace = 'Replace'; $strReplaceTable = 'Replace table data with file'; $strReset = 'Reset'; +$strReType = 'Re-type'; $strRevoke = 'Revoke'; $strRevokeGrant = 'Revoke Grant'; $strRevokeGrantMessage = 'You have revoked the Grant privilege for %s'; @@ -358,14 +370,24 @@ $strSelectFields = 'Select fields (at least one):'; $strSelectNumRows = 'in query'; $strSelectTables = 'Select Tables'; $strSend = 'Save as file'; +$strSent = 'Sent'; $strServer = 'Server %s'; $strServerChoice = 'Server Choice'; +$strServerStatus = 'Runtime Information'; +$strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.'; +$strServerTabStatus = 'Status'; +$strServerTabVariables = 'Variables'; +$strServerTabProcesslist = 'Processes'; +$strServerTrafficNotes = 'Server traffic: These tables show the network traffic statistics of this MySQL server since its startup.'; +$strServerVars = 'Server variables and settings'; $strServerVersion = 'Server version'; +$strSessionValue = 'Session value'; $strSetEnumVal = 'If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...
If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').'; $strShow = 'Show'; $strShowAll = 'Show all'; $strShowColor = 'Show color'; $strShowCols = 'Show columns'; +$strShowDatadictAs = 'Data Dictionary Format'; $strShowGrid = 'Show grid'; $strShowPHPInfo = 'Show PHP information'; $strShowTableDimension = 'Show dimension of tables'; @@ -406,6 +428,7 @@ $strTheContents = 'The contents of the file replaces the contents of the selecte $strTheTerminator = 'The terminator of the fields.'; $strTotal = 'total'; $strTotalUC = 'Total'; +$strTraffic = 'Traffic'; $strType = 'Type'; $strUncheckAll = 'Uncheck All'; @@ -426,6 +449,7 @@ $strUsers = 'Users'; $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.'; $strValue = 'Value'; +$strVar = 'Variable'; $strViewDump = 'View dump (schema) of table'; $strViewDumpDB = 'View dump (schema) of database'; @@ -439,30 +463,4 @@ $strYes = 'Yes'; $strZip = '"zipped"'; -$strShowDatadictAs = 'Data Dictionary Format'; //to translate -$strLandscape = 'Landscape'; //to translate -$strPortrait = 'Portrait'; //to translate - -$timespanfmt = '%s days, %s hours, %s minutes and %s seconds'; //to translate - -$strAbortedClients = 'Aborted'; //to translate -$strConnections = 'Connections'; //to translate -$strFailedAttempts = 'Failed attempts'; //to translate -$strGlobalValue = 'Global value'; //to translate -$strMoreStatusVars = 'More status variables'; //to translate -$strPerHour = 'per hour'; //to translate -$strQueryStatistics = 'Query statistics: Since its startup, %s queries have been sent to the server.'; -$strQueryType = 'Query type'; //to translate -$strReceived = 'Received'; //to translate -$strSent = 'Sent'; //to translate -$strServerStatus = 'Runtime Information'; //to translate -$strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.'; //to translate -$strServerTabStatus = 'Status'; //to translate -$strServerTabVariables = 'Variables'; //to translate -$strServerTabProcesslist = 'Processes'; //to translate -$strServerTrafficNotes = 'Server traffic: These tables show the network traffic statistics of this MySQL server since its startup.'; -$strServerVars = 'Server variables and settings'; //to translate -$strSessionValue = 'Session value'; //to translate -$strTraffic = 'Traffic'; //to translate -$strVar = 'Variable'; //to translate ?>