From 9b5397cf8f00a05327034c5b03af3e4edd52f604 Mon Sep 17 00:00:00 2001 From: Robin Johnson Date: Thu, 23 Jan 2003 04:29:24 +0000 Subject: [PATCH] lang/english*: Resorted and Resynced. --- ChangeLog | 1 + lang/english-iso-8859-1.inc.php3 | 20 ++++++++++---------- lang/english-utf-8.inc.php3 | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5afc7e9b..0a975577c 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $Source$ 2003-01-22 Robin Johnson * lang/swedish*: Updates, thanks to Björn T. Hallberg (bth) * lang/italian*: Updates, thanks to Pietro Danesi (danone) + * lang/english*: Resorted and Resynced. 2003-01-21 Robin Johnson * libraries/sqlparser.lib.php3: checkType function diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3 index 1d9cc384e..2b751a6a2 100644 --- a/lang/english-iso-8859-1.inc.php3 +++ b/lang/english-iso-8859-1.inc.php3 @@ -19,6 +19,7 @@ $timespanfmt = '%s days, %s hours, %s minutes and %s seconds'; $strAPrimaryKey = 'A primary key has been added on %s'; $strAbortedClients = 'Aborted'; +$strAbsolutePathToDocSqlDir = 'Please enter the absolute path on webserver to docSQL directory'; $strAccessDenied = 'Access denied'; $strAction = 'Action'; $strAddDeleteColumn = 'Add/Delete Field Columns'; @@ -32,6 +33,8 @@ $strAddSearchConditions = 'Add search conditions (body of the "where" clause):'; $strAddToIndex = 'Add to index  %s column(s)'; $strAddUser = 'Add a new User'; $strAddUserMessage = 'You have added a new user.'; +$strAddedColumnComment = 'Added comment for column'; +$strAddedColumnRelation = 'Added relation for column'; $strAdministration = 'Administration'; $strAffectedRows = 'Affected rows:'; $strAfter = 'After %s'; @@ -169,6 +172,7 @@ $strFieldsEmpty = ' The field count is empty! '; $strFieldsEnclosedBy = 'Fields enclosed by'; $strFieldsEscapedBy = 'Fields escaped by'; $strFieldsTerminatedBy = 'Fields terminated by'; +$strFileCouldNotBeRead = 'File could not be read'; $strFixed = 'fixed'; $strFlushPrivilegesNote = 'Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses if manual changes have made to it. In this case, you should %sreload the privileges%s before you continue.'; $strFlushTable = 'Flush the table ("FLUSH")'; @@ -200,7 +204,10 @@ $strId = 'ID'; $strIdxFulltext = 'Fulltext'; $strIfYouWish = 'If you wish to load only some of a table\'s columns, specify a comma separated field list.'; $strIgnore = 'Ignore'; +$strIgnoringFile = 'Ignoring file %s'; $strImportDocSQL = 'Import docSQL Files'; +$strImportFiles = 'Import files'; +$strImportFinished = 'Import finished'; $strInUse = 'in use'; $strIndex = 'Index'; $strIndexHasBeenDropped = 'Index %s has been dropped'; @@ -488,6 +495,7 @@ $strTheContent = 'The content of your file has been inserted.'; $strTheContents = 'The contents of the file replaces the contents of the selected table for rows with identical primary or unique key.'; $strTheTerminator = 'The terminator of the fields.'; $strThisHost = 'This Host'; +$strThisNotDirectory = 'This was not a directory'; $strThreadSuccessfullyKilled = 'Thread %s was successfully killed.'; $strTime = 'Time'; $strTotal = 'total'; @@ -526,6 +534,8 @@ $strWebServerUploadDirectory = 'web-server upload directory'; $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached'; $strWelcome = 'Welcome to %s'; $strWithChecked = 'With selected:'; +$strWritingCommentNotPossible = 'Writing of comment not possible'; +$strWritingRelationNotPossible = 'Writing of relation not possible'; $strWrongUser = 'Wrong username/password. Access denied.'; $strYes = 'Yes'; @@ -533,14 +543,4 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; -$strAddedColumnComment = 'Added comment for column'; -$strWritingCommentNotPossible = 'Writing of comment not possible'; -$strAddedColumnRelation = 'Added relation for column'; -$strWritingRelationNotPossible = 'Writing of relation not possible'; -$strImportFinished = 'Import finished'; -$strFileCouldNotBeRead = 'File could not be read'; -$strIgnoringFile = 'Ignoring file %s'; -$strThisNotDirectory = 'This was not a directory'; -$strAbsolutePathToDocSqlDir = 'Please enter the absolute path on webserver to docSQL directory'; -$strImportFiles = 'Import files'; ?> diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3 index 8cd28c0e8..f2dcbe28f 100644 --- a/lang/english-utf-8.inc.php3 +++ b/lang/english-utf-8.inc.php3 @@ -20,6 +20,7 @@ $timespanfmt = '%s days, %s hours, %s minutes and %s seconds'; $strAPrimaryKey = 'A primary key has been added on %s'; $strAbortedClients = 'Aborted'; +$strAbsolutePathToDocSqlDir = 'Please enter the absolute path on webserver to docSQL directory'; $strAccessDenied = 'Access denied'; $strAction = 'Action'; $strAddDeleteColumn = 'Add/Delete Field Columns'; @@ -33,6 +34,8 @@ $strAddSearchConditions = 'Add search conditions (body of the "where" clause):'; $strAddToIndex = 'Add to index  %s column(s)'; $strAddUser = 'Add a new User'; $strAddUserMessage = 'You have added a new user.'; +$strAddedColumnComment = 'Added comment for column'; +$strAddedColumnRelation = 'Added relation for column'; $strAdministration = 'Administration'; $strAffectedRows = 'Affected rows:'; $strAfter = 'After %s'; @@ -170,6 +173,7 @@ $strFieldsEmpty = ' The field count is empty! '; $strFieldsEnclosedBy = 'Fields enclosed by'; $strFieldsEscapedBy = 'Fields escaped by'; $strFieldsTerminatedBy = 'Fields terminated by'; +$strFileCouldNotBeRead = 'File could not be read'; $strFixed = 'fixed'; $strFlushPrivilegesNote = 'Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses if manual changes have made to it. In this case, you should %sreload the privileges%s before you continue.'; $strFlushTable = 'Flush the table ("FLUSH")'; @@ -201,7 +205,10 @@ $strId = 'ID'; $strIdxFulltext = 'Fulltext'; $strIfYouWish = 'If you wish to load only some of a table\'s columns, specify a comma separated field list.'; $strIgnore = 'Ignore'; +$strIgnoringFile = 'Ignoring file %s'; $strImportDocSQL = 'Import docSQL Files'; +$strImportFiles = 'Import files'; +$strImportFinished = 'Import finished'; $strInUse = 'in use'; $strIndex = 'Index'; $strIndexHasBeenDropped = 'Index %s has been dropped'; @@ -489,6 +496,7 @@ $strTheContent = 'The content of your file has been inserted.'; $strTheContents = 'The contents of the file replaces the contents of the selected table for rows with identical primary or unique key.'; $strTheTerminator = 'The terminator of the fields.'; $strThisHost = 'This Host'; +$strThisNotDirectory = 'This was not a directory'; $strThreadSuccessfullyKilled = 'Thread %s was successfully killed.'; $strTime = 'Time'; $strTotal = 'total'; @@ -527,6 +535,8 @@ $strWebServerUploadDirectory = 'web-server upload directory'; $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached'; $strWelcome = 'Welcome to %s'; $strWithChecked = 'With selected:'; +$strWritingCommentNotPossible = 'Writing of comment not possible'; +$strWritingRelationNotPossible = 'Writing of relation not possible'; $strWrongUser = 'Wrong username/password. Access denied.'; $strYes = 'Yes'; @@ -534,14 +544,4 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; -$strAddedColumnComment = 'Added comment for column'; -$strWritingCommentNotPossible = 'Writing of comment not possible'; -$strAddedColumnRelation = 'Added relation for column'; -$strWritingRelationNotPossible = 'Writing of relation not possible'; -$strImportFinished = 'Import finished'; -$strFileCouldNotBeRead = 'File could not be read'; -$strIgnoringFile = 'Ignoring file %s'; -$strThisNotDirectory = 'This was not a directory'; -$strAbsolutePathToDocSqlDir = 'Please enter the absolute path on webserver to docSQL directory'; -$strImportFiles = 'Import files'; ?>