Git March 2011

git@phpmyadmin.net

6 participants
171 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1810-g53ba93b
by Michal Čihař 05 Mar '11

05 Mar '11

The branch, master has been updated via 53ba93b02e8395fb102cae35168133aa244cc155 (commit) from 0242446e4682cff050e2c61f151a266b1b86bc83 (commit) - Log ----------------------------------------------------------------- commit 53ba93b02e8395fb102cae35168133aa244cc155 Author: Michal Čihař <michal(a)cihar.com> Date: Sat Mar 5 15:11:29 2011 +0100 Remove debug code. This should never be commited. ----------------------------------------------------------------------- Summary of changes: scripts/update-po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update-po b/scripts/update-po index ac89039..f293467 100755 --- a/scripts/update-po +++ b/scripts/update-po @@ -32,8 +32,8 @@ for loc in $LOCS ; do s/Project-Id-Version: phpMyAdmin .*/Project-Id-Version: phpMyAdmin '$ver'\\n"/; ' po/$loc.po if [ -f ../localized_docs/po/$loc.po ] ; then - msgmerge --previous -C /tmp/po/$loc.po -C ../localized_docs/po/$loc.po -U po/$loc.po po/phpmyadmin.pot + msgmerge --previous -C ../localized_docs/po/$loc.po -U po/$loc.po po/phpmyadmin.pot else - msgmerge --previous -C /tmp/po/$loc.po -U po/$loc.po po/phpmyadmin.pot + msgmerge --previous -U po/$loc.po po/phpmyadmin.pot fi done hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1809-g0242446
by Marc Delisle 05 Mar '11

05 Mar '11

The branch, master has been updated via 0242446e4682cff050e2c61f151a266b1b86bc83 (commit) via 555f5fa8c4878ac3a15f7145e394a2bf724e2c07 (commit) via 2630f3e34c4d445468a28b121fbaef29183bd029 (commit) from 7cbaf739e40a2642d0a3176a8cf961bfdea8ec75 (commit) - Log ----------------------------------------------------------------- commit 0242446e4682cff050e2c61f151a266b1b86bc83 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Mar 5 07:13:43 2011 -0500 Localize hide/submit messages Replace submit with Save (an existing message) commit 555f5fa8c4878ac3a15f7145e394a2bf724e2c07 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Mar 5 06:57:24 2011 -0500 Remove author name from variable name Tidy jQuery code Proper indentation commit 2630f3e34c4d445468a28b121fbaef29183bd029 Author: onebighack <onebighack(a)users.sourceforge.net> Date: Sat Mar 5 06:22:50 2011 -0500 Patch #3195202 Inline edit Hide ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 + js/sql.js | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 99 insertions(+), 8 deletions(-) diff --git a/js/messages.php b/js/messages.php index fc28b2e..9da01ca 100644 --- a/js/messages.php +++ b/js/messages.php @@ -86,6 +86,8 @@ $js_messages['strSearching'] = __('Searching'); $js_messages['strHideQueryBox'] = __('Hide query box'); $js_messages['strShowQueryBox'] = __('Show query box'); $js_messages['strInlineEdit'] = __('Inline Edit'); +$js_messages['strSave'] = __('Save'); +$js_messages['strHide'] = __('Hide'); /* For tbl_select.js */ $js_messages['strHideSearchCriteria'] = __('Hide search criteria'); diff --git a/js/sql.js b/js/sql.js index 1cbbca2..3e0388e 100644 --- a/js/sql.js +++ b/js/sql.js @@ -13,6 +13,7 @@ * @param string str * @return string the URL-decoded string */ +var data_vt; function PMA_urldecode(str) { return decodeURIComponent(str.replace(/\+/g, '%20')); } @@ -408,9 +409,83 @@ $(document).ready(function() { $(".inline_edit_anchor").live('click', function(event) { /** @lends jQuery */ event.preventDefault(); - $(this).removeClass('inline_edit_anchor').addClass('inline_edit_active'); + // adding submit and hide buttons to inline edit <td> + // for "hide", button the original data to be restored is present in .original_data + // looping through all columns or rows, to find the required data and then storing it in an array. + + var $this_children = $(this).children('span.nowrap').children('a').children('span.nowrap'); + if (disp_mode != 'vertical'){ + $this_children.empty(); + $this_children.text(PMA_messages['strSave']); + } else { + // vertical + data_vt = $this_children.html(); + $this_children.text(PMA_messages['strSave']); + } + + var hide_link = '<br /><br /><a id="hide">' + PMA_messages['strHide'] + '</a>'; + if (disp_mode != 'vertical'){ + $(this).append(hide_link); + $('#table_results tbody tr td a#hide').click(function(){ + $this_children = $(this).siblings('span.nowrap').children('a').children('span.nowrap'); + $this_children.empty(); + $this_children.text(PMA_messages['strInlineEdit']); + var $this_hide = $(this).parent(); + $this_hide.removeClass("inline_edit_active hover").addClass("inline_edit_anchor"); + var last_column = $this_hide.siblings().length; + var txt=[]; + for(var i=4; i < last_column; i++){ + txt[i-4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').text(); + } + for (var i=4; i < last_column; i++){ + $this_hide.siblings("td:eq(" + i + ")").empty(); + $this_hide.siblings("td:eq(" + i + ")").append(txt[i-4]); + } + $(this).prev().prev().remove(); + $(this).prev().remove(); + $(this).remove(); + }); + } else { + var txt=[]; + var rows=$(this).parent().siblings().length;; + + $(this).append(hide_link); + $('#table_results tbody tr td a#hide').click(function(){ + + var pos=$(this).parent().index(); + var $chg_submit=$(this).parent().children('span.nowrap').children('a').children('span.nowrap'); + $chg_submit.empty(); + $chg_submit.append(data_vt); + + var $this_row=$(this).parent().parent(); + //alert(pos); + if(parseInt(pos)%2==0){ + $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); + + $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); + } else { + $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); + + $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); + + } + + for( var i=6;i<=rows+2;i++){ + txt[i-6]=$this_row.siblings("tr:eq("+i+") td:eq("+pos+") span.original_data").text(); + } + for (var i=6;i<=rows+2;i++){ + $this_row.siblings("tr:eq("+i+") td:eq("+pos+")").empty(); + $this_row.siblings("tr:eq("+i+") td:eq("+pos+")").append(txt[i-6]); + } + $(this).prev().remove(); + $(this).prev().remove(); + $(this).remove(); + + }); + } + // Initialize some variables if(disp_mode == 'vertical') { /** @@ -636,8 +711,9 @@ $(document).ready(function() { * @see PMA_ajaxShowMessage() * @see getFieldName() */ - $(".inline_edit_active").live('click', function(event) { + $(".inline_edit_active span a").live('click', function(event) { /** @lends jQuery */ + event.preventDefault(); /** @@ -646,8 +722,7 @@ $(document).ready(function() { * being edited * */ - var $this_td = $(this); - + var $this_td = $(this).parent().parent(); var $test_element = ''; // to test the presence of a element // Initialize variables @@ -665,8 +740,7 @@ $(document).ready(function() { * @var where_clause String containing the WHERE clause to select this row */ var where_clause = $this_td.parents('tbody').find('tr').find('.where_clause:nth('+this_td_index+')').val(); - } - else { + } else { var $input_siblings = $this_td.parent('tr').find('.inline_edit'); var where_clause = $this_td.parent('tr').find('.where_clause').val(); } @@ -705,7 +779,7 @@ $(document).ready(function() { /** * @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() @@ -756,7 +830,6 @@ $(document).ready(function() { $.extend(relation_fields, this_field_params); } } - sql_query += ' ' + field_name + "='" + this_field_params[field_name].replace(/'/g, "''") + "' , "; } }) @@ -794,8 +867,24 @@ $(document).ready(function() { 'submit_type' : 'save' }; + // if inline_edit is successful, we need to go back to default view + var $del_hide=$(this).parent(); + var $chg_submit=$(this); + $.post('tbl_replace.php', post_params, function(data) { if(data.success == true) { + // deleting the hide button if my query was successful + // remove <br><br><a> tags + for ( var i=0;i<=2;i++) { $del_hide.next().remove(); } + if(disp_mode!='vertical'){ + $chg_submit.empty(); + $chg_submit.text(PMA_messages['strInlineEdit']); + } + else { + $chg_submit.children('span.nowrap').empty(); + $chg_submit.children('span.nowrap').append(data_vt); + } + PMA_ajaxShowMessage(data.message); $this_td.removeClass('inline_edit_active').addClass('inline_edit_anchor'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1806-g7cbaf73
by Madhura Jayaratne 05 Mar '11

