- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1894-gcc05f48
by Madhura Jayaratne 11 Apr '11

11 Apr '11

The branch, master has been updated via cc05f48f3c97507a9be778d411844bad83d21d0b (commit) via 63dd25baac73cafd55e8c44ab49ab50d22443461 (commit) from 5d147c25affd72bba06b86d131c272bceb361f4d (commit) - Log ----------------------------------------------------------------- commit cc05f48f3c97507a9be778d411844bad83d21d0b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Mon Apr 11 10:55:58 2011 +0530 Bug #3207730 [AJAX] Inline edit and Relational display column commit 63dd25baac73cafd55e8c44ab49ab50d22443461 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Apr 10 20:33:17 2011 +0530 Code formatting to improve readability. ----------------------------------------------------------------------- Summary of changes: js/sql.js | 28 +++++++++++++++++----------- sql.php | 43 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 14 deletions(-) diff --git a/js/sql.js b/js/sql.js index 1444b15..28c7287 100644 --- a/js/sql.js +++ b/js/sql.js @@ -785,6 +785,10 @@ $(document).ready(function() { */ var relation_fields = {}; /** + * @var relational_display string 'K' if relational key, 'D' if relational display column + */ + var relational_display = $("#relational_display_K").attr('checked') ? 'K' : 'D'; + /** * @var transform_fields Array containing the name/value pairs for transformed fields */ var transform_fields = {}; @@ -800,15 +804,16 @@ $(document).ready(function() { var need_to_post = false; - var new_clause=''; - var prev_index=-1; + var new_clause = ''; + var prev_index = -1; $input_siblings.each(function() { /** @lends jQuery */ /** * @var this_field Object referring to this field (<td>) */ - var $this_field = $(this); + var $this_field = $(this); + /** * @var field_name String containing the name of this field. * @see getFieldName() @@ -861,7 +866,7 @@ $(document).ready(function() { } } if(where_clause.indexOf(field_name) > prev_index){ - new_clause += '`'+window.parent.table+'`.'+'`' + field_name + "` = '"+this_field_params[field_name].replace(/'/g,"''")+"'"+' AND '; + new_clause += '`' + window.parent.table + '`.' + '`' + field_name + "` = '" + this_field_params[field_name].replace(/'/g,"''") + "'" + ' AND '; } if (this_field_params[field_name] != $this_field.data('original_data')) { sql_query += ' `' + field_name + "`='" + this_field_params[field_name].replace(/'/g, "''") + "' , "; @@ -876,8 +881,8 @@ $(document).ready(function() { //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); - new_clause=new_clause.substring(0,new_clause.length-5); - new_clause=PMA_urlencode(new_clause); + new_clause = new_clause.substring(0, new_clause.length-5); + new_clause = PMA_urlencode(new_clause); sql_query += ' WHERE ' + PMA_urldecode(where_clause); /** * @var rel_fields_list String, url encoded representation of {@link relations_fields} @@ -890,8 +895,8 @@ $(document).ready(function() { var transform_fields_list = $.param(transform_fields); // if inline_edit is successful, we need to go back to default view - var $del_hide=$(this).parent(); - var $chg_submit=$(this); + var $del_hide = $(this).parent(); + var $chg_submit = $(this); if (need_to_post) { // Make the Ajax post after setting all parameters @@ -909,6 +914,7 @@ $(document).ready(function() { 'rel_fields_list' : rel_fields_list, 'do_transformations' : transformation_fields, 'transform_fields_list' : transform_fields_list, + 'relational_display' : relational_display, 'goto' : 'sql.php', 'submit_type' : 'save' }; @@ -917,10 +923,10 @@ $(document).ready(function() { if(data.success == true) { PMA_ajaxShowMessage(data.message); if(disp_mode == 'vertical') { - $this_td.parents('tbody').find('tr').find('.where_clause:nth('+this_td_index+')').attr('value',new_clause); + $this_td.parents('tbody').find('tr').find('.where_clause:nth(' + this_td_index + ')').attr('value', new_clause); } else { - $this_td.parent('tr').find('.where_clause').attr('value',new_clause); + $this_td.parent('tr').find('.where_clause').attr('value', new_clause); } // remove possible previous feedback message $('#result_query').remove(); @@ -1026,7 +1032,7 @@ function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, if (typeof data.relations != 'undefined') { $.each(data.relations, function(key, value) { if(key == field_name) { - new_html = $(value).append(new_value); + new_html = $(value); return false; } }) diff --git a/sql.php b/sql.php index ce2f65f..e9373f2 100644 --- a/sql.php +++ b/sql.php @@ -654,6 +654,34 @@ if (0 == $num_rows || $is_affected) { foreach( $rel_fields as $rel_field => $rel_field_value) { $where_comparison = "='" . $rel_field_value . "'"; + $display_field = PMA_getDisplayField($map[$rel_field]['foreign_db'], $map[$rel_field]['foreign_table']); + + // Field to display from the foreign table? + if (isset($display_field) && strlen($display_field)) { + $dispsql = 'SELECT ' . PMA_backquote($display_field) + . ' FROM ' . PMA_backquote($map[$rel_field]['foreign_db']) + . '.' . PMA_backquote($map[$rel_field]['foreign_table']) + . ' WHERE ' . PMA_backquote($map[$rel_field]['foreign_field']) + . $where_comparison; + $dispresult = PMA_DBI_try_query($dispsql, null, PMA_DBI_QUERY_STORE); + if ($dispresult && PMA_DBI_num_rows($dispresult) > 0) { + list($dispval) = PMA_DBI_fetch_row($dispresult, 0); + } else { + //$dispval = __('Link not found'); + } + @PMA_DBI_free_result($dispresult); + } else { + $dispval = ''; + } // end if... else... + + if ('K' == $_SESSION['tmp_user_values']['relational_display']) { + // user chose "relational key" in the display options, so + // the title contains the display field + $title = (! empty($dispval))? ' title="' . htmlspecialchars($dispval) . '"' : ''; + } else { + $title = ' title="' . htmlspecialchars($rel_field_value) . '"'; + } + $_url_params = array( 'db' => $map[$rel_field]['foreign_db'], 'table' => $map[$rel_field]['foreign_table'], @@ -663,9 +691,18 @@ if (0 == $num_rows || $is_affected) { . ' WHERE ' . PMA_backquote($map[$rel_field]['foreign_field']) . $where_comparison ); - - $extra_data['relations'][$rel_field] = '<a href="sql.php' . PMA_generate_common_url($_url_params) . '">'; - $extra_data['relations'][$rel_field] .= '</a>'; + $output = '<a href="sql.php' . PMA_generate_common_url($_url_params) . '"' . $title . '>'; + + if ('D' == $_SESSION['tmp_user_values']['relational_display']) { + // user chose "relational display field" in the + // display options, so show display field in the cell + $output .= (!empty($dispval)) ? htmlspecialchars($dispval) : ''; + } else { + // otherwise display data in the cell + $output .= htmlspecialchars($rel_field_value); + } + $output .= '</a>'; + $extra_data['relations'][$rel_field] = $output; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1892-g5d147c2
by Marc Delisle 10 Apr '11

10 Apr '11

The branch, master has been updated via 5d147c25affd72bba06b86d131c272bceb361f4d (commit) from e083d8438afe74c8568c922e943f09e161435d40 (commit) - Log ----------------------------------------------------------------- commit 5d147c25affd72bba06b86d131c272bceb361f4d Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Apr 10 09:01:31 2011 -0400 Bug #3281316 Loading message stays on screen for too long ----------------------------------------------------------------------- Summary of changes: js/sql.js | 16 +++++++++------- sql.php | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/js/sql.js b/js/sql.js index 6895b16..1444b15 100644 --- a/js/sql.js +++ b/js/sql.js @@ -264,13 +264,15 @@ $(document).ready(function() { $('.success').fadeOut(); $('.sqlquery_message').fadeOut(); // show a message that stays on screen - $('#sqlqueryform').before(data.message); - // and display the query - $('<div class="sqlquery_message"></div>') - .html(data.sql_query) - .insertBefore('#sqlqueryform'); - // unnecessary div that came from data.sql_query - $('.notice').remove(); + if (typeof data.sql_query != 'undefined') { + $('<div class="sqlquery_message"></div>') + .html(data.sql_query) + .insertBefore('#sqlqueryform'); + // unnecessary div that came from data.sql_query + $('.notice').remove(); + } else { + $('#sqlqueryform').before(data.message); + } $('#sqlqueryresults').show(); // this happens if a USE command was typed if (typeof data.reload != 'undefined') { diff --git a/sql.php b/sql.php index eb6dc52..ce2f65f 100644 --- a/sql.php +++ b/sql.php @@ -710,7 +710,7 @@ if (0 == $num_rows || $is_affected) { } if ($cfg['ShowSQL']) { - $extra_data['result_query'] = PMA_showMessage($message, $GLOBALS['sql_query'], 'success'); + $extra_data['sql_query'] = PMA_showMessage($message, $GLOBALS['sql_query'], 'success'); } if (isset($GLOBALS['reload']) && $GLOBALS['reload'] == 1) { $extra_data['reload'] = 1; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1891-ge083d84
by Madhura Jayaratne 09 Apr '11

09 Apr '11

