From 8e0a78e0c6cf062006e7f997af6c81fbdf3ebaf7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 23 Dec 2007 13:49:34 +0000 Subject: [PATCH] remove code/message for deprecated pmadb-style column comments in the export file --- lang/afrikaans-utf-8.inc.php | 1 - lang/albanian-utf-8.inc.php | 1 - lang/arabic-utf-8.inc.php | 1 - lang/azerbaijani-utf-8.inc.php | 1 - lang/basque-utf-8.inc.php | 1 - lang/belarusian_cyrillic-utf-8.inc.php | 1 - lang/belarusian_latin-utf-8.inc.php | 1 - lang/bosnian-utf-8.inc.php | 1 - lang/brazilian_portuguese-utf-8.inc.php | 1 - lang/bulgarian-utf-8.inc.php | 1 - lang/catalan-utf-8.inc.php | 1 - lang/chinese_simplified-utf-8.inc.php | 1 - lang/chinese_traditional-utf-8.inc.php | 1 - lang/croatian-utf-8.inc.php | 1 - lang/czech-utf-8.inc.php | 1 - lang/danish-utf-8.inc.php | 1 - lang/dutch-utf-8.inc.php | 1 - lang/english-utf-8.inc.php | 1 - lang/estonian-utf-8.inc.php | 1 - lang/finnish-utf-8.inc.php | 1 - lang/french-utf-8.inc.php | 1 - lang/galician-utf-8.inc.php | 1 - lang/georgian-utf-8.inc.php | 1 - lang/german-utf-8.inc.php | 1 - lang/greek-utf-8.inc.php | 1 - lang/hebrew-utf-8.inc.php | 1 - lang/hindi-utf-8.inc.php | 1 - lang/hungarian-utf-8.inc.php | 1 - lang/indonesian-utf-8.inc.php | 1 - lang/italian-utf-8.inc.php | 1 - lang/japanese-utf-8.inc.php | 1 - lang/korean-utf-8.inc.php | 1 - lang/latvian-utf-8.inc.php | 1 - lang/lithuanian-utf-8.inc.php | 1 - lang/macedonian_cyrillic-utf-8.inc.php | 1 - lang/malay-utf-8.inc.php | 1 - lang/mongolian-utf-8.inc.php | 1 - lang/norwegian-utf-8.inc.php | 1 - lang/persian-utf-8.inc.php | 1 - lang/polish-utf-8.inc.php | 1 - lang/portuguese-utf-8.inc.php | 1 - lang/romanian-utf-8.inc.php | 1 - lang/russian-utf-8.inc.php | 1 - lang/serbian_cyrillic-utf-8.inc.php | 1 - lang/serbian_latin-utf-8.inc.php | 1 - lang/sinhala-utf-8.inc.php | 1 - lang/slovak-utf-8.inc.php | 1 - lang/slovenian-utf-8.inc.php | 1 - lang/spanish-utf-8.inc.php | 1 - lang/swedish-utf-8.inc.php | 1 - lang/tatarish-utf-8.inc.php | 1 - lang/thai-utf-8.inc.php | 1 - lang/turkish-utf-8.inc.php | 1 - lang/ukrainian-utf-8.inc.php | 1 - libraries/export/sql.php | 29 ++++++------------------- 55 files changed, 7 insertions(+), 76 deletions(-) diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 982b62049..71a1e1ae1 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -441,7 +441,6 @@ $strCheckPrivsLong = 'Check privileges for database "%s".'; //to tran $strCollation = 'Collation'; //to translate $strColumnPrivileges = 'Column-specific privileges'; //to translate $strCommand = 'Command'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompression = 'Compression'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index d633b8e26..50b64a408 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -113,7 +113,6 @@ $strCollation = 'Collation'; $strColumnNames = 'Emrat e kollonave'; $strColumnPrivileges = 'Të drejtat relative të kollonave'; $strCommand = 'Komanda'; -$strCommentsForTable = 'KOMENTET PËR TABELËN'; $strComments = 'Komente'; $strCompleteInserts = 'Të shtuarat komplet'; $strCompression = 'Kompresim'; diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 315b561ff..ee699be1b 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -650,7 +650,6 @@ $strBusyPages = 'Busy pages'; //to translate $strCalendar = 'Calendar'; //to translate $strCanNotLoadImportPlugins = 'Could not load import plugins, please check your installation!'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 3de8accd7..523e370c3 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -628,7 +628,6 @@ $strCharsetsAndCollations = 'Character Sets and Collations'; //to translate $strCharsets = 'Charsets'; //to translate $strCheckOverhead = 'Check tables with overhead'; //to translate $strCollation = 'Collation'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 100ac4b9d..1b1710865 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -637,7 +637,6 @@ $strBusyPages = 'Busy pages'; //to translate $strCalendar = 'Calendar'; //to translate $strCanNotLoadImportPlugins = 'Could not load import plugins, please check your installation!'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 7f696bd20..117e862ad 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -142,7 +142,6 @@ $strColumnNames = 'Назвы калёнак'; $strColumnPrivileges = 'Спэцыфічныя прывілеі калёнак'; $strCommand = 'Каманда'; $strComments = 'Камэнтары'; -$strCommentsForTable = 'Камэнтары да табліцы'; $strCompatibleHashing = 'Сумяшчальнае з MySQL 4.0'; $strCompleteInserts = 'Поўная ўстаўка'; $strCompression = 'Сьціск'; diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index e18b1eb60..40721c481 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -140,7 +140,6 @@ $strCollation = 'Supastaŭleńnie'; $strColumnNames = 'Nazvy kalonak'; $strColumnPrivileges = 'Specyfičnyja pryvilei kalonak'; $strCommand = 'Kamanda'; -$strCommentsForTable = 'Kamentary da tablicy'; $strComments = 'Kamentary'; $strCompatibleHashing = 'Sumiaščalnaje z MySQL 4.0'; $strCompleteInserts = 'Poŭnaja ŭstaŭka'; diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index f73890f07..03aebb0ec 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -629,7 +629,6 @@ $strBusyPages = 'Busy pages'; //to translate $strCalendar = 'Calendar'; //to translate $strCanNotLoadImportPlugins = 'Could not load import plugins, please check your installation!'; //to translate $strCheckOverhead = 'Check tables with overhead'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 24d0dcba2..9fd53480b 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -141,7 +141,6 @@ $strColumnNames = 'Nome das colunas'; $strColumnPrivileges = 'Privilégios específicos da coluna'; $strCommand = 'Comando'; $strComments = 'Comentários'; -$strCommentsForTable = 'COMENTÁRIOS PARA A TABELA'; $strCompatibleHashing = 'Compatível com MySQL 4.0'; $strCompleteInserts = 'Inserções completas'; $strCompression = 'Compressão'; diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 062b35d99..bd21c846d 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -124,7 +124,6 @@ $strCollation = 'Колация'; $strColumnNames = 'Име на колона'; $strColumnPrivileges = 'Привилегии специфични за колоната'; $strCommand = 'Команда'; -$strCommentsForTable = 'КОМЕНТАРИ ЗА ТАБЛИЦА'; $strComments = 'Коментари'; $strCompatibleHashing = 'MySQL 4.0 съвместимо'; $strCompleteInserts = 'Пълни INSERT-и'; diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 00aa0f291..79c035bb3 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -137,7 +137,6 @@ $strColumnNames = 'Nom de les columnes'; $strColumnPrivileges = 'Permissos especfics de columna'; $strCommand = 'Ordre'; $strComments = 'Comentaris'; -$strCommentsForTable = 'COMENTARIS PER LA TAULA'; $strCompatibleHashing = 'Compatible amb MySQL 4.0'; $strCompleteInserts = 'Completar insercions'; $strCompression = 'Compressi'; diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index e5a2666cb..344ec3f41 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -125,7 +125,6 @@ $strCollation = '整理'; $strColumnNames = '列名'; $strColumnPrivileges = '按列指定权限'; $strCommand = '命令'; -$strCommentsForTable = '表的注释'; $strComments = '注释'; $strCompatibleHashing = 'MySQL 4.0 兼容'; $strCompleteInserts = '完整插入'; diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index fb5dd3d10..dd2c129c1 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -140,7 +140,6 @@ $strColumnNames = '欄位名稱'; $strColumnPrivileges = '指定欄位權限'; $strCommand = '指令'; $strComments = '註解'; -$strCommentsForTable = 'COMMENTS FOR TABLE'; // keep in SQL statement $strCompatibleHashing = 'MySQL 4.0 相容'; $strCompleteInserts = '使用完整新增指令'; $strCompression = '壓縮'; diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 9a312ed88..30c201a23 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -142,7 +142,6 @@ $strCollation = 'Uspoređivanje'; $strColumnNames = 'Nazivi stupaca'; $strColumnPrivileges = 'Privilegije specifične za stupac'; $strCommand = 'Naredba'; -$strCommentsForTable = 'COMMENTS FOR TABLE'; $strComments = 'Komentari'; $strCompatibleHashing = 'MySQL 4.0 kompatibilno'; $strCompleteInserts = 'Dovrši umetanja'; diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 6708ae095..095bafd23 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -144,7 +144,6 @@ $strCollation = 'Porovnávání'; $strColumnNames = 'Názvy sloupců'; $strColumnPrivileges = 'Oprávnění pro jednotlivé sloupce'; $strCommand = 'Příkaz'; -$strCommentsForTable = 'KOMENTÁŘE PRO TABULKU'; $strComments = 'Komentáře'; $strCompatibleHashing = 'Kompatibilní s MySQL 4.0'; $strCompleteInserts = 'Úplné inserty'; diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 986020aa4..9d6417fb9 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -142,7 +142,6 @@ $strCollation = 'Kollation (Collation)'; $strColumnNames = 'Kolonnenavne'; $strColumnPrivileges = 'Kolonne-specifikke privilegier'; $strCommand = 'Kommando'; -$strCommentsForTable = 'COMMENTS FOR TABLE (tabel-kommentarer)'; $strComments = 'Kommentarer'; $strCompatibleHashing = 'MySQL 4.0 kompatibel'; $strCompleteInserts = 'Komplette inserts'; diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index ee9314085..e94b0d8a6 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -122,7 +122,6 @@ $strColumnNames = 'Kolom namen'; $strColumnPrivileges = 'Kolom-specifieke privileges'; $strCommand = 'Commando'; $strComments = 'Commentaar'; -$strCommentsForTable = 'COMMENTAAR VOOR TABEL'; $strCompatibleHashing = 'MySQL 4.0 compatibel'; $strCompleteInserts = 'Invoegen voltooid'; $strCompression = 'Compressie'; diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 8dfb11aac..85a8f6381 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -145,7 +145,6 @@ $strColumnNames = 'Column names'; $strColumnPrivileges = 'Column-specific privileges'; $strCommand = 'Command'; $strComments = 'Comments'; -$strCommentsForTable = 'COMMENTS FOR TABLE'; $strCompatibleHashing = 'MySQL 4.0 compatible'; $strCompleteInserts = 'Complete inserts'; $strCompression = 'Compression'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index dc32eaad8..6a3fa3087 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -143,7 +143,6 @@ $strCollation = 'Määrang'; $strColumnNames = 'Väljade nimed'; $strColumnPrivileges = 'Väli-spetsiifilised privileegid'; $strCommand = 'Käsk'; -$strCommentsForTable = 'KOMMENTAARID TABELILE'; $strComments = 'Kommentaarid'; $strCompatibleHashing = 'MySQL 4.0-iga ühilduv'; $strCompleteInserts = 'Täispikk INSERT'; diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 7359f3fa6..e5d8ac9dd 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -144,7 +144,6 @@ $strCollation = 'Aakkosjärjestys'; $strColumnNames = 'Sarakkeiden nimet'; $strColumnPrivileges = 'Sarakekohtaiset käyttöoikeudet'; $strCommand = 'Komento'; -$strCommentsForTable = 'KOMMENTIT TAULULLE'; $strComments = 'Kommentit'; $strCompatibleHashing = 'MySQL 4.0 -yhteensopiva'; $strCompleteInserts = 'Kokonaiset lisäyslauseet'; diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 1f87a2943..e9db1f06b 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -140,7 +140,6 @@ $strColumnNames = 'Nom des colonnes'; $strColumnPrivileges = 'Privilèges de colonnes'; $strCommand = 'Commande'; $strComments = 'Commentaires'; -$strCommentsForTable = 'COMMENTAIRES POUR LA TABLE'; $strCompatibleHashing = 'compatible MySQL 4.0'; $strCompleteInserts = 'Insertions complètes'; $strCompression = 'Compression'; diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 33a6b2d5e..7599f2c66 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -142,7 +142,6 @@ $strColumnNames = 'Nomes das Columnas'; $strColumnPrivileges = 'Privilexios proprios de columna'; $strCommand = 'Comando'; $strComments = 'Comentarios'; -$strCommentsForTable = 'COMENTARIOS PARA A TABELA'; $strCompatibleHashing = 'Compatíbel co MySQL 4.0'; $strCompleteInserts = 'Insercións completas'; $strCompression = 'Compresión'; diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 07d689aa8..b62015430 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -421,7 +421,6 @@ $strColComFeat = 'Displaying Column Comments'; //to translate $strCollation = 'Collation'; //to translate $strColumnPrivileges = 'Column-specific privileges'; //to translate $strCommand = 'Command'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompression = 'Compression'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 3b5bc89b2..3b9c4cbc0 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -152,7 +152,6 @@ $strColumnNames = 'Spaltennamen'; $strColumnPrivileges = 'Spaltenspezifische Rechte'; $strCommand = 'Befehl'; $strComments = 'Kommentare'; -$strCommentsForTable = 'TABELLENKOMMENTARE'; $strCompatibleHashing = 'MySQL 4.0 kompatibel'; $strCompleteInserts = 'Vollständige \'INSERT\'s'; $strCompression = 'Kompression'; diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 23d805327..736f5a705 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -628,7 +628,6 @@ $strCaseSensitive = 'case-sensitive'; //to translate $strCharsetsAndCollations = 'Character Sets and Collations'; //to translate $strCheckOverhead = 'Check tables with overhead'; //to translate $strCollation = 'Collation'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 02c31a6fb..394797886 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -118,7 +118,6 @@ $strCollation = 'קידוד'; $strColumnNames = 'שמות עמודה'; $strColumnPrivileges = 'הרשאות ספציפיות-לעמודה'; $strCommand = 'פקודה'; -$strCommentsForTable = 'הערות עבור טבלה'; $strComments = 'הערות'; $strCompatibleHashing = 'תואם MySQL 4.0'; $strCompleteInserts = 'השלם הכנסות'; diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index beab5ba6c..4ebf328ff 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -339,7 +339,6 @@ $strCheckOverhead = 'Check tables with overhead'; //to translate $strColComFeat = 'Displaying Column Comments'; //to translate $strCollation = 'Collation'; //to translate $strCommand = 'Command'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompression = 'Compression'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index d5c9aadb9..095105695 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -132,7 +132,6 @@ $strCollation = 'Egybevetés'; $strColumnNames = 'Oszlop nevek'; $strColumnPrivileges = 'Oszlop-specifikus privilégiumok'; $strCommand = 'Parancs'; -$strCommentsForTable = 'Tábla-megjegyzések'; $strComments = 'Megjegyzések'; $strCompatibleHashing = 'MySQL 4.0 kompatibilis'; $strCompleteInserts = 'Mezőneveket is hozzáadja'; diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index c9e016c4f..0502df82d 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -126,7 +126,6 @@ $strCollation = 'Penyortiran'; $strColumnNames = 'Nama kolom'; $strColumnPrivileges = 'Hak (privileges) khusus terhadap kolum'; $strCommand = 'Perintah'; -$strCommentsForTable = 'KOMENTAR UNTUK TABEL'; $strComments = 'Komentar'; $strCompatibleHashing = 'MySQL 4.0 compatible'; $strCompleteInserts = 'INSERT lengkap'; diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index d2d0547a2..8484354f4 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -143,7 +143,6 @@ $strColumnNames = 'Nomi delle colonne'; $strColumnPrivileges = 'Privilegi relativi alle colonne'; $strCommand = 'Comando'; $strComments = 'Commenti'; -$strCommentsForTable = 'Commenti per la tabella'; $strCompatibleHashing = 'Compatibile con MySQL 4.0'; $strCompleteInserts = 'Inserimenti completi'; $strCompression = 'Compressione'; diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index cf18e5ea7..d3be2ca5d 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -144,7 +144,6 @@ $strColumnNames = 'カラム名'; $strColumnPrivileges = 'このカラムに固有の特権'; $strCommand = 'コマンド'; $strComments = 'コメント'; -$strCommentsForTable = 'COMMENTS FOR TABLE'; // XXX $strCompatibleHashing = 'MySQL 4.0 互換'; $strCompleteInserts = '完全な INSERT 文を作成する'; $strCompression = '圧縮'; diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 70c49deca..5e806c04a 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -497,7 +497,6 @@ $strCharsets = 'Charsets'; //to translate $strCheckOverhead = 'Check tables with overhead'; //to translate $strCollation = 'Collation'; //to translate $strCommand = 'Command'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index b0b65d43d..9fc66d290 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -121,7 +121,6 @@ $strCollation = 'Izkārtojumi'; $strColumnNames = 'Kolonnu nosaukumi'; $strColumnPrivileges = 'Kolonnu specifiskās privilēģijas'; $strCommand = 'Komanda'; -$strCommentsForTable = 'KOMENTĀRI TABULAI'; $strComments = 'Komentāri'; $strCompatibleHashing = 'MySQL 4.0 savietojams'; $strCompleteInserts = 'Pilnas INSERT izteiksmes'; diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 0acaee834..4a9a7c69a 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -119,7 +119,6 @@ $strCollation = 'Palyginimas'; $strColumnNames = 'Stulpelių vardai'; $strColumnPrivileges = 'Specifinės stulpelių privilegijos'; $strCommand = 'Komanda'; -$strCommentsForTable = 'COMMENTS FOR TABLE'; $strComments = 'Komentarai'; $strCompatibleHashing = 'Suderinamas sy MySQL 4.0'; $strCompleteInserts = 'Visiškas įterpimas'; diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index 85dc56c26..8ea665aa4 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -132,7 +132,6 @@ $strColumnNames = 'Имиња на колони'; $strColumnPrivileges = 'Привилегии врзани за колоните'; $strCommand = 'Наредба'; $strComments = 'Коментари'; -$strCommentsForTable = 'КОМЕНТАР НА ТАБЕЛАТА'; $strCompatibleHashing = 'MySQL 4.0 компатибилно'; $strCompleteInserts = 'Комплетен INSERT (со имиња на полињата)'; $strCompression = 'Компресија'; diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 8e5c0f3c1..6eea5bfc3 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -492,7 +492,6 @@ $strCheckPrivs = 'Check Privileges'; //to translate $strCheckPrivsLong = 'Check privileges for database "%s".'; //to translate $strCollation = 'Collation'; //to translate $strColumnPrivileges = 'Column-specific privileges'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 577238cc2..9b371b808 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -131,7 +131,6 @@ $strCollation = 'Жишилт'; $strColumnNames = 'Баганын нэрс'; $strColumnPrivileges = 'Онцгой эрх, баганын эрх'; $strCommand = 'Команд'; -$strCommentsForTable = 'Хүснэгтийн тайлбар'; $strComments = 'Тайлбар'; $strCompatibleHashing = 'MySQL 4.0 compatible'; $strCompleteInserts = 'Оруулалтыг дуусгах'; diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 858d08609..daa137d27 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -141,7 +141,6 @@ $strColumnNames = 'Kolonnenavn'; $strColumnPrivileges = 'Kolonne-spesifikke privilegier'; $strCommand = 'Kommando'; $strComments = 'Kommentarer'; -$strCommentsForTable = 'TABELLKOMMENTARER'; $strCompatibleHashing = 'MySQL 4.0 kompatibel'; $strCompleteInserts = 'Komplette innlegg'; $strCompression = 'Kompresjon'; diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 4478bd903..356835dab 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -415,7 +415,6 @@ $strCheckPrivsLong = 'Check privileges for database "%s".'; //to trans $strCollation = 'Collation'; //to translate $strColumnPrivileges = 'Column-specific privileges'; //to translate $strCommand = 'Command'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index ee9490654..32ca83b62 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -134,7 +134,6 @@ $strCollation = 'Metoda porównywania napisów'; $strColumnNames = 'Nazwy kolumn'; $strColumnPrivileges = 'Uprawnienia specyficzne dla kolumn'; $strCommand = 'Polecenie'; -$strCommentsForTable = 'KOMENTARZE TABELI'; $strComments = 'Komentarze'; $strCompatibleHashing = 'Kompatybilny z MySQL-em 4.0'; $strCompleteInserts = 'Pełne dodania'; diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 614578c28..69f30e288 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -629,7 +629,6 @@ $strCanNotLoadImportPlugins = 'Could not load import plugins, please check your $strCharsetsAndCollations = 'Character Sets and Collations'; //to translate $strCheckOverhead = 'Check tables with overhead'; //to translate $strCollation = 'Collation'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 48d898f65..6318b0504 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -119,7 +119,6 @@ $strColumnNames = 'Numele coloanelor'; $strColumnPrivileges = 'Drepturi specifice de coloana'; $strCommand = 'Comanda'; $strComments = 'Comentarii'; -$strCommentsForTable = 'COMENTARII PENTRU TABEL'; $strCompatibleHashing = 'Compatibil MySQL 4.0'; $strCompleteInserts = 'Rezolva inserarea'; $strCompression = 'Compresie'; diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 46d30e5ce..8422db64a 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -145,7 +145,6 @@ $strColumnNames = 'Названия столбцов'; $strColumnPrivileges = 'Привилегии уровня столбца'; $strCommand = 'Команда'; $strComments = 'Комментарии'; -$strCommentsForTable = 'Комментарии к таблице'; $strCompatibleHashing = 'MySQL 4.0 совместимо'; $strCompleteInserts = 'Полная вставка'; $strCompression = 'Упаковать'; diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 55653d95c..9a9161418 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -142,7 +142,6 @@ $strCollation = 'Сортирање'; $strColumnNames = 'Имена колона'; $strColumnPrivileges = 'Привилегије везане за колоне'; $strCommand = 'Наредба'; -$strCommentsForTable = 'КОМЕНТАРИ ТАБЕЛЕ'; $strComments = 'Коментари'; $strCompatibleHashing = 'MySQL 4.0 компатибилно'; $strCompleteInserts = 'Комплетан INSERT (са именима поља)'; diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index d8ffc8e57..715771293 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -142,7 +142,6 @@ $strCollation = 'Sortiranje'; $strColumnNames = 'Imena kolona'; $strColumnPrivileges = 'Privilegije vezane za kolone'; $strCommand = 'Naredba'; -$strCommentsForTable = 'KOMENTARI TABELE'; $strComments = 'Komentari'; $strCompatibleHashing = 'MySQL 4.0 kompatibilno'; $strCompleteInserts = 'Kompletan INSERT (sa imenima polja)'; diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 246e9db72..d427a10e1 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -143,7 +143,6 @@ $strColumnNames = 'තීර නම්'; $strColumnPrivileges = 'Column-specific privileges'; $strCommand = 'විධානය'; $strComments = 'විස්තරය'; -$strCommentsForTable = 'COMMENTS FOR TABLE'; $strCompatibleHashing = 'MySQL 4.0 compatible'; $strCompleteInserts = 'Complete inserts'; $strCompression = 'Compression'; diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 92e45e553..f9baac2bf 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -138,7 +138,6 @@ $strCollation = 'Zotriedenie'; $strColumnNames = 'Názvy stĺpcov'; $strColumnPrivileges = 'Oprávnenia pre jednotlivé stĺpce'; $strCommand = 'Príkaz'; -$strCommentsForTable = 'KOMENTÁRE PRE TABUĽKU'; $strComments = 'Komentáre'; $strCompatibleHashing = 'Kompatibilné s MySQL 4.0'; $strCompleteInserts = 'Úplné vloženie'; diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 46e6d90dd..54192d68d 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -109,7 +109,6 @@ $strCollation = 'Pravilo za razvrščanje znakov'; $strColumnNames = 'Imena stolpcev'; $strColumnPrivileges = 'Privilegiji tipični za stolpec'; $strCommand = 'Ukaz'; -$strCommentsForTable = 'KOMENTARJI ZA TABELO'; $strComments = 'Komentarji'; $strCompleteInserts = 'Popolne \'insert\' poizvedbe'; $strCompression = 'Stiskanje'; diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 90f9cf423..87004eace 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -139,7 +139,6 @@ $strColumnNames = 'Nombre de las columnas'; $strColumnPrivileges = 'Privilegios específicos para la columna'; $strCommand = 'Comando'; $strComments = 'Comentarios'; -$strCommentsForTable = 'COMENTARIOS PARA LA TABLA'; $strCompatibleHashing = 'Compatible con MySQL 4.0'; $strCompleteInserts = 'Completar los INSERTS'; $strCompression = 'Compresión'; diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index f18c3e2db..b7c7da43a 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -141,7 +141,6 @@ $strCollation = 'Kollationering'; $strColumnNames = 'Kolumn-namn'; $strColumnPrivileges = 'Kolumnspecifika privilegier'; $strCommand = 'Kommando'; -$strCommentsForTable = 'KOMMENTARER FÖR TABELL'; $strComments = 'Kommentarer'; $strCompatibleHashing = 'Kompatibel med MySQL 4.0'; $strCompleteInserts = 'Kompletta infogningar'; diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 87d2728f1..5477ca720 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -132,7 +132,6 @@ $strColumnNames = 'Alan iseme'; $strColumnPrivileges = 'Berär bağana öçen xoquqlar'; $strCommand = 'Ämer'; $strComments = 'Açıqlama'; -$strCommentsForTable = 'COMMENTS FOR TABLE'; $strCompatibleHashing = 'MySQL 4.0 öçen yaraqlı'; $strCompleteInserts = 'Tulayım östise'; $strCompression = 'Qısu'; diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 36364d685..44f923493 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -622,7 +622,6 @@ $strBusyPages = 'Busy pages'; //to translate $strCanNotLoadImportPlugins = 'Could not load import plugins, please check your installation!'; //to translate $strCheckOverhead = 'Check tables with overhead'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 12394f156..4af7f3955 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -148,7 +148,6 @@ $strCollation = 'Karşılaştırma'; $strColumnNames = 'Sütun adları'; $strColumnPrivileges = 'Sütuna özgü yetkiler'; $strCommand = 'Komut'; -$strCommentsForTable = 'TABLO YORUMLARI'; $strComments = 'Yorumlar'; $strCompatibleHashing = 'MySQL 4.0 uyumlu'; $strCompleteInserts = 'Bütün eklemeler'; diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 1bdf96cec..cb9c17304 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -623,7 +623,6 @@ $strBusyPages = 'Busy pages'; //to translate $strCalendar = 'Calendar'; //to translate $strCanNotLoadImportPlugins = 'Could not load import plugins, please check your installation!'; //to translate $strCheckOverhead = 'Check tables with overhead'; //to translate -$strCommentsForTable = 'COMMENTS FOR TABLE'; //to translate $strCompatibleHashing = 'MySQL 4.0 compatible'; //to translate $strCompressionWillBeDetected = 'Imported file compression will be automatically detected from: %s'; //to translate $strConfigDefaultFileError = 'Could not load default configuration from: "%1$s"'; //to translate diff --git a/libraries/export/sql.php b/libraries/export/sql.php index c00948aa7..dad2d8bc5 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -572,14 +572,13 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false) * @param string the table name * @param string the end of line sequence * @param boolean whether to include relation comments - * @param boolean whether to include column comments * @param boolean whether to include mime comments * * @return string resulting comments * * @access public */ -function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_comments = false, $do_mime = false) +function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime = false) { global $cfgRelation; global $sql_backquotes; @@ -587,13 +586,6 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_comm $schema_create = ''; - // triggered only for MySQL < 4.1.x (pmadb-style comments) - if ($do_comments && $cfgRelation['commwork']) { - if (!($comments_map = PMA_getComments($db, $table))) { - unset($comments_map); - } - } - // Check if we can use Relations (Mike Beck) if ($do_relation && !empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in @@ -615,17 +607,6 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_comm } } - if (isset($comments_map) && count($comments_map) > 0) { - $schema_create .= $crlf - . PMA_exportComment() - . PMA_exportComment($GLOBALS['strCommentsForTable']. ' ' . PMA_backquote($table, $sql_backquotes) . ':'); - foreach ($comments_map AS $comment_field => $comment) { - $schema_create .= PMA_exportComment(' ' . PMA_backquote($comment_field, $sql_backquotes)) - . PMA_exportComment(' ' . PMA_backquote($comment, $sql_backquotes)); - } - $schema_create .= PMA_exportComment(); - } - if (isset($mime_map) && count($mime_map) > 0) { $schema_create .= $crlf . PMA_exportComment() @@ -662,7 +643,11 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_comm * @param string the end of line sequence * @param string the url to go back in case of error * @param boolean whether to include relation comments - * @param boolean whether to include column comments + * @param boolean whether to include the pmadb-style column comments + * as comments in the structure; this is deprecated + * but the parameter is left here because export.php + * calls PMA_exportStructure() also for other export + * types which use this parameter * @param boolean whether to include mime comments * @param string 'stand_in', 'create_table', 'create_view' * @param string 'server', 'database', 'table' @@ -717,7 +702,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE, $dump .= PMA_getTableDefStandIn($db, $table, $crlf); } // end switch - $dump .= PMA_getTableComments($db, $table, $crlf, $relation, $comments, $mime); + $dump .= PMA_getTableComments($db, $table, $crlf, $relation, $mime); // this one is built by PMA_getTableDef() to use in table copy/move // but not in the case of export unset($GLOBALS['sql_constraints_query']);