05 Mar '11

The branch, master has been updated via 7cbaf739e40a2642d0a3176a8cf961bfdea8ec75 (commit) via 489d6bfce8447ca1a8a335fc7580c6b8b8963bf1 (commit) from 612598fe7fbc6c6cf6305a798e9b48b435ea7a91 (commit) - Log ----------------------------------------------------------------- commit 7cbaf739e40a2642d0a3176a8cf961bfdea8ec75 Merge: 489d6bfce8447ca1a8a335fc7580c6b8b8963bf1 612598fe7fbc6c6cf6305a798e9b48b435ea7a91 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Mar 5 09:55:10 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 489d6bfce8447ca1a8a335fc7580c6b8b8963bf1 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Mar 5 09:53:51 2011 +0530 Bug #3196093 CSV import - Abort immediately and show error message on invalid parameters. ----------------------------------------------------------------------- Summary of changes: libraries/import/csv.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/libraries/import/csv.php b/libraries/import/csv.php index db8d09c..e41ea35 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -56,10 +56,12 @@ $csv_enclosed = strtr($csv_enclosed, $replacements); $csv_escaped = strtr($csv_escaped, $replacements); $csv_new_line = strtr($csv_new_line, $replacements); +$param_error = FALSE; if (strlen($csv_terminated) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Columns terminated by'), false); $error = TRUE; + $param_error = TRUE; // The default dialog of MS Excel when generating a CSV produces a // semi-colon-separated file with no chance of specifying the // enclosing character. Thus, users who want to import this file @@ -72,14 +74,22 @@ if (strlen($csv_terminated) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Columns enclosed by'), false); $error = TRUE; + $param_error = TRUE; } elseif (strlen($csv_escaped) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Columns escaped by'), false); $error = TRUE; + $param_error = TRUE; } elseif (strlen($csv_new_line) != 1 && $csv_new_line != 'auto') { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Lines terminated by'), false); $error = TRUE; + $param_error = TRUE; +} + +// If there is an error in the parameters entered, indicate that immediately. +if ($param_error) { + PMA_mysqlDie($message->getMessage(), '', '', $err_url); } $buffer = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1804-g612598f
by Piotr Przybylski 04 Mar '11

04 Mar '11

The branch, master has been updated via 612598fe7fbc6c6cf6305a798e9b48b435ea7a91 (commit) from 260cf97a06e2e2cb046093228d4267f8501823b7 (commit) - Log ----------------------------------------------------------------- commit 612598fe7fbc6c6cf6305a798e9b48b435ea7a91 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Mar 4 23:06:49 2011 +0100 Fix CSP header: * add 'self' for img-src and script-src * version.js access: - remove protocol (shorter and useful mainly when HTTPS is required) - remove path (invalid syntax, only hosts are allowed there) ----------------------------------------------------------------------- Summary of changes: libraries/header_http.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index f7c27b2..9ad890d 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -22,7 +22,7 @@ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; /* Prevent against ClickJacking by allowing frames only from same origin */ if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) { header('X-Frame-Options: SAMEORIGIN'); - header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\'; img-src data:; script-src http://www.phpmyadmin.net/home_page/version.js'); + header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\'; img-src \'self\' data:; script-src \'self\' www.phpmyadmin.net'); } header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21 header('Last-Modified: ' . $GLOBALS['now']); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1803-g260cf97
by Michal Čihař 04 Mar '11

04 Mar '11

The branch, master has been updated via 260cf97a06e2e2cb046093228d4267f8501823b7 (commit) via 29afe63e29d2af2e77744eec12110023efe5db9f (commit) from 31c76833626b90a28e33fda7f042a67417bc2851 (commit) - Log ----------------------------------------------------------------- commit 260cf97a06e2e2cb046093228d4267f8501823b7 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 4 15:19:01 2011 +0100 Allow loading version information using javascript in CSP commit 29afe63e29d2af2e77744eec12110023efe5db9f Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 4 15:17:32 2011 +0100 Allow data: for <img> in CSP ----------------------------------------------------------------------- Summary of changes: libraries/header_http.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index 6086f38..f7c27b2 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -22,7 +22,7 @@ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; /* Prevent against ClickJacking by allowing frames only from same origin */ if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) { header('X-Frame-Options: SAMEORIGIN'); - header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\''); + header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\'; img-src data:; script-src http://www.phpmyadmin.net/home_page/version.js'); } header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21 header('Last-Modified: ' . $GLOBALS['now']); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1801-g31c7683
by Michal Čihař 04 Mar '11

