From d63fa35c0f4147859370adbda34fbb27c811634d Mon Sep 17 00:00:00 2001 From: Crack Date: Sun, 4 Jul 2010 00:18:04 +0200 Subject: [PATCH] finished messages.inc.php cleanup --- libraries/config/messages.inc.php | 13 +------------ setup/lib/form_processing.lib.php | 6 +++--- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index ab218182b..39536ffdf 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -41,28 +41,22 @@ $strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows'); $strConfigDefaultCharset_desc = __('Default character set used for conversions'); $strConfigDefaultCharset_name = __('Default character set'); $strConfigDefaultDisplay_name = __('Default display direction'); -$strConfigDefaultLanguage = __('Default language'); $strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used'); $strConfigDefaultPropDisplay_name = __('Display direction for altering/creating columns'); -$strConfigDefaultServer = __('Default server'); $strConfigDefaultTabDatabase_desc = __('Tab that is displayed when entering a database'); $strConfigDefaultTabDatabase_name = __('Default database tab'); $strConfigDefaultTabServer_desc = __('Tab that is displayed when entering a server'); $strConfigDefaultTabServer_name = __('Default server tab'); $strConfigDefaultTabTable_desc = __('Tab that is displayed when entering a table'); $strConfigDefaultTabTable_name = __('Default table tab'); -$strConfigDisplay = __('Display'); $strConfigDisplayBinaryAsHex_desc = __('Show binary contents as HEX by default'); $strConfigDisplayBinaryAsHex_name = __('Show binary contents as HEX'); $strConfigDisplayDatabasesList_desc = __('Show database listing as a list instead of a drop down'); $strConfigDisplayDatabasesList_name = __('Display databases as a list'); $strConfigDisplayServersList_desc = __('Show server listing as a list instead of a drop down'); $strConfigDisplayServersList_name = __('Display servers as a list'); -$strConfigDonateLink = __('Donate'); -$strConfigDownload = __('Download'); $strConfigEditInWindow_desc = __('Edit SQL queries in popup window'); $strConfigEditInWindow_name = __('Edit in window'); -$strConfigEndOfLine = __('End of line'); $strConfigErrorIconic_desc = __('Show icons for warning, error and information messages'); $strConfigErrorIconic_name = __('Iconic errors'); $strConfigExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)'); @@ -210,6 +204,7 @@ $strConfigFormset_Features = __('Features'); $strConfigFormset_Import = __('Customize import defaults'); $strConfigFormset_Left_frame = __('Customize navigation frame'); $strConfigFormset_Main_frame = __('Customize main frame'); +$strConfigFormset_Sql_queries = __('SQL queries'); $strConfigForm_Sql = __('SQL'); $strConfigForm_Sql_box = __('SQL Query box'); $strConfigForm_Sql_box_desc = __('Customize links shown in SQL Query boxes'); @@ -225,7 +220,6 @@ $strConfigForm_Texy_desc = __('Customize default options'); $strConfigGZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations'); $strConfigGZipDump_name = __('GZip'); $strConfigIconvExtraParams_name = __('Extra parameters for iconv'); -$strConfigIgnoreErrors = __('Ignore errors'); $strConfigIgnoreMultiSubmitErrors_desc = __('If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed'); $strConfigIgnoreMultiSubmitErrors_name = __('Ignore multiple statement errors'); $strConfigImport_allow_interrupt_desc = __('Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.'); @@ -276,7 +270,6 @@ $strConfigLeftLogoLinkWindow_desc = __('Open the linked page in the main window $strConfigLeftLogoLinkWindow_name = __('Logo link target'); $strConfigLeftPointerEnable_desc = __('Highlight server under the mouse cursor'); $strConfigLeftPointerEnable_name = __('Enable highlighting'); -$strConfigLetUserChoose = __('let the user choose'); $strConfigLightTabs_desc = __('Use less graphically intense tabs'); $strConfigLightTabs_name = __('Light tabs'); $strConfigLimitChars_desc = __('Maximum number of characters shown in any non-numeric column on browse view'); @@ -310,7 +303,6 @@ $strConfigNavigationBarIconic_desc = __('Use only icons, only text or both'); $strConfigNavigationBarIconic_name = __('Iconic navigation bar'); $strConfigOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers'); $strConfigOBGzip_name = __('GZip output buffering'); -$strConfigOptionNone = __('- none -'); $strConfigOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise'); $strConfigOrder_name = __('Default sorting order'); $strConfigPersistentConnections_desc = __('Use persistent connections to MySQL databases'); @@ -336,7 +328,6 @@ $strConfigRepeatCells_name = __('Repeat headers'); $strConfigReplaceHelpImg_desc = __('Show help button instead of Documentation text'); $strConfigReplaceHelpImg_name = __('Show help button'); $strConfigRestoreDefaultValue = __('Restore default value'); -$strConfigRevertErroneousFields = __('Try to revert erroneous fields to their default values'); $strConfigSaveDir_desc = __('Directory where exports can be saved on server'); $strConfigSaveDir_name = __('Save directory'); $strConfigServers_AllowDeny_order_desc = __('Leave blank if not used'); @@ -431,10 +422,8 @@ $strConfigShowChgPassword_name = __('Show password change form'); $strConfigShowCreateDb_name = __('Show create database form'); $strConfigShowFieldTypesInDataEditView_desc = __('Defines whether or not type fields should be initially displayed in edit/insert mode'); $strConfigShowFieldTypesInDataEditView_name = __('Show field types'); -$strConfigShowForm = __('Show form'); $strConfigShowFunctionFields_desc = __('Display the function fields in edit/insert mode'); $strConfigShowFunctionFields_name = __('Show function fields'); -$strConfigShowHiddenMessages = __('Show hidden messages (#MSG_COUNT)'); $strConfigShowPhpInfo_desc = __('Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output'); $strConfigShowPhpInfo_name = __('Show phpinfo() link'); $strConfigShowServerInfo_name = __('Show detailed MySQL server information'); diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index 5e95f8bfb..553e87c15 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -42,12 +42,12 @@ function process_formset(FormDisplay $form_display) {


- +
displayErrors() ?> - +   - +