diff --git a/ChangeLog b/ChangeLog index 9811159a5..cac5ab6bc 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,11 +5,17 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-09-23 Loïc Chapeaux + * tbl_properties.php3; tbl_copy.php3 (removed); tbl_move_copy.php3 (added); + lang/*: feature request #463164 (Add ability to move -rename- across + db's). + * lang/italian.inc.php3 updates, thanks to Pietro Danesi. + 2001-09-24 Marc Delisle * lang/polish.inc.php3 updates, thanks to Jakub Wilk. * lang/romanian.inc.php3 updates, thanks to Valics Lehel. * lang/galician.inc.php3 updates, thanks to Xosé Calvo. - + 2001-09-23 Benjamin Gandon * read_dump.php3: widely improved (some remaining bugs has been fixed and the script is now about too time faster than before). diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index c9a4a8014..519a61792 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/lang/brazilian_portuguese.inc.php3 @@ -65,7 +65,6 @@ $strColumnEmpty = 'Os nomes das colunas est $strColumnNames = 'Nome da Colunas'; $strCompleteInserts = 'Inserções Completas'; $strConfirm = 'Você tem certeza?'; -$strCopyTable = 'Copia tabela para'; $strCopyTableOK = 'Tabela %s copiada para %s.'; $strCreate = 'Cria'; $strCreateNewDatabase = 'Cria novo banco de dados'; @@ -308,10 +307,13 @@ $strWrongUser = 'Usu $strYes = 'Sim'; // To translate +$strCopyTable = 'Copy table to (database.table):'; $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strIdxFulltext = 'Fulltext'; //to translate $strInvalidName = '"%s" is a reserved word, you can\'t use it as a database/table/field name.'; //to translate $strKeepPass = 'Do not change the password';//to translate +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate $strRunningAs = 'as'; $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\').'; //to translate diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index 4f6836e87..fa0bda8c4 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/lang/bulgarian-win1251.inc.php3 @@ -59,7 +59,6 @@ $strColumnEmpty = 'The columns names are empty!'; //to translate $strColumnNames = 'Íàçâàíèå íà êîëîíà'; $strCompleteInserts = 'Complete inserts'; //to translate $strConfirm = 'Do you really want to do it?'; //to translate -$strCopyTable = 'Êîïèðàé òàáëèöàòà â'; $strCopyTableOK = 'Òàáëèöà %s áåøå êîïèðàíà â %s.'; $strCreate = 'Ñúçäàé'; $strCreateNewDatabase = 'Ñúçäàé íîâà ÁÄ'; @@ -327,4 +326,7 @@ $strUpdateProfile = 'Update profile:';//to translate $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index f4af3d73b..cae90f842 100644 --- a/lang/catala.inc.php3 +++ b/lang/catala.inc.php3 @@ -62,7 +62,6 @@ $strColumnEmpty = 'Els noms de les columnes són buits!'; $strColumnNames = 'Nom de les col·lumnes'; $strCompleteInserts = 'Completar insercions'; $strConfirm = 'Ho vols fer realment ?'; -$strCopyTable = 'Copiar la taula a'; $strCopyTableOK = 'La taula %s ha estat copiada a %s.'; $strCreate = 'Crear'; $strCreateNewDatabase = 'Crea una nova base de dades'; @@ -323,4 +322,7 @@ $strUpdateProfile = 'Update profile:';//to translate $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index ef34d8b47..3acc3caad 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -63,7 +63,6 @@ $strColumnEmpty = ' $strColumnNames = 'Äæ¦ì¦WºÙ'; $strCompleteInserts = 'Complete inserts'; $strConfirm = '±z½T©w­n³o¼Ë°µ?'; -$strCopyTable = '½Æ»s¸ê®Æªí¬°'; $strCopyTableOK = '¤w¸g±N¸ê®Æªí %s ½Æ»s¬° %s.'; $strCreate = '«Ø¥ß'; $strCreateNewDatabase = '«Ø¥ß·s¸ê®Æ®w'; @@ -323,4 +322,7 @@ $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strZip = '"zipped"'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 1edbe1423..778fd9b15 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -59,7 +59,6 @@ $strColumnEmpty = 'The columns names are empty!'; //to translate $strColumnNames = '×Ö¶ÎÃû'; $strCompleteInserts = 'Complete inserts'; //to translate $strConfirm = 'Do you really want to do it?'; //to translate -$strCopyTable = '¸´ÖÆÊý¾Ý±íΪ'; $strCopyTableOK = 'Êý¾Ý±í %s ÒѾ­³É¹¦¸´ÖÆΪ %s¡£'; $strCreate = '½¨Á¢'; $strCreateNewDatabase = '½¨Á¢Ò»¸öеÄÊý¾Ý¿â'; @@ -327,4 +326,7 @@ $strUpdateProfile = 'Update profile:';//to translate $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3 index 821ba681c..53dc688f6 100644 --- a/lang/czech-iso.inc.php3 +++ b/lang/czech-iso.inc.php3 @@ -300,6 +300,7 @@ $strZip = '"zazipov // To translate $strAPrimaryKey = 'A primary key has been added on %s';//to translate $strAnIndex = 'An index has been added on %s';//to translate +$strCopyTable = 'Copy table to (database.table):'; $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strFieldHasBeenDropped = 'Field %s has been dropped';//to translate @@ -310,6 +311,8 @@ $strIdxFulltext = 'Fulltext'; //to translate $strIndexHasBeenDropped = 'Index %s has been dropped';//to translate $strKeepPass = 'Do not change the password';//to translate $strLinesTerminatedBy = 'Lines terminated by';//to translate +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate $strRunningAs = 'as'; diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index a77d4daf9..91816df00 100644 --- a/lang/czech-win1250.inc.php3 +++ b/lang/czech-win1250.inc.php3 @@ -63,7 +63,6 @@ $strColumnEmpty = 'Jm $strColumnNames = 'Názvy sloupcù'; $strCompleteInserts = 'Uplné inserty'; $strConfirm = 'Opravdu chcete toto provést?'; -$strCopyTable = 'Zkopírovat tabulku do'; $strCopyTableOK = 'Tabulka %s byla zkopírována do %s.'; $strCreate = 'Vytvoøit'; $strCreateNewDatabase = 'Vytvoøit novou databázi'; @@ -300,6 +299,7 @@ $strZip = '"zazipov // To translate $strAPrimaryKey = 'A primary key has been added on %s';//to translate $strAnIndex = 'An index has been added on %s';//to translate +$strCopyTable = 'Copy table to (database.table):'; $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strFieldHasBeenDropped = 'Field %s has been dropped';//to translate @@ -310,6 +310,8 @@ $strIdxFulltext = 'Fulltext'; //to translate $strIndexHasBeenDropped = 'Index %s has been dropped';//to translate $strKeepPass = 'Do not change the password';//to translate $strLinesTerminatedBy = 'Lines terminated by';//to translate +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate $strRunningAs = 'as'; diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3 index 4842f7dab..5006ac89f 100644 --- a/lang/danish.inc.php3 +++ b/lang/danish.inc.php3 @@ -62,7 +62,6 @@ $strColumnEmpty = 'The columns names are empty!'; //to translate $strColumnNames = 'Kolonne navne'; $strCompleteInserts = 'Lav komplette inserts'; $strConfirm = 'Do you really want to do it?'; //to translate -$strCopyTable = 'Kopier tabel til'; $strCopyTableOK = 'Tabellen %s er nu kopieret til: %s.'; $strCreate = 'Opret'; $strCreateNewDatabase = 'Opret ny database'; @@ -322,4 +321,7 @@ $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strZip = '"zipped"'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3 index 619e21e68..3d12395fc 100644 --- a/lang/dutch.inc.php3 +++ b/lang/dutch.inc.php3 @@ -61,7 +61,6 @@ $strColumnEmpty = 'De kolommen zijn leeg!'; $strColumnNames = 'Kolom namen'; $strCompleteInserts = 'Complete inserts'; //to translate $strConfirm = 'Weet u zeker dat u dit wilt?'; -$strCopyTable = 'Kopieer tabel naar'; $strCopyTableOK = 'Tabel %s is gekopieerd naar %s.'; $strCreate = 'Aanmaken'; $strCreateNewDatabase = 'Nieuwe database aanmaken'; @@ -322,4 +321,7 @@ $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strZip = '"zipped"'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 0e0620ba5..957fc545f 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -65,7 +65,7 @@ $strColumnEmpty = 'The columns names are empty!'; $strColumnNames = 'Column names'; $strCompleteInserts = 'Complete inserts'; $strConfirm = 'Do you really want to do it?'; -$strCopyTable = 'Copy table to'; +$strCopyTable = 'Copy table to (database.table):'; $strCopyTableOK = 'Table %s has been copied to %s.'; $strCreate = 'Create'; $strCreateNewDatabase = 'Create new database'; @@ -167,6 +167,8 @@ $strLogout = 'Log out'; $strModifications = 'Modifications have been saved'; $strModify = 'Modify'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strMySQLReloaded = 'MySQL reloaded.'; $strMySQLSaid = 'MySQL said: '; $strMySQLShowProcess = 'Show processes'; diff --git a/lang/finnish.inc.php3 b/lang/finnish.inc.php3 index 067f38142..8909b298c 100644 --- a/lang/finnish.inc.php3 +++ b/lang/finnish.inc.php3 @@ -69,7 +69,6 @@ $strColumnEmpty = 'Sarakkeiden nimet puuttuvat!'; $strColumnNames = 'Saraikkeiden nimet'; $strCompleteInserts = 'Täydelliset insert-lauseet'; $strConfirm = 'Oletko varma, että haluat tehdä tämän?'; -$strCopyTable = 'Kopioi taulu nimellä'; $strCopyTableOK = 'Taulu %s on kopioitu nimelle %s.'; $strCreate = 'Luo'; $strCreateNewDatabase = 'Luo uusi tietokanta'; @@ -320,6 +319,9 @@ $strYes = 'Kyll $strZip = '"zip-pakattu"'; // To translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate $strOverhead = 'Overhead'; //to translate $strRunningAs = 'as'; diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index 4fe14dae9..813395aa1 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -65,7 +65,7 @@ $strColumnEmpty = 'Les noms de colonnes sont vides'; $strColumnNames = 'Nom des colonnes'; $strCompleteInserts = 'Insertions complètes'; $strConfirm = 'Veuillez confirmer'; -$strCopyTable = 'Copier la table vers'; +$strCopyTable = 'Copier la table vers (base.table) :'; $strCopyTableOK = 'La table %s a été copiée vers %s.'; $strCreate = 'Créer'; $strCreateNewDatabase = 'Créer une base de données'; @@ -167,6 +167,8 @@ $strLogout = 'Quitter'; $strModifications = 'Les modifications ont été sauvegardées.'; $strModify = 'Modifier'; +$strMoveTable = 'Déplacer la table vers (base.table) :'; +$strMoveTableOK = 'La table %s a été déplacée vers %s.'; $strMySQLReloaded = 'MySQL rechargé.'; $strMySQLSaid = 'MySQL a répondu:'; $strMySQLShowProcess = 'Afficher les processus'; @@ -321,4 +323,5 @@ $strWrongUser = 'Erreur d\'utilisateur/mot de passe. Acc $strYes = 'Oui'; $strZip = '"zippé"'; + ?> diff --git a/lang/galician.inc.php3 b/lang/galician.inc.php3 index b7e85a303..981821617 100644 --- a/lang/galician.inc.php3 +++ b/lang/galician.inc.php3 @@ -65,7 +65,6 @@ $strColumnEmpty = 'Os nomes das columnas est $strColumnNames = 'Nomes das Columnas'; $strCompleteInserts = 'Insercións completas'; $strConfirm = 'Está seguro/a?'; -$strCopyTable = 'Copiar a tabela para'; $strCopyTableOK = 'Tabela \$table copiada para \$new_name.'; $strCreate = 'Crear'; $strCreateNewDatabase = 'Crear un novo banco de datos'; @@ -320,6 +319,9 @@ $strYes = 'Si'; $strZip = 'comprimido no formato "zipped"'; // To translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate $strShowAll = 'Show all'; // to translate $strWithChecked = 'With checked:'; diff --git a/lang/german.inc.php3 b/lang/german.inc.php3 index e742ad796..55df3c7f1 100644 --- a/lang/german.inc.php3 +++ b/lang/german.inc.php3 @@ -63,7 +63,6 @@ $strColumnEmpty = 'Die Spalten-Titel sind leer!'; $strColumnNames = 'Spaltennamen'; $strCompleteInserts = 'Vollständige \'INSERT\'s'; $strConfirm = 'Bist du dir wirklich sicher?'; -$strCopyTable = 'Tabelle kopieren nach'; $strCopyTableOK = 'Tabelle %s wurde kopiert nach %s.'; $strCreate = 'Erzeugen'; $strCreateNewDatabase = 'Neue Datenbank erzeugen'; @@ -304,6 +303,7 @@ $strZip = '"Zip komprimiert"'; // To translate $strAPrimaryKey = 'A primary key has been added on %s';//to translate $strAnIndex = 'An index has been added on %s';//to translate +$strCopyTable = 'Copy table to (database.table):'; $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strFieldHasBeenDropped = 'Field %s has been dropped';//to translate $strFieldsEnclosedBy = 'Fields enclosed by';//to translate @@ -312,6 +312,8 @@ $strFieldsTerminatedBy = 'Fields terminated by';//to translate $strIndexHasBeenDropped = 'Index %s has been dropped';//to translate $strKeepPass = 'Do not change the password';//to translate $strLinesTerminatedBy = 'Lines terminated by';//to translate +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate $strRunningAs = 'as'; diff --git a/lang/greek.inc.php3 b/lang/greek.inc.php3 index c2e692242..5d153f4a2 100644 --- a/lang/greek.inc.php3 +++ b/lang/greek.inc.php3 @@ -63,7 +63,6 @@ $strColumnEmpty = ' $strColumnNames = 'Ïíüìáôá óôçëþí'; $strCompleteInserts = 'ÏëïêëçñùìÝíåò åéóáãùãÝò'; $strConfirm = 'ÐñáãìáôéêÜ èÝëåôå íá ôï åêåëÝóåôå;'; -$strCopyTable = 'ÁíôñéãñáöÞ ðßíáêá óôï'; $strCopyTableOK = 'Ï Ðßíáêáò %s áíôéãñÜöçêå óôï %s.'; $strCreate = 'Äçìéïõñãßá'; $strCreateNewDatabase = 'Äçìéïõñãßá íÝáò âÜóçò'; @@ -301,6 +300,7 @@ $strZip = ' // To translate $strAPrimaryKey = 'A primary key has been added on %s';//to translate $strAnIndex = 'An index has been added on %s';//to translate +$strCopyTable = 'Copy table to (database.table):'; $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strFieldHasBeenDropped = 'Field %s has been dropped';//to translate @@ -310,6 +310,8 @@ $strFieldsTerminatedBy = 'Fields terminated by';//to translate $strIndexHasBeenDropped = 'Index %s has been dropped';//to translate $strKeepPass = 'Do not change the password';//to translate $strLinesTerminatedBy = 'Lines terminated by';//to translate +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate $strRunningAs = 'as'; diff --git a/lang/japanese.inc.php3 b/lang/japanese.inc.php3 index 280055d26..78170be93 100644 --- a/lang/japanese.inc.php3 +++ b/lang/japanese.inc.php3 @@ -59,7 +59,6 @@ $strColumnEmpty = 'The columns names are empty!'; //to translate $strColumnNames = 'Îó(¥³¥é¥à)̾'; $strCompleteInserts = '´°Á´¤ÊINSERTʸ¤ÎºîÀ®'; $strConfirm = 'Do you really want to do it?'; //to translate -$strCopyTable = '¥Æ¡¼¥Ö¥ë¤ò¼¡¤Ø¥³¥Ô¡¼¤·¤Þ¤¹¡£-->'; $strCopyTableOK = '%s¥Æ¡¼¥Ö¥ë¤ò%s¤Ë¥³¥Ô¡¼¤·¤Þ¤·¤¿¡£'; $strCreate = 'ºîÀ®'; $strCreateNewDatabase = '¿·¤·¤¤DB¤òºîÀ®¤·¤Þ¤¹¡£'; @@ -326,4 +325,7 @@ $strUpdateProfile = 'Update profile:';//to translate $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3 index 019306ed2..f4280b338 100644 --- a/lang/korean.inc.php3 +++ b/lang/korean.inc.php3 @@ -59,7 +59,6 @@ $strColumnEmpty = 'The columns names are empty!'; //to translate $strColumnNames = 'Ä®·³(æê) À̸§'; $strCompleteInserts = '¿ÏÀüÇÑ INSERT¹® ÀÛ¼º'; $strConfirm = 'Do you really want to do it?'; //to translate -$strCopyTable = 'Å×À̺íÀ» ´ÙÀ½¿¡ º¹»çÇÕ´Ï´Ù. -->'; $strCopyTableOK = '%s Å×À̺íÀÌ %s À¸·Î º¹»çµÇ¾ú½À´Ï´Ù.'; $strCreate = ' ¸¸µé±â '; $strCreateNewDatabase = '»õ·Î¿î µ¥ÀÌÅÍ º£À̽º¸¦ ¸¸µì´Ï´Ù'; @@ -326,4 +325,7 @@ $strUpdateProfile = 'Update profile:';//to translate $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3 index b4c9f0938..805f41185 100644 --- a/lang/norwegian.inc.php3 +++ b/lang/norwegian.inc.php3 @@ -64,7 +64,6 @@ $strColumnEmpty = 'Kolonnenavnene er tomme!'; $strColumnNames = 'Kolonnenavn'; $strCompleteInserts = 'Komplette innlegg'; $strConfirm = 'Ønsker du virkelig å gjøre det?'; -$strCopyTable = 'Kopier tabell til'; $strCopyTableOK = 'Tabellen %s er kopiert til %s.'; $strCreate = 'Opprett'; $strCreateNewDatabase = 'Opprett ny database'; @@ -305,10 +304,13 @@ $strYes = 'Ja'; // To translate $strCarriage = 'Carriage return: \\r'; //to translate +$strCopyTable = 'Copy table to (database.table):'; $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strGrants = 'Grants'; //to translate $strKeepPass = 'Do not change the password';//to translate +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate $strPartialText = 'Partial Texts'; //to translate $strRunningAs = 'as'; diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3 index fc5c28124..9bbd0251e 100644 --- a/lang/polish.inc.php3 +++ b/lang/polish.inc.php3 @@ -65,7 +65,6 @@ $strColumnEmpty = 'Brak nazw kolumn!'; $strColumnNames = 'Nazwy kolumn'; $strCompleteInserts = 'Pe³ne dodania'; $strConfirm = 'Czy na pewno to zrobic?'; -$strCopyTable = 'Kopiowanie tabeli do'; $strCopyTableOK = 'Tabela %s zosta³a przekopiowana do %s.'; $strCreate = 'Utworzenie'; $strCreateNewDatabase = 'Utworzenie nowej bazy danych'; @@ -321,5 +320,8 @@ $strYes = 'Tak'; $strZip = '".zip"'; // To translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate ?> diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3 index 125de9cfe..d374eb529 100644 --- a/lang/portuguese.inc.php3 +++ b/lang/portuguese.inc.php3 @@ -59,7 +59,6 @@ $strColumnEmpty = 'The columns names are empty!'; //to translate $strColumnNames = 'Nome da Colunas'; $strCompleteInserts = 'Complete inserts'; //to translate $strConfirm = 'Do you really want to do it?'; //to translate -$strCopyTable = 'Copia tabela para'; $strCopyTableOK = 'Tabela %s copiada para %s.'; $strCreate = 'Cria'; $strCreateNewDatabase = 'Cria novo banco de dados'; @@ -326,4 +325,7 @@ $strUpdateProfile = 'Update profile:';//to translate $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/romanian.inc.php3 b/lang/romanian.inc.php3 index c9347abaa..6f80f1a8c 100644 --- a/lang/romanian.inc.php3 +++ b/lang/romanian.inc.php3 @@ -65,7 +65,6 @@ $strColumnEmpty = 'Numele coloanelor sunt goale!'; $strColumnNames = 'Numele coloanelor'; $strCompleteInserts = 'Rezolva inserarea'; $strConfirm = 'Sunteti sigur ca doriti sa continuati?'; -$strCopyTable = 'Copiaza tabel la:'; $strCopyTableOK = 'Tabelul %s a fost copiat la %s.'; $strCreate = 'Creaza'; $strCreateNewDatabase = 'Creaza baza de date noua'; @@ -320,6 +319,9 @@ $strWithChecked = 'Verificat cu:'; $strYes = 'Da'; // To translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate $strZip = '"zipped"'; //to translate ?> diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3 index 7409bb0ad..683b3db84 100644 --- a/lang/russian-koi8.inc.php3 +++ b/lang/russian-koi8.inc.php3 @@ -61,7 +61,6 @@ $strColumnEmpty = ' $strColumnNames = 'îÁÚ×ÁÎÉÑ ËÏÌÏÎÏË'; $strCompleteInserts = 'ðÏÌÎÁÑ ×ÓÔÁ×ËÁ'; $strConfirm = '÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÓÄÅÌÁÔØ ÜÔÏ?'; -$strCopyTable = 'óËÏÐÉÒÏ×ÁÔØ ÔÁÂÌÉÃÕ ×'; $strCopyTableOK = 'ôÁÂÌÉÃÁ %s ÂÙÌÁ ÓËÏÐÉÒÏ×ÁÎÁ × %s.'; $strCreate = 'óÏÚÄÁÔØ'; $strCreateNewDatabase = 'óÏÚÄÁÔØ ÎÏ×ÕÀ âä'; @@ -322,4 +321,7 @@ $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strZip = '"zipped"'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3 index 7f7daa39c..be0c4bcbb 100644 --- a/lang/russian-win1251.inc.php3 +++ b/lang/russian-win1251.inc.php3 @@ -61,7 +61,6 @@ $strColumnEmpty = ' $strColumnNames = 'Íàçâàíèÿ êîëîíîê'; $strCompleteInserts = 'Ïîëíàÿ âñòàâêà'; $strConfirm = 'Âû äåéñòâèòåëüíî õîòèòå ñäåëàòü ýòî?'; -$strCopyTable = 'Ñêîïèðîâàòü òàáëèöó â'; $strCopyTableOK = 'Òàáëèöà %s áûëà ñêîïèðîâàíà â %s.'; $strCreate = 'Ñîçäàòü'; $strCreateNewDatabase = 'Ñîçäàòü íîâóþ ÁÄ'; @@ -322,4 +321,7 @@ $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strZip = '"zipped"'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3 index 32c87c7ee..8065d2c9d 100644 --- a/lang/slovak-iso.inc.php3 +++ b/lang/slovak-iso.inc.php3 @@ -66,6 +66,7 @@ $strColumnEmpty = 'N $strColumnNames = 'Názvy ståpcov'; $strCompleteInserts = 'Úplné vlo¾enie'; $strConfirm = 'Skutoène si ¾eláte toto vykona»?'; +$strCopyTable = 'Skopírova» tabuµku do (databáza.tabuµka):'; $strCopyTable = 'Skopírova» tabuµku do'; $strCopyTableOK = 'Tabuµka %s bola skorírovaná do %s.'; $strCreate = 'Vytvori»'; @@ -318,6 +319,8 @@ $strYes = ' $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strKeepPass = 'Do not change the password';//to translate +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; $strNoQuery = 'No SQL query!'; //to translate $strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate $strUpdateProfile = 'Update profile:';//to translate diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3 index f9df387fc..3d5b4b81f 100644 --- a/lang/spanish.inc.php3 +++ b/lang/spanish.inc.php3 @@ -62,7 +62,6 @@ $strColumnEmpty = 'Los nombres de columna estan vacios!'; $strColumnNames = 'Nombre de columnas'; $strCompleteInserts = 'Completar los Inserts'; $strConfirm = 'Realmente quieres hacerlo?'; -$strCopyTable = 'Copiar la tabla a'; $strCopyTableOK = 'La tabla %s ha sido copiada a %s.'; $strCreate = 'Crear'; $strCreateNewDatabase = 'Crear nueva base de datos'; @@ -322,4 +321,7 @@ $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strZip = '"zipped"'; //to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3 index 54a87a700..574c36ae2 100644 --- a/lang/swedish.inc.php3 +++ b/lang/swedish.inc.php3 @@ -65,7 +65,6 @@ $strColumnEmpty = 'Kolumn-namnen $strColumnNames = 'Kolumn-namn'; $strCompleteInserts = 'Kompletta infogningar'; $strConfirm = 'Vill du verkligen göra det?'; -$strCopyTable = 'Kopiera tabellen till'; $strCopyTableOK = 'Tabellen %s har kopierats till %s.'; $strCreate = 'Skapa'; $strCreateNewDatabase = 'Skapa ny databas'; @@ -323,4 +322,7 @@ $strYes = 'Ja'; $strZip = '"zippad"'; // To translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3 index 6bd900450..30edada60 100644 --- a/lang/thai.inc.php3 +++ b/lang/thai.inc.php3 @@ -59,7 +59,6 @@ $strColumnEmpty = 'The columns names are empty!'; //to translate $strColumnNames = 'ª×èͤÍÅÑÁ¹ì'; $strCompleteInserts = 'Complete inserts'; $strConfirm = 'Do you really want to do it?'; //to translate -$strCopyTable = 'ÊíÒà¹ÒµÒÃÒ§à»ç¹'; $strCopyTableOK = 'µÒÃÒ§ %s ä´é·íÒ¡ÒÃÊíÒà¹Òä»à»ç¹ %s àÃÕºÃéÍÂáÅéÇ.'; $strCreate = 'ÊÃéÒ§'; $strCreateNewDatabase = 'ÊÃéÒ§°Ò¹¢éÍÁÙÅãËÁè'; @@ -327,4 +326,7 @@ $strUpdateProfile = 'Update profile:';//to translate $strUpdateProfileMessage = 'The profile has been updated.';//to translate $strDatabaseHasBeenDropped = 'Database %s has been dropped.'; //to translate $strNoQuery = 'No SQL query!'; //to translate +$strCopyTable = 'Copy table to (database.table):'; +$strMoveTable = 'Move table to (database.table):'; +$strMoveTableOK = 'Table %s has been moved to %s.'; ?> diff --git a/tbl_copy.php3 b/tbl_move_copy.php3 old mode 100755 new mode 100644 similarity index 68% rename from tbl_copy.php3 rename to tbl_move_copy.php3 index 688797e70..5cd1e7d4e --- a/tbl_copy.php3 +++ b/tbl_move_copy.php3 @@ -28,8 +28,7 @@ function my_handler($sql_insert = '') * Gets some core libraries */ require('./libraries/grab_globals.lib.php3'); -$js_to_run = 'functions.js'; -require('./header.inc.php3'); +require('./libraries/common.lib.php3'); /** @@ -64,8 +63,8 @@ if (isset($new_name) && trim($new_name) != '') { $new_name = stripslashes($new_name); } if (MYSQL_INT_VERSION < 32306) { - check_reserved_words($db, $err_url); - check_reserved_words($table, $err_url); + check_reserved_words($target_db, $err_url); + check_reserved_words($new_name, $err_url); } $source = backquote($db) . '.' . backquote($table); @@ -75,8 +74,11 @@ if (isset($new_name) && trim($new_name) != '') { $sql_structure = get_table_def($db, $table, "\n", $err_url); $sql_structure = eregi_replace('^CREATE TABLE (`?)' . $table . '(`?)', 'CREATE TABLE ' . $target, $sql_structure); - $result = mysql_query($sql_structure) or mysql_die('', $sql_structure, '', $err_url); - if (isset($sql_query)) { + $result = @mysql_query($sql_structure); + if (mysql_error()) { + include('./header.inc.php3'); + mysql_die('', $sql_structure, '', $err_url); + } else if (isset($sql_query)) { $sql_query .= "\n" . $sql_structure . ';'; } else { $sql_query = $sql_structure . ';'; @@ -87,7 +89,11 @@ if (isset($new_name) && trim($new_name) != '') { // speedup copy table - staybyte - 22. Juni 2001 if (MYSQL_INT_VERSION >= 32300) { $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . backquote($table); - $result = mysql_query($sql_insert_data) or mysql_die('', $sql_insert_data, '', $err_url); + $result = @mysql_query($sql_insert_data); + if (mysql_error()) { + include('./header.inc.php3'); + mysql_die('', $sql_insert_data, '', $err_url); + } } // end MySQL >= 3.23 else { $sql_insert_data = ''; @@ -96,8 +102,24 @@ if (isset($new_name) && trim($new_name) != '') { $sql_query .= "\n\n" . $sql_insert_data; } - $message = sprintf($strCopyTableOK, $source, $target); - $reload = 1; + // Drops old table if the user has requested to move it + if (isset($submit_move)) { + $sql_drop_table = 'DROP TABLE ' . $source; + $result = @mysql_query($sql_drop_table); + if (mysql_error()) { + include('./header.inc.php3'); + mysql_die('', $sql_drop_table, '', $err_url); + } + $sql_query .= "\n\n" . $sql_drop_table . ';'; + $db = $target_db; + $table = $new_name; + } + + $message = (isset($submit_move) ? $strMoveTableOK : $strCopyTableOK); + $message = sprintf($message, $source, $target); + $reload = 1; + $js_to_run = 'functions.js'; + include('./header.inc.php3'); } // end is target table name @@ -105,6 +127,7 @@ if (isset($new_name) && trim($new_name) != '') { * No new name for the table! */ else { + include('./header.inc.php3'); mysql_die($strTableEmpty, '', '', $err_url); } diff --git a/tbl_properties.php3 b/tbl_properties.php3 index 2ca6f421e..dae0b76c7 100755 --- a/tbl_properties.php3 +++ b/tbl_properties.php3 @@ -521,7 +521,7 @@ if ($index_count > 0) { echo "\n"; ?> - " + @@ -952,12 +952,9 @@ echo "\n"; - -
  • + +
  • - - -
    @@ -965,20 +962,43 @@ echo "\n"; +  : +   + +
    + + + + +
  • +
    + + +
    +
    + + + + + + - -
    -  : + +
    - + +  .  +
    - + +
    @@ -986,7 +1006,7 @@ echo "\n";
    		  - @@ -995,15 +1015,15 @@ echo "\n"; - @@ -1014,7 +1034,7 @@ echo "\n";   
    - .' . trim($strTable) . ')'; ?> : + +
     .  - +
    - +