04 Mar '11

The branch, master has been updated via 31c76833626b90a28e33fda7f042a67417bc2851 (commit) via 9408ebf238bdec44039080c9f0e9a48b5ebb546b (commit) via 5c6cfd19337dcdfaec01ee583db6d5181fd5d582 (commit) from 3e9ff369d8b8a8172ada9e3677df453ee53e07d1 (commit) - Log ----------------------------------------------------------------- commit 31c76833626b90a28e33fda7f042a67417bc2851 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Mar 4 09:47:35 2011 +0200 Translation update done using Pootle. commit 9408ebf238bdec44039080c9f0e9a48b5ebb546b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Mar 4 09:46:37 2011 +0200 Translation update done using Pootle. commit 5c6cfd19337dcdfaec01ee583db6d5181fd5d582 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Fri Mar 4 09:45:43 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 30 ++++++------------------------ 1 files changed, 6 insertions(+), 24 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 32f3c2f..46716dd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-03-03 07:17+0100\n" -"PO-Revision-Date: 2011-02-28 18:54+0200\n" +"PO-Revision-Date: 2011-03-04 09:47+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" "Language: zh_CN\n" @@ -3925,9 +3925,7 @@ msgstr "显示函数列" msgid "" "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] " "output" -msgstr "" -"显示 [a@http://php.net/manual/function.phpinfo.php]phpinfo() (外链，英文)[/" -"a] 输出的链接" +msgstr "显示 [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] 输出的链接" #: libraries/config/messages.inc.php:448 msgid "Show phpinfo() link" @@ -8436,9 +8434,7 @@ msgstr "此 MySQL 服务器正以<b>从</b>服务器运行于<b>复制</b>进程 msgid "" "For further information about replication status on the server, please visit " "the <a href=#replication>replication section</a>." -msgstr "" -"要获得更多关于此服务器的复制状态，请查看<a href=\"#replication\">复制状态信息" -"</a>。" +msgstr "要获得更多关于此服务器的复制状态，请查看<a href=#replication>复制状态信息</a>。" #: server_status.php:509 msgid "" @@ -8654,9 +8650,9 @@ msgid "" "level directory as described in [a(a)Documentation.html#setup_script]" "documentation[/a]. Otherwise you will be only able to download or display it." msgstr "" -"请在 phpMyAdmin 的根文件夹下创建[a@../Documentation.html#setup_script]文档[/" -"a]中所述的网站服务器可以写入的 [em]config[/em] 文件夹。否则你只能下载或显示配" -"置。" +"请在 phpMyAdmin 的根文件夹下创建 " +"[a@Documentation.html#setup_script]文档[/a]中所述的网站服务器可以写入的 [em]config[/em] " +"文件夹。否则你只能下载或显示配置。" #: setup/frames/index.inc.php:57 msgid "" @@ -9625,17 +9621,3 @@ msgstr "视图名" #: view_operations.php:91 msgid "Rename view to" msgstr "将视图改名为" - -#, fuzzy -#~| msgid "Delete the matches for the %s table?" -#~ msgid "Delete the matches for the " -#~ msgstr "删除 %s 表中所有匹配的记录？" - -#~ msgid "Show left delete link" -#~ msgstr "显示左侧删除链接" - -#~ msgid "Show right delete link" -#~ msgstr "显示右侧删除链接" - -#~ msgid "Mailing lists" -#~ msgstr "邮件列表" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. ecd0e5c75da79c31c16d205f3426b316bf14d29a
by Michal Čihař 03 Mar '11

03 Mar '11

The branch, master has been updated via ecd0e5c75da79c31c16d205f3426b316bf14d29a (commit) via 4c5cfc185040f4e06493f274142e179dddfd7dcf (commit) via 1fc11c628bb0fa2123b67ac7329c8801aae3d1f9 (commit) via 98f4e9d7c688d76f77a43931144fec1008f8a284 (commit) via fa90c670b0880390d954ca2a2e59860b2346d2bc (commit) via dfefecf5f83a4f3d38371a3542a4525b36d1c61b (commit) via f3b2705bdbd845966d84f075392d35ebc236af7d (commit) via bd4866040bf4c468172c1ea38de5b1ee0aa5e484 (commit) via 1facf5cdba5fcdece2f5d2d32d73a3d6a8c9ef75 (commit) via 48ed81fc8ca37633c864d5f918662b9cfd46eee2 (commit) via 28ffb14a1c058e22b39006776a83801d1efa31b9 (commit) via 5c45fb951082358a9c75bc356db575977c347a73 (commit) via b9a6554b08a00d6880a8fe2aabe98475673318f1 (commit) via 95578e0057a50642fd766d567d341fa9c254c31c (commit) via c01006eef813be546296d02c6d1ff5a4ca192eff (commit) via f88df0aed95d227c73f47182aa30ce19b11936db (commit) from 88e66bb557aa5f92069e5df2b2613e0c45272cbb (commit) - Log ----------------------------------------------------------------- commit ecd0e5c75da79c31c16d205f3426b316bf14d29a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Mar 3 22:35:17 2011 +0100 Update translated doc commit 4c5cfc185040f4e06493f274142e179dddfd7dcf Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:26:38 2011 +0200 Translation update done using Pootle. commit 1fc11c628bb0fa2123b67ac7329c8801aae3d1f9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:25:17 2011 +0200 Translation update done using Pootle. commit 98f4e9d7c688d76f77a43931144fec1008f8a284 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:23:33 2011 +0200 Translation update done using Pootle. commit fa90c670b0880390d954ca2a2e59860b2346d2bc Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:22:10 2011 +0200 Translation update done using Pootle. commit dfefecf5f83a4f3d38371a3542a4525b36d1c61b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:20:15 2011 +0200 Translation update done using Pootle. commit f3b2705bdbd845966d84f075392d35ebc236af7d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:18:39 2011 +0200 Translation update done using Pootle. commit bd4866040bf4c468172c1ea38de5b1ee0aa5e484 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:18:27 2011 +0200 Translation update done using Pootle. commit 1facf5cdba5fcdece2f5d2d32d73a3d6a8c9ef75 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:17:51 2011 +0200 Translation update done using Pootle. commit 48ed81fc8ca37633c864d5f918662b9cfd46eee2 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:17:31 2011 +0200 Translation update done using Pootle. commit 28ffb14a1c058e22b39006776a83801d1efa31b9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:15:30 2011 +0200 Translation update done using Pootle. commit 5c45fb951082358a9c75bc356db575977c347a73 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:14:37 2011 +0200 Translation update done using Pootle. commit b9a6554b08a00d6880a8fe2aabe98475673318f1 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:14:06 2011 +0200 Translation update done using Pootle. commit 95578e0057a50642fd766d567d341fa9c254c31c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:11:42 2011 +0200 Translation update done using Pootle. commit c01006eef813be546296d02c6d1ff5a4ca192eff Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 3 23:10:42 2011 +0200 Translation update done using Pootle. commit f88df0aed95d227c73f47182aa30ce19b11936db Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Mar 3 18:47:20 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/es/Documentation.html | 94 ++++++++++++++++++++++-------------------- po/en_GB.po | 13 +++--- po/es.po | 57 ++++++++++++++++++++----- 3 files changed, 102 insertions(+), 62 deletions(-) diff --git a/output/es/Documentation.html b/output/es/Documentation.html index 0b285a9..81de020 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -781,15 +781,16 @@ configuración 'avanzada' en versiones anteriores y que puede ser escrita como 'http') (<tt>$auth_type = '<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</tt>) introducida en la versión 1.3.0 permite acceder como cualquier usuario MySQL válido mediante HTTP-Auth.</li> - <li>'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as -introduced in 2.10.0 allows you to log in from prepared PHP session -data. This is useful for implementing single signon from another -application. Sample way how to seed session is in signon example: -<code>scripts/signon.php</code>. There is also alternative example using -OpenID - <code>scripts/openid.php</code>. You need to configure <a -href="#cfg_Servers_SignonSession" class="configrule">session name</a> and <a -href="#cfg_Servers_SignonURL" class="configrule">signon URL</a> to use this -authentication method.</li> + <li>Autenticación 'signon' (<tt>$auth_type = 'signon'</tt>) +introducida en la versión 2.10.0 permite iniciar sesión desde datos +preparados en la sesión PHP. Esto es útil para implementar un inicio de +sesión único desde otra aplicación. Un modelo de cómo sembrar los datos en +la sesión se puede encontrar en el ejemplo: +<code>scripts/signon.php</code>. También existe un ejemplo alternativo +utilizando OpenID: <code>scripts/openid.php</code>. Necesita configurar el +<a href="#cfg_Servers_SignonSession" class="configrule">nombre de la +sesión</a> y el <a href="#cfg_Servers_SignonURL" class="configrule">URL de +inicio de sesión</a> para utilizar este método de autenticación.</li> </ul> Para más información vea la <a href="#setup">sección de instalación</a>, @@ -852,28 +853,28 @@ de bases de datos puden contener caracteres comodín ("_" and "%"): si se desea utilizar instancias literales de estos caracteres, deberá anteponerles el caracter de escape '\' (por ejemplo, utilice <tt>'mi\_bdd'</tt> y no <tt>'mi_bdd'</tt>).<br /> - This setting is an efficient way to lower the server load since the latter -does not need to send MySQL requests to build the available database -list. But <span class="important">it does not replace the privileges rules -of the MySQL database server</span>. If set, it just means only these -databases will be displayed but <span class="important">not that all other -databases can't be used.</span> + Esta configuración es una forma eficiente de disminuir la carga del servidor +ya que éste no necesita enviar pedidos a MySQL para crear la lista de bases +de datos disponibles. Pero <span class="important">no reemplaza las reglas +de privilegios del servidor de base de datos MySQL</span>. Si está +configurado, sólo estas bases de datos van a ser mostradas pero <span +class="important">otras bases de datos aún pueden ser utilizadas</span>. <br /><br /> - An example of using more that one database: -<tt>$cfg['Servers'][$i]['only_db'] = array('db1', 'db2');</tt> + En ejemplo que utiliza más de uan base de datos: +<tt>$cfg['Servers'][$i]['only_db'] = array('base1', 'base2');</tt> <br /><br /> - As of phpMyAdmin 2.5.5 the order inside the array is used for sorting the -databases in the left frame, so that you can individually arrange your -databases.<br /> - If you want to have certain databases at the top, but don't care about the -others, you do not need to specify all other databases. Use: -<tt>$cfg['Servers'][$i]['only_db'] = array('db3', 'db4', '*');</tt> instead -to tell phpMyAdmin that it should display db3 and db4 on top, and the rest -in alphabetic order.</dd> + Desde phpMyAdmin 2.5.5 el orden del array es el utilizado para ordenar las +bases de datos en el panel izquierdo para poder darle un orden personalizado +a las mismas.<br /> + Si se desea tener ciertas bases de datos al principio pero quieres ver todas +las otras no es necesario especificarlas una por una. Usa algo como +<tt>$cfg['Servers'][$i]['only_db'] = array('base3', 'base4', '*');</tt> en +su ligar para indicarle a phpMyAdmin que debe mostrar base3 y base4 primero +y luego todas las demás en orden alfabético.</dd> - <dt><span id="cfg_Servers_hide_db">$cfg['Servers'][$i]['hide_db']</span> string + <dt>cadena <span id="cfg_Servers_hide_db">$cfg['Servers'][$i]['hide_db']</span> </dt> <dd>Expresiones regulares para ocultar algunas bases de datos de usuarios sin privilegios. Sólo evita que sean listadas, pero el usuario podrá aún acceder @@ -883,19 +884,20 @@ acceso, usa el sistema de privilegios de MySQL. Por ejemplo, para ocultar todas las bases de datos que empiecen con la letra "a", usa<br /> <pre>$cfg['Servers'][$i]['hide_db'] = '^a';</pre> - and to hide both "db1" and "db2" use <br /> - <pre>$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';</pre> - More information on regular expressions can be found in the <a -href="http://php.net/manual/en/reference.pcre.pattern.syntax.php"> PCRE -pattern syntax</a> portion of the PHP reference manual. + y para ocultar tanto "db1" como "db2" usa <br /> + <pre>$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)';</pre> + Puedes encontrar más información sobre expresiones regulares en el manual de +referencia de PHP, en la sección sobre <a +href="http://php.net/manual/en/reference.pcre.pattern.syntax.php">sintáxis +de patrones PCRE</a>. </dd> - <dt id="cfg_Servers_verbose">$cfg['Servers'][$i]['verbose'] string</dt> - <dd>Only useful when using phpMyAdmin with multiple server entries. If set, this -string will be displayed instead of the hostname in the pull-down menu on -the main page. This can be useful if you want to show only certain databases -on your system, for example. For HTTP auth, all non-US-ASCII characters will -be stripped.</dd> + <dt id="cfg_Servers_verbose">cadena $cfg['Servers'][$i]['verbose']</dt> + <dd>Sólo es útil al utilizar phpMyAdmin con múltiples servidores MySQL. Si está +configurado, esta cadena será mostrada en lugar del nombre del sistema en el +menú desplegable de la página principal. Puede ser útil si quieres mostrar +ciertas bases de datos en tu sistema. Para autenticación HTTP, todos los +caracteres fuera del conjunto US-ASCII serán eliminados.</dd> <dt id="pmadb"> <span id="cfg_Servers_pmadb">$cfg['Servers'][$i]['pmadb']</span> string @@ -904,16 +906,18 @@ be stripped.</dd> phpMyAdmin. <br /><br /> - See the <a href="#linked-tables">phpMyAdmin configuration storage</a> -section in this document to see the benefits of this feature, and for a -quick way of creating this database and the needed tables. + Ver la sección sobre <a href="#linked-tables">almacenamiento de +configuración phpMyAdmin</a> en este documento para saber sobre las ventajas +de esta funcionalidad y para una forma fácil de crear esta base de datos y +las tablas necesarias. <br /><br /> - If you are the only user of this phpMyAdmin installation, you can use your -current database to store those special tables; in this case, just put your -current database name in <tt>$cfg['Servers'][$i]['pmadb']</tt>. For a -multi-user installation, set this parameter to the name of your central -database containing the phpMyAdmin configuration storage.</dd> + Si se es el único usuario de esta instalación de phpMyAdmin, se puede +utilizar la base actual para almacenar estas tablas especiales; en este +caso, sólo agrega el nombre de la base de datos actual en +<tt>$cfg['Servers'][$i]['pmadb']</tt>. Para una instalación multi-usuario, +este parámetro debe ser la base de datos central que contiene el +almacenamiento de configuración phpMyAdmin.</dd> <dt id="bookmark"> <span diff --git a/po/en_GB.po b/po/en_GB.po index 9b5da34..80f234d 100644 --- a/po/en_GB.po +++ b/po/en_GB.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-03-02 13:52+0100\n" -"PO-Revision-Date: 2011-02-10 12:58+0200\n" +"PO-Revision-Date: 2011-03-03 18:47+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: none\n" "Language: en_GB\n" @@ -1996,7 +1996,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:756 -#, fuzzy msgid "" "'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as " "introduced in 2.10.0 allows you to log in from prepared PHP session data. " @@ -2011,10 +2010,12 @@ msgstr "" "'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as " "introduced in 2.10.0 allows you to log in from prepared PHP session data. " "This is useful for implementing single signon from another application. " -"Sample way how to seed session is in signon example: <code>scripts/signon." -"php</code>. You need to configure <a href=\"#cfg_Servers_SignonSession\" " -"class=\"configrule\">session name</a> and <a href=\"#cfg_Servers_SignonURL\" " -"class=\"configrule\">signon URL</a> to use this authentication method." +"Sample way how to seed session is in signon example: " +"<code>scripts/signon.php</code>. There is also alternative example using " +"OpenID - <code>scripts/openid.php</code>. You need to configure <a " +"href=\"#cfg_Servers_SignonSession\" class=\"configrule\">session name</a> and <a " +"href=\"#cfg_Servers_SignonURL\" class=\"configrule\">signon URL</a> to use this " +"authentication method." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:774 diff --git a/po/es.po b/po/es.po index 8d11c97..2ffa3d1 100644 --- a/po/es.po +++ b/po/es.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-03-02 13:51+0100\n" -"PO-Revision-Date: 2011-02-28 06:50+0200\n" +"PO-Revision-Date: 2011-03-03 23:26+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -2042,7 +2042,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:756 -#, fuzzy msgid "" "'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as " "introduced in 2.10.0 allows you to log in from prepared PHP session data. " @@ -2059,10 +2058,11 @@ msgstr "" "preparados en la sesión PHP. Esto es útil para implementar un inicio de " "sesión único desde otra aplicación. Un modelo de cómo sembrar los datos en " "la sesión se puede encontrar en el ejemplo: <code>scripts/signon.php</code>. " -"Necesita configurar el <a href=\"#cfg_Servers_SignonSession\" class=" -"\"configrule\">nombre de la sesión</a> y el <a href=\"#cfg_Servers_SignonURL" -"\" class=\"configrule\">URL de inicio de sesión</a> para utilizar este " -"método de autenticación." +"También existe un ejemplo alternativo utilizando OpenID: " +"<code>scripts/openid.php</code>. Necesita configurar el <a " +"href=\"#cfg_Servers_SignonSession\" class=\"configrule\">nombre de la sesión</a> " +"y el <a href=\"#cfg_Servers_SignonURL\" class=\"configrule\">URL de inicio de " +"sesión</a> para utilizar este método de autenticación." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:774 @@ -2203,6 +2203,12 @@ msgid "" "will be displayed but <span class=\"important\">not that all other databases " "can't be used.</span>" msgstr "" +"Esta configuración es una forma eficiente de disminuir la carga del servidor " +"ya que éste no necesita enviar pedidos a MySQL para crear la lista de bases " +"de datos disponibles. Pero <span class=\"important\">no reemplaza las reglas " +"de privilegios del servidor de base de datos MySQL</span>. Si está " +"configurado, sólo estas bases de datos van a ser mostradas pero <span " +"class=\"important\">otras bases de datos aún pueden ser utilizadas</span>." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:828 @@ -2210,6 +2216,8 @@ msgid "" "An example of using more that one database: <tt>$cfg['Servers'][$i]" "['only_db'] = array('db1', 'db2');</tt>" msgstr "" +"En ejemplo que utiliza más de uan base de datos: " +"<tt>$cfg['Servers'][$i]['only_db'] = array('base1', 'base2');</tt>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:832 @@ -2218,6 +2226,9 @@ msgid "" "databases in the left frame, so that you can individually arrange your " "databases." msgstr "" +"Desde phpMyAdmin 2.5.5 el orden del array es el utilizado para ordenar las " +"bases de datos en el panel izquierdo para poder darle un orden personalizado " +"a las mismas." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:834 @@ -2228,12 +2239,18 @@ msgid "" "phpMyAdmin that it should display db3 and db4 on top, and the rest in " "alphabetic order." msgstr "" +"Si se desea tener ciertas bases de datos al principio pero quieres ver todas " +"las otras no es necesario especificarlas una por una. Usa algo como " +"<tt>$cfg['Servers'][$i]['only_db'] = array('base3', 'base4', '*');</tt> en " +"su ligar para indicarle a phpMyAdmin que debe mostrar base3 y base4 primero " +"y luego todas las demás en orden alfabético." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:840 msgid "" "<span id=\"cfg_Servers_hide_db\">$cfg['Servers'][$i]['hide_db']</span> string" msgstr "" +"cadena <span id=\"cfg_Servers_hide_db\">$cfg['Servers'][$i]['hide_db']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:842 @@ -2264,15 +2281,14 @@ msgstr "$cfg['Servers'][$i]['hide_db'] = '^a';" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:849 -#, fuzzy msgid "and to hide both "db1" and "db2" use" -msgstr "y para ocultar "db1" and "db2" usa" +msgstr "y para ocultar tanto "db1" como "db2" usa" #. type: Content of: <html><body><div><dl><dd><pre> #: orig-docs/Documentation.html:850 -#, fuzzy, no-wrap +#, no-wrap msgid "$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';" -msgstr "$cfg['Servers'][$i]['hide_db'] = '(db1|db2)';" +msgstr "$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)';" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:851 @@ -2281,11 +2297,15 @@ msgid "" "php.net/manual/en/reference.pcre.pattern.syntax.php\"> PCRE pattern syntax</" "a> portion of the PHP reference manual." msgstr "" +"Puedes encontrar más información sobre expresiones regulares en el manual de " +"referencia de PHP, en la sección sobre <a " +"href=\"http://php.net/manual/en/reference.pcre.pattern.syntax.php\">sintáxis " +"de patrones PCRE</a>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:856 msgid "$cfg['Servers'][$i]['verbose'] string" -msgstr "$cfg['Servers'][$i]['verbose'] string" +msgstr "cadena $cfg['Servers'][$i]['verbose']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:857 @@ -2296,6 +2316,11 @@ msgid "" "on your system, for example. For HTTP auth, all non-US-ASCII characters will " "be stripped." msgstr "" +"Sólo es útil al utilizar phpMyAdmin con múltiples servidores MySQL. Si está " +"configurado, esta cadena será mostrada en lugar del nombre del sistema en el " +"menú desplegable de la página principal. Puede ser útil si quieres mostrar " +"ciertas bases de datos en tu sistema. Para autenticación HTTP, todos los " +"caracteres fuera del conjunto US-ASCII serán eliminados." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:864 @@ -2319,6 +2344,10 @@ msgid "" "section in this document to see the benefits of this feature, and for a " "quick way of creating this database and the needed tables." msgstr "" +"Ver la sección sobre <a href=\"#linked-tables\">almacenamiento de " +"configuración phpMyAdmin</a> en este documento para saber sobre las ventajas " +"de esta funcionalidad y para una forma fácil de crear esta base de datos y " +"las tablas necesarias." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:874 @@ -2329,6 +2358,12 @@ msgid "" "user installation, set this parameter to the name of your central database " "containing the phpMyAdmin configuration storage." msgstr "" +"Si se es el único usuario de esta instalación de phpMyAdmin, se puede " +"utilizar la base actual para almacenar estas tablas especiales; en este " +"caso, sólo agrega el nombre de la base de datos actual en " +"<tt>$cfg['Servers'][$i]['pmadb']</tt>. Para una instalación multi-usuario, " +"este parámetro debe ser la base de datos central que contiene el " +"almacenamiento de configuración phpMyAdmin." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:882 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1798-g3e9ff36
by Michal Čihař 03 Mar '11