The branch, master has been updated via e083d8438afe74c8568c922e943f09e161435d40 (commit) from 514b852cd81da431b57db5ecdf2bd946882f4bdb (commit) - Log ----------------------------------------------------------------- commit e083d8438afe74c8568c922e943f09e161435d40 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Apr 9 12:03:56 2011 +0530 Bug #3281333 AJAX response does not remove old contents ----------------------------------------------------------------------- Summary of changes: js/sql.js | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/js/sql.js b/js/sql.js index 4e34126..6895b16 100644 --- a/js/sql.js +++ b/js/sql.js @@ -290,6 +290,9 @@ $(document).ready(function() { } else { // real results are returned + // fade out previous messages, if any + $('.success').fadeOut(); + $('.sqlquery_message').fadeOut(); $received_data = $(data); $zero_row_results = $received_data.find('textarea[name="sql_query"]'); // if zero rows are returned from the query execution hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 6cfdfaa0ef587eabd6a97e6937e724bf47fadba2
by Michal Čihař 08 Apr '11

08 Apr '11

The branch, master has been updated via 6cfdfaa0ef587eabd6a97e6937e724bf47fadba2 (commit) via 859263ea8cda34f55faa79551a08a16e0af0b3dd (commit) via d6c661db6ed5dc549a2ec6feff4927adf6667cda (commit) via a36641d0b8b111d5303c46511f0bbec83ae7220e (commit) via ba41eb1a1604ad70677a1dedf6b3c9159524f35a (commit) from 84fce9505aa8c9c24933dd1e56b6460ec11791b7 (commit) - Log ----------------------------------------------------------------- commit 6cfdfaa0ef587eabd6a97e6937e724bf47fadba2 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 8 15:11:11 2011 +0200 Update docs commit 859263ea8cda34f55faa79551a08a16e0af0b3dd Author: mjaning <mjaning(a)gmail.com> Date: Fri Apr 8 15:06:59 2011 +0200 Translation update done using Pootle. commit d6c661db6ed5dc549a2ec6feff4927adf6667cda Author: mjaning <mjaning(a)gmail.com> Date: Fri Apr 8 15:03:28 2011 +0200 Translation update done using Pootle. commit a36641d0b8b111d5303c46511f0bbec83ae7220e Author: mjaning <mjaning(a)gmail.com> Date: Fri Apr 8 14:55:24 2011 +0200 Translation update done using Pootle. commit ba41eb1a1604ad70677a1dedf6b3c9159524f35a Author: mjaning <mjaning(a)gmail.com> Date: Fri Apr 8 14:54:28 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/pt_BR/Documentation.html | 50 ++++++++++++++++++++------------------ po/pt_BR.po | 16 +++++++++++- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/output/pt_BR/Documentation.html b/output/pt_BR/Documentation.html index caec58a..a9fbeab 100644 --- a/output/pt_BR/Documentation.html +++ b/output/pt_BR/Documentation.html @@ -725,7 +725,7 @@ que o servidor Web.</dd> <tt>mysql</tt> : A extensão clássica do MySQL. Este é o método recomendado e também é o padrão neste momento. - <tt>mysqli</tt> : A extensão modernizada do MySQL. Esta extensão foi + <tt>mysqli</tt> : A extensão mais moderna do MySQL. Esta extensão foi disponibilizada com o php 5.0.0 e é método recomendado para se conectar a servidores rodando MySQL 4.1.x ou mais recentes.</dd> @@ -742,23 +742,23 @@ string </dt> <dd>Esta conta especial é usada para 2 finalidades específicas: para habilitar todos os recursos de relacionamento (veja <a href="#pmadb" -class="configrule">$cfg['Servers'][$i]['pmadb']</a>) e para um servidor +class="configrule">$cfg['Servers'][$i]['pmadb']</a>) e para um servidor MySQL que estiver rodando com <tt>--skip-show-database</tt>, para habilitar uma instalação mult-usuário (autenticação por modo <abbr title="HyperText Transfer Protocol">HTTP</abbr> ou COOKIE). - When using <abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie -authentication modes (or 'config' authentication mode since phpMyAdmin -2.2.1), you need to supply the details of a MySQL account that has -<tt>SELECT</tt> privilege on the mysql.user (all columns except -"Password"), mysql.db (all columns) and -mysql.tables_priv (all columns except "Grantor" and -"Timestamp") tables. This account is used to check what -databases the user will see at login. - Please see the <a href="#setup">install section</a> on "Using -authentication modes" for more information. - - In phpMyAdmin versions before 2.2.5, those were called + Quando for usar a autenticação por <abbr title="HyperText Transfer +Protocol">HTTP</abbr> ou cookie (ou autenticação modo 'config' desde o +phpMyAdmin 2.2.1), você deve informar os detalhes da conta MySQL que tenha +privilégio <tt>SELECT</tt> nas tabelas mysql.user (todas as colunas +exceto "Password"), mysql.db (todas as colunas) e +mysql.tables_priv (todas as colunas exceto "Grantor" e +"Timestamp") . Esta conta é usada para verificar qual o banco +de dados o usuário vai usar para o login. + Favor verificar a <a href="#setup">seção instalação</a> em "Usando +modos de autenticação" para maiores informações. + + Em versões anteriores ao phpMyAdmin 2.2.5, eles eram chamados de "stduser/stdpass".</dd> <dt id="cfg_Servers_auth_type">$cfg['Servers'][$i]['auth_type'] string <tt>['<abbr title="HyperText @@ -766,14 +766,16 @@ Transfer Protocol">HTTP</abbr>'|'http'|'cookie'|'config'|'signon']</tt></dt> <dd>Whether config or cookie or <abbr title="HyperText Transfer Protocol">HTTP</abbr> or signon authentication should be used for this server. - <ul><li>'config' authentication (<tt>$auth_type = 'config'</tt>) is the -plain old way: username and password are stored in config.inc.php.</li> - <li>'cookie' authentication mode (<tt>$auth_type = 'cookie'</tt>) as -introduced in 2.2.3 allows you to log in as any valid MySQL user with the -help of cookies. Username and password are stored in cookies during the -session and password is deleted when it ends. This can also allow you to log -in in arbitrary server if <tt><a href="#AllowArbitraryServer" -class="configrule">$cfg['AllowArbitraryServer']</a></tt> enabled. + <ul><li>autenticação por modo 'config' (<tt>$auth_type = 'config'</tt>) é +a boa e velha maneira de se fazer: username e password são armazenados em +config.inc.php.</li> + <li>autenticação por modo 'cookie' (<tt>$auth_type = 'cookie'</tt>) +introduzido na versão 2.2.3 permite você logar com quaisquer usuários +válidos do MySQL com a ajuda dos cookies. Username and password são +armazenados em cookies durante a sessão e a password é eliminada ao final da +sessão. Isto também permite você logar em um servidor arbitrário se o <tt><a +href="#AllowArbitraryServer" +class="configrule">$cfg['AllowArbitraryServer']</a></tt> estiver ativado. </li> <li>'<abbr title="HyperText Transfer Protocol">HTTP</abbr>' authentication (was called 'advanced' in previous versions and can be written also as 'http') @@ -791,8 +793,8 @@ href="#cfg_Servers_SignonURL" class="configrule">signon URL</a> to use this authentication method.</li> </ul> - Please see the <a href="#setup">install section</a> on "Using -authentication modes" for more information. + Favor verificar a <a href="#setup">seção instalação</a> em "Usando +modos de autenticação" para maiores informações. </dd> <dt id="servers_auth_http_realm"> <span diff --git a/po/pt_BR.po b/po/pt_BR.po index d207b17..d10c93f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-06 10:05+0300\n" -"PO-Revision-Date: 2011-04-07 19:33+0200\n" +"PO-Revision-Date: 2011-04-08 15:06+0200\n" "Last-Translator: <mjaning(a)gmail.com>\n" "Language-Team: none\n" "Language: pt_BR\n" @@ -1981,6 +1981,8 @@ msgid "" "Please see the <a href=\"#setup\">install section</a> on "Using " "authentication modes" for more information." msgstr "" +"Favor verificar a <a href=\"#setup\">seção instalação</a> em "Usando " +"modos de autenticação" para maiores informações." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:737 @@ -1988,6 +1990,8 @@ msgid "" "In phpMyAdmin versions before 2.2.5, those were called "stduser/" "stdpass"." msgstr "" +"Em versões anteriores ao phpMyAdmin 2.2.5, eles eram chamados de " +""stduser/stdpass"." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:740 @@ -2011,6 +2015,9 @@ msgid "" "'config' authentication (<tt>$auth_type = 'config'</tt>) is the " "plain old way: username and password are stored in config.inc.php." msgstr "" +"autenticação por modo 'config' (<tt>$auth_type = 'config'</tt>) é " +"a boa e velha maneira de se fazer: username e password são armazenados em " +"config.inc.php." #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:748 @@ -2022,6 +2029,13 @@ msgid "" "in in arbitrary server if <tt><a href=\"#AllowArbitraryServer\" class=" "\"configrule\">$cfg['AllowArbitraryServer']</a></tt> enabled." msgstr "" +"autenticação por modo 'cookie' (<tt>$auth_type = 'cookie'</tt>) " +"introduzido na versão 2.2.3 permite você logar com quaisquer usuários " +"válidos do MySQL com a ajuda dos cookies. Username and password são " +"armazenados em cookies durante a sessão e a password é eliminada ao final da " +"sessão. Isto também permite você logar em um servidor arbitrário se o " +"<tt><a href=\"#AllowArbitraryServer\" " +"class=\"configrule\">$cfg['AllowArbitraryServer']</a></tt> estiver ativado." #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:756 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1890-g514b852
by Michal Čihař 07 Apr '11

