- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-41-g06bfdd7
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, QA_3_4 has been updated via 06bfdd7ca6d76335f45d53134770979d7d25d739 (commit) from 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 (commit) - Log ----------------------------------------------------------------- commit 06bfdd7ca6d76335f45d53134770979d7d25d739 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 15:52:01 2011 +0200 Add changelog entries ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76f3514..021c2cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ phpMyAdmin - ChangeLog - bug #3363221 [display] Missing Server Parameter on inline sql query - bug #3367986 [navi] Drop field -> lost active table - remove misleading comment on the "Rename database" interface +- bug #3374374 [interface] Fix footnote for inexact count while browsing +- bug #3372807 [interface] Fix security warning link in setup - bug #3374347 [display] Backquotes in normal text on import page 3.4.3.1 (2011-07-02) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11714-gc968408
by Marc Delisle 22 Jul '11

22 Jul '11

The branch, master has been updated via c968408de7b5353832c428cc85901080ed7394f8 (commit) via 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 (commit) via 201ad07ea8883fc8c3a18227a656ea56fe7b18fc (commit) from 3024f1e8672b63d8f88db70db4943acebfa16420 (commit) - Log ----------------------------------------------------------------- commit c968408de7b5353832c428cc85901080ed7394f8 Merge: 3024f1e8672b63d8f88db70db4943acebfa16420 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 22 09:35:51 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_import.lib.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc2f709..24167bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog - bug #3363221 [display] Missing Server Parameter on inline sql query - bug #3367986 [navi] Drop field -> lost active table - remove misleading comment on the "Rename database" interface +- bug #3374347 [display] Backquotes in normal text on import page 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 052a023..d709631 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -63,7 +63,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { complete = response.complete; if (total==0 && complete==0 && percent==0) { - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.')); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'), false); ?>'); $('#upload_form_status').css("display", "none"); } else { $('#upload_form_status_info').html(' '+Math.round(percent)+'%, '+complete+'/'+total); @@ -73,7 +73,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { if (finished==true) { $('#importmain').css('display', 'none'); $('#import_form_status').css('display', 'inline'); - $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.')); ?> '); + $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.'), false); ?> '); $('#import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error <?php // reload the left sidebar when the import is finished @@ -95,7 +95,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { <?php } else { // no plugin available ?> - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.'), false) . PMA_showDocu('faq2_9'); ?>'); $('#upload_form_status').css("display", "none"); <?php } // else hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-40-g9a26872
by Marc Delisle 22 Jul '11

22 Jul '11