03 Mar '11

The branch, master has been updated via 3e9ff369d8b8a8172ada9e3677df453ee53e07d1 (commit) via 4d49bbe84e68cdf89c5d22bc396c32ec4bf0c431 (commit) via 836a41e7524cc3dec9ce68aa131552b49a2be240 (commit) via 7686d55217d337b1c084c4d6a6378c2cce889298 (commit) via 8f39fd1c01dd31875866db2d597fc6d608928ddd (commit) via 5db3da71bcffad17d14979352579818c93c460e4 (commit) via ad899ff221edb06e5045c3ad9f6b36a1c62ee5e5 (commit) via 0f155e93e6f9812993ac8978b23b3e8e9d47fdb0 (commit) via b55a300717300a1b9af4b33dd8b3cf7db6b13b9d (commit) via 9cd85d904a5b2ada92be55825fec140a9412756a (commit) via a478d554b5cdf753db112b8e9de29a3cd96fd847 (commit) via d734e9e7ce7b9a2cae9799df918e7c51e9b0e4b7 (commit) via 9302baf8547e6a47335ef9a29fea5faceedc66fc (commit) via 0cc27c3261f35a97eeb0148e417b3089f3772733 (commit) via 157618c260551b4297ce47105214320186a5bf13 (commit) via 25a4655ee9429b80d5e4c59b0cc8eeae0cc7b1d3 (commit) via 994ae901d02182b0cbfe367ebf9207650cca3958 (commit) via c5fc7a748b772092ed381a9f1b2896f3ccea6b22 (commit) via d7e6e35071f3cc27c9f1faec4d1bad41ca62a91a (commit) via e132b9515268f5bbec4487a5559089f4f1f06fbd (commit) via 0af4a7174dab8f8e83ea7edd8894d3af6b5b1854 (commit) via 87ed9e99947676961eb443812c0e3e73f8e0f30d (commit) via 60a92c4d1b0ef20bbd687acb26c88f03e8e58e0a (commit) via c111924c533eda8dfb26a0657276fadd504c4918 (commit) from 7fe857322b21e4fe412b96af88ee64996e354ad4 (commit) - Log ----------------------------------------------------------------- commit 3e9ff369d8b8a8172ada9e3677df453ee53e07d1 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:56:06 2011 +0200 Translation update done using Pootle. commit 4d49bbe84e68cdf89c5d22bc396c32ec4bf0c431 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:55:45 2011 +0200 Translation update done using Pootle. commit 836a41e7524cc3dec9ce68aa131552b49a2be240 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:54:54 2011 +0200 Translation update done using Pootle. commit 7686d55217d337b1c084c4d6a6378c2cce889298 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:54:16 2011 +0200 Translation update done using Pootle. commit 8f39fd1c01dd31875866db2d597fc6d608928ddd Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:54:10 2011 +0200 Translation update done using Pootle. commit 5db3da71bcffad17d14979352579818c93c460e4 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:53:50 2011 +0200 Translation update done using Pootle. commit ad899ff221edb06e5045c3ad9f6b36a1c62ee5e5 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:53:28 2011 +0200 Translation update done using Pootle. commit 0f155e93e6f9812993ac8978b23b3e8e9d47fdb0 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:52:44 2011 +0200 Translation update done using Pootle. commit b55a300717300a1b9af4b33dd8b3cf7db6b13b9d Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:52:17 2011 +0200 Translation update done using Pootle. commit 9cd85d904a5b2ada92be55825fec140a9412756a Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:52:08 2011 +0200 Translation update done using Pootle. commit a478d554b5cdf753db112b8e9de29a3cd96fd847 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:52:02 2011 +0200 Translation update done using Pootle. commit d734e9e7ce7b9a2cae9799df918e7c51e9b0e4b7 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:50:57 2011 +0200 Translation update done using Pootle. commit 9302baf8547e6a47335ef9a29fea5faceedc66fc Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:50:42 2011 +0200 Translation update done using Pootle. commit 0cc27c3261f35a97eeb0148e417b3089f3772733 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:50:26 2011 +0200 Translation update done using Pootle. commit 157618c260551b4297ce47105214320186a5bf13 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:50:17 2011 +0200 Translation update done using Pootle. commit 25a4655ee9429b80d5e4c59b0cc8eeae0cc7b1d3 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:49:58 2011 +0200 Translation update done using Pootle. commit 994ae901d02182b0cbfe367ebf9207650cca3958 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:49:54 2011 +0200 Translation update done using Pootle. commit c5fc7a748b772092ed381a9f1b2896f3ccea6b22 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:49:26 2011 +0200 Translation update done using Pootle. commit d7e6e35071f3cc27c9f1faec4d1bad41ca62a91a Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:49:22 2011 +0200 Translation update done using Pootle. commit e132b9515268f5bbec4487a5559089f4f1f06fbd Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:49:08 2011 +0200 Translation update done using Pootle. commit 0af4a7174dab8f8e83ea7edd8894d3af6b5b1854 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:48:53 2011 +0200 Translation update done using Pootle. commit 87ed9e99947676961eb443812c0e3e73f8e0f30d Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:48:31 2011 +0200 Translation update done using Pootle. commit 60a92c4d1b0ef20bbd687acb26c88f03e8e58e0a Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:47:28 2011 +0200 Translation update done using Pootle. commit c111924c533eda8dfb26a0657276fadd504c4918 Author: sven-cihar.com <sven-cihar.com(a)incase.de> Date: Thu Mar 3 15:46:20 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/de.po | 46 +++++++++++++--------------------------------- 1 files changed, 13 insertions(+), 33 deletions(-) diff --git a/po/de.po b/po/de.po index 97ecf7a..b44453a 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-03-03 07:17+0100\n" -"PO-Revision-Date: 2011-02-24 12:56+0200\n" -"Last-Translator: Michal Čihař <michal(a)cihar.com>\n" +"PO-Revision-Date: 2011-03-03 15:56+0200\n" +"Last-Translator: <sven-cihar.com(a)incase.de>\n" "Language-Team: german <de(a)li.org>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -1110,9 +1110,8 @@ msgid "Show query box" msgstr "SQL-Querybox anzeigen" #: js/messages.php:88 -#, fuzzy msgid "Inline Edit" -msgstr "Inline" +msgstr "Direkt bearbeiten" #: js/messages.php:91 msgid "Hide search criteria" @@ -1174,9 +1173,8 @@ msgstr "" #. l10n: Latest available phpMyAdmin version #: js/messages.php:117 -#, fuzzy msgid ", latest stable version:" -msgstr "Auf neue Version prüfen" +msgstr ", aktuellste stabile Version:" #. l10n: Display text for calendar close link #: js/messages.php:132 @@ -1840,9 +1838,8 @@ msgid "Check Privileges" msgstr "Rechte überprüfen" #: libraries/chart.lib.php:40 -#, fuzzy msgid "Query statistics" -msgstr "Zeige Statistik" +msgstr "Statistiken abfragen" #: libraries/chart.lib.php:63 msgid "Query execution time comparison (in microseconds)" @@ -1996,12 +1993,10 @@ msgid "Validate SQL" msgstr "SQL validieren" #: libraries/common.lib.php:1262 -#, fuzzy msgid "Inline edit of this query" msgstr "Inline-Bearbeiten dieses SQL-Befehls" #: libraries/common.lib.php:1264 -#, fuzzy msgid "Inline" msgstr "Inline" @@ -2140,17 +2135,14 @@ msgid "The directory you set for upload work cannot be reached" msgstr "Auf das festgelegte Upload-Verzeichnis kann nicht zugegriffen werden." #: libraries/common.lib.php:2996 -#, fuzzy msgid "There are no files to upload" msgstr "Es sind keine Dateien zum Upload vorhanden" #: libraries/config.values.php:45 libraries/config.values.php:50 -#, fuzzy msgid "Both" msgstr "Beide" #: libraries/config.values.php:74 -#, fuzzy msgid "Open" msgstr "Geöffnet" @@ -2174,17 +2166,14 @@ msgstr "Daten" #: 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 -#, fuzzy msgid "structure and data" msgstr "Struktur und Daten" #: libraries/config.values.php:99 -#, fuzzy msgid "Quick - display only the minimal options to configure" -msgstr "Schnell – Zeige nur die Minimal-Konfigurationsoptionen" +msgstr "Schnell – Zeige nur die minimalen Konfigurationsoptionen" #: libraries/config.values.php:100 -#, fuzzy msgid "Custom - display all possible options to configure" msgstr "Angepasst – Zeige alle möglichen Konfigurationsoptionen" @@ -2202,11 +2191,11 @@ msgstr "Erweiterte 'INSERT's" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "Beide der Obigen" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "Keines der Obigen" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:422 @@ -2389,7 +2378,6 @@ msgid "Bzip2" msgstr "Bzip2" #: libraries/config/messages.inc.php:32 -#, fuzzy msgid "" "Defines which type of editing controls should be used for CHAR and VARCHAR " "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" @@ -2400,7 +2388,6 @@ msgstr "" "Eingabelänge, [kbd]textarea[/kbd] - erlaubt Zeilenumbrüche in Feldern" #: libraries/config/messages.inc.php:33 -#, fuzzy msgid "CHAR columns editing" msgstr "Bearbeitung von CHAR-Felder" @@ -2459,19 +2446,20 @@ msgid "Debug SQL" msgstr "SQL Debugger" #: libraries/config/messages.inc.php:45 -#, fuzzy msgid "Default display direction" -msgstr "Anzeigeoptionen für Datenbank" +msgstr "Stamdardanzeigerichtung" #: libraries/config/messages.inc.php:46 msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]horizontal[/kbd], [kbd]vertikal[/kbd] oder eine Zahl, die die maximale " +"Menge angibt, für die das vertikale Modell genutzt werden soll." #: libraries/config/messages.inc.php:47 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "Anzeigerichtung für das Ändern/Erstellen von Spalten" #: libraries/config/messages.inc.php:48 msgid "Tab that is displayed when entering a database" @@ -2498,7 +2486,6 @@ msgid "Default table tab" msgstr "Standardtab bei Tabellen" #: libraries/config/messages.inc.php:54 -#, fuzzy msgid "Show binary contents as HEX by default" msgstr "Binäre Inhalte standardmäßig hexadezimal anzeigen" @@ -2527,7 +2514,6 @@ msgid "Edit SQL queries in popup window" msgstr "SQL-Abfragen in einem Popup-Fenster bearbeiten" #: libraries/config/messages.inc.php:61 -#, fuzzy msgid "Edit in window" msgstr "In Fenster bearbeiten" @@ -2610,9 +2596,8 @@ msgid "Replace NULL by" msgstr "Ersetze NULL durch" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 -#, fuzzy msgid "Remove CRLF characters within columns" -msgstr "CRLF-Zeichen aus den Feldern entfernen" +msgstr "CRLF-Zeichen aus den Zeilen entfernen" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:242 #: libraries/config/messages.inc.php:250 libraries/import/csv.php:61 @@ -10235,8 +10220,3 @@ msgstr "VIEW Name" #: view_operations.php:91 msgid "Rename view to" msgstr "View umbenennen in" - -#, fuzzy -#~| msgid "Delete the matches for the %s table?" -#~ msgid "Delete the matches for the " -#~ msgstr "Treffer für Tabelle %s löschen?" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. cd7466bb0a679ce4c0ace2585adf79fe62b0765c
by Michal Čihař 03 Mar '11

