From 6cea5a5c522650384180486b2e130b307eae5df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Thu, 23 May 2013 12:38:17 +0200 Subject: [PATCH 01/10] Translated using Weblate (Estonian) Currently translated at 100.0% (2603 of 2603) --- po/et.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/et.po b/po/et.po index 9ce8f8637c..1b4b01de28 100644 --- a/po/et.po +++ b/po/et.po @@ -6,13 +6,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-23 02:54-0400\n" -"PO-Revision-Date: 2013-05-02 13:27+0200\n" +"PO-Revision-Date: 2013-05-23 12:38+0200\n" "Last-Translator: Kristjan Räts \n" "Language-Team: Estonian \n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: et\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.6-dev\n" @@ -6165,10 +6165,9 @@ msgstr "CSV kasutades LOAD DATA" #: 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 tabel" +msgstr "OpenDocument tabel" #: libraries/config/setup.forms.php:262 #: libraries/config/user_preferences.forms.php:167 @@ -6197,10 +6196,9 @@ msgstr "Microsoft Word 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 tekst" +msgstr "OpenDocument tekst" #: libraries/config/validate.lib.php:214 msgid "Could not initialize Drizzle connection library" From 1dbd513d777e13de3c05106a43626dfc672ca9db Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 23 May 2013 09:26:41 +0200 Subject: [PATCH 02/10] Translated using Weblate (Turkish) Currently translated at 100.0% (2603 of 2603) --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 73ce08210c..1d42c6945c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-23 02:54-0400\n" -"PO-Revision-Date: 2013-05-23 09:13+0200\n" +"PO-Revision-Date: 2013-05-23 09:26+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish \n" "Language: tr\n" @@ -6223,7 +6223,7 @@ msgstr "VERİ YÜKLE kullanarak CSV" #: libraries/config/user_preferences.forms.php:252 #| msgid "Open Document Spreadsheet" msgid "OpenDocument Spreadsheet" -msgstr "OpenDocument Tablolama Belgesi" +msgstr "OpenDocument Hesap Tablosu" #: libraries/config/setup.forms.php:262 #: libraries/config/user_preferences.forms.php:167 From 01670b4761cd98ddb725bafacbd096a68207a814 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Thu, 23 May 2013 14:52:42 +0200 Subject: [PATCH 03/10] Translated using Weblate (Greek) Currently translated at 100.0% (2603 of 2603) --- po/el.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/el.po b/po/el.po index 8fab85c115..0a576786f7 100644 --- a/po/el.po +++ b/po/el.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-23 02:54-0400\n" -"PO-Revision-Date: 2013-05-03 16:34+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2013-05-23 14:52+0200\n" +"Last-Translator: Panagiotis Papazoglou \n" "Language-Team: Greek \n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.6-dev\n" @@ -6266,7 +6266,6 @@ msgstr "CSV με χρήση LOAD DATA" #: 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 "Έγγραφο Λογιστικού Φύλλου Ανοιχτού Κώδικα - ODS" @@ -6298,7 +6297,6 @@ msgstr "Έγγραφο Microsoft Word 2000" #: libraries/config/setup.forms.php:352 #: libraries/config/user_preferences.forms.php:256 -#, fuzzy #| msgid "Open Document Text" msgid "OpenDocument Text" msgstr "Έγγραφο Κειμένου Ανοιχτού Κώδικα - ODΤ" From c88762e3860abd94c41ad609e6b05c1976dea94a Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Thu, 23 May 2013 23:54:29 +0530 Subject: [PATCH 04/10] Include profiling scripts initially, bug#3639 in QA_4_0 --- libraries/common.inc.php | 17 ++++++++++++++++- sql.php | 13 ------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 5e0976827d..bbea065bd6 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1030,12 +1030,27 @@ if (! defined('PMA_MINIMUM_COMMON')) { // the checkbox was unchecked unset($_SESSION['profiling']); } + /** + * Inclusion of profiling scripts is needed on various + * pages like sql, tbl_sql, db_sql, tbl_select + */ + $response = PMA_Response::getInstance(); + if (isset($_SESSION['profiling'])) { + $header = $response->getHeader(); + $scripts = $header->getScripts(); + /* < IE 9 doesn't support canvas natively */ + if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) { + $scripts->addFile('canvg/flashcanvas.js'); + } + $scripts->addFile('jqplot/jquery.jqplot.js'); + $scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js'); + $scripts->addFile('canvg/canvg.js'); + } /* * There is no point in even attempting to process * an ajax request if there is a token mismatch */ - $response = PMA_Response::getInstance(); if ($response->isAjax() && $token_mismatch) { $response->isSuccess(false); $response->addJSON( diff --git a/sql.php b/sql.php index ab7c4d8207..35d2c67618 100644 --- a/sql.php +++ b/sql.php @@ -67,19 +67,6 @@ if (isset($_REQUEST['printview'])) { $GLOBALS['printview'] = $_REQUEST['printview']; } -if (isset($_SESSION['profiling'])) { - $response = PMA_Response::getInstance(); - $header = $response->getHeader(); - $scripts = $header->getScripts(); - /* < IE 9 doesn't support canvas natively */ - if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) { - $scripts->addFile('canvg/flashcanvas.js'); - } - $scripts->addFile('jqplot/jquery.jqplot.js'); - $scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js'); - $scripts->addFile('canvg/canvg.js'); -} - if (!isset($_SESSION['is_multi_query'])) { $_SESSION['is_multi_query'] = false; } From 99fb3cb401644f4ef9f278ff23912e06d5eeb40e Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Thu, 23 May 2013 15:16:15 +0200 Subject: [PATCH 05/10] Translated using Weblate (Dutch) Currently translated at 100.0% (2603 of 2603) --- po/nl.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/nl.po b/po/nl.po index f81ae9d3a3..0ba6462cd2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-23 02:54-0400\n" -"PO-Revision-Date: 2013-05-03 11:39+0200\n" +"PO-Revision-Date: 2013-05-23 15:16+0200\n" "Last-Translator: Dieter Adriaenssens \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" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.6-dev\n" @@ -6253,10 +6253,9 @@ msgstr "CSV met behulp van LOAD DATA" #: 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-rekenblad" +msgstr "OpenDocument-rekenblad" #: libraries/config/setup.forms.php:262 #: libraries/config/user_preferences.forms.php:167 @@ -6285,10 +6284,9 @@ msgstr "Microsoft Word 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 Tekst" +msgstr "OpenDocument Tekst" #: libraries/config/validate.lib.php:214 msgid "Could not initialize Drizzle connection library" From 6604b5b5e154f6b89c6e67aeff24eea51aeac033 Mon Sep 17 00:00:00 2001 From: Yungu Kim Date: Thu, 23 May 2013 17:03:53 +0200 Subject: [PATCH 06/10] Translated using Weblate (Korean) Currently translated at 65.1% (1695 of 2603) --- po/ko.po | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/po/ko.po b/po/ko.po index 6b6f05133e..a35236cad6 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-23 02:54-0400\n" -"PO-Revision-Date: 2013-05-17 07:41+0200\n" +"PO-Revision-Date: 2013-05-23 17:03+0200\n" "Last-Translator: Yungu Kim \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" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 1.6-dev\n" @@ -5466,24 +5466,24 @@ msgstr "" #: libraries/config/messages.inc.php:407 msgid "Show only listed databases" -msgstr "" +msgstr "리스트에 있는 데이터베이스만 보여주기" #: libraries/config/messages.inc.php:408 libraries/config/messages.inc.php:449 msgid "Leave empty if not using config auth" -msgstr "" +msgstr "config 인증을 사용하지 않을 경우 비워두세요" #: libraries/config/messages.inc.php:409 msgid "Password for config auth" -msgstr "" +msgstr "config 인증용 패스워드" #: libraries/config/messages.inc.php:410 msgid "" "Leave blank for no PDF schema support, suggested: [kbd]pma__pdf_pages[/kbd]" -msgstr "" +msgstr "PDF 스키마를 제공하지 않을 경우 비워두세요. 제안값: [kbd]pma__pdf_pages[/kbd]" #: libraries/config/messages.inc.php:411 msgid "PDF schema: pages table" -msgstr "" +msgstr "PDF 스키마: 페이지 테이블" #: libraries/config/messages.inc.php:412 msgid "" @@ -5491,6 +5491,9 @@ msgid "" "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for " "no support. Suggested: [kbd]phpmyadmin[/kbd]" msgstr "" +"관계(릴레이션), 북마크, PDF 기능을 위한 데이터베이스. 자세한 정보는 " +"[a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a]를 참고하세요. 이 기능들을 제공하지 않으려면 " +"비워두세요. 권장값: [kbd]phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:413 msgid "Database name" @@ -5498,7 +5501,7 @@ msgstr "데이터베이스명" #: libraries/config/messages.inc.php:414 msgid "Port on which MySQL server is listening, leave empty for default" -msgstr "" +msgstr "MySQL 서버의 네트워크 포트. 기본값을 쓰려면 비워두세요" #: libraries/config/messages.inc.php:415 msgid "Server port" @@ -11499,52 +11502,47 @@ msgstr "표시할 데이터 없음" #: tbl_chart.php:62 tbl_gis_visualization.php:24 msgid "No SQL query was set to fetch data." -msgstr "" +msgstr "데이터를 가져오기 위한 SQL 쿼리가 없습니다." #: tbl_chart.php:124 msgid "No numeric columns present in the table to plot." -msgstr "" +msgstr "테이블에 숫자형 컬럼이 없어 표시할 수 없습니다." #: tbl_chart.php:154 -#, fuzzy #| msgid "Mar" msgctxt "Chart type" msgid "Bar" -msgstr "3월" +msgstr "가로 막대" #: tbl_chart.php:156 -#, fuzzy #| msgid "Column" msgctxt "Chart type" msgid "Column" -msgstr "컬럼명" +msgstr "세로 막대" #: tbl_chart.php:159 -#, fuzzy #| msgid "Line" msgctxt "Chart type" msgid "Line" -msgstr "줄" +msgstr "선형" #: tbl_chart.php:161 -#, fuzzy #| msgctxt "Inline edit query" #| msgid "Inline" msgctxt "Chart type" msgid "Spline" -msgstr "인라인" +msgstr "곡선형" #: tbl_chart.php:163 msgctxt "Chart type" msgid "Area" -msgstr "" +msgstr "영역" #: tbl_chart.php:166 -#, fuzzy #| msgid "PiB" msgctxt "Chart type" msgid "Pie" -msgstr "PB" +msgstr "원형" #: tbl_chart.php:170 msgctxt "Chart type" @@ -11553,7 +11551,7 @@ msgstr "타임라인" #: tbl_chart.php:177 msgid "Stacked" -msgstr "" +msgstr "누적" #: tbl_chart.php:180 msgid "Chart title" @@ -11561,16 +11559,15 @@ msgstr "차트 제목" #: tbl_chart.php:184 msgid "X-Axis:" -msgstr "" +msgstr "X축:" #: tbl_chart.php:200 -#, fuzzy msgid "Series:" -msgstr "SQL 질의" +msgstr "시리즈:" #: tbl_chart.php:229 msgid "X-Axis label:" -msgstr "" +msgstr "X축 레이블:" #: tbl_chart.php:232 msgid "X Values" From e1b0aa0ff54c6f662a0909aff1803a792dea4f76 Mon Sep 17 00:00:00 2001 From: Rodrigo Souza Date: Thu, 23 May 2013 17:25:13 +0200 Subject: [PATCH 07/10] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2603 of 2603) --- po/pt_BR.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a344e9bf10..be1c4b9195 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-23 02:54-0400\n" -"PO-Revision-Date: 2013-05-07 15:07+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2013-05-23 17:25+0200\n" +"Last-Translator: Rodrigo Souza \n" +"Language-Team: Portuguese (Brazil) " +"\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 1.6-dev\n" @@ -6250,10 +6250,9 @@ msgstr "CSV usando LOAD DATA" #: 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 "Planilha Open Document" +msgstr "Planilha Open-Document" #: libraries/config/setup.forms.php:262 #: libraries/config/user_preferences.forms.php:167 @@ -6282,10 +6281,9 @@ msgstr "Microsoft Word 2000" #: libraries/config/setup.forms.php:352 #: libraries/config/user_preferences.forms.php:256 -#, fuzzy #| msgid "Open Document Text" msgid "OpenDocument Text" -msgstr "Texto Open Document" +msgstr "Texto Open-Document" #: libraries/config/validate.lib.php:214 msgid "Could not initialize Drizzle connection library" From cf1f3479c52cd84965475da40349f5ee029e81bf Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Thu, 23 May 2013 17:14:43 +0200 Subject: [PATCH 08/10] Translated using Weblate (Swedish) Currently translated at 100.0% (2603 of 2603) --- po/sv.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/sv.po b/po/sv.po index 51296399b9..65d1550608 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-23 02:54-0400\n" -"PO-Revision-Date: 2013-05-04 00:58+0200\n" -"Last-Translator: ProUser \n" +"PO-Revision-Date: 2013-05-23 17:14+0200\n" +"Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.6-dev\n" @@ -6180,10 +6180,9 @@ msgstr "CSV med LOAD DATA" #: 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 "OpenDocument kalkylblad" +msgstr "OpenDocument-kalkylblad" #: libraries/config/setup.forms.php:262 #: libraries/config/user_preferences.forms.php:167 @@ -6212,10 +6211,9 @@ msgstr "Microsoft Word 2000" #: libraries/config/setup.forms.php:352 #: libraries/config/user_preferences.forms.php:256 -#, fuzzy #| msgid "Open Document Text" msgid "OpenDocument Text" -msgstr "OpenDocument text" +msgstr "OpenDocument-text" #: libraries/config/validate.lib.php:214 msgid "Could not initialize Drizzle connection library" From 71748b1f8c75e1d7821a86cb4161b1df1d30ef08 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 24 May 2013 05:28:58 -0400 Subject: [PATCH 09/10] bug #3942 Warnings about reserved word for many non reserved words --- ChangeLog | 1 + libraries/sqlparser.data.php | 284 +++-------------------------------- 2 files changed, 22 insertions(+), 263 deletions(-) diff --git a/ChangeLog b/ChangeLog index db76259abf..6c5d0ec1c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #3941 Recent tables list always empty - bug #3933 Do not translate "Open Document" in export settings - bug #3927 List of tables is missing after expanding in the navigation frame +- bug #3942 Warnings about reserved word for many non reserved words 4.0.2.0 (not yet released) - bug #3902 Cannot browse when table name contains keyword "call" diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 8aad5a1592..fab1177d88 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -675,196 +675,106 @@ $PMA_SQPdata_reserved_word = array ( ); /** - * words forbidden to be used as column or table name wihtout quotes - * as seen in http://dev.mysql.com/doc/mysql/en/reserved-words.html + * words forbidden to be used as column or table name without quotes + * as seen in http://dev.mysql.com/doc/refman/5.6/en/reserved-words.html * * @global array MySQL forbidden words */ $PMA_SQPdata_forbidden_word = array ( - 'ACCESSIBLE', // 5.1 - 'ACTION', + 'ACCESSIBLE', 'ADD', - 'AFTER', - 'AGAINST', - 'AGGREGATE', - 'ALGORITHM', 'ALL', 'ALTER', 'ANALYZE', 'AND', - 'ANY', 'AS', 'ASC', - 'ASCII', 'ASENSITIVE', - 'AUTO_INCREMENT', - 'AVG', - 'AVG_ROW_LENGTH', - 'BACKUP', - 'BDB', 'BEFORE', - 'BEGIN', - 'BERKELEYDB', 'BETWEEN', 'BIGINT', 'BINARY', - 'BINLOG', - 'BIT', 'BLOB', - 'BOOL', - 'BOOLEAN', 'BOTH', - 'BTREE', 'BY', - 'BYTE', - 'CACHE', 'CALL', 'CASCADE', - 'CASCADED', 'CASE', - 'CHAIN', 'CHANGE', - 'CHANGED', 'CHAR', 'CHARACTER', - 'CHARSET', 'CHECK', - 'CHECKSUM', - 'CIPHER', - 'CLOSE', 'COLLATE', - 'COLLATION', 'COLUMN', - 'COLUMNS', - 'COMMENT', - 'COMMIT', - 'COMMITTED', - 'COMPACT', - 'COMPRESSED', - 'CONCURRENT', 'CONDITION', - 'CONNECTION', - 'CONSISTENT', 'CONSTRAINT', - 'CONTAINS', 'CONTINUE', 'CONVERT', 'CREATE', 'CROSS', - 'CUBE', 'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER', 'CURSOR', - 'DATA', 'DATABASE', 'DATABASES', - 'DATE', - 'DATETIME', - 'DAY', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', - 'DEALLOCATE', 'DEC', 'DECIMAL', 'DECLARE', 'DEFAULT', - 'DEFINER', 'DELAYED', - 'DELAY_KEY_WRITE', 'DELETE', 'DESC', 'DESCRIBE', - 'DES_KEY_FILE', 'DETERMINISTIC', - 'DIRECTORY', - 'DISABLE', - 'DISCARD', 'DISTINCT', 'DISTINCTROW', 'DIV', - 'DO', 'DOUBLE', 'DROP', 'DUAL', - 'DUMPFILE', - 'DUPLICATE', - 'DYNAMIC', 'EACH', 'ELSE', 'ELSEIF', - 'ENABLE', 'ENCLOSED', - 'END', - 'ENGINE', - 'ENGINES', - 'ENUM', - 'ERRORS', - 'ESCAPE', 'ESCAPED', - 'EVENTS', - 'EXECUTE', 'EXISTS', 'EXIT', - 'EXPANSION', 'EXPLAIN', - 'EXTENDED', 'FALSE', - 'FAST', 'FETCH', - 'FIELDS', - 'FILE', - 'FIRST', - 'FIXED', 'FLOAT', 'FLOAT4', 'FLOAT8', - 'FLUSH', 'FOR', 'FORCE', 'FOREIGN', - 'FOUND', - 'FRAC_SECOND', 'FROM', - 'FULL', 'FULLTEXT', - 'FUNCTION', - 'GEOMETRY', - 'GEOMETRYCOLLECTION', - 'GET_FORMAT', - 'GLOBAL', - 'GOTO', + 'GENERAL', + 'GET', 'GRANT', - 'GRANTS', 'GROUP', - 'HANDLER', - 'HASH', 'HAVING', - 'HELP', 'HIGH_PRIORITY', - 'HOSTS', - 'HOUR', 'HOUR_MICROSECOND', 'HOUR_MINUTE', 'HOUR_SECOND', - 'IDENTIFIED', 'IF', 'IGNORE', - 'IMPORT', + 'IGNORE_SERVER_IDS', 'IN', 'INDEX', - 'INDEXES', 'INFILE', 'INNER', - 'INNOBASE', - 'INNODB', 'INOUT', 'INSENSITIVE', 'INSERT', - 'INSERT_METHOD', 'INT', 'INT1', 'INT2', @@ -874,102 +784,50 @@ $PMA_SQPdata_forbidden_word = array ( 'INTEGER', 'INTERVAL', 'INTO', - 'INVOKER', - 'IO_THREAD', + 'IO_AFTER_GTIDS', + 'IO_BEFORE_GTIDS', 'IS', - 'ISOLATION', - 'ISSUER', 'ITERATE', 'JOIN', 'KEY', 'KEYS', 'KILL', - 'LABEL', - 'LANGUAGE', - 'LAST', 'LEADING', 'LEAVE', - 'LEAVES', 'LEFT', 'LIKE', 'LIMIT', - 'LINEAR', // 5.1 + 'LINEAR', 'LINES', - 'LINESTRING', 'LOAD', - 'LOCAL', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCK', - 'LOCKS', - 'LOGS', 'LONG', 'LONGBLOB', 'LONGTEXT', 'LOOP', 'LOW_PRIORITY', - 'MASTER', - 'MASTER_CONNECT_RETRY', - 'MASTER_HOST', - 'MASTER_LOG_FILE', - 'MASTER_LOG_POS', - 'MASTER_PASSWORD', - 'MASTER_PORT', - 'MASTER_SERVER_ID', - 'MASTER_SSL', - 'MASTER_SSL_CA', - 'MASTER_SSL_CAPATH', - 'MASTER_SSL_CERT', - 'MASTER_SSL_CIPHER', - 'MASTER_SSL_KEY', - 'MASTER_USER', + 'MASTER_BIND', + 'MASTER_HEARTBEAT_PERIOD', + 'MASTER_SSL_VERIFY_SERVER_CERT', 'MATCH', - 'MAX_CONNECTIONS_PER_HOUR', - 'MAX_QUERIES_PER_HOUR', - 'MAX_ROWS', - 'MAX_UPDATES_PER_HOUR', - 'MAX_USER_CONNECTIONS', - 'MEDIUM', + 'MAXVALUE', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', - 'MERGE', - 'MICROSECOND', 'MIDDLEINT', - 'MIGRATE', - 'MINUTE', 'MINUTE_MICROSECOND', 'MINUTE_SECOND', - 'MIN_ROWS', 'MOD', - 'MODE', 'MODIFIES', - 'MODIFY', - 'MONTH', - 'MULTILINESTRING', - 'MULTIPOINT', - 'MULTIPOLYGON', - 'MUTEX', - 'NATIONAL', 'NATURAL', - 'NCHAR', - 'NDB', - 'NDBCLUSTER', - 'NEW', - 'NEXT', - 'NO', - 'NONE', 'NOT', 'NO_WRITE_TO_BINLOG', 'NULL', 'NUMERIC', - 'NVARCHAR', - 'OFFSET', - 'OLD_PASSWORD', 'ON', - 'ONE', 'ONE_SHOT', - 'OPEN', 'OPTIMIZE', 'OPTION', 'OPTIONALLY', @@ -978,187 +836,87 @@ $PMA_SQPdata_forbidden_word = array ( 'OUT', 'OUTER', 'OUTFILE', - 'PACK_KEYS', - 'PARTIAL', - 'PASSWORD', - 'PHASE', - 'POINT', - 'POLYGON', + 'PARTITION', 'PRECISION', - 'PREPARE', - 'PREV', 'PRIMARY', - 'PRIVILEGES', 'PROCEDURE', - 'PROCESSLIST', 'PURGE', - 'QUARTER', - 'QUERY', - 'QUICK', - 'RAID0', - 'RAID_CHUNKS', - 'RAID_CHUNKSIZE', - 'RAID_TYPE', - 'RANGE', // 5.1 + 'RANGE', 'READ', 'READS', - 'READ_ONLY', // 5.1 - 'READ_WRITE', // 5.1 + 'READ_WRITE', 'REAL', - 'RECOVER', - 'REDUNDANT', 'REFERENCES', 'REGEXP', - 'RELAY_LOG_FILE', - 'RELAY_LOG_POS', - 'RELAY_THREAD', 'RELEASE', - 'RELOAD', 'RENAME', - 'REPAIR', 'REPEAT', - 'REPEATABLE', 'REPLACE', - 'REPLICATION', 'REQUIRE', - 'RESET', - 'RESTORE', + 'RESIGNAL', 'RESTRICT', - 'RESUME', 'RETURN', - 'RETURNS', 'REVOKE', 'RIGHT', 'RLIKE', - 'ROLLBACK', - 'ROLLUP', - 'ROUTINE', - 'ROW', - 'ROWS', - 'ROW_FORMAT', - 'RTREE', - 'SAVEPOINT', 'SCHEMA', 'SCHEMAS', - 'SECOND', 'SECOND_MICROSECOND', - 'SECURITY', 'SELECT', 'SENSITIVE', 'SEPARATOR', - 'SERIAL', - 'SERIALIZABLE', - 'SESSION', 'SET', - 'SHARE', 'SHOW', - 'SHUTDOWN', - 'SIGNED', - 'SIMPLE', - 'SLAVE', + 'SIGNAL', + 'SLOW', 'SMALLINT', - 'SNAPSHOT', - 'SOME', - 'SONAME', - 'SOUNDS', 'SPATIAL', 'SPECIFIC', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', + 'SQL_AFTER_GTIDS', + 'SQL_BEFORE_GTIDS', 'SQL_BIG_RESULT', - 'SQL_BUFFER_RESULT', - 'SQL_CACHE', 'SQL_CALC_FOUND_ROWS', - 'SQL_NO_CACHE', 'SQL_SMALL_RESULT', - 'SQL_THREAD', - 'SQL_TSI_DAY', - 'SQL_TSI_FRAC_SECOND', - 'SQL_TSI_HOUR', - 'SQL_TSI_MINUTE', - 'SQL_TSI_MONTH', - 'SQL_TSI_QUARTER', - 'SQL_TSI_SECOND', - 'SQL_TSI_WEEK', - 'SQL_TSI_YEAR', 'SSL', - 'START', 'STARTING', - 'STATUS', - 'STOP', - 'STORAGE', 'STRAIGHT_JOIN', - 'STRING', - 'STRIPED', - 'SUBJECT', - 'SUPER', - 'SUSPEND', 'TABLE', - 'TABLES', - 'TABLESPACE', - 'TEMPORARY', - 'TEMPTABLE', 'TERMINATED', - 'TEXT', 'THEN', - 'TIME', - 'TIMESTAMP', - 'TIMESTAMPADD', - 'TIMESTAMPDIFF', 'TINYBLOB', 'TINYINT', 'TINYTEXT', 'TO', 'TRAILING', - 'TRANSACTION', 'TRIGGER', - 'TRIGGERS', 'TRUE', - 'TRUNCATE', - 'TYPE', - 'TYPES', - 'UNCOMMITTED', - 'UNDEFINED', 'UNDO', - 'UNICODE', 'UNION', 'UNIQUE', - 'UNKNOWN', 'UNLOCK', 'UNSIGNED', - 'UNTIL', 'UPDATE', 'USAGE', 'USE', - 'USER', - 'USER_RESOURCES', - 'USE_FRM', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP', - 'VALUE', 'VALUES', 'VARBINARY', 'VARCHAR', 'VARCHARACTER', - 'VARIABLES', 'VARYING', - 'VIEW', - 'WARNINGS', - 'WEEK', 'WHEN', 'WHERE', 'WHILE', 'WITH', - 'WORK', 'WRITE', - 'X509', - 'XA', 'XOR', - 'YEAR', 'YEAR_MONTH', 'ZEROFILL' ); From 76eaf7c12b9bdf988de1be823e047184cf9a4dbb Mon Sep 17 00:00:00 2001 From: Domen Date: Fri, 24 May 2013 02:04:42 +0200 Subject: [PATCH 10/10] Translated using Weblate (Slovenian) Currently translated at 100.0% (2603 of 2603) --- po/sl.po | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/po/sl.po b/po/sl.po index b53449a5d3..24748c00e9 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,16 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-23 02:54-0400\n" -"PO-Revision-Date: 2013-05-20 16:14+0200\n" +"PO-Revision-Date: 2013-05-24 02:04+0200\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian \n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%" -"100==4 ? 2 : 3;\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3;\n" "X-Generator: Weblate 1.6-dev\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:344 @@ -6210,10 +6209,9 @@ msgstr "CSV z uporabo LOAD DATA" #: 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 "Preglednica Open Document" +msgstr "Preglednica OpenDocument" #: libraries/config/setup.forms.php:262 #: libraries/config/user_preferences.forms.php:167 @@ -6242,10 +6240,9 @@ msgstr "Microsoft Word 2000" #: libraries/config/setup.forms.php:352 #: libraries/config/user_preferences.forms.php:256 -#, fuzzy #| msgid "Open Document Text" msgid "OpenDocument Text" -msgstr "Besedilo Open Document" +msgstr "Besedilo OpenDocument" #: libraries/config/validate.lib.php:214 msgid "Could not initialize Drizzle connection library"