The branch, QA_3_4 has been updated via 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 (commit) via 201ad07ea8883fc8c3a18227a656ea56fe7b18fc (commit) from 5f9c187010dcf2b51bf3dee516789b6fae9f2363 (commit) - Log ----------------------------------------------------------------- commit 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 22 09:34:42 2011 -0400 ChangeLog entry for bug #3374347 commit 201ad07ea8883fc8c3a18227a656ea56fe7b18fc Author: Sven Strickroth <email(a)cs-ware.de> Date: Fri Jul 22 00:52:06 2011 +0200 Do not add backquotes for normal displayed text Signed-off-by: Sven Strickroth <email(a)cs-ware.de> ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_import.lib.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 250bd1a..76f3514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog - bug #3363221 [display] Missing Server Parameter on inline sql query - bug #3367986 [navi] Drop field -> lost active table - remove misleading comment on the "Rename database" interface +- bug #3374347 [display] Backquotes in normal text on import page 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 3a9c2ea..c56c461 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -63,7 +63,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { complete = response.complete; if (total==0 && complete==0 && percent==0) { - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.')); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'), false); ?>'); $('#upload_form_status').css("display", "none"); } else { $('#upload_form_status_info').html(' '+Math.round(percent)+'%, '+complete+'/'+total); @@ -73,7 +73,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { if (finished==true) { $('#importmain').css('display', 'none'); $('#import_form_status').css('display', 'inline'); - $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.')); ?> '); + $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.'), false); ?> '); $('#import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error <?php // reload the left sidebar when the import is finished @@ -95,7 +95,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { <?php } else { // no plugin available ?> - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.'), false) . PMA_showDocu('faq2_9'); ?>'); $('#upload_form_status').css("display", "none"); <?php } // else hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11711-g3024f1e
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 3024f1e8672b63d8f88db70db4943acebfa16420 (commit) from 11937b06bd1bffc24cacd0f45d2ce749387c4574 (commit) - Log ----------------------------------------------------------------- commit 3024f1e8672b63d8f88db70db4943acebfa16420 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 15:21:57 2011 +0200 Fix syntax errors in translation ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a3d4cb1..b2479ad 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10269,7 +10269,7 @@ msgid "" "You are not using a secure connection; all data (including potentially " "sensitive information, like passwords) is transferred unencrypted!" msgstr "Você não está usando conexão segura; todos dados (incluindo " -possíveis informações sensíveis, como senhas) são transferidos sem criptografia." +"possíveis informações sensíveis, como senhas) são transferidos sem criptografia." #: setup/frames/index.inc.php:60 #, php-format @@ -10277,7 +10277,7 @@ msgid "" "If your server is also configured to accept HTTPS requests follow [a@%s]this " "link[/a] to use a secure connection." msgstr "Se o seu servidor também está configurado para aceitar requisições HTTPS " -siga [a@%s]este link[/a] para usar uma conexão segura." +"siga [a@%s]este link[/a] para usar uma conexão segura." #: setup/frames/index.inc.php:64 msgid "Insecure connection" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11710-g11937b0
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 11937b06bd1bffc24cacd0f45d2ce749387c4574 (commit) via 5f9c187010dcf2b51bf3dee516789b6fae9f2363 (commit) from 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 (commit) - Log ----------------------------------------------------------------- commit 11937b06bd1bffc24cacd0f45d2ce749387c4574 Merge: 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 5f9c187010dcf2b51bf3dee516789b6fae9f2363 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 15:19:59 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: setup/lib/index.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 04fdfd1..9823cbd 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -264,7 +264,7 @@ function perform_config_checks() $strLoginCookieValidityWarning3 = __('If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin cookie validity%s must be set to a value less or equal to it.'); $strLoginCookieValidityWarning3 = sprintf($strLoginCookieValidityWarning3, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %shost authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); - $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '%s'); + $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]http[/kbd].'); $strServerAuthConfigMsg = sprintf($strServerAuthConfigMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server]', '[/a]'); $strZipDumpExportWarning = __('%sZip compression%s requires functions (%s) which are unavailable on this system.'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-38-g5f9c187
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, QA_3_4 has been updated via 5f9c187010dcf2b51bf3dee516789b6fae9f2363 (commit) from 54398f8a124702e30820bc4636040dda1db6b71b (commit) - Log ----------------------------------------------------------------- commit 5f9c187010dcf2b51bf3dee516789b6fae9f2363 Author: Jørgen Thomsen <joergent(a)users.sourceforge.neT> Date: Fri Jul 22 15:19:31 2011 +0200 Fix format parameters ----------------------------------------------------------------------- Summary of changes: setup/lib/index.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index aa0d044..149918c 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -264,7 +264,7 @@ function perform_config_checks() $strLoginCookieValidityWarning3 = __('If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin cookie validity%s must be set to a value less or equal to it.'); $strLoginCookieValidityWarning3 = sprintf($strLoginCookieValidityWarning3, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %shost authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); - $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '%s'); + $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]http[/kbd].'); $strServerAuthConfigMsg = sprintf($strServerAuthConfigMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server]', '[/a]'); $strZipDumpExportWarning = __('%sZip compression%s requires functions (%s) which are unavailable on this system.'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11708-g4a80c3e
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 (commit) via 54398f8a124702e30820bc4636040dda1db6b71b (commit) from c8967b62309eb6df7042fd44848042cd7f9d8d40 (commit) - Log ----------------------------------------------------------------- commit 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 Merge: c8967b62309eb6df7042fd44848042cd7f9d8d40 54398f8a124702e30820bc4636040dda1db6b71b Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jul 22 15:17:25 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 9e02c24..af5dc89 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2078,7 +2078,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) || $analyzed_sql[0]['where_clause'] == '1 ')) { // "j u s t b r o w s i n g" $pre_count = '~'; - $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')), true); + $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]'))); } else { $pre_count = ''; $after_count = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-37-g54398f8
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, QA_3_4 has been updated via 54398f8a124702e30820bc4636040dda1db6b71b (commit) from bea5556023b4561c23e82f5005059c5fb7b1cde8 (commit) - Log ----------------------------------------------------------------- commit 54398f8a124702e30820bc4636040dda1db6b71b Author: Sven Strickroth <email(a)cs-ware.de> Date: Fri Jul 22 02:01:17 2011 +0200 Do not call PMA_showHint with bbcode=true in display_tbl.lib.php This fixes an issue with an InnoDB-table on sql.php with "select * from tbl" showing that "total ~ N 1" rows are displayed and with a JavaScript enabled browser the footnote gets hidden and it's impossible to find out what the 1 means. Signed-off-by: Sven Strickroth <email(a)cs-ware.de> ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index c7d74ef..c871612 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1937,7 +1937,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) || $analyzed_sql[0]['where_clause'] == '1 ')) { // "j u s t b r o w s i n g" $pre_count = '~'; - $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')), true); + $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]'))); } else { $pre_count = ''; $after_count = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11706-gc8967b6
by Michal Čihař 22 Jul '11

22 Jul '11

