Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Isaac Bennetch
commit
fb161a7beb
@ -3672,44 +3672,9 @@ function PMA_getHtmlTableBodyForUserRights($db_rights)
|
||||
function PMA_getFieldsetForAddDeleteUser()
|
||||
{
|
||||
$html_output = PMA_getAddUserHtmlFieldset();
|
||||
$html_output .= '<fieldset id="fieldset_delete_user">'
|
||||
. '<legend>' . "\n"
|
||||
. Util::getIcon('b_usrdrop.png')
|
||||
. ' ' . __('Remove selected user accounts') . '' . "\n"
|
||||
. '</legend>' . "\n";
|
||||
|
||||
$html_output .= '<input type="hidden" name="mode" value="2" />' . "\n"
|
||||
. '('
|
||||
. __(
|
||||
'Revoke all active privileges from the users '
|
||||
. 'and delete them afterwards.'
|
||||
)
|
||||
. ')'
|
||||
. '<br />' . "\n";
|
||||
|
||||
$html_output .= '<input type="checkbox" '
|
||||
. 'title="'
|
||||
. __('Drop the databases that have the same names as the users.')
|
||||
. '" '
|
||||
. 'name="drop_users_db" id="checkbox_drop_users_db" />' . "\n";
|
||||
|
||||
$html_output .= '<label for="checkbox_drop_users_db" '
|
||||
. 'title="'
|
||||
. __('Drop the databases that have the same names as the users.')
|
||||
. '">' . "\n"
|
||||
. ' '
|
||||
. __('Drop the databases that have the same names as the users.')
|
||||
. "\n"
|
||||
. '</label>' . "\n"
|
||||
. '</fieldset>' . "\n";
|
||||
|
||||
$html_output .= '<fieldset id="fieldset_delete_user_footer" class="tblFooters">'
|
||||
. "\n";
|
||||
$html_output .= '<input type="submit" name="delete" '
|
||||
. 'value="' . __('Go') . '" id="buttonGo" '
|
||||
. 'class="ajax"/>' . "\n";
|
||||
|
||||
$html_output .= '</fieldset>' . "\n";
|
||||
$html_output .= Template::get('privileges/delete_user_fieldset')
|
||||
->render(array());
|
||||
|
||||
return $html_output;
|
||||
}
|
||||
@ -4486,17 +4451,13 @@ function PMA_getAddUserHtmlFieldset($db = '', $table = '')
|
||||
= $table;
|
||||
}
|
||||
|
||||
return '<fieldset id="fieldset_add_user">' . "\n"
|
||||
. '<legend>' . _pgettext('Create new user', 'New') . '</legend>'
|
||||
. '<a id="add_user_anchor" href="server_privileges.php'
|
||||
. URL::getCommon($url_params) . '" '
|
||||
. (!empty($rel_params)
|
||||
? ('rel="' . URL::getCommon($rel_params) . '" ')
|
||||
: '')
|
||||
. '>' . "\n"
|
||||
. Util::getIcon('b_usradd.png')
|
||||
. ' ' . __('Add user account') . '</a>' . "\n"
|
||||
. '</fieldset>' . "\n";
|
||||
return Template::get('privileges/add_user_fieldset')
|
||||
->render(
|
||||
array(
|
||||
'url_params' => $url_params,
|
||||
'rel_params' => $rel_params
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
21
po/cs.po
21
po/cs.po
@ -6,8 +6,8 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2016-11-10 09:40+0100\n"
|
||||
"PO-Revision-Date: 2016-11-10 12:19+0000\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"PO-Revision-Date: 2016-11-24 13:35+0000\n"
|
||||
"Last-Translator: ratajs <simonrataj@seznam.cz>\n"
|
||||
"Language-Team: Czech "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/cs/>\n"
|
||||
"Language: cs\n"
|
||||
@ -15,7 +15,7 @@ msgstr ""
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 2.9\n"
|
||||
"X-Generator: Weblate 2.10-dev\n"
|
||||
|
||||
#: changelog.php:38 license.php:33
|
||||
#, fuzzy, php-format
|
||||
@ -770,7 +770,7 @@ msgstr ""
|
||||
|
||||
#: index.php:514
|
||||
msgid "The secret passphrase in configuration (blowfish_secret) is too short."
|
||||
msgstr ""
|
||||
msgstr "Tajné heslo v konfiguraci (blowfish_secret) je příliš krátké."
|
||||
|
||||
#: index.php:528
|
||||
msgid ""
|
||||
@ -956,6 +956,12 @@ msgid ""
|
||||
"column(s) editing feature (the \"Change\" Link) on the table structure page. "
|
||||
"</b>"
|
||||
msgstr ""
|
||||
"Prostřednictvím této operace se MySQL pokusí namapovat datové hodnoty mezi "
|
||||
"řazení. Jestli znakové sady nejsou kompatibilní, může dojít ke ztrátě dat a "
|
||||
"<b>ztracená data nemusí</b> být obnovitelné jednoduše tím, že změníte zpět "
|
||||
"collation(s) sloupec. <b>Pro převedení existujících data se doporučuje "
|
||||
"použít editace funkce (odkaz \"Změnit\") na stránce struktury sloupce "
|
||||
"tabulky.</b>"
|
||||
|
||||
#: js/messages.php:107
|
||||
msgid ""
|
||||
@ -1787,7 +1793,7 @@ msgstr "Export"
|
||||
|
||||
#: js/messages.php:394
|
||||
msgid "No routine is exportable. Required privileges may be lacking."
|
||||
msgstr ""
|
||||
msgstr "Žádná rutina nejde exportovat. Možná chybí požadovaná oprávnění."
|
||||
|
||||
#: js/messages.php:397 libraries/rte/rte_routines.lib.php:756
|
||||
msgid "ENUM/SET editor"
|
||||
@ -2140,10 +2146,13 @@ msgid "Encryption key"
|
||||
msgstr "Šifrovací klíč"
|
||||
|
||||
#: js/messages.php:527
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"MySQL accepts additional values not selectable by the slider; key in those "
|
||||
"values directly if desired"
|
||||
msgstr ""
|
||||
"Další přijaté hodnoty nelze vybrat nastavením jezdce; Zadejte tyto hodnoty "
|
||||
"přímo podle potřeby"
|
||||
|
||||
#: js/messages.php:533
|
||||
msgid ""
|
||||
@ -14661,8 +14670,6 @@ msgid "Show query history at start"
|
||||
msgstr "Zobrazit historii dotazů při spuštění"
|
||||
|
||||
#: templates/console/display.phtml:189
|
||||
#, fuzzy
|
||||
#| msgid "Show current browsing query"
|
||||
msgid "Show current browsing query"
|
||||
msgstr "Zobrazit aktuálně prohlížený dotaz"
|
||||
|
||||
|
||||
38
po/fr.po
38
po/fr.po
@ -4,8 +4,8 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2016-11-10 09:40+0100\n"
|
||||
"PO-Revision-Date: 2016-11-23 14:43+0000\n"
|
||||
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
|
||||
"PO-Revision-Date: 2016-11-24 13:18+0000\n"
|
||||
"Last-Translator: Carlos Ferreira <c.ferreira@acsiiweb.com>\n"
|
||||
"Language-Team: French "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/fr/>\n"
|
||||
"Language: fr\n"
|
||||
@ -11883,12 +11883,11 @@ msgstr ""
|
||||
"routine."
|
||||
|
||||
#: libraries/rte/rte_words.lib.php:42
|
||||
#, fuzzy, php-format
|
||||
#| msgid "No routine with name %1$s found in database %2$s"
|
||||
#, php-format
|
||||
msgid "No routine with name %1$s found in database %2$s."
|
||||
msgstr ""
|
||||
"Aucune procédure portant le nom %1$s n'a été trouvée dans la base de données "
|
||||
"%2$s"
|
||||
"%2$s."
|
||||
|
||||
#: libraries/rte/rte_words.lib.php:43
|
||||
msgid "There are no routines to display."
|
||||
@ -11908,17 +11907,14 @@ msgid "trigger"
|
||||
msgstr "déclencheur"
|
||||
|
||||
#: libraries/rte/rte_words.lib.php:54
|
||||
#, fuzzy
|
||||
#| msgid "You do not have the necessary privileges to create a trigger"
|
||||
msgid "You do not have the necessary privileges to create a trigger."
|
||||
msgstr "Vous n'avez pas les privilèges nécessaires pour créer un déclencheur"
|
||||
msgstr "Vous n'avez pas les privilèges nécessaires pour créer un déclencheur."
|
||||
|
||||
#: libraries/rte/rte_words.lib.php:56
|
||||
#, fuzzy, php-format
|
||||
#| msgid "No trigger with name %1$s found in database %2$s"
|
||||
#, php-format
|
||||
msgid "No trigger with name %1$s found in database %2$s."
|
||||
msgstr ""
|
||||
"Aucun déclencheur nommé %1$s n'a été trouvé dans la base de données %2$s"
|
||||
"Aucun déclencheur nommé %1$s n'a été trouvé dans la base de données %2$s."
|
||||
|
||||
#: libraries/rte/rte_words.lib.php:57
|
||||
msgid "There are no triggers to display."
|
||||
@ -11938,16 +11934,13 @@ msgid "event"
|
||||
msgstr "événement"
|
||||
|
||||
#: libraries/rte/rte_words.lib.php:68
|
||||
#, fuzzy
|
||||
#| msgid "You do not have the necessary privileges to create an event"
|
||||
msgid "You do not have the necessary privileges to create an event."
|
||||
msgstr "Vous n'avez pas les privilèges nécessaires pour créer un événement"
|
||||
msgstr "Vous n'avez pas les privilèges nécessaires pour créer un événement."
|
||||
|
||||
#: libraries/rte/rte_words.lib.php:70
|
||||
#, fuzzy, php-format
|
||||
#| msgid "No event with name %1$s found in database %2$s"
|
||||
#, php-format
|
||||
msgid "No event with name %1$s found in database %2$s."
|
||||
msgstr "Aucun événement nommé %1$s n'a été trouvé dans la base de données %2$s"
|
||||
msgstr "Aucun événement nommé %1$s n'a été trouvé dans la base de données %2$s."
|
||||
|
||||
#: libraries/rte/rte_words.lib.php:71
|
||||
msgid "There are no events to display."
|
||||
@ -14501,8 +14494,6 @@ msgid "Add"
|
||||
msgstr "Ajouter"
|
||||
|
||||
#: templates/columns_definitions/column_definitions_form.phtml:66
|
||||
#, fuzzy
|
||||
#| msgid "Add column(s)"
|
||||
msgid "column(s)"
|
||||
msgstr "colonne(s)"
|
||||
|
||||
@ -15690,8 +15681,6 @@ msgid "The profile has been updated."
|
||||
msgstr "Le profil a été modifié."
|
||||
|
||||
#: user_password.php:125
|
||||
#, fuzzy
|
||||
#| msgid "Password Hashing:"
|
||||
msgid "Password is too long!"
|
||||
msgstr "Le mot de passe est trop long !"
|
||||
|
||||
@ -15817,8 +15806,7 @@ msgid "This option conflicts with \"%1$s\"."
|
||||
msgstr "Cette option entre en conflit avec « %1$s »."
|
||||
|
||||
#: vendor/phpmyadmin/sql-parser/src/Components/OptionsArray.php:260
|
||||
#, fuzzy, php-format
|
||||
#| msgid "Ending quote %1$s was expected."
|
||||
#, php-format
|
||||
msgid "Value/Expression for the option %1$s was expected"
|
||||
msgstr "Une valeur/expression pour l'option %1$s était attendue"
|
||||
|
||||
@ -15894,8 +15882,6 @@ msgid "The name of the entity was expected."
|
||||
msgstr "Le nom de l'entité était attendu."
|
||||
|
||||
#: vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php:436
|
||||
#, fuzzy
|
||||
#| msgid "Variable name was expected."
|
||||
msgid "A table name was expected."
|
||||
msgstr "Un nom de table était attendu."
|
||||
|
||||
@ -15908,8 +15894,6 @@ msgid "A \"RETURNS\" keyword was expected."
|
||||
msgstr "Le mot clé « RETURNS » était attendu."
|
||||
|
||||
#: vendor/phpmyadmin/sql-parser/src/Statements/DeleteStatement.php:303
|
||||
#, fuzzy
|
||||
#| msgid "This type of clause was previously parsed."
|
||||
msgid "This type of clause is not valid in Multi-table queries."
|
||||
msgstr "Ce type de clause a été analysé précédemment."
|
||||
|
||||
|
||||
8
templates/privileges/add_user_fieldset.phtml
Normal file
8
templates/privileges/add_user_fieldset.phtml
Normal file
@ -0,0 +1,8 @@
|
||||
<fieldset id="fieldset_add_user">
|
||||
<legend><?= _pgettext('Create new user', 'New') ?></legend>
|
||||
<a id="add_user_anchor" href="server_privileges.php<?= PMA\libraries\URL::getCommon($url_params) ?>"
|
||||
<?php if (!empty($rel_params)) : ?>
|
||||
rel="<?= PMA\libraries\URL::getCommon($rel_params)?>"
|
||||
<?php endif; ?> >
|
||||
<?= PMA\libraries\Util::getIcon('b_usradd.png') ?><?= __('Add user account') ?></a>
|
||||
</fieldset>
|
||||
17
templates/privileges/delete_user_fieldset.phtml
Normal file
17
templates/privileges/delete_user_fieldset.phtml
Normal file
@ -0,0 +1,17 @@
|
||||
<fieldset id="fieldset_delete_user">
|
||||
<legend>
|
||||
<?= PMA\libraries\Util::getIcon('b_usrdrop.png')?><?= __('Remove selected user accounts') ?>
|
||||
</legend>
|
||||
<input type="hidden" name="mode" value="2" />
|
||||
( <?= __('Revoke all active privileges from the users and delete them afterwards.') ?> )
|
||||
<br />
|
||||
<input type="checkbox" title="<?= __('Drop the databases that have the same names as the users.') ?>"
|
||||
name="drop_users_db" id="checkbox_drop_users_db" />
|
||||
<label for="checkbox_drop_users_db" title=<?= __('Drop the databases that have the same names as the users.')?> >
|
||||
<?= __('Drop the databases that have the same names as the users.') ?>
|
||||
</label>
|
||||
</fieldset>
|
||||
|
||||
<fieldset id="fieldset_delete_user_footer" class="tblFooters">
|
||||
<input type="submit" name="delete" value="<?= __('Go') ?>" id="buttonGo" class="ajax" />
|
||||
</fieldset>
|
||||
Loading…
Reference in New Issue
Block a user