07 Apr '11

The branch, master has been updated via 514b852cd81da431b57db5ecdf2bd946882f4bdb (commit) via 00e01e944653fa022b08957080f433565c02c101 (commit) via ee3f147f711627357bbf0a736bcf9ae8a7dd1c5f (commit) via 74ceeadf614dd498979f65a492b1a0467583aaa4 (commit) via 298147855e49fca744ba61fd5ae6586081abd875 (commit) via 3a1033a196d78e2f350527b082f682714d35ecb6 (commit) via a2673c7d976e7919dbede8ffb30d10682af6aa19 (commit) via 0f31c784e011f0816656a16203967252e5da1278 (commit) via cc1b99758268c222a2888f44b18fc95353acb926 (commit) via e21ad16c4eb94a90e72966a7c3bcea3c4f3ffd53 (commit) via 045895b672949267727ed709babb6ed24a09a45a (commit) via da0b79915f5da4b1fe765b35c33585b90a88a748 (commit) via c5751d1b07993ec81f952f552304cd6b4d1609c9 (commit) via ea8d2eb884b9497fe8a9c1a7c3f3f6c0854500f8 (commit) via 57b26f22d299fa844809f278d43d389cddca756a (commit) via 17ed1860628a573362df6109f60fa03554e996fd (commit) via ede4e62f74d64b30a1a6f0bdffa305ac19e18a26 (commit) via 057a8098b011f7adf02f2bdafcf982397343ffd5 (commit) via 203b6b55d2fa6b77fed46c07f92997886552af4a (commit) via 3cae8cb3181bf281a5771293f7eaa1a0961ad19d (commit) via f3e9de1c1b0510b94a816a26f1c02079ad0b75b2 (commit) via 49d5227989463fc102453098662977e28a3532a6 (commit) via bf7c7ceacafd9fa29b7e4c2ddc2d1ead4dc35b88 (commit) via 778318d01d01f1d44363642f75e387100a4b5400 (commit) via 3821ab32cbc0344cfdd0e27bdb3fb4b3c31b8312 (commit) via 35107c0a24e1fd35e4d01ed40cea47f4c741753e (commit) via 83696c20b1d5d0ae3ed381a4b0bc3a3a81a72ccc (commit) via b967424a0b732047cf28611b51330a9f658d9907 (commit) via 4fbe4606c1da1adcf09e4c25e559bb84de9c8920 (commit) via 9d96cb0b4775863bb52e34f9bfda16c46114f14b (commit) via abc9a32794e3f48d475a9fc93d56e6124db196d2 (commit) via d54bac2982812147ee977000850ddae3e79f0396 (commit) via 2fbf124cce1800de3b1a4f8eaae3385f4f12e320 (commit) via a5cbce1059e869627e2de7b4a12d1d4de3dcabc4 (commit) via cb66e0871042d8ab26ecb0dea3f58eddce8b9c74 (commit) via 4dd63774723b4154ce654741a8fb006419e23559 (commit) via e3f44f7378ba2570522a6c718d199d52a07fddee (commit) via 9c6f007982b93ba7966ae355eba365ff8650d647 (commit) via 28e8216998d0f2de4aca82f1d0b6b39bcdcb61af (commit) via db9a58805f9c168631d2cedd5a1a5a5c4c96119c (commit) via 799d556103b36360c2bc1bbebd6f78956634f4ff (commit) via 80f58ec8f32dcf967a9d4db41993f6b2e07698bf (commit) via 1e52f35fc9ca5f789a74f9a7f506ff6b97e1d88f (commit) via edab6f784e79c688fb656998c67048ecd1cbf8bc (commit) via 70d518427ccfad12bf7e6c60ad54776419b3f129 (commit) via 09de9d1b3095ecc06ce15a7b85aa6c38c1bba14a (commit) via dd282e229545d95f0079fcedf84aebe3ef42c383 (commit) via ab6bc7b2c6d87abfba86bd0bf2fe0aa8a2a95847 (commit) via 847c50a3198924dce591e9c93fd683b252ad2b91 (commit) via d6dfae7f798af8b175aafef3058fe6768a7b7fbd (commit) via c1d68988caac573d3292757b4e01dfc3328447fd (commit) via 60fd114c7b45be6bcb6a8c34e8a0c95a1f522d99 (commit) via f7f3a750246df04eff3ceb997d063ad19f4fc13d (commit) via 9a5361e4015570c5ee5476ff85d4677890035c7a (commit) via 18de72cc69726d5c9e7b99ce6e637c7ef357cf4a (commit) via 1c1045bb5a1cc3dac03eee68ab0aebaa6fc35b04 (commit) via 4d01da20d9dd4b10a77dd7f49a878f546f82ba28 (commit) via c8a76be9dced5cb07a3c2a9762a360fc90d90e30 (commit) via ce4ffa02a40385f375cc3e393e1cd75d88c6020e (commit) via f5cf22e5c0e2a8a84ebe6ad8504092a0f31d9782 (commit) via 3d1bd838f3d350e89570c0efcc09411d612b4c5c (commit) via 93c5a88744869a8caca320e36c55fe28da5ae401 (commit) via c142760f99e05ee4cc113bb8706957e911b53d88 (commit) via 35ea607e1f8261d661b67939c7f6e7664c3d4337 (commit) via 9d432a65a7a2e8ef35d568b131ed973efdedda61 (commit) via a3f59b787a6eb0245c8fae76e9f5bb50863aaea1 (commit) via bdbaed3ac887a41990e0ccac22ed04c3cb6b3bb1 (commit) via 3f040de54899f2b3e53e66adb731327b37897b99 (commit) via 24cb2ce7b38bc05ea545d31b5e00cd64505bd916 (commit) via 34690d6e4adf37d7ed32962fa4d76b6f7650af04 (commit) via 598b9c4f74a9b114f561e4db3904a7a400c0dcbe (commit) via 012e8c1f11b4607275d5e75ae5aee6d36d5395b0 (commit) via 459d1859923cd1c943bb15252c5543ba50d3d4af (commit) via c9d3586559660f2c0a3312157b5707c2f57c8721 (commit) via c0db3ae9922e67f27ca23a3780447b373959e7f2 (commit) via dcca19cefa4b8fbc921d3a9b82f876f394886989 (commit) via 244511594a081aeb2785ee61b9dbf135b0f2a6ce (commit) via d6b034159f762f7534c19e41236ab2e4e4006915 (commit) via 343cc39176dbeefcfb03e84c0c751c5b33d8c2e1 (commit) via 73277ff881db7f632f7b1f1585504299e994e723 (commit) via 4bc6b34909c408098ce8771522c8d53c2e1263b1 (commit) via f1654b211c67078cff20cfd06cf980428d641010 (commit) via c8b67bac934a4f0a2082980b9dd9b0d09b0607ab (commit) via 7b96e0a22ef6dc861d739f5cb7aaea6fc0ed2a6b (commit) via d7f2f398e9acfaeb198466f3018a1c5a9d6b6fd8 (commit) via 8eadab316bb79b5e7dee5036fd1dc9fab67210bb (commit) via 70522842d8d9f353da9043721c20bb1bf438c291 (commit) via 22fca441cd7faef4bc1dcac826df38608e0ef389 (commit) via 5d7e8d3c7085a3af94f58a6a69aeb25a0573afc5 (commit) via bbead4db6f88dd4d36a0149fbffb82e01b180160 (commit) via 0a276bf0ed1e022f784e77103a40e48347350635 (commit) via 90fb0edef03119aedb4732db5113c45bd7263fb9 (commit) via bb375dc26ab3f44b9bae717f52b402559a5da1b3 (commit) from f6fb9b46785dde20c09524a77fd200f44458e94c (commit) - Log ----------------------------------------------------------------- commit 514b852cd81da431b57db5ecdf2bd946882f4bdb Merge: f6fb9b46785dde20c09524a77fd200f44458e94c 00e01e944653fa022b08957080f433565c02c101 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Apr 7 20:12:44 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 00e01e944653fa022b08957080f433565c02c101 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:06:30 2011 +0200 Translation update done using Pootle. commit ee3f147f711627357bbf0a736bcf9ae8a7dd1c5f Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:05:51 2011 +0200 Translation update done using Pootle. commit 74ceeadf614dd498979f65a492b1a0467583aaa4 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:05:38 2011 +0200 Translation update done using Pootle. commit 298147855e49fca744ba61fd5ae6586081abd875 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:05:24 2011 +0200 Translation update done using Pootle. commit 3a1033a196d78e2f350527b082f682714d35ecb6 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:04:58 2011 +0200 Translation update done using Pootle. commit a2673c7d976e7919dbede8ffb30d10682af6aa19 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:04:37 2011 +0200 Translation update done using Pootle. commit 0f31c784e011f0816656a16203967252e5da1278 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:03:30 2011 +0200 Translation update done using Pootle. commit cc1b99758268c222a2888f44b18fc95353acb926 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:03:22 2011 +0200 Translation update done using Pootle. commit e21ad16c4eb94a90e72966a7c3bcea3c4f3ffd53 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:03:04 2011 +0200 Translation update done using Pootle. commit 045895b672949267727ed709babb6ed24a09a45a Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:01:23 2011 +0200 Translation update done using Pootle. commit da0b79915f5da4b1fe765b35c33585b90a88a748 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:00:59 2011 +0200 Translation update done using Pootle. commit c5751d1b07993ec81f952f552304cd6b4d1609c9 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:00:39 2011 +0200 Translation update done using Pootle. commit ea8d2eb884b9497fe8a9c1a7c3f3f6c0854500f8 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 17:00:26 2011 +0200 Translation update done using Pootle. commit 57b26f22d299fa844809f278d43d389cddca756a Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:59:58 2011 +0200 Translation update done using Pootle. commit 17ed1860628a573362df6109f60fa03554e996fd Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:59:13 2011 +0200 Translation update done using Pootle. commit ede4e62f74d64b30a1a6f0bdffa305ac19e18a26 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:58:59 2011 +0200 Translation update done using Pootle. commit 057a8098b011f7adf02f2bdafcf982397343ffd5 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:58:52 2011 +0200 Translation update done using Pootle. commit 203b6b55d2fa6b77fed46c07f92997886552af4a Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:58:23 2011 +0200 Translation update done using Pootle. commit 3cae8cb3181bf281a5771293f7eaa1a0961ad19d Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:58:00 2011 +0200 Translation update done using Pootle. commit f3e9de1c1b0510b94a816a26f1c02079ad0b75b2 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:57:55 2011 +0200 Translation update done using Pootle. commit 49d5227989463fc102453098662977e28a3532a6 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:57:43 2011 +0200 Translation update done using Pootle. commit bf7c7ceacafd9fa29b7e4c2ddc2d1ead4dc35b88 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:57:26 2011 +0200 Translation update done using Pootle. commit 778318d01d01f1d44363642f75e387100a4b5400 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:56:57 2011 +0200 Translation update done using Pootle. commit 3821ab32cbc0344cfdd0e27bdb3fb4b3c31b8312 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:56:46 2011 +0200 Translation update done using Pootle. commit 35107c0a24e1fd35e4d01ed40cea47f4c741753e Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:56:33 2011 +0200 Translation update done using Pootle. commit 83696c20b1d5d0ae3ed381a4b0bc3a3a81a72ccc Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:55:57 2011 +0200 Translation update done using Pootle. commit b967424a0b732047cf28611b51330a9f658d9907 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:55:43 2011 +0200 Translation update done using Pootle. commit 4fbe4606c1da1adcf09e4c25e559bb84de9c8920 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:55:25 2011 +0200 Translation update done using Pootle. commit 9d96cb0b4775863bb52e34f9bfda16c46114f14b Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:55:17 2011 +0200 Translation update done using Pootle. commit abc9a32794e3f48d475a9fc93d56e6124db196d2 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:54:34 2011 +0200 Translation update done using Pootle. commit d54bac2982812147ee977000850ddae3e79f0396 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:54:24 2011 +0200 Translation update done using Pootle. commit 2fbf124cce1800de3b1a4f8eaae3385f4f12e320 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:54:13 2011 +0200 Translation update done using Pootle. commit a5cbce1059e869627e2de7b4a12d1d4de3dcabc4 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:53:51 2011 +0200 Translation update done using Pootle. commit cb66e0871042d8ab26ecb0dea3f58eddce8b9c74 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:53:17 2011 +0200 Translation update done using Pootle. commit 4dd63774723b4154ce654741a8fb006419e23559 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:53:00 2011 +0200 Translation update done using Pootle. commit e3f44f7378ba2570522a6c718d199d52a07fddee Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:52:26 2011 +0200 Translation update done using Pootle. commit 9c6f007982b93ba7966ae355eba365ff8650d647 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:52:22 2011 +0200 Translation update done using Pootle. commit 28e8216998d0f2de4aca82f1d0b6b39bcdcb61af Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:52:09 2011 +0200 Translation update done using Pootle. commit db9a58805f9c168631d2cedd5a1a5a5c4c96119c Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:50:49 2011 +0200 Translation update done using Pootle. commit 799d556103b36360c2bc1bbebd6f78956634f4ff Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:50:14 2011 +0200 Translation update done using Pootle. commit 80f58ec8f32dcf967a9d4db41993f6b2e07698bf Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:49:57 2011 +0200 Translation update done using Pootle. commit 1e52f35fc9ca5f789a74f9a7f506ff6b97e1d88f Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:49:43 2011 +0200 Translation update done using Pootle. commit edab6f784e79c688fb656998c67048ecd1cbf8bc Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:49:29 2011 +0200 Translation update done using Pootle. commit 70d518427ccfad12bf7e6c60ad54776419b3f129 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:49:07 2011 +0200 Translation update done using Pootle. commit 09de9d1b3095ecc06ce15a7b85aa6c38c1bba14a Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:47:55 2011 +0200 Translation update done using Pootle. commit dd282e229545d95f0079fcedf84aebe3ef42c383 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:46:59 2011 +0200 Translation update done using Pootle. commit ab6bc7b2c6d87abfba86bd0bf2fe0aa8a2a95847 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:46:42 2011 +0200 Translation update done using Pootle. commit 847c50a3198924dce591e9c93fd683b252ad2b91 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:46:20 2011 +0200 Translation update done using Pootle. commit d6dfae7f798af8b175aafef3058fe6768a7b7fbd Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:45:34 2011 +0200 Translation update done using Pootle. commit c1d68988caac573d3292757b4e01dfc3328447fd Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:44:08 2011 +0200 Translation update done using Pootle. commit 60fd114c7b45be6bcb6a8c34e8a0c95a1f522d99 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:43:58 2011 +0200 Translation update done using Pootle. commit f7f3a750246df04eff3ceb997d063ad19f4fc13d Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:43:41 2011 +0200 Translation update done using Pootle. commit 9a5361e4015570c5ee5476ff85d4677890035c7a Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:43:31 2011 +0200 Translation update done using Pootle. commit 18de72cc69726d5c9e7b99ce6e637c7ef357cf4a Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:43:19 2011 +0200 Translation update done using Pootle. commit 1c1045bb5a1cc3dac03eee68ab0aebaa6fc35b04 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:42:54 2011 +0200 Translation update done using Pootle. commit 4d01da20d9dd4b10a77dd7f49a878f546f82ba28 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:42:03 2011 +0200 Translation update done using Pootle. commit c8a76be9dced5cb07a3c2a9762a360fc90d90e30 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:41:52 2011 +0200 Translation update done using Pootle. commit ce4ffa02a40385f375cc3e393e1cd75d88c6020e Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:41:10 2011 +0200 Translation update done using Pootle. commit f5cf22e5c0e2a8a84ebe6ad8504092a0f31d9782 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:40:50 2011 +0200 Translation update done using Pootle. commit 3d1bd838f3d350e89570c0efcc09411d612b4c5c Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:40:36 2011 +0200 Translation update done using Pootle. commit 93c5a88744869a8caca320e36c55fe28da5ae401 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:40:27 2011 +0200 Translation update done using Pootle. commit c142760f99e05ee4cc113bb8706957e911b53d88 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:40:05 2011 +0200 Translation update done using Pootle. commit 35ea607e1f8261d661b67939c7f6e7664c3d4337 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:39:13 2011 +0200 Translation update done using Pootle. commit 9d432a65a7a2e8ef35d568b131ed973efdedda61 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:39:08 2011 +0200 Translation update done using Pootle. commit a3f59b787a6eb0245c8fae76e9f5bb50863aaea1 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:39:00 2011 +0200 Translation update done using Pootle. commit bdbaed3ac887a41990e0ccac22ed04c3cb6b3bb1 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:38:55 2011 +0200 Translation update done using Pootle. commit 3f040de54899f2b3e53e66adb731327b37897b99 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:38:50 2011 +0200 Translation update done using Pootle. commit 24cb2ce7b38bc05ea545d31b5e00cd64505bd916 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:38:44 2011 +0200 Translation update done using Pootle. commit 34690d6e4adf37d7ed32962fa4d76b6f7650af04 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:38:24 2011 +0200 Translation update done using Pootle. commit 598b9c4f74a9b114f561e4db3904a7a400c0dcbe Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:38:07 2011 +0200 Translation update done using Pootle. commit 012e8c1f11b4607275d5e75ae5aee6d36d5395b0 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:37:53 2011 +0200 Translation update done using Pootle. commit 459d1859923cd1c943bb15252c5543ba50d3d4af Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:37:35 2011 +0200 Translation update done using Pootle. commit c9d3586559660f2c0a3312157b5707c2f57c8721 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:37:04 2011 +0200 Translation update done using Pootle. commit c0db3ae9922e67f27ca23a3780447b373959e7f2 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:36:29 2011 +0200 Translation update done using Pootle. commit dcca19cefa4b8fbc921d3a9b82f876f394886989 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:35:51 2011 +0200 Translation update done using Pootle. commit 244511594a081aeb2785ee61b9dbf135b0f2a6ce Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:35:37 2011 +0200 Translation update done using Pootle. commit d6b034159f762f7534c19e41236ab2e4e4006915 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:35:31 2011 +0200 Translation update done using Pootle. commit 343cc39176dbeefcfb03e84c0c751c5b33d8c2e1 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:35:26 2011 +0200 Translation update done using Pootle. commit 73277ff881db7f632f7b1f1585504299e994e723 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:35:21 2011 +0200 Translation update done using Pootle. commit 4bc6b34909c408098ce8771522c8d53c2e1263b1 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:35:17 2011 +0200 Translation update done using Pootle. commit f1654b211c67078cff20cfd06cf980428d641010 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:35:13 2011 +0200 Translation update done using Pootle. commit c8b67bac934a4f0a2082980b9dd9b0d09b0607ab Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:35:09 2011 +0200 Translation update done using Pootle. commit 7b96e0a22ef6dc861d739f5cb7aaea6fc0ed2a6b Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:34:38 2011 +0200 Translation update done using Pootle. commit d7f2f398e9acfaeb198466f3018a1c5a9d6b6fd8 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:34:28 2011 +0200 Translation update done using Pootle. commit 8eadab316bb79b5e7dee5036fd1dc9fab67210bb Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:33:53 2011 +0200 Translation update done using Pootle. commit 70522842d8d9f353da9043721c20bb1bf438c291 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:33:43 2011 +0200 Translation update done using Pootle. commit 22fca441cd7faef4bc1dcac826df38608e0ef389 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:33:02 2011 +0200 Translation update done using Pootle. commit 5d7e8d3c7085a3af94f58a6a69aeb25a0573afc5 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:32:44 2011 +0200 Translation update done using Pootle. commit bbead4db6f88dd4d36a0149fbffb82e01b180160 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:32:16 2011 +0200 Translation update done using Pootle. commit 0a276bf0ed1e022f784e77103a40e48347350635 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:31:05 2011 +0200 Translation update done using Pootle. commit 90fb0edef03119aedb4732db5113c45bd7263fb9 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:30:11 2011 +0200 Translation update done using Pootle. commit bb375dc26ab3f44b9bae717f52b402559a5da1b3 Author: veeven <veeven(a)gmail.com> Date: Thu Apr 7 16:28:50 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/te.po | 217 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 95 insertions(+), 122 deletions(-) diff --git a/po/te.po b/po/te.po index ca63c57..d28f655 100644 --- a/po/te.po +++ b/po/te.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-07 13:07+0200\n" -"PO-Revision-Date: 2010-11-29 17:44+0200\n" -"Last-Translator: <veeven(a)gmail.com>\n" +"PO-Revision-Date: 2011-04-07 17:06+0200\n" +"Last-Translator: <veeven(a)gmail.com>\n" "Language-Team: Telugu <te(a)li.org>\n" "Language: te\n" "MIME-Version: 1.0\n" @@ -121,7 +121,7 @@ msgstr "" #: db_datadict.php:48 db_operations.php:364 msgid "Database comment: " -msgstr "డేటాబేస్ వివరణ" +msgstr "డేటాబేస్ వ్యాఖ్య:" #: db_datadict.php:158 libraries/schema/Pdf_Relation_Schema.class.php:1213 #: libraries/tbl_properties.inc.php:725 tbl_operations.php:358 @@ -408,8 +408,8 @@ msgstr "చివరి చూపు" #, php-format msgid "%s table" msgid_plural "%s tables" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s పట్టిక" +msgstr[1] "%s పట్టికలు" #: db_qbe.php:25 import.php:453 libraries/Message.class.php:190 #: libraries/display_tbl.lib.php:2036 libraries/sql_query_form.lib.php:140 @@ -566,12 +566,12 @@ msgid "Delete" msgstr "తొలగించు" #: db_search.php:272 -#, fuzzy, php-format +#, php-format #| msgid "Total: %s match(es)" msgid "Total: %s match" msgid_plural "Total: %s matches" -msgstr[0] "మొత్తం: %s పోలిక(లు)" -msgstr[1] "మొత్తం: %s పోలిక(లు)" +msgstr[0] "మొత్తం: %s పోలిక" +msgstr[1] "మొత్తం: %s పోలికలు" #: db_search.php:295 msgid "Search in database" @@ -684,7 +684,7 @@ msgstr "" #: libraries/tbl_links.inc.php:73 prefs_manage.php:288 #: server_privileges.php:1382 setup/frames/menu.inc.php:21 msgid "Export" -msgstr "" +msgstr "ఎగుమతి" #: db_structure.php:505 db_structure.php:561 #: libraries/display_tbl.lib.php:2242 tbl_structure.php:583 @@ -746,7 +746,7 @@ msgstr "డేటాబేస్" #: db_tracking.php:86 msgid "Last version" -msgstr "" +msgstr "చివరి కూర్పు" #: db_tracking.php:87 tbl_tracking.php:588 msgid "Created" @@ -1002,17 +1002,15 @@ msgstr "సంకేతపదాలు సరిపోలలేదు!" # మొదటి అనువాదము #: js/messages.php:52 -#, fuzzy #| msgid "Add a new User" msgid "Add a New User" -msgstr "క్రొత్త వినియోగదారుని చేర్చు" +msgstr "కొత్త వాడుకరిని చేర్చు" # మొదటి అనువాదము #: js/messages.php:53 -#, fuzzy #| msgid "Create" msgid "Create User" -msgstr "సృష్టించు" +msgstr "వాడుకరిని సృష్టించు" #: js/messages.php:54 msgid "Reloading Privileges" @@ -1176,10 +1174,9 @@ msgid "Generate" msgstr "" #: js/messages.php:111 -#, fuzzy #| msgid "Password" msgid "Change Password" -msgstr "సంకేతపదం" +msgstr "సంకేతపదాన్ని మార్చు" #: js/messages.php:114 tbl_structure.php:471 msgid "More" @@ -1205,10 +1202,9 @@ msgstr "" # మొదటి అనువాదము #. l10n: Display text for previous month link in calendar #: js/messages.php:139 -#, fuzzy #| msgid "Previous" msgid "Prev" -msgstr "క్రితము" +msgstr "గత" # మొదటి అనువాదము #. l10n: Display text for next month link in calendar @@ -1398,59 +1394,51 @@ msgstr "శని" #. l10n: Minimal week day name #: js/messages.php:212 -#, fuzzy #| msgid "Sun" msgid "Su" -msgstr "ఆది" +msgstr "ఆ" #. l10n: Minimal week day name #: js/messages.php:214 -#, fuzzy #| msgid "Mon" msgid "Mo" -msgstr "సోమ" +msgstr "సో" #. l10n: Minimal week day name #: js/messages.php:216 -#, fuzzy #| msgid "Tue" msgid "Tu" -msgstr "మంగళ" +msgstr "మం" #. l10n: Minimal week day name #: js/messages.php:218 -#, fuzzy #| msgid "Wed" msgid "We" -msgstr "బుధ" +msgstr "బు" #. l10n: Minimal week day name #: js/messages.php:220 -#, fuzzy #| msgid "Thu" msgid "Th" -msgstr "గురు" +msgstr "గు" #. l10n: Minimal week day name #: js/messages.php:222 -#, fuzzy #| msgid "Fri" msgid "Fr" -msgstr "శుక్ర" +msgstr "శు" #. l10n: Minimal week day name #: js/messages.php:224 -#, fuzzy #| msgid "Sat" msgid "Sa" -msgstr "శని" +msgstr "శ" #. l10n: Column header for week of the year in calendar #: js/messages.php:226 -#, fuzzy #| msgid "Wiki" msgid "Wk" -msgstr "వికీ" +msgstr "వారం" #: js/messages.php:228 msgid "Hour" @@ -1660,7 +1648,7 @@ msgstr "" #: libraries/Theme_Manager.class.php:291 test/theme.php:160 themes.php:20 #: themes.php:40 msgid "Theme / Style" -msgstr "" +msgstr "అలంకారం / శైలి" #: libraries/auth/config.auth.lib.php:76 msgid "Cannot connect: invalid settings." @@ -1815,7 +1803,7 @@ msgstr "" #: libraries/config/messages.inc.php:180 libraries/export/xml.php:36 #: server_status.php:385 msgid "Tables" -msgstr "" +msgstr "పట్టికలు" #: libraries/build_html_for_db.lib.php:35 libraries/config/setup.forms.php:300 #: libraries/config/setup.forms.php:336 libraries/config/setup.forms.php:367 @@ -1967,7 +1955,7 @@ msgstr "en" #: libraries/sql_query_form.lib.php:429 libraries/sql_query_form.lib.php:432 #: main.php:226 server_variables.php:63 msgid "Documentation" -msgstr "" +msgstr "పత్రావళి" #: libraries/common.lib.php:605 libraries/header_printview.inc.php:60 #: server_processlist.php:72 server_status.php:372 @@ -2031,41 +2019,41 @@ msgstr "సమయం" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ #: libraries/common.lib.php:1392 msgid "B" -msgstr "" +msgstr "బై" #: libraries/common.lib.php:1392 msgid "KiB" -msgstr "" +msgstr "కిబై" #: libraries/common.lib.php:1392 msgid "MiB" -msgstr "" +msgstr "మెబై" #: libraries/common.lib.php:1392 msgid "GiB" -msgstr "" +msgstr "గిబై" #: libraries/common.lib.php:1392 msgid "TiB" -msgstr "" +msgstr "టెబై" #: libraries/common.lib.php:1392 msgid "PiB" -msgstr "" +msgstr "పిబై" #: libraries/common.lib.php:1392 msgid "EiB" -msgstr "" +msgstr "ఎబై" #. l10n: Thousands separator #: libraries/common.lib.php:1430 msgid "," -msgstr "" +msgstr "," #. l10n: Decimal separator #: libraries/common.lib.php:1432 msgid "." -msgstr "" +msgstr "." #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string #: libraries/common.lib.php:1609 @@ -2117,7 +2105,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:634 pmd_general.php:151 #: server_privileges.php:604 server_replication.php:313 tbl_tracking.php:263 msgid "Structure" -msgstr "" +msgstr "నిర్మాణాకృతి" #: libraries/common.lib.php:2826 libraries/common.lib.php:2833 #: libraries/config/messages.inc.php:211 libraries/db_links.inc.php:53 @@ -2176,19 +2164,19 @@ msgstr "మూసివేయి" #: libraries/export/sql.php:79 libraries/export/texytext.php:23 #: libraries/import.lib.php:1172 msgid "structure" -msgstr "" +msgstr "నిర్మాణాకృతి" #: libraries/config.values.php:96 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "భోగట్టా" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "structure and data" -msgstr "" +msgstr "నిర్మాణాకృతి మరియు భోగట్టా" #: libraries/config.values.php:99 msgid "Quick - display only the minimal options to configure" @@ -2237,13 +2225,13 @@ msgstr "" #: libraries/config/FormDisplay.class.php:574 #: libraries/config/validate.lib.php:360 libraries/config/validate.lib.php:450 msgid "Incorrect value" -msgstr "" +msgstr "తప్పుడు విలువ" #: libraries/config/FormDisplay.class.php:87 #: libraries/config/validate.lib.php:464 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "విలువ తప్పనిసరిగా %s కి సమానంగా లేదా తక్కువగా ఉండాలి" #: libraries/config/FormDisplay.class.php:538 #, php-format @@ -2253,7 +2241,7 @@ msgstr "" #: libraries/config/FormDisplay.class.php:736 #: libraries/config/FormDisplay.class.php:740 msgid "unavailable" -msgstr "" +msgstr "అందుబాటులో లేదు" #: libraries/config/FormDisplay.class.php:737 #: libraries/config/FormDisplay.class.php:741 @@ -2657,10 +2645,9 @@ msgid "Relations" msgstr "సంబంధాలు" #: libraries/config/messages.inc.php:103 -#, fuzzy #| msgid "Export type" msgid "Export method" -msgstr "ఎగుమతి రకం" +msgstr "ఎగుమతి పద్ధతి" #: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:114 msgid "Save on server" @@ -2800,7 +2787,7 @@ msgstr "" #: libraries/config/messages.inc.php:164 libraries/config/messages.inc.php:206 #: setup/frames/menu.inc.php:16 msgid "Features" -msgstr "" +msgstr "విశేషాలు" #: libraries/config/messages.inc.php:165 msgid "General" @@ -2814,7 +2801,7 @@ msgstr "" #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 #: prefs_manage.php:231 setup/frames/menu.inc.php:20 msgid "Import" -msgstr "" +msgstr "దిగుమతి" #: libraries/config/messages.inc.php:168 msgid "Import defaults" @@ -2826,7 +2813,7 @@ msgstr "" #: libraries/config/messages.inc.php:170 msgid "Import / export" -msgstr "" +msgstr "దిగుమతి / ఎగుమతి" #: libraries/config/messages.inc.php:171 msgid "Set import and export directories and compression options" @@ -2871,11 +2858,11 @@ msgstr "మైక్రోసాఫ్ట్ ఆఫీస్" #: libraries/config/messages.inc.php:185 msgid "Open Document" -msgstr "" +msgstr "ఓపెన్ డాక్యుమెంట్" #: libraries/config/messages.inc.php:187 msgid "Other core settings" -msgstr "" +msgstr "ఇతర ప్రముఖ అమరికలు" #: libraries/config/messages.inc.php:188 msgid "Settings that didn't fit enywhere else" @@ -3346,7 +3333,7 @@ msgstr "" #: libraries/config/messages.inc.php:309 msgid "Maximum tables" -msgstr "" +msgstr "గరిష్ఠ పట్టికలు" #: libraries/config/messages.inc.php:310 msgid "" @@ -3510,7 +3497,7 @@ msgstr "" #: libraries/config/messages.inc.php:349 msgid "Show help button" -msgstr "" +msgstr "సహాయపు బొత్తాన్ని చూపించు" #: libraries/config/messages.inc.php:351 msgid "Directory where exports can be saved on server" @@ -3522,7 +3509,7 @@ msgstr "" #: libraries/config/messages.inc.php:353 msgid "Leave blank if not used" -msgstr "" +msgstr "ఉపయోగించకపోతే ఖాళీగా వదిలేయండి" #: libraries/config/messages.inc.php:354 msgid "Host authorization order" @@ -3530,7 +3517,7 @@ msgstr "" #: libraries/config/messages.inc.php:355 msgid "Leave blank for defaults" -msgstr "" +msgstr "అప్రమేయాలకై ఖాళీగా వదిలివేయండి" #: libraries/config/messages.inc.php:356 msgid "Host authorization rules" @@ -4098,7 +4085,7 @@ msgstr "" #: libraries/config/messages.inc.php:483 msgid "Default title" -msgstr "" +msgstr "అప్రమేయ శీర్షిక" #: libraries/config/messages.inc.php:484 msgid "Title of browser window when a server is selected" @@ -4286,7 +4273,7 @@ msgstr "" #: libraries/config/validate.lib.php:367 #, php-format msgid "Incorrect IP address: %s" -msgstr "" +msgstr "తప్పుడు ఐపీ చిరునామా: %s" # మొదటి అనువాదము #. l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. @@ -4369,7 +4356,7 @@ msgstr "వివరాలు..." #: libraries/display_change_password.lib.php:29 main.php:97 #: user_password.php:119 user_password.php:137 msgid "Change password" -msgstr "" +msgstr "సంకేతపదాన్ని మార్చు" #: libraries/display_change_password.lib.php:34 #: libraries/replication_gui.lib.php:347 server_privileges.php:818 @@ -4380,7 +4367,7 @@ msgstr "సంకేతపదం లేదు" #: libraries/replication_gui.lib.php:355 libraries/replication_gui.lib.php:358 #: server_privileges.php:826 server_privileges.php:829 msgid "Re-type" -msgstr "" +msgstr "మళ్ళీ టైపుచెయ్యండి" #: libraries/display_change_password.lib.php:51 msgid "Password Hashing" @@ -4446,10 +4433,9 @@ msgstr "" # మొదటి అనువాదము #: libraries/display_export.lib.php:137 -#, fuzzy #| msgid "Database" msgid "Database(s):" -msgstr "డేటాబేస్" +msgstr "డేటాబేసు(లు)" #: libraries/display_export.lib.php:139 msgid "Table(s):" @@ -4529,7 +4515,7 @@ msgstr "" #: libraries/export/sql.php:945 libraries/tbl_properties.inc.php:578 #: pmd_general.php:510 server_privileges.php:1981 server_processlist.php:96 msgid "None" -msgstr "" +msgstr "ఏమీలేదు" #: libraries/display_export.lib.php:313 msgid "zipped" @@ -4786,7 +4772,7 @@ msgstr "" #: libraries/engines/bdb.lib.php:20 main.php:225 msgid "Version information" -msgstr "" +msgstr "సంచిక సమాచారం" #: libraries/engines/innodb.lib.php:22 msgid "Data home directory" @@ -5255,10 +5241,9 @@ msgid "Display foreign key relationships" msgstr "" #: libraries/export/latex.php:59 libraries/export/odt.php:45 -#, fuzzy #| msgid "Table comments" msgid "Display comments" -msgstr "పట్టిక వ్యాఖ్యలు" +msgstr "వ్యాఖ్యలను చూపించు" #: libraries/export/latex.php:62 libraries/export/odt.php:48 #: libraries/export/sql.php:44 @@ -5293,11 +5278,11 @@ msgstr "" #: libraries/export/mediawiki.php:15 msgid "MediaWiki Table" -msgstr "" +msgstr "మీడియావికీ పట్టిక" #: libraries/export/pdf.php:17 msgid "PDF" -msgstr "" +msgstr "PDF" #: libraries/export/pdf.php:23 msgid "(Generates a report containing the data of a single table)" @@ -5571,7 +5556,7 @@ msgstr "" #: libraries/import/docsql.php:31 libraries/tbl_properties.inc.php:617 #: server_synchronize.php:427 server_synchronize.php:870 msgid "Table name" -msgstr "" +msgstr "పట్టిక పేరు" #: libraries/import/ldi.php:44 libraries/schema/User_Schema.class.php:316 #: view_create.php:147 @@ -5605,11 +5590,10 @@ msgid "" msgstr "" #: libraries/kanji-encoding.lib.php:142 -#, fuzzy #| msgid "No" msgctxt "None encoding conversion" msgid "None" -msgstr "కాదు" +msgstr "ఏమీలేదు" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:148 @@ -5704,7 +5688,7 @@ msgstr "జపనీ" #: libraries/mysql_charsets.lib.php:273 msgid "Latvian" -msgstr "" +msgstr "లాత్వియన్" #: libraries/mysql_charsets.lib.php:276 msgid "Lithuanian" @@ -5796,7 +5780,7 @@ msgstr "ఆర్మేనియన్" #: libraries/mysql_charsets.lib.php:376 msgid "Cyrillic" -msgstr "" +msgstr "సిరిలిక్" #: libraries/mysql_charsets.lib.php:379 msgid "Arabic" @@ -5808,7 +5792,7 @@ msgstr "హిబ్రూ" #: libraries/mysql_charsets.lib.php:388 msgid "Georgian" -msgstr "" +msgstr "జార్జియన్" #: libraries/mysql_charsets.lib.php:391 msgid "Greek" @@ -5821,7 +5805,7 @@ msgstr "ఛెక్-స్లోవాక్" #: libraries/mysql_charsets.lib.php:409 libraries/mysql_charsets.lib.php:416 msgid "unknown" -msgstr "" +msgstr "తెలియని" #: libraries/navigation_header.inc.php:57 #: libraries/navigation_header.inc.php:60 @@ -6049,7 +6033,7 @@ msgstr "" #: libraries/schema/Pdf_Relation_Schema.class.php:1091 msgid "Table of contents" -msgstr "" +msgstr "విషయ సూచిక" #: libraries/schema/Pdf_Relation_Schema.class.php:1241 #: libraries/schema/Pdf_Relation_Schema.class.php:1262 @@ -6070,10 +6054,9 @@ msgid "Create a page" msgstr "పుటని సృష్టించు" #: libraries/schema/User_Schema.class.php:99 -#, fuzzy #| msgid "Page number:" msgid "Page name" -msgstr "పుట సంఖ్య:" +msgstr "పుట పేరు" #: libraries/schema/User_Schema.class.php:103 msgid "Automatic layout based on" @@ -6136,10 +6119,9 @@ msgid "Portrait" msgstr "" #: libraries/schema/User_Schema.class.php:394 -#, fuzzy #| msgid "Original position" msgid "Orientation" -msgstr "అసలు స్థానం" +msgstr "దిశ" #: libraries/schema/User_Schema.class.php:407 msgid "Paper size" @@ -6164,7 +6146,7 @@ msgstr "" #: libraries/select_lang.lib.php:497 #, php-format msgid "Unknown language: %1$s." -msgstr "" +msgstr "తెలియని భాష: %1$s." #: libraries/select_server.lib.php:38 libraries/select_server.lib.php:44 msgid "Current Server" @@ -6353,7 +6335,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:104 msgid "Length/Values" -msgstr "" +msgstr "పొడవు/విలువలు" #: libraries/tbl_properties.inc.php:104 msgid "" @@ -6403,11 +6385,10 @@ msgid "Get more editing space" msgstr "" #: libraries/tbl_properties.inc.php:396 -#, fuzzy #| msgid "No" msgctxt "for default" msgid "None" -msgstr "కాదు" +msgstr "ఏమీలేదు" #: libraries/tbl_properties.inc.php:397 msgid "As defined:" @@ -6421,7 +6402,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:534 tbl_structure.php:155 #: tbl_structure.php:159 tbl_structure.php:569 msgid "Fulltext" -msgstr "" +msgstr "పూర్తిపాఠ్యం" #: libraries/tbl_properties.inc.php:583 transformation_overview.php:57 #, php-format @@ -6603,10 +6584,9 @@ msgid "MySQL connection collation" msgstr "" #: main.php:122 -#, fuzzy #| msgid "Basic settings" msgid "Appearance Settings" -msgstr "ప్రాధమిక అమరికలు" +msgstr "రూపురేఖల అమరికలు" #: main.php:163 prefs_manage.php:274 msgid "More settings" @@ -6656,11 +6636,11 @@ msgstr "" #: main.php:232 msgid "Get support" -msgstr "" +msgstr "సహాయాన్ని పొందండి" #: main.php:233 msgid "List of changes" -msgstr "" +msgstr "మార్పుల జాబితా" #: main.php:257 msgid "" @@ -6751,11 +6731,10 @@ msgstr "" # మొదటి అనువాదము #: navigation.php:308 navigation.php:309 -#, fuzzy #| msgid "Create a page" msgctxt "short form" msgid "Create table" -msgstr "పుటని సృష్టించు" +msgstr "పట్టికను సృష్టించు" #: navigation.php:313 navigation.php:485 msgid "Please select a database" @@ -6874,10 +6853,9 @@ msgid "Operator" msgstr "" #: pmd_general.php:810 -#, fuzzy #| msgid "Actions" msgid "Active options" -msgstr "చర్యలు" +msgstr "క్రియాశీల ఎంపికలు" #: pmd_help.php:26 msgid "To select relation, click :" @@ -6902,10 +6880,9 @@ msgstr "పుటని సృష్టించుటలో తప్పిద # మొదటి అనువాదము #: pmd_pdf.php:89 -#, fuzzy #| msgid "pages" msgid "Page" -msgstr "పుటలు" +msgstr "పుట" #: pmd_pdf.php:99 msgid "Import from selected page" @@ -6923,10 +6900,9 @@ msgid "Create a page and export to it" msgstr "పుటని సృష్టించు" #: pmd_pdf.php:111 -#, fuzzy #| msgid "New name" msgid "New page name: " -msgstr "కొత్త పేరు" +msgstr "కొత్త పుట పేరు:" #: pmd_pdf.php:114 msgid "Export/Import to scale" @@ -7318,11 +7294,10 @@ msgid "No privileges." msgstr "" #: server_privileges.php:311 server_privileges.php:312 -#, fuzzy #| msgid "No" msgctxt "None privileges" msgid "None" -msgstr "కాదు" +msgstr "ఏమీలేవు" #: server_privileges.php:442 server_privileges.php:577 #: server_privileges.php:1824 server_privileges.php:1830 @@ -7364,17 +7339,17 @@ msgstr "" #: server_privileges.php:846 server_privileges.php:2312 msgid "No user found." -msgstr "" +msgstr "వాడుకరి కనబడలేదు." #: server_privileges.php:890 #, php-format msgid "The user %s already exists!" -msgstr "" +msgstr "%s అనే వాడుకరి ఇప్పటికే ఉన్నారు!" # మొదటి అనువాదము #: server_privileges.php:974 msgid "You have added a new user." -msgstr "మీరు క్రొత్త వినియోగదారుని చేర్చారు" +msgstr "మీరు క్రొత్త వాడుకరిని చేర్చారు." #: server_privileges.php:1204 #, php-format @@ -7439,7 +7414,7 @@ msgstr "" #: server_privileges.php:1705 server_privileges.php:1729 #: server_privileges.php:2134 server_privileges.php:2323 msgid "Add a new User" -msgstr "క్రొత్త వినియోగదారుని చేర్చు" +msgstr "క్రొత్త వాడుకరిని చేర్చు" #: server_privileges.php:1710 msgid "Remove selected users" @@ -8591,7 +8566,7 @@ msgstr "" #: setup/frames/index.inc.php:88 setup/frames/menu.inc.php:15 msgid "Overview" -msgstr "" +msgstr "అవలోకనం" #: setup/frames/index.inc.php:96 msgid "Show hidden messages (#MSG_COUNT)" @@ -8607,11 +8582,11 @@ msgstr "" #: setup/frames/index.inc.php:173 msgid "Default language" -msgstr "" +msgstr "అప్రమేయ భాష" #: setup/frames/index.inc.php:183 msgid "let the user choose" -msgstr "" +msgstr "వాడుకరిని ఎంచుకోనివ్వు" #: setup/frames/index.inc.php:194 msgid "- none -" @@ -9020,7 +8995,7 @@ msgstr "" #: tbl_create.php:56 #, php-format msgid "Table %s already exists!" -msgstr "" +msgstr "%s అనే పట్టిక ఇప్పటికే ఉంది!" #: tbl_create.php:242 #, php-format @@ -9109,7 +9084,7 @@ msgstr "" #: tbl_operations.php:347 msgid "Table options" -msgstr "" +msgstr "పట్టిక ఎంపికలు" #: tbl_operations.php:351 msgid "Rename table to" @@ -9236,10 +9211,9 @@ msgid "Error creating foreign key on %1$s (check data types)" msgstr "" #: tbl_relation.php:402 -#, fuzzy #| msgid "Internal relations" msgid "Internal relation" -msgstr "అంతర్గత సంబంధాలు" +msgstr "అంతర్గత సంబంధం" #: tbl_relation.php:404 msgid "" @@ -9296,11 +9270,10 @@ msgid "Add FULLTEXT index" msgstr "" #: tbl_structure.php:384 -#, fuzzy #| msgid "No" msgctxt "None for default" msgid "None" -msgstr "కాదు" +msgstr "ఏమీలేదు" #: tbl_structure.php:397 #, php-format @@ -9320,7 +9293,7 @@ msgstr "" #: tbl_structure.php:471 msgid "Show more actions" -msgstr "" +msgstr "మరిన్ని చర్యలను చూపించు" #: tbl_structure.php:597 tbl_structure.php:599 msgid "Relation view" @@ -9497,7 +9470,7 @@ msgstr "" #: themes.php:41 msgid "Get more themes!" -msgstr "" +msgstr "మరిన్ని అలంకారాలను పొందండి!" #: transformation_overview.php:24 msgid "Available MIME types" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 84fce9505aa8c9c24933dd1e56b6460ec11791b7
by Michal Čihař 07 Apr '11

