From 91548801bbc9b6c246cacce82b0bb7eeddf4c9a0 Mon Sep 17 00:00:00 2001 From: Umair Khan Date: Mon, 20 Jan 2014 20:26:52 +0530 Subject: [PATCH 1/4] implement feature request #1489 Signed-off-by: Umair Khan --- .../navigation/Nodes/Node_Database_Container.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/navigation/Nodes/Node_Database_Container.class.php b/libraries/navigation/Nodes/Node_Database_Container.class.php index ed1366decc..052d5485c1 100644 --- a/libraries/navigation/Nodes/Node_Database_Container.class.php +++ b/libraries/navigation/Nodes/Node_Database_Container.class.php @@ -30,7 +30,11 @@ class Node_Database_Container extends Node $new = PMA_NodeFactory::getInstance( 'Node', _pgettext('Create new database', 'New') ); - $new->isNew = true; + if($GLOBALS['is_create_db_priv']) { + $new->isNew = true; + } else { + $new->isNew = false; + } $new->icon = PMA_Util::getImage('b_newdb.png', ''); $new->links = array( 'text' => 'server_databases.php?server=' . $GLOBALS['server'] From 0a5ea4dafbfbcd3172b50fec849324294badb326 Mon Sep 17 00:00:00 2001 From: Umair Khan Date: Mon, 20 Jan 2014 21:16:37 +0530 Subject: [PATCH 2/4] Replace if condition with a better code Signed-off-by: Umair Khan --- .../navigation/Nodes/Node_Database_Container.class.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libraries/navigation/Nodes/Node_Database_Container.class.php b/libraries/navigation/Nodes/Node_Database_Container.class.php index 052d5485c1..5d4f52772d 100644 --- a/libraries/navigation/Nodes/Node_Database_Container.class.php +++ b/libraries/navigation/Nodes/Node_Database_Container.class.php @@ -30,11 +30,7 @@ class Node_Database_Container extends Node $new = PMA_NodeFactory::getInstance( 'Node', _pgettext('Create new database', 'New') ); - if($GLOBALS['is_create_db_priv']) { - $new->isNew = true; - } else { - $new->isNew = false; - } + $new->isNew = $GLOBALS['is_create_db_priv']; $new->icon = PMA_Util::getImage('b_newdb.png', ''); $new->links = array( 'text' => 'server_databases.php?server=' . $GLOBALS['server'] From b3587df199e6075df9439db8bdb909589a24db61 Mon Sep 17 00:00:00 2001 From: Douglas dreginatto Date: Tue, 21 Jan 2014 17:41:00 +0100 Subject: [PATCH 3/4] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2749 of 2749) --- po/pt_BR.po | 48 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index f3f2c71dfe..62d54fca97 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-16 14:46+0200\n" -"Last-Translator: claudio MrBot \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2014-01-21 17:40+0200\n" +"Last-Translator: Douglas dreginatto \n" +"Language-Team: Portuguese (Brazil) " +"\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2067,7 +2067,7 @@ msgid "" "Your export is incomplete, due to a low execution time limit at the PHP level" msgstr "" "A exportação está incompleta devido ao baixo limite de tempo de execução no " -"PHP." +"PHP" #. l10n: Display text for calendar close link #: js/messages.php:439 @@ -4480,7 +4480,6 @@ msgid "Highlight pointer" msgstr "Destacar apontador" #: libraries/config/messages.inc.php:28 -#, fuzzy #| msgid "" #| "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import and export operations" @@ -4489,7 +4488,7 @@ msgid "" "import operations" msgstr "" "Habilitar compressão [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] para " -"operações de importar e exportar" +"operações de importar" #: libraries/config/messages.inc.php:29 msgid "Bzip2" @@ -4566,7 +4565,6 @@ msgid "Check config file permissions" msgstr "Verificar permissões do arquivo de configuração" #: libraries/config/messages.inc.php:43 -#, fuzzy #| msgid "" #| "Compress gzip/bzip2 exports on the fly without the need for much memory; " #| "if you encounter problems with created gzip/bzip2 files disable this " @@ -4575,9 +4573,9 @@ msgid "" "Compress gzip exports on the fly without the need for much memory; if you " "encounter problems with created gzip files disable this feature" msgstr "" -"Comprime exportações gzip/bzip2 imediatamente sem a necessidade de muita " -"memória; se você encontrar problemas com arquivos gzip/bzip2 criados " -"desabilite este recurso" +"Comprime exportações gzip imediatamente sem a necessidade de muita memória; " +"se você encontrar problemas com arquivos gzip criados desabilite este " +"recurso" #: libraries/config/messages.inc.php:44 msgid "Compress on the fly" @@ -7077,6 +7075,8 @@ msgid "" "Skip this number of queries (for SQL) or lines (for other formats), starting " "from the first one:" msgstr "" +"Pular este número de consultas (para SQL) ou linhas (para outros formatos), " +"iniciando da primeira:" #: libraries/display_import.lib.php:342 msgid "Format-Specific Options:" @@ -9346,50 +9346,43 @@ msgid "Generate Password:" msgstr "Gerar senha:" #: libraries/replication_gui.lib.php:908 -#, fuzzy #| msgid "Replication status" msgid "Replication started successfully." -msgstr "Status de replicação" +msgstr "Replicação iniciada com sucesso." #: libraries/replication_gui.lib.php:909 -#, fuzzy #| msgid "Master replication" msgid "Error starting replication." -msgstr "Replicação de master" +msgstr "Erro ao iniciar replicação." #: libraries/replication_gui.lib.php:913 -#, fuzzy #| msgid "Chart generated successfully." msgid "Replication stopped successfully." -msgstr "Os privilégios foram recarregados com sucesso." +msgstr "Replicação encerrada com sucesso." #: libraries/replication_gui.lib.php:914 -#, fuzzy #| msgid "Master replication" msgid "Error stopping replication." -msgstr "Replicação de master" +msgstr "Erro ao parar replicação." #: libraries/replication_gui.lib.php:918 -#, fuzzy #| msgid "Replication status" msgid "Replication resetting successfully." -msgstr "Status de replicação" +msgstr "Replicação reiniciada com sucesso." #: libraries/replication_gui.lib.php:919 -#, fuzzy #| msgid "Master replication" msgid "Error resetting replication." -msgstr "Replicação de master" +msgstr "Erro ao reiniciar replicação." #: libraries/replication_gui.lib.php:923 msgid "Success." -msgstr "" +msgstr "Sucesso." #: libraries/replication_gui.lib.php:924 -#, fuzzy #| msgid "Error" msgid "Error." -msgstr "Erro" +msgstr "Erro." #: libraries/replication_gui.lib.php:966 msgid "Unknown error" @@ -10326,7 +10319,6 @@ msgid "Use text field" msgstr "Usar campo texto" #: libraries/server_privileges.lib.php:1310 -#, fuzzy #| msgid "" #| "An account already exists with the same username but possibly a different " #| "hostname. Are you sure you wish to proceed?" @@ -10335,7 +10327,7 @@ msgid "" "hostname. " msgstr "" "Uma conta já existe com o mesmo nome de usuário, mas possivelmente com um " -"nome de host diferente. Você tem certeza que deseja continuar?" +"nome de servidor diferente. " #: libraries/server_privileges.lib.php:1446 msgid "Do not change the password" From 882eece2f79b8462b4c02b750f45fe2bc425de18 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Tue, 21 Jan 2014 11:59:58 +0100 Subject: [PATCH 4/4] Translated using Weblate (Swedish) Currently translated at 97.8% (2691 of 2749) --- po/sv.po | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/po/sv.po b/po/sv.po index 07a0805221..3038bd7863 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-21 11:53+0200\n" +"PO-Revision-Date: 2014-01-21 11:59+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -6709,7 +6709,7 @@ msgstr "möjlig djupgående rekursiv attack" #: libraries/database_interface.inc.php:34 #, php-format msgid "See %sour documentation%s for more information." -msgstr "" +msgstr "Se %sdokumentationen%s för mer information." #: libraries/dbi/DBIDrizzle.class.php:146 libraries/dbi/DBIMysql.class.php:170 #: libraries/dbi/DBIMysqli.class.php:224 @@ -7431,10 +7431,9 @@ msgid "Please explain the steps that lead to the error:" msgstr "" #: libraries/error_report.lib.php:301 -#, fuzzy #| msgid "Automatically create versions" msgid "Automatically send report next time" -msgstr "Skapa versioner automatiskt" +msgstr "Skicka rapport automatiskt nästa gång" #: libraries/import.lib.php:190 libraries/insert_edit.lib.php:122 #: libraries/rte/rte_routines.lib.php:1466 libraries/sql.lib.php:1642 @@ -8620,10 +8619,10 @@ msgid "RELATIONS FOR TABLE" msgstr "RELATIONER FÖR TABELL" #: libraries/plugins/export/ExportSql.class.php:1513 -#, fuzzy, php-format +#, php-format #| msgid "Structure for view" msgid "Structure for view %s exported as a table" -msgstr "Struktur för vy" +msgstr "Struktur för vy %s exporterad som en tabell" #: libraries/plugins/export/ExportSql.class.php:1601 msgid "Error reading data:" @@ -10189,7 +10188,7 @@ msgstr "Inget" #: libraries/server_privileges.lib.php:2908 #: libraries/server_user_groups.lib.php:78 msgid "User group" -msgstr "" +msgstr "Användargrupp" #: libraries/server_privileges.lib.php:704 msgid "Resource limits" @@ -10369,10 +10368,9 @@ msgid "wildcard" msgstr "jokertecken" #: libraries/server_privileges.lib.php:2069 -#, fuzzy #| msgid "database-specific" msgid "table-specific" -msgstr "databasspecifik" +msgstr "tabellspecifik" #: libraries/server_privileges.lib.php:2146 #: libraries/server_privileges.lib.php:3351 @@ -10388,10 +10386,9 @@ msgid "Revoke" msgstr "Upphäv" #: libraries/server_privileges.lib.php:2248 -#, fuzzy #| msgid "Edit server" msgid "Edit user group" -msgstr "Konfigurera server" +msgstr "Redigera användargrupp" #: libraries/server_privileges.lib.php:2423 msgid "… keep the old one." @@ -11575,11 +11572,11 @@ msgstr "Antalet trådar som inte är vilande." #: libraries/server_user_groups.lib.php:23 #, php-format msgid "Users of '%s' user group" -msgstr "" +msgstr "Användare av användargruppen '%s'" #: libraries/server_user_groups.lib.php:34 msgid "No users were found belonging to this user group." -msgstr "" +msgstr "Inga användare tillhörde denna användargrupp." #: libraries/server_user_groups.lib.php:65 libraries/server_users.lib.php:30 #| msgid "Users" @@ -11605,10 +11602,9 @@ msgid "Table level tabs" msgstr "Tabellkommentarer" #: libraries/server_user_groups.lib.php:110 -#, fuzzy #| msgid "Views" msgid "View users" -msgstr "Vy" +msgstr "Visa användare" #: libraries/server_user_groups.lib.php:147 #: libraries/server_user_groups.lib.php:208 @@ -11619,7 +11615,7 @@ msgstr "Lägg till användargrupp" #: libraries/server_user_groups.lib.php:211 #, php-format msgid "Edit user group: '%s'" -msgstr "" +msgstr "Redigera användargrupp: '%s'" #: libraries/server_user_groups.lib.php:227 #, fuzzy @@ -13221,10 +13217,9 @@ msgid "Rename view to" msgstr "Ändra namn till" #: view_operations.php:133 -#, fuzzy #| msgid "Delete the table (DROP)" msgid "Delete the view (DROP)" -msgstr "Ta bort tabellen (DROP)" +msgstr "Ta bort vyn (DROP)" #: libraries/advisory_rules.txt:49 msgid "Uptime below one day"