From 3905d1eb5272bbdfdcb712ec8ac002bd2e33c209 Mon Sep 17 00:00:00 2001 From: josep constanti Date: Mon, 20 Jul 2015 08:07:40 +0200 Subject: Translated using Weblate (Catalan) Currently translated at 100.0% (3038 of 3038 strings) [CI skip] --- po/ca.po | 56 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/po/ca.po b/po/ca.po index 808f7e5686..5c9620d4da 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-08 15:27+0200\n" -"PO-Revision-Date: 2015-05-30 17:56+0200\n" +"PO-Revision-Date: 2015-07-20 08:07+0200\n" "Last-Translator: josep constanti \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan " +"\n" "Language: ca\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.3-dev\n" +"X-Generator: Weblate 2.4-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -702,7 +702,7 @@ msgstr "" #: import_status.php:103 msgid "Could not load the progress of the import." -msgstr "" +msgstr "No es pot carregar la progressió en la importació." #: import_status.php:112 js/messages.php:340 libraries/Util.class.php:735 #: libraries/export.lib.php:464 @@ -6174,11 +6174,13 @@ msgstr "No avortar en cas d'error d' INSERT" #: libraries/config/messages.inc.php:337 libraries/config/messages.inc.php:349 msgid "Add ON DUPLICATE KEY UPDATE" -msgstr "" +msgstr "Afegeix ON DUPLICATE KEY UPDATE" #: libraries/config/messages.inc.php:338 libraries/config/messages.inc.php:350 msgid "Update data when duplicate keys found on import" msgstr "" +"Actualitza amb les dades noves quan es trobin claus duplicades en la " +"importació" #: libraries/config/messages.inc.php:341 msgid "" @@ -6463,7 +6465,6 @@ msgid "Minimum number of databases to display the database filter box" msgstr "Mínim nombre de bases de dades a mostrar a la caixa de filtre" #: libraries/config/messages.inc.php:458 -#, fuzzy #| msgid "" #| "Group items in the navigation tree (determined by the separator defined " #| "below)." @@ -6471,8 +6472,8 @@ msgid "" "Group items in the navigation tree (determined by the separator defined in " "the Databases and Tables tabs above)." msgstr "" -"Agrupar ítems a l'arbre de navegació (determinat pel separador definit tot " -"seguit)." +"Agrupar ítems a l'arbre de navegació (determinat pel separador definit a les " +"pestanyes de Bases de dades i de Taules de dalt)." #: libraries/config/messages.inc.php:460 msgid "Group items in the tree" @@ -10240,6 +10241,8 @@ msgstr "Taula:" msgid "" "Update data when duplicate keys found on import (add ON DUPLICATE KEY UPDATE)" msgstr "" +"Actualitza amb les dades noves quan es trobin claus duplicades en la " +"importació (afegeix ON DUPLICATE KEY UPDATE)" #: libraries/plugins/import/ImportCsv.class.php:63 #: libraries/plugins/import/ImportOds.class.php:75 @@ -14929,12 +14932,12 @@ msgid "The MySQL manual only is accurate for official MySQL binaries." msgstr "El manual de MySQL només és exacte per als binaris oficials de MySQL." #: libraries/advisory_rules.txt:132 -#, fuzzy #| msgid "Percona documentation is at http://www.percona.com/docs/wiki/" msgid "" "Percona documentation is at http://www.percona.com/software/documentation/" msgstr "" -"La documentació de Percona es troba a http://www.percona.com/docs/wiki/" +"La documentació de Percona es troba a " +"http://www.percona.com/software/documentation/" #: libraries/advisory_rules.txt:133 msgid "'percona' found in version_comment" @@ -14942,11 +14945,12 @@ msgstr "" "S'ha trobat 'percona' als comentaris de la versió (\"version_comment\")" #: libraries/advisory_rules.txt:139 -#, fuzzy #| msgid "Drizzle documentation is at http://docs.drizzle.org/" msgid "" "Drizzle documentation is at http://www.drizzle.org/content/documentation/" -msgstr "La documentació de Drizzle es troba a http://docs.drizzle.org/" +msgstr "" +"La documentació de Drizzle es troba a " +"http://docs.drizzle.org/content/documentation/" #: libraries/advisory_rules.txt:140 #, php-format @@ -15780,7 +15784,6 @@ msgid "Too many connections are aborted." msgstr "Massa connexions avortades." #: libraries/advisory_rules.txt:403 libraries/advisory_rules.txt:410 -#, fuzzy #| msgid "" #| "Connections are usually aborted when they cannot be authorized. This article might help you track down the source." msgstr "" "Les connexions s'avorten generalment quan no poden ser autoritzades. Aquest article pot ajudar a rastrejar el " -"motiu." +"\"http://www.percona.com/blog.com/2008/08/23/how-to-track-down-the-source-of-" +"aborted_connects/\">Aquest article pot ajudar a rastrejar el motiu." #: libraries/advisory_rules.txt:404 #, php-format @@ -15921,7 +15923,7 @@ msgid "The InnoDB log file size is inadequately large." msgstr "La mida de l'arxiu de registre InnoDB és inadequadament gran." #: libraries/advisory_rules.txt:447 -#, fuzzy, php-format +#, php-format #| msgid "" #| "It is usually sufficient to set {innodb_log_file_size} to 25%% of the " #| "size of {innodb_buffer_pool_size}. A very big {innodb_log_file_size} " @@ -15946,14 +15948,14 @@ msgstr "" "Normalment és suficient establir {innodb_log_file_size} al 25%% de la mida " "de {innodb_buffer_pool_size}. Un valor de {innodb_log_file_size} molt gran " "alenteix el temps de recuperació després d'una caiguda de la base de dades " -"de manera considerable. Consulta també el present article. Cal apagar el servidor, eliminar els arxius de " "registre d'InnoDB, definir el nou valor a l'arxiu my.cnf, iniciar el " "servidor, i comprovar immediatament els registres d'error per veure si tot " -"ha anat bé. Consulta també aquest " -"article" +"ha anat bé. Consulta també aquest article" #: libraries/advisory_rules.txt:448 #, php-format @@ -15969,7 +15971,7 @@ msgid "Your InnoDB buffer pool is fairly small." msgstr "La memòria intermèdia d'InnoDB és relativament petita." #: libraries/advisory_rules.txt:454 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The InnoDB buffer pool has a profound impact on performance for InnoDB " #| "tables. Assign all your remaining memory to this buffer. For database " @@ -16002,9 +16004,9 @@ msgstr "" "cal avaluar acuradament el consum de memòria dels altres serveis i taules " "amb altres motors i definir aquesta variable en conseqüència. Si és massa " "alt, el sistema començarà a utilitzar l'àrea d'intercanvi a disc, el que " -"disminueix significativament el rendiment. Consulta també aquest article" +"disminueix significativament el rendiment. Consulta també " +"aquest article" #: libraries/advisory_rules.txt:455 #, php-format -- cgit v1.2.3 From 3ff847eb1452175fe667eb5583049e8a051c8cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= Date: Mon, 20 Jul 2015 09:30:35 +0200 Subject: Translated using Weblate (Hungarian) Currently translated at 100.0% (3038 of 3038 strings) [CI skip] --- po/hu.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/hu.po b/po/hu.po index 898d62a291..d2d980f2ef 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-08 15:27+0200\n" -"PO-Revision-Date: 2015-07-08 22:14+0200\n" +"PO-Revision-Date: 2015-07-20 09:30+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian " "\n" @@ -13924,7 +13924,7 @@ msgid "" "'\\\\xyz' or 'a\\'b')." msgstr "" "Írja be az átalakítási beállítások értékeit a következő formátumban: 'a', " -"100, b,'c'…
Ha fordított perjelet (\"\\\") vagy idézőjelet (\"'\") akar " +"100, b,'c'…
Ha fordított perjelet („\\”) vagy aposztrófot („'”) akar " "beszúrni az értékekbe, akkor kezdje fordított perjellel (például: '\\\\xyz' " "vagy 'a\\'b')." -- cgit v1.2.3 From 14c97bc16e8a3a22ec2e8c6ebf1dbc2ddf8f0958 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Sun, 19 Jul 2015 22:28:46 +0200 Subject: Translated using Weblate (Interlingua) Currently translated at 69.5% (2114 of 3038 strings) [CI skip] --- po/ia.po | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/po/ia.po b/po/ia.po index 2c3e89f7e8..1c6e34f4f2 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-08 15:27+0200\n" -"PO-Revision-Date: 2015-07-08 22:54+0200\n" +"PO-Revision-Date: 2015-07-19 22:28+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -6220,11 +6220,11 @@ msgstr "Non aborta quando on ha un error de INSERT" #: libraries/config/messages.inc.php:337 libraries/config/messages.inc.php:349 msgid "Add ON DUPLICATE KEY UPDATE" -msgstr "" +msgstr "Adde ON DUPLICATE KEY UPDATE" #: libraries/config/messages.inc.php:338 libraries/config/messages.inc.php:350 msgid "Update data when duplicate keys found on import" -msgstr "" +msgstr "Actualisa datos quando on trova claves duplicate durante le importation" #: libraries/config/messages.inc.php:341 msgid "" @@ -13633,7 +13633,7 @@ msgstr "Move columna" #: libraries/tbl_columns_definition_form.lib.php:363 msgid "List of available transformations and their options" -msgstr "" +msgstr "Lista de transformationes disponibile e lor operationes" #: libraries/tbl_columns_definition_form.lib.php:368 msgid "" @@ -13713,15 +13713,15 @@ msgstr "" #: libraries/tbl_indexes.lib.php:116 msgid "The name of the primary key must be \"PRIMARY\"!" -msgstr "" +msgstr "Le nomine del clave primari debe esser \"PRIMARY\"!" #: libraries/tbl_indexes.lib.php:126 msgid "Can't rename index to PRIMARY!" -msgstr "" +msgstr "Non pote renominar indice a PRIMARY!" #: libraries/tbl_indexes.lib.php:142 msgid "No index parts defined!" -msgstr "" +msgstr "Nulle partes de indice definite!" #: libraries/tbl_indexes.lib.php:283 msgid "Index name:" @@ -13836,6 +13836,7 @@ msgstr "Relationes interne ha essite actualisate on successo." #, php-format msgid "Error creating foreign key on %1$s (check data types)" msgstr "" +"Error quando on creava clave extranee sur %1$s (verifica typos de datos)" #: libraries/tracking.lib.php:69 #, php-format @@ -14277,7 +14278,7 @@ msgstr "" #: tbl_chart.php:37 msgid "No data to display" -msgstr "" +msgstr "Necun dato de monstrar" #: tbl_chart.php:61 tbl_gis_visualization.php:24 msgid "No SQL query was set to fetch data." @@ -15423,11 +15424,11 @@ msgstr "" #: libraries/advisory_rules.txt:459 msgid "MyISAM concurrent inserts" -msgstr "" +msgstr "Insertiones concurrente de MyISAM" #: libraries/advisory_rules.txt:462 msgid "Enable {concurrent_insert} by setting it to 1" -msgstr "" +msgstr "Habilita (insertion concurrente) per poner lo a 1" #: libraries/advisory_rules.txt:463 msgid "" @@ -15438,7 +15439,7 @@ msgstr "" #: libraries/advisory_rules.txt:464 msgid "concurrent_insert is set to 0" -msgstr "" +msgstr "concurrent_insert - insertion concurrente- es ponite a 0" #~ msgid "Replace table data with file" #~ msgstr "Reimplacia tabella de datos con file" -- cgit v1.2.3 From d000ef70d755843718a2161b021c503e023609f3 Mon Sep 17 00:00:00 2001 From: Nabin Ghimire Date: Sun, 19 Jul 2015 05:08:01 +0200 Subject: Translated using Weblate (Nepali) Currently translated at 1.9% (58 of 3038 strings) [CI skip] --- po/ne.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/po/ne.po b/po/ne.po index 3faf86f50d..15b28fce77 100644 --- a/po/ne.po +++ b/po/ne.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-08 15:27+0200\n" -"PO-Revision-Date: 2014-08-26 15:28+0200\n" +"PO-Revision-Date: 2015-07-19 05:08+0200\n" "Last-Translator: Nabin Ghimire \n" -"Language-Team: Nepali \n" +"Language-Team: Nepali " +"\n" "Language: ne\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 1.10-dev\n" +"X-Generator: Weblate 2.4-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -37,10 +37,10 @@ msgid "Click to sort." msgstr "क्रमबद्ध गर्नका लागि क्लिक गर्नुहोस।" #: db_central_columns.php:129 -#, fuzzy, php-format +#, php-format #| msgid "Showing row(s) %1$s - %2$s" msgid "Showing rows %1$s - %2$s." -msgstr "पङ्तिहरु %1$s - %2$s देखाउँदै" +msgstr "%1$s - %2$s पङ्तिहरु देखाउँदै।" #: db_create.php:61 #, php-format @@ -344,7 +344,7 @@ msgstr "" #: db_tracking.php:79 msgid "No tables selected." -msgstr "" +msgstr "कुनैपनि डेटाबेस चयन गरिएको छैन।" #: db_tracking.php:114 msgid "Tracked tables" @@ -360,7 +360,7 @@ msgstr "निर्माण गरियो/गरिएको छ" #: db_tracking.php:128 libraries/tracking.lib.php:277 msgid "Updated" -msgstr "" +msgstr "सुधार गरियो" #: db_tracking.php:129 js/messages.php:212 libraries/Menu.class.php:545 #: libraries/Util.class.php:4151 libraries/rte/rte_events.lib.php:404 @@ -3500,7 +3500,7 @@ msgstr "" #: libraries/tbl_columns_definition_form.lib.php:215 #: libraries/tracking.lib.php:873 msgid "Structure" -msgstr "" +msgstr "संरचना" #: libraries/Menu.class.php:317 libraries/Menu.class.php:421 #: libraries/Menu.class.php:541 libraries/Util.class.php:3209 @@ -3781,7 +3781,7 @@ msgstr "" #: libraries/plugins/export/ExportXml.class.php:120 #: libraries/structure.lib.php:3102 msgid "Tables" -msgstr "" +msgstr "टेबलहरु" #: libraries/ServerStatusData.class.php:202 msgid "Transaction coordinator" @@ -4500,7 +4500,7 @@ msgstr "" #: libraries/server_privileges.lib.php:1162 libraries/structure.lib.php:2353 #: libraries/tbl_printview.lib.php:308 msgid "Data" -msgstr "" +msgstr "डाटा" #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171 #: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:185 -- cgit v1.2.3 From a302f1b558f4f0d63494d49617e04559895054ad Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 20 Jul 2015 08:46:46 -0400 Subject: 4.4.13-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce1eace066..2c50e42b6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.4.12.0 (not yet released) +4.4.13.0 (not yet released) + +4.4.12.0 (2015-07-20) - bug Saved chart image does not have a proper name or an extension - bug #4976 Timepicker CSS issues in Original theme - bug #4975 Move/Copy/Rename operations on Table/Db fail on Drizzle server diff --git a/README b/README index 45845f7a03..38925cfea0 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.4.12-dev +Version 4.4.13-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 925b076c0d..14e24b02fd 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.4.12-dev' +version = '4.4.13-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 12e0b5b1f7..bb901608c5 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.4.12-dev'); + $this->set('PMA_VERSION', '4.4.13-dev'); /** * @deprecated */ -- cgit v1.2.3 From 0626eed43a55835468cbd2d0fd0c6034f7ec8d11 Mon Sep 17 00:00:00 2001 From: dingo thirteen Date: Mon, 20 Jul 2015 21:04:35 +0200 Subject: Translated using Weblate (Dutch) Currently translated at 100.0% (3038 of 3038 strings) [CI skip] --- po/nl.po | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/po/nl.po b/po/nl.po index eeb4c2d7f8..7a10963557 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-08 15:27+0200\n" -"PO-Revision-Date: 2015-05-20 16:41+0200\n" +"PO-Revision-Date: 2015-07-20 21:04+0200\n" "Last-Translator: dingo thirteen \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch " +"\n" "Language: nl\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.3-dev\n" +"X-Generator: Weblate 2.4-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -704,7 +704,7 @@ msgstr "" #: import_status.php:103 msgid "Could not load the progress of the import." -msgstr "" +msgstr "Voortgang van de import kon niet worden ingelezen." #: import_status.php:112 js/messages.php:340 libraries/Util.class.php:735 #: libraries/export.lib.php:464 @@ -6192,11 +6192,13 @@ msgstr "Breek een handeling niet af bij een INSERT-fout" #: libraries/config/messages.inc.php:337 libraries/config/messages.inc.php:349 msgid "Add ON DUPLICATE KEY UPDATE" -msgstr "" +msgstr "Voeg ON DUPLICATE KEY UPDATE toe" #: libraries/config/messages.inc.php:338 libraries/config/messages.inc.php:350 msgid "Update data when duplicate keys found on import" msgstr "" +"Werk data bij wanneer identieke sleutelvelden worden gevonden bij het " +"importeren" #: libraries/config/messages.inc.php:341 msgid "" @@ -10281,6 +10283,8 @@ msgstr "Tabel:" msgid "" "Update data when duplicate keys found on import (add ON DUPLICATE KEY UPDATE)" msgstr "" +"Werk data bij wanneer dubbele sleutelvelden worden gevonden bij import (voeg " +"ON DUPLICATE KEY UPDATE toe)" #: libraries/plugins/import/ImportCsv.class.php:63 #: libraries/plugins/import/ImportOds.class.php:75 -- cgit v1.2.3 From 143a9c12519892bda7a742bf037f21f2d2b835d1 Mon Sep 17 00:00:00 2001 From: Vinicius Pitta Lima de Araujo Date: Tue, 21 Jul 2015 03:13:44 +0200 Subject: Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (3036 of 3038 strings) [CI skip] --- po/pt_BR.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index c4b3023bba..a2868b2b11 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-08 15:27+0200\n" -"PO-Revision-Date: 2015-07-12 20:12+0200\n" -"Last-Translator: Helder Santana \n" +"PO-Revision-Date: 2015-07-21 03:13+0200\n" +"Last-Translator: Vinicius Pitta Lima de Araujo \n" "Language-Team: Portuguese (Brazil) " "\n" "Language: pt_BR\n" @@ -6206,6 +6206,7 @@ msgstr "" #: libraries/config/messages.inc.php:338 libraries/config/messages.inc.php:350 msgid "Update data when duplicate keys found on import" msgstr "" +"Atualizar dados quando chaves duplicadas forem encontradas na importação" #: libraries/config/messages.inc.php:341 msgid "" -- cgit v1.2.3 From dfea8ffda70d630340d17ee90e1db2aeae07cbcd Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 21 Jul 2015 17:56:07 +0530 Subject: Fix failing tests Signed-off-by: Madhura Jayaratne --- libraries/select_lang.lib.php | 8 ++++---- test/libraries/PMA_insert_edit_test.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 3d9872c37b..16d49534e1 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -587,11 +587,11 @@ if (! function_exists('__')) { } /* Text direction for language */ -if (in_array($GLOBALS['lang'], array('ar', 'fa', 'he', 'ur'))) { +//if (in_array($GLOBALS['lang'], array('ar', 'fa', 'he', 'ur'))) { $GLOBALS['text_dir'] = 'rtl'; -} else { - $GLOBALS['text_dir'] = 'ltr'; -} +//} else { +// $GLOBALS['text_dir'] = 'ltr'; +//} /* TCPDF */ $GLOBALS['l'] = array(); diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index 979b53da64..0ef0a9d241 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -2862,7 +2862,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $actual ); $this->assertContains( - 'varchar(20)', + 'varchar(20)', $actual ); $this->assertContains( @@ -2972,7 +2972,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $actual ); $this->assertContains( - 'longtext', + 'longtext', $actual ); $this->assertContains( -- cgit v1.2.3 From 7d55220cce89f05e5d9bd6656aa12784199dcff9 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 21 Jul 2015 18:03:27 +0530 Subject: Another failing test fixed Signed-off-by: Madhura Jayaratne --- test/libraries/PMA_insert_edit_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index 0ef0a9d241..26e0a51095 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -2916,7 +2916,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $actual ); $this->assertContains( - 'datetime', + 'datetime', $actual ); $this->assertContains( -- cgit v1.2.3 From cd5154d74c8e49b0f777454716cf92972bcfb49c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 21 Jul 2015 18:06:18 +0530 Subject: Revert changes that were accidentally committed Signed-off-by: Madhura Jayaratne --- libraries/select_lang.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 16d49534e1..3d9872c37b 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -587,11 +587,11 @@ if (! function_exists('__')) { } /* Text direction for language */ -//if (in_array($GLOBALS['lang'], array('ar', 'fa', 'he', 'ur'))) { +if (in_array($GLOBALS['lang'], array('ar', 'fa', 'he', 'ur'))) { $GLOBALS['text_dir'] = 'rtl'; -//} else { -// $GLOBALS['text_dir'] = 'ltr'; -//} +} else { + $GLOBALS['text_dir'] = 'ltr'; +} /* TCPDF */ $GLOBALS['l'] = array(); -- cgit v1.2.3 From cd34226d8961fb298c8b8615121162bfd0be118e Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Wed, 22 Jul 2015 04:01:22 +0530 Subject: Fix unexpected behaviour Signed-off-by: Deven Bansod --- libraries/server_status_processes.lib.php | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php index f1835018ce..95e8b82136 100644 --- a/libraries/server_status_processes.lib.php +++ b/libraries/server_status_processes.lib.php @@ -238,7 +238,6 @@ function PMA_getHtmlForProcessListFilter() } $url_params = array( - 'showExecuting' => 1, 'ajax_request' => true ); -- cgit v1.2.3 From 36423d6ebd0a1d0ad28d1f1a0cde29a9315dcd43 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 22 Jul 2015 10:14:04 +0530 Subject: issue #1808 "Improve table structure" generates invalid SQL Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/create_addfield.lib.php | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2c50e42b6b..9e5a96f41d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.4.13.0 (not yet released) +- issue #1808 "Improve table structure" generates invalid SQL 4.4.12.0 (2015-07-20) - bug Saved chart image does not have a proper name or an extension diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php index cabb3af9ea..756f7c24ba 100644 --- a/libraries/create_addfield.lib.php +++ b/libraries/create_addfield.lib.php @@ -99,6 +99,10 @@ function PMA_setColumnCreationStatementSuffix($current_field_num, return $sql_suffix; } + if ($_REQUEST['field_where'] == 'last') { + return $sql_suffix; + } + // Only the first field can be added somewhere other than at the end if ($current_field_num == 0) { if ($_REQUEST['field_where'] == 'first') { -- cgit v1.2.3 From 2872471eccee88663040f8b5bfcced9505b77e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?= =?UTF-8?q?=CF=82=20=CE=A0=CE=B1=CF=80=CE=AC=CE=B6=CE=BF=CE=B3=CE=BB=CE=BF?= =?UTF-8?q?=CF=85?= Date: Tue, 21 Jul 2015 07:27:21 +0200 Subject: Translated using Weblate (Greek) Currently translated at 100.0% (3038 of 3038 strings) [CI skip] --- po/el.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index b8f8bd345c..b26edd4cab 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-08 15:27+0200\n" -"PO-Revision-Date: 2015-07-16 07:20+0200\n" +"PO-Revision-Date: 2015-07-21 07:27+0200\n" "Last-Translator: Παναγιώτης Παπάζογλου \n" "Language-Team: Greek " "\n" @@ -13767,7 +13767,7 @@ msgstr "Βελτίωση δομής πίνακα" #: libraries/structure.lib.php:1663 msgid "Track view" -msgstr "Πληροφορίες παρακολούθησης προβολής" +msgstr "Προβολή παρακολούθησης" #: libraries/structure.lib.php:1704 #: libraries/tbl_columns_definition_form.lib.php:189 -- cgit v1.2.3 From 565dab1c8a13999656dedc5aa7fccb1375d76bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Ara=C3=BAjo?= Date: Tue, 21 Jul 2015 03:18:31 +0200 Subject: Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (3037 of 3038 strings) [CI skip] I believe there is no reason to translate the message literally because it can lead to loss of meaning --- po/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a2868b2b11..c60a335c19 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-08 15:27+0200\n" -"PO-Revision-Date: 2015-07-21 03:13+0200\n" +"PO-Revision-Date: 2015-07-21 03:18+0200\n" "Last-Translator: Vinicius Pitta Lima de Araujo \n" "Language-Team: Portuguese (Brazil) " "\n" @@ -6201,12 +6201,12 @@ msgstr "Não aborta em erro de INSERT" #: libraries/config/messages.inc.php:337 libraries/config/messages.inc.php:349 msgid "Add ON DUPLICATE KEY UPDATE" -msgstr "" +msgstr "Adicionar ON DUPLICATE KEY UPDATE" #: libraries/config/messages.inc.php:338 libraries/config/messages.inc.php:350 msgid "Update data when duplicate keys found on import" msgstr "" -"Atualizar dados quando chaves duplicadas forem encontradas na importação" +"Atualizar dados quando forem encontradas chaves duplicadas na importação" #: libraries/config/messages.inc.php:341 msgid "" -- cgit v1.2.3 From 67e608a3b0b6aad13c667573beb4a23623e95adf Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 22 Jul 2015 04:02:13 +0200 Subject: Translated using Weblate (Sinhala) Currently translated at 65.4% (1988 of 3038 strings) [CI skip] --- po/si.po | 69 ++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/po/si.po b/po/si.po index 68d32ed3ff..32539331a7 100644 --- a/po/si.po +++ b/po/si.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-08 15:27+0200\n" -"PO-Revision-Date: 2014-11-11 12:16+0200\n" +"PO-Revision-Date: 2015-07-22 04:02+0200\n" "Last-Translator: Madhura Jayaratne \n" -"Language-Team: Sinhala \n" +"Language-Team: Sinhala " +"\n" "Language: si\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.0\n" +"X-Generator: Weblate 2.4-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -324,7 +324,7 @@ msgstr "%sදෘශ්‍ය ගොඩනංවනය%s වෙත යන්න" #: libraries/plugins/auth/AuthenticationConfig.class.php:118 #: libraries/plugins/auth/AuthenticationHttp.class.php:91 msgid "Access denied!" -msgstr "පිවිසුම වලක්වා ඇත" +msgstr "පිවිසුම වලක්වා ඇත!" #: db_tracking.php:39 db_tracking.php:64 #, fuzzy @@ -3710,12 +3710,12 @@ msgstr "ටීකාව" #: libraries/Index.class.php:683 msgid "The primary key has been dropped." -msgstr "ප්‍රාථමික මූලය හලන ලදි" +msgstr "ප්‍රාථමික මූලය හලන ලදි." #: libraries/Index.class.php:692 #, php-format msgid "Index %s has been dropped." -msgstr "%s සූචිය හලන ලදි" +msgstr "%s සූචිය හලන ලදි." #: libraries/Index.class.php:709 libraries/Util.class.php:3435 #: libraries/Util.class.php:3436 libraries/server_databases.lib.php:146 @@ -3851,10 +3851,9 @@ msgid "Designer" msgstr "සැලසුම්කරණය" #: libraries/Menu.class.php:500 libraries/Util.class.php:4177 -#, fuzzy #| msgid "Textarea columns" msgid "Central columns" -msgstr "පෙළ පෙදෙසේ පළල" +msgstr "මධ්‍යම තීර" #: libraries/Menu.class.php:537 libraries/Util.class.php:4149 #: libraries/config/messages.inc.php:233 @@ -4794,7 +4793,7 @@ msgstr "වෙබ් සේවාදායකයේ %s උඩුගත #: libraries/Util.class.php:3401 libraries/insert_edit.lib.php:1167 #: libraries/sql_query_form.lib.php:445 msgid "The directory you set for upload work cannot be reached." -msgstr "අප්ලෝඩ් කිරීම් සඳහා සැකසූ ඩිරෙක්ටරිය වෙත පිවිසිය නොහැක" +msgstr "උඩුගත කිරීම් සඳහා සැකසූ ඩිරෙක්ටරිය වෙත පිවිසිය නොහැක." #: libraries/Util.class.php:3412 msgid "There are no files to upload!" @@ -5488,7 +5487,7 @@ msgstr "Blowfish රහස" #: libraries/config/messages.inc.php:39 msgid "Highlight selected rows." -msgstr "තෝරාගත් පේළි ඉස්මතු කරන්න" +msgstr "තෝරාගත් පේළි ඉස්මතු කරන්න." #: libraries/config/messages.inc.php:40 msgid "Row marker" @@ -5645,7 +5644,7 @@ msgstr "වගු සැකිල්ලට අදාල ක්‍රියාව #: libraries/config/messages.inc.php:98 msgid "Show server listing as a list instead of a drop down." -msgstr "සේවාදායකයන් පතනයක් ලෙස නොව ලැයිස්තුවක් ලෙස පෙන්වන්න" +msgstr "සේවාදායකයන් පතනයක් ලෙස නොව ලැයිස්තුවක් ලෙස පෙන්වන්න." #: libraries/config/messages.inc.php:99 msgid "Display servers as a list" @@ -5668,8 +5667,8 @@ msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)." msgstr "" -"විධානාවලියක් ක්‍රියාත්මක වීමට ලබා දෙන කාලය සඳහා අගයක් සිටුවයි. (අසීමිත කාලයක් සඳහා [kbd]0[/" -"kbd] භාවිතා කරන්න)" +"විධානාවලියක් ක්‍රියාත්මක වීමට ලබා දෙන කාලය සඳහා අගයක් සිටුවයි. (අසීමිත කාලයක්" +" සඳහා [kbd]0[/kbd] භාවිතා කරන්න)." #: libraries/config/messages.inc.php:109 msgid "Maximum execution time" @@ -6791,10 +6790,9 @@ msgid "Default sort order for tables with a primary key." msgstr "" #: libraries/config/messages.inc.php:539 -#, fuzzy #| msgid "Default sorting order" msgid "Primary key default sort order" -msgstr "පෙරනිමි අනුපිළිවෙල" +msgstr "ප්‍රාථමික යතුරු පෙරනිමි සුබෙදුම් අනුපිළිවෙල" #: libraries/config/messages.inc.php:541 #, fuzzy @@ -9945,7 +9943,7 @@ msgstr "මුර පදයක් නොමැතිව ඇතුල් වී #: libraries/plugins/AuthenticationPlugin.class.php:73 #, php-format msgid "No activity within %s seconds; please log in again." -msgstr "පසුගිය තත්පර %s තුල අක්‍රීයයි; නැවත ඇතුළු වන්න" +msgstr "පසුගිය තත්පර %s තුල අක්‍රීයයි; නැවත ඇතුළු වන්න." #: libraries/plugins/AuthenticationPlugin.class.php:82 #: libraries/plugins/AuthenticationPlugin.class.php:84 @@ -10046,7 +10044,7 @@ msgstr "%s ගොනුවෙහි යතුරු කිසිවක් අඩ #: libraries/plugins/auth/swekey/swekey.auth.lib.php:195 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:216 msgid "Hardware authentication failed!" -msgstr "දෘඪාංග සත්‍යාපනය අසමත් විය" +msgstr "දෘඪාංග සත්‍යාපනය අසමත් විය!" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:203 msgid "No valid authentication key plugged" @@ -12216,7 +12214,7 @@ msgstr "%s ගේ මුරපදය සාර්ථකව වෙනස් ක #: libraries/server_privileges.lib.php:1862 #, php-format msgid "You have revoked the privileges for %s." -msgstr "ඔබ %s සඳහා වරප්‍රසාද අහෝසි කර ඇත" +msgstr "ඔබ %s සඳහා වරප්‍රසාද අහෝසි කර ඇත." #: libraries/server_privileges.lib.php:1952 #: libraries/server_privileges.lib.php:4075 @@ -12229,16 +12227,17 @@ msgstr "භාවිතා කරන්නා සඳහා දත්තගබඩ #: libraries/server_privileges.lib.php:1965 msgid "Create database with same name and grant all privileges." -msgstr "එකම නමින් දත්තගබඩාවක සාදා සියලු වරප්‍රසාද එයට දෙන්න" +msgstr "එම නමින්ම දත්තගබඩාවක් සාදා එයට සියලු වරප්‍රසාද ප්‍රදානය කරන්න." #: libraries/server_privileges.lib.php:1971 msgid "Grant all privileges on wildcard name (username\\_%)." -msgstr "අභිමත ආදේශක නාමයන් සඳහා සියලු වරප්‍රසාද දෙන්න (භාවිත නාමය\\_%)" +msgstr "" +"අභිමත ආදේශක නාමයන් සඳහා සියලු වරප්‍රසාද ප්‍රදානය කරන්න (භාවිත නාමය\\_%)." #: libraries/server_privileges.lib.php:1980 #, php-format msgid "Grant all privileges on database \"%s\"." -msgstr "\"%s\" දත්තගබඩාව සඳහා සියලු වරප්‍රසාද ප්‍රදානය කරන්න" +msgstr "\"%s\" දත්තගබඩාව සඳහා සියලු වරප්‍රසාද ප්‍රදානය කරන්න." #: libraries/server_privileges.lib.php:2081 #: libraries/server_privileges.lib.php:2145 @@ -13570,7 +13569,7 @@ msgstr "SQL විමසුමක් සිදු කරන්න/%s දත් #: libraries/sql_query_form.lib.php:240 msgid "Get auto-saved query" -msgstr "" +msgstr "ස්වයං සුරැකුණු විමසුම ලබාගන්න" #: libraries/sql_query_form.lib.php:284 msgid "Bookmark this SQL query:" @@ -13650,7 +13649,7 @@ msgstr "නොදන්නා විරාම අකුරු වැල" #: libraries/structure.lib.php:70 tbl_operations.php:355 #, php-format msgid "Table %s has been emptied." -msgstr "%s වගුව හිස් කරන ලදි" +msgstr "%s වගුව හිස් කරන ලදි." #: libraries/structure.lib.php:93 msgid "Tracking is active." @@ -13738,7 +13737,7 @@ msgstr "කිසිවක් නැත" #: libraries/structure.lib.php:1448 #, php-format msgid "Column %s has been dropped." -msgstr "%s තීරුව හලන ලදි" +msgstr "%s තීරුව හලන ලදි." #: libraries/structure.lib.php:1486 libraries/structure.lib.php:2230 msgid "Change" @@ -13755,16 +13754,14 @@ msgid "Fulltext" msgstr "සම්පූර්ණ පාඨය" #: libraries/structure.lib.php:1528 libraries/structure.lib.php:2166 -#, fuzzy #| msgid "CHAR textarea columns" msgid "Add to central columns" -msgstr "CHAR පෙළ පෙදෙසේ පළල" +msgstr "මධ්‍යම තීර වලට එක් කරන්න" #: libraries/structure.lib.php:1533 libraries/structure.lib.php:2156 -#, fuzzy #| msgid "Remove column(s)" msgid "Remove from central columns" -msgstr "පේළි(යක්) ඉවත් කරන්න" +msgstr "මධ්‍යම තීර වලින් ඉවත් කරන්න" #: libraries/structure.lib.php:1549 libraries/structure.lib.php:1653 msgid "Move columns" @@ -13783,16 +13780,14 @@ msgid "Propose table structure" msgstr "සැකිල්ලක් යෝජනා කරන්න" #: libraries/structure.lib.php:1656 -#, fuzzy #| msgid "Propose table structure" msgid "Improve table structure" -msgstr "සැකිල්ලක් යෝජනා කරන්න" +msgstr "වගුවේ සැකිල්ල වැඩි දියුණු කරන්න" #: libraries/structure.lib.php:1663 -#, fuzzy #| msgid "Track table" msgid "Track view" -msgstr "වගුව අවධානයට ලක් කරන්න" +msgstr "දසුන අවධානයට ලක් කරන්න" #: libraries/structure.lib.php:1704 #: libraries/tbl_columns_definition_form.lib.php:189 @@ -13844,12 +13839,12 @@ msgstr "මීළඟ ක්‍රමාංකය" #: libraries/structure.lib.php:2120 libraries/structure.lib.php:2135 #, php-format msgid "An index has been added on %s." -msgstr "%s සඳහා සූචියක් එක්කරන ලදි" +msgstr "%s සඳහා සූචියක් එක්කරන ලදි." #: libraries/structure.lib.php:2106 #, php-format msgid "A primary key has been added on %s." -msgstr "%s ට ප්‍රාථමික මූලයක් එක් කරන ලදි" +msgstr "%s ට ප්‍රාථමික මූලයක් එක් කරන ලදි." #: libraries/structure.lib.php:2185 libraries/structure.lib.php:2256 msgid "Distinct values" @@ -13883,7 +13878,7 @@ msgstr "එලදායී" #: tbl_addfield.php:92 #, php-format msgid "Table %1$s has been altered successfully." -msgstr "%1$s වගුව සාර්ථකව වෙනස් කරන ලදි" +msgstr "%1$s වගුව සාර්ථකව වෙනස් කරන ලදි." #: libraries/structure.lib.php:2621 libraries/tracking.lib.php:1085 msgid "Query error" @@ -14461,7 +14456,7 @@ msgstr "සිටුවම් පරිපාලනය" #: libraries/user_preferences.inc.php:46 prefs_manage.php:305 msgid "Configuration has been saved." -msgstr "වෙනස් කිරීම් සුරකින ලදි" +msgstr "වින්‍යාස සුරකින ලදි." #: libraries/user_preferences.inc.php:66 #, php-format -- cgit v1.2.3 From 9679ca5002f61e6052766e2982408a16f1f494dd Mon Sep 17 00:00:00 2001 From: Stefano Martinelli Date: Tue, 21 Jul 2015 20:10:22 +0200 Subject: Translated using Weblate (Italian) Currently translated at 100.0% (3161 of 3161 strings) [CI skip] --- po/it.po | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/po/it.po b/po/it.po index 17b9bfdec6..4e94a9e38e 100644 --- a/po/it.po +++ b/po/it.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-20 06:34-0400\n" -"PO-Revision-Date: 2015-07-14 16:13+0200\n" +"PO-Revision-Date: 2015-07-21 20:10+0200\n" "Last-Translator: Stefano Martinelli \n" -"Language-Team: Italian \n" +"Language-Team: Italian " +"\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5677,12 +5677,13 @@ msgid "" "Find any errors in the query before executing it. Requires CodeMirror to be " "enabled." msgstr "" +"Trova gli errori nella query prima di eseguirla. Richiede CodeMirror per " +"essere abilitato." #: libraries/config/messages.inc.php:62 -#, fuzzy #| msgid "Enable SQL Validator" msgid "Enable linter" -msgstr "Abilita il validatore SQL" +msgstr "Abilita linter" #: libraries/config/messages.inc.php:64 msgid "" @@ -12509,19 +12510,17 @@ msgstr "" "con un nome host (hostname) diverso." #: libraries/server_privileges.lib.php:1503 -#, fuzzy #| msgid "User name:" msgid "Host name:" -msgstr "Nome utente:" +msgstr "Nome host:" #: libraries/server_privileges.lib.php:1508 #: libraries/server_privileges.lib.php:1610 #: libraries/server_privileges.lib.php:2242 #: libraries/server_privileges.lib.php:3203 -#, fuzzy #| msgid "Log name" msgid "Host name" -msgstr "Nome del log" +msgstr "Nome host" #: libraries/server_privileges.lib.php:1645 msgid "Do not change the password" @@ -14880,10 +14879,9 @@ msgid "Pick from Central Columns" msgstr "Scegli dai Campi Centrali" #: templates/columns_definitions/column_virtuality.phtml:46 -#, fuzzy #| msgid "Compression" msgid "Expression" -msgstr "Compressione" +msgstr "Espressione" #: templates/columns_definitions/move_column.phtml:7 msgid "first" @@ -14911,7 +14909,7 @@ msgstr "" #: templates/columns_definitions/table_fields_definitions.phtml:70 msgid "Virtuality" -msgstr "" +msgstr "Virtuality" #: templates/columns_definitions/table_fields_definitions.phtml:76 msgid "Move column" -- cgit v1.2.3 From 21fe34ea99ec9471d963ba1b5ebd175fd15a0925 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 22 Jul 2015 04:30:12 +0200 Subject: Translated using Weblate (Sinhala) Currently translated at 62.5% (1978 of 3161 strings) [CI skip] --- po/si.po | 84 ++++++++++++++++++++++------------------------------------------ 1 file changed, 29 insertions(+), 55 deletions(-) diff --git a/po/si.po b/po/si.po index 57be0ea563..e3d0ec3e39 100644 --- a/po/si.po +++ b/po/si.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-20 06:34-0400\n" -"PO-Revision-Date: 2015-07-20 18:30+0200\n" +"PO-Revision-Date: 2015-07-22 04:30+0200\n" "Last-Translator: Madhura Jayaratne \n" "Language-Team: Sinhala " "\n" @@ -1885,10 +1885,9 @@ msgid "Changing Charset" msgstr "අක්ෂර කට්ටලය වෙනස් කෙරෙමින්" #: js/messages.php:320 libraries/Util.class.php:3220 -#, fuzzy #| msgid "Disable foreign key checks" msgid "Enable foreign key checks" -msgstr "අන්‍ය මූල පරීක්ෂා අක්‍රිය කරන්න" +msgstr "අන්‍ය මූල පරීක්ෂා සක්‍රිය කරන්න" #: js/messages.php:323 #, fuzzy @@ -3545,17 +3544,16 @@ msgstr "තීර:" #: libraries/DBQbe.class.php:513 msgid "Alias:" -msgstr "" +msgstr "අන්වර්ථය:" #: libraries/DBQbe.class.php:566 msgid "Sort:" msgstr "සුබෙදන්න:" #: libraries/DBQbe.class.php:630 -#, fuzzy #| msgid "Sort:" msgid "Sort order:" -msgstr "සුබෙදන්න:" +msgstr "සුබෙදුම් අනුපිළිවෙල:" #: libraries/DBQbe.class.php:679 msgid "Show:" @@ -4215,10 +4213,9 @@ msgstr "සැලසුම්කරණය" #: libraries/Menu.class.php:505 libraries/Util.class.php:4367 #: libraries/structure.lib.php:360 -#, fuzzy #| msgid "Textarea columns" msgid "Central columns" -msgstr "පෙළ පෙදෙසේ පළල" +msgstr "මධ්‍යම තීර" #: libraries/Menu.class.php:542 libraries/Util.class.php:4339 #: libraries/config.values.php:103 libraries/config/messages.inc.php:248 @@ -4229,10 +4226,9 @@ msgid "Databases" msgstr "දත්තගබඩා" #: libraries/Menu.class.php:566 -#, fuzzy #| msgid "Users" msgid "User accounts" -msgstr "භාවිතා කරන්නන්" +msgstr "භාවිත ගිණුම්" #: libraries/Menu.class.php:593 libraries/ServerStatusData.class.php:121 #: libraries/Util.class.php:4346 libraries/server_common.lib.php:36 @@ -7200,10 +7196,9 @@ msgid "Default sort order for tables with a primary key." msgstr "" #: libraries/config/messages.inc.php:572 -#, fuzzy #| msgid "Default sorting order" msgid "Primary key default sort order" -msgstr "පෙරනිමි අනුපිළිවෙල" +msgstr "ප්‍රාථමික යතුරු පෙරනිමි සුබෙදුම් අනුපිළිවෙල" #: libraries/config/messages.inc.php:574 #, fuzzy @@ -7504,10 +7499,9 @@ msgstr "" "[kbd]pma__pdf_pages[/kbd]" #: libraries/config/messages.inc.php:658 -#, fuzzy #| msgid "Exporting rows from \"%s\" table" msgid "Export templates table" -msgstr "\"%s\" වගුවෙන් පේළි අපනයනය කිරීම" +msgstr "අපනයන ආකෘති වගුව" #: libraries/config/messages.inc.php:660 #, fuzzy @@ -8525,16 +8519,14 @@ msgid "Exporting rows from \"%s\" table" msgstr "\"%s\" වගුවෙන් පේළි අපනයනය කිරීම" #: libraries/display_export.lib.php:203 -#, fuzzy #| msgid "Export type" msgid "Export templates:" -msgstr "අපනයන වර්ගය" +msgstr "අපනයන ආකෘති:" #: libraries/display_export.lib.php:208 -#, fuzzy #| msgid "File name template:" msgid "New template:" -msgstr "ගොනු නාම අච්චුව:" +msgstr "නව ආකෘතිය:" #: libraries/display_export.lib.php:211 #, fuzzy @@ -8543,23 +8535,20 @@ msgid "Template name" msgstr "වගුවේ නම" #: libraries/display_export.lib.php:220 -#, fuzzy #| msgid "File name template:" msgid "Existing templates:" -msgstr "ගොනු නාම අච්චුව:" +msgstr "පවත්නා ආකෘති:" #: libraries/display_export.lib.php:221 -#, fuzzy #| msgid "%s table" #| msgid_plural "%s tables" msgid "Template:" -msgstr "%s වගු" +msgstr "ආකෘතිය:" #: libraries/display_export.lib.php:226 -#, fuzzy #| msgid "Updated" msgid "Update" -msgstr "යාවත්කාලීන කරන ලදි" +msgstr "යාවත්කාලීන කරන්න" #: libraries/display_export.lib.php:248 #, fuzzy @@ -10160,10 +10149,9 @@ msgstr "" #: libraries/operations.lib.php:867 libraries/operations.lib.php:961 #: libraries/operations.lib.php:1315 libraries/rte/rte_routines.lib.php:907 #: templates/columns_definitions/table_fields_definitions.phtml:47 -#, fuzzy #| msgid "Edit Privileges" msgid "Adjust Privileges" -msgstr "වරප්‍රසාද සංස්කරණය කරන්න" +msgstr "වරප්‍රසාද හැඩ ගස්වන්න" #: libraries/operations.lib.php:133 #, php-format @@ -11578,10 +11566,9 @@ msgid "Remembering Designer Settings" msgstr "වගුව සැකසූ අනුපිළිවෙල මතක තබාගන්න" #: libraries/relation.lib.php:338 -#, fuzzy #| msgid "Invalid export type" msgid "Saving export templates" -msgstr "වැරදි අපනයන වර්ගයකි" +msgstr "අපනයන ආකෘති සුරකිමින්" #: libraries/relation.lib.php:346 msgid "Quick steps to setup advanced features:" @@ -12776,19 +12763,17 @@ msgid "" msgstr "" #: libraries/server_privileges.lib.php:1503 -#, fuzzy #| msgid "User name:" msgid "Host name:" -msgstr "භාවිත නාමය:" +msgstr "දාරක නාමය:" #: libraries/server_privileges.lib.php:1508 #: libraries/server_privileges.lib.php:1610 #: libraries/server_privileges.lib.php:2242 #: libraries/server_privileges.lib.php:3203 -#, fuzzy #| msgid "Log name" msgid "Host name" -msgstr "ලොග් නම" +msgstr "දාරක නාමය" #: libraries/server_privileges.lib.php:1645 msgid "Do not change the password" @@ -12806,16 +12791,14 @@ msgstr "ඔබ %s සඳහා වරප්‍රසාද අහෝසි ක #: libraries/server_privileges.lib.php:1933 #: libraries/server_privileges.lib.php:4063 -#, fuzzy #| msgid "Add user" msgid "Add user account" -msgstr "භාවිතා කරන්නෙක් එක් කරන්න" +msgstr "භාවිත ගිණුමක් එක් කරන්න" #: libraries/server_privileges.lib.php:1942 -#, fuzzy #| msgid "Database for user" msgid "Database for user account" -msgstr "භාවිතා කරන්නා සඳහා දත්තගබඩාව" +msgstr "භාවිත ගිණුම සඳහා දත්තගබඩාව" #: libraries/server_privileges.lib.php:1946 msgid "Create database with same name and grant all privileges." @@ -12912,16 +12895,14 @@ msgid "" msgstr "… භාවිතා කරන්නන්ගේ වගුවෙන් පැරණි එක ඉවත් කර වරප්‍රසාද නැවත අලුත් කරන්න." #: libraries/server_privileges.lib.php:2728 -#, fuzzy #| msgid "Change Login Information / Copy User" msgid "Change login information / Copy user account" -msgstr "ලොගින් තොරතුරු වෙනස් කරන්න / භාවිතා කරන්නා පිටපත් කරන්න" +msgstr "ලොගින් තොරතුරු වෙනස් කරන්න / භාවිත ගිණුම පිටපත් කරන්න" #: libraries/server_privileges.lib.php:2734 -#, fuzzy #| msgid "Create a new user with the same privileges and …" msgid "Create a new user account with the same privileges and …" -msgstr "සහ එකම වරප්‍රසාද සහිතව නව භාවිතා කරන්නෙක් එක් කරන්න …" +msgstr "සහ එකම වරප්‍රසාද සහිතව නව භාවිත ගිණුමක් එක් කරන්න …" #: libraries/server_privileges.lib.php:3036 msgid "Column-specific privileges" @@ -12942,10 +12923,9 @@ msgid "Add privileges on the following table:" msgstr "පහත වගුවට වරප්‍රසාද එක් කරන්න:" #: libraries/server_privileges.lib.php:3370 -#, fuzzy #| msgid "Remove selected users" msgid "Remove selected user accounts" -msgstr "තෝරාගත් භාවිතා කරන්නන් ඉවත් කරන්න" +msgstr "තෝරාගත් භාවිත ගිණුම් ඉවත් කරන්න" #: libraries/server_privileges.lib.php:3376 msgid "Revoke all active privileges from the users and delete them afterwards." @@ -13011,10 +12991,9 @@ msgid "Edit privileges:" msgstr "වරප්‍රසාද සංස්කරණය කරන්න:" #: libraries/server_privileges.lib.php:4085 -#, fuzzy #| msgid "Users" msgid "User account" -msgstr "භාවිතා කරන්නන්" +msgstr "භාවිත ගිණුම" #: libraries/server_privileges.lib.php:4144 msgid "" @@ -13023,10 +13002,9 @@ msgid "" msgstr "" #: libraries/server_privileges.lib.php:4164 libraries/server_users.lib.php:25 -#, fuzzy #| msgid "Users overview" msgid "User accounts overview" -msgstr "භාවිතා කරන්නන් පිළිබඳ දළ විශ්ලේෂණය" +msgstr "භාවිත ගිණුම් පිළිබඳ දළ විශ්ලේෂණය" #: libraries/server_privileges.lib.php:4232 msgid "" @@ -14196,13 +14174,12 @@ msgstr "SQL විමසුමක් සිදු කරන්න/%s දත් #: libraries/sql_query_form.lib.php:256 msgid "Get auto-saved query" -msgstr "" +msgstr "ස්වයං සුරැකුණු විමසුම ලබාගන්න" #: libraries/sql_query_form.lib.php:267 -#, fuzzy #| msgid "Bad parameters!" msgid "Bind parameters" -msgstr "වැරදි පරාමිතියන්!" +msgstr "පරාමිතියන් බඳින්න" #: libraries/sql_query_form.lib.php:314 msgid "Bookmark this SQL query:" @@ -14354,16 +14331,14 @@ msgid "Fulltext" msgstr "සම්පූර්ණ පාඨය" #: libraries/structure.lib.php:1571 libraries/structure.lib.php:2208 -#, fuzzy #| msgid "CHAR textarea columns" msgid "Add to central columns" -msgstr "CHAR පෙළ පෙදෙසේ පළල" +msgstr "මධ්‍යම තීර වලට එක් කරන්න" #: libraries/structure.lib.php:1576 libraries/structure.lib.php:2198 -#, fuzzy #| msgid "Remove column(s)" msgid "Remove from central columns" -msgstr "පේළි(යක්) ඉවත් කරන්න" +msgstr "මධ්‍යම තීර වලින් ඉවත් කරන්න" #: libraries/structure.lib.php:1594 libraries/structure.lib.php:1697 msgid "Move columns" @@ -14382,10 +14357,9 @@ msgid "Propose table structure" msgstr "සැකිල්ලක් යෝජනා කරන්න" #: libraries/structure.lib.php:1700 -#, fuzzy #| msgid "Propose table structure" msgid "Improve table structure" -msgstr "සැකිල්ලක් යෝජනා කරන්න" +msgstr "වගුවේ සැකිල්ල වැඩි දියුණු කරන්න" #: libraries/structure.lib.php:1707 #| msgid "Track table" -- cgit v1.2.3 From 487e1a8fa1e2b9fb30b64e3cf82e96196f5ce39e Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 22 Jul 2015 11:36:19 +0530 Subject: Fix floating. Fix styles for reported errors. Move inputs inside the form Signed-off-by: Madhura Jayaratne --- js/ajax.js | 6 ++++-- js/messages.php | 7 ++++--- libraries/Error_Handler.class.php | 18 +++++++++--------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/js/ajax.js b/js/ajax.js index a5a70f91a7..13e388a58c 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -446,10 +446,12 @@ var AJAX = { .insertAfter('#selflink') .append(data._errors); // bind for php error reporting forms (bottom) - $("#pma_ignore_errors_bottom").bind("click", function() { + $("#pma_ignore_errors_bottom").bind("click", function(e) { + e.preventDefault(); PMA_ignorePhpErrors(); }); - $("#pma_ignore_all_errors_bottom").bind("click", function() { + $("#pma_ignore_all_errors_bottom").bind("click", function(e) { + e.preventDefault(); PMA_ignorePhpErrors(false); }); // In case of 'sendErrorReport'='always' diff --git a/js/messages.php b/js/messages.php index d43376ebc3..917e6d6650 100644 --- a/js/messages.php +++ b/js/messages.php @@ -572,14 +572,15 @@ $js_messages['strTooManyInputs'] = __( $js_messages['phpErrorsFound'] = '
' . __('Some errors have been detected on the server!') - . '
' + . '
' . __('Please look at the bottom of this window.') + . '
' . '' + . '" class="floatright" style="margin-top: 20px;">' . '' + . '" class="floatright" style="margin-top: 20px;">' . '
'; $js_messages['phpErrorsBeingSubmitted'] = '
' diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index 3a4c028b4e..d8518a2d7a 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -331,25 +331,23 @@ class PMA_Error_Handler . '' . '' + . '" id="pma_report_errors" class="floatright">' . '' . '' - . ''; + . ''; if ($GLOBALS['cfg']['SendErrorReports'] == 'ask') { // add ignore buttons $retval .= ''; + . '" id="pma_ignore_errors_bottom" class="floatright">'; } $retval .= ''; + . '" id="pma_ignore_all_errors_bottom" class="floatright">'; + $retval .= ''; } return $retval; } @@ -537,11 +535,13 @@ class PMA_Error_Handler function() { PMA_ignorePhpErrors(false) });' - . '$("#pma_ignore_errors_bottom").bind("click", function() { + . '$("#pma_ignore_errors_bottom").bind("click", function(e) { + e.preventDefaulut(); PMA_ignorePhpErrors() });' . '$("#pma_ignore_all_errors_bottom").bind("click", - function() { + function(e) { + e.preventDefault(); PMA_ignorePhpErrors(false) });' . '$("html, body").animate({ -- cgit v1.2.3 From 13d5aabc59565b6cb9b6e9dc0d2dd1dbb00f4cb6 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 22 Jul 2015 07:21:28 +0200 Subject: Translated using Weblate (Sinhala) Currently translated at 62.6% (1980 of 3161 strings) [CI skip] --- po/si.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/si.po b/po/si.po index e3d0ec3e39..b9b5fc61c2 100644 --- a/po/si.po +++ b/po/si.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-20 06:34-0400\n" -"PO-Revision-Date: 2015-07-22 04:30+0200\n" +"PO-Revision-Date: 2015-07-22 07:21+0200\n" "Last-Translator: Madhura Jayaratne \n" "Language-Team: Sinhala " "\n" @@ -9543,7 +9543,7 @@ msgstr "රුමේනියානු" #: libraries/mysql_charsets.lib.php:243 msgid "Sinhalese" -msgstr "" +msgstr "සිංහල" #: libraries/mysql_charsets.lib.php:246 msgid "Slovak" @@ -9588,10 +9588,9 @@ msgid "multilingual" msgstr "බහුභාෂා" #: libraries/mysql_charsets.lib.php:273 -#, fuzzy #| msgid "File name" msgid "Vietnamese" -msgstr "ගොනුවේ නම" +msgstr "වියට්නාම්" #: libraries/mysql_charsets.lib.php:300 msgid "Central European" -- cgit v1.2.3 From 9a223332f5df3d97765701a2c8a751526700a6cd Mon Sep 17 00:00:00 2001 From: Koo Youngmin Date: Wed, 22 Jul 2015 08:21:58 +0200 Subject: Translated using Weblate (Korean) Currently translated at 81.6% (2481 of 3038 strings) [CI skip] --- po/ko.po | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/po/ko.po b/po/ko.po index 2e46b0e763..7d1ed2544a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.12-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-08 15:27+0200\n" -"PO-Revision-Date: 2015-03-30 03:04+0200\n" -"Last-Translator: Kyeong Su Shin \n" -"Language-Team: Korean \n" +"PO-Revision-Date: 2015-07-22 08:21+0200\n" +"Last-Translator: Koo Youngmin \n" +"Language-Team: Korean " +"\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.3-dev\n" +"X-Generator: Weblate 2.4-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -671,16 +671,14 @@ msgid "Import has been successfully finished, %d queries executed." msgstr "가져오기를 성공적으로 마쳤습니다. %d 쿼리가 실행되었습니다." #: import.php:665 -#, fuzzy, php-format +#, php-format #| msgid "" #| "Script timeout passed, if you want to finish import, please resubmit same " #| "file and import will resume." msgid "" "Script timeout passed, if you want to finish import, please %sresubmit the " "same file%s and import will resume." -msgstr "" -"스크립트 타임아웃이 통보되었습니다. 가져오기를 이어서 계속 완료시키려면 같은 " -"파일을 다시 전송해주십시오." +msgstr "스크립트 시간 제한이 초과되었습니다. 이어서 하시려면 같은 파일을 다시 전송해 주세요 (%s, %s)." #: import.php:675 msgid "" @@ -692,7 +690,7 @@ msgstr "" #: import_status.php:103 msgid "Could not load the progress of the import." -msgstr "" +msgstr "가져오기에 필요한 절차를 로드할 수 없습니다." #: import_status.php:112 js/messages.php:340 libraries/Util.class.php:735 #: libraries/export.lib.php:464 @@ -819,7 +817,6 @@ msgid "List of changes" msgstr "변경 목록" #: index.php:447 -#, fuzzy #| msgid "" #| "Your configuration file contains settings (root with no password) that " #| "correspond to the default MySQL privileged account. Your MySQL server is " @@ -831,9 +828,8 @@ msgid "" "default, is open to intrusion, and you really should fix this security hole " "by setting a password for user 'root'." msgstr "" -"환경설정파일에 MySQL 관리자 암호가 없습니다. 이같은 기본설정상태로 MySQL 서버" -"가 작동한다면 누구나 침입할 수 있으므로, 'root'유저에 암호를 설정하여 이 보" -"안 취약점을 수정하시기 바랍니다." +"비밀번호 없이 MySQL의 최고 권한을 가지고 있는 root 유저로 로그인했습니다. MySQL 서버는 외부의 해킹에 대해 취약한 기본 " +"설정으로 돌아가고 있으며, 설정에서 root 유저의 비밀번호를 설정하는 것으로 이 취약점을 최대한 빨리 고쳐야 합니다." #: index.php:464 msgid "" -- cgit v1.2.3 From 0905415894bebdebcfdea5dc2e99f1c78bc02722 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 22 Jul 2015 11:55:07 +0530 Subject: ChangeLog entry for https://github.com/phpmyadmin/phpmyadmin/pull/1809 Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 9e5a96f41d..499088e6aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.4.13.0 (not yet released) - issue #1808 "Improve table structure" generates invalid SQL +- bug Once checked "Show only active" checkbox is always checked 4.4.12.0 (2015-07-20) - bug Saved chart image does not have a proper name or an extension -- cgit v1.2.3 From 676cfcefba7521ab8de2dbfe9fca550769202a6a Mon Sep 17 00:00:00 2001 From: Koo Youngmin Date: Wed, 22 Jul 2015 08:22:01 +0200 Subject: Translated using Weblate (Korean) Currently translated at 77.4% (2448 of 3161 strings) [CI skip] --- po/ko.po | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/po/ko.po b/po/ko.po index 3fa8f77f58..535033cc7e 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-20 06:34-0400\n" -"PO-Revision-Date: 2015-03-30 03:03+0200\n" -"Last-Translator: Kyeong Su Shin \n" -"Language-Team: Korean \n" +"PO-Revision-Date: 2015-07-22 08:21+0200\n" +"Last-Translator: Koo Youngmin \n" +"Language-Team: Korean " +"\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.3-dev\n" +"X-Generator: Weblate 2.4-dev\n" #: changelog.php:37 license.php:28 #, php-format @@ -678,16 +678,14 @@ msgid "Import has been successfully finished, %d queries executed." msgstr "가져오기를 성공적으로 마쳤습니다. %d 쿼리가 실행되었습니다." #: import.php:692 -#, fuzzy, php-format +#, php-format #| msgid "" #| "Script timeout passed, if you want to finish import, please resubmit same " #| "file and import will resume." msgid "" "Script timeout passed, if you want to finish import, please %sresubmit the " "same file%s and import will resume." -msgstr "" -"스크립트 타임아웃이 통보되었습니다. 가져오기를 이어서 계속 완료시키려면 같은 " -"파일을 다시 전송해주십시오." +msgstr "스크립트 시간 제한이 초과되었습니다. 이어서 하시려면 같은 파일을 다시 전송해 주세요 (%s, %s)." #: import.php:702 msgid "" @@ -699,7 +697,7 @@ msgstr "" #: import_status.php:103 msgid "Could not load the progress of the import." -msgstr "" +msgstr "가져오기에 필요한 절차를 로드할 수 없습니다." #: import_status.php:112 js/messages.php:378 libraries/Util.class.php:776 #: libraries/export.lib.php:515 @@ -826,7 +824,6 @@ msgid "List of changes" msgstr "변경 목록" #: index.php:451 -#, fuzzy #| msgid "" #| "Your configuration file contains settings (root with no password) that " #| "correspond to the default MySQL privileged account. Your MySQL server is " @@ -838,9 +835,8 @@ msgid "" "default, is open to intrusion, and you really should fix this security hole " "by setting a password for user 'root'." msgstr "" -"환경설정파일에 MySQL 관리자 암호가 없습니다. 이같은 기본설정상태로 MySQL 서버" -"가 작동한다면 누구나 침입할 수 있으므로, 'root'유저에 암호를 설정하여 이 보" -"안 취약점을 수정하시기 바랍니다." +"비밀번호 없이 MySQL의 최고 권한을 가지고 있는 root 유저로 로그인했습니다. MySQL 서버는 외부의 해킹에 대해 취약한 기본 " +"설정으로 돌아가고 있으며, 설정에서 root 유저의 비밀번호를 설정하는 것으로 이 취약점을 최대한 빨리 고쳐야 합니다." #: index.php:468 msgid "" -- cgit v1.2.3