Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
This commit is contained in:
Michal Čihař
commit
f0d3aaa5c0
@ -102,6 +102,8 @@ class PageSettings
|
||||
* @param FormDisplay &$form_display Form
|
||||
* @param ConfigFile &$cf Configuration file
|
||||
* @param Message|null &$error Error message
|
||||
* @param FormDisplay $form_display
|
||||
* @param ConfigFile $cf
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
@ -17,7 +17,6 @@ use PMA\libraries\Util;
|
||||
use PMA\Util as Util_lib;
|
||||
use SqlParser;
|
||||
use SqlParser\Statements\CreateStatement;
|
||||
use SqlParser\Utils\Table as SqlTable;
|
||||
use PMA\libraries\Table;
|
||||
use PMA\libraries\controllers\TableController;
|
||||
use PMA\libraries\URL;
|
||||
|
||||
@ -248,7 +248,7 @@ function PMA_getMemoryLimitForExport()
|
||||
* @param string $compression compression asked
|
||||
* @param string $filename_template the filename template
|
||||
*
|
||||
* @return array the filename template and mime type
|
||||
* @return string[] the filename template and mime type
|
||||
*/
|
||||
function PMA_getExportFilenameAndMimetype(
|
||||
$export_type, $remember_template, $export_plugin, $compression,
|
||||
@ -366,7 +366,7 @@ function PMA_openExportFile($filename, $quick_export)
|
||||
* @param string $dump_buffer the current dump buffer
|
||||
* @param string $save_filename the export filename
|
||||
*
|
||||
* @return object $message a message object (or empty string)
|
||||
* @return Message $message a message object (or empty string)
|
||||
*/
|
||||
function PMA_closeExportFile($file_handle, $dump_buffer, $save_filename)
|
||||
{
|
||||
@ -465,7 +465,7 @@ function PMA_saveObjectInBuffer($object_name, $append = false)
|
||||
* @param string $db the database name
|
||||
* @param string $table the table name
|
||||
*
|
||||
* @return array the generated HTML and back button
|
||||
* @return string[] the generated HTML and back button
|
||||
*/
|
||||
function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table)
|
||||
{
|
||||
@ -1021,7 +1021,7 @@ function PMA_unlockTables()
|
||||
/**
|
||||
* Returns all the metadata types that can be exported with a database or a table
|
||||
*
|
||||
* @return array metadata types.
|
||||
* @return string[] metadata types.
|
||||
*/
|
||||
function PMA_getMetadataTypesToExport()
|
||||
{
|
||||
|
||||
@ -75,7 +75,7 @@ class GISPoint extends GISGeometry
|
||||
* @param array $scale_data Array containing data related to scaling
|
||||
* @param resource $image Image object
|
||||
*
|
||||
* @return object the modified image object
|
||||
* @return resource the modified image object
|
||||
* @access public
|
||||
*/
|
||||
public function prepareRowAsPng(
|
||||
|
||||
14
po/ca.po
14
po/ca.po
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2016-12-13 10:41+0100\n"
|
||||
"PO-Revision-Date: 2016-11-18 10:31+0000\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Catalan <https://hosted.weblate.org/projects/phpmyadmin/"
|
||||
"master/ca/>\n"
|
||||
"PO-Revision-Date: 2016-12-13 11:53+0000\n"
|
||||
"Last-Translator: monicagrau <monicagrau@gmail.com>\n"
|
||||
"Language-Team: Catalan "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/ca/>\n"
|
||||
"Language: ca\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -8575,9 +8575,9 @@ msgid ""
|
||||
"to the PHP timeout limit. <i>(This might be a good way to import large "
|
||||
"files, however it can break transactions.)</i>"
|
||||
msgstr ""
|
||||
"Permet l'interrupció de l'importació en cas de que l'arxiu d'ordres detecti "
|
||||
"que s'acosta el limit del temps. <i>(Pot ser una bona solució per importar "
|
||||
"arxius grans, però pot trencar transaccions.)</i>"
|
||||
"Permet la interrupció de la importació en cas de que l'arxiu d'ordres "
|
||||
"detecti que s'acosta el limit del temps. <i>(Pot ser una bona solució per "
|
||||
"importar arxius grans, però pot trencar transaccions.)</i>"
|
||||
|
||||
#: libraries/display_import.lib.php:315
|
||||
msgid "Skip this number of queries (for SQL) starting from the first one:"
|
||||
|
||||
16
po/ia.po
16
po/ia.po
@ -8,7 +8,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2016-12-13 10:41+0100\n"
|
||||
"PO-Revision-Date: 2016-12-13 10:23+0000\n"
|
||||
"PO-Revision-Date: 2016-12-13 10:29+0000\n"
|
||||
"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
|
||||
"Language-Team: Interlingua "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/ia/>\n"
|
||||
@ -2623,23 +2623,23 @@ msgstr "Copia tabella con prefixo"
|
||||
|
||||
#: js/messages.php:732
|
||||
msgid "Extremely weak"
|
||||
msgstr ""
|
||||
msgstr "Extrememente debile"
|
||||
|
||||
#: js/messages.php:733
|
||||
msgid "Very weak"
|
||||
msgstr ""
|
||||
msgstr "Multe debile"
|
||||
|
||||
#: js/messages.php:734
|
||||
msgid "Weak"
|
||||
msgstr ""
|
||||
msgstr "Debile"
|
||||
|
||||
#: js/messages.php:735
|
||||
msgid "Good"
|
||||
msgstr ""
|
||||
msgstr "Bon"
|
||||
|
||||
#: js/messages.php:736
|
||||
msgid "Strong"
|
||||
msgstr ""
|
||||
msgstr "Forte"
|
||||
|
||||
#: js/messages.php:765
|
||||
msgctxt "Previous month"
|
||||
@ -8304,7 +8304,7 @@ msgstr "Contrasigno:"
|
||||
|
||||
#: libraries/display_change_password.lib.php:68
|
||||
msgid "Enter:"
|
||||
msgstr ""
|
||||
msgstr "Inserta:"
|
||||
|
||||
#: libraries/display_change_password.lib.php:75
|
||||
#: libraries/replication_gui.lib.php:865
|
||||
@ -10883,7 +10883,7 @@ msgstr ""
|
||||
#: libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php:52
|
||||
#, php-format
|
||||
msgid "Validation failed for the input string %s."
|
||||
msgstr ""
|
||||
msgstr "Validation falleva per le catena de ingresso %s."
|
||||
|
||||
#: libraries/plugins/transformations/abs/SQLTransformationsPlugin.php:29
|
||||
msgid "Formats text as SQL query with syntax highlighting."
|
||||
|
||||
40
po/it.po
40
po/it.po
@ -4,16 +4,16 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2016-12-13 10:41+0100\n"
|
||||
"PO-Revision-Date: 2016-11-10 10:06+0000\n"
|
||||
"PO-Revision-Date: 2016-12-13 14:14+0000\n"
|
||||
"Last-Translator: Stefano Martinelli <stefano.ste.martinelli@gmail.com>\n"
|
||||
"Language-Team: Italian <https://hosted.weblate.org/projects/phpmyadmin/"
|
||||
"master/it/>\n"
|
||||
"Language-Team: Italian "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/it/>\n"
|
||||
"Language: it\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 2.9\n"
|
||||
"X-Generator: Weblate 2.10-dev\n"
|
||||
|
||||
#: changelog.php:39 license.php:34
|
||||
#, php-format
|
||||
@ -2632,23 +2632,23 @@ msgstr "Copia tabella col prefisso"
|
||||
|
||||
#: js/messages.php:732
|
||||
msgid "Extremely weak"
|
||||
msgstr ""
|
||||
msgstr "Estremamente debole"
|
||||
|
||||
#: js/messages.php:733
|
||||
msgid "Very weak"
|
||||
msgstr ""
|
||||
msgstr "Molto debole"
|
||||
|
||||
#: js/messages.php:734
|
||||
msgid "Weak"
|
||||
msgstr ""
|
||||
msgstr "Debole"
|
||||
|
||||
#: js/messages.php:735
|
||||
msgid "Good"
|
||||
msgstr ""
|
||||
msgstr "Buona"
|
||||
|
||||
#: js/messages.php:736
|
||||
msgid "Strong"
|
||||
msgstr ""
|
||||
msgstr "Forte"
|
||||
|
||||
#: js/messages.php:765
|
||||
msgctxt "Previous month"
|
||||
@ -8314,7 +8314,7 @@ msgstr "Password:"
|
||||
|
||||
#: libraries/display_change_password.lib.php:68
|
||||
msgid "Enter:"
|
||||
msgstr ""
|
||||
msgstr "Inserisci:"
|
||||
|
||||
#: libraries/display_change_password.lib.php:75
|
||||
#: libraries/replication_gui.lib.php:865
|
||||
@ -14286,16 +14286,12 @@ msgstr ""
|
||||
"senza essere cifrati!"
|
||||
|
||||
#: setup/frames/index.inc.php:78
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "If your server is also configured to accept HTTPS requests follow [a@"
|
||||
#| "%s]this link[/a] to use a secure connection."
|
||||
msgid ""
|
||||
"If your server is also configured to accept HTTPS requests follow this link "
|
||||
"to use a secure connection."
|
||||
msgstr ""
|
||||
"Se il tuo server accetta anche richieste HTTPS, [a@%s]clicca qui[/a] per "
|
||||
"utilizzare la conessione sicura."
|
||||
"Se il tuo server accetta anche richieste HTTPS, segui questo link per "
|
||||
"utilizzare una connessione sicura."
|
||||
|
||||
#: setup/frames/index.inc.php:82
|
||||
msgid "Insecure connection"
|
||||
@ -15157,10 +15153,8 @@ msgstr ""
|
||||
"dominio. Vuoi importarla per la sessione corrente?"
|
||||
|
||||
#: templates/prefs_autoload.phtml:14
|
||||
#, fuzzy
|
||||
#| msgid "Delete tracking"
|
||||
msgid "Delete settings "
|
||||
msgstr "Cancella monitoraggio"
|
||||
msgstr "Cancella impostazioni "
|
||||
|
||||
#: templates/privileges/add_privileges_database.phtml:2
|
||||
msgid "Add privileges on the following database(s):"
|
||||
@ -15796,10 +15790,6 @@ msgid "Unexpected end of CASE expression"
|
||||
msgstr "Inattesa fine dell'espressione CASE"
|
||||
|
||||
#: vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php:227
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "A symbol name was expected! A reserved keyword can not be used as a field "
|
||||
#| "name without backquotes."
|
||||
msgid ""
|
||||
"A symbol name was expected! A reserved keyword can not be used as a column "
|
||||
"name without backquotes."
|
||||
@ -15925,10 +15915,8 @@ msgid "Unrecognized keyword."
|
||||
msgstr "Parola chiave non riconosciuta."
|
||||
|
||||
#: vendor/phpmyadmin/sql-parser/src/Statement.php:495
|
||||
#, fuzzy
|
||||
#| msgid "Unexpected beginning of statement."
|
||||
msgid "Unexpected ordering of clauses."
|
||||
msgstr "Inizio di statement inatteso."
|
||||
msgstr "Ordinamento di clausole inatteso."
|
||||
|
||||
#: vendor/phpmyadmin/sql-parser/src/Statements/CreateStatement.php:381
|
||||
msgid "The name of the entity was expected."
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