The branch, master has been updated via c8967b62309eb6df7042fd44848042cd7f9d8d40 (commit) from 2dee226c5010cc9dd3f3ca85ac7138af61a24358 (commit) - Log ----------------------------------------------------------------- commit c8967b62309eb6df7042fd44848042cd7f9d8d40 Author: M. Quasar <marcosm(a)gmail.com> Date: Wed Jul 20 16:08:01 2011 -0300 added translation strings for missing values ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 69 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 33 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 20fc437..a3d4cb1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10194,7 +10194,7 @@ msgstr "Aplicar mudanças selecionadas" #: server_synchronize.php:446 server_synchronize.php:891 msgid "Synchronize Databases" -msgstr "" +msgstr "Sincronizar Bando de Dados" #: server_synchronize.php:459 msgid "Selected target tables have been synchronized with source tables." @@ -10234,7 +10234,7 @@ msgstr "" #: server_variables.php:58 msgid "Setting variable failed" -msgstr "" +msgstr "Erro na atribuição da variável" #: server_variables.php:77 msgid "Server variables and settings" @@ -10268,18 +10268,20 @@ msgstr "" msgid "" "You are not using a secure connection; all data (including potentially " "sensitive information, like passwords) is transferred unencrypted!" -msgstr "" +msgstr "Você não está usando conexão segura; todos dados (incluindo " +possíveis informações sensíveis, como senhas) são transferidos sem criptografia." #: setup/frames/index.inc.php:60 #, php-format msgid "" "If your server is also configured to accept HTTPS requests follow [a@%s]this " "link[/a] to use a secure connection." -msgstr "" +msgstr "Se o seu servidor também está configurado para aceitar requisições HTTPS " +siga [a@%s]este link[/a] para usar uma conexão segura." #: setup/frames/index.inc.php:64 msgid "Insecure connection" -msgstr "Conexão insegura" +msgstr "Conexão vulnerável" #: setup/frames/index.inc.php:92 #, fuzzy @@ -10383,7 +10385,8 @@ msgstr "" msgid "" "Reading of version failed. Maybe you're offline or the upgrade server does " "not respond." -msgstr "" +msgstr "Leitura de versão falhou. Você pode estar offline ou o servidor " +"de atualização não responde." #: setup/lib/index.lib.php:143 msgid "Got invalid version string from server" @@ -10398,11 +10401,12 @@ msgstr "" msgid "" "You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable " "version is %s, released on %s." -msgstr "" +msgstr "Se você estiver usando versão do Gir, execute [kbd]git pull[/kbd] :-)[br]" +"A versão estável mais nova é %s, lançada em %s." #: setup/lib/index.lib.php:165 msgid "No newer stable version is available" -msgstr "" +msgstr "Não existe nenhuma versão estável mais nova." #: setup/lib/index.lib.php:250 #, php-format @@ -10431,12 +10435,13 @@ msgstr "" msgid "" "This value should be double checked to ensure that this directory is neither " "world accessible nor readable or writable by other users on your server." -msgstr "" +msgstr "Este valor deve ser verificado com atenção para garantir que " +"este diretório não seja acessado ou escrito por outros usuários no seu servidor." #: setup/lib/index.lib.php:256 #, php-format msgid "This %soption%s should be enabled if your web server supports it." -msgstr "" +msgstr "Esta %sopção%s deveria estar habilitada se seu navegador tem suporter." #: setup/lib/index.lib.php:258 #, php-format @@ -10518,7 +10523,7 @@ msgstr "Você permite a conexão com o servidor sem uma senha." #: setup/lib/index.lib.php:351 msgid "Key is too short, it should have at least 8 characters." -msgstr "A chave é muito curta, você deveria ter pelo menos 8 caracteres." +msgstr "A chave é muito curta, deveria ter pelo menos 8 caracteres." #: setup/lib/index.lib.php:358 msgid "Key should contain letters, numbers [em]and[/em] special characters." @@ -10532,7 +10537,7 @@ msgstr "Visualizar valores estrangeiros" #: sql.php:189 #, php-format msgid "Using bookmark \"%s\" as default browse query." -msgstr "" +msgstr "Usando marcador \"%s\" como padrão." #: sql.php:661 tbl_replace.php:369 #, php-format @@ -10571,7 +10576,7 @@ msgstr "Por causa da sua largura, esse campo pode não ser editável" #: tbl_change.php:800 msgid "Remove BLOB Repository Reference" -msgstr "" +msgstr "Remover referência a repositório BLOB" #: tbl_change.php:806 msgid "Binary - do not edit" @@ -10635,7 +10640,7 @@ msgstr "Mar" #: tbl_chart.php:87 msgid "Line" -msgstr "" +msgstr "Linhas" #: tbl_chart.php:88 #, fuzzy @@ -10663,7 +10668,7 @@ msgstr "Título do Relatório" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "Eixo X" #: tbl_chart.php:113 #, fuzzy @@ -10717,7 +10722,7 @@ msgstr "Ver o esquema da tabela" #: tbl_gis_visualization.php:111 msgid "Display GIS Visualization" -msgstr "" +msgstr "Mostrar visualização GIS" #: tbl_gis_visualization.php:157 msgid "Width" @@ -10978,7 +10983,8 @@ msgstr "Relações internas" msgid "" "An internal relation is not necessary when a corresponding FOREIGN KEY " "relation exists." -msgstr "" +msgstr "Uma relação interna é desnecessária quando uma CHAVE ESTRANGEIRA " +"correspondente existe." #: tbl_relation.php:410 msgid "Foreign key constraint" @@ -10996,7 +11002,7 @@ msgstr "Selecionar os campos (no mínimo 1)" #: tbl_select.php:278 msgid "Add search conditions (body of the \"where\" clause):" -msgstr "Condição de Pesquisa (complemento da cláusula \"onde\"):" +msgstr "Condição de pesquisa (complemento da cláusula \"onde\"):" #: tbl_select.php:285 msgid "Number of rows per page" @@ -11008,7 +11014,7 @@ msgstr "Ordenado por:" #: tbl_structure.php:158 tbl_structure.php:163 tbl_structure.php:611 msgid "Spatial" -msgstr "" +msgstr "Espacial" #: tbl_structure.php:165 tbl_structure.php:169 msgid "Browse distinct values" @@ -11106,22 +11112,22 @@ msgstr "particionado" #: tbl_tracking.php:109 #, php-format msgid "Tracking report for table `%s`" -msgstr "" +msgstr "Relatório de rastreamento para tabela `%s`" #: tbl_tracking.php:182 #, php-format msgid "Version %s is created, tracking for %s.%s is activated." -msgstr "" +msgstr "Versão %s criada, rastreamento para %s. %s ativado(a)." #: tbl_tracking.php:190 #, php-format msgid "Tracking for %s.%s , version %s is deactivated." -msgstr "" +msgstr "Rastreamento para %s.%s, versão %s desativado(a)." #: tbl_tracking.php:198 #, php-format msgid "Tracking for %s.%s , version %s is activated." -msgstr "" +msgstr "Rastreamento para %s.%s, versão %s ativado(a)." #: tbl_tracking.php:208 msgid "SQL statements executed." @@ -11131,7 +11137,8 @@ msgstr "Instruções SQL executadas." msgid "" "You can execute the dump by creating and using a temporary database. Please " "ensure that you have the privileges to do so." -msgstr "" +msgstr "Você pode executar o dump criando e usando uma tabela temporária." +"Por favor, certifique-se de ter os privilégios necessários." #: tbl_tracking.php:215 msgid "Comment out these two lines if you do not need them." @@ -11145,11 +11152,7 @@ msgstr "Instruções SQL exportadas. Por favor copie a saída ou execute." #: tbl_tracking.php:255 #, php-format msgid "Version %s snapshot (SQL code)" -msgstr "" - -#: tbl_tracking.php:382 -msgid "Tracking data definition successfully deleted" -msgstr "" +msgstr "Instantâneo (código SQL) da versão %s" #: tbl_tracking.php:384 tbl_tracking.php:401 #, fuzzy @@ -11157,9 +11160,9 @@ msgstr "" msgid "Query error" msgstr "Reunir erros" -#: tbl_tracking.php:399 +#: tbl_tracking.php:399 tbl_tracking.php:382 msgid "Tracking data manipulation successfully deleted" -msgstr "" +msgstr "Rastreamento de manipulação de dados removidos com sucesso" #: tbl_tracking.php:411 msgid "Tracking statements" @@ -11168,7 +11171,7 @@ msgstr "Rastreando instruções" #: tbl_tracking.php:427 tbl_tracking.php:555 #, php-format msgid "Show %s with dates from %s to %s by user %s %s" -msgstr "" +msgstr "Mostrar %s com datas desde %s até %s pelo usuário %s %s" #: tbl_tracking.php:432 #, fuzzy @@ -11300,7 +11303,7 @@ msgstr "Você não tem direitos suficientes para estar aqui agora!" #: user_password.php:96 msgid "The profile has been updated." -msgstr "O perfíl foi atualizado." +msgstr "O perfil foi atualizado." #: view_create.php:141 msgid "VIEW name" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, unittesting, deleted. RELEASE_3_4_3_1-8161-gf787d74
by Herman van Rink 22 Jul '11

22 Jul '11

The branch, unittesting has been deleted was f787d74f1027d15f5817b4647d7d67085b9c1f3f ----------------------------------------------------------------------- f787d74f1027d15f5817b4647d7d67085b9c1f3f Merge remote-tracking branch 'zarubin/master' into unittesting ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0