03 Mar '11

The branch, master has been updated via cd7466bb0a679ce4c0ace2585adf79fe62b0765c (commit) via c6b19afc29856c29d7c672db93052e3bc2635214 (commit) from 1dae9fd86fb31f7b9ee3540ee4e104795562a643 (commit) - Log ----------------------------------------------------------------- commit cd7466bb0a679ce4c0ace2585adf79fe62b0765c Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 3 15:11:29 2011 +0100 Add pointer to another wiki page commit c6b19afc29856c29d7c672db93052e3bc2635214 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 3 15:10:05 2011 +0100 Fix link to wiki ----------------------------------------------------------------------- Summary of changes: templates/improve.tpl | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/templates/improve.tpl b/templates/improve.tpl index d7cede7..2b02b94 100644 --- a/templates/improve.tpl +++ b/templates/improve.tpl @@ -46,6 +46,11 @@ href="http://en.wikipedia.org/wiki/Git_software">Wikipedia</a> or reference in the comprehensive book <a href="http://progit.org/">Pro Git</a>. </p> +<p> +You can find more information for developers on our +<a href="http://wiki.phpmyadmin.net/pma/Development">wiki</a>. +</p> + <h3>Contributing code</h3> <p> Once you have coded an improvement and you are ready to submit it to us, @@ -58,7 +63,7 @@ through improving the patch. <h3>Simple tasks to start</h3> <p> If you are looking for some simple task where you can start, check out -our wiki page with <a href="http://wiki.phpmyadmin.net/pma/Devel:Junior">junior +our wiki page with <a href="http://wiki.phpmyadmin.net/pma/Tasks_for_junior_developers">junior jobs</a> where you can find some tips where to look. </p> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1774-g7fe8573
by Piotr Przybylski 03 Mar '11

03 Mar '11

The branch, master has been updated via 7fe857322b21e4fe412b96af88ee64996e354ad4 (commit) from 614838a4e56f6b6298c6c43e380eae7976d746fa (commit) - Log ----------------------------------------------------------------- commit 7fe857322b21e4fe412b96af88ee64996e354ad4 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Mar 3 12:59:11 2011 +0100 fix More for topmenu in pmahomme formatting ----------------------------------------------------------------------- Summary of changes: themes/original/css/theme_right.css.php | 4 ++-- themes/pmahomme/css/theme_right.css.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 73ec5f8..a0bbfea 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -682,10 +682,10 @@ ul#topmenu ul a { ul#topmenu .submenu { position: relative; - display: none; + display: none; } ul#topmenu .shown { - display: block; + display: block; } ul#topmenu ul { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index cb5f3d8..8f9fcc9 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -831,12 +831,12 @@ ul#topmenu ul a { } /* MH added for hide/show more menu */ ul#topmenu .submenu { - display: none; - position: relative; + display: none; + position: relative; } -#topmenu .shown { - display: inline-block; +ul#topmenu .shown { + display: inline-block; } ul#topmenu ul { hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git March 2011