diff --git a/ChangeLog b/ChangeLog index c2ac66829..3e507c173 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-09-21 Loïc Chapeaux + * users_detail.php3; libraries/user_details.js; lang/*: changing the whole + profile of an user is now possible. + 2001-09-20 Geert Lund * security issue fix: added checking for valid user and password to the phpinfo.php3 file, probitting non authorized users getting valuable diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3 index d6cec34ac..e19ca0005 100644 --- a/lang/brazilian_portuguese.inc.php3 +++ b/lang/brazilian_portuguese.inc.php3 @@ -84,7 +84,7 @@ $strDeleted = 'Registro eliminado'; $strDeletedRows = 'Registro deletados:'; $strDeleteFailed = 'Não foi possível apagar!'; $strDeletePassword = 'Apagar Senha'; -$strDeleteUserMessage = 'Você deletou o usuário'; +$strDeleteUserMessage = 'Você deletou o usuário %s.'; $strDelPassMessage = 'Você deletou a senha de'; $strDescending = 'Descendente'; $strDisableMagicQuotes = 'Atenção: You have enabled magic_quotes_gpc in your PHP configuration. This version of PhpMyAdmin cannot work properly with it. Please have a look at the configuration section of the PHP manual for information on how to disable it.'; //to translate @@ -294,9 +294,7 @@ $strType = 'Tipo'; $strUncheckAll = 'Desmarca Todos'; $strUnique = 'Único'; -$strUpdatePassMessage = 'Você mudou a senha para'; -$strUpdatePassword = 'Mudar Senha'; -$strUpdatePrivMessage = 'Você mudou os priviléios para'; +$strUpdatePrivMessage = 'Você mudou os priviléios para %s.'; $strUpdateQuery = 'Atualiza Query'; $strUsage = 'Uso'; $strUseBackquotes = 'Usa aspas simples nos nomes de tabelas e campos'; @@ -318,12 +316,13 @@ $strYes = 'Sim'; // To translate $strIdxFulltext = 'Fulltext'; //to translate $strInvalidName = '"%s" is a reserved word, you can\'t use it as a database/table/field name.'; //to translate +$strKeepPass = 'Do not change the password';//to translate $strRunningAs = 'as'; $strSetEnumVal = 'If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...
If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').'; //to translate $strShowAll = 'Show all'; // to translate $strShowCols = 'Show columns'; $strShowTables = 'Show tables'; -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate $strWithChecked = 'With checked:'; //to translate ?> diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3 index 69dd34cf2..22ee2021c 100644 --- a/lang/bulgarian-win1251.inc.php3 +++ b/lang/bulgarian-win1251.inc.php3 @@ -76,7 +76,6 @@ $strDelete = ' $strDeleted = 'Ðåäúò áåøå èçòðèò'; $strDeleteFailed = 'Deleted Failed!'; //to translate $strDeletePassword = 'Delete Password'; //to translate -$strDeleteUserMessage = 'You have deleted the user'; //to translate $strDelPassMessage = 'You have deleted the password for'; //to translate $strDescending = 'Íèçõîäÿù'; $strDisableMagicQuotes = 'Warning: You have enabled magic_quotes_gpc in your PHP configuration. This version of PhpMyAdmin cannot work properly with it. Please have a look at the configuration section of the PHP manual for information on how to disable it.'; //to translate @@ -250,9 +249,6 @@ $strType = ' $strUncheckAll = 'Uncheck All'; //to translate $strUnique = 'Óíèêàëíî'; -$strUpdatePassMessage = 'You have updated the password for'; //to translate -$strUpdatePassword = 'Update Password'; //to translate -$strUpdatePrivMessage = 'You have updated the privileges for'; //to translate $strUpdateQuery = 'Äîïúëíè Çàïèòâàíåòî'; $strUsage = 'Usage'; //to translate $strUser = 'User'; //to translate @@ -329,6 +325,9 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3 index 389621dc5..c41c2b59d 100644 --- a/lang/catala.inc.php3 +++ b/lang/catala.inc.php3 @@ -79,7 +79,7 @@ $strDelete = 'Esborrar'; $strDeleted = 'La fila ha estat esborrada'; $strDeleteFailed = 'No s\'ha pogut esborrar!'; $strDeletePassword = 'Esborrar contrasenya'; -$strDeleteUserMessage = 'Has esborrat l\'usuari'; +$strDeleteUserMessage = 'Has esborrat l\'usuari %s.'; $strDelPassMessage = 'Has esborrat la contrasenya de l\'usuari'; $strDescending = 'Desending'; //to translate (tbl_qbe.php3) $strDisableMagicQuotes = 'Atenció: Has activat les magic_quotes_gpc en el fitxer de configuració del PHP. Aquesta versió del PhpMyAdmin no funciona correctament amb aquesta opció. Fes un cop d\'ull al manual de PHP sobre com desactivar aquesta opció.'; @@ -258,9 +258,7 @@ $strType = 'Tipus'; $strUncheckAll = 'Descel.leccionar tot'; $strUnique = 'Única'; -$strUpdatePassMessage = 'Heu actualitzat la contrasenya de '; -$strUpdatePassword = 'Actualitzar contrasenya'; -$strUpdatePrivMessage = 'Heu actualitzat els privilegis de '; +$strUpdatePrivMessage = 'Heu actualitzat els privilegis de %s.'; $strUpdateQuery = 'Update Query'; //to translate (tbl_qbe.php3) $strUsage = 'Ús'; $strUser = 'Usuari'; @@ -324,6 +322,7 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index c3273681b..1f9f4dd7a 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -80,7 +80,6 @@ $strDelete = ' $strDeleted = '°O¿ý¤w³Q§R°£'; $strDeleteFailed = '§R°£¥¢±Ñ!'; $strDeletePassword = '§R°£±K½X'; -$strDeleteUserMessage = '±z§R°£¤F¨Ï¥ÎªÌ '; $strDelPassMessage = '±z¤w¸g§R°£¤F¤U­±³o¦ì¨Ï¥ÎªÌªº±K½X:'; $strDescending = 'Desending'; //to translate (tbl_qbe.php3) $strDisableMagicQuotes = 'ĵ§i: ±zªº PHP ³]©w±Ò¥Î magic_quotes_gpc ³o­Ó¥\¯à¡A¦ý¨Ï¥Î¦¹¥\¯à¡A³o­Óª©¥»ªº PhpMyAdmin ¤£¯à¥¿½T¦a°õ¦æ
­n¤F¸Ñ¦p¦ó¨ú®ø³o­Ó¥\¯à¡A½Ð°Ñ¦Ò PHP ¨Ï¥Î¤â¥U¤¤Ãö©ó²ÕºA³]©w (configuration) ³o¤@¸`ªº¤º®e'; @@ -261,9 +260,6 @@ $strType = ' $strUncheckAll = '¥þ³¡¨ú®ø'; $strUnique = '°ß¤@'; -$strUpdatePassMessage = 'You have updated the password for';//±z¤w¸g¬°¤U­±³o¦ì¨Ï¥ÎªÌ§ó·s±K½X:(this variable can't show Chinese correctly) -$strUpdatePassword = 'Åܧó±K½X'; -$strUpdatePrivMessage = 'You have updated the privileges for'; //±z¤w¸g¬°¤U­±³o¦ì¨Ï¥ÎªÌ§ó·sÅv­­:(this variable can't show Chinese correctly) $strUpdateQuery = 'Update Query'; //to translate (tbl_qbe.php3) $strUsage = '¨Ï¥Î'; $strUser = '¨Ï¥ÎªÌ'; @@ -325,6 +321,10 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate + +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 9e401f821..e9023ef15 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -76,7 +76,6 @@ $strDelete = 'ɾ $strDeleted = '¸Ã¼Ç¼ÒѾ­±»É¾³ý¡£'; $strDeleteFailed = 'Deleted Failed!'; //to translate $strDeletePassword = 'Delete Password'; //to translate -$strDeleteUserMessage = 'You have deleted the user'; //to translate $strDelPassMessage = 'You have deleted the password for'; //to translate $strDescending = 'Desending'; //to translate (tbl_qbe.php3) $strDisableMagicQuotes = 'Warning: You have enabled magic_quotes_gpc in your PHP configuration. This version of PhpMyAdmin cannot work properly with it. Please have a look at the configuration section of the PHP manual for information on how to disable it.'; //to translate @@ -250,9 +249,6 @@ $strType = ' $strUncheckAll = 'Uncheck All'; //to translate $strUnique = 'Ψһ'; -$strUpdatePassMessage = 'You have updated the password for'; //to translate -$strUpdatePassword = 'Update Password'; //to translate -$strUpdatePrivMessage = 'You have updated the privileges for'; //to translate $strUpdateQuery = 'Update Query'; //to translate (tbl_qbe.php3) $strUsage = 'Usage'; //to translate $strUser = 'User'; //to translate @@ -329,6 +325,9 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/czech-iso.inc.php3 b/lang/czech-iso.inc.php3 index 6979f7a09..dfb1623f3 100644 --- a/lang/czech-iso.inc.php3 +++ b/lang/czech-iso.inc.php3 @@ -82,7 +82,6 @@ $strDeleted = ' $strDeletedRows = 'Smazané øádky:'; $strDeleteFailed = 'Smazání selhalo!'; $strDeletePassword = 'Smazat heslo'; -$strDeleteUserMessage = 'Byl smazán u¾ivatel'; $strDelPassMessage = 'Bylo smazáno heslo pro'; $strDescending = 'Sestupnì'; $strDisableMagicQuotes = 'Varování: Zapnul jste magic_quotes_gpc v nastavení PHP. Tato verze PhpMyAdmina nemù¾e s tímto nastavením korektnì pracovat. Prosím podívejte se do manuálu PHP (kapitola nastavení) jak toto nastavení zmìnit.'; @@ -283,9 +282,6 @@ $strType = 'Typ'; $strUncheckAll = 'Od¹krtnout v¹e'; $strUnique = 'Unikátní'; -$strUpdatePassMessage = 'Bylo zmìnìno heslo pro'; -$strUpdatePassword = 'Zmìnit heslo'; -$strUpdatePrivMessage = 'Byla zmìnìna privilegia pro'; $strUpdateQuery = 'Aktualizovat dotaz'; $strUsage = 'Pou¾ívá'; $strUseBackquotes = 'Pou¾ít zpìtné uvozovky u jmeno tabulek a polí'; @@ -306,24 +302,27 @@ $strWrongUser = ' $strYes = 'Ano'; // To translate -$strIdxFulltext = 'Fulltext'; //to translate -$strRunningAs = 'as'; -$strShowAll = 'Show all'; // to translate -$strShowCols = 'Show columns'; -$strShowTables = 'Show tables'; $strAPrimaryKey = 'A primary key has been added on %s';//to translate $strAnIndex = 'An index has been added on %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strFieldHasBeenDropped = 'Field %s has been dropped';//to translate $strFieldsEnclosedBy = 'Fields enclosed by';//to translate $strFieldsEscapedBy = 'Fields escaped by';//to translate $strFieldsTerminatedBy = 'Fields terminated by';//to translate +$strIdxFulltext = 'Fulltext'; //to translate $strIndexHasBeenDropped = 'Index %s has been dropped';//to translate +$strKeepPass = 'Do not change the password';//to translate $strLinesTerminatedBy = 'Lines terminated by';//to translate $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate +$strRunningAs = 'as'; $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate +$strShowAll = 'Show all'; // to translate +$strShowCols = 'Show columns'; +$strShowTables = 'Show tables'; $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3 index 268f74edb..2c049d779 100644 --- a/lang/czech-win1250.inc.php3 +++ b/lang/czech-win1250.inc.php3 @@ -82,7 +82,6 @@ $strDeleted = ' $strDeletedRows = 'Smazané øádky:'; $strDeleteFailed = 'Smazání selhalo!'; $strDeletePassword = 'Smazat heslo'; -$strDeleteUserMessage = 'Byl smazán uživatel'; $strDelPassMessage = 'Bylo smazáno heslo pro'; $strDescending = 'Sestupnì'; $strDisableMagicQuotes = 'Varování: Zapnul jste magic_quotes_gpc v nastavení PHP. Tato verze PhpMyAdmina nemùže s tímto nastavením korektnì pracovat. Prosím podívejte se do manuálu PHP (kapitola nastavení) jak toto nastavení zmìnit.'; @@ -283,9 +282,6 @@ $strType = 'Typ'; $strUncheckAll = 'Odškrtnout vše'; $strUnique = 'Unikátní'; -$strUpdatePassMessage = 'Bylo zmìnìno heslo pro'; -$strUpdatePassword = 'Zmìnit heslo'; -$strUpdatePrivMessage = 'Byla zmìnìna privilegia pro'; $strUpdateQuery = 'Aktualizovat dotaz'; $strUsage = 'Používá'; $strUseBackquotes = 'Použít zpìtné uvozovky u jmeno tabulek a polí'; @@ -306,24 +302,27 @@ $strWrongUser = ' $strYes = 'Ano'; // To translate -$strIdxFulltext = 'Fulltext'; //to translate -$strRunningAs = 'as'; -$strShowAll = 'Show all'; // to translate -$strShowCols = 'Show columns'; -$strShowTables = 'Show tables'; $strAPrimaryKey = 'A primary key has been added on %s';//to translate $strAnIndex = 'An index has been added on %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strFieldHasBeenDropped = 'Field %s has been dropped';//to translate $strFieldsEnclosedBy = 'Fields enclosed by';//to translate $strFieldsEscapedBy = 'Fields escaped by';//to translate $strFieldsTerminatedBy = 'Fields terminated by';//to translate +$strIdxFulltext = 'Fulltext'; //to translate $strIndexHasBeenDropped = 'Index %s has been dropped';//to translate +$strKeepPass = 'Do not change the password';//to translate $strLinesTerminatedBy = 'Lines terminated by';//to translate $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate +$strRunningAs = 'as'; $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate +$strShowAll = 'Show all'; // to translate +$strShowCols = 'Show columns'; +$strShowTables = 'Show tables'; $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3 index 9f3e28178..82d5c3295 100644 --- a/lang/danish.inc.php3 +++ b/lang/danish.inc.php3 @@ -79,7 +79,6 @@ $strDelete = 'Slet'; $strDeleted = 'Rækken er slettet!'; $strDeleteFailed = 'Deleted Failed!'; //to translate $strDeletePassword = 'Delete Password'; //to translate -$strDeleteUserMessage = 'You have deleted the user'; //to translate $strDelPassMessage = 'You have deleted the password for'; //to translate $strDescending = 'Desending'; //to translate (tbl_qbe.php3) $strDisableMagicQuotes = 'Advarsel: Du har aktiveret funktionen magic_quotes_gpc i din PHP konfiguration. PhpMyAdmin ikke behøver denne funktion for at kunne virke efter hensigten. Tag venligst et kig i kapitlet om konfiguration i PHP manualen for information om hvordan funktionen ikke aktiveres.'; @@ -260,9 +259,6 @@ $strType = 'Datatype'; $strUncheckAll = 'Uncheck All'; //to translate $strUnique = 'Unik'; -$strUpdatePassMessage = 'You have updated the password for'; //to translate -$strUpdatePassword = 'Update Password'; //to translate -$strUpdatePrivMessage = 'You have updated the privileges for'; //to translate $strUpdateQuery = 'Update Query'; //to translate (tbl_qbe.php3) $strUsage = 'Usage'; //to translate $strUser = 'User'; //to translate @@ -324,6 +320,9 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3 index 47847a9c3..91384d8d7 100644 --- a/lang/dutch.inc.php3 +++ b/lang/dutch.inc.php3 @@ -80,7 +80,6 @@ $strDeleted = 'De rij is verwijderd'; $strDeletedRows = 'Verwijder rijen:'; $strDeleteFailed = 'Verwijderen mislukt!'; $strDeletePassword = 'Verwijder het wachtwoord'; -$strDeleteUserMessage = 'U heeft de gebruiker verwijderd'; $strDelPassMessage = 'Het heeft het wachtwoord verwijderd voor'; $strDescending = 'Aflopend'; $strDisableMagicQuotes = 'Waarschuwing: U heeft magic_quotes_gpc ingeschakeld staan in uw PHP configuratie. Deze versie van PhpMyAdmin kan daar niet goed mee werken. Kijk in de configuratie sectie van de PHP handleiding voor informatie om het uit te schakelen.'; @@ -278,9 +277,6 @@ $strType = 'Type'; $strUncheckAll = 'Deselecteer alles'; $strUnique = 'Unieke waarde'; -$strUpdatePassMessage = 'U heeft het wachtwoord gewijzigd voor'; -$strUpdatePassword = 'Wijzig wachtwoord'; -$strUpdatePrivMessage = 'U heeft de rechten gewijzigd voor'; $strUpdateQuery = 'Wijzig Query'; $strUsage = 'Gebruik'; $strUser = 'Gebruiker'; @@ -324,6 +320,9 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index fefe1ffbe..84525c849 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -84,7 +84,7 @@ $strDeleted = 'The row has been deleted'; $strDeletedRows = 'Deleted rows:'; $strDeleteFailed = 'Deleted Failed!'; $strDeletePassword = 'Delete Password'; -$strDeleteUserMessage = 'You have deleted the user'; +$strDeleteUserMessage = 'You have deleted the user %s.'; $strDelPassMessage = 'You have deleted the password for'; $strDescending = 'Descending'; $strDisableMagicQuotes = 'Warning: You have enabled magic_quotes_gpc in your PHP configuration. This version of PhpMyAdmin cannot work properly with it. Please have a look at the configuration section of the PHP manual for information on how to disable it.'; @@ -156,6 +156,7 @@ $strInstructions = 'Instructions'; $strInUse = 'in use'; $strInvalidName = '"%s" is a reserved word, you can\'t use it as a database/table/field name.'; +$strKeepPass = 'Do not change the password'; $strKeyname = 'Keyname'; $strKill = 'Kill'; @@ -301,12 +302,10 @@ $strType = 'Type'; $strUncheckAll = 'Uncheck All'; $strUnique = 'Unique'; -$strUpdatePassMessage = 'You have updated the password for'; -$strUpdatePassword = 'Update Password'; -$strUpdatePrivMessage = 'You have updated the privileges for'; +$strUpdatePrivMessage = 'You have updated the privileges for %s.'; +$strUpdateProfile = 'Update profile:'; +$strUpdateProfileMessage = 'The profile has been updated.'; $strUpdateQuery = 'Update Query'; -$strUpdateServer = 'Update server'; -$strUpdateServMessage = 'You have updated the server for %s'; $strUsage = 'Usage'; $strUseBackquotes = 'Use backquotes with tables and fields\' names'; $strUser = 'User'; diff --git a/lang/finnish.inc.php3 b/lang/finnish.inc.php3 index 51f715d1c..48d3f5793 100644 --- a/lang/finnish.inc.php3 +++ b/lang/finnish.inc.php3 @@ -88,7 +88,6 @@ $strDeleted = 'Rivi on poistettu'; $strDeletedRows = 'Poistetut rivit:'; $strDeleteFailed = 'Poistaminen epäonnistui!'; $strDeletePassword = 'Poista salasana'; -$strDeleteUserMessage = 'Poistettu käyttäjä:'; $strDelPassMessage = 'Salasana poistettu käyttäjältä'; $strDescending = 'Laskeva'; $strDisableMagicQuotes = 'Varoitus: "magic_quotes_gpc"-toiminto on päällä PHP:n asetuksissa. Tämä PhpMyAdminin ei toimi kunnolla tämän toiminnon ollessa päällä. PHP:n käyttöohjeiden konfigurointikappale kertoo kuinka toiminto saadaan pois päältä.'; @@ -300,9 +299,6 @@ $strType = 'Tyyppi'; $strUncheckAll = 'Poista valinta kaikista'; $strUnique = 'Uniikki'; -$strUpdatePassMessage = 'Olet päivittänyt salasanan käyttäjälle'; -$strUpdatePassword = 'Päivitä salasana'; -$strUpdatePrivMessage = 'Olet päivittänyt oikeudet käyttäjälle'; $strUpdateQuery = 'Päivitä lause'; $strUsage = 'Tila'; $strUseBackquotes = 'Laita taulujen ja sarakkeiden nimet lainausmerkkeihin'; @@ -323,10 +319,13 @@ $strWrongUser = 'V $strYes = 'Kyllä'; // To translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate $strRunningAs = 'as'; $strShowAll = 'Show all'; // to translate $strShowCols = 'Show columns'; $strShowTables = 'Show tables'; -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index 85b69f44c..3a58de617 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -84,7 +84,7 @@ $strDeleted = 'L\'enregistrement a $strDeletedRows = 'Nombre d\'enregistrements effacés :'; $strDeleteFailed = 'L\'effacement a échoué'; $strDeletePassword = 'Effacer le mot de passe'; -$strDeleteUserMessage = 'Vous avez effacé l\'utilisateur'; +$strDeleteUserMessage = 'Vous avez effacé l\'utilisateur %s.'; $strDelPassMessage = 'Vous avez effacé le mot de passe de '; $strDescending = 'Décroissant'; $strDisableMagicQuotes = 'Attention: Vous avez positionné magic_quotes_gpc dans la configuration de PHP. Cette version de PhpMyAdmin ne peut fonctionner correctement avec. Veuillez vous référer au paragraphe traitant de la configration dans la documentation de PHP pour positionner cette variable à off.'; @@ -155,6 +155,8 @@ $strInsertTextfiles = 'Ins $strInstructions = 'Instructions'; $strInUse = 'utilisé'; $strInvalidName = '"%s" est un mot réservé, il ne peut être utilisé comme nom de base/table/champ.'; + +$strKeepPass = 'Conserver le mot de passe'; $strKeyname = 'Nom de la clé'; $strKill = 'Supprimer'; @@ -300,9 +302,9 @@ $strType = 'Type'; $strUncheckAll = 'Tout décocher'; $strUnique = 'Unique'; -$strUpdatePassMessage = 'Vous avez modifié le mot de passe pour'; -$strUpdatePassword = 'Changer le mot de passe'; -$strUpdatePrivMessage = 'Vous avez modifié les privilèges pour'; +$strUpdatePrivMessage = 'Vous avez modifié les privilèges pour %s.'; +$strUpdateProfile = 'Modifier le profil :'; +$strUpdateProfileMessage = 'Le profil a été modifié.'; $strUpdateQuery = 'Mise-à-jour de la requête'; $strUpdateServer = 'Changer le serveur'; $strUpdateServMessage = 'Vous avez modifié le serveur pour %s'; diff --git a/lang/galician.inc.php3 b/lang/galician.inc.php3 index db84b569d..938b7ff1f 100644 --- a/lang/galician.inc.php3 +++ b/lang/galician.inc.php3 @@ -84,7 +84,7 @@ $strDeleted = 'Rexistro eliminado'; $strDeletedRows = 'Filas borradas:'; $strDeleteFailed = 'Non foi posible eliminar!'; $strDeletePassword = 'Borrar o contrasinal'; -$strDeleteUserMessage = 'Eliminou o usuario'; +$strDeleteUserMessage = 'Eliminou o usuario %s.'; $strDelPassMessage = 'Eliminou o contrasinal de'; $strDescending = 'Descendente'; $strDisableMagicQuotes = 'Atención: Acaba de activar magic_quotes_gpc na configuración do PHP. Esta versión de PhpMyAdmin non traballa ben con el. Mire na sección de configuración do manual do PHP información sobre como desactivá-lo.'; @@ -295,9 +295,7 @@ $strType = 'Tipo'; $strUncheckAll = 'Quitar-lles as marcas a todos'; $strUnique = 'Único'; -$strUpdatePassMessage = 'Mudou o contrasinal para'; -$strUpdatePassword = 'Mudar o contrasinal'; -$strUpdatePrivMessage = 'Mudou os privilexios para'; +$strUpdatePrivMessage = 'Mudou os privilexios para %s.'; $strUpdateQuery = 'Actualizar a procura'; $strUsage = 'Uso'; $strUseBackquotes = 'Protexer os nomes das tabelas e dos campos con " ` "'; @@ -319,11 +317,12 @@ $strYes = 'Si'; // To translate $strIdxFulltext = 'Fulltext'; //to translate $strInvalidName = '"%s" is a reserved word, you can\'t use it as a database/table/field name.'; //to translate +$strKeepPass = 'Do not change the password';//to translate $strRunningAs = 'as'; $strShowAll = 'Show all'; // to translate $strShowCols = 'Show columns'; $strShowTables = 'Show tables'; -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate $strWithChecked = 'With checked:'; ?> diff --git a/lang/german.inc.php3 b/lang/german.inc.php3 index 5cacaf306..d08a415f3 100644 --- a/lang/german.inc.php3 +++ b/lang/german.inc.php3 @@ -82,7 +82,7 @@ $strDeleted = 'Die Zeile wurde gel $strDeletedRows = 'Gelöschte Zeilen:'; $strDeleteFailed = 'Löschen fehlgeschlagen!'; $strDeletePassword = 'Password löschen'; -$strDeleteUserMessage = 'Der Benutzer wurde gelöscht'; +$strDeleteUserMessage = 'Der Benutzer wurde gelöscht %s.'; $strDelPassMessage = 'Password entfernt für'; $strDescending = 'absteigend'; $strDisableMagicQuotes = 'Achtung: Sie haben magic_quotes_gpc in Ihrer PHP-Konfigration aktiviert. Dieses Version von PhpMyAdmin braucht dies nicht aktiviert sein, um korrekt zu funktionieren. Bitte lesen Sie im PHP-Manual (Installation & Configuration) nach, um Informationen darüber zu erhalten, wie man magic_quotes_gpc nicht aktivieren kann.'; @@ -285,9 +285,7 @@ $strType = 'Typ'; $strUncheckAll = 'Auswahl entfernen'; $strUnique = 'Unique'; -$strUpdatePassMessage = 'Das Password wurde geändert:'; -$strUpdatePassword = 'Password ändern'; -$strUpdatePrivMessage = 'Die Rechte wurden geändert:'; +$strUpdatePrivMessage = 'Die Rechte wurden geändert %s.'; $strUpdateQuery = 'Aktualisieren'; $strUsage = 'Verbrauch'; $strUseBackquotes = ' Tabellen- und Feldnamen in einfachen Anführungszeichen '; @@ -318,12 +316,13 @@ $strFieldsEnclosedBy = 'Fields enclosed by';//to translate $strFieldsEscapedBy = 'Fields escaped by';//to translate $strFieldsTerminatedBy = 'Fields terminated by';//to translate $strIndexHasBeenDropped = 'Index %s has been dropped';//to translate +$strKeepPass = 'Do not change the password';//to translate $strLinesTerminatedBy = 'Lines terminated by';//to translate $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/greek.inc.php3 b/lang/greek.inc.php3 index 0bc565b0b..c801734c0 100644 --- a/lang/greek.inc.php3 +++ b/lang/greek.inc.php3 @@ -82,7 +82,6 @@ $strDeleted = ' $strDeletedRows = 'ÄéáãñáììÝíåò ÃñáììÝò:'; $strDeleteFailed = 'Ç äéáãñáöÞ áðÝôõ÷å'; $strDeletePassword = 'ÄéáãñáöÞ Êùäéêïý Ðñüóâáóçò'; -$strDeleteUserMessage = 'You have deleted the user'; $strDelPassMessage = 'ÄéáãñÜøáôå ôïí Êùäéêü Ðñüóâáóçò ãéá ôïí'; $strDescending = 'Öèßíïõóá'; $strDisableMagicQuotes = 'Ðñïåéäïðïßçóç: ¸÷åôå åíåñãïðïéÞóåé ôçí åðéëïãÞ magic_quotes_gpc óôéò ñõèìßóåéò ôïõ PHP. ÁõôÞ ç Ýêäïóç ôïõ PhpMyAdmin äåí ìðïñåß íá ëåéôïõñãÞóåé óùóôÜ ìáæß ìå ôçí åðéëïãÞ áõôÞ. Ðáñáêáëþ åëÝãîôå ôçí ôåêìçñßùóç ôïõ PHP óôï ôìÞìá ñõèìßóåùí ãéá ðëçñïöïñßåò ðþò íá ôï áðåíåñãïðïéÞóåôå.'; @@ -284,9 +283,6 @@ $strType = ' $strUncheckAll = 'ÁðåðéëïãÞ üëùí'; $strUnique = 'Ìïíáäéêü'; -$strUpdatePassMessage = '¸÷åôå åíçìåñþóåé ôïí Êùäéêü Ðñüóâáóçò ãéá'; -$strUpdatePassword = 'ÅíçìÝñùóç Êùäéêïý Ðñüóâáóçò'; -$strUpdatePrivMessage = '¸÷åôå åíçìåñþóåé ôá ðñïíüìéá ãéá'; $strUpdateQuery = 'ÅíçìÝñùóç ôçò Åðåñþôçóçò'; $strUsage = '×ñÞóç'; $strUseBackquotes = '×ñçóéìïðïéÞóôå áíÜðïäá åéóáãùãéêÜ ìå ôá ïíüìáôá ôùí ÐéíÜêùí êáé ôùí Ðåäßùí'; @@ -307,23 +303,26 @@ $strWrongUser = ' $strYes = 'Íáé'; // To translate -$strRunningAs = 'as'; -$strShowAll = 'Show all'; // to translate -$strShowCols = 'Show columns'; -$strShowTables = 'Show tables'; $strAPrimaryKey = 'A primary key has been added on %s';//to translate $strAnIndex = 'An index has been added on %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strFieldHasBeenDropped = 'Field %s has been dropped';//to translate $strFieldsEnclosedBy = 'Fields enclosed by';//to translate $strFieldsEscapedBy = 'Fields escaped by';//to translate $strFieldsTerminatedBy = 'Fields terminated by';//to translate $strIndexHasBeenDropped = 'Index %s has been dropped';//to translate +$strKeepPass = 'Do not change the password';//to translate $strLinesTerminatedBy = 'Lines terminated by';//to translate $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate +$strRunningAs = 'as'; $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate +$strShowAll = 'Show all'; // to translate +$strShowCols = 'Show columns'; +$strShowTables = 'Show tables'; $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3 index 824f9547b..cd406ce3c 100644 --- a/lang/italian.inc.php3 +++ b/lang/italian.inc.php3 @@ -85,7 +85,7 @@ $strDeleted = 'La riga $strDeletedRows = 'Righe cancellate:'; $strDeleteFailed = 'Cancellazione fallita!'; $strDeletePassword = 'Cancella Password'; -$strDeleteUserMessage = 'Hai cancellato l\'utente'; +$strDeleteUserMessage = 'Hai cancellato l\'utente %s.'; $strDelPassMessage = 'Hai cancellato la password per'; $strDescending = 'Decrescente'; $strDisableMagicQuotes = 'Attenzione: Hai l\'opzione \'magic_quotes_gpc\' abilitata nel file di configurazione di PHP. Questa versione di PhpMyAdmin non funziona correttamente con essa. Fai riferimento alla sezione relativa alla configurazione del manuale PHP per informazioni su come disabilitarla.'; @@ -302,12 +302,8 @@ $strType = 'Tipo'; $strUncheckAll = 'Deseleziona tutti'; $strUnique = 'Unica'; -$strUpdatePassMessage = 'Hai aggiornato la password per'; -$strUpdatePassword = 'Aggiorna Password'; -$strUpdatePrivMessage = 'Hai aggiornato i permessi per'; +$strUpdatePrivMessage = 'Hai aggiornato i permessi per %s.'; $strUpdateQuery = 'Aggiorna Query'; -$strUpdateServer = 'Aggiorna il server'; -$strUpdateServMessage = 'Hai aggiornato il server per %s'; $strUsage = 'Utilizzo'; $strUseBackquotes = 'Usa i backquotes con i nomi delle tabelle e dei campi'; $strUser = 'Utente'; @@ -327,4 +323,7 @@ $strWrongUser = 'Nome utente o password errati. Accesso negato.'; $strYes = ' Si '; // To translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/japanese.inc.php3 b/lang/japanese.inc.php3 index d6414d0e8..c856005ba 100644 --- a/lang/japanese.inc.php3 +++ b/lang/japanese.inc.php3 @@ -76,7 +76,6 @@ $strDelete = ' $strDeleted = 'ÁªÂò¤·¤¿Îó¤òºï½ü¤·¤Þ¤·¤¿¡£'; $strDeleteFailed = 'Deleted Failed!'; //to translate $strDeletePassword = 'Delete Password'; //to translate -$strDeleteUserMessage = 'You have deleted the user'; //to translate $strDelPassMessage = 'You have deleted the password for'; //to translate $strDescending = 'Desending'; //to translate (tbl_qbe.php3) $strDisableMagicQuotes = 'Warning: PHP \'magic_quotes_gpc\'¤¬Enable¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤ÎphpMyAdmin¤Ç¤ÏÀµ¤·¤¯ºîÆ°¤·¤Þ¤»¤ó¡£PHP¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤·¤Ædisable¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£'; @@ -250,9 +249,6 @@ $strType = ' $strUncheckAll = 'Uncheck All'; //to translate $strUnique = '¥æ¥Ë¡¼¥¯¥¿¥¤¥×'; -$strUpdatePassMessage = 'You have updated the password for'; //to translate -$strUpdatePassword = 'Update Password'; //to translate -$strUpdatePrivMessage = 'You have updated the privileges for'; //to translate $strUpdateQuery = 'Update Query'; //to translate (tbl_qbe.php3) $strUsage = 'Usage'; //to translate $strUser = 'User'; //to translate @@ -328,6 +324,9 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/korean.inc.php3 b/lang/korean.inc.php3 index 32b29c52a..52125e5d9 100644 --- a/lang/korean.inc.php3 +++ b/lang/korean.inc.php3 @@ -76,7 +76,6 @@ $strDelete = ' $strDeleted = '¼±ÅÃÇÑ ¿­À» »èÁ¦ ÇÏ¿´½À´Ï´Ù.'; $strDeleteFailed = 'Deleted Failed!'; //to translate $strDeletePassword = 'Delete Password'; //to translate -$strDeleteUserMessage = 'You have deleted the user'; //to translate $strDelPassMessage = 'You have deleted the password for'; //to translate $strDescending = 'Desending'; //to translate (tbl_qbe.php3) $strDisableMagicQuotes = 'Warning: PHP \'magic_quotes_gpc\'°¡ Enable·Î ¼³Á¤µÇ¾î ÀÖ½À´Ï´Ù¸¸, ÀÌ ¹öÀüÀÇ phpMyAdmin¿¡¼­´Â ÀÛµ¿ÇÏÁö ¾Ê½À´Ï´Ù. PHP ¸Å´º¾óÀ» ÂüÁ¶ÇÏ¿© disable·Î ¼³Á¤ÇØ Áֽʽÿä.'; @@ -250,9 +249,6 @@ $strType = ' $strUncheckAll = 'Uncheck All'; //to translate $strUnique = 'À¯´ÏÅ© ŸÀÌÇÁ'; -$strUpdatePassMessage = 'You have updated the password for'; //to translate -$strUpdatePassword = 'Update Password'; //to translate -$strUpdatePrivMessage = 'You have updated the privileges for'; //to translate $strUpdateQuery = 'Update Query'; //to translate (tbl_qbe.php3) $strUsage = 'Usage'; //to translate $strUser = 'User'; //to translate @@ -328,6 +324,9 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/norwegian.inc.php3 b/lang/norwegian.inc.php3 index ade9bf9a3..397eb1a8d 100644 --- a/lang/norwegian.inc.php3 +++ b/lang/norwegian.inc.php3 @@ -83,7 +83,6 @@ $strDeleted = 'Raden er slettet'; $strDeletedRows = 'Slettede rader:'; $strDeleteFailed = 'Slettingen misslyktes!'; $strDeletePassword = 'Slett passord'; -$strDeleteUserMessage = 'Du har slettet brukeren'; $strDelPassMessage = 'Du har slettet passordet til'; $strDescending = 'Synkende'; $strDisableMagicQuotes = 'Advarsel: Du har slått på magic_quotes_gpc i din PHP konfigurasjon. Denne versjonen av PhpMyAdmin vil ikke fungere skikkelig med den. Vennligst se i konfigurasjons delen i PHP manualen for informasjon om hvordan du slår den av.'; @@ -292,9 +291,6 @@ $strType = 'Type'; $strUncheckAll = 'Fjern avmerking'; $strUnique = 'Unik'; -$strUpdatePassMessage = 'Du har oppdatert passordet til'; -$strUpdatePassword = 'Oppdater passord'; -$strUpdatePrivMessage = 'Du har oppdatert privilegiene til'; $strUpdateQuery = 'Oppdater spørring'; $strUsage = 'Bruk'; $strUseBackquotes = 'Bruk venstre anførselstegn med tabell og felt navn'; @@ -315,14 +311,17 @@ $strYes = 'Ja'; // To translate $strCarriage = 'Carriage return: \\r'; //to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strGrants = 'Grants'; //to translate +$strKeepPass = 'Do not change the password';//to translate $strPartialText = 'Partial Texts'; //to translate $strRunningAs = 'as'; $strShowAll = 'Show all'; // to translate $strShowCols = 'Show columns'; $strShowTables = 'Show tables'; $strStatement = 'Statements'; //to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate $strWithChecked = 'With checked:'; //to translate ?> diff --git a/lang/polish.inc.php3 b/lang/polish.inc.php3 index aa05cc57e..f1f42df6e 100644 --- a/lang/polish.inc.php3 +++ b/lang/polish.inc.php3 @@ -84,7 +84,6 @@ $strDeleted = 'Rekord zosta $strDeletedRows = 'Skasowane rekordy:'; $strDeleteFailed = 'Kasowanie nie powiod³o sie!'; $strDeletePassword = 'Kasowanie has³a'; -$strDeleteUserMessage = 'U¿ytkownik zosta³ skasowany'; $strDelPassMessage = 'Skasowane zosta³o has³o u¿ytkownika'; $strDescending = 'Malej±co'; $strDisableMagicQuotes = 'Ostrze¿enie: W³±czono opcje magic_quotes_gpc w konfiguracji PHP. Ta wersja PhpMyAdmin ¼le dzia³a, gdy opcja ta jest wy³±czona. Proszê zaznajomiæ siê z dokumentacj± do PHP, aby znale¼æ informacje, w jaki sposób wy³±czyæ tê opcjê.'; @@ -294,9 +293,6 @@ $strType = 'Typ'; $strUncheckAll = 'Odznaczenie wszystkich'; $strUnique = 'Unikalny'; -$strUpdatePassMessage = 'Zmienione zosta³o has³o dla'; -$strUpdatePassword = 'Zmiana has³a'; -$strUpdatePrivMessage = 'Zmienione zosta³y uprawnienia dla'; $strUpdateQuery = 'Zmiana zapytania'; $strUsage = 'Wykorzystanie'; $strUseBackquotes = 'U¿ycie cudzys³owów z nazwami tabel i pól'; @@ -316,13 +312,16 @@ $strWrongUser = 'B $strYes = 'Tak'; // To translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strIdxFulltext = 'Fulltext'; //to translate $strInvalidName = '"%s" is a reserved word, you can\'t use it as a database/table/field name.'; //to translate +$strKeepPass = 'Do not change the password';//to translate $strRunningAs = 'as'; $strShowAll = 'Show all'; // to translate $strShowCols = 'Show columns'; $strShowTables = 'Show tables'; -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate $strWithChecked = 'With checked:'; ?> diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3 index 36bccc313..8483d0efc 100644 --- a/lang/portuguese.inc.php3 +++ b/lang/portuguese.inc.php3 @@ -76,7 +76,6 @@ $strDelete = 'Remove'; $strDeleted = 'Registro eliminado'; $strDeleteFailed = 'Deleted Failed!'; //to translate $strDeletePassword = 'Delete Password'; //to translate -$strDeleteUserMessage = 'You have deleted the user'; //to translate $strDelPassMessage = 'You have deleted the password for'; //to translate $strDescending = 'Desending'; //to translate (tbl_qbe.php3) $strDisableMagicQuotes = 'Warning: You have enabled magic_quotes_gpc in your PHP configuration. This version of PhpMyAdmin cannot work properly with it. Please have a look at the configuration section of the PHP manual for information on how to disable it.'; //to translate @@ -250,9 +249,6 @@ $strType = 'Tipo'; $strUncheckAll = 'Uncheck All'; //to translate $strUnique = 'Unique'; -$strUpdatePassMessage = 'You have updated the password for'; //to translate -$strUpdatePassword = 'Update Password'; //to translate -$strUpdatePrivMessage = 'You have updated the privileges for'; //to translate $strUpdateQuery = 'Update Query'; //to translate (tbl_qbe.php3) $strUsage = 'Usage'; //to translate $strUser = 'User'; //to translate @@ -328,6 +324,9 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/romanian.inc.php3 b/lang/romanian.inc.php3 index 98452a618..1f96f82c2 100644 --- a/lang/romanian.inc.php3 +++ b/lang/romanian.inc.php3 @@ -84,7 +84,7 @@ $strDeleted = 'Linia a fost stearsa'; $strDeletedRows = 'Randuri sterse:'; $strDeleteFailed = 'Stergere nereusita!'; $strDeletePassword = 'Sterge parola'; -$strDeleteUserMessage = 'Ati sters utilizatorul'; +$strDeleteUserMessage = 'Ati sters utilizatorul %s.'; $strDelPassMessage = 'Ati sters parola pentru'; $strDescending = 'Descrescator'; $strDisableMagicQuotes = 'Atentie: Ati activat magic_quotes_gpc in configuratia PHP. Aceasta versiune PhpMyAdmin nu va functiona corect cu aceasta setare. Va rugam sa parcurgeti sectiunea de configurare a manualului PHP pentru mai multe informatii legate de modul de dezactivare.'; @@ -296,9 +296,7 @@ $strType = 'Tip'; $strUncheckAll = 'Deselecteaza toate'; $strUnique = 'Unic'; -$strUpdatePassMessage = 'Ati reinnoit parola pentru'; -$strUpdatePassword = 'Reinnoire parola'; -$strUpdatePrivMessage = 'Ati reinnoit drepturile de acces pentru'; +$strUpdatePrivMessage = 'Ati reinnoit drepturile de acces pentru %s.'; $strUpdateQuery = 'Reinnoire comanda'; $strUsage = 'Utilizare'; $strUseBackquotes = 'Utilizati apostroful pentru numele tabelelor si a campurilor'; @@ -320,10 +318,11 @@ $strYes = 'Da'; // To translate $strIdxFulltext = 'Fulltext'; //to translate +$strKeepPass = 'Do not change the password';//to translate $strRunningAs = 'as'; $strShowAll = 'Show all'; // to translate $strShowCols = 'Show columns'; $strShowTables = 'Show tables'; -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3 index 5dbd76ca9..064c75741 100644 --- a/lang/russian-koi8.inc.php3 +++ b/lang/russian-koi8.inc.php3 @@ -78,7 +78,6 @@ $strDelete = ' $strDeleted = 'òÑÄ ÂÙÌ ÕÄÁÌÅÎ'; $strDeleteFailed = 'îÅÕÄÁÞÎÏÅ ÕÄÁÌÅÎÉÅ!'; $strDeletePassword = 'õ×ÁÌÉÔØ ÐÁÒÏÌØ'; -$strDeleteUserMessage = 'âÙÌ ÕÄÁÌÅÎ ÐÏÌØÚÏ×ÁÔÅÌØ'; $strDelPassMessage = 'âÙÌ ÕÄÁÌÅÎ ÐÁÒÏÌØ ÄÌÑ'; $strDescending = 'îÉÓÈÏÄÑÝÉÊ'; $strDisableMagicQuotes = '÷ÎÉÍÁÎÅ: ÷ ËÏÎÆÉÇÕÒÁÃÉÉ PHP ÂÙÌÉ ÒÁÚÒÅÛÅÎÙ magic_quotes_gpc. üÔÁ ×ÅÒÓÉÑ PhpMyAdmin ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÄÁÎÎÕÀ ×ÏÚÍÏÖÎÏÓÔØ . ðÏÓÍÏÔÒÉÔÅ ÓÅËÃÉÀ ËÏÎÆÉÇÕÒÁÃÉÉ × ÒÕËÏ×ÏÄÓÔ×Å ÐÏ PHP, ÄÌÑ ÉÎÆÏÒÍÁÃÉÉ Ï ÏÔËÌÀÞÅÎÉÉ ÄÁÎÎÏÊ ×ÏÚÍÏÖÎÏÓÔÉ.'; @@ -261,9 +260,6 @@ $strType = ' $strUncheckAll = 'îÉÞÅÇÏ ÎÅ ÐÒÏ×ÅÒÑÔØ'; $strUnique = 'õÎÉËÁÌØÎÏÅ'; -$strUpdatePassMessage = 'âÙÌ ÉÚÍÅÎÅÔ ÐÁÒÏÌØ ÄÌÑ'; -$strUpdatePassword = 'éÚÍÅÎÉÔØ ÐÁÒÏÌØ'; -$strUpdatePrivMessage = 'âÙÌÉ ÉÚÍÅÎÅÎÙ ÐÒÉ×ÉÌÅÇÉÉ ÄÌÑ'; $strUpdateQuery = 'äÏÐÏÌÎÉÔØ úÁÐÒÏÓ'; $strUsage = 'éÓÐÏÌØÚÏ×ÁÎÉÅ'; $strUseBackquotes = 'ïÂÒÁÔÎÙÅ ËÁ×ÙÞËÉ × ÎÁÚ×ÁÎÉÑÈ ÔÁÂÌÉÃ É ÐÏÌÅÊ'; @@ -324,6 +320,9 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3 index 87f6505f0..56423ee0f 100644 --- a/lang/russian-win1251.inc.php3 +++ b/lang/russian-win1251.inc.php3 @@ -78,7 +78,6 @@ $strDelete = ' $strDeleted = 'Ðÿä áûë óäàëåí'; $strDeleteFailed = 'Íåóäà÷íîå óäàëåíèå!'; $strDeletePassword = 'Óâàëèòü ïàðîëü'; -$strDeleteUserMessage = 'Áûë óäàëåí ïîëüçîâàòåëü'; $strDelPassMessage = 'Áûë óäàëåí ïàðîëü äëÿ'; $strDescending = 'Íèñõîäÿùèé'; $strDisableMagicQuotes = 'Âíèìàíå:  êîíôèãóðàöèè PHP áûëè ðàçðåøåíû magic_quotes_gpc. Ýòà âåðñèÿ PhpMyAdmin íå ïîääåðæèâàåò äàííóþ âîçìîæíîñòü . Ïîñìîòðèòå ñåêöèþ êîíôèãóðàöèè â ðóêîâîäñòâå ïî PHP, äëÿ èíôîðìàöèè îá îòêëþ÷åíèè äàííîé âîçìîæíîñòè.'; @@ -261,9 +260,6 @@ $strType = ' $strUncheckAll = 'Íè÷åãî íå ïðîâåðÿòü'; $strUnique = 'Óíèêàëüíîå'; -$strUpdatePassMessage = 'Áûë èçìåíåò ïàðîëü äëÿ'; -$strUpdatePassword = 'Èçìåíèòü ïàðîëü'; -$strUpdatePrivMessage = 'Áûëè èçìåíåíû ïðèâèëåãèè äëÿ'; $strUpdateQuery = 'Äîïîëíèòü Çàïðîñ'; $strUsage = 'Èñïîëüçîâàíèå'; $strUseBackquotes = 'Îáðàòíûå êàâû÷êè â íàçâàíèÿõ òàáëèö è ïîëåé'; @@ -324,6 +320,9 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3 index 9de16c459..e0ec84657 100644 --- a/lang/slovak-iso.inc.php3 +++ b/lang/slovak-iso.inc.php3 @@ -83,7 +83,6 @@ $strDelete = 'Zmaza $strDeleted = 'Riadok bol zmazaný'; $strDeleteFailed = 'Mazanie bolo neúspe¹né!'; $strDeletePassword = 'Zmaza» heslo'; -$strDeleteUserMessage = 'Bol zmazaný pou¾ívateµ'; $strDelPassMessage = 'Bolo zmazané heslo pre'; $strDescending = 'Zostupne'; $strDisableMagicQuotes = 'Varovanie: Máte zapnuté magic_quotes_gpc vo Va¹ej konfigurácii PHP. Táto verzia PhpMyAdmin-a nemô¾e funguva» správane s týmto nastavením. Prosím pozrite sa do manuálu konfigurácie PHP ako toto nastavenie zmeni».'; @@ -279,9 +278,6 @@ $strType = 'Typ'; $strUncheckAll = 'Odznaèi» v¹etko'; $strUnique = 'Unikátny'; -$strUpdatePassMessage = 'Bolo zmenené heslo pre pou¾ívateµa'; -$strUpdatePassword = 'Zmeni» heslo'; -$strUpdatePrivMessage = 'Boli zmenené privilégia pre pou¾ívateµa'; $strUpdateQuery = 'Aktualizova» dotaz'; $strUsage = 'Vyu¾itie'; $strUseBackquotes = ' Pou¾i» opaèný apostrof pri názvoch tabuliek a polí '; @@ -325,6 +321,9 @@ $strShowTables = 'Show tables'; $strStrucExcelCSV = 'CSV for Ms Excel data'; $strTables = '%s table(s)'; //to translate $strWithChecked = 'With checked:'; -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3 index a460dc174..d2b5ac77e 100644 --- a/lang/spanish.inc.php3 +++ b/lang/spanish.inc.php3 @@ -81,7 +81,7 @@ $strDeleted = 'La fila se ha borrado'; $strDeletedRows = 'Filas Borradas: '; $strDeleteFailed = 'La operacion de borrado ha fallado!'; $strDeletePassword = 'Borrar contraseña'; -$strDeleteUserMessage = 'Ud. ha borrado el usuario'; +$strDeleteUserMessage = 'Ud. ha borrado el usuario %s.'; $strDelPassMessage = 'Ud. ha borrado la contraseña para'; $strDescending = 'Descendente'; $strDisableMagicQuotes = 'Atencion: Ud. ha activado magic_quotes_gpc en su configuracion de PHP. Esta version de PhpMyAdmin no funciona correctamente con ello. Por favor revise la seccion de configuracion en el manual de PHP para informacion de como desactivar dicha opcion.'; @@ -277,9 +277,7 @@ $strType = 'Tipo'; $strUncheckAll = 'Desmarcar todos'; $strUnique = 'Unico'; -$strUpdatePassMessage = 'Ud. ha actualizado la contraseña para'; -$strUpdatePassword = 'Actualizar Contraseña'; -$strUpdatePrivMessage = 'Ud. a actualizado los privilegios para'; +$strUpdatePrivMessage = 'Ud. a actualizado los privilegios para %s.'; $strUpdateQuery = 'Modificar la Consulta'; $strUsage = 'Uso'; $strUseBackquotes = 'Usar backquotes con tablas y nombres de campo'; @@ -324,6 +322,7 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3 index 91405d09a..7f8ba6d01 100644 --- a/lang/swedish.inc.php3 +++ b/lang/swedish.inc.php3 @@ -82,7 +82,6 @@ $strDeleted = 'Raden har raderats'; $strDeletedRows = 'Raderade rader'; $strDeleteFailed = 'Raderingen misslyckades!'; $strDeletePassword = 'Radera lösenord'; -$strDeleteUserMessage = 'Du har raderat användaren'; $strDelPassMessage = 'Du har raderat lösenordet för'; $strDescending = 'Fallande'; $strDisableMagicQuotes = 'Varning: Du har aktiverat \'magic_quotes_gpc\' i din PHP-konfiguration. Den här versionen av PhpMyAdmin fungerar inte korrekt med det tillvalet. Läs i PHP-dokumentationen för att se hur du avaktiverar det.'; @@ -283,9 +282,6 @@ $strType = 'Typ'; $strUncheckAll = 'Avmarkera alla'; $strUnique = 'Unik'; -$strUpdatePassMessage = 'Du har uppdaterat lösenordet för'; -$strUpdatePassword = 'Uppdatera lösenord'; -$strUpdatePrivMessage = 'Du har uppdaterat privilegierna för'; $strUpdateQuery = 'Uppdatera fråga'; $strUsage = 'Användning'; $strUseBackquotes = 'Använd bakåtcitat i tabeller och fältnamn'; @@ -306,24 +302,27 @@ $strWrongUser = 'Fel anv $strYes = 'Ja'; // To translate -$strIdxFulltext = 'Fulltext'; //to translate -$strRunningAs = 'as'; -$strShowAll = 'Show all'; // to translate -$strShowCols = 'Show columns'; -$strShowTables = 'Show tables'; $strAPrimaryKey = 'A primary key has been added on %s';//to translate $strAnIndex = 'An index has been added on %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate $strFieldHasBeenDropped = 'Field %s has been dropped';//to translate $strFieldsEnclosedBy = 'Fields enclosed by';//to translate $strFieldsEscapedBy = 'Fields escaped by';//to translate $strFieldsTerminatedBy = 'Fields terminated by';//to translate +$strIdxFulltext = 'Fulltext'; //to translate $strIndexHasBeenDropped = 'Index %s has been dropped';//to translate +$strKeepPass = 'Do not change the password';//to translate $strLinesTerminatedBy = 'Lines terminated by';//to translate $strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate +$strRunningAs = 'as'; $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate +$strShowAll = 'Show all'; // to translate +$strShowCols = 'Show columns'; +$strShowTables = 'Show tables'; $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3 index ff790fbae..d39b2eb82 100644 --- a/lang/thai.inc.php3 +++ b/lang/thai.inc.php3 @@ -76,7 +76,6 @@ $strDelete = 'ź'; $strDeleted = 'źá¶ÇÍÍ¡àÃÕºÃéÍÂáÅéÇ'; $strDeleteFailed = 'Deleted Failed!'; //to translate $strDeletePassword = 'Delete Password'; //to translate -$strDeleteUserMessage = 'You have deleted the user'; //to translate $strDelPassMessage = 'You have deleted the password for'; //to translate $strDescending = 'Desending'; //to translate (tbl_qbe.php3) $strDisableMagicQuotes = 'Warning: You have enabled magic_quotes_gpc in your PHP configuration. This version of PhpMyAdmin cannot work properly with it. Please have a look at the configuration section of the PHP manual for information on how to disable it.'; //to translate @@ -250,9 +249,6 @@ $strType = 'Type'; //to translate $strUncheckAll = 'Uncheck All'; //to translate $strUnique = 'Unique'; //to translate -$strUpdatePassMessage = 'You have updated the password for'; //to translate -$strUpdatePassword = 'Update Password'; //to translate -$strUpdatePrivMessage = 'You have updated the privileges for'; //to translate $strUpdateQuery = 'Update Query'; //to translate (tbl_qbe.php3) $strUsage = 'Usage'; //to translate $strUser = 'User'; //to translate @@ -329,6 +325,9 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate $strStartingRecord = 'Starting record';//to translate $strTableHasBeenDropped = 'Table %s has been dropped';//to translate $strTableHasBeenEmptied = 'Table %s has been emptied';//to translate -$strUpdateServer = 'Update server';//to translate -$strUpdateServMessage = 'You have updated the server for %s';//to translate +$strDeleteUserMessage = 'You have deleted the user %s.';//to translate +$strKeepPass = 'Do not change the password';//to translate +$strUpdatePrivMessage = 'You have updated the privileges for %s.';//to translate +$strUpdateProfile = 'Update profile:';//to translate +$strUpdateProfileMessage = 'The profile has been updated.';//to translate ?> diff --git a/libraries/user_details.js b/libraries/user_details.js index 5d2eacec6..af496f6de 100644 --- a/libraries/user_details.js +++ b/libraries/user_details.js @@ -10,17 +10,29 @@ */ function checkPassword(the_form) { - if (the_form.elements['nopass'][1].checked) { - if (the_form.elements['pma_pw'].value == '') { + // Gets the elements pointers + if (the_form.name == 'addUserForm') { + var pswd_index = 1; + var pswd1_name = 'pma_pw'; + var pswd2_name = 'pma_pw2'; + } else { + var pswd_index = 2; + var pswd1_name = 'new_pw'; + var pswd2_name = 'new_pw2'; + } + + // Validates + if (the_form.elements['nopass'][pswd_index].checked) { + if (the_form.elements[pswd1_name].value == '') { alert(jsPasswordEmpty); - the_form.elements['pma_pw2'].value = ''; - the_form.elements['pma_pw'].focus(); + the_form.elements[pswd2_name].value = ''; + the_form.elements[pswd1_name].focus(); return false; - } else if (the_form.elements['pma_pw'].value != the_form.elements['pma_pw2'].value) { + } else if (the_form.elements[pswd1_name].value != the_form.elements[pswd2_name].value) { alert(jsPasswordNotSame); - the_form.elements['pma_pw'].value = ''; - the_form.elements['pma_pw2'].value = ''; - the_form.elements['pma_pw'].focus(); + the_form.elements[pswd1_name].value = ''; + the_form.elements[pswd2_name].value = ''; + the_form.elements[pswd1_name].focus(); return false; } // end if...else if } // end if diff --git a/user_details.php3 b/user_details.php3 index 2ec648395..fb34e39f3 100644 --- a/user_details.php3 +++ b/user_details.php3 @@ -353,7 +353,7 @@ function normal_operations() - +   @@ -605,43 +605,62 @@ function edit_operations($host, $user)
  • -
    - + + + + + -
    - " /> -   - + /> + +   + /> +  :  + + " onchange="this.form.anyhost[1].checked = true" />
    - - - " /> - " /> -
    -
    • - -
  • -
    - - + + + + + + + + + + + + +
    - /> + /> + +   + /> +  :  + + " onchange="this.form.anyuser[1].checked = true" /> +
    + + +  
          
    +   - /> +  :  - +     :  - +
    @@ -649,7 +668,7 @@ function edit_operations($host, $user) " /> " /> - +
    • @@ -909,24 +928,38 @@ function confirm($the_host, $the_user) { */ check_rights(); -if (empty($host)) { - $db = 'mysql'; - $table = 'user'; -} else if (get_magic_quotes_gpc()) { +if (isset($db)) { + $db_bkp = $db; + unset($db); +} +if (isset($table)) { + $table_bkp = $table; + unset($db); +} +if (!empty($host) && get_magic_quotes_gpc()) { $host = stripslashes($host); if (!empty($pma_user)) { $pma_user = stripslashes($pma_user); } } - + $js_to_run = 'user_details.js'; include('./header.inc.php3'); -if (!empty($host) && !isset($submit_chgServer)) { +if (!isset($submit_updProfile)) { echo '

    ' . "\n"; - echo ' ' . $strHost . ' ' . $host . ' - ' . $strUser . ' ' . (($pma_user) ? $pma_user : $strAny) . "\n"; + echo ' ' . (empty($host) ? $strAnyHost : $strHost . ' ' . $host) . ' - ' . (empty($pma_user) ? $strAnyUser : $strUser . ' ' . $pma_user) . "\n"; echo '

    '; } +if (isset($db_bkp)) { + $db = $db_bkp; + unset($db_bkp); +} +if (isset($table_bkp)) { + $table = $table_bkp; + unset($table_bkp); +} + /** * Some actions has been submitted @@ -963,10 +996,9 @@ else if (isset($delete) && $delete $result = mysql_query('DELETE FROM mysql.user' . $common_where); if ($result) { - echo '

    ' . $strDeleteUserMessage . ' ' . $delete_user . '@' . $delete_host . '
    '; - echo ' ' . $strRememberReload . '

    '; + show_message(sprintf($strDeleteUserMessage, '' . $delete_user . '@' . $delete_host . '') . '
    ' . $strRememberReload); } else { - echo '

    ' . $strDeleteFailed . '

    '; + show_message($strDeleteFailed); } } @@ -1018,8 +1050,8 @@ else if (isset($submit_addUser)) { } // end else } -// Changes the server that an user can access -else if (isset($submit_chgServer)) { +// Updates the profile of an user +else if (isset($submit_updProfile)) { $show_query = 'y'; $edit = TRUE; if (empty($host)) { @@ -1028,52 +1060,76 @@ else if (isset($submit_chgServer)) { if (empty($pma_user)) { $pma_user = '%'; } - if (empty($new_server)) { + + // Builds the sql query + $sql_query = ''; + + if (isset($anyhost) && $anyhost) { $new_server = '%'; - } else if (get_magic_quotes_gpc()) { + } else if (!empty($new_server) && get_magic_quotes_gpc()) { $new_server = stripslashes($new_server); } - - $sql_query = 'UPDATE user ' - . 'SET host = \'' . sql_addslashes($new_server) . '\' ' - . 'WHERE user = \'' . sql_addslashes($pma_user) . '\' AND host = \'' . sql_addslashes($host) . '\''; - $result = @mysql_query($sql_query) or mysql_die('', '', FALSE); - - $host = $new_server; - echo '

    ' . "\n"; - echo ' ' . $strHost . ' ' . $host . ' - ' . $strUser . ' ' . (($pma_user) ? $pma_user : $strAny) . "\n"; - echo '

    '; - show_message(sprintf($strUpdateServMessage, '' . $pma_user . '@' . $host . '') . '
    ' . $strRememberReload); -} - -// Changes the password of an user -else if (isset($submit_chgPswd)) { - $show_query = 'y'; - $edit = TRUE; - if (empty($host)) { - $host = '%'; - } - if (empty($pma_user)) { - $pma_user = '%'; + if (!empty($new_server) && $new_server != $host) { + $sql_query .= 'host = \'' . sql_addslashes($new_server) . '\''; + } else if (isset($new_server)) { + unset($new_server); } - // Password is not confirmed - if ((!isset($nopass) || !$nopass) && empty($pma_pw)) { + if (isset($anyuser) && $anyuser) { + $new_user = '%'; + } else if (!empty($new_user) && get_magic_quotes_gpc()) { + $new_user = stripslashes($new_user); + } + if (!empty($new_user) && $new_user != $pma_user) { + $sql_query .= (empty($sql_query) ? '' : ', ') + . 'user = \'' . sql_addslashes($new_user) . '\''; + } else if (isset($new_user)) { + unset($new_user); + } + + if (isset($nopass) && $nopass == -1) { + // void() + } + else if ((!isset($nopass) || $nopass == 0) && empty($new_pw)) { + echo '

    ' . "\n"; + echo ' ' . $strHost . ' ' . $host . ' - ' . $strUser . ' ' . (($pma_user) ? $pma_user : $strAny) . "\n"; + echo '

    ' . "\n"; echo '

    ' . $strError . ' : ' . $strPasswordEmpty . '

    ' . "\n"; } - else if (!empty($pma_pw) - && (!isset($pma_pw2) || $pma_pw != $pma_pw2)) { + else if (!empty($new_pw) + && (!isset($new_pw2) || $new_pw != $new_pw2)) { + echo '

    ' . "\n"; + echo ' ' . $strHost . ' ' . $host . ' - ' . $strUser . ' ' . (($pma_user) ? $pma_user : $strAny) . "\n"; + echo '

    ' . "\n"; echo '

    ' . $strError . ' : ' . $strPasswordNotSame . '

    ' . "\n"; } - - // Password confirmed else { - $sql_query = 'UPDATE user ' - . 'SET password = ' . (empty($pma_pw) ? '\'\'' : 'PASSWORD(\'' . sql_addslashes($pma_pw) . '\')') . ' ' - . 'WHERE user = \'' . sql_addslashes($pma_user) . '\' AND host = \'' . sql_addslashes($host) . '\''; - $result = @mysql_query($sql_query) or mysql_die('', '', FALSE); - show_message($strUpdatePassMessage . ' ' . $pma_user . '@' . $host . '
    ' . $strRememberReload); - } // end else + $sql_query .= (empty($sql_query) ? '' : ', ') + . 'password = ' . (empty($new_pw) ? '\'\'' : 'PASSWORD(\'' . sql_addslashes($new_pw) . '\')'); + } + + if (!empty($sql_query)) { + $sql_query = 'UPDATE user ' + . 'SET ' . $sql_query . ' ' + . 'WHERE user = \'' . sql_addslashes($pma_user) . '\' AND host = \'' . sql_addslashes($host) . '\''; + $result = @mysql_query($sql_query) or mysql_die('', '', FALSE); + + if (isset($new_server)) { + $host = $new_server; + } + if (isset($new_user)) { + $pma_user = $new_user; + } + echo '

    ' . "\n"; + echo ' ' . $strHost . ' ' . $host . ' - ' . $strUser . ' ' . (($pma_user) ? $pma_user : $strAny) . "\n"; + echo '

    ' . "\n"; + show_message($strUpdateProfileMessage . '
    ' . $strRememberReload); + } else { + echo '

    ' . "\n"; + echo ' ' . $strHost . ' ' . $host . ' - ' . $strUser . ' ' . (($pma_user) ? $pma_user : $strAny) . "\n"; + echo '

    ' . "\n"; + show_message($strNoModification); + } } // Changes the privileges of an user @@ -1104,7 +1160,7 @@ else if (isset($submit_chgPriv)) { . $sql_query . ' WHERE host = \'' . sql_addslashes($host) . '\' AND user = \'' . sql_addslashes($pma_user) . '\''; $result = @mysql_query($sql_query) or mysql_die('', '', FALSE); - show_message($strUpdatePrivMessage . ' ' . $pma_user . '@' . $host . '
    ' . $strRememberReload); + show_message(sprintf($strUpdatePrivMessage, '' . $pma_user . '@' . $host . '') . '
    ' . $strRememberReload); } // Revoke/Grant privileges