From 85e5a3b5cebf5a7479779297bfcb50294f3f8725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 11 Jun 2013 14:58:02 +0200 Subject: [PATCH 1/3] bug #3645 Better handling of invalid ODS documents --- ChangeLog | 1 + libraries/plugins/import/ImportOds.class.php | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ca574a3f0..3910837559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ not set - bug #3964 Import using https does not work - bug Missing removeCRLF option in ExportCsv and ExportExcel plugins - bug #3631 Drop not working Visio schema export. +- bug #3645 Better handling of invalid ODS documents 4.0.3.0 (2013-06-05) - bug #3941 Recent tables list always empty diff --git a/libraries/plugins/import/ImportOds.class.php b/libraries/plugins/import/ImportOds.class.php index 3a85f733b1..5a681e97af 100644 --- a/libraries/plugins/import/ImportOds.class.php +++ b/libraries/plugins/import/ImportOds.class.php @@ -175,8 +175,16 @@ class ImportOds extends ImportPlugin ); $error = true; } else { - $sheets = $xml->children('office', true)->{'body'}->{'spreadsheet'} - ->children('table', true); + $root = $xml->children('office', true)->{'body'}->{'spreadsheet'}; + if (empty($root)) { + $sheets = array(); + $message = PMA_Message::error( + __('Could not parse OpenDocument Spreasheet!') + ); + $error = true; + } else { + $sheets = $root->children('table', true); + } } $tables = array(); From 31f7230fa7ac939068929e737947e69012554c5f Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 11 Jun 2013 14:56:08 +0200 Subject: [PATCH 2/3] Translated using Weblate (Sinhala) Currently translated at 81.7% (2127 of 2603) --- po/si.po | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/po/si.po b/po/si.po index 8a94722c3e..56c04b6aaa 100644 --- a/po/si.po +++ b/po/si.po @@ -4,16 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-06-03 09:16-0400\n" -"PO-Revision-Date: 2013-01-20 17:30+0200\n" +"PO-Revision-Date: 2013-06-11 14:56+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" -"Language: si\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.4-dev\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 1.6-dev\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:344 #: libraries/DisplayResults.class.php:809 @@ -6060,10 +6059,9 @@ msgstr "LOAD DATA භාවිතයෙන් CSV" #: libraries/config/setup.forms.php:255 libraries/config/setup.forms.php:348 #: libraries/config/user_preferences.forms.php:160 #: libraries/config/user_preferences.forms.php:252 -#, fuzzy #| msgid "Open Document Spreadsheet" msgid "OpenDocument Spreadsheet" -msgstr "Open Document පැතුරුම්පත" +msgstr "OpenDocument පැතුරුම්පත" #: libraries/config/setup.forms.php:262 #: libraries/config/user_preferences.forms.php:167 @@ -6092,10 +6090,9 @@ msgstr "මයික්‍රොසොෆ්ට් වර්ඩ් 2000" #: libraries/config/setup.forms.php:352 #: libraries/config/user_preferences.forms.php:256 -#, fuzzy #| msgid "Open Document Text" msgid "OpenDocument Text" -msgstr "Open Document පෙළ" +msgstr "OpenDocument පෙළ" #: libraries/config/validate.lib.php:214 msgid "Could not initialize Drizzle connection library" @@ -9536,7 +9533,6 @@ msgid "After %s" msgstr "%s ට පසු" #: libraries/structure.lib.php:1670 -#, fuzzy #| msgid "Row Statistics" msgid "Row statistics" msgstr "පේළි සංඛ්‍ය ලේඛන" From 7d4a8fa3d21ea33595ae31fa5eb9ca809e37caf7 Mon Sep 17 00:00:00 2001 From: Peter Rosa Date: Tue, 11 Jun 2013 14:58:13 +0200 Subject: [PATCH 3/3] Translated using Weblate (Slovak) Currently translated at 78.3% (2038 of 2603) --- po/sk.po | 118 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 89 insertions(+), 29 deletions(-) diff --git a/po/sk.po b/po/sk.po index 6b698297eb..7aac55e954 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-06-03 09:16-0400\n" -"PO-Revision-Date: 2013-06-11 13:30+0200\n" +"PO-Revision-Date: 2013-06-11 14:58+0200\n" "Last-Translator: Peter Rosa \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -3168,6 +3168,8 @@ msgid "" "after you refresh this page. Please check if the table structure has been " "changed." msgstr "" +"Nepodarilo sa uložiť nastavenie \"%s\". Po obnovení stránky sa zmeny stratia. " +"Skontrolujte, či sa zmenila štruktúra tabuľky." #: libraries/TableSearch.class.php:179 libraries/insert_edit.lib.php:209 #: libraries/insert_edit.lib.php:215 libraries/rte/rte_routines.lib.php:1579 @@ -3214,7 +3216,7 @@ msgstr "Zobraziť zoradené:" #: libraries/TableSearch.class.php:839 msgid "Use this column to label each point" -msgstr "" +msgstr "Tento stĺpec sa použije na označenie každého bodu" #: libraries/TableSearch.class.php:860 msgid "Maximum rows to plot" @@ -3241,7 +3243,7 @@ msgstr "Vykonať \"dopyt podľa príkladu\" (nahradzujúci znak: \"%\")" #: libraries/TableSearch.class.php:1169 msgid "Browse/Edit the points" -msgstr "" +msgstr "Prezerať/Upraviť body" #: libraries/TableSearch.class.php:1176 msgid "How to use" @@ -3287,42 +3289,56 @@ msgstr "Vzhľad" msgid "" "A 1-byte integer, signed range is -128 to 127, unsigned range is 0 to 255" msgstr "" +"1-bytové celé číslo, rozsah: so znamienkom -128 až 127, bez znamienka 0 až " +"255" #: libraries/Types.class.php:298 msgid "" "A 2-byte integer, signed range is -32,768 to 32,767, unsigned range is 0 to " "65,535" msgstr "" +"2-bytové celé číslo, rozsah: so znamienkom -32 768 až 32 767, bez znamienka " +"0 až 65,535" #: libraries/Types.class.php:300 msgid "" "A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is " "0 to 16,777,215" msgstr "" +"3-bytové celé číslo, rozsah: so znamienkom -8 388 608 až 8 388 607, bez " +"znamienka 0 až 16 777 215" #: libraries/Types.class.php:302 msgid "" "A 4-byte integer, signed range is -2,147,483,648 to 2,147,483,647, unsigned " "range is 0 to 4,294,967,295." msgstr "" +"4-bytové celé číslo, rozsah: so znamienkom -2 147 483 648 až 2 147 483 647, " +"bez znamienka 0 až 4 294 967 295." #: libraries/Types.class.php:304 msgid "" "An 8-byte integer, signed range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615" msgstr "" +"8-bytové celé číslo, rozsah: so znamienkom -9 223 372 036 854 775 808 až 9 " +"223 372 036 854 775 807, bez znamienka 0 až 18 446 744 073 709 551 615" #: libraries/Types.class.php:306 libraries/Types.class.php:712 msgid "" "A fixed-point number (M, D) - the maximum number of digits (M) is 65 " "(default 10), the maximum number of decimals (D) is 30 (default 0)" msgstr "" +"Číslo s pevnou čiarkou (M, D) - maximálny počet číslic (M) je 65 (predvolené " +"10), maximálny počet desatinných miest (D) 30 (predvolené 0)" #: libraries/Types.class.php:308 msgid "" "A small floating-point number, allowable values are -3.402823466E+38 to -" "1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38" msgstr "" +"Číslo s plávajúcou desatinnou čiarkou, rozsahy: od -3,402823466E+38 do " +"-1,175494351E-38; 0; od 1,175494351E-38 do 3,402823466E+38" #: libraries/Types.class.php:310 msgid "" @@ -3330,28 +3346,36 @@ msgid "" "1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and " "2.2250738585072014E-308 to 1.7976931348623157E+308" msgstr "" +"Číslo s dvojitou presnosťou a plávajúcou desatinnou čiarkou, rozsah: od " +"-1,7976931348623157E+308 do -2,2250738585072014E-308; 0; od " +"2,2250738585072014E-308 do 1,7976931348623157E+308" #: libraries/Types.class.php:312 msgid "" "Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for " "FLOAT)" msgstr "" +"Synonymum pre DOUBLE (výnimka: v SQL režime REAL_AS_FLOAT je to synonymum " +"pre FLOAT)" #: libraries/Types.class.php:314 msgid "" "A bit-field type (M), storing M of bits per value (default is 1, maximum is " "64)" msgstr "" +"Pole bitov (M), ukladá M bitov pre každú hodnotu (predvolené 1, maximum 64)" #: libraries/Types.class.php:316 msgid "" "A synonym for TINYINT(1), a value of zero is considered false, nonzero " "values are considered true" msgstr "" +"Synonymum pre TINYINT(1), hodnota 0 znamená NEPRAVDA, nenulové hodnoty " +"znamenajú PRAVDA" #: libraries/Types.class.php:318 msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "" +msgstr "Alias pre BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" #: libraries/Types.class.php:320 libraries/Types.class.php:722 #, php-format @@ -3361,13 +3385,15 @@ msgstr "Dátum, podporovaný rozsah je od %1$s do %2$s" #: libraries/Types.class.php:322 libraries/Types.class.php:724 #, php-format msgid "A date and time combination, supported range is %1$s to %2$s" -msgstr "" +msgstr "Dátum a čas, podporovaný rozsah je od %1$s do %2$s" #: libraries/Types.class.php:324 msgid "" "A timestamp, range is 1970-01-01 00:00:01 UTC to 2038-01-09 03:14:07 UTC, " "stored as the number of seconds since the epoch (1970-01-01 00:00:00 UTC)" msgstr "" +"Časová značka, rozsah od 1.1.1970 00:00:01 UTC do 1.9.2038 03:14:07 UTC, " +"ukladá sa ako počet sekúnd od počiatku (1.1.1970 00:00:00 UTC)" #: libraries/Types.class.php:326 libraries/Types.class.php:728 #, php-format @@ -3379,12 +3405,16 @@ msgid "" "A year in four-digit (4, default) or two-digit (2) format, the allowable " "values are 70 (1970) to 69 (2069) or 1901 to 2155 and 0000" msgstr "" +"Rok v 4-číslicovom formáte (predvolené 4) alebo 2-číslicovom formáte (2), " +"povolené hodnoty od 70 (1970) do 69 (2069) alebo 1901 až 2155 a 0000" #: libraries/Types.class.php:330 msgid "" "A fixed-length (0-255, default 1) string that is always right-padded with " "spaces to the specified length when stored" msgstr "" +"Text s pevnou dĺžkou (0-255, predvolené 1), zarovnaný sprava s medzerami na " +"začiatku" #: libraries/Types.class.php:332 libraries/Types.class.php:730 #, php-format @@ -3392,24 +3422,32 @@ msgid "" "A variable-length (%s) string, the effective maximum length is subject to " "the maximum row size" msgstr "" +"Text s premenlivou dĺžkou (%s), skutočná maximálna dĺžka súvisí s maximálnou " +"dĺžkou riadku" #: libraries/Types.class.php:334 msgid "" "A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with " "a one-byte prefix indicating the length of the value in bytes" msgstr "" +"Stĺpec typu TEXT, maximálna dĺžka 255 (2^8 - 1) znakov, ukladá sa s " +"1-bytovým prefixom, ktorý obsahuje dĺžku textu v bytoch" #: libraries/Types.class.php:336 libraries/Types.class.php:732 msgid "" "A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored " "with a two-byte prefix indicating the length of the value in bytes" msgstr "" +"Stĺpec typu TEXT, maximálna dĺžka 65 535 (2^16 - 1) znakov, ukladá sa s " +"2-bytovým prefixom, ktorý obsahuje dĺžku textu v bytoch" #: libraries/Types.class.php:338 msgid "" "A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, " "stored with a three-byte prefix indicating the length of the value in bytes" msgstr "" +"Stĺpec typu TEXT, maximálna dĺžka 16 777 215 (2^24 - 1) znakov, ukladá sa s " +"3-bytovým prefixom, ktorý obsahuje dĺžku textu v bytoch" #: libraries/Types.class.php:340 msgid "" @@ -3417,64 +3455,77 @@ msgid "" "characters, stored with a four-byte prefix indicating the length of the " "value in bytes" msgstr "" +"Stĺpec typu TEXT, maximálna dĺžka 4 294 967 295 or 4 GB (2^32 - 1) znakov, " +"ukladá sa s 4-bytovým prefixom, ktorý obsahuje dĺžku textu v bytoch" #: libraries/Types.class.php:342 msgid "" "Similar to the CHAR type, but stores binary byte strings rather than non-" "binary character strings" -msgstr "" +msgstr "Podobné typu CHAR, ale ukladá binárne bajty namiesto nebinárnych znakov" #: libraries/Types.class.php:344 msgid "" "Similar to the VARCHAR type, but stores binary byte strings rather than non-" "binary character strings" msgstr "" +"Podobné typu VARCHAR, ale ukladá binárne bajty namiesto nebinárnych znakov" #: libraries/Types.class.php:346 msgid "" "A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a " "one-byte prefix indicating the length of the value" msgstr "" +"Stĺpec BLOB, maximálna dĺžka 255 (2^8 - 1) bytov, ukladá sa sa 1-bytovým " +"prefixom, ktorý obsahuje dĺžku hodnoty" #: libraries/Types.class.php:348 msgid "" "A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored " "with a three-byte prefix indicating the length of the value" msgstr "" +"Stĺpec BLOB, maximálna dĺžka 16 777 (2^24 - 1) bytov, ukladá sa sa 3-bytovým " +"prefixom, ktorý obsahuje dĺžku hodnoty" #: libraries/Types.class.php:350 libraries/Types.class.php:736 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a two-byte prefix indicating the length of the value" msgstr "" +"Stĺpec BLOB, maximálna dĺžka 65 535 (2^16 - 1) bytov, ukladá sa sa 2-bytovým " +"prefixom, ktorý obsahuje dĺžku hodnoty" #: libraries/Types.class.php:352 msgid "" "A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " "bytes, stored with a four-byte prefix indicating the length of the value" msgstr "" +"Stĺpec BLOB, maximálna dĺžka 4 294 967 295 alebo 4 GB (2^32 - 1) bytov, " +"ukladá sa sa 4-bytovým prefixom, ktorý obsahuje dĺžku hodnoty" #: libraries/Types.class.php:354 msgid "" "An enumeration, chosen from the list of up to 65,535 values or the special " "'' error value" msgstr "" +"Vymenovanie hodnôt vybratých zo zoznamu dlhého až 65 535 hodnôt alebo " +"špeciálna chybová hodnota ''" #: libraries/Types.class.php:356 msgid "A single value chosen from a set of up to 64 members" -msgstr "" +msgstr "Jediná hodnota vybratá z množiny max. 64 členov" #: libraries/Types.class.php:358 msgid "A type that can store a geometry of any type" -msgstr "" +msgstr "Tento typ ukladá geometriu akéhokoľvek druhu" #: libraries/Types.class.php:360 msgid "A point in 2-dimensional space" -msgstr "" +msgstr "Bod vo dvojrozmernom priestore" #: libraries/Types.class.php:362 msgid "A curve with linear interpolation between points" -msgstr "" +msgstr "Krivka s lineárnou interpoláciou medzi bodmi" #: libraries/Types.class.php:364 msgid "A polygon" @@ -3482,24 +3533,24 @@ msgstr "Polygón" #: libraries/Types.class.php:366 msgid "A collection of points" -msgstr "" +msgstr "Množina bodov" #: libraries/Types.class.php:368 msgid "A collection of curves with linear interpolation between points" -msgstr "" +msgstr "Množina kriviek s lineárnou interpoláciou medzi bodmi" #: libraries/Types.class.php:370 msgid "A collection of polygons" -msgstr "" +msgstr "Množina polygónov" #: libraries/Types.class.php:372 msgid "A collection of geometry objects of any type" -msgstr "" +msgstr "Množina geometrických objektov akéhokoľvek typu" #: libraries/Types.class.php:624 libraries/Types.class.php:974 msgctxt "numeric types" msgid "Numeric" -msgstr "" +msgstr "Číslo" #: libraries/Types.class.php:643 libraries/Types.class.php:977 msgctxt "date and time types" @@ -3512,53 +3563,60 @@ msgid "String" msgstr "Reťazec" #: libraries/Types.class.php:673 -#, fuzzy #| msgid "Total" msgctxt "spatial types" msgid "Spatial" -msgstr "Celkom" +msgstr "Priestorový objekt" #: libraries/Types.class.php:708 msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647" -msgstr "" +msgstr "4-bytové celé číslo, rozsah od -2 147 483 648 do 2 147 483 647" #: libraries/Types.class.php:710 msgid "" "An 8-byte integer, range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807" msgstr "" +"8-bytové celé číslo, rozsah od -9 223 372 036 854 775 808 do 9 223 372 036 " +"854 775 807" #: libraries/Types.class.php:714 msgid "A system's default double-precision floating-point number" msgstr "" +"Číslo s dvojitou presnosťou a plávajúcou desatinnou čiarkou predvolené " +"systémom" #: libraries/Types.class.php:716 msgid "True or false" -msgstr "" +msgstr "Pravda alebo nepravda" #: libraries/Types.class.php:718 msgid "An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "" +msgstr "Alias pre BIGINT NOT NULL AUTO_INCREMENT UNIQUE" #: libraries/Types.class.php:720 msgid "Stores a Universally Unique Identifier (UUID)" -msgstr "" +msgstr "Ukladá Univerzálny jedinečný identifikátor (UUID)" #: libraries/Types.class.php:726 msgid "" "A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' " "UTC; TIMESTAMP(6) can store microseconds" msgstr "" +"Časová značka, rozsah od '1.1.0001 00:00:00' UTC do '31.12.9999 23:59:59' " +"UTC; TIMESTAMP(6) môže ukladať mikrosekundy" #: libraries/Types.class.php:734 msgid "" "A variable-length (0-65,535) string, uses binary collation for all " "comparisons" msgstr "" +"Text s premenlivou dĺžkou (0-65 535), používa binárne zotriedenie pre všetky " +"porovnávania" #: libraries/Types.class.php:738 msgid "An enumeration, chosen from the list of defined values" -msgstr "" +msgstr "Vymenovanie hodnôt vybratých zo zoznamu definovaných hodnôt" #: libraries/Util.class.php:226 #, php-format @@ -3781,11 +3839,11 @@ msgstr "Mali by ste aktualizovať %s na verziu %s alebo vyššiu." #: libraries/common.inc.php:1058 msgid "Error: Token mismatch" -msgstr "" +msgstr "Chyba: Nesprávny token" #: libraries/common.inc.php:1102 msgid "GLOBALS overwrite attempt" -msgstr "" +msgstr "Pokus o prepísanie GLOBALS" #: libraries/common.inc.php:1109 msgid "possible exploit" @@ -3814,11 +3872,11 @@ msgstr "Vpravo" #: libraries/config.values.php:69 msgid "Click" -msgstr "" +msgstr "Klik" #: libraries/config.values.php:70 msgid "Double click" -msgstr "" +msgstr "Dvojklik" #: libraries/config.values.php:71 libraries/config.values.php:102 #: libraries/config/FormDisplay.tpl.php:223 libraries/relation.lib.php:98 @@ -4006,9 +4064,8 @@ msgstr "" "cookie[/kbd]" #: libraries/config/messages.inc.php:21 -#, fuzzy msgid "Blowfish secret" -msgstr "Blowfish secret" +msgstr "Šifrovacia fráza Blowfish" #: libraries/config/messages.inc.php:22 msgid "Highlight selected rows" @@ -4057,10 +4114,13 @@ msgid "" "Use user-friendly editor for editing SQL queries ([a@http://codemirror.net/]" "CodeMirror[/a]) with syntax highlighting and line numbers" msgstr "" +"Použiť užívateľsky príjemný editor na úpravu SQL dozatazov " +"([a@http://codemirror.net/]CodeMirror[/a]) s číslovaním riadkov a " +"zvýrazňovaním syntaxe" #: libraries/config/messages.inc.php:31 msgid "Enable CodeMirror" -msgstr "" +msgstr "Povoliť CodeMirror" #: libraries/config/messages.inc.php:32 msgid ""