Merge branch 'QA_4_7'
This commit is contained in:
Michal Čihař
commit
28dc8a4b68
@ -326,20 +326,12 @@ class ErrorHandler
|
||||
*/
|
||||
public function getDispErrors()
|
||||
{
|
||||
// Not sure why but seen in https://reports.phpmyadmin.net/
|
||||
if (empty($GLOBALS['cfg']['SendErrorReports'])) {
|
||||
$GLOBALS['cfg']['SendErrorReports'] = 'ask';
|
||||
}
|
||||
$retval = '';
|
||||
// display errors if SendErrorReports is set to 'ask'.
|
||||
if ($GLOBALS['cfg']['SendErrorReports'] != 'never') {
|
||||
foreach ($this->getErrors() as $error) {
|
||||
if ($error instanceof Error) {
|
||||
if (! $error->isDisplayed()) {
|
||||
$retval .= $error->getDisplay();
|
||||
}
|
||||
} else {
|
||||
$retval .= var_export($error, true);
|
||||
if (! $error->isDisplayed()) {
|
||||
$retval .= $error->getDisplay();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@ -411,7 +403,6 @@ class ErrorHandler
|
||||
$this->errors[$hash] = $error;
|
||||
}
|
||||
}
|
||||
//$this->errors = array_merge($_SESSION['errors'], $this->errors);
|
||||
|
||||
// delete stored errors
|
||||
$_SESSION['errors'] = array();
|
||||
|
||||
96
po/fr.po
96
po/fr.po
@ -4,7 +4,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2017-01-25 10:08+0100\n"
|
||||
"PO-Revision-Date: 2017-02-11 09:12+0000\n"
|
||||
"PO-Revision-Date: 2017-02-21 20:10+0000\n"
|
||||
"Last-Translator: tmtisfree <tmtisfree@free.fr>\n"
|
||||
"Language-Team: French "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/fr/>\n"
|
||||
@ -883,7 +883,7 @@ msgstr "Destruction de clé primaire/index"
|
||||
|
||||
#: js/messages.php:63
|
||||
msgid "Dropping Foreign key."
|
||||
msgstr "Destruction de la clé étrangère"
|
||||
msgstr "Destruction de la clé étrangère."
|
||||
|
||||
#: js/messages.php:65
|
||||
msgid "This operation could take a long time. Proceed anyway?"
|
||||
@ -3625,10 +3625,8 @@ msgid "Relational key"
|
||||
msgstr "Clé relationnelle"
|
||||
|
||||
#: libraries/DisplayResults.php:1745
|
||||
#, fuzzy
|
||||
#| msgid "Display column for relations"
|
||||
msgid "Display column for relationships"
|
||||
msgstr "Colonne d'affichage pour les relations"
|
||||
msgstr "Afficher une colonne pour les relations"
|
||||
|
||||
#: libraries/DisplayResults.php:1761
|
||||
msgid "Show binary contents"
|
||||
@ -5946,8 +5944,6 @@ msgstr "Type MIME"
|
||||
|
||||
#: libraries/config/messages.inc.php:167 libraries/config/messages.inc.php:180
|
||||
#: libraries/config/messages.inc.php:221
|
||||
#, fuzzy
|
||||
#| msgid "Relations"
|
||||
msgid "Relationships"
|
||||
msgstr "Relations"
|
||||
|
||||
@ -7692,16 +7688,12 @@ msgid "Show hint"
|
||||
msgstr "Montrer les explications"
|
||||
|
||||
#: libraries/config/messages.inc.php:867
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Shows link to [a@https://secure.php.net/manual/function.phpinfo."
|
||||
#| "php]phpinfo()[/a] output."
|
||||
msgid ""
|
||||
"Shows link to [a@https://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
|
||||
"output."
|
||||
msgstr ""
|
||||
"Montre un lien vers le résultat de [a@https://secure.php.net/manual/function."
|
||||
"phpinfo.php]phpinfo()[/a]."
|
||||
"Affiche un lien vers le résultat de "
|
||||
"[a@https://php.net/manual/function.phpinfo.php]phpinfo()[/a]."
|
||||
|
||||
#: libraries/config/messages.inc.php:870
|
||||
msgid "Show phpinfo() link"
|
||||
@ -8190,10 +8182,8 @@ msgid "Display column was successfully updated."
|
||||
msgstr "La colonne descriptive a été correctement modifiée."
|
||||
|
||||
#: libraries/controllers/table/TableRelationController.php:282
|
||||
#, fuzzy
|
||||
#| msgid "Internal relations were successfully updated."
|
||||
msgid "Internal relationships were successfully updated."
|
||||
msgstr "Les relations internes ont été correctement modifiées."
|
||||
msgstr "Les relations internes ont été mises à jour avec succès."
|
||||
|
||||
#: libraries/controllers/table/TableSearchController.php:768
|
||||
msgid "Table search"
|
||||
@ -10114,7 +10104,7 @@ msgstr "Vous n'êtes pas autorisé à vous connecter à ce serveur MySQL !"
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.php:723
|
||||
msgid "OpenSSL error when manipulating with cookies:"
|
||||
msgstr ""
|
||||
msgstr "Erreur OpenSSL en manipulant des cookies :"
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationHttp.php:88
|
||||
msgid "Wrong username/password. Access denied."
|
||||
@ -10561,8 +10551,6 @@ msgid "MIME TYPES FOR TABLE"
|
||||
msgstr "TYPES MIME POUR LA TABLE"
|
||||
|
||||
#: libraries/plugins/export/ExportSql.php:1878
|
||||
#, fuzzy
|
||||
#| msgid "RELATIONS FOR TABLE"
|
||||
msgid "RELATIONSHIPS FOR TABLE"
|
||||
msgstr "RELATIONS POUR LA TABLE"
|
||||
|
||||
@ -11040,22 +11028,16 @@ msgid "Formats text as XML with syntax highlighting."
|
||||
msgstr "Formate le texte en XML avec la coloration syntaxique."
|
||||
|
||||
#: libraries/pmd_common.php:551
|
||||
#, fuzzy
|
||||
#| msgid "Error: relation already exists."
|
||||
msgid "Error: relationship already exists."
|
||||
msgstr "Erreur: relation déjà existante."
|
||||
msgstr "Erreur : relation déjà existante."
|
||||
|
||||
#: libraries/pmd_common.php:597
|
||||
#, fuzzy
|
||||
#| msgid "FOREIGN KEY relation has been added."
|
||||
msgid "FOREIGN KEY relationship has been added."
|
||||
msgstr "Relation de type FOREIGN KEY ajoutée."
|
||||
msgstr "Relation de clé étrangère ajoutée."
|
||||
|
||||
#: libraries/pmd_common.php:603
|
||||
#, fuzzy
|
||||
#| msgid "Error: FOREIGN KEY relation could not be added!"
|
||||
msgid "Error: FOREIGN KEY relationship could not be added!"
|
||||
msgstr "Erreur: relation de clé étrangère non ajoutée !"
|
||||
msgstr "Erreur : relation de clé étrangère non ajoutée !"
|
||||
|
||||
#: libraries/pmd_common.php:608
|
||||
msgid "Error: Missing index on column(s)."
|
||||
@ -11066,40 +11048,28 @@ msgid "Error: Relational features are disabled!"
|
||||
msgstr "Erreur : fonctionnalités relationnelles désactivées !"
|
||||
|
||||
#: libraries/pmd_common.php:635
|
||||
#, fuzzy
|
||||
#| msgid "Internal relation has been added."
|
||||
msgid "Internal relationship has been added."
|
||||
msgstr "Relation interne ajoutée."
|
||||
|
||||
#: libraries/pmd_common.php:641
|
||||
#, fuzzy
|
||||
#| msgid "Error: Internal relation could not be added!"
|
||||
msgid "Error: Internal relationship could not be added!"
|
||||
msgstr "Erreur: relation interne non ajoutée !"
|
||||
|
||||
#: libraries/pmd_common.php:679
|
||||
#, fuzzy
|
||||
#| msgid "FOREIGN KEY relation has been removed."
|
||||
msgid "FOREIGN KEY relationship has been removed."
|
||||
msgstr "Relation de type FOREIGN KEY supprimée."
|
||||
|
||||
#: libraries/pmd_common.php:685
|
||||
#, fuzzy
|
||||
#| msgid "Error: FOREIGN KEY relation could not be removed!"
|
||||
msgid "Error: FOREIGN KEY relationship could not be removed!"
|
||||
msgstr "Erreur: relation de type FOREIGN KEY non ajoutée !"
|
||||
|
||||
#: libraries/pmd_common.php:712
|
||||
#, fuzzy
|
||||
#| msgid "Error: Internal relation could not be removed!"
|
||||
msgid "Error: Internal relationship could not be removed!"
|
||||
msgstr "Erreur : relation interne non ajoutée !"
|
||||
|
||||
#: libraries/pmd_common.php:679
|
||||
msgid "FOREIGN KEY relationship has been removed."
|
||||
msgstr "Relation de clé étrangère retirée."
|
||||
|
||||
#: libraries/pmd_common.php:685
|
||||
msgid "Error: FOREIGN KEY relationship could not be removed!"
|
||||
msgstr "Erreur : relation de clé étrangère non retirée !"
|
||||
|
||||
#: libraries/pmd_common.php:712
|
||||
msgid "Error: Internal relationship could not be removed!"
|
||||
msgstr "Erreur : relation interne non retirée !"
|
||||
|
||||
#: libraries/pmd_common.php:716
|
||||
#, fuzzy
|
||||
#| msgid "Internal relation has been removed."
|
||||
msgid "Internal relationship has been removed."
|
||||
msgstr "Relation interne supprimée."
|
||||
msgstr "Relation interne retirée."
|
||||
|
||||
#: libraries/relation.lib.php:90
|
||||
msgid "not OK"
|
||||
@ -11546,6 +11516,8 @@ msgid ""
|
||||
"Connection to server is disabled, please enable $cfg['AllowArbitraryServer'] "
|
||||
"in phpMyAdmin configuration."
|
||||
msgstr ""
|
||||
"La connexion au serveur est désactivée, merci d'activer "
|
||||
"$cfg['AllowArbitraryServer'] dans la configuration de phpMyAdmin."
|
||||
|
||||
#: libraries/replication_gui.lib.php:914
|
||||
msgid "Replication started successfully."
|
||||
@ -14876,10 +14848,8 @@ msgid "See table structure"
|
||||
msgstr "Voir la structure de la table"
|
||||
|
||||
#: templates/database/designer/delete_relation_panel.phtml:21
|
||||
#, fuzzy
|
||||
#| msgid "Delete relation"
|
||||
msgid "Delete relationship"
|
||||
msgstr "Effacer la relation"
|
||||
msgstr "Supprimer la relation"
|
||||
|
||||
#: templates/database/designer/edit_delete_pages.phtml:7
|
||||
msgid "Page to open"
|
||||
@ -14906,15 +14876,11 @@ msgstr "sous-requête"
|
||||
#: templates/database/designer/new_relation_panel.phtml:22
|
||||
#: templates/database/designer/side_menu.phtml:84
|
||||
#: templates/database/designer/side_menu.phtml:87
|
||||
#, fuzzy
|
||||
#| msgid "Create relation"
|
||||
msgid "Create relationship"
|
||||
msgstr "Nouvelle relation"
|
||||
|
||||
#: templates/database/designer/options_panel.phtml:34
|
||||
#: templates/database/designer/options_panel.phtml:200
|
||||
#, fuzzy
|
||||
#| msgid "Relation operator"
|
||||
msgid "Relationship operator"
|
||||
msgstr "Opérateur de relation"
|
||||
|
||||
@ -15014,10 +14980,8 @@ msgstr "Bascule agrandir/réduire"
|
||||
|
||||
#: templates/database/designer/side_menu.phtml:145
|
||||
#: templates/database/designer/side_menu.phtml:148
|
||||
#, fuzzy
|
||||
#| msgid "Toggle relation lines"
|
||||
msgid "Toggle relationship lines"
|
||||
msgstr "Basculement des lignes de relations"
|
||||
msgstr "Commuter les lignes de relations"
|
||||
|
||||
#: templates/database/designer/side_menu.phtml:153
|
||||
#: templates/database/designer/side_menu.phtml:156
|
||||
@ -15044,10 +15008,8 @@ msgid "Hide/Show all"
|
||||
msgstr "Cacher/montrer tout"
|
||||
|
||||
#: templates/database/designer/table_list.phtml:14
|
||||
#, fuzzy
|
||||
#| msgid "Hide/Show Tables with no relation"
|
||||
msgid "Hide/Show Tables with no relationship"
|
||||
msgstr "Cacher/montrer les tables sans liens"
|
||||
msgstr "Masquer/Afficher les tables sans relations"
|
||||
|
||||
#: templates/database/designer/table_list.phtml:59
|
||||
msgid "Number of tables:"
|
||||
@ -15468,8 +15430,6 @@ msgstr "+ Ajouter une contrainte"
|
||||
|
||||
#: templates/table/relation/common_form.phtml:76
|
||||
#: templates/table/relation/common_form.phtml:82
|
||||
#, fuzzy
|
||||
#| msgid "Internal relations"
|
||||
msgid "Internal relationships"
|
||||
msgstr "Relations internes"
|
||||
|
||||
|
||||
70
po/uk.po
70
po/uk.po
@ -4,7 +4,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2017-01-25 10:08+0100\n"
|
||||
"PO-Revision-Date: 2017-02-21 08:13+0000\n"
|
||||
"PO-Revision-Date: 2017-02-21 10:11+0000\n"
|
||||
"Last-Translator: Володимир <bardvv@gmail.com>\n"
|
||||
"Language-Team: Ukrainian "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/uk/>\n"
|
||||
@ -972,31 +972,35 @@ msgstr ""
|
||||
"структури таблиці."
|
||||
|
||||
#: js/messages.php:107
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"Are you sure you wish to change all the column collations and convert the "
|
||||
"data?"
|
||||
msgstr ""
|
||||
"Ви впевнені, що хочете змінити всі стовпці співставлення і перетворити дані?"
|
||||
|
||||
#: js/messages.php:111
|
||||
#, fuzzy
|
||||
#| msgid "Save & Close"
|
||||
msgid "Save & close"
|
||||
msgstr "Зберегти та закрити"
|
||||
msgstr "Зберегти і закрити"
|
||||
|
||||
#: js/messages.php:112 libraries/config/FormDisplay.tpl.php:426
|
||||
#: libraries/insert_edit.lib.php:1619 prefs_manage.php:374 prefs_manage.php:385
|
||||
#, fuzzy
|
||||
msgid "Reset"
|
||||
msgstr "Перевстановити"
|
||||
msgstr "Скинути"
|
||||
|
||||
#: js/messages.php:113
|
||||
#, fuzzy
|
||||
#| msgid "Reset All"
|
||||
msgid "Reset all"
|
||||
msgstr "Скинути всі"
|
||||
msgstr "Скинути все"
|
||||
|
||||
#: js/messages.php:116
|
||||
#, fuzzy
|
||||
msgid "Missing value in the form!"
|
||||
msgstr "Не задано значення для форми!"
|
||||
msgstr "Відсутнє значення в формі!"
|
||||
|
||||
#: js/messages.php:117
|
||||
msgid "Select at least one of the options!"
|
||||
@ -1034,8 +1038,9 @@ msgid "Create composite index"
|
||||
msgstr "Створити складений індекс"
|
||||
|
||||
#: js/messages.php:125
|
||||
#, fuzzy
|
||||
msgid "Composite with:"
|
||||
msgstr ""
|
||||
msgstr "Формувати з:"
|
||||
|
||||
#: js/messages.php:126
|
||||
msgid "Please select column(s) for the index."
|
||||
@ -1053,8 +1058,9 @@ msgid "Preview SQL"
|
||||
msgstr "Попередній перегляд SQL"
|
||||
|
||||
#: js/messages.php:135
|
||||
#, fuzzy
|
||||
msgid "Simulate query"
|
||||
msgstr "Імітувати запит"
|
||||
msgstr "Змоделювати запит"
|
||||
|
||||
#: js/messages.php:136
|
||||
msgid "Matched rows:"
|
||||
@ -1072,26 +1078,31 @@ msgid "Y values"
|
||||
msgstr "Значення Y"
|
||||
|
||||
#: js/messages.php:144
|
||||
#, fuzzy
|
||||
msgid "The host name is empty!"
|
||||
msgstr "Порожнє ім'я хоста!"
|
||||
msgstr "Відсутнє ім'я хосту!"
|
||||
|
||||
#: js/messages.php:145
|
||||
#, fuzzy
|
||||
msgid "The user name is empty!"
|
||||
msgstr "Порожнє і'мя користувача!"
|
||||
msgstr "Відсутнє ім'я користувача!"
|
||||
|
||||
#: js/messages.php:146 libraries/server_privileges.lib.php:1868
|
||||
#: user_password.php:119
|
||||
#, fuzzy
|
||||
msgid "The password is empty!"
|
||||
msgstr "Порожній пароль!"
|
||||
msgstr "Відсутній пароль!"
|
||||
|
||||
#: js/messages.php:147 libraries/server_privileges.lib.php:1866
|
||||
#: user_password.php:123
|
||||
#, fuzzy
|
||||
msgid "The passwords aren't the same!"
|
||||
msgstr "Паролі не однакові!"
|
||||
msgstr "Паролі не співпадають!"
|
||||
|
||||
#: js/messages.php:148
|
||||
#, fuzzy
|
||||
msgid "Removing Selected Users"
|
||||
msgstr "Видалення відмічених користувачів"
|
||||
msgstr "Видалення вибраних користувачів"
|
||||
|
||||
#: js/messages.php:149 js/messages.php:216 libraries/tracking.lib.php:467
|
||||
#: libraries/tracking.lib.php:830
|
||||
@ -1099,26 +1110,25 @@ msgid "Close"
|
||||
msgstr "Закрити"
|
||||
|
||||
#: js/messages.php:152
|
||||
#, fuzzy
|
||||
#| msgid "The number of pages created."
|
||||
msgid "Template was created."
|
||||
msgstr "Кількість створених сторінок."
|
||||
msgstr "Шаблон створений."
|
||||
|
||||
#: js/messages.php:153
|
||||
#, fuzzy
|
||||
msgid "Template was loaded."
|
||||
msgstr ""
|
||||
msgstr "Шаблон завантажений."
|
||||
|
||||
#: js/messages.php:154
|
||||
#, fuzzy
|
||||
#| msgid "The profile has been updated."
|
||||
msgid "Template was updated."
|
||||
msgstr "Профіль було поновлено."
|
||||
msgstr "Шаблон оновлено."
|
||||
|
||||
#: js/messages.php:155
|
||||
#, fuzzy
|
||||
#| msgid "The row has been deleted."
|
||||
msgid "Template was deleted."
|
||||
msgstr "Рядок видалено."
|
||||
msgstr "Шаблон видалено."
|
||||
|
||||
#. l10n: Other, small valued, queries
|
||||
#: js/messages.php:158 libraries/ServerStatusData.php:132
|
||||
@ -1177,8 +1187,9 @@ msgid "System CPU usage"
|
||||
msgstr "Використання CPU системою"
|
||||
|
||||
#: js/messages.php:181
|
||||
#, fuzzy
|
||||
msgid "System memory"
|
||||
msgstr "Пам'ять системи"
|
||||
msgstr "Системна пам'ять"
|
||||
|
||||
#: js/messages.php:182
|
||||
msgid "System swap"
|
||||
@ -1676,14 +1687,15 @@ msgid "Test"
|
||||
msgstr "Тест"
|
||||
|
||||
#: js/messages.php:345
|
||||
#, fuzzy
|
||||
msgid "Formatting SQL…"
|
||||
msgstr ""
|
||||
msgstr "Форматування SQL…"
|
||||
|
||||
#: js/messages.php:346
|
||||
#, fuzzy
|
||||
#| msgid "Bad parameters!"
|
||||
msgid "No parameters found!"
|
||||
msgstr "Помилкові параметри!"
|
||||
msgstr "Параметри не знайдені!"
|
||||
|
||||
#: js/messages.php:350
|
||||
#: templates/database/designer/aggregate_query_panel.phtml:63
|
||||
@ -1852,8 +1864,9 @@ msgid "Export"
|
||||
msgstr "Експортувати"
|
||||
|
||||
#: js/messages.php:395
|
||||
#, fuzzy
|
||||
msgid "No routine is exportable. Required privileges may be lacking."
|
||||
msgstr ""
|
||||
msgstr "Експортування неможливе. Відсутні необхідні привілеї."
|
||||
|
||||
#: js/messages.php:398 libraries/rte/rte_routines.lib.php:747
|
||||
msgid "ENUM/SET editor"
|
||||
@ -1929,8 +1942,9 @@ msgid "Browse foreign values"
|
||||
msgstr "Огляд зовнішніх значень"
|
||||
|
||||
#: js/messages.php:416
|
||||
#, fuzzy
|
||||
msgid "No auto-saved query"
|
||||
msgstr ""
|
||||
msgstr "Немає автоматичного збереження запиту"
|
||||
|
||||
#: js/messages.php:417
|
||||
#, fuzzy, php-format
|
||||
@ -1939,8 +1953,9 @@ msgid "Variable %d:"
|
||||
msgstr "Змінна"
|
||||
|
||||
#: js/messages.php:420 libraries/normalization.lib.php:884
|
||||
#, fuzzy
|
||||
msgid "Pick"
|
||||
msgstr ""
|
||||
msgstr "Відбір"
|
||||
|
||||
#: js/messages.php:421
|
||||
msgid "Column selector"
|
||||
@ -1951,11 +1966,13 @@ msgid "Search this list"
|
||||
msgstr "Шукати в цьому списку"
|
||||
|
||||
#: js/messages.php:424
|
||||
#, php-format
|
||||
#, fuzzy, php-format
|
||||
msgid ""
|
||||
"No columns in the central list. Make sure the Central columns list for "
|
||||
"database %s has columns that are not present in the current table."
|
||||
msgstr ""
|
||||
"Немає стовпців у списку. Переконайтеся, що список стовпців бази даних %s "
|
||||
"має стовпці, які не представлені в поточній таблиці."
|
||||
|
||||
#: js/messages.php:427
|
||||
msgid "See more"
|
||||
@ -2018,10 +2035,13 @@ msgid "Selected partial dependencies are as follows:"
|
||||
msgstr "Обрані часткові залежності такі:"
|
||||
|
||||
#: js/messages.php:447
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
"Note: a, b -> d,f implies values of columns a and b combined together can "
|
||||
"determine values of column d and column f."
|
||||
msgstr ""
|
||||
"Примітка:, b-> d, f має на увазі значення стовпців а і b, при об'єднані "
|
||||
"разом може визначити значення стовпця d та стовпця f."
|
||||
|
||||
#: js/messages.php:450
|
||||
msgid "No partial dependencies selected!"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
