From 83eb5a172e16adf2ab7181e24dc97464e7a9ee6a Mon Sep 17 00:00:00 2001 From: Jonadabe PT Date: Thu, 18 Apr 2013 10:03:12 +0200 Subject: [PATCH 1/6] Translated using Weblate (Portuguese) Currently translated at 52.8% (1352 of 2562) --- po/pt.po | 53 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/po/pt.po b/po/pt.po index 7ce2e1157c..c1570fb69c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2013-03-22 01:31+0200\n" -"Last-Translator: Pedro Ribeiro \n" +"PO-Revision-Date: 2013-04-18 10:03+0200\n" +"Last-Translator: Jonadabe PT \n" "Language-Team: Portuguese " "\n" "Language: pt\n" @@ -8277,7 +8277,6 @@ msgstr "" #: libraries/tbl_select.lib.php:86 pmd_general.php:481 pmd_general.php:501 #: pmd_general.php:623 pmd_general.php:636 pmd_general.php:699 #: pmd_general.php:753 -#, fuzzy msgid "Operator" msgstr "Operador" @@ -8534,6 +8533,8 @@ msgid "" "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" msgstr "" +"Activou a função mbstring.func_overload na sua configuração PHP. Esta opção " +"é incompatível com o phpMyAdmin e pode causar alguns danos aos dados!" #: main.php:284 msgid "" @@ -8541,6 +8542,9 @@ msgid "" "multibyte charset. Without the mbstring extension phpMyAdmin is unable to " "split strings correctly and it may result in unexpected results." msgstr "" +"A extensão mbstring do PHP não foi encontrada e parece que está a utilizar " +"um charset multibyte. Sem a extensão mbstring, o phpMyAdmin não é capaz de " +"separar correctamente as strings e pode resultar em resultados inesperados." #: main.php:292 msgid "" @@ -8549,6 +8553,11 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" +"O seu parâmetro PHP " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] é menor que o valor válido " +"para o cookie configurado no phpMyAdmin, e por isso, a sua autenticação " +"expirará mais cedo que o configurado no phpMyAdmin." #: main.php:299 msgid "" @@ -8568,9 +8577,12 @@ msgid "" "exists in your phpMyAdmin directory. You should remove it once phpMyAdmin " "has been configured." msgstr "" +"A pasta [code]config[/code], que é usado pelo script de instalação, ainda " +"existe na sua pasta phpMyAdmin. Deverá remover esta pasta depois de ter " +"configurado o phpMyAdmin." #: main.php:321 -#, fuzzy, php-format +#, php-format #| msgid "" #| "ditional features for working with linked tables have been ctivated. To d " #| "out why click %shere%s." @@ -8578,8 +8590,9 @@ msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. To find out why click %shere%s." msgstr "" -"As Características adicionais para trabalhar com ligações entre Tabelas " -"foram desactivadas. Para saber porquê carregue %saqui%s." +"A configuração de armazenamento phpMyAdmin não está completamente " +"configurada, algumas funcionalidades adicionais foram desactivadas. Para " +"perceber porquê clique %saqui%s." #: main.php:336 msgid "" @@ -8912,9 +8925,8 @@ msgid "Select binary log to view" msgstr "" #: server_binlog.php:103 server_status.php:606 -#, fuzzy msgid "Files" -msgstr "Qtd Campos" +msgstr "Ficheiros" #: server_binlog.php:150 server_binlog.php:152 server_status.php:1261 #: server_status.php:1263 @@ -9640,13 +9652,14 @@ msgid "" msgstr "" #: server_status.php:594 +#, fuzzy msgid "Handler" -msgstr "" +msgstr "Handler" #: server_status.php:595 #, fuzzy msgid "Query cache" -msgstr "Tipo de Query" +msgstr "Query cache" #: server_status.php:596 msgid "Threads" @@ -9659,12 +9672,11 @@ msgstr "" #: server_status.php:599 #, fuzzy msgid "Delayed inserts" -msgstr "Instrucções de inserção múltiplas" +msgstr "Delayed inserts" #: server_status.php:600 -#, fuzzy msgid "Key cache" -msgstr "Tipo de Query" +msgstr "Chave da cache" #: server_status.php:601 msgid "Joins" @@ -9672,7 +9684,7 @@ msgstr "" #: server_status.php:603 msgid "Sorting" -msgstr "" +msgstr "Ordem" #: server_status.php:605 msgid "Transaction coordinator" @@ -9683,9 +9695,8 @@ msgid "Flush (close) all tables" msgstr "" #: server_status.php:619 -#, fuzzy msgid "Show open tables" -msgstr "Mostra tabelas" +msgstr "Ver tabelas abertas" #: server_status.php:624 msgid "Show slave hosts" @@ -11782,7 +11793,9 @@ msgstr "Criar versão" #, fuzzy #| msgid "Do a \"query by example\" (wildcard: \"%\")" msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" -msgstr "Faça uma \"pesquisa por formulário\" (caractere universal: \"%\")" +msgstr "" +"Faça uma \"pesquisa por formulário\" (caractere universal: \"%\") para duas " +"colunas diferentes" #: tbl_zoom_select.php:152 #| msgid "Hide search criteria" @@ -11798,13 +11811,13 @@ msgid "Maximum rows to plot" msgstr "Número máximo de linhas para traçar" #: tbl_zoom_select.php:417 +#, fuzzy msgid "Browse/Edit the points" -msgstr "" +msgstr "Listar/Editar os pontos" #: tbl_zoom_select.php:424 -#, fuzzy msgid "How to use" -msgstr "versão do PHP" +msgstr "Como usar" #: tbl_zoom_select.php:431 #, fuzzy From 2ec63c7fb31808e3cf56f787029a46fc786ced36 Mon Sep 17 00:00:00 2001 From: Pedro Ribeiro Date: Thu, 18 Apr 2013 17:24:17 +0200 Subject: [PATCH 2/6] Translated using Weblate (Portuguese) Currently translated at 53.0% (1358 of 2562) --- po/pt.po | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/po/pt.po b/po/pt.po index c1570fb69c..38641ff7b5 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2013-04-18 10:03+0200\n" -"Last-Translator: Jonadabe PT \n" +"PO-Revision-Date: 2013-04-18 17:24+0200\n" +"Last-Translator: Pedro Ribeiro \n" "Language-Team: Portuguese " "\n" "Language: pt\n" @@ -8607,6 +8607,8 @@ msgid "" "Your PHP MySQL library version %s differs from your MySQL server version %s. " "This may cause unpredictable behavior." msgstr "" +"A versão %s da biblioteca MySQL do PHP difere da versão %s do servidor " +"MySQL. Isto pode causar comportamento imprevisível." #: main.php:378 #, php-format @@ -8614,6 +8616,8 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" +"Servidor a correr com Suhosin. Por favor verifique a %sdocumentação%s para " +"eventuais problemas." #: navigation.php:182 server_databases.php:284 server_synchronize.php:1294 msgid "No databases" @@ -9663,11 +9667,11 @@ msgstr "Query cache" #: server_status.php:596 msgid "Threads" -msgstr "" +msgstr "Tópicos" #: server_status.php:598 msgid "Temporary data" -msgstr "" +msgstr "Dados temporários" #: server_status.php:599 #, fuzzy @@ -9688,11 +9692,11 @@ msgstr "Ordem" #: server_status.php:605 msgid "Transaction coordinator" -msgstr "" +msgstr "Coordenador de Transacção" #: server_status.php:617 msgid "Flush (close) all tables" -msgstr "" +msgstr "Flush (fechar) todas as tabelas" #: server_status.php:619 msgid "Show open tables" From 82090c11b10f605a735af0e0c9d7e519cf74ab48 Mon Sep 17 00:00:00 2001 From: Filipe Batista Date: Fri, 19 Apr 2013 12:59:31 +0200 Subject: [PATCH 3/6] Translated using Weblate (Portuguese) Currently translated at 53.0% (1359 of 2562) --- po/pt.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/pt.po b/po/pt.po index 38641ff7b5..347cc650bd 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2013-04-18 17:24+0200\n" -"Last-Translator: Pedro Ribeiro \n" +"PO-Revision-Date: 2013-04-19 12:59+0200\n" +"Last-Translator: Filipe Batista \n" "Language-Team: Portuguese " "\n" "Language: pt\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.5-dev\n" +"X-Generator: Weblate 1.6-dev\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -5877,7 +5877,7 @@ msgstr "" #: libraries/display_select_lang.lib.php:46 #: libraries/display_select_lang.lib.php:47 setup/frames/index.inc.php:72 msgid "Language" -msgstr "" +msgstr "Lingua" #: libraries/display_tbl.lib.php:406 msgid "Save edited data" From de483ef6859a9d2914240ae9e0274ddd3a03a2b1 Mon Sep 17 00:00:00 2001 From: Yungu Kim Date: Fri, 19 Apr 2013 16:53:11 +0200 Subject: [PATCH 4/6] Translated using Weblate (Korean) Currently translated at 58.5% (1499 of 2562) --- po/ko.po | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/po/ko.po b/po/ko.po index 24e49f8499..cf97341643 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2013-04-15 14:02+0200\n" +"PO-Revision-Date: 2013-04-19 16:53+0200\n" "Last-Translator: Yungu Kim \n" "Language-Team: Korean \n" "Language: ko\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 1.5-dev\n" +"X-Generator: Weblate 1.6-dev\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -3272,7 +3272,7 @@ msgstr "선택된 행을 하이라이트" #: libraries/config/messages.inc.php:27 msgid "Row marker" -msgstr "" +msgstr "열(row) 마커" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" @@ -3299,6 +3299,8 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"CHAR와 VARCHAR 행에 사용될 편집 입력창 정의; [kbd]input[/kbd] - 입력 길이 제한 가능, " +"[kbd]textarea[/kbd] - 줄 바꿈 허용" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" @@ -3354,7 +3356,7 @@ msgstr "" #: libraries/config/messages.inc.php:44 msgid "Compress on the fly" -msgstr "" +msgstr "즉시 압축" #: libraries/config/messages.inc.php:45 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:167 @@ -3421,7 +3423,7 @@ msgstr "데이터베이스들을 목록으로 표시" #: libraries/config/messages.inc.php:60 msgid "Show server listing as a list instead of a drop down" -msgstr "" +msgstr "서버 목록을 목록 형태로 출력(드롭 다운 사용 안 함)" #: libraries/config/messages.inc.php:61 msgid "Display servers as a list" @@ -3431,7 +3433,7 @@ msgstr "서버들을 목록으로 표시" msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." -msgstr "" +msgstr "선택한 테이블을 최적화 하거나 복구하는 등의 대규모 유지 보수 작업을 해제합니다." #: libraries/config/messages.inc.php:63 #| msgid "Table maintenance" @@ -3672,7 +3674,7 @@ msgstr "강제적인 SSL 연결" msgid "" "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "the referenced data, [kbd]id[/kbd] is the key value" -msgstr "" +msgstr "외래키 드롭다운 박스 항목을 정렬; [kbd]content[/kbd]: 참조 데이터, [kbd]id[/kbd]: 키 값" #: libraries/config/messages.inc.php:153 msgid "Foreign key dropdown order" @@ -4267,7 +4269,7 @@ msgstr "" #: libraries/config/messages.inc.php:311 msgid "Maximum databases" -msgstr "" +msgstr "데이터베이스의 최대 갯수" #: libraries/config/messages.inc.php:312 msgid "" @@ -4860,13 +4862,13 @@ msgstr "" #: libraries/config/messages.inc.php:444 msgid "SQL query tracking table" -msgstr "" +msgstr "SQL 쿼리 추적 테이블" #: libraries/config/messages.inc.php:445 msgid "" "Whether the tracking mechanism creates versions for tables and views " "automatically." -msgstr "" +msgstr "SQL 쿼리 추적 기능이 테이블과 뷰에 대한 버전을 자동으로 생성할지 여부." #: libraries/config/messages.inc.php:446 msgid "Automatically create versions" @@ -12065,11 +12067,11 @@ msgstr "테이블 조인 평균: %s, 이 값은 시간당 1미만이어야 합 #: po/advisory_rules.php:130 msgid "Rate of reading first index entry" -msgstr "" +msgstr "첫 번째 인덱스 항목을 읽는 비율" #: po/advisory_rules.php:131 msgid "The rate of reading the first index entry is high." -msgstr "" +msgstr "첫 번째 인덱스 항목을 읽는 비율이 높습니다." #: po/advisory_rules.php:132 msgid "" @@ -12080,6 +12082,10 @@ msgid "" "scans. Other than that full index scans can only be reduced by rewriting " "queries." msgstr "" +"전체 인덱스 스캔이 자주 발생할 경우 이렇게 됩니다. 전체 인덱스 스캔은 테이블 스캔보다는 빠르지만 큰 테이블에서는 CPU 자원을 많이 " +"씁니다. 이런 테이블들이 대용량의 UPDATE와 DELETE를 했거나 하는 중이라면, 'OPTIMIZE TABLE'을 수행하여 전체 " +"인덱스 스캔 속도를 높이거나 횟수를 줄일 수 있습니다. 그 외에 리라이트(rewrite) 쿼리에 의해 전체 인덱스 스캔이 줄어들 수 " +"있습니다." #: po/advisory_rules.php:133 #, php-format @@ -12092,7 +12098,7 @@ msgstr "고정위치 읽기 비율" #: po/advisory_rules.php:136 msgid "The rate of reading data from a fixed position is high." -msgstr "" +msgstr "고정된 위치에서 데이터를 읽는 비율이 높습니다." #: po/advisory_rules.php:137 msgid "" @@ -12100,6 +12106,8 @@ msgid "" "scan, including join queries that do not use indexes. Add indexes where " "applicable." msgstr "" +"많은 쿼리들이 결과를 정렬하거나 전체 테이블 스캔이 필요함을 의미합니다. 인덱스를 쓰지 않는 조인 쿼리도 포함됩니다. 인덱스를 적절히 " +"추가하세요." #: po/advisory_rules.php:138 #, php-format From 34faa9897e4672c1eb4d0511e0e9a9b10b83492e Mon Sep 17 00:00:00 2001 From: Rodrigo Souza Date: Fri, 19 Apr 2013 23:18:56 +0200 Subject: [PATCH 5/6] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2562 of 2562) --- 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 2ee2177bf3..fd27cb89a7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2013-04-15 18:36+0200\n" +"PO-Revision-Date: 2013-04-19 23:18+0200\n" "Last-Translator: Rodrigo Souza \n" "Language-Team: Portuguese (Brazil) " "\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 1.5-dev\n" +"X-Generator: Weblate 1.6-dev\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -11759,7 +11759,7 @@ msgstr "Editar view" #: tbl_structure.php:640 msgid "Relation view" -msgstr "Ver relações" +msgstr "View de relações" #: tbl_structure.php:648 msgid "Propose table structure" From 1f983ff3289c9cb8ecb919e4969fbc12abc6c8f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 8 Feb 2013 09:02:14 +0100 Subject: [PATCH 6/6] Fix backtrace collected on error Since adding of another level of abstraction (addError), the handleError method stayed in the backtrace. This lead to non useful backtraces and explosion of session data size as handleError gets GLOBALS as one of argument in case of user errors. --- libraries/Error.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/Error.class.php b/libraries/Error.class.php index e972f67412..6e4054930b 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -106,9 +106,9 @@ class PMA_Error extends PMA_Message $this->setLine($errline); $backtrace = debug_backtrace(); - // remove last two calls: debug_backtrace() and handleError() - unset($backtrace[0]); - unset($backtrace[1]); + // remove last three calls: + // debug_backtrace(), handleError() and addError() + $backtrace = array_slice($backtrace, 3); $this->setBacktrace($backtrace); }