diff --git a/ChangeLog b/ChangeLog index d82953076..c91e58b17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + rfe #838637 [privileges] Export a user's privileges - [core] Updated mootools to fix some glitches with Safari. + rfe #2816943 [interface] Add REGEXP ^...$ to select dialog. ++ rfe #2924956 [interface] Add insert ignore option to editing row. 3.3.0.0 (not yet released) + rfe #2308632 [edit] Use hex for (var)binary fields, diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index d6b6cc080..e89a79abc 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 1c1c2c997..7f66c27a0 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1638,4 +1638,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index edb319468..fdba98e20 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 0d6dd52bd..ce15569a0 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 275eab3fb..83667bb2e 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index c092203c4..08d48def0 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1634,4 +1634,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index d26cd5114..21aab667e 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1634,4 +1634,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 3393fdeb8..196ef3c76 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1646,4 +1646,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 4f2d3e5e6..f517ee954 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 560b9483f..3edcae799 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1634,4 +1634,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index ef0267c64..fb9ecf13e 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index b63a957c1..bf633ee53 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1626,4 +1626,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index ae46965fe..dd7a42ef2 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 5ec61739e..8da16aa62 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 4f36b4fac..1fb5a6bc5 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1634,4 +1634,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 4b57722b2..84fafe651 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1628,4 +1628,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index fd8ab5334..01fd4d6b7 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 1143139b2..99a30144a 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1633,4 +1633,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 88da2891e..44a869741 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -133,26 +133,6 @@ $strCardinality = 'Cardinality'; $strCaseInsensitive = 'case-insensitive'; $strCaseSensitive = 'case-sensitive'; $strCentralEuropean = 'Central European'; -$strChange = 'Change'; -$strChangeCopyModeCopy = '... keep the old one.'; -$strChangeCopyMode = 'Create a new user with the same privileges and ...'; -$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.'; -$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.'; -$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.'; -$strChangeCopyUser = 'Change Login Information / Copy User'; -$strChangeDisplay = 'Choose field to display'; -$strChangePassword = 'Change password'; -$strCharset = 'Charset'; -$strCharsetOfFile = 'Character set of the file:'; -$strCharsetsAndCollations = 'Character Sets and Collations'; -$strCharsets = 'Charsets'; -$strCheckAll = 'Check All'; -$strCheck = 'Check'; -$strCheckOverhead = 'Check tables having overhead'; -$strCheckPrivs = 'Check Privileges'; -$strCheckPrivsLong = 'Check privileges for database "%s".'; -$strCheckTable = 'Check table'; -$strChoosePage = 'Please choose a page to edit'; $strClickToSelect = 'Click to select'; $strClickToUnselect = 'Click to unselect'; $strColComFeat = 'Displaying Column Comments'; @@ -208,6 +188,26 @@ $strCustomColor = 'Custom color'; $strCyrillic = 'Cyrillic'; $strCzech = 'Czech'; $strCzechSlovak = 'Czech-Slovak'; +$strChangeCopyModeCopy = '... keep the old one.'; +$strChangeCopyMode = 'Create a new user with the same privileges and ...'; +$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.'; +$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.'; +$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.'; +$strChangeCopyUser = 'Change Login Information / Copy User'; +$strChangeDisplay = 'Choose field to display'; +$strChange = 'Change'; +$strChangePassword = 'Change password'; +$strCharset = 'Charset'; +$strCharsetOfFile = 'Character set of the file:'; +$strCharsetsAndCollations = 'Character Sets and Collations'; +$strCharsets = 'Charsets'; +$strCheckAll = 'Check All'; +$strCheck = 'Check'; +$strCheckOverhead = 'Check tables having overhead'; +$strCheckPrivs = 'Check Privileges'; +$strCheckPrivsLong = 'Check privileges for database "%s".'; +$strCheckTable = 'Check table'; +$strChoosePage = 'Please choose a page to edit'; $strDanish = 'Danish'; $strDatabase = 'Database'; @@ -434,6 +434,7 @@ $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 by setting a password for user \'root\'.'; $strInsertAsNewRow = 'Insert as new row'; $strInsertedRowId = 'Inserted row id: %1$d'; +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; $strInsert = 'Insert'; $strInterface = 'Interface'; $strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; @@ -471,7 +472,6 @@ $strKorean = 'Korean'; $strLandscape = 'Landscape'; $strLanguage = 'Language'; $strLanguageUnknown = 'Unknown language: %1$s.'; -$strLatchedPages = 'Latched pages'; $strLatexCaption = 'Table caption'; $strLatexContent = 'Content of table __TABLE__'; $strLatexContinuedCaption = 'Continued table caption'; @@ -480,6 +480,7 @@ $strLatexIncludeCaption = 'Include table caption'; $strLatexLabel = 'Label key'; $strLaTeX = 'LaTeX'; $strLatexStructure = 'Structure of table __TABLE__'; +$strLatchedPages = 'Latched pages'; $strLatvian = 'Latvian'; $strLDI = 'CSV using LOAD DATA'; $strLDILocal = 'Use LOCAL keyword'; @@ -538,9 +539,9 @@ $strMyISAMRepairThreadsDesc = 'If this value is greater than 1, MyISAM table ind $strMyISAMRepairThreads = 'Repair threads'; $strMyISAMSortBufferSizeDesc = 'The buffer that is allocated when sorting MyISAM indexes during a REPAIR TABLE or when creating indexes with CREATE INDEX or ALTER TABLE.'; $strMyISAMSortBufferSize = 'Sort buffer size'; -$strMySQLCharset = 'MySQL charset'; $strMysqlClientVersion = 'MySQL client version'; $strMySQLConnectionCollation = 'MySQL connection collation'; +$strMySQLCharset = 'MySQL charset'; $strMysqlLibDiffersServerVersion = 'Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.'; $strMySQLSaid = 'MySQL said: '; $strMySQLShowProcess = 'Show processes'; @@ -610,19 +611,19 @@ $strPartitionDefinition = 'PARTITION definition'; $strPartitioned = 'partitioned'; $strPartitionMaintenance = 'Partition maintenance'; $strPartition = 'Partition %s'; -$strPasswordChanged = 'The password for %s was changed successfully.'; $strPasswordEmpty = 'The password is empty!'; $strPasswordHashing = 'Password Hashing'; +$strPasswordChanged = 'The password for %s was changed successfully.'; $strPasswordNotSame = 'The passwords aren\'t the same!'; $strPassword = 'Password'; -$strPBXTCheckpointFrequency = 'Checkpoint frequency'; -$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.'; $strPBXTDataFileGrowSize = 'Data file grow size'; $strPBXTDataFileGrowSizeDesc = 'The grow size of the handle data (.xtd) files.'; $strPBXTDataLogThreshold = 'Data log threshold'; $strPBXTDataLogThresholdDesc = 'The maximum size of a data log file. The default value is 64MB. PBXT can create a maximum of 32000 data logs, which are used by all tables. So the value of this variable can be increased to increase the total amount of data that can be stored in the database.'; $strPBXTGarbageThresholdDesc = 'The percentage of garbage in a data log file before it is compacted. This is a value between 1 and 99. The default is 50.'; $strPBXTGarbageThreshold = 'Garbage threshold'; +$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.'; +$strPBXTCheckpointFrequency = 'Checkpoint frequency'; $strPBXTIndexCacheSizeDesc = 'This is the amount of memory allocated to the index cache. Default value is 32MB. The memory allocated here is used only for caching index pages.'; $strPBXTIndexCacheSize = 'Index cache size'; $strPBXTLogBufferSizeDesc = 'The size of the buffer used when writing a data log. The default is 256MB. The engine allocates one buffer per thread, but only if the thread is required to write a data log.'; @@ -683,8 +684,8 @@ $strPrivDescDelete = 'Allows deleting data.'; $strPrivDescDropDb = 'Allows dropping databases and tables.'; $strPrivDescDropTbl = 'Allows dropping tables.'; $strPrivDescEvent = 'Allows to set up events for the event scheduler'; -$strPrivDescExecute5 = 'Allows executing stored routines.'; $strPrivDescExecute = 'Allows running stored procedures; has no effect in this MySQL version.'; +$strPrivDescExecute5 = 'Allows executing stored routines.'; $strPrivDescFile = 'Allows importing data from and exporting data into files.'; $strPrivDescGrant = 'Allows adding users and privileges without reloading the privilege tables.'; $strPrivDescIndex = 'Allows creating and dropping indexes.'; @@ -762,15 +763,15 @@ $strReplaceNULLBy = 'Replace NULL by'; $strReplaceTable = 'Replace table data with file'; $strReplicationAddLines = 'Now, add the following lines at the end of [mysqld] section in your my.cnf and please restart the MySQL server afterwards.'; $strReplicationAddSlaveUser = 'Add slave replication user'; -$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; $strReplicationConfiguredMaster = 'This server is configured as master in a replication process.'; $strReplicationControlSlave = 'Control slave:'; $strReplicationErrorGetPosition = 'Unable to read master log position. Possible privilege problem on master.'; $strReplicationErrorMasterConnect = 'Unable to connect to master %s.'; +$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; +$strReplicationMasterConfiguration = 'Master configuration'; $strReplicationMasterChooseAll = 'Replicate all databases; Ignore:'; $strReplicationMasterChooseIgn = 'Ignore all databases; Replicate:'; $strReplicationMasterChooseMode = 'This server is not configured as master server in a replication process. You can choose from either replicating all databases and ignoring certain (useful if you want to replicate majority of databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode:'; -$strReplicationMasterConfiguration = 'Master configuration'; $strReplicationMaster = 'Master replication'; $strReplication = 'Replication'; $strReplicationRestartServer = 'Once you restarted MySQL server, please click on Go button. Afterwards, you should see a message informing you, that this server is configured as master'; @@ -780,10 +781,10 @@ $strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report- $strReplicationShowConnectedSlaves = 'Show connected slaves'; $strReplicationShowMasterStatus = 'Show master status'; $strReplicationSkippingErrorWarn = 'Skipping error(s) might lead into unsynchronized master and slave!'; -$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; $strReplicationSlaveConfiguration = 'Slave configuration'; $strReplicationSlaveConfigured = 'Server is configured as slave in a replication process. Would you like to:'; $strReplicationSlaveErrorManagement = 'Error management:'; +$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; $strReplicationSlaveIOThread = 'IO Thread %s only'; $strReplicationSlaveNotConfigured = 'This server is not configured as slave in a replication process. Would you like to configure it?'; $strReplicationSlaveReset = 'Reset slave'; @@ -876,8 +877,8 @@ $strSetupAllowArbitraryServer_desc = 'If enabled user can enter any MySQL server $strSetupAllowArbitraryServerMsg = 'This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'; $strSetupAllowArbitraryServer_name = 'Allow login to any MySQL server'; $strSetupAllowUserDropDatabase_name = 'Show "Drop database" link to normal users'; -$strSetupBlowfishSecretCharsMsg = 'Key should contain letters, numbers [em]and[/em] special characters'; $strSetupblowfish_secret_desc = 'Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication'; +$strSetupBlowfishSecretCharsMsg = 'Key should contain letters, numbers [em]and[/em] special characters'; $strSetupBlowfishSecretLengthMsg = 'Key is too short, it should have at least 8 characters'; $strSetupBlowfishSecretMsg = 'You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.'; $strSetupblowfish_secret_name = 'Blowfish secret'; @@ -890,13 +891,6 @@ $strSetupBZipDump_name = 'Bzip2'; $strSetupBZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; $strSetupCannotLoadConfig = 'Cannot load or save configuration'; $strSetupCannotLoadConfigMsg = 'Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.'; -$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; -$strSetupCharEditing_name = 'CHAR fields editing'; -$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas'; -$strSetupCharTextareaCols_name = 'CHAR textarea columns'; -$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas'; -$strSetupCharTextareaRows_name = 'CHAR textarea rows'; -$strSetupCheckConfigurationPermissions_name = 'Check config file permissions'; $strSetupClear = 'Clear'; $strSetupCompressOnFly_desc = 'Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature'; $strSetupCompressOnFly_name = 'Compress on the fly'; @@ -938,12 +932,12 @@ $strSetuperror_nan_p = 'Not a positive number'; $strSetupExecTimeLimit_desc = 'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)'; $strSetupExecTimeLimit_name = 'Maximum execution time'; $strSetupExport_asfile_name = 'Save as file'; -$strSetupExport_charset_name = 'Character set of the file'; $strSetupExport_compression_name = 'Compression'; $strSetupExport_file_template_database_name = 'Database name template'; $strSetupExport_file_template_server_name = 'Server name template'; $strSetupExport_file_template_table_name = 'Table name template'; $strSetupExport_format_name = 'Format'; +$strSetupExport_charset_name = 'Character set of the file'; $strSetupExport_onserver_name = 'Save on server'; $strSetupExport_onserver_overwrite_name = 'Overwrite existing file(s)'; $strSetupExport_remember_file_template_name = 'Remember file name template'; @@ -1006,6 +1000,13 @@ $strSetupGZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] c $strSetupGZipDump_name = 'GZip'; $strSetupGZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; $strSetupHomepageLink = 'phpMyAdmin homepage'; +$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; +$strSetupCharEditing_name = 'CHAR fields editing'; +$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas'; +$strSetupCharTextareaCols_name = 'CHAR textarea columns'; +$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas'; +$strSetupCharTextareaRows_name = 'CHAR textarea rows'; +$strSetupCheckConfigurationPermissions_name = 'Check config file permissions'; $strSetupIconvExtraParams_name = 'Extra parameters for iconv'; $strSetupIgnoreErrors = 'Ignore errors'; $strSetupIgnoreMultiSubmitErrors_desc = 'If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed'; @@ -1053,10 +1054,10 @@ $strSetupLoginCookieStore_name = 'Login cookie store'; $strSetupLoginCookieValidity_desc = 'Define how long (in seconds) a login cookie is valid'; $strSetupLoginCookieValidityMsg = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'; $strSetupLoginCookieValidity_name = 'Login cookie validity'; -$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; -$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; $strSetupMaxDbList_desc = 'Maximum number of databases displayed in left frame and database list'; $strSetupMaxDbList_name = 'Maximum databases'; +$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; +$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; $strSetupMaxRows_desc = 'Number of rows displayed when browsing a result set. If the result set contains more rows, "Previous" and "Next" links will be shown.'; $strSetupMaxRows_name = 'Maximum number of rows to display'; $strSetupMaxTableList_desc = 'Maximum number of tables displayed in table list'; @@ -1163,20 +1164,20 @@ $strSetupServers_table_info_desc = 'Table to describe the display fields, leave $strSetupServers_table_info_name = 'Display fields table'; $strSetupServers_user_desc = 'Leave empty if not using config auth'; $strSetupServers_user_name = 'User for config auth'; +$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; $strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance'; $strSetupServers_verbose_check_name = 'Verbose check'; -$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; $strSetupServers_verbose_name = 'Verbose name of this server'; $strSetupSetValue = 'Set value: %s'; $strSetupShowAll_desc = 'Whether a user should be displayed a "show all (records)" button'; $strSetupShowAll_name = 'Allow to display all the rows'; -$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; -$strSetupShowChgPassword_name = 'Show password change form'; $strSetupShowCreateDb_name = 'Show create database form'; $strSetupShowForm = 'Show form'; $strSetupShowFunctionFields_desc = 'Display the function fields in edit/insert mode'; $strSetupShowFunctionFields_name = 'Show function fields'; $strSetupShowHiddenMessages = 'Show hidden messages (#MSG_COUNT)'; +$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; +$strSetupShowChgPassword_name = 'Show password change form'; $strSetupShowPhpInfo_desc = 'Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output'; $strSetupShowPhpInfo_name = 'Show phpinfo() link'; $strSetupShowServerInfo_name = 'Show detailed MySQL server information'; @@ -1330,8 +1331,8 @@ $strShowStatusReset = 'Reset'; $strShowStatusRpl_statusDescr = 'The status of failsafe replication (not yet implemented).'; $strShowStatusSelect_full_joinDescr = 'The number of joins that do not use indexes. If this value is not 0, you should carefully check the indexes of your tables.'; $strShowStatusSelect_full_range_joinDescr = 'The number of joins that used a range search on a reference table.'; -$strShowStatusSelect_range_checkDescr = 'The number of joins without keys that check for key usage after each row. (If this is not 0, you should carefully check the indexes of your tables.)'; $strShowStatusSelect_rangeDescr = 'The number of joins that used ranges on the first table. (It\'s normally not critical even if this is big.)'; +$strShowStatusSelect_range_checkDescr = 'The number of joins without keys that check for key usage after each row. (If this is not 0, you should carefully check the indexes of your tables.)'; $strShowStatusSelect_scanDescr = 'The number of joins that did a full scan of the first table.'; $strShowStatusSlave_open_temp_tablesDescr = 'The number of temporary tables currently open by the slave SQL thread.'; $strShowStatusSlave_retried_transactionsDescr = 'Total (since startup) number of times the replication slave SQL thread has retried transactions.'; @@ -1380,9 +1381,9 @@ $strSQPBugUnclosedQuote = 'Unclosed quote'; $strSQPBugUnknownPunctuation = 'Unknown Punctuation String'; $strStandInStructureForView = 'Stand-in structure for view'; $strStart = 'Start'; -$strStatCheckTime = 'Last check'; $strStatCreateTime = 'Creation'; $strStatement = 'Statements'; +$strStatCheckTime = 'Last check'; $strStatic = 'static'; $strStatisticsOverrun = 'On a busy server, the byte counters may overrun, so those statistics as reported by the MySQL server may be incorrect.'; $strStatUpdateTime = 'Last update'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 3f344a1db..a7535a0fc 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index e07c75c8c..9bd43dbdb 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1632,4 +1632,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 10b223a04..ea855b929 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1612,4 +1612,5 @@ $strYes = 'Oui'; $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; $strZip = '"zippé"'; +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 6ea3e9271..f1d612c9b 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1620,4 +1620,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index eddad7789..6b32d1d02 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index c7d7530fa..2a698ac11 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 54b75f9f1..d7e005c70 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strDeleteTrackingData = 'Διαγραφή δεδομένων παρακολού $strRenameView = 'Rename view to'; //to translate $strSynchronizeDb = 'Synchronize Databases'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index c28bc1993..a4bb8ed94 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1635,4 +1635,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index be568d3ca..d55701ed0 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 82d8efba8..18c636438 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1634,4 +1634,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index f0f776bc0..28eb6c036 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1634,4 +1634,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 62475f294..ad394de4c 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1634,4 +1634,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 84d40ad69..dc75cd1d9 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 1ec9eef1d..2e746640b 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index dd5d02439..d405741b7 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index f8d78897a..6c832e564 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1633,4 +1633,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index 428832659..485f37263 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index b08d58bd7..420c3135f 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1653,4 +1653,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index b84dbc649..0a65b3c7b 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1639,4 +1639,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index ef319858a..52ffdc5f4 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1615,4 +1615,5 @@ $strZip = 'Komprimert (zip)'; // To translate: $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 9d5fe21f4..3c33851c2 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1642,4 +1642,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index a9c7b3274..4b6a60217 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1625,4 +1625,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 04449544b..e49cba63c 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 03a6e701b..56aae70a4 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1633,4 +1633,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index d5e629430..eca99e89b 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1618,4 +1618,5 @@ $strZeroRemovesTheLimit = 'Замечание: Установка значени $strZip = 'zip'; $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 81b8e049c..56d0e01ff 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index b379301b9..ec8e5851e 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1637,4 +1637,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 127495318..38e6e2d7e 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1641,4 +1641,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 5eb1b0a7a..67be3b931 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1633,4 +1633,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index aca499f58..77db99b1f 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index e65d6a0f6..14edbb113 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1628,4 +1628,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index e3443375d..8edd50a3b 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1629,4 +1629,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 64bd107fa..bdf0bf86d 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1633,4 +1633,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 501555e54..2ca14e5e1 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1638,4 +1638,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 2ae76b4ab..a5d431843 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1628,4 +1628,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index df499a07c..5a8a545a9 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1636,4 +1636,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/uzbek_cyrillic-utf-8.inc.php b/lang/uzbek_cyrillic-utf-8.inc.php index c0b48dbc3..3d60d6582 100644 --- a/lang/uzbek_cyrillic-utf-8.inc.php +++ b/lang/uzbek_cyrillic-utf-8.inc.php @@ -1633,4 +1633,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/lang/uzbek_latin-utf-8.inc.php b/lang/uzbek_latin-utf-8.inc.php index b26b60c9c..14a6fbf20 100644 --- a/lang/uzbek_latin-utf-8.inc.php +++ b/lang/uzbek_latin-utf-8.inc.php @@ -1633,4 +1633,5 @@ $strTrackingCommentOut = 'Comment out these two lines if you do not need them.'; $strTrackingReportForTable = 'Tracking report for table `%s`'; //to translate $strDeleteTrackingData = 'Delete tracking data for this table'; //to translate $strRenameView = 'Rename view to'; //to translate +$strInsertIgnoreAsNewRow = 'Insert as new row and ignore errors'; //to translate ?> diff --git a/tbl_change.php b/tbl_change.php index e3b660d52..e0406c673 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -1106,6 +1106,7 @@ if (isset($where_clause)) { } ?> + use the WHERE clause $loop_array = (is_array($_REQUEST['where_clause']) ? $_REQUEST['where_clause'] : array($_REQUEST['where_clause'])); $using_key = true; - $is_insert = ($_REQUEST['submit_type'] == 'insert'); + $is_insert = ($_REQUEST['submit_type'] == 'insert') || ($_REQUEST['submit_type'] == 'insertignore'); + $is_insertignore = ($_REQUEST['submit_type'] == 'insertignore'); } else { // new row => use indexes $loop_array = array(); @@ -147,6 +148,7 @@ if (isset($_REQUEST['where_clause'])) { } $using_key = false; $is_insert = true; + $is_insertignore = false; } $query = array(); @@ -310,8 +312,14 @@ unset($me_fields_name, $me_fields_prev, $me_funcs, $me_fields_type, $me_fields_n // Builds the sql query if ($is_insert && count($value_sets) > 0) { - $query[] = 'INSERT INTO ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($GLOBALS['table']) + if ($is_insertignore) { + $insert_command = 'INSERT IGNORE '; + } else { + $insert_command = 'INSERT '; + } + $query[] = $insert_command . 'INTO ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($GLOBALS['table']) . ' (' . implode(', ', $query_fields) . ') VALUES (' . implode('), (', $value_sets) . ')'; + unset($insert_command); unset($query_fields, $value_sets); @@ -327,7 +335,7 @@ if ($is_insert && count($value_sets) > 0) { require './' . PMA_securePath($goto_include); exit; } -unset($me_fields, $is_insert); +unset($me_fields, $is_insert, $is_insertignore); /** * Executes the sql query and get the result, then move back to the calling