diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | js/db_operations.js | 10 | ||||
-rw-r--r-- | main.php | 2 | ||||
-rw-r--r-- | po/af.po | 2 | ||||
-rw-r--r-- | po/ar.po | 2 | ||||
-rw-r--r-- | po/az.po | 2 | ||||
-rw-r--r-- | po/be.po | 2 | ||||
-rw-r--r-- | po/be@latin.po | 2 | ||||
-rw-r--r-- | po/bg.po | 2 | ||||
-rw-r--r-- | po/bn.po | 2 | ||||
-rw-r--r-- | po/br.po | 2 | ||||
-rw-r--r-- | po/bs.po | 2 | ||||
-rw-r--r-- | po/ca.po | 4 | ||||
-rw-r--r-- | po/ckb.po | 2 | ||||
-rw-r--r-- | po/cs.po | 4 | ||||
-rw-r--r-- | po/cy.po | 2 | ||||
-rw-r--r-- | po/da.po | 4 | ||||
-rw-r--r-- | po/de.po | 35 | ||||
-rw-r--r-- | po/el.po | 4 | ||||
-rw-r--r-- | po/en_GB.po | 4 | ||||
-rw-r--r-- | po/es.po | 4 | ||||
-rw-r--r-- | po/et.po | 4 | ||||
-rw-r--r-- | po/eu.po | 26 | ||||
-rw-r--r-- | po/fa.po | 2 | ||||
-rw-r--r-- | po/fi.po | 6 | ||||
-rw-r--r-- | po/fr.po | 4 | ||||
-rw-r--r-- | po/gl.po | 8 | ||||
-rw-r--r-- | po/he.po | 2 | ||||
-rw-r--r-- | po/hi.po | 2 | ||||
-rw-r--r-- | po/hr.po | 2 | ||||
-rw-r--r-- | po/hu.po | 2 | ||||
-rw-r--r-- | po/hy.po | 2 | ||||
-rw-r--r-- | po/id.po | 2 | ||||
-rw-r--r-- | po/it.po | 4 | ||||
-rw-r--r-- | po/ja.po | 4 | ||||
-rw-r--r-- | po/ka.po | 6 | ||||
-rw-r--r-- | po/kk.po | 2 | ||||
-rw-r--r-- | po/ko.po | 2 | ||||
-rw-r--r-- | po/lt.po | 2 | ||||
-rw-r--r-- | po/lv.po | 2 | ||||
-rw-r--r-- | po/mk.po | 2 | ||||
-rw-r--r-- | po/ml.po | 2 | ||||
-rw-r--r-- | po/mn.po | 2 | ||||
-rw-r--r-- | po/ms.po | 2 | ||||
-rw-r--r-- | po/nb.po | 6 | ||||
-rw-r--r-- | po/nl.po | 4 | ||||
-rw-r--r-- | po/pl.po | 4 | ||||
-rw-r--r-- | po/pt.po | 2 | ||||
-rw-r--r-- | po/pt_BR.po | 2 | ||||
-rw-r--r-- | po/ro.po | 17 | ||||
-rw-r--r-- | po/ru.po | 4 | ||||
-rw-r--r-- | po/si.po | 2 | ||||
-rw-r--r-- | po/sk.po | 2 | ||||
-rw-r--r-- | po/sl.po | 4 | ||||
-rw-r--r-- | po/sq.po | 2 | ||||
-rw-r--r-- | po/sr.po | 2 | ||||
-rw-r--r-- | po/sr@latin.po | 2 | ||||
-rw-r--r-- | po/sv.po | 28 | ||||
-rw-r--r-- | po/ta.po | 2 | ||||
-rw-r--r-- | po/te.po | 2 | ||||
-rw-r--r-- | po/th.po | 2 | ||||
-rw-r--r-- | po/tk.po | 2 | ||||
-rw-r--r-- | po/tr.po | 4 | ||||
-rw-r--r-- | po/tt.po | 2 | ||||
-rw-r--r-- | po/ug.po | 2 | ||||
-rw-r--r-- | po/uk.po | 2 | ||||
-rw-r--r-- | po/ur.po | 2 | ||||
-rw-r--r-- | po/uz.po | 8 | ||||
-rw-r--r-- | po/uz@latin.po | 8 | ||||
-rw-r--r-- | po/zh_CN.po | 4 | ||||
-rw-r--r-- | po/zh_TW.po | 4 | ||||
-rw-r--r-- | test/classes/PMA_Error_Handler_test.php | 233 | ||||
-rw-r--r-- | url.php | 1 |
73 files changed, 390 insertions, 159 deletions
@@ -45,6 +45,9 @@ VerboseMultiSubmit, ReplaceHelpImg + rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table 3.5.3.0 (not yet released) +- bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore +- bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done +- bug #3527531 [interface] GC-maxlifetime warning incorrectly displayed 3.5.2.0 (not yet released) - bug #3521416 [interface] JS error when editing index @@ -61,6 +64,8 @@ VerboseMultiSubmit, ReplaceHelpImg - bug #3534121 [config] duplicate line in config.sample.inc.php - bug #3534311 [interface] Grid editing incorrectly parses ENUM/SET values - bug #3510196 [core] More clever URL rewriting with ForceSSL +- bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore +- bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done 3.5.1.0 (2012-05-03) - bug #3510784 [edit] Limit clause ignored when sort order is remembered diff --git a/js/db_operations.js b/js/db_operations.js index 67ca7a9b44..301d6f8888 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -45,7 +45,7 @@ $(function() { button_options[PMA_messages['strNo']] = function() { $(this).dialog("close").remove(); } $form.PMA_confirm(question, $form.attr('action'), function(url) { - PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases']); + PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases'], false); $.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function(data) { if(data.success == true) { @@ -84,7 +84,7 @@ $(function() { $("#copy_db_form.ajax").live('submit', function(event) { event.preventDefault(); - var $msgbox = PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']); + PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase'], false); var $form = $(this); @@ -94,7 +94,7 @@ $(function() { // use messages that stay on screen $('div.success, div.error').fadeOut(); if(data.success == true) { - $('#floating_menubar').after(data.message); + PMA_ajaxShowMessage(data.message); if( $("#checkbox_switch").is(":checked")) { window.parent.db = data.newname; window.parent.refreshMain(); @@ -106,10 +106,8 @@ $(function() { window.parent.refreshNavigation(true); } } else { - $('#floating_menubar').after(data.error); + PMA_ajaxShowMessage(data.error, false); } - - PMA_ajaxRemoveMessage($msgbox); }) // end $.get }) // end copy database @@ -302,7 +302,7 @@ if (! @extension_loaded('mbstring')) { */ $gc_time = (int)@ini_get('session.gc_maxlifetime'); if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) { - trigger_error(__('Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'), E_USER_WARNING); + trigger_error(__('Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'), E_USER_WARNING); } /** @@ -9179,7 +9179,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9156,7 +9156,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9349,7 +9349,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9642,7 +9642,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" diff --git a/po/be@latin.po b/po/be@latin.po index 2cb70c63cc..50eac77883 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -9633,7 +9633,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -8895,7 +8895,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9375,7 +9375,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -8928,7 +8928,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9348,7 +9348,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9182,12 +9182,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "El paràmetre de PHP [a@http://php.net/manual/en/session.configuration." -"php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] és menor que la " +"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] és menor que la " "caducitat de galetes -cookies- configurat a phpMyAdmin, degut a aixó, la " "vostra conenexió caducarà abans del establert a phpMyAdmin." @@ -8617,7 +8617,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9128,12 +9128,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Vaše nastavení PHP ([a@http://php.net/manual/en/session.configuration." -"php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a]) je menší než " +"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a]) je menší než " "platnost cookies nastavená v phpMyAdminovi. Z tohoto důvodu bude vaše " "přilášení neplatné dříve, než je nastaveno v phpMyAdminovi." @@ -9256,7 +9256,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9178,12 +9178,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Din PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] er mindre end cooki " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] er mindre end cooki " "gyldighed konfigureret i phpMyAdmin; på grund af dette vil din login session " "udløbe tidligere end konfigureret i phpMyAdmin" @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-28 09:04+0200\n" -"PO-Revision-Date: 2012-06-24 16:15+0200\n" +"PO-Revision-Date: 2012-07-01 18:22+0200\n" "Last-Translator: J. M. <me@mynetx.net>\n" "Language-Team: none\n" "Language: de\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:577 server_privileges.php:1838 @@ -551,13 +551,13 @@ msgstr[0] "<b>Insgesamt</b> <i>%s</i> Treffer" msgstr[1] "<b>Insgesamt</b> <i>%s</i> Treffer" #: db_search.php:296 -#, fuzzy, php-format +#, php-format #| msgid "%1$s match inside table <i>%2$s</i>" #| msgid_plural "%1$s matches inside table <i>%2$s</i>" msgid "%1$s match in <strong>%2$s</strong>" msgid_plural "%1$s matches in <strong>%2$s</strong>" -msgstr[0] "%1$s Treffer in der Tabelle <i>%2$s</i>" -msgstr[1] "%1$s Treffer in der Tabelle <i>%2$s</i>" +msgstr[0] "%1$s Treffer in <strong>%2$s</strong>" +msgstr[1] "%1$s Treffer in <strong>%2$s</strong>" #: db_search.php:311 libraries/Menu.class.php:246 #: libraries/common.lib.php:3311 libraries/common.lib.php:3533 @@ -7382,7 +7382,7 @@ msgstr "Benutzung von Blowfish des mcrypt-Pakets fehlgeschlagen!" #: libraries/plugins/auth/AuthenticationCookie.class.php:81 msgid "Your session has expired. Please login again." -msgstr "" +msgstr "Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an." #: libraries/plugins/auth/AuthenticationCookie.class.php:170 msgid "Log in" @@ -8003,7 +8003,6 @@ msgstr "" "zu setzen." #: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the column data " #| "via standard input. Returns the standard output of the application. The " @@ -8030,15 +8029,15 @@ msgstr "" "NUR FÜR LINUX: Startet ein externes Programm und verwendet die Daten der " "Spalte für die Standardeingabe. Gibt die Standardausgabe der Anwendung " "zurück. Die Voreinstellung wurde für Tidy optimiert, um HTML code optisch zu " -"formatieren. Aus Sicherheitsgründen müssen Sie die Datei libraries/" -"transformations/text_plain__external.inc.php von Hand bearbeiten, um weitere " -"Programme verfügbar zu machen. Die erste Option ist die Nummer des dort " -"hinterlegten Programmes und die zweite Option legt die Parameter für das " -"externe Programm fest. Die dritte Option bestimmt, falls auf 1 gesetzt, dass " -"die Ausgabe mit htmlspecialchars() formatiert wird (Standard: 1). Die vierte " -"Option bestimmt, falls auf 1 gesetzt, ob ein NOWRAP-Parameter der " -"Tabellenzelle hinzugefügt wird, um einen automatischen Umbruch der " -"Standardausgabe zu verhindern (Standard: 1)." +"formatieren. Aus Sicherheitsgründen müssen Sie die Datei " +"libraries/plugins/transformations/Text_Plain_External.class.php von Hand " +"bearbeiten, um weitere Programme verfügbar zu machen. Die erste Option ist " +"die Nummer des dort hinterlegten Programmes und die zweite Option legt die " +"Parameter für das externe Programm fest. Die dritte Option bestimmt, falls " +"auf 1 gesetzt, dass die Ausgabe mit htmlspecialchars() formatiert wird " +"(Standard: 1). Die vierte Option bestimmt, falls auf 1 gesetzt, ob ein " +"NOWRAP-Parameter der Tabellenzelle hinzugefügt wird, um einen automatischen " +"Umbruch der Standardausgabe zu verhindern (Standard: 1)." #: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31 msgid "" @@ -9294,12 +9293,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Ihre PHP Einstellung [a@http://php.net/manual/en/session.configuration." -"php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] ist niedriger als " +"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] ist niedriger als " "die in phpMyAdmin konfigurierte Cookiegültigkeit, deshalb wird Ihre " "Anmeldung eher ablaufen als in phpMyAdmin konfiguriert." @@ -9279,12 +9279,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Η παράμετρος PHP [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] είναι μικρότερη από την " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] είναι μικρότερη από την " "ρυθμισμένη εγκυρότητα cookie στο phpMyAdmin. Εξαιτίας αυτού, η σύνδεσή σας " "θα λήξει νωρίτερα από ό,τι ρυθμίστηκε στο phpMyAdmin." diff --git a/po/en_GB.po b/po/en_GB.po index 934b54ab1c..5ae95f597b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -9150,12 +9150,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." @@ -9323,12 +9323,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "El parámetro [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] es menor que la validez " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] es menor que la validez " "de la cookie configurada en phpMyAdmin. Por ello, la sesión expirará antes " "de lo configurado en phpMyAdmin." @@ -9137,12 +9137,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Sinu PHP parameeter [a@http://php.net/manual/en/session.configuration." -"php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] on väiksem, kui " +"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] on väiksem, kui " "phpMyAdminis seadistatud küpsise kehtivus. Seetõttu sinu sisselogimine aegub " "varem, kui phpMyAdminis seadistatud." @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-28 09:04+0200\n" -"PO-Revision-Date: 2012-05-02 12:41+0200\n" -"Last-Translator: Marc Delisle <marc@infomarc.info>\n" +"PO-Revision-Date: 2012-07-01 18:47+0200\n" +"Last-Translator: aitzol berasategi <aitzol76@gmail.com>\n" "Language-Team: basque <eu@li.org>\n" "Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 0.10\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:577 server_privileges.php:1838 @@ -29,15 +29,14 @@ msgid "Page number:" msgstr "Orri zenbakia:" #: browse_foreigners.php:94 -#, fuzzy msgid "" "The target browser window could not be updated. Maybe you have closed the " "parent window, or your browser's security settings are configured to block " "cross-window updates." msgstr "" -"The target browser window could not be updated. Maybe you have closed the " -"parent window, or your browser's security settings are configured to block " -"cross-window updates." +"Helburuko lehioa ezin da eguneratu. Baliteke jatorrizko leihoa itxita " +"edukitzea edo zure nabigatzailearen segurtasun ezarpenak zeharkako lehioen " +"eguneratzea blokeatzeko konfiguraturik egotea." #: browse_foreigners.php:168 libraries/Menu.class.php:259 #: libraries/Menu.class.php:353 libraries/common.lib.php:3309 @@ -82,9 +81,8 @@ msgstr "Joan" #: browse_foreigners.php:186 browse_foreigners.php:190 #: libraries/Index.class.php:461 tbl_tracking.php:365 -#, fuzzy msgid "Keyname" -msgstr "Giltzaren izena" +msgstr "Giltza-izena" #: browse_foreigners.php:187 browse_foreigners.php:189 #: server_collations.php:39 server_collations.php:51 server_engines.php:42 @@ -103,8 +101,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" -"%s fitxategia ez dago eskuragarri sisteman, joan www.phpmyadmin.net " -"informazio gehiagorako" +"%s fitxategia ez dago eskuragarri sisteman, informazio gehiagorako ikusi " +"www.phpmyadmin.net" #: db_create.php:74 #, php-format @@ -288,10 +286,10 @@ msgid "Database %1$s has been renamed to %2$s" msgstr "%s datu-basea %s-(e)ra berrizendatua izan da" #: db_operations.php:330 -#, fuzzy, php-format +#, php-format #| msgid "Database %s has been copied to %s" msgid "Database %1$s has been copied to %2$s" -msgstr "%s datu-basea hona kopiatua izan da: %s." +msgstr "%1$s datu-basea %2$s(e)ra kopiatua izan da." #: db_operations.php:461 msgid "Rename database to" @@ -9307,7 +9305,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9158,7 +9158,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9245,12 +9245,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "PHP-parametri [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] on matalampi kuin " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] on matalampi kuin " "phpMyAdminissa määritetty evästekelpoisuus. Siksi kirjautumisesi erääntyy " "nopeammin kuin phpMyAdminissa on määritetty." @@ -9266,7 +9266,7 @@ msgid "" "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" "PHP-parametri [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] on matalampi kuin " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] on matalampi kuin " "phpMyAdminissa määritetty evästekelpoisuus. Siksi kirjautumisesi erääntyy " "nopeammin kuin phpMyAdminissa on määritetty." @@ -9258,12 +9258,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "La valeur du paramètre PHP [a@http://php.net/manual/fr/session.configuration." -"php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] est plus petite " +"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] est plus petite " "que la durée du cookie configurée dans phpMyAdmin; donc, votre session de " "travail expirera plus tôt." @@ -9107,12 +9107,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "O parámetro PHP [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] é menor do que a validez " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] é menor do que a validez " "das cookies que se configurou en phpMyAdmin; por causa disto, o rexistro " "caducará antes do que está configurado en phpMyAdmin." @@ -9120,7 +9120,7 @@ msgstr "" #, fuzzy #| msgid "" #| "r PHP parameter [a@http://php.net/manual/en/session.configuration.#ini." -#| "session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that kie " +#| "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower that kie " #| "validity configured in phpMyAdmin, because of this, your login l expire " #| "sooner than configured in phpMyAdmin." msgid "" @@ -9128,7 +9128,7 @@ msgid "" "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" "O parámetro PHP [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] é menor do que a validez " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] é menor do que a validez " "das cookies que se configurou en phpMyAdmin; por causa disto, o rexistro " "caducará antes do que está configurado en phpMyAdmin." @@ -9241,7 +9241,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9194,7 +9194,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9614,7 +9614,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9272,7 +9272,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -8611,7 +8611,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -8959,7 +8959,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9260,12 +9260,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Il tuo parametero PHP [a@http://php.net/manual/en/session.configuration." -"php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] é inferiore alla " +"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] é inferiore alla " "validitá del cookie configurata in phpMyAdmin, per questo motivo, i dati di " "login scadranno prima di come configurato in phpMyAdmin." @@ -9120,12 +9120,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "お使いの PHP のパラメータ [a@http://php.net/manual/ja/session.configuration." -"php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] が、phpMyAdmin に" +"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] が、phpMyAdmin に" "設定されているクッキーの有効期間より短くなっています。このため、phpMyAdmin に" "設定されているよりも早くログインの期限が切れます。" @@ -9552,7 +9552,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9561,7 +9561,7 @@ msgstr "" #, fuzzy #| msgid "" #| "r PHP parameter [a@http://php.net/manual/en/session.configuration.#ini." -#| "session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that kie " +#| "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower that kie " #| "validity configured in phpMyAdmin, because of this, your login l expire " #| "sooner than configured in phpMyAdmin." msgid "" @@ -9569,7 +9569,7 @@ msgid "" "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." @@ -8643,7 +8643,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9034,7 +9034,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9167,7 +9167,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9394,7 +9394,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9460,7 +9460,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -8624,7 +8624,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9456,7 +9456,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9224,7 +9224,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9441,12 +9441,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Ditt PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] er lavere enn cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] er lavere enn cookie " "gyldighet konfigurert i phpMyAdmin, på grunn av dette så vil din innlogging " "utløpe raskere enn konfigurert i phpMyAdmin." @@ -9462,7 +9462,7 @@ msgid "" "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" "Ditt PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] er lavere enn cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] er lavere enn cookie " "gyldighet konfigurert i phpMyAdmin, på grunn av dette så vil din innlogging " "utløpe raskere enn konfigurert i phpMyAdmin." @@ -9235,12 +9235,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "De PHP-parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is korter dan de " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is korter dan de " "ingestelde cookiegeldigheid in phpMyAdmin. Hierdoor verloopt uw sessie " "eerder dan in phpMyAdmin is ingesteld." @@ -9235,12 +9235,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Parametr PHP [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] ma mniejszą wartość niż " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] ma mniejszą wartość niż " "czas przechowywania ciasteczka skonfigurowany w phpMyAdmin. Z tego powodu " "sesja wygaśnie wcześniej niż jest to skonfigurowane w phpMyAdmin." @@ -9170,7 +9170,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index e95a27dce1..8acd246369 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -9254,7 +9254,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-28 09:04+0200\n" -"PO-Revision-Date: 2012-05-17 15:15+0200\n" -"Last-Translator: Michal Čihař <michal@cihar.com>\n" +"PO-Revision-Date: 2012-06-30 17:07+0200\n" +"Last-Translator: Alex Marin <alex.ukf@gmail.com>\n" "Language-Team: romanian <ro@li.org>\n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);;\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:577 server_privileges.php:1838 @@ -9637,7 +9637,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -11218,15 +11218,15 @@ msgstr "" #: server_status.php:1362 msgid "The total number of data reads." -msgstr "" +msgstr "Numărul total de citiri de date." #: server_status.php:1363 msgid "The total number of data writes." -msgstr "" +msgstr "Numărul total de scrieri de date." #: server_status.php:1364 msgid "The amount of data written so far, in bytes." -msgstr "" +msgstr "Cantitatea totală de date scrisă până acum, în bytes." #: server_status.php:1365 msgid "The number of pages that have been written for doublewrite operations." @@ -11734,10 +11734,9 @@ msgid "Log statistics" msgstr "Statisticile rîndului" #: server_status.php:1749 -#, fuzzy #| msgid "Select Tables" msgid "Selected time range:" -msgstr "Selectează tabele" +msgstr "Perioada selectată:" #: server_status.php:1754 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" @@ -9249,12 +9249,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Ваш PHP параметр [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] меньше, чем длительность " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] меньше, чем длительность " "cookie определенная в phpMyAdmin, по этой причине, данные входа истекут " "быстрее установленных." @@ -8912,7 +8912,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9197,7 +9197,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9189,12 +9189,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Vaš parameter PHP[a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] je nižji od veljavnosti " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] je nižji od veljavnosti " "piškotkov, določene v phpMyAdminu. Zaradi tega se bo vaša prijava iztekla " "prej, kot je določeno v phpMyAdminu." @@ -9380,7 +9380,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9559,7 +9559,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" diff --git a/po/sr@latin.po b/po/sr@latin.po index fb4f7b3b85..2fb70f4309 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -9550,7 +9550,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-28 09:04+0200\n" -"PO-Revision-Date: 2012-06-26 19:16+0200\n" +"PO-Revision-Date: 2012-07-01 18:04+0200\n" "Last-Translator: ProUser <stefan@inkopsforum.se>\n" "Language-Team: swedish <sv@li.org>\n" "Language: sv\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:577 server_privileges.php:1838 @@ -7895,7 +7895,6 @@ msgstr "" "tomma strängen." #: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the column data " #| "via standard input. Returns the standard output of the application. The " @@ -7919,16 +7918,15 @@ msgid "" "option, if set to 1, will prevent wrapping and ensure that the output " "appears all on one line (Default 1)." msgstr "" -"ENDAST LINUX: Startar en extern applikation och skickar fältdata till den " -"via standard-indata. Returnerar applikationens standard-utdata. Standard är " -"Tidy, för att snygga till HTML-kod. Av säkerhetsskäl måste du manuellt " -"redigera filen libraries/transformations/text_plain__external.inc.php lista " -"de verktyg du vill göra tillgängliga. Det första alternativet är då numret " -"för det program du vill använda och det andra alternativet är parametrarna " -"för programmet.. Den tredje parametern, om angivet till 1, kommer att " -"konvertera utgång med htmlspecialchars () (standard 1). Den fjärde " -"parametern, om angivet till 1, kommer att förhindra inslagning och se till " -"att utskriften kommer på en enda rad (standard 1)." +"ENDAST LINUX: Startar en extern applikation och sänder kolumndata via " +"standard in. Returnerar standard ut från applikationen. Standard är Tidy, " +"för att pretty-print HTML-kod. Av säkerhetsskäl måste du manuellt redigera " +"filen libraries/plugins/transformationer/Text_Plain_External.class.php och " +"lista de verktyg du vill göra tillgängliga. Den första optionen är antalet " +"program du vill använda och den andra optionen är parametrarna för " +"programmet. Den tredje optionen, om den är 1, kommer omvandla utdata via " +"htmlspecialchars() (Default 1). Den fjärde optionen, om 1, kommer förhindra " +"radbrytning och se till att utskriften sker på en rad (Default 1)." #: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31 msgid "" @@ -9162,12 +9160,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Din PHP-parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] är lägre än cookie-" +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] är lägre än cookie-" "giltighet konfigurerad i phpMyAdmin. På grund av detta kommer din inloggning " "upphöra att gälla tidigare än konfigurerat i phpMyAdmin." @@ -8793,7 +8793,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9008,7 +9008,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9089,7 +9089,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -8620,7 +8620,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9215,13 +9215,13 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "phpMyAdmin içinde yapılandırılmış tanımlama bilgisi geçerliliği PHP " "parametreleriniz [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] düşük, bundan dolayı " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] düşük, bundan dolayı " "oturum açmanızın süresi phpMyAdmin içinde yapılandırılmadıkça dolacaktır." #: main.php:309 @@ -9457,7 +9457,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9110,7 +9110,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9090,7 +9090,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9174,7 +9174,7 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" @@ -9938,12 +9938,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Сервердаги PHP конфигурациясида \"[a@http://php.net/manual/en/session." -"configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a]\" " +"configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a]\" " "параметрининг қиймати phpMyAdmin дастурининг \"cookie\" ҳақиқийлиги " "давомийлигидан кичикроқ, шунинг учун логин сессиянгиз phpMyAdmin дастурида " "конфигурация қилганингиздан тезроқ тугайди." @@ -9952,7 +9952,7 @@ msgstr "" #, fuzzy #| msgid "" #| "r PHP parameter [a@http://php.net/manual/en/session.configuration.#ini." -#| "session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that kie " +#| "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower that kie " #| "validity configured in phpMyAdmin, because of this, your login l expire " #| "sooner than configured in phpMyAdmin." msgid "" @@ -9960,7 +9960,7 @@ msgid "" "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" "Сервердаги PHP конфигурациясида \"[a@http://php.net/manual/en/session." -"configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a]\" " +"configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a]\" " "параметрининг қиймати phpMyAdmin дастурининг \"cookie\" ҳақиқийлиги " "давомийлигидан кичикроқ, шунинг учун логин сессиянгиз phpMyAdmin дастурида " "конфигурация қилганингиздан тезроқ тугайди." diff --git a/po/uz@latin.po b/po/uz@latin.po index da5c10b7e5..241ae860c2 100644 --- a/po/uz@latin.po +++ b/po/uz@latin.po @@ -9975,12 +9975,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "Serverdagi PHP konfiguratsiyasida \"[a@http://php.net/manual/en/session." -"configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a]\" " +"configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a]\" " "parametrining qiymati phpMyAdmin dasturining \"cookie\" haqiqiyligi " "davomiyligidan kichikroq, shuning uchun login sessiyangiz phpMyAdmin " "dasturida konfiguratsiya qilganingizdan tezroq tugaydi." @@ -9989,7 +9989,7 @@ msgstr "" #, fuzzy #| msgid "" #| "r PHP parameter [a@http://php.net/manual/en/session.configuration.#ini." -#| "session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that kie " +#| "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower that kie " #| "validity configured in phpMyAdmin, because of this, your login l expire " #| "sooner than configured in phpMyAdmin." msgid "" @@ -9997,7 +9997,7 @@ msgid "" "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" "Serverdagi PHP konfiguratsiyasida \"[a@http://php.net/manual/en/session." -"configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a]\" " +"configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a]\" " "parametrining qiymati phpMyAdmin dasturining \"cookie\" haqiqiyligi " "davomiyligidan kichikroq, shuning uchun login sessiyangiz phpMyAdmin " "dasturida konfiguratsiya qilganingizdan tezroq tugaydi." diff --git a/po/zh_CN.po b/po/zh_CN.po index 473109ce45..6da53d8670 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8899,12 +8899,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "您的 PHP 配置参数 [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime (外链,英文)[/a] 短于您在 " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime (外链,英文)[/a] 短于您在 " "phpMyAdmin 中设置的 Cookies 有效期,因此您的登录会话有效期将会比您在 " "phpMyAdmin 中设置的时间要更短。" diff --git a/po/zh_TW.po b/po/zh_TW.po index d98559c16e..8e9b1a05ea 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9175,12 +9175,12 @@ msgstr "" #: main.php:302 msgid "" "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie " +"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie " "validity configured in phpMyAdmin, because of this, your login will expire " "sooner than configured in phpMyAdmin." msgstr "" "您的 PHP 設定參數 [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@]session.gc_maxlifetime [/a] 短於您在 phpMyAdmin 中設" +"session.gc-maxlifetime@_blank]session.gc_maxlifetime [/a] 短於您在 phpMyAdmin 中設" "定的 Cookies 有效期,因此您的登錄連線有效期將會比您在 phpMyAdmin 中設定的時間" "要更短" diff --git a/test/classes/PMA_Error_Handler_test.php b/test/classes/PMA_Error_Handler_test.php new file mode 100644 index 0000000000..ebceb55e14 --- /dev/null +++ b/test/classes/PMA_Error_Handler_test.php @@ -0,0 +1,233 @@ +<?php +/** + * Tests for displaing results + * + * @package PhpMyAdmin-test + */ + +/* + * Include to test. + */ + +require_once 'libraries/Error_Handler.class.php'; +require_once 'libraries/sanitizing.lib.php'; + +class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase +{ + /** + * @access protected + */ + protected $object; + + /** + * Sets up the fixture, for example, opens a network connection. + * This method is called before a test is executed. + * + * @access protected + * @return void + */ + protected function setUp() + { + $this->object = $this->getMockForAbstractClass('PMA_Error_Handler'); + + } + + /** + * Tears down the fixture, for example, closes a network connection. + * This method is called after a test is executed. + * + * @access protected + * @return void + */ + protected function tearDown() + { + unset($this->object); + } + + /** + * Call protected functions by making the visibitlity to public. + * + * @param string $name method name + * @param array $params parameters for the invocation + * + * @return the output from the protected method. + */ + private function _callProtectedFunction($name, $params) + { + $class = new ReflectionClass('PMA_Error_Handler'); + $method = $class->getMethod($name); + $method->setAccessible(true); + return $method->invokeArgs($this->object, $params); + } + + /** + * @param integer $errno error number + * @param string $errstr error string + * @param string $errfile error file + * @param integer $errline error line + * @param $output output from the handleError method + * + * @dataProvider providerForTestHandleError + */ + public function testHandleError($errno, $errstr, $errfile, $errline, $output){ + + $GLOBALS['cfg']['Error_Handler']['gather'] = true; + + $this->assertEquals($this->object->handleError($errno, $errstr, $errfile, $errline),$output); + } + + /** + * @return array data for testHandleError + */ + public function providerForTestHandleError() + { + return array( + array( + '1024', + 'Compile Error', + 'error.txt', + 12, + '' + ) + ); + } + + /** + * Test for logError + */ + public function testLogError(){ + + $error = new PMA_Error('2', 'Compile Error', 'error.txt', 15); + + $this->assertTrue( + $this->_callProtectedFunction( + 'logError', + array($error) + ) + ); + } + + /** + * Test for getDispUserErrors + */ + public function testGetDispUserErrors(){ + + $this->assertEquals($this->object->getDispUserErrors(), + '<div class="notice">Compile Error</div>' + ); + } + + /** + * Test for getDispErrors + */ + public function testGetDispErrorsForDisplayFalse(){ + + $GLOBALS['cfg']['Error_Handler']['display'] = false; + $this->assertEquals($this->object->getDispUserErrors(), + '' + ); + } + + /** + * Test for getDispErrors + */ + public function testGetDispErrorsForDisplayTrue(){ + + $GLOBALS['cfg']['Error_Handler']['display'] = true; + + $this->assertEquals($this->object->getDispErrors(), + '' + ); + + } + + /** + * Test for checkSavedErrors + */ + public function testCheckSavedErrors(){ + + $_SESSION['errors'] = true; + + $this->_callProtectedFunction( + 'checkSavedErrors', + array() + ); + $this->assertTrue(!isset($_SESSION['errors'])); + } + + /** + * Test for countErrors + */ + public function testCountErrors(){ + + $err = array(); + $err[] = new PMA_Error('256', 'Compile Error', 'error.txt', 15); + $errHandler = $this->getMock('PMA_Error_Handler'); + $errHandler->expects($this->any()) + ->method('getErrors') + ->will($this->returnValue($err)); + + $this->assertEquals($this->object->countErrors(), + 0 + ); + } + + /** + * Test for countUserErrors + */ + public function testCountUserErrors(){ + + $err = array(); + $err[] = new PMA_Error('256', 'Compile Error', 'error.txt', 15); + $errHandler = $this->getMock('PMA_Error_Handler'); + $errHandler->expects($this->any()) + ->method('countErrors','getErrors') + ->will($this->returnValue(1,$err)); + + $this->assertEquals($this->object->countUserErrors(), + 0 + ); + } + + /** + * Test for hasUserErrors + */ + public function testHasUserErrors(){ + $this->assertFalse($this->object->hasUserErrors()); + } + + /** + * Test for hasErrors + */ + public function testHasErrors(){ + $this->assertFalse($this->object->hasErrors()); + } + + /** + * Test for countDisplayErrors + */ + public function testCountDisplayErrorsForDisplayTrue(){ + $GLOBALS['cfg']['Error_Handler']['display'] = true; + $this->assertEquals($this->object->countDisplayErrors(), + 0 + ); + } + + /** + * Test for countDisplayErrors + */ + public function testCountDisplayErrorsForDisplayFalse(){ + $GLOBALS['cfg']['Error_Handler']['display'] = false; + $this->assertEquals($this->object->countDisplayErrors(), + 0 + ); + } + + /** + * Test for hasDisplayErrors + */ + public function testHasDisplayErrors(){ + $this->assertFalse($this->object->hasDisplayErrors()); + } + +} @@ -18,4 +18,5 @@ if (! PMA_isValid($_GET['url']) } else { header('Location: ' . $_GET['url']); } +die(); ?> |