07 Apr '11

The branch, master has been updated via 84fce9505aa8c9c24933dd1e56b6460ec11791b7 (commit) via c44fbcd1e635149d557c9a7189849c4a06459625 (commit) via 0f3a4f46067f02949543f6a13b3b3bba9e0af107 (commit) from 445eacf6ebb9aa6631097143272af52170770b0a (commit) - Log ----------------------------------------------------------------- commit 84fce9505aa8c9c24933dd1e56b6460ec11791b7 Author: mjaning <mjaning(a)gmail.com> Date: Thu Apr 7 19:33:52 2011 +0200 Translation update done using Pootle. commit c44fbcd1e635149d557c9a7189849c4a06459625 Author: mjaning <mjaning(a)gmail.com> Date: Thu Apr 7 19:27:34 2011 +0200 Translation update done using Pootle. commit 0f3a4f46067f02949543f6a13b3b3bba9e0af107 Author: mjaning <mjaning(a)gmail.com> Date: Thu Apr 7 19:27:00 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index e722808..d207b17 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-06 10:05+0300\n" -"PO-Revision-Date: 2011-04-06 19:00+0200\n" +"PO-Revision-Date: 2011-04-07 19:33+0200\n" "Last-Translator: <mjaning(a)gmail.com>\n" "Language-Team: none\n" "Language: pt_BR\n" @@ -1897,7 +1897,7 @@ msgid "" "available with php 5.0.0 and is the recommended way to connect to a server " "running MySQL 4.1.x or newer." msgstr "" -"<tt>mysqli</tt> : A extensão modernizada do MySQL. Esta extensão foi " +"<tt>mysqli</tt> : A extensão mais moderna do MySQL. Esta extensão foi " "disponibilizada com o php 5.0.0 e é método recomendado para se conectar a " "servidores rodando MySQL 4.1.x ou mais recentes." @@ -1949,7 +1949,7 @@ msgid "" msgstr "" "Esta conta especial é usada para 2 finalidades específicas: para habilitar " "todos os recursos de relacionamento (veja <a href=\"#pmadb\" " -"class=\"configrule\">$cfg['Servers'][$i]['pmadb']</a>) e para um servidor " +"class=\"configrule\">$cfg['Servers'][$i]['pmadb']</a>) e para um servidor " "MySQL que estiver rodando com <tt>--skip-show-database</tt>, para habilitar " "uma instalação mult-usuário (autenticação por modo <abbr title=\"HyperText " "Transfer Protocol\">HTTP</abbr> ou COOKIE)." @@ -1966,6 +1966,14 @@ msgid "" "i>tables. This account is used to check what databases the user will see at " "login." msgstr "" +"Quando for usar a autenticação por <abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr> ou cookie (ou autenticação modo 'config' desde o " +"phpMyAdmin 2.2.1), você deve informar os detalhes da conta MySQL que tenha " +"privilégio <tt>SELECT</tt> nas tabelas mysql.user (todas as colunas " +"exceto "Password"), mysql.db (todas as colunas) e " +"mysql.tables_priv (todas as colunas exceto "Grantor" e " +""Timestamp") . Esta conta é usada para verificar qual o banco " +"de dados o usuário vai usar para o login." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:734 orig-docs/Documentation.html:773 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1797-gf6fb9b4
by Marc Delisle 07 Apr '11

07 Apr '11

The branch, master has been updated via f6fb9b46785dde20c09524a77fd200f44458e94c (commit) from 9433f4e78fdc847554d900ea440e642685d8dd75 (commit) - Log ----------------------------------------------------------------- commit f6fb9b46785dde20c09524a77fd200f44458e94c Author: onebighack <onebighack(a)users.sourceforge.net> Date: Thu Apr 7 13:01:57 2011 -0400 Patch #3249406 Error in updating using inline edit ----------------------------------------------------------------------- Summary of changes: js/sql.js | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index 078f3a2..4e34126 100644 --- a/js/sql.js +++ b/js/sql.js @@ -18,6 +18,10 @@ function PMA_urldecode(str) { return decodeURIComponent(str.replace(/\+/g, '%20')); } +function PMA_urlencode(str) { + return encodeURIComponent(str.replace(/\%20/g, '+')); +} + /** * Get the field name for the current field. Required to construct the query * for inline editing @@ -683,7 +687,6 @@ $(document).ready(function() { 'token' : window.parent.token, 'curr_value' : curr_value } - $.post('sql.php', post_params, function(data) { $this_field.append(data.dropdown); $this_field.data('original_data', data_value); @@ -791,6 +794,9 @@ $(document).ready(function() { var sql_query = 'UPDATE `' + window.parent.table + '` SET '; var need_to_post = false; + + var new_clause=''; + var prev_index=-1; $input_siblings.each(function() { /** @lends jQuery */ @@ -849,6 +855,9 @@ $(document).ready(function() { $.extend(relation_fields, this_field_params); } } + if(where_clause.indexOf(field_name) > prev_index){ + new_clause += '`'+window.parent.table+'`.'+'`' + field_name + "` = '"+this_field_params[field_name].replace(/'/g,"''")+"'"+' AND '; + } if (this_field_params[field_name] != $this_field.data('original_data')) { sql_query += ' `' + field_name + "`='" + this_field_params[field_name].replace(/'/g, "''") + "' , "; need_to_post = true; @@ -856,10 +865,15 @@ $(document).ready(function() { } }) + /* + * update the where_clause, remove the last appended ' AND ' + * */ + //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); + new_clause=new_clause.substring(0,new_clause.length-5); + new_clause=PMA_urlencode(new_clause); sql_query += ' WHERE ' + PMA_urldecode(where_clause); - /** * @var rel_fields_list String, url encoded representation of {@link relations_fields} */ @@ -897,6 +911,12 @@ $(document).ready(function() { $.post('tbl_replace.php', post_params, function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); + if(disp_mode == 'vertical') { + $this_td.parents('tbody').find('tr').find('.where_clause:nth('+this_td_index+')').attr('value',new_clause); + } + else { + $this_td.parent('tr').find('.where_clause').attr('value',new_clause); + } // remove possible previous feedback message $('#result_query').remove(); if (typeof data.result_query != 'undefined') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1796-g9433f4e
by Michal Čihař 07 Apr '11

07 Apr '11

The branch, master has been updated via 9433f4e78fdc847554d900ea440e642685d8dd75 (commit) from 8119fa376954e8fc7811c67cd68401b474f8d4f0 (commit) - Log ----------------------------------------------------------------- commit 9433f4e78fdc847554d900ea440e642685d8dd75 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 7 14:35:11 2011 +0200 Fix check for latest version to work with versions like -rc1-dev ----------------------------------------------------------------------- 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 a90bc3d..5d42910 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -176,7 +176,7 @@ function PMA_version_check() function version_to_int($version) { $matches = array(); - if (!preg_match('/^(\d+)\.(\d+)\.(\d+)((\.|-(pl|rc|dev|beta|alpha))(\d+)?)?$/', $version, $matches)) { + if (!preg_match('/^(\d+)\.(\d+)\.(\d+)((\.|-(pl|rc|dev|beta|alpha))(\d+)?(-dev)?)?$/', $version, $matches)) { return false; } if (!empty($matches[6])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1795-g8119fa3
by Michal Čihař 07 Apr '11

07 Apr '11

The branch, master has been updated via 8119fa376954e8fc7811c67cd68401b474f8d4f0 (commit) from df6bed32948928fb33ef90d20dc091a69b6bb4a7 (commit) - Log ----------------------------------------------------------------- commit 8119fa376954e8fc7811c67cd68401b474f8d4f0 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Apr 5 23:16:47 2011 +0100 Bug #3271928 - Fix alignment of form fields when creating a new table ----------------------------------------------------------------------- Summary of changes: themes/original/css/theme_right.css.php | 9 +++++++++ themes/pmahomme/css/theme_right.css.php | 13 +++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 1c9d5f5..5eb1a35 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1808,3 +1808,12 @@ fieldset .disabled-field td { #prefs_autoload { margin-bottom: 0.5em; } + +#table_columns input, select { + width: 14em; + box-sizing: border-box; + -ms-box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 652b441..3b57fea 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2110,3 +2110,16 @@ fieldset .disabled-field td { #prefs_autoload { margin-bottom: 0.5em; } + +#table_columns input, select { + width: 14em; + box-sizing: border-box; + -ms-box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + +#table_columns select { + margin: 0 6px; +} + hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-1793-g91b28bb
by Michal Čihař 07 Apr '11

07 Apr '11

The branch, master has been updated via 91b28bbfa2794409ad3f46e139e34a9951ceab5e (commit) from 288329402cf5f2f0d5e3645495b25174caa7b099 (commit) - Log ----------------------------------------------------------------- commit 91b28bbfa2794409ad3f46e139e34a9951ceab5e Author: Azhari Harahap <blackarazi(a)gmail.com> Date: Thu Apr 7 00:52:14 2011 +0700 Fix db structure align (patch #3277725, bug #3276024). ----------------------------------------------------------------------- Summary of changes: libraries/db_structure.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 6f91d44..c288559 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -31,7 +31,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false $action_colspan = 6; } - echo '<table class="data" style="float: left;">' . "\n" + echo '<table class="data">' . "\n" .'<thead>' . "\n" .'<tr><th></th>' . "\n" .' <th>' . PMA_SortableTableHeader(__('Table'), 'table') . '</th>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0