diff --git a/ChangeLog b/ChangeLog index bb76cabab..bbfd4b373 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,7 +50,7 @@ danbarry + [engines] Maria support + [engines] MyISAM and InnoDB: support ROW_FORMAT table option + prevent search indexes from indexing phpMyAdmin installations -+ [engines] PBXT: table options ++ [engines] PBXT: table options, foreign key (relation view, designer) 2.11.7.0 (not yet released) - bug #1908719 [interface] New field cannot be auto-increment and primary key diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 49fab7d47..73b180fcc 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -553,7 +553,6 @@ $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoD $strInnoDBPages = 'pages'; //to translate $strInnodbStat = 'InnoDB Status'; //to translate $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInternalRelations = 'Internal relations'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate @@ -996,7 +995,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1072,4 +1070,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 2bb618827..c9fae3cc1 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -266,7 +266,6 @@ $strInnodbStat = 'Gjëndja InnoDB'; $strInsecureMySQL = 'File i konfigurimit në përdorim përmban zgjedhje (root pa asnjë password) që korrispondojnë me të drejtat e account MySQL të paracaktuar. Një server MySQL funksionues me këto zgjedhje është i pambrojtur ndaj sulmeve, dhe ju duhet patjetër të korrigjoni këtë vrimë në siguri.'; $strInsertAsNewRow = 'Shto një rresht të ri'; $strInsert = 'Shto'; -$strInternalNotNecessary = '* Nuk ka nevojë për një relacion të brendshëm kur ky relacion ekziston në InnoDB.'; $strInternalRelations = 'Relacione të brendshme'; $strInUse = 'në përdorim'; @@ -995,7 +994,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1071,4 +1069,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 59cdc3de1..4839666f8 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -254,7 +254,6 @@ $strInnodbStat = 'وضع InnoDB'; $strInsecureMySQL = 'يحتوي ملف الإعدادت الخاص بك تعيينات )المستخدم root دون كلمة مرور( والذي يشير إلى حساب المستخدم الرئيسي لـMySQL. خادم MySQL الذي يعمل بهذه الإعدادت الافتراضية معرض لخطر الاقتحام، وعليك أن تقوم بإصلاح ثغرة الأمان هذه في أقرب وقت ممكن.'; $strInsertAsNewRow = 'إدخال كتسجيل جديد'; $strInsert = 'إدخال'; -$strInternalNotNecessary = '* العلاقة الداخلية غير ضرورية عندما تكون موجودة مسبقاً في InnoDB.'; $strInternalRelations = 'العلاقات الداخلية'; $strInUse = 'قيد الإستعمال'; @@ -997,7 +996,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1073,4 +1071,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index d903664ca..2090c8cc9 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -688,7 +688,6 @@ $strInnoDBDataFilePath = 'Data files'; //to translate $strInnoDBDataHomeDir = 'Data home directory'; //to translate $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoDB data files.'; //to translate $strInnoDBPages = 'pages'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInternalRelations = 'Internal relations'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate @@ -992,7 +991,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1068,4 +1066,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 26a9babb6..9b10555bc 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -245,7 +245,6 @@ $strInnodbStat = 'InnoDB Egoera'; $strInsecureMySQL = 'Zure konfigurazio fitxategiak MySQL-ren kontu pribilegiatuari dagozkion ezarpenak (root pasahitzik gabe) dauzka . Zure MySQL zerbitzaria lehenetsitako balio hauekin ari da lanean; atzipen-saiakera arrotzei irekita beraz. Segurtasun-zulo hau konpondu beharko zenuke.'; $strInsertAsNewRow = 'Txertatu errenkada berri batean'; $strInsert = 'Txertatu'; -$strInternalNotNecessary = '* Barne-erlaziorik ez da beharrezkoa InnoDB-en ere existitzen denean.'; $strInternalRelations = 'Barne-erlazioak'; $strInUse = 'lanean'; @@ -989,7 +988,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1065,4 +1063,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 1bafdde19..30e461b7f 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -348,7 +348,6 @@ $strInnodbStat = 'Стан InnoDB'; $strInsecureMySQL = 'Ваш канфігурацыйны файл утрымлівае налады (карыстальнік root без паролю), якія адпавядаюць прывілеяванаму карыстальніку MySQL па змоўчаньні. Ваш сэрвэр MySQL працуе з гэтай наладай па змоўчаньні і зьяўляецца адкрытым для зьнешняга ўрываньня, і таму вам абавязкова трэба выправіць гэтую хібу ў бясьпецы.'; $strInsertAsNewRow = 'Уставіць як новы радок'; $strInsert = 'Уставіць'; -$strInternalNotNecessary = '* Унутраная сувязь не зьяўляецца абавязковай, калі яна ўжо існуе ў InnoDB.'; $strInternalRelations = 'Унутраныя сувязі'; $strInUse = 'выкарыстоўваецца'; $strInvalidAuthMethod = 'У канфігурацыі вызначаны некарэктны мэтад аўтэнтыфікацыі:'; @@ -972,7 +971,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1048,4 +1046,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 35f25d191..eb78052d3 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -347,7 +347,6 @@ $strInnodbStat = 'Stan InnoDB'; $strInsecureMySQL = 'Vaš kanfihuracyjny fajł utrymlivaje nałady (karystalnik root biez parolu), jakija adpaviadajuć pryvilejavanamu karystalniku MySQL pa zmoŭčańni. Vaš server MySQL pracuje z hetaj naładaj pa zmoŭčańni i źjaŭlajecca adkrytym dla źniešniaha ŭryvańnia, i tamu vam abaviazkova treba vypravić hetuju chibu ŭ biaśpiecy.'; $strInsertAsNewRow = 'Ustavić jak novy radok'; $strInsert = 'Ustavić'; -$strInternalNotNecessary = '* Unutranaja suviaź nie źjaŭlajecca abaviazkovaj, kali jana ŭžo isnuje ŭ InnoDB.'; $strInternalRelations = 'Unutranyja suviazi'; $strInUse = 'vykarystoŭvajecca'; $strInvalidAuthMethod = 'U kanfihuracyi vyznačany niekarektny metad aŭtentyfikacyi:'; @@ -971,7 +970,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1047,4 +1045,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index c924e6ac3..52f0a020d 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -694,7 +694,6 @@ $strInnoDBDataFilePath = 'Data files'; //to translate $strInnoDBDataHomeDir = 'Data home directory'; //to translate $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoDB data files.'; //to translate $strInnoDBPages = 'pages'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInternalRelations = 'Internal relations'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate @@ -995,7 +994,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1071,4 +1069,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 4454341d1..62af7ba6c 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -366,12 +366,10 @@ $strInnoDBDataFilePath = 'Arquivos de dados'; $strInnoDBDataHomeDirDesc = 'A parte comum do caminho do diretório para todos os arquivos de dados do InnoDB.'; $strInnoDBDataHomeDir = 'Diretório raiz de dados'; $strInnoDBPages = 'páginas'; -$strInnoDBRelationAdded = 'Adicionado relacionamento InnoDB'; $strInnodbStat = 'Status do InnoDB'; $strInsecureMySQL = 'O seu arquivo de configuração contém configurações (root sem senha) que correspondem à conta privilegiada padrão do MySQL. O servidor MySQL rodando com esse padrão estará aberto a invasões, você realmente deveria corrigir este furo de segurança.'; $strInsertAsNewRow = 'Inserir como um novo registro'; $strInsert = 'Inserir'; -$strInternalNotNecessary = '* Não é necessária uma relação interna quando também já existe na InnoDB.'; $strInternalRelationAdded = 'Adicionado relacionamento Interno'; $strInternalRelations = 'Relações internas'; $strInUse = 'em uso'; @@ -1045,4 +1043,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 478550817..0740dd157 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -309,7 +309,6 @@ $strInnodbStat = 'InnoDB Състояние'; $strInsecureMySQL = 'Вашият конфигурационен файл съдържа настройки (root без парола), които съответстват на привилегирования акаунт на MySQL по подразбиране. Вашият MySQL сървър е стартиран с това по подразбиране и може да бъде лесно хакнат. Трябва да оправите тази дупка в сигурността.'; $strInsertAsNewRow = 'Вмъкване като нов ред'; $strInsert = 'Вмъкване'; -$strInternalNotNecessary = '* Вътрешната релация не е необходима когато съществува също в InnoDB.'; $strInternalRelations = 'Вътрешни релации'; $strInUse = 'Заето'; $strInvalidColumn = 'Невалидна колона (%s)!'; @@ -992,7 +991,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1068,4 +1066,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 61f37e18b..cbfabd9db 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -362,12 +362,10 @@ $strInnoDBDataFilePath = 'Arxius de dades'; $strInnoDBDataHomeDirDesc = 'La part comuna de la ruta al directori per tots els arxius de dades InnoDB.'; $strInnoDBDataHomeDir = 'Directori local de dades'; $strInnoDBPages = 'pàgines'; -$strInnoDBRelationAdded = 'Afegida relació InnoDB'; $strInnodbStat = 'Estat InnoDB'; $strInsecureMySQL = 'El vostre arxiu de configuració té paràmetres (root sense contrasenya) que corresponen al compte privilegiat predetermitat de MySQL. El servidor MySQL està funcionant amb aquests valors, el que significa un forat de seguretat, i s\'exposa a intrusions, pel que recomanem la reparació urgent d\'aquest forat de seguretat.'; $strInsertAsNewRow = 'Inserir com a nova fila'; $strInsert = 'Insereix'; -$strInternalNotNecessary = '* No es necessita una relació interna si ja existeix a InnoDB.'; $strInternalRelationAdded = 'Afegida relació interna'; $strInternalRelations = 'Relacions internes'; $strInUse = 'en ús'; @@ -1043,4 +1041,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index b5b92cddb..0c6c889ae 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -283,7 +283,6 @@ $strInnodbStat = 'InnoDB 状态'; $strInsecureMySQL = '您配置文件中的设定与 MySQL 默认权限账户对应(没有密码的 root)。您的 MySQL 服务器使用默认值运行当然没有问题，不过这样的话，被入侵的可能性会很大，您真的应该先补上这个安全漏洞。'; $strInsert = '插入'; $strInsertAsNewRow = '以新行插入'; -$strInternalNotNecessary = '当 * 也存在于InnoDB中的时候，内部关联并不必要。'; $strInternalRelations = '内在联系'; $strInUse = '使用中'; @@ -997,7 +996,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1073,4 +1071,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index f296619c4..165cd8579 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -336,7 +336,6 @@ $strInnodbStat = 'InnoDB 狀態'; $strInsecureMySQL = '設定檔內有關設定 (root登入及沒有密碼) 與預設的 MySQL 權限戶口相同。 MySQL 伺服器在這預設的設定運行的話會很容易被入侵，您應更改有關設定去防止安全漏洞。'; $strInsert = '新增'; $strInsertAsNewRow = '儲存為新記錄'; -$strInternalNotNecessary = '* 當內部關聯在 InnoDB 已存在時是無需要的.'; $strInternalRelations = '內部關聯'; $strInUse = '使用中'; $strInvalidAuthMethod = '於設定內設定錯誤認證方式:'; @@ -976,7 +975,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1052,4 +1050,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 6f9429b8e..2239fefa9 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -368,12 +368,10 @@ $strInnoDBDataFilePath = 'Podatkovne datoteke'; $strInnoDBDataHomeDirDesc = 'Uobičajeni dio putanje mapa za sve InnoDB podatkovne datoteke.'; $strInnoDBDataHomeDir = 'Osnovna mapa podataka'; $strInnoDBPages = 'stranice'; -$strInnoDBRelationAdded = 'Dodana InnoDB povezanosti'; $strInnodbStat = 'InnoDB stanje'; $strInsecureMySQL = 'Vaša konfiguracijska datoteka sadrži postavke (root korisnik bez lozinke) koja odgovara zadanom privilegiranom nalogu MySQL-a. Vaš MySQL poslužitelj pokrenut je sa zadanim postavkama i kao takav otvoren je upadima. Potrebno je ispraviti ovaj sigurnosni nedostatak.'; $strInsertAsNewRow = 'Umetni kao novi redak'; $strInsert = 'Umetni'; -$strInternalNotNecessary = '* Interna relacija nije potrebna ako također postoji unutar InnoDB.'; $strInternalRelationAdded = 'Dodane interne povezanosti'; $strInternalRelations = 'Interne relacije'; $strInUse = 'u upotrebi'; @@ -1046,4 +1044,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index b280ef5e0..88f6201f7 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -377,14 +377,12 @@ $strInnoDBDataFilePath = 'Soubor s daty'; $strInnoDBDataHomeDirDesc = 'Společná část cesty pro všechny soubory obsahující data InnoDB.'; $strInnoDBDataHomeDir = 'Domovský adresář pro data'; $strInnoDBPages = 'stránek'; -$strInnoDBRelationAdded = 'Vytvořena relace InnoDB'; $strInnodbStat = 'Stav InnoDB'; $strInsecureMySQL = 'Máte standardní nastavení hesla uživatele root v MySQL. Doporučujeme změnit toto nastavení a tím podstatně zvýšit zabezpečení vašeho serveru.'; $strInsertAsNewRow = 'Vložit jako nový řádek'; $strInsertedRowId = 'ID vloženého řádku: %1$d'; $strInsert = 'Vložit'; $strInterface = 'Rozhraní'; -$strInternalNotNecessary = '* Interní relace není potřebná, pokud již relace existuje v InnoDB.'; $strInternalRelationAdded = 'Interní relace vytvořena'; $strInternalRelations = 'Interní relace'; $strInUse = 'právě se používá'; @@ -1047,4 +1045,6 @@ $strZeroRemovesTheLimit = 'Poznámka: Nastavení těchto parametrů na 0 (nulu) $strZip = '„zazipováno“'; $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 526919555..558935e0e 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -367,12 +367,10 @@ $strInnoDBDataFilePath = 'Datafiler'; $strInnoDBDataHomeDir = 'Data hovedmappe'; $strInnoDBDataHomeDirDesc = 'Den fælles del af stien til mappen med alle InnoDB datafiler.'; $strInnoDBPages = 'sider'; -$strInnoDBRelationAdded = 'InnoDB-relation tilføjet'; $strInnodbStat = 'InnoDB status'; $strInsecureMySQL = 'Din konfigurationsfil indeholder indstillinger (root og intet kodeord) som svarer til en standard MySQL-priviligeret brugerkonto. Din MySQL server kører med denne standardindstilling, er åben for indtrængen, og du opfordres stærkt til at gøre noget ved dette sikkerhedshul.'; $strInsertAsNewRow = 'Indsæt som ny række'; $strInsert = 'Indsæt'; -$strInternalNotNecessary = '* En intern relation er ikke nødvendig når den også eksisterer i InnoDB.'; $strInternalRelationAdded = 'Intern relation tilføjet'; $strInternalRelations = 'Interne relationer'; $strInUse = 'i brug'; @@ -1047,4 +1045,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 8a5fdb322..539e033d8 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -279,7 +279,6 @@ $strInnodbStat = 'InnoDB Status'; $strInsecureMySQL = 'Uw configuratie bestand bevat instellingen (root zonder wachtwoord) die betrekking hebben tot de standaard MySQL account. Uw MySQL server draait met deze standaard waardes, en is open voor ongewilde toegang, het wordt dus aangeraden dit op te lossen.'; $strInsertAsNewRow = 'Voeg toe als nieuwe rij'; $strInsert = 'Invoegen'; -$strInternalNotNecessary = '* Een interne relatie is niet nodig wanneer er ook een InnoDB aanwezig is.'; $strInternalRelations = 'Interne relaties'; $strInUse = 'in gebruik'; @@ -993,7 +992,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1069,4 +1067,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 93058849e..26a641791 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -312,6 +312,7 @@ $strFlushTable = 'Flush the table ("FLUSH")'; $strFlushTables = 'Flush (close) all tables'; $strFontSize = 'Font size'; $strForeignKeyError = 'Error creating foreign key on %1$s (check data types)'; +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; $strFormat = 'Format'; $strFormEmpty = 'Missing value in the form!'; $strFreePages = 'Free pages'; @@ -378,14 +379,13 @@ $strInnoDBDataFilePath = 'Data files'; $strInnoDBDataHomeDir = 'Data home directory'; $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoDB data files.'; $strInnoDBPages = 'pages'; -$strInnoDBRelationAdded = 'InnoDB relation added'; $strInnodbStat = 'InnoDB Status'; $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.'; $strInsertAsNewRow = 'Insert as new row'; $strInsertedRowId = 'Inserted row id: %1$d'; $strInsert = 'Insert'; $strInterface = 'Interface'; -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; $strInternalRelationAdded = 'Internal relation added'; $strInternalRelations = 'Internal relations'; $strInUse = 'in use'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 6cec59f05..21d6c546d 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -359,12 +359,10 @@ $strInnoDBDataFilePath = 'Andmefailid'; $strInnoDBDataHomeDir = 'Andmete kodukataloog'; $strInnoDBDataHomeDirDesc = 'Ühine kataloogi nimeosa kõigi InnoDB andmefailide jaoks.'; $strInnoDBPages = 'lehti'; -$strInnoDBRelationAdded = 'InnoDB suhe lisatud'; $strInnodbStat = 'InnoDB staatus'; $strInsecureMySQL = 'Teie konfiguratsioonifail sisaldab seadeid (root kasutaja ilma paroolita) mis vastab MySQL-i vaikimisi priviligeeritud kasutajale. Kui Teie MySQL-i server jookseb sellise seadega on ta avatud rünnakutele, soovitav on see turvaauk kiiresti parandada.'; $strInsertAsNewRow = 'Lisa uue reana'; $strInsert = 'Lisa'; -$strInternalNotNecessary = '* Sisene seos ei ole vajalik kui ta eksisteerib ka InnoDB-s.'; $strInternalRelationAdded = 'Sisemine suhe loodud'; $strInternalRelations = 'Sisesed seosed'; $strInUse = 'kasutusel'; @@ -1053,4 +1051,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 5772fb33f..5e979bb9e 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -373,13 +373,11 @@ $strInnoDBDataFilePath = "Tallennustiedostot"; $strInnoDBDataHomeDirDesc = "Hakemistopolun yhteinen osa kaikille InnoDB-tiedostoille."; $strInnoDBDataHomeDir = "Tallennustiedostojen kotihakemisto"; $strInnoDBPages = 'sivua'; -$strInnoDBRelationAdded = 'InnoDB-relaatio luotu'; $strInnodbStat = 'InnoDB:n tila'; $strInsecureMySQL = 'Asetustiedostosi käyttää asetuksia, jotka viittaavat MySQL-palvelimen oletusarvoiseen käyttäjään (root ilman salasanaa). Tällaisin asetuksin MySQL-palvelin on altis hyökkäyksille. Tämä tietoturvariski olisi syytä korjata pikimmiten!'; $strInsertAsNewRow = 'Lisää uutena rivinä'; $strInsertedRowId = 'Lisätyn rivin tunnus: %1$d'; $strInsert = 'Lisää rivi'; -$strInternalNotNecessary = '* Sisäistä relaatiota ei tarvita, jos sellainen on jo InnoDB-kannassa.'; $strInternalRelationAdded = 'Sisäinen relaatio luotu'; $strInternalRelations = 'Sisäiset relaatiot'; $strInUse = 'käytössä'; @@ -1047,4 +1045,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 15c74b9dc..eb11faf7c 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -374,14 +374,12 @@ $strInnoDBDataFilePath = 'Fichiers de données'; $strInnoDBDataHomeDirDesc = 'Le chemin du répertoire pour tous les fichiers de données InnoDB.'; $strInnoDBDataHomeDir = 'Répertoire des données'; $strInnoDBPages = 'pages'; -$strInnoDBRelationAdded = 'Relation InnoDB ajoutée'; $strInnodbStat = 'État InnoDB'; $strInsecureMySQL = 'Votre fichier de configuration fait référence à l\'utilisateur root sans mot de passe, ce qui correspond à la valeur par défaut de MySQL. Votre serveur MySQL est donc ouvert aux intrusions, et vous devriez corriger ce problème de sécurité.'; $strInsertAsNewRow = 'Sauvegarder un nouvel enregistrement'; $strInsertedRowId = 'Identifiant de l\'enregistrement inséré : %1$d'; $strInsert = 'Insérer'; $strInterface = 'Interface'; -$strInternalNotNecessary = '* Si une relation existe dans InnoDB, il n\'est pas nécessaire de la définir dans les relations internes.'; $strInternalRelationAdded = 'Relation interne ajoutée'; $strInternalRelations = 'Relations internes'; $strInUse = 'utilisé'; @@ -1044,4 +1042,6 @@ $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; $strZip = '"zippé"'; $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 3455da7e7..b0f7eb4f3 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -367,12 +367,10 @@ $strInnoDBDataFilePath = 'Ficheiros de datos'; $strInnoDBDataHomeDirDesc = 'Parte común do camiño do directorio que ten todos os ficheiros de datos de innoDB.'; $strInnoDBDataHomeDir = 'Directorio base dos datos'; $strInnoDBPages = 'páxinas'; -$strInnoDBRelationAdded = 'Engadiuse relación InnoDB'; $strInnodbStat = 'Estado de InnoDB'; $strInsecureMySQL = 'O seu ficheiro de configuración contén axustes (en concreto, o usuário root non ten contrasinal) que corresponden coa conta con todos os privilexios que MySQL fai por omisión. O seu servidor de MySQL está a rodar con esta configuración, está aberto a intrusións e habería que mirar de solucionar este problema de seguranza.'; $strInsertAsNewRow = 'Inserir unha nova columna'; $strInsert = 'Inserir'; -$strInternalNotNecessary = '* Non se precisa dunha relación interna cando existe tamén en InnoDB.'; $strInternalRelationAdded = 'Engadiuse relación interna'; $strInternalRelations = 'Relacións internas'; $strInUse = 'en uso'; @@ -1046,4 +1044,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index d0f15a46a..70ab03af0 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -542,7 +542,6 @@ $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoD $strInnoDBPages = 'pages'; //to translate $strInnodbStat = 'InnoDB Status'; //to translate $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInternalRelations = 'Internal relations'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate @@ -997,7 +996,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1073,4 +1071,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 7bdf1b6b2..58e19ccff 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -379,13 +379,11 @@ $strInnoDBDataFilePath = 'Datendateien'; $strInnoDBDataHomeDir = 'Pfad für Datendateien'; $strInnoDBDataHomeDirDesc = 'Der Pfad des Verzeichnisses, unter welchem alle InnoDB-Datendateien abgelegt werden.'; $strInnoDBPages = 'Seiten'; -$strInnoDBRelationAdded = 'InnoDB Verknüpfung hinzugefügt'; $strInnodbStat = 'InnoDB-Status'; $strInsecureMySQL = 'Ihre Konfigurationsdatei enthält Einstellungen (Benutzer "root" ohne Passwort), welche denen des MySQL-Standardbenutzers entsprechen. Wird Ihr MySQL-Server mit diesen Einstellungen betrieben, so können Unbefugte leicht von außen auf ihn zugreifen. Sie sollten diese Sicherheitslücke unbedingt schließen!'; $strInsert = 'Einfügen'; $strInsertAsNewRow = ' Als neuen Datensatz speichern '; $strInsertedRowId = 'ID der eingefügten Zeile: %1$d'; -$strInternalNotNecessary = '* Eine interne Beziehung ist nicht notwendig, wenn sie bereits im InnoDB-Format vorliegt.'; $strInternalRelationAdded = 'Interne Verknüpfung hinzugefügt'; $strInternalRelations = 'Interne Beziehungen'; $strInvalidAuthMethod = 'Ungültige Authentifikationsmethode:'; @@ -1053,4 +1051,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 5610ed74c..c442e5706 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -693,7 +693,6 @@ $strInnoDBDataFilePath = 'Data files'; //to translate $strInnoDBDataHomeDir = 'Data home directory'; //to translate $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoDB data files.'; //to translate $strInnoDBPages = 'pages'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInternalRelations = 'Internal relations'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate @@ -994,7 +993,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1070,4 +1068,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index c089e670a..3410428e6 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -290,7 +290,6 @@ $strInnodbStat = 'מצב InnoDB'; $strInsecureMySQL = 'קובץ ההגדרות שלך מכיל הגדרות (root ללא סיסמא) אשר תואמות את חשבון הרשאה ברירת מחדל של MySQL. שרת MySQL שלך פועל עם ברירת מחדל זאת, והוא פתוח לחדירות,ואתה ממש צריך לתקן את חור אבטחה זה.'; $strInsertAsNewRow = 'הכנסה כשורה חדשה'; $strInsert = 'הכנסה'; -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; $strInternalRelations = 'יחסים פנימיים'; $strInUse = 'בשימוש'; $strInvalidColumnCount = 'מספר העמודות צריך להיות גדול מאפס.'; @@ -989,7 +988,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1065,4 +1063,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index dc348f415..48dd3728f 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -473,7 +473,6 @@ $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoD $strInnoDBPages = 'pages'; //to translate $strInnodbStat = 'InnoDB Status'; //to translate $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInternalRelations = 'Internal relations'; //to translate $strInUse = 'in use'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate @@ -997,7 +996,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1073,4 +1071,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index a4e57cb73..0e5aa0359 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -330,7 +330,6 @@ $strInnodbStat = 'InnoDB állapot'; $strInsecureMySQL = 'A konfigurációs fájl beállítása (root hozzáférés jelszó nélkül) az alapértelmezett MySQL beállítás. A MySQL szerver most ezzel fut, ami alkalmat ad a betörésre. Sürgősen javítani kell ezt a biztonsági rést.'; $strInsertAsNewRow = 'Beszúrás új sorként'; $strInsert = 'Beszúr'; -$strInternalNotNecessary = '* Egy belső kapcsolat nem szükséges, ha az létezik az InnoDB-ben is.'; $strInternalRelations = 'Belső kapcsolatok'; $strInUse = 'használatban'; $strInvalidAuthMethod = 'Érvénytelen hitelesítési mód lett beállítva a konfigurációban:'; @@ -898,7 +897,6 @@ $strInnoDBBufferPoolSize = 'Buffer pool size';//to translate $strInnoDBBufferPoolSizeDesc = 'The size of the memory buffer InnoDB uses to cache data and indexes of its tables.';//to translate $strInnoDBDataHomeDir = 'Data home directory';//to translate $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoDB data files.';//to translate -$strInnoDBRelationAdded = 'InnoDB relation added';//to translate $strInsertedRowId = 'Inserted row id: %1$d'; //to translate $strInternalRelationAdded = 'Internal relation added';//to translate $strInvalidDatabase = 'Invalid database';//to translate @@ -1064,4 +1062,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index c2d99c698..462705658 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -306,7 +306,6 @@ $strInnodbStat = 'Status dari InnoDB'; $strInsecureMySQL = 'File konfigurasi Anda ditentukan dengan pengguna Root dan tanpa adanya Kata Sandi (sama dengan Default MySQL Privileged Account). Jika MySQL-Server dijalankan dengan sedemikian, server Anda terbuka lebar untuk suatu penyerangan. Disarankan untuk memperbaiki kelemahan keamanan (security hole) ini.'; $strInsertAsNewRow = 'Sisipkan sebagai baris baru'; $strInsert = 'Sisipkan'; -$strInternalNotNecessary = '* Relasi internal tidak dibutuhkan bila ia telah berada dalam InnoDB.'; $strInternalRelations = 'Relasi internal'; $strInUse = 'sedang digunakan'; $strInvalidColumnCount = 'Perhitungan kolom wajib lebih besar dari nol.'; @@ -987,7 +986,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1063,4 +1061,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index e917460f2..1b73e4776 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -368,12 +368,10 @@ $strInnoDBDataFilePath = 'File dati'; $strInnoDBDataHomeDirDesc = 'La parte comune del path della directory per tutti i file dati InnoDB.'; $strInnoDBDataHomeDir = 'Home directory dei dati'; $strInnoDBPages = 'pagine'; -$strInnoDBRelationAdded = 'Aggiunta relazione InnoDB'; $strInnodbStat = 'Stato InnoDB'; $strInsecureMySQL = 'Il file di configurazione in uso contiene impostazioni (root con nessuna password) che corrispondono ai privilegi dell\'account MySQL predefinito. Un server MySQL funzionante con queste impostazioni è aperto a intrusioni, e si dovrebbe realmente riparare a questa falla nella sicurezza.'; $strInsertAsNewRow = 'Inserisci come nuova riga'; $strInsert = 'Inserisci'; -$strInternalNotNecessary = '* Non è necessaria una relazione interna quando già esiste in InnoDB.'; $strInternalRelationAdded = 'Aggiunte relazioni internet'; $strInternalRelations = 'Relazioni interne'; $strInUse = 'in uso'; @@ -1048,4 +1046,6 @@ $strMySQLServerInformation = 'MySQL server information'; //to translate $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 9133766fc..d2625cf5e 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -370,12 +370,10 @@ $strInnoDBDataFilePath = 'データファイル'; $strInnoDBDataHomeDir = 'データのホームディレクトリ'; $strInnoDBDataHomeDirDesc = 'すべての InnoDB データファイルに共通するディレクトリパス'; $strInnoDBPages = 'ページ'; -$strInnoDBRelationAdded = 'InnoDB リレーションを追加しました'; $strInnodbStat = 'InnoDB ステータス'; $strInsecureMySQL = 'お使いの設定ファイルに MySQL のデフォルト特権アカウントに相当する設定 (root ユーザでパスワードなし) が含まれています。お使いの MySQL サーバはこのデフォルト設定で動作しているため不正アクセス可能な状態になっています。このセキュリティーホールはかならず閉ざしてください'; $strInsertAsNewRow = '新しい行として挿入する'; $strInsert = '挿入'; -$strInternalNotNecessary = '* InnoDB にも内部リレーションが存在している場合は不要です'; $strInternalRelationAdded = '内部リレーションを追加しました'; $strInternalRelations = '内部リレーション'; $strInUse = '使用中'; @@ -1064,4 +1062,6 @@ $strTexyText = 'Texy!テキスト'; //to translate $strWebServerInformation = 'ウェブサーバ情報'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 47dcab785..04710f92b 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -604,7 +604,6 @@ $strInnoDBDataHomeDir = 'Data home directory'; //to translate $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoDB data files.'; //to translate $strInnoDBPages = 'pages'; //to translate $strInnodbStat = 'InnoDB 상태'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInternalRelations = 'Internal relations'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate @@ -992,7 +991,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1068,4 +1066,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 18136be1e..8850fd87e 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -279,7 +279,6 @@ $strInnodbStat = 'InnoDB statuss'; $strInsecureMySQL = 'Jūsu konfigurācijas fails satur iestādījumus (lietotājs "root" bez paroles), kas atbilst noklusētajam MySQL priviliģētajam lietotājam. Jūsu MySQL serveris strādā ar šo noklusēto variantu, ir atvērts uzbrukumiem, un Jums tiešām jāaiztaisa šis drošības caurums.'; $strInsertAsNewRow = 'Ievietot kā jaunu rindu'; $strInsert = 'Pievienot'; -$strInternalNotNecessary = '* Iekšējā relācija nav nepieciešama, kad tā eksistē arī iekš InnoDB.'; $strInternalRelations = 'Iekšējās relācijas'; $strInUse = 'lietošanā'; @@ -994,7 +993,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1070,4 +1068,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 50149885e..44def4590 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -290,7 +290,6 @@ $strInnodbStat = 'InnoDB būsena'; $strInsecureMySQL = 'Jūsų parinkčių byloje yra nurodyti standartiniai nustatymai (pvz: root vartotojas be slaptažožio). Taip sutinkinta MySQL darbinė stotis yra nesaugi, bei gali būti atvira įsilaužimams, todėl rekomenduojame pakeisti šias parinktis.'; $strInsertAsNewRow = 'Įterpti naują įrašą'; $strInsert = 'Įterpti'; -$strInternalNotNecessary = '* Galite nenaudoti vidinių sąryšių, jeigu jie jau apibrėžti InnoDB.'; $strInternalRelations = 'Vidiniai sąryšiai'; $strInUse = 'šiuo metu naudojama'; @@ -987,7 +986,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1063,4 +1061,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index 3a7fbcc82..ff735f0e7 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -308,7 +308,6 @@ $strInnodbStat = 'InnoDB статус'; $strInsecureMySQL = 'Вашата конфигурациска податотека содржи подесувања (root без лозинка) кои одговараат на стандардниот MySQL привилегиран налог. Вашиот MySQL сервер работи со овие подесувања, отворен е за упди, и навистина треба да го поправите овој сигурносен ризик.'; $strInsert = 'Нов запис'; $strInsertAsNewRow = 'Внеси како нов запис'; -$strInternalNotNecessary = '* Внатрешната релација не е неопходна кога постои и во InnoDB.'; $strInternalRelations = 'Внатрешни релации'; $strJapanese = 'Јапонски'; @@ -796,7 +795,6 @@ $strImportExportCoords = 'Import/Export coordinates for PDF schema'; //to trans $strImportFormat = 'Format of imported file'; //to translate $strImport = 'Import'; //to translate $strImportSuccessfullyFinished = 'Import has been successfully finished, %d queries executed.'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate @@ -1048,4 +1046,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 63f829671..83f47d101 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -596,7 +596,6 @@ $strInnoDBDataHomeDir = 'Data home directory'; //to translate $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoDB data files.'; //to translate $strInnoDBPages = 'pages'; //to translate $strInnodbStat = 'InnoDB Status'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInternalRelations = 'Internal relations'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate @@ -1009,7 +1008,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1085,4 +1083,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 6a6ab7c12..7eed2c2da 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -311,7 +311,6 @@ $strInnodbStat = 'InnoDB байдал'; $strInsecureMySQL = 'Таны тохиргооны файл нь MySQL-ын анхдагч онцгой эрхийг (нэвтрэгч root нь нууц үггүй) агуулжээ. Таны MySQL сервэр энэ анхдагчаар ажиллаж байгаа нь хэн ч урилгагүй орох боломжийг өгнө. Та хамгаалалтын асуудлаа засах хэрэгтэй'; $strInsertAsNewRow = 'Шинэ мөр оруулаад'; $strInsert = 'Оруулах'; -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; $strInternalRelations = 'Дотоод хамаарал'; $strInUse = 'хэрэглэгдэж байна'; $strInvalidColumnCount = 'Баганы тоо тэгээс их байна.'; @@ -992,7 +991,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1068,4 +1066,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 3dc3fdae3..e05fb4b97 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -371,13 +371,11 @@ $strInnoDBDataFilePath = 'Datafiler'; $strInnoDBDataHomeDir = 'Datalagringsmappe'; $strInnoDBDataHomeDirDesc = 'Felles del av filsti for alle InnoDB datafiler.'; $strInnoDBPages = 'sider'; -$strInnoDBRelationAdded = 'InnoDB relasjon lagt til'; $strInnodbStat = 'InnoDB status'; $strInsecureMySQL = 'Din konfigurasjonsfil inneholder innstillinger (root uten passord) som korrensponderer med MySQLs standard priviligerte brukerkonto. Din MySQL-tjener kjører med denne standardinnstillingen, er åpen for misbruk, og du burde fikse dette sikkerhetshullet snarest.'; $strInsert = 'Sett inn'; $strInsertedRowId = 'Insatt rad id: %1$d'; $strInsertAsNewRow = 'Sett inn som ny rad'; -$strInternalNotNecessary = '* En intern relasjon er ikke nødvendig når den også eksisterer i InnoDB.'; $strInternalRelationAdded = 'Intern relasjon lagt til'; $strInternalRelations = 'Interne relasjoner'; $strInUse = 'i bruk'; @@ -1045,4 +1043,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index c231b4a81..ca5a057a0 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -526,7 +526,6 @@ $strInnoDBDataHomeDir = 'Data home directory'; //to translate $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoDB data files.'; //to translate $strInnoDBPages = 'pages'; //to translate $strInnodbStat = 'InnoDB Status'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInternalRelations = 'Internal relations'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate @@ -994,7 +993,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1070,4 +1068,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 955591dd6..171943117 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -341,7 +341,6 @@ $strInnodbStat = 'Status InnoDB'; $strInsecureMySQL = 'Twój plik konfiguracyjny zawiera ustawienia (konto roota bez hasła), które odpowiadają domyślnemu uprzywilejowanemu kontu MySQL. Twój serwer MySQL działa z takim ustawieniem, jest otwarty dla włamywaczy. Ta luka w bezpieczeństwie naprawdę powinna zostać naprawiona.'; $strInsertAsNewRow = 'Dodaj jako nowy rekord'; $strInsert = 'Dodaj'; -$strInternalNotNecessary = '* Wewnętrzna relacja nie jest konieczna gdy istnieje również w InnoDB.'; $strInternalRelations = 'Wewnętrzne relacje'; $strInUse = 'w użyciu'; $strInvalidAuthMethod = 'W konfiguracji ustawiono błędną metodę uwierzytelniania:'; @@ -965,7 +964,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1041,4 +1039,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 9c6f8601a..6025e4806 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -243,7 +243,6 @@ $strInnodbStat = 'Estado da InnoDB'; $strInsecureMySQL = 'O seu ficheiro de configuração contem configurações (root sem palavra-passe) que correspondem à conta privilegiada por defeito do MySQL. O servidor MySQL está a correr com este valor por defeito, assim aberto a intrusões, deveria corrigir este buraco de segurança.'; $strInsertAsNewRow = 'Insere como novo registo'; $strInsert = 'Insere'; -$strInternalNotNecessary = '* Não é necessária uma relação interna quando também já existe na InnoDB.'; $strInternalRelations = 'Relações internas'; $strInUse = 'em uso'; @@ -998,7 +997,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1074,4 +1072,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 768da70cd..314f78111 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -320,13 +320,11 @@ $strIndexName = 'Nume index :'; $strIndexType = 'Tip index :'; $strIndexWarningTable = 'Probleme cu indexul tabelului `%s`'; $strInnoDBPages = 'pagini'; -$strInnoDBRelationAdded = 'Relație InnoDB adăugată'; $strInnodbStat = 'Stare InnoDB'; $strInsecureMySQL = 'Configurarea conține setările de bază (utilizator root fără parolă). Serverul MySQL poate fi astfel vulnerabil. Reparați neapărat această greșeală.'; $strInsertAsNewRow = 'Inserează ca o nouă linie'; $strInsertedRowId = 'ID rînd inserat:'; $strInsert = 'Inserare'; -$strInternalNotNecessary = '* Nu se cere o relație internă în cazul în care există și în InnoDB.'; $strInternalRelationAdded = 'Relație internă adăugată'; $strInternalRelations = 'Relații interne'; $strInUse = 'în folosință'; @@ -1062,4 +1060,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index d517b13e4..e45d8b47a 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -370,12 +370,10 @@ $strInnoDBDataFilePath = 'Файлы данных'; $strInnoDBDataHomeDir = 'Домашний каталог для данных'; $strInnoDBDataHomeDirDesc = 'Общая часть пути к каталогу для всех файлов данных InnoDB'; $strInnoDBPages = 'страниц'; -$strInnoDBRelationAdded = 'Создана связь таблиц типа InnoDB'; $strInnodbStat = 'Состояние InnoDB'; $strInsecureMySQL = 'Конфигурационный файл phpMyAdmin содержит настройки MySQL по-умолчанию, согласно которым для привилегированного пользователя "root" не задан пароль. Такие настройки делают MySQL-сервер уязвимым для несанкционированного доступа, поэтому настоятельно рекомендуется установить пароль для пользователя "root".'; $strInsert = 'Вставить'; $strInsertAsNewRow = 'Вставить запись'; -$strInternalNotNecessary = '* При наличии внутренней связи в таблице типа InnoDB, ее установка не обязательна.'; $strInternalRelationAdded = 'Добавлена внутренняя связь'; $strInternalRelations = 'Внутренние связи'; $strInUse = 'используется'; @@ -1049,4 +1047,6 @@ $strMySQLServerInformation = 'MySQL server information'; //to translate $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 6e4ed214f..6e76f6e66 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -368,12 +368,10 @@ $strInnoDBDataFilePath = 'Датотеке са подацима'; $strInnoDBDataHomeDirDesc = 'Заједнички део путање директоријума за све InnoDB датотеке са подацима.'; $strInnoDBDataHomeDir = 'Основни директоријум података'; $strInnoDBPages = 'страна'; -$strInnoDBRelationAdded = 'Додата InnoDB релација'; $strInnodbStat = 'InnoDB статус'; $strInsecureMySQL = 'Ваша конфигурациона датотека садржи подешавања (root без лозинке) која одговарају стандардном MySQL привилегованом налогу. Ваш MySQL сервер ради са овим подешавањима, отворен је за упаде, и заиста треба да исправите овај сигурносни ризик.'; $strInsertAsNewRow = 'Унеси као нови ред'; $strInsert = 'Нови запис'; -$strInternalNotNecessary = '* Унутрашња релација није неопходна када постоји и у InnoDB.'; $strInternalRelationAdded = 'Додата интерна релација'; $strInternalRelations = 'Унутрашње релације'; $strInUse = 'се користи'; @@ -1047,4 +1045,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index b8cdbbf40..6496c8f52 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -368,12 +368,10 @@ $strInnoDBDataFilePath = 'Datoteke sa podacima'; $strInnoDBDataHomeDirDesc = 'Zajednički deo putanje direktorijuma za sve InnoDB datoteke sa podacima.'; $strInnoDBDataHomeDir = 'Osnovni direktorijum podataka'; $strInnoDBPages = 'strana'; -$strInnoDBRelationAdded = 'Dodata InnoDB relacija'; $strInnodbStat = 'InnoDB status'; $strInsecureMySQL = 'Vaša konfiguraciona datoteka sadrži podešavanja (root bez lozinke) koja odgovaraju standardnom MySQL privilegovanom nalogu. Vaš MySQL server radi sa ovim podešavanjima, otvoren je za upade, i zaista treba da ispravite ovaj sigurnosni rizik.'; $strInsertAsNewRow = 'Unesi kao novi red'; $strInsert = 'Novi zapis'; -$strInternalNotNecessary = '* Unutrašnja relacija nije neophodna kada postoji i u InnoDB.'; $strInternalRelationAdded = 'Dodata interna relacija'; $strInternalRelations = 'Unutrašnje relacije'; $strInUse = 'se koristi'; @@ -1047,4 +1045,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 4d2cb4328..bde89ed7f 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -349,7 +349,6 @@ $strInnodbStat = 'InnoDB Status'; $strInsecureMySQL = 'Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole.'; $strInsertAsNewRow = 'Insert as new row'; $strInsert = 'ඇතුල් කරන්න'; -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; $strInternalRelations = 'Internal relations'; $strInUse = 'භාවිතා වෙමින් පවතී'; $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; @@ -974,7 +973,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1050,4 +1048,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 9a0f78f6d..5d5e86e18 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -344,7 +344,6 @@ $strInnodbStat = 'Stav InnoDB'; $strInsecureMySQL = 'Konfiguračný súbor obsahuje nastavenia (root bez hesla), ktoré zodpovedajú predvolenému privilegovanému MySQL účtu. Ak MySQL server beží s týmto nastavením, nie je zabezpečený proti napadnutiu, táto bezpečnostná chyba by mala byť urýchlene odstránená.'; $strInsertAsNewRow = 'Vložiť ako nový riadok'; $strInsert = 'Vložiť'; -$strInternalNotNecessary = '* Vnútorný vzťah nie je nutný ak už vzťah existuje v InnoDB.'; $strInternalRelations = 'Interné vzťahy'; $strInUse = 'práve sa používa'; $strInvalidAuthMethod = 'V konfigurácii je nastavená nesprávna autentifikačná metóda:'; @@ -972,7 +971,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1048,4 +1046,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 4caf88e8e..9445f2e4d 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -259,7 +259,6 @@ $strInnodbStat = 'InnoDB stanje'; $strInsecureMySQL = 'Konfiguracijska datoteka vsebuje nastavitve (uporabnik root brez gesla), ki odgovarjajo privzetemu privlegiranemu računu MySQLa. MySQL strežnik teče s privzetimi nastavitvami, zato je izpostavljen vdorom. Čimprej odpravite ti dve varnostni luknji.'; $strInsertAsNewRow = 'Vstavi kot novo vrstico'; $strInsert = 'Vstavi'; -$strInternalNotNecessary = '* Notranja relacija je nepotrebna, če obstaja tudi v InnoDB.'; $strInternalRelations = 'Notranje relacije'; $strInUse = 'v uporabi'; @@ -991,7 +990,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1067,4 +1065,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index d9fc56b58..1d782d19d 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -364,12 +364,10 @@ $strInnoDBDataFilePath = 'Archivos de datos'; $strInnoDBDataHomeDirDesc = 'La parte constante de la ruta del directorio para todos los archivos de datos InnoDB.'; $strInnoDBDataHomeDir = 'Directorio raíz de los datos'; $strInnoDBPages = 'páginas'; -$strInnoDBRelationAdded = 'Se añadió la relación InnoDB'; $strInnodbStat = 'Estado del InnoDB'; $strInsecureMySQL = 'Su archivo de configuración contiene parámetros (root sin contraseña) que corresponden a la cuenta privilegiada predeterminada de MySQL. Su servidor de MySQL está usando estos valores, lo que constituye una vulnerabilidad. Se le recomienda corregir esta brecha de seguridad. Por ejemplo, desde la página de inicio de phpMyAdmin seleccione Privilegios y agregue la contraseña a root@localhost. Deberá escribir la misma contraseña en config.inc.php de phpMyAdmin'; $strInsertAsNewRow = 'Insertar como una nueva fila'; $strInsert = 'Insertar'; -$strInternalNotNecessary = '* No es necesaria una relación interna cuando también existe en InnoDB.'; $strInternalRelationAdded = 'Se añadió la relación interna'; $strInternalRelations = 'Relaciones internas'; $strInUse = 'en uso'; @@ -1043,4 +1041,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'El servidor está utilizando Suhosin. Por favor, refiérase a %sdocumentation%s para posibles ajustes.'; $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 3e28f5006..df910e307 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -367,12 +367,10 @@ $strInnoDBDataFilePath = 'Datafiler'; $strInnoDBDataHomeDirDesc = 'Den gemensamma delen av sökvägen för alla InnoDB-datafiler.'; $strInnoDBDataHomeDir = 'Hemkatalog för data'; $strInnoDBPages = 'sidor'; -$strInnoDBRelationAdded = 'InnoDB relation tillagd'; $strInnodbStat = 'InnoDB-status'; $strInsecureMySQL = 'Din konfigurationsfil innehåller inställningar (root-konto utan lösenord) som motsvarar MySQL:s privilegierade standardkonto. Din MySQL-server körs med denna standardinställning och är öppen för intrång, så du bör verkligen täppa till detta säkerhetshål.'; $strInsertAsNewRow = 'Lägg till som ny rad'; $strInsert = 'Lägg till'; -$strInternalNotNecessary = '* En intern relation är inte nödvändig när den även finns i InnoDB.'; $strInternalRelationAdded = 'Intern relation tillagd'; $strInternalRelations = 'Interna relationer'; $strInUse = 'används'; @@ -1046,4 +1044,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server körs med Suhosin. Se %sdokumentation%s för möjliga frågor.'; $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 626aa2238..d627bda5f 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -329,7 +329,6 @@ $strInnodbStat = 'InnoDB Torışı'; $strInsecureMySQL = 'MySQL-servergä ireşü öçen qullanası xisap bularaq, caylaw biremendä töp xisap saylanğan (sersüzsez "root"). MySQL-server şul töp xisap belän açılğan da, andıy xällär iminlekneñ citdi tişege tip sanala.'; $strInsertAsNewRow = 'Yaña yazma kert tä'; $strInsert = 'Östäw'; -$strInternalNotNecessary = '* InnoDB eçendä bulğan eçke bäyläneşlär qabatlarğa kiräk tügel.'; $strInternalRelations = 'Eçke bäyläneş'; $strInUse = 'totıla'; $strInvalidCSVParameter = 'CSV yökläweneñ yaraqsız köyläneşe: %s'; @@ -983,7 +982,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1059,4 +1057,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 7094d51c2..eb1fd5073 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -689,7 +689,6 @@ $strInnoDBDataFilePath = 'Data files'; //to translate $strInnoDBDataHomeDir = 'Data home directory'; //to translate $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoDB data files.'; //to translate $strInnoDBPages = 'pages'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate $strInvalidColumn = 'Invalid column (%s) specified!'; //to translate @@ -993,7 +992,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1069,4 +1067,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 7eb1a5ae4..e73c6991f 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -374,12 +374,10 @@ $strInnoDBDataFilePath = 'Veri dosyaları'; $strInnoDBDataHomeDirDesc = 'Tüm InnoDB veri dosyaları için dizin yolunun ortak kısmı.'; $strInnoDBDataHomeDir = 'Veri ana dizini'; $strInnoDBPages = 'sayfa'; -$strInnoDBRelationAdded = 'InnoDB ilişkisi eklendi'; $strInnodbStat = 'InnoDB Durumu'; $strInsecureMySQL = 'Yapılandırma dosyanız varsayılan MySQL yetkili hesapla uyuşan ayarlar (parolasız root) içeriyor. MySQL sunucunuz bu varsayılan, dışardan girişe açık ayarlarla çalışıyor ve bu güvenlik açığını gerçekten düzeltmeniz gerekmektedir.'; $strInsertAsNewRow = 'Yeni satır olarak ekle'; $strInsert = 'Ekle'; -$strInternalNotNecessary = '* InnoDb\'de zaten bir iç ilişki olduğunda bu gerekli değildir.'; $strInternalRelationAdded = 'Dahili ilişki eklendi'; $strInternalRelations = 'Dahili ilişkiler'; $strInUse = 'kullanımda'; @@ -1053,4 +1051,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index b6fbe3007..688e33919 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -688,7 +688,6 @@ $strInnoDBDataFilePath = 'Data files'; //to translate $strInnoDBDataHomeDir = 'Data home directory'; //to translate $strInnoDBDataHomeDirDesc = 'The common part of the directory path for all InnoDB data files.'; //to translate $strInnoDBPages = 'pages'; //to translate -$strInternalNotNecessary = '* An internal relation is not necessary when it exists also in InnoDB.'; //to translate $strInternalRelations = 'Internal relations'; //to translate $strInvalidAuthMethod = 'Invalid authentication method set in configuration:'; //to translate $strInvalidColumnCount = 'Column count has to be larger than zero.'; //to translate @@ -991,7 +990,6 @@ $strDirectLinks = 'Direct links'; //to translate $strHideShowAll = 'Hide/Show all'; //to translate $strHideShowNoRelation = 'Hide/Show Tables with no relation'; //to translate $strInternalRelationAdded = 'Internal relation added'; //to translate -$strInnoDBRelationAdded = 'InnoDB relation added'; //to translate $strRelationDeleted = 'Relation deleted'; //to translate $strToSelectRelation = 'To select relation, click :'; //to translate $strExportImportToScale = 'Export/Import to scale'; //to translate @@ -1067,4 +1065,6 @@ $strWebServerInformation = 'Web server information'; //to translate $strAboutphpMyAdmin = 'About phpMyAdmin'; //to translate $strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate $strEvents = 'Events'; //to translate +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate ?> diff --git a/libraries/common.lib.php b/libraries/common.lib.php index e7d08b753..aed8fb2cb 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2489,4 +2489,20 @@ function PMA_extract_type_length($fieldspec) { 'length' => $length ); } + +/** + * Verifies if this table's engine supports foreign keys + * + * @uses strtoupper() + * @param string $engine + * @return boolean + */ +function PMA_foreignkey_supported($engine) { + $engine = strtoupper($engine); + if ('INNODB' == $engine || 'PBXT' == $engine) { + return true; + } else { + return false; + } +} ?> diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 419384b61..dcf91683c 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -374,7 +374,7 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') $foreign = PMA_DBI_fetch_result($rel_query, 'master_field', null, $GLOBALS['controllink']); } - if (($source == 'both' || $source == 'innodb') && strlen($table)) { + if (($source == 'both' || $source == 'foreign') && strlen($table)) { $show_create_table_query = 'SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table); $show_create_table = PMA_DBI_fetch_value($show_create_table_query, 0, 1); @@ -388,8 +388,8 @@ function PMA_getForeigners($db, $table, $column = '', $source = 'both') if (count($one_key['index_list']) == 1) { foreach ($one_key['index_list'] as $i => $field) { // If a foreign key is defined in the 'internal' source (pmadb) - // and in 'innodb', we won't get it twice if $source='both' - // because we use $field as key + // and as a native foreign key, we won't get it twice + // if $source='both' because we use $field as key // The parser looks for a CONSTRAINT clause just before // the FOREIGN KEY clause. It finds it (as output from diff --git a/pmd_common.php b/pmd_common.php index 5f8bbe819..a95d2e06d 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -71,6 +71,7 @@ function get_tabs() $i++; } + $GLOBALS['script_display_field'] .= '// ]]>' . "\n" . '' . "\n"; @@ -142,7 +143,7 @@ function get_script_contr() $i++; } } - $row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'innodb'); + $row = PMA_getForeigners($GLOBALS['db'], $val[0], '', 'foreign'); //echo "
INNO "; //print_r($row); if ($row !== false) { @@ -214,10 +215,11 @@ function get_all_keys($unique_only = false) $schema = $GLOBALS['PMD']['OWNER'][$I]; // for now, take into account only the first index segment foreach (PMA_Index::getFromTable($table, $schema) as $index) { - if ($unique_only && $index->isUnique()) { - $column = key($index->getColumns()); - $keys[$schema . '.' .$table . '.' . $column] = 1; + if ($unique_only && ! $index->isUnique()) { + continue; } + $column = key($index->getColumns()); + $keys[$schema . '.' .$table . '.' . $column] = 1; } } diff --git a/pmd_general.php b/pmd_general.php index 366f5dd9a..5e6c4fe1c 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -45,7 +45,7 @@ echo ' var strLang = Array(); strLang["strModifications"] = "' . PMA_escapeJsString($strModifications) . '"; strLang["strRelationDeleted"] = "' . PMA_escapeJsString($strRelationDeleted) . '"; - strLang["strInnoDBRelationAdded"] = "' . PMA_escapeJsString($strInnoDBRelationAdded). '"; + strLang["strForeignKeyRelationAdded"] = "' . PMA_escapeJsString($strForeignKeyRelationAdded). '"; strLang["strGeneralRelationFeat:strDisabled"] = "' . PMA_escapeJsString($strGeneralRelationFeat . ' : ' . $strDisabled) . '"; strLang["strInternalRelationAdded"] = "' . PMA_escapeJsString($strInternalRelationAdded) . '"; strLang["strErrorRelationAdded"] = "' . PMA_escapeJsString($strErrorRelationAdded) . '"; @@ -243,10 +243,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { onmouseout="this.className = old_class;" onmousedown="Click_field(' - InnoDB + FOREIGN KEY on delete diff --git a/pmd_relation_new.php b/pmd_relation_new.php index 27c171813..4e435f60c 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -22,12 +22,12 @@ $tables = PMA_DBI_get_tables_full($db, $T2); //die(); $type_T2 = strtoupper($tables[$T2]['ENGINE']); -// I n n o D B -if ($type_T1 == 'INNODB' and $type_T2 == 'INNODB') { +// native foreign key +if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && $type_T1 == $type_T2) { // relation exists? - $existrel_innodb = PMA_getForeigners($db, $T2, '', 'innodb'); - if (isset($existrel_innodb[$F2]) - && isset($existrel_innodb[$F2]['constraint'])) { + $existrel_foreign = PMA_getForeigners($db, $T2, '', 'foreign'); + if (isset($existrel_foreign[$F2]) + && isset($existrel_foreign[$F2]['constraint'])) { PMD_return(0,'strErrorRelationExists'); } // note: in InnoDB, the index does not requires to be on a PRIMARY @@ -61,10 +61,10 @@ if ($type_T1 == 'INNODB' and $type_T2 == 'INNODB') { $upd_query .= ' ON UPDATE ' . $on_update; } PMA_DBI_try_query($upd_query) or PMD_return(0,'strErrorRelationAdded'); - PMD_return(1,'strInnoDBRelationAdded'); + PMD_return(1,'strForeignKeyRelationAdded'); } -// n o n - I n n o D B +// internal (pmadb) relation } else { if ($GLOBALS['cfgRelation']['relwork'] == false) { PMD_return(0, 'strGeneralRelationFeat:strDisabled'); diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 2c3f38d07..ed74dde41 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -23,14 +23,14 @@ $type_T1 = strtoupper($tables[$T1]['ENGINE']); $tables = PMA_DBI_get_tables_full($db, $T2); $type_T2 = strtoupper($tables[$T2]['ENGINE']); -if ($type_T1 == 'INNODB' && $type_T2 == 'INNODB') { +if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && $type_T1 == $type_T2) { // InnoDB - $existrel_innodb = PMA_getForeigners($DB2, $T2, '', 'innodb'); + $existrel_foreign = PMA_getForeigners($DB2, $T2, '', 'foreign'); - if (isset($existrel_innodb[$F2]['constraint'])) { + if (isset($existrel_foreign[$F2]['constraint'])) { $upd_query = 'ALTER TABLE ' . PMA_backquote($T2) . ' DROP FOREIGN KEY ' - . PMA_backquote($existrel_innodb[$F2]['constraint']); + . PMA_backquote($existrel_foreign[$F2]['constraint']); $upd_rs = PMA_DBI_query($upd_query); } } else { diff --git a/tbl_operations.php b/tbl_operations.php index 94cf50169..5452dc58b 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -492,7 +492,7 @@ if (isset($possible_row_formats[$tbl_type])) {
diff --git a/tbl_relation.php b/tbl_relation.php index c1cc1889e..800db2e40 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -84,8 +84,8 @@ $cfgRelation = PMA_getRelationsParam(); if ($cfgRelation['relwork']) { $existrel = PMA_getForeigners($db, $table, '', 'internal'); } -if ($tbl_type == 'INNODB') { - $existrel_innodb = PMA_getForeigners($db, $table, '', 'innodb'); +if (PMA_foreignkey_supported($tbl_type)) { + $existrel_foreign = PMA_getForeigners($db, $table, '', 'foreign'); } if ($cfgRelation['displaywork']) { $disp = PMA_getDisplayField($db, $table); @@ -131,21 +131,21 @@ if (isset($destination) && $cfgRelation['relwork']) { } // end while } // end if (updates for internal relations) -// u p d a t e s f o r I n n o D B +// u p d a t e s f o r f o r e i g n k e y s // (for now, one index name only; we keep the definitions if the // foreign db is not the same) // I use $sql_query to be able to display directly the query via // PMA_showMessage() -if (isset($_REQUEST['destination_innodb'])) { +if (isset($_REQUEST['destination_foreign'])) { $display_query = ''; $seen_error = false; - foreach ($_REQUEST['destination_innodb'] as $master_field => $foreign_string) { + foreach ($_REQUEST['destination_foreign'] as $master_field => $foreign_string) { if (! empty($foreign_string)) { $foreign_string = trim($foreign_string, '`'); list($foreign_db, $foreign_table, $foreign_field) = explode('`.`', $foreign_string); - if (!isset($existrel_innodb[$master_field])) { + if (!isset($existrel_foreign[$master_field])) { // no key defined for this field // The next few lines are repeated below, so they @@ -172,9 +172,9 @@ if (isset($_REQUEST['destination_innodb'])) { $display_query .= $sql_query . "\n"; // end repeated code - } elseif (($existrel_innodb[$master_field]['foreign_db'] . '.' .$existrel_innodb[$master_field]['foreign_table'] . '.' . $existrel_innodb[$master_field]['foreign_field'] != $foreign_string) - || ($_REQUEST['on_delete'][$master_field] != (!empty($existrel_innodb[$master_field]['on_delete']) ? $existrel_innodb[$master_field]['on_delete'] : '')) - || ($_REQUEST['on_update'][$master_field] != (!empty($existrel_innodb[$master_field]['on_update']) ? $existrel_innodb[$master_field]['on_update'] : '')) + } elseif (($existrel_foreign[$master_field]['foreign_db'] . '.' .$existrel_foreign[$master_field]['foreign_table'] . '.' . $existrel_foreign[$master_field]['foreign_field'] != $foreign_string) + || ($_REQUEST['on_delete'][$master_field] != (!empty($existrel_foreign[$master_field]['on_delete']) ? $existrel_foreign[$master_field]['on_delete'] : '')) + || ($_REQUEST['on_update'][$master_field] != (!empty($existrel_foreign[$master_field]['on_update']) ? $existrel_foreign[$master_field]['on_update'] : '')) ) { // another foreign key is already defined for this field // or @@ -183,7 +183,7 @@ if (isset($_REQUEST['destination_innodb'])) { // remove existing key $sql_query = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP FOREIGN KEY ' - . PMA_backquote($existrel_innodb[$master_field]['constraint']) . ';'; + . PMA_backquote($existrel_foreign[$master_field]['constraint']) . ';'; // I tried to send both in one query but it failed PMA_DBI_query($sql_query); @@ -210,10 +210,10 @@ if (isset($_REQUEST['destination_innodb'])) { $display_query .= $sql_query . "\n"; } // end if... else.... - } elseif (isset($existrel_innodb[$master_field])) { + } elseif (isset($existrel_foreign[$master_field])) { $sql_query = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP FOREIGN KEY ' - . PMA_backquote($existrel_innodb[$master_field]['constraint']); + . PMA_backquote($existrel_foreign[$master_field]['constraint']); $sql_query .= ';'; $display_query .= $sql_query . "\n"; } // end if... else.... @@ -246,7 +246,7 @@ if (isset($_REQUEST['destination_innodb'])) { PMA_showMessage($strSuccess, null, 'success'); } } -} // end if isset($destination_innodb) +} // end if isset($destination_foreign) // U p d a t e s f o r d i s p l a y f i e l d @@ -282,8 +282,8 @@ if ($cfgRelation['displaywork'] && isset($display_field)) { if (isset($destination) && $cfgRelation['relwork']) { $existrel = PMA_getForeigners($db, $table, '', 'internal'); } -if (isset($destination_innodb) && $tbl_type=='INNODB') { - $existrel_innodb = PMA_getForeigners($db, $table, '', 'innodb'); +if (isset($destination_foreign) && PMA_foreignkey_supported($tbl_type)) { + $existrel_foreign = PMA_getForeigners($db, $table, '', 'foreign'); } if ($cfgRelation['displaywork']) { @@ -302,12 +302,13 @@ echo PMA_generate_common_hidden_inputs($db, $table); // relations -if ($cfgRelation['relwork'] || $tbl_type == 'INNODB') { +if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { // To choose relations we first need all tables names in current db - // and if PMA version permits and the main table is innodb, - // we use SHOW TABLE STATUS because we need to find other InnoDB tables + // and if the main table supports foreign keys + // we use SHOW TABLE STATUS because we need to find other tables of the + // same engine. - if ($tbl_type == 'INNODB') { + if (PMA_foreignkey_supported($tbl_type)) { $tab_query = 'SHOW TABLE STATUS FROM ' . PMA_backquote($db); // [0] of the row is the name // [1] is the type @@ -318,17 +319,19 @@ if ($cfgRelation['relwork'] || $tbl_type == 'INNODB') { $tab_rs = PMA_DBI_query($tab_query, null, PMA_DBI_QUERY_STORE); $selectboxall[] = ''; - $selectboxall_innodb[] = ''; + $selectboxall_foreign[] = ''; while ($curr_table = PMA_DBI_fetch_row($tab_rs)) { $current_table = new PMA_Table($curr_table[0], $db); $selectboxall = array_merge($selectboxall, $current_table->getUniqueColumns()); - if ($tbl_type == 'INNODB' + // if foreign keys are supported, collect all keys from other + // tables of the same engine + if (PMA_foreignkey_supported($tbl_type) && isset($curr_table[1]) - && $curr_table[1] == 'InnoDB') { - $selectboxall_innodb = array_merge($selectboxall_innodb, $current_table->getIndexedColumns()); + && strtoupper($curr_table[1]) == $tbl_type) { + $selectboxall_foreign = array_merge($selectboxall_foreign, $current_table->getIndexedColumns()); } } // end while over tables } // end if @@ -352,13 +355,14 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { ' . $strInternalRelations; - if ($tbl_type=='INNODB') { - echo PMA_showHint($strInternalNotNecessary); + if (PMA_foreignkey_supported($tbl_type)) { + echo PMA_showHint($strInternalAndForeign); } echo ''; } - if ($tbl_type == 'INNODB') { - echo 'InnoDB'; + if (PMA_foreignkey_supported($tbl_type)) { + // this does not have to be translated, it's part of the MySQL syntax + echo 'FOREIGN KEY (' . $tbl_type . ')'; echo ''; } ?> @@ -410,23 +414,23 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { '; if (!empty($save_row[$i]['Key'])) { ?> - 0) { PMA_generate_dropdown('ON DELETE', 'on_delete[' . $save_row[$i]['Field'] . ']', $options_array, - isset($existrel_innodb[$myfield]['on_delete']) ? $existrel_innodb[$myfield]['on_delete']: ''); + isset($existrel_foreign[$myfield]['on_delete']) ? $existrel_foreign[$myfield]['on_delete']: ''); echo '' . "\n" .'' . "\n"; @@ -461,7 +465,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { PMA_generate_dropdown('ON UPDATE', 'on_update[' . $save_row[$i]['Field'] . ']', $options_array, - isset($existrel_innodb[$myfield]['on_update']) ? $existrel_innodb[$myfield]['on_update']: ''); + isset($existrel_foreign[$myfield]['on_update']) ? $existrel_foreign[$myfield]['on_update']: ''); echo '' . "\n"; } else { echo $strNoIndex; diff --git a/tbl_structure.php b/tbl_structure.php index 963d6ff57..fafdeef29 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -480,9 +480,9 @@ echo $strPrintView;