From 8676b5cc56f90e89c18acee86361dbd95c130a3b Mon Sep 17 00:00:00 2001 From: Yungu Kim Date: Sun, 26 Jan 2014 10:31:56 +0100 Subject: [PATCH 1/6] Translated using Weblate (Korean) Currently translated at 72.5% (1995 of 2749) --- po/ko.po | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/po/ko.po b/po/ko.po index 7e9a4c26cb..3c428ac8a3 100644 --- a/po/ko.po +++ b/po/ko.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-22 14:11+0200\n" +"PO-Revision-Date: 2014-01-26 10:31+0200\n" "Last-Translator: Yungu Kim \n" "Language-Team: Korean \n" "Language: ko\n" @@ -4224,7 +4224,7 @@ msgstr "사용불가" #: libraries/config/FormDisplay.class.php:772 #, php-format msgid "\"%s\" requires %s extension" -msgstr "\"%s\"(은)는 확장기능 %s 이 필요합니다" +msgstr "\"%s\"(은)는 %s 확장기능이 필요합니다" #: libraries/config/FormDisplay.class.php:791 #, php-format @@ -5990,13 +5990,13 @@ msgstr "" #: libraries/config/messages.inc.php:440 msgid "UI preferences table" -msgstr "" +msgstr "UI 설정 테이블" #: libraries/config/messages.inc.php:441 msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." -msgstr "" +msgstr "데이터베이스 생성 시 DROP DATABASE IF EXISTS 구문을 로그 첫 번째 줄에 추가할지 여부." #: libraries/config/messages.inc.php:442 msgid "Add DROP DATABASE" @@ -6006,7 +6006,7 @@ msgstr "DROP DATABASE 추가" msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table." -msgstr "" +msgstr "테이블 생성 시 DROP TABLE IF EXISTS 구문을 로그 첫 번째 줄에 추가할지 여부." #: libraries/config/messages.inc.php:444 msgid "Add DROP TABLE" @@ -8088,7 +8088,7 @@ msgstr "%s 파일은 어떤 key id도 포함하지 않습니다." #: libraries/plugins/auth/swekey/swekey.auth.lib.php:185 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:205 msgid "Hardware authentication failed!" -msgstr "하드웨어 인증 실패" +msgstr "하드웨어 인증 실패!" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:192 msgid "No valid authentication key plugged" @@ -8352,24 +8352,24 @@ msgstr "명세" msgid "" "Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" -msgstr "" +msgstr "테이블과 컬럼의 이름을 역따옴표로 감싸기 (특수문자나 키워드가 포함된 컬럼이나 테이블의 이름을 보호함)" #: libraries/plugins/export/ExportSql.class.php:311 msgid "Data creation options" -msgstr "" +msgstr "데이터 생성 옵션" #: libraries/plugins/export/ExportSql.class.php:315 #: libraries/plugins/export/ExportSql.class.php:1684 msgid "Truncate table before insert" -msgstr "" +msgstr "삽입 전에 테이블 비우기" #: libraries/plugins/export/ExportSql.class.php:321 msgid "Instead of INSERT statements, use:" -msgstr "" +msgstr "INSERT 구문 대신 사용할 구문:" #: libraries/plugins/export/ExportSql.class.php:327 msgid "INSERT DELAYED statements" -msgstr "" +msgstr "INSERT DELAYED 문" #: libraries/plugins/export/ExportSql.class.php:338 #: libraries/plugins/export/ExportSql.class.php:368 @@ -11992,7 +11992,7 @@ msgstr "인덱스 이름:" #: libraries/tbl_indexes.lib.php:264 msgid "" "\"PRIMARY\" must be the name of and only of a primary key!" -msgstr "\"PRIMARY\"는 기본 키만의 유일한 이름입니다!" +msgstr "\"PRIMARY\"는 반드시 기본 키의 이름이어야 하며, 기본 키만 쓸 수 있는 이름입니다!" #: libraries/tbl_indexes.lib.php:283 msgid "Comment:" @@ -12935,10 +12935,9 @@ msgid "Rename view to" msgstr "뷰 이름 변경" #: view_operations.php:133 -#, fuzzy #| msgid "Delete the table (DROP)" msgid "Delete the view (DROP)" -msgstr "테이블 삭제(DROP)" +msgstr "뷰 삭제(DROP)" #: libraries/advisory_rules.txt:49 msgid "Uptime below one day" @@ -13685,7 +13684,7 @@ msgstr "사용된 MyISAM 키 버퍼 비율" #: libraries/advisory_rules.txt:316 #, php-format msgid "%% MyISAM key buffer used: %s%%, this value should be above 95%%" -msgstr "%%MyISAM 키 버퍼 사용: %s%%, 이 값은 95%% 이상이어야 합니다." +msgstr "MyISAM 키 버퍼 사용 비율(%%): %s%%, 이 값은 95%% 이상이어야 합니다." #: libraries/advisory_rules.txt:318 msgid "Percentage of index reads from memory" @@ -14049,7 +14048,7 @@ msgstr "" #: libraries/advisory_rules.txt:448 #, php-format msgid "Your absolute InnoDB log size is %s MiB" -msgstr "InnoDB 로그 절대크기는 %s MiB 입니다." +msgstr "InnoDB 로그의 총 크기는 %s MiB 입니다" #: libraries/advisory_rules.txt:450 msgid "InnoDB buffer pool size" From ea708974c78b39b138198986a2f9674e09ac0117 Mon Sep 17 00:00:00 2001 From: Eduardo Abreu Date: Sat, 25 Jan 2014 18:09:57 +0100 Subject: [PATCH 2/6] Translated using Weblate (Portuguese) Currently translated at 61.0% (1679 of 2749) --- po/pt.po | 112 +++++++++++++++++++++++++------------------------------ 1 file changed, 51 insertions(+), 61 deletions(-) diff --git a/po/pt.po b/po/pt.po index aa563e839d..7c4a5df535 100644 --- a/po/pt.po +++ b/po/pt.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-25 02:57+0200\n" +"PO-Revision-Date: 2014-01-25 18:09+0200\n" "Last-Translator: Eduardo Abreu \n" "Language-Team: Portuguese " "\n" @@ -6645,7 +6645,7 @@ msgstr "Utilizador da proxy" #: libraries/config/messages.inc.php:535 msgid "The password for authenticating with the proxy" -msgstr "" +msgstr "A password para autenticar com a proxy" #: libraries/config/messages.inc.php:536 #| msgid "Password" @@ -6657,6 +6657,9 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression " "for import and export operations" msgstr "" +"Active a compressão " +"[a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] para operações de " +"importar e exportar" #: libraries/config/messages.inc.php:539 msgid "ZIP" @@ -6689,42 +6692,41 @@ msgstr "Enviar relatórios de erro" #: libraries/config/setup.forms.php:41 msgid "Config authentication" -msgstr "" +msgstr "Autenticação da configuração" #: libraries/config/setup.forms.php:45 msgid "Cookie authentication" -msgstr "" +msgstr "Autenticação das cookies" #: libraries/config/setup.forms.php:48 msgid "HTTP authentication" -msgstr "" +msgstr "Autenticação HTTP" #: libraries/config/setup.forms.php:51 msgid "Signon authentication" -msgstr "" +msgstr "Autenticação Signon" #: libraries/config/setup.forms.php:256 #: libraries/config/user_preferences.forms.php:156 msgid "CSV using LOAD DATA" -msgstr "" +msgstr "CSV usando o LOAD DATA" #: libraries/config/setup.forms.php:265 libraries/config/setup.forms.php:359 #: libraries/config/user_preferences.forms.php:164 #: libraries/config/user_preferences.forms.php:257 -#, fuzzy #| msgid "Open Document" msgid "OpenDocument Spreadsheet" -msgstr "Abrir Documento" +msgstr "Folha de cálculo OpenDocument" #: libraries/config/setup.forms.php:272 #: libraries/config/user_preferences.forms.php:171 msgid "Quick" -msgstr "" +msgstr "Rápido" #: libraries/config/setup.forms.php:276 #: libraries/config/user_preferences.forms.php:175 msgid "Custom" -msgstr "" +msgstr "Personalizado" #: libraries/config/setup.forms.php:298 #: libraries/config/user_preferences.forms.php:196 @@ -6739,28 +6741,29 @@ msgstr "dados CSV para MS Excel" #: libraries/config/setup.forms.php:354 #: libraries/config/user_preferences.forms.php:252 msgid "Microsoft Word 2000" -msgstr "" +msgstr "Microsoft Word 2000" #: libraries/config/setup.forms.php:363 #: libraries/config/user_preferences.forms.php:261 -#, fuzzy #| msgid "Open Document" msgid "OpenDocument Text" -msgstr "Abrir Documento" +msgstr "Texto OpenDocument" #: libraries/core.lib.php:287 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." msgstr "" +"A extensão %s não foi encontrada. Por favor verifique a sua configuração do " +"PHP." #: libraries/core.lib.php:446 msgid "possible deep recursion attack" -msgstr "" +msgstr "possível ataque de recursividade em profundidade (deep recursion)" #: libraries/database_interface.inc.php:34 #, php-format msgid "See %sour documentation%s for more information." -msgstr "" +msgstr "Veja a %snossa documentação%s para mais informação." #: libraries/dbi/DBIDrizzle.class.php:146 libraries/dbi/DBIMysql.class.php:170 #: libraries/dbi/DBIMysqli.class.php:224 @@ -6786,7 +6789,7 @@ msgstr "Sem palavra-passe" #: libraries/replication_gui.lib.php:400 libraries/replication_gui.lib.php:838 #: libraries/server_privileges.lib.php:1433 msgid "Password:" -msgstr "Palavra-passe :" +msgstr "Palavra-passe:" #: libraries/display_change_password.lib.php:67 #: libraries/replication_gui.lib.php:862 @@ -6797,30 +6800,27 @@ msgid "Re-type:" msgstr "Confirma" #: libraries/display_change_password.lib.php:74 -#, fuzzy #| msgid "Password:" msgid "Password Hashing:" -msgstr "Palavra-passe :" +msgstr "Hash da palavra-passe:" #: libraries/display_change_password.lib.php:87 msgid "MySQL 4.0 compatible" -msgstr "" +msgstr "Compatível com MySQL 4.0" #: libraries/display_create_database.lib.php:23 -#, fuzzy #| msgid "Create new database" msgid "Create database" -msgstr "Criar nova base de dados" +msgstr "Criar base de dados" #: libraries/display_create_database.lib.php:47 msgid "Create" msgstr "Criar" #: libraries/display_create_database.lib.php:51 -#, fuzzy #| msgid "Create new database" msgid "Create database:" -msgstr "Criar nova base de dados" +msgstr "Criar base de dados:" #: libraries/display_create_database.lib.php:61 #: libraries/server_privileges.lib.php:3789 server_privileges.php:130 @@ -6829,9 +6829,8 @@ msgid "No Privileges" msgstr "Sem Privilégios" #: libraries/display_create_table.lib.php:55 pmd_general.php:86 -#, fuzzy msgid "Create table" -msgstr "Criar uma Página nova" +msgstr "Criar tabela" #: libraries/display_create_table.lib.php:60 #: libraries/plugins/export/ExportHtmlword.class.php:485 @@ -6846,92 +6845,87 @@ msgid "Name" msgstr "Nome" #: libraries/display_create_table.lib.php:65 -#, fuzzy #| msgid "Number of rows per page" msgid "Number of columns" -msgstr "Número de registos por página" +msgstr "Número de colunas" #: libraries/display_export.inc.php:36 msgid "Could not load export plugins, please check your installation!" msgstr "" +"Não foi possível carregar os plugins de exportação, por favor verifique a " +"sua instalação!" #: libraries/display_export.lib.php:165 -#, fuzzy #| msgid "Cannot log in to the MySQL server" msgid "Exporting databases from the current server" -msgstr "Não é possível fazer login no servidor MySQL" +msgstr "Exportando as bases de dados do servidor actual" #: libraries/display_export.lib.php:168 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Exporting tables from \"%s\" database" -msgstr "Criar nova tabela na base de dados %s" +msgstr "Exportando as tabelas da base de dados \"%s\"" #: libraries/display_export.lib.php:173 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Exporting rows from \"%s\" table" -msgstr "Criar nova tabela na base de dados %s" +msgstr "Exportando as linhas da tabela \"%s\"" #: libraries/display_export.lib.php:198 -#, fuzzy #| msgid "Export type" msgid "Export Method:" -msgstr "Tipo de Exportação" +msgstr "Método de Exportação:" #: libraries/display_export.lib.php:208 msgid "Quick - display only the minimal options" -msgstr "" +msgstr "Rápido - exibe o mínimo de opções" #: libraries/display_export.lib.php:220 -#, fuzzy msgid "Custom - display all possible options" -msgstr "Opções de exportação da Base de Dados" +msgstr "Personalizado - exibe todas as opções possíveis" #: libraries/display_export.lib.php:242 -#, fuzzy #| msgid "Databases" msgid "Database(s):" -msgstr "Base de Dados" +msgstr "Base(s) de Dados:" #: libraries/display_export.lib.php:244 -#, fuzzy #| msgid "Tables" msgid "Table(s):" -msgstr "Tabelas" +msgstr "Tabela(s):" #: libraries/display_export.lib.php:264 libraries/display_import.lib.php:336 #: libraries/plugins/export/ExportCodegen.class.php:107 -#, fuzzy #| msgid "Format" msgid "Format:" -msgstr "Formato" +msgstr "Formato:" #: libraries/display_export.lib.php:269 -#, fuzzy #| msgid "Transformation options" msgid "Format-specific options:" -msgstr "Opções de tranformação" +msgstr "Opções específicas do formato:" #: libraries/display_export.lib.php:272 msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Desloque-se para baixo para preencher as opções do formato seleccionado e " +"ignore as opções para outros formatos." #: libraries/display_export.lib.php:283 libraries/display_import.lib.php:353 msgid "Encoding Conversion:" -msgstr "" +msgstr "Conversão de codificação:" #: libraries/display_export.lib.php:311 libraries/sql.lib.php:438 -#, fuzzy #| msgid "Rows" msgid "Rows:" -msgstr "Registos" +msgstr "Linhas:" #: libraries/display_export.lib.php:319 msgid "Dump some row(s)" -msgstr "" +msgstr "Eliminar alguma(s) linha(s)" #: libraries/display_export.lib.php:334 msgid "Row to begin at:" @@ -6939,11 +6933,11 @@ msgstr "" #: libraries/display_export.lib.php:351 msgid "Dump all rows" -msgstr "" +msgstr "Eliminar todas as linhas" #: libraries/display_export.lib.php:367 libraries/display_export.lib.php:626 msgid "Output:" -msgstr "" +msgstr "Saída:" #: libraries/display_export.lib.php:376 libraries/display_export.lib.php:411 #, fuzzy, php-format @@ -6987,28 +6981,24 @@ msgid "Character set of the file:" msgstr "Configurar o Mapa de Caracteres do ficheiro:" #: libraries/display_export.lib.php:569 -#, fuzzy #| msgid "Compression" msgid "Compression:" -msgstr "Compressão" +msgstr "Compressão:" #: libraries/display_export.lib.php:577 -#, fuzzy #| msgid "\"zipped\"" msgid "zipped" -msgstr "\"Compressão zip\"" +msgstr "zipado" #: libraries/display_export.lib.php:584 -#, fuzzy #| msgid "\"gzipped\"" msgid "gzipped" -msgstr "\"Compressão gzip\"" +msgstr "gzipado" #: libraries/display_export.lib.php:611 -#, fuzzy #| msgid "Save as file" msgid "View output as text" -msgstr "envia" +msgstr "Ver resultado como texto" #: libraries/display_export.lib.php:636 #, fuzzy From e8fa9e533565eb2503586ce7040236a928a50de2 Mon Sep 17 00:00:00 2001 From: Sampath Liyanage Date: Mon, 27 Jan 2014 21:29:27 +0530 Subject: [PATCH 3/6] bug 4245 fix with minimum changes Signed-off-by: Sampath Liyanage --- libraries/Util.class.php | 12 +++++++++++- libraries/sql.lib.php | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 8ff48770b2..fa59874a0d 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -1012,7 +1012,17 @@ class PMA_Util $sql_query = ''; } } - + + if (isset($GLOBALS['db']) && isset($GLOBALS['table'])){ + // Parse and analyze the query + $analyzed_sql_results = PMA_SQP_getParserAnalyzeMap( + $sql_query, $GLOBALS['db']); + + // Synchronize message(query) with table + PMA_handleSortOrder($GLOBALS['db'], $GLOBALS['table'], + $analyzed_sql_results, $sql_query); + } + if (isset($GLOBALS['using_bookmark_message'])) { $retval .= $GLOBALS['using_bookmark_message']->getDisplay(); unset($GLOBALS['using_bookmark_message']); diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index f3ee83de94..cfdd42ba75 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -227,7 +227,8 @@ function PMA_getTableHtmlForMultipleQueries( function PMA_handleSortOrder($db, $table, &$analyzed_sql_results, &$full_sql_query) { $pmatable = new PMA_Table($table, $db); - if (empty($analyzed_sql_results['analyzed_sql'][0]['order_by_clause'])) { + if (empty($analyzed_sql_results['analyzed_sql'][0]['order_by_clause']) + && isset($GLOBALS['default_query']) && $GLOBALS['default_query']) { $sorted_col = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN); if ($sorted_col) { //remove the tablename from retrieved preference @@ -1170,6 +1171,7 @@ function PMA_appendLimitClause($full_sql_query, $analyzed_sql, $display_query) */ function PMA_getDefaultSqlQueryForBrowse($db, $table) { + $GLOBALS['default_query'] = true; include_once 'libraries/bookmark.lib.php'; $book_sql_query = PMA_Bookmark_get( $db, From ea0ad9d41c1726a573d6c0beeba7eec5cfa147c7 Mon Sep 17 00:00:00 2001 From: Sampath Liyanage Date: Mon, 27 Jan 2014 21:53:36 +0530 Subject: [PATCH 4/6] unit tests updated. Some global variables were set in setup functions of some test files. one testing function with mockobjects was changed from once() to exactly(2) because the bug fix has made that function calls twice Signed-off-by: Sampath Liyanage --- test/classes/PMA_Header_test.php | 1 + test/libraries/PMA_insert_edit_test.php | 3 +++ test/libraries/PMA_server_binlog_test.php | 9 ++++++--- test/libraries/PMA_server_privileges_test.php | 3 +++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/test/classes/PMA_Header_test.php b/test/classes/PMA_Header_test.php index 04f194b390..78ae08ce4a 100644 --- a/test/classes/PMA_Header_test.php +++ b/test/classes/PMA_Header_test.php @@ -55,6 +55,7 @@ class PMA_Header_Test extends PHPUnit_Framework_TestCase $GLOBALS['PMA_Config']->enableBc(); $GLOBALS['cfg']['Server']['verbose'] = 'verbose host'; $GLOBALS['cfg']['Server']['pmadb'] = ''; + $GLOBALS['default_query'] = true; } /** diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index 2a27bfb9ae..77df46a43f 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -50,6 +50,9 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $GLOBALS['text_dir'] = 'ltr'; $GLOBALS['db'] = 'db'; $GLOBALS['table'] = 'table'; + $GLOBALS['cfg']['Server']['pmadb'] = 'pmadb'; + $GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs'; + $GLOBALS['cfg']['Server']['user'] = 'user'; } /** diff --git a/test/libraries/PMA_server_binlog_test.php b/test/libraries/PMA_server_binlog_test.php index 66d6304138..36daed383a 100644 --- a/test/libraries/PMA_server_binlog_test.php +++ b/test/libraries/PMA_server_binlog_test.php @@ -51,10 +51,13 @@ class PMA_ServerBinlog_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['ShowSQL'] = true; $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons'; $GLOBALS['cfg']['LimitChars'] = 100; - + $GLOBALS['cfg']['Server']['pmadb'] = 'pmadb'; + $GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs'; + $GLOBALS['cfg']['Server']['user'] = 'user'; + $GLOBALS['table'] = "table"; $GLOBALS['pmaThemeImage'] = 'image'; - + //$_SESSION $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); $_SESSION['PMA_Theme'] = new PMA_Theme(); @@ -138,7 +141,7 @@ class PMA_ServerBinlog_Test extends PHPUnit_Framework_TestCase $count = 3; //expects functions - $dbi->expects($this->once())->method('query') + $dbi->expects($this->exactly(2))->method('query') ->will($this->returnValue($result)); $dbi->expects($this->once())->method('numRows') diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index 6b69d28ba1..1562879d76 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -65,6 +65,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = "db_structure.php"; $GLOBALS['cfg']['Confirm'] = "Confirm"; $GLOBALS['cfg']['ShowHint'] = true; + $GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs'; + $GLOBALS['cfg']['Server']['user'] = 'user'; $GLOBALS['cfgRelation'] = array(); $GLOBALS['cfgRelation']['menuswork'] = false; @@ -76,6 +78,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $GLOBALS['username'] = "username"; $GLOBALS['collation_connection'] = "collation_connection"; $GLOBALS['text_dir'] = "text_dir"; + $GLOBALS['default_query'] = true; //$_POST $_POST['pred_password'] = 'none'; From 9ec1d29a41ec06d6a2cea8b1f69df0c60ac3ac4a Mon Sep 17 00:00:00 2001 From: Dadan Setia Date: Mon, 27 Jan 2014 08:23:29 +0100 Subject: [PATCH 5/6] Translated using Weblate (Indonesian) Currently translated at 80.0% (2200 of 2749) --- po/id.po | 188 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 130 insertions(+), 58 deletions(-) diff --git a/po/id.po b/po/id.po index 6b2700462b..12ec50a40c 100644 --- a/po/id.po +++ b/po/id.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-24 10:21+0200\n" +"PO-Revision-Date: 2014-01-27 08:23+0200\n" "Last-Translator: Dadan Setia \n" "Language-Team: Indonesian " "\n" @@ -5969,10 +5969,9 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:411 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximal number of table preferences to store" -msgstr "Jumlah maksimum tabel yang ditampilkan di daftar tabel" +msgstr "Jumlah maksimal preferensi tabel untuk menyimpan" #: libraries/config/messages.inc.php:412 msgid "Try to connect without password" @@ -5983,11 +5982,15 @@ msgid "Connect without password" msgstr "Tersambung tanpa sandi" #: libraries/config/messages.inc.php:414 +#, fuzzy msgid "" "You can use MySQL wildcard characters (% and _), escape them if you want to " "use their literal instances, i.e. use [kbd]'my\\_db'[/kbd] and not " "[kbd]'my_db'[/kbd]." msgstr "" +"Anda dapat menggunakan karakter wildcard MySQL (% dan _), loloskan jika " +"Anda ingin menggunakan contoh literal, yaitu gunakan [kbd]'my\\_db'[/kbd] dan " +"bukan [kbd]'my_db'[/kbd]." #: libraries/config/messages.inc.php:415 msgid "Show only listed databases" @@ -6567,7 +6570,7 @@ msgstr "" #: libraries/config/messages.inc.php:532 msgid "Proxy url" -msgstr "" +msgstr "Alamat proxy" #: libraries/config/messages.inc.php:533 msgid "" @@ -6575,22 +6578,23 @@ msgid "" "authentication is performed. If a username is supplied, Basic Authentication " "will be performed. No other types of authentication are currently supported." msgstr "" +"Nama pengguna untuk otentikasi dengan proxy. Secara default, tidak ada " +"otentikasi yang dilakukan. Jika nama pengguna diberikan, otentikasi dasar " +"akan dilakukan. Tidak ada jenis otentikasi lain yang didukung saat ini." #: libraries/config/messages.inc.php:534 -#, fuzzy #| msgid "Username" msgid "Proxy username" -msgstr "Nama Pengguna" +msgstr "Nama Pengguna Proxy" #: libraries/config/messages.inc.php:535 msgid "The password for authenticating with the proxy" msgstr "" #: libraries/config/messages.inc.php:536 -#, fuzzy #| msgid "Password" msgid "Proxy password" -msgstr "Kata Sandi" +msgstr "Password proxy" #: libraries/config/messages.inc.php:538 msgid "" @@ -6608,7 +6612,7 @@ msgstr "" #: libraries/config/messages.inc.php:541 msgid "Public key for reCaptcha" -msgstr "" +msgstr "Kunci publik untuk reCaptcha" #: libraries/config/messages.inc.php:542 msgid "Enter your private key for your domain reCaptcha service" @@ -6616,21 +6620,20 @@ msgstr "" #: libraries/config/messages.inc.php:543 msgid "Private key for reCaptcha" -msgstr "" +msgstr "Kunci privat untuk reCaptcha" #: libraries/config/messages.inc.php:545 msgid "Choose the default action when sending error reports" msgstr "" #: libraries/config/messages.inc.php:546 -#, fuzzy #| msgid "Server port" msgid "Send error reports" -msgstr "Porta server" +msgstr "Kirim laporan kesalahan" #: libraries/config/setup.forms.php:41 msgid "Config authentication" -msgstr "Autentikasi config" +msgstr "Konfigurasi Autentikasi" #: libraries/config/setup.forms.php:45 msgid "Cookie authentication" @@ -6652,10 +6655,9 @@ msgstr "CSV menggunakan LOAD DATA" #: libraries/config/setup.forms.php:265 libraries/config/setup.forms.php:359 #: libraries/config/user_preferences.forms.php:164 #: libraries/config/user_preferences.forms.php:257 -#, fuzzy #| msgid "Open Document Spreadsheet" msgid "OpenDocument Spreadsheet" -msgstr "Open Document Spreadsheet" +msgstr "Lembar sebar OpenDocument" #: libraries/config/setup.forms.php:272 #: libraries/config/user_preferences.forms.php:171 @@ -6684,10 +6686,9 @@ msgstr "Microsoft Word 2000" #: libraries/config/setup.forms.php:363 #: libraries/config/user_preferences.forms.php:261 -#, fuzzy #| msgid "Open Document Text" msgid "OpenDocument Text" -msgstr "Open Document Text" +msgstr "Teks OpenDocument" #: libraries/core.lib.php:287 #, php-format @@ -6696,12 +6697,12 @@ msgstr "Ekstensi %s tidak ditemukan. Harap periksa konfigurasi PHP Anda." #: libraries/core.lib.php:446 msgid "possible deep recursion attack" -msgstr "" +msgstr "Memungkinkan serangan rekursi dalam" #: libraries/database_interface.inc.php:34 #, php-format msgid "See %sour documentation%s for more information." -msgstr "" +msgstr "Lihat %sdokumentasi kami%s untuk informasi lebih lanjut." #: libraries/dbi/DBIDrizzle.class.php:146 libraries/dbi/DBIMysql.class.php:170 #: libraries/dbi/DBIMysqli.class.php:224 @@ -6711,17 +6712,17 @@ msgstr "" #: libraries/dbi/drizzle-wrappers.lib.php:385 msgid "Can't seek in an unbuffered result set" -msgstr "" +msgstr "Tidak dapat mencari dalam hasil set unbuffered" #: libraries/dbi/drizzle-wrappers.lib.php:406 msgid "Can't count rows in an unbuffered result set" -msgstr "" +msgstr "Tidak bisa menghitung baris dalam hasil set unbuffered" #: libraries/display_change_password.lib.php:53 #: libraries/replication_gui.lib.php:851 #: libraries/server_privileges.lib.php:1453 msgid "No Password" -msgstr "Kata Sandi belum ditetapkan" +msgstr "Kata Sandi tidak ditetapkan" #: libraries/display_change_password.lib.php:61 #: libraries/plugins/auth/AuthenticationCookie.class.php:225 @@ -6733,10 +6734,9 @@ msgstr "Kata Sandi:" #: libraries/display_change_password.lib.php:67 #: libraries/replication_gui.lib.php:862 #: libraries/server_privileges.lib.php:1468 -#, fuzzy #| msgid "Re-type" msgid "Re-type:" -msgstr "Ketik ulang" +msgstr "Ketik ulang:" #: libraries/display_change_password.lib.php:74 #, fuzzy @@ -6757,10 +6757,9 @@ msgid "Create" msgstr "Buat" #: libraries/display_create_database.lib.php:51 -#, fuzzy #| msgid "Create database" msgid "Create database:" -msgstr "Buat basis data" +msgstr "Buat basis data:" #: libraries/display_create_database.lib.php:61 #: libraries/server_privileges.lib.php:3789 server_privileges.php:130 @@ -6840,6 +6839,8 @@ msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Gulir ke bawah untuk mengisi pilihan untuk format yang dipilih dan " +"mengabaikan pilihan untuk format lain." #: libraries/display_export.lib.php:283 libraries/display_import.lib.php:353 msgid "Encoding Conversion:" @@ -6887,16 +6888,20 @@ msgid ", @TABLE@ will become the table name" msgstr ", @TABLE@ akan menjadi nama tabel" #: libraries/display_export.lib.php:453 -#, php-format +#, fuzzy, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " "formatting strings. Additionally the following transformations will happen: " "%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" +"Nilai ini ditafsir menggunakan %1$sstrftime%2$s, sehingga Anda dapat " +"menggunakan format string waktu. Tambahan ditransformasi sehingga menjadi: " +"%3$s. Teks lain akan disimpan seperti biasa. Lihat %4$sFAQ%5$s untuk " +"rincian." #: libraries/display_export.lib.php:510 msgid "use this for future exports" -msgstr "" +msgstr "gunakan ini untuk ekspor kedepannya" #: libraries/display_export.lib.php:525 libraries/display_import.lib.php:182 #: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:504 @@ -6926,33 +6931,35 @@ msgstr "Simpan hasil ke suatu berkas" #: libraries/display_git_revision.lib.php:56 #, php-format msgid "%1$s from %2$s branch" -msgstr "" +msgstr "cabang %1$s dari %2$s" #: libraries/display_git_revision.lib.php:58 msgid "no branch" -msgstr "" +msgstr "Tidak bercabang" #: libraries/display_git_revision.lib.php:64 msgid "Git revision:" -msgstr "" +msgstr "Revisi Git:" #: libraries/display_git_revision.lib.php:67 -#, fuzzy, php-format +#, php-format #| msgid "Create version %s of %s.%s" msgid "committed on %1$s by %2$s" -msgstr "Buat versi %s dari %s.%s" +msgstr "committ pada %1$s oleh %2$s" #: libraries/display_git_revision.lib.php:75 -#, fuzzy, php-format +#, php-format #| msgid "Create version %s of %s.%s" msgid "authored on %1$s by %2$s" -msgstr "Buat versi %s dari %s.%s" +msgstr "Ditulis pada %1$s oleh %2$s" #: libraries/display_import.lib.php:74 msgid "" "Please be patient, the file is being uploaded. Details about the upload are " "not available." msgstr "" +"Harap bersabar, file sedang diunggah. Rincian tentang pengunggahan tidak " +"tersedia." #: libraries/display_import.lib.php:111 msgid "Importing into the current server" @@ -6998,6 +7005,8 @@ msgstr "Impor Parsial:" msgid "" "Previous import timed out, after resubmitting will continue from position %d." msgstr "" +"Proses impor sebelumnya kehabisan waktu, setelah mengirimkan kembali akan " +"dilanjutkan dari posisi %d." #: libraries/display_import.lib.php:293 #, fuzzy @@ -11768,10 +11777,12 @@ msgid "END CUT" msgstr "Akhiri potong (CUT)" #: libraries/sqlparser.lib.php:195 +#, fuzzy msgid "BEGIN RAW" msgstr "MULAI mentah (RAW)" #: libraries/sqlparser.lib.php:199 +#, fuzzy msgid "END RAW" msgstr "AKHIRI mentah (RAW)" @@ -12932,14 +12943,18 @@ msgid "" "Reading of version failed. Maybe you're offline or the upgrade server does " "not respond." msgstr "" +"Pembacaan versi gagal. Mungkin Anda sedang offline atau server upgrade tidak " +"merespon." #: setup/lib/index.lib.php:132 +#, fuzzy msgid "Got invalid version string from server" -msgstr "" +msgstr "Mendapatkan string versi tidak valid dari server" #: setup/lib/index.lib.php:145 +#, fuzzy msgid "Unparsable version string" -msgstr "" +msgstr "Unparsable string versi" #: setup/lib/index.lib.php:165 #, php-format @@ -12947,10 +12962,12 @@ msgid "" "You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable " "version is %s, released on %s." msgstr "" +"Anda menggunakan versi Git, jalankan [kbd]git pull[/kbd] :-)[br] Versi " +"stabil terbaru adalah %s, dirilis pada %s." #: setup/lib/index.lib.php:172 msgid "No newer stable version is available" -msgstr "" +msgstr "Tidak ada versi stabil baru yang tersedia" #: setup/lib/index.lib.php:218 #, php-format @@ -13119,12 +13136,14 @@ msgid "No data to display" msgstr "Tidak ada data" #: tbl_chart.php:62 tbl_gis_visualization.php:24 +#, fuzzy msgid "No SQL query was set to fetch data." -msgstr "" +msgstr "Tidak ada query SQL ditetapkan untuk mengambil data." #: tbl_chart.php:124 +#, fuzzy msgid "No numeric columns present in the table to plot." -msgstr "" +msgstr "Tidak ada kolom numerik yang muncul dalam tabel untuk perencanaan." #: tbl_create.php:30 tbl_get_field.php:25 #, php-format @@ -13215,22 +13234,26 @@ msgstr "Hapus tabel (DROP)" #: libraries/advisory_rules.txt:49 msgid "Uptime below one day" -msgstr "" +msgstr "Uptime kurang dari satu hari" #: libraries/advisory_rules.txt:52 +#, fuzzy msgid "Uptime is less than 1 day, performance tuning may not be accurate." -msgstr "" +msgstr "Uptime kurang dari 1 hari, tuning kinerja mungkin tidak akurat." #: libraries/advisory_rules.txt:53 +#, fuzzy msgid "" "To have more accurate averages it is recommended to let the server run for " "longer than a day before running this analyzer" msgstr "" +"Untuk memiliki rata-rata yang lebih akurat dianjurkan untuk membiarkan " +"server berjalan selama lebih dari satu hari sebelum menjalankan analisa ini" #: libraries/advisory_rules.txt:54 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "Uptime hanya %s" #: libraries/advisory_rules.txt:56 msgid "Questions below 1,000" @@ -13245,10 +13268,13 @@ msgstr "" "mungkin tidak akurat." #: libraries/advisory_rules.txt:60 +#, fuzzy msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." msgstr "" +"Biarkan server berjalan untuk waktu yang lama sampai telah dieksekusi " +"sejumlah besar pertanyaan." #: libraries/advisory_rules.txt:61 #, php-format @@ -13260,29 +13286,37 @@ msgid "Percentage of slow queries" msgstr "Persentase kueri lambat" #: libraries/advisory_rules.txt:66 +#, fuzzy msgid "" "There is a lot of slow queries compared to the overall amount of Queries." msgstr "" +"Ada banyak query yang lambat dibandingkan dengan jumlah keseluruhan Query." #: libraries/advisory_rules.txt:67 libraries/advisory_rules.txt:74 +#, fuzzy msgid "" "You might want to increase {long_query_time} or optimize the queries listed " "in the slow query log" msgstr "" +"Anda mungkin ingin meningkatkan {long_query_time} atau mengoptimalkan query " +"tercantum dalam log lambat permintaan" #: libraries/advisory_rules.txt:68 #, php-format msgid "The slow query rate should be below 5%%, your value is %s%%." -msgstr "" +msgstr "Tingkat lambat permintaan harus di bawah 5%%, nilai Anda adalah %s%%." #: libraries/advisory_rules.txt:70 msgid "Slow query rate" msgstr "Laju kueri lambat" #: libraries/advisory_rules.txt:73 +#, fuzzy msgid "" "There is a high percentage of slow queries compared to the server uptime." msgstr "" +"Ada persentase yang tinggi dari query lambat dibandingkan dengan server " +"uptime." #: libraries/advisory_rules.txt:75 #, fuzzy, php-format @@ -13301,16 +13335,22 @@ msgid "Long query time" msgstr "Waktu kueri panjang" #: libraries/advisory_rules.txt:80 +#, fuzzy msgid "" "{long_query_time} is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." msgstr "" +"{long_query_time} diatur ke 10 detik atau lebih, sehingga hanya query lambat " +"yang mengambil di atas 10 detik login." #: libraries/advisory_rules.txt:81 +#, fuzzy msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." msgstr "" +"Disarankan untuk mengatur {long_query_time} ke nilai yang lebih rendah, " +"tergantung pada lingkungan Anda. Biasanya nilai dari 1-5 detik disarankan." #: libraries/advisory_rules.txt:82 #, fuzzy, php-format @@ -13329,10 +13369,13 @@ msgid "The slow query log is disabled." msgstr "slow_query_log diaktifkan." #: libraries/advisory_rules.txt:88 +#, fuzzy msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"Aktifkan logging query lambar dengan menetapkan {log_slow_queries} ke 'ON'. " +"Ini akan membantu pemecahan masalah buruk melakukan query." #: libraries/advisory_rules.txt:89 #, fuzzy @@ -13341,10 +13384,13 @@ msgid "log_slow_queries is set to 'OFF'" msgstr "long_query_time disetel menjadi %d detik." #: libraries/advisory_rules.txt:95 +#, fuzzy msgid "" "Enable slow query logging by setting {slow_query_log} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"Aktifkan logging query dengan menetapkan {slow_query_log} ke 'ON'. Ini akan " +"membantu pemecahan masalah buruk melakukan query." #: libraries/advisory_rules.txt:96 #, fuzzy @@ -13358,13 +13404,16 @@ msgstr "Seri Rilis" #: libraries/advisory_rules.txt:103 msgid "The MySQL server version less than 5.1." -msgstr "" +msgstr "Versi Server MySQL dibawah 5.1." #: libraries/advisory_rules.txt:104 +#, fuzzy msgid "" "You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 " "even more so." msgstr "" +"Anda harus meng-upgrade, seperti MySQL 5.1 telah meningkatkan kinerja, dan " +"MySQL 5.5 bahkan lebih." #: libraries/advisory_rules.txt:105 libraries/advisory_rules.txt:112 #: libraries/advisory_rules.txt:119 @@ -13377,18 +13426,23 @@ msgid "Minor Version" msgstr "Versi Minor" #: libraries/advisory_rules.txt:110 +#, fuzzy msgid "Version less than 5.1.30 (the first GA release of 5.1)." -msgstr "" +msgstr "Versi kurang dari 5.1.30 (GA rilis pertama dari 5.1)." #: libraries/advisory_rules.txt:111 +#, fuzzy msgid "" "You should upgrade, as recent versions of MySQL 5.1 have improved " "performance and MySQL 5.5 even more so." msgstr "" +"Anda harus meng-upgrade, karena versi terbaru MySQL 5.1 telah meningkatkan " +"kinerja dan MySQL 5.5 bahkan lebih." #: libraries/advisory_rules.txt:117 +#, fuzzy msgid "Version less than 5.5.8 (the first GA release of 5.5)." -msgstr "" +msgstr "Versi kurang dari 5.5.8 (GA rilis pertama dari 5.5)." #: libraries/advisory_rules.txt:118 msgid "You should upgrade, to a stable version of MySQL 5.5" @@ -13400,60 +13454,73 @@ msgid "Distribution" msgstr "Distribusi" #: libraries/advisory_rules.txt:124 +#, fuzzy msgid "Version is compiled from source, not a MySQL official binary." -msgstr "" +msgstr "Versi dikompilasi dari sumber, bukan biner resmi MySQL." #: libraries/advisory_rules.txt:125 +#, fuzzy msgid "" "If you did not compile from source, you may be using a package modified by a " "distribution. The MySQL manual only is accurate for official MySQL binaries, " "not any package distributions (such as RedHat, Debian/Ubuntu etc)." msgstr "" +"Jika Anda tidak mengkompilasi dari source, Anda mungkin menggunakan paket " +"dimodifikasi oleh distribusi. The MySQL manual saja cukup akurat untuk MySQL " +"binari resmi, tidak ada distribusi paket (seperti RedHat, Debian / Ubuntu " +"dll)." #: libraries/advisory_rules.txt:126 msgid "'source' found in version_comment" -msgstr "" +msgstr "'source' ditemukan pada version_comment" #: libraries/advisory_rules.txt:131 libraries/advisory_rules.txt:138 +#, fuzzy msgid "The MySQL manual only is accurate for official MySQL binaries." -msgstr "" +msgstr "The MySQL manual saja cukup akurat untuk MySQL binari resmi." #: libraries/advisory_rules.txt:132 msgid "Percona documentation is at http://www.percona.com/docs/wiki/" -msgstr "" +msgstr "Dokumentasi Percona di http://www.percona.com/docs/wiki/" #: libraries/advisory_rules.txt:133 msgid "'percona' found in version_comment" -msgstr "" +msgstr "'percona' ditemukan pada version_comment" #: libraries/advisory_rules.txt:139 msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "" +msgstr "Dokumentasi Drizzle di http://docs.drizzle.org/" #: libraries/advisory_rules.txt:140 -#, php-format +#, fuzzy, php-format msgid "Version string (%s) matches Drizzle versioning scheme" -msgstr "" +msgstr "String Version (%s) cocok Gerimis skema versi" #: libraries/advisory_rules.txt:142 msgid "MySQL Architecture" msgstr "Arsitektur MySQL" #: libraries/advisory_rules.txt:145 +#, fuzzy msgid "MySQL is not compiled as a 64-bit package." -msgstr "" +msgstr "MySQL tidak dikompilasi sebagai paket 64-bit." #: libraries/advisory_rules.txt:146 +#, fuzzy msgid "" "Your memory capacity is above 3 GiB (assuming the Server is on localhost), " "so MySQL might not be able to access all of your memory. You might want to " "consider installing the 64-bit version of MySQL." msgstr "" +"Kapasitas memori Anda di atas 3 GiB (dengan asumsi Server adalah pada " +"localhost), sehingga MySQL mungkin tidak dapat mengakses semua memori Anda. " +"Anda mungkin ingin mempertimbangkan untuk menginstal versi 64-bit dari " +"MySQL." #: libraries/advisory_rules.txt:147 -#, php-format +#, fuzzy, php-format msgid "Available memory on this host: %s" -msgstr "" +msgstr "Tersedia memori pada host ini: %s" #: libraries/advisory_rules.txt:153 msgid "Query cache disabled" @@ -13464,12 +13531,17 @@ msgid "The query cache is not enabled." msgstr "Singgahan kueri tidak diaktifkan." #: libraries/advisory_rules.txt:157 +#, fuzzy msgid "" "The query cache is known to greatly improve performance if configured " "correctly. Enable it by setting {query_cache_size} to a 2 digit MiB value " "and setting {query_cache_type} to 'ON'. Note: If you are using " "memcached, ignore this recommendation." msgstr "" +"The cache query dikenal untuk lebih meningkatkan kinerja jika dikonfigurasi " +"dengan benar. Aktifkan dengan menetapkan {query_cache_size} ke 2 digit MiB " +"nilai dan pengaturan {query_cache_type} ke 'ON'. Catatan: Jika Anda " +"menggunakan memcached, mengabaikan rekomendasi ini." #: libraries/advisory_rules.txt:158 #, fuzzy From e3cdf91e225e31d83afbb18e997b92ad7176359b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Jan 2014 12:43:56 -0500 Subject: [PATCH 6/6] ChangeLog entry for fix of bug #4245 Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 7839fd2143..2ece009e83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.1.7.0 (not yet released) +- bug #4245 initial Browse query does not match sorting order 4.1.6.0 (2014-01-26) - bug #4232 User not found after creating the user