- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10525-g3a3ac7c
by Dieter Adriaenssens 04 Oct '10

04 Oct '10

The branch, master has been updated via 3a3ac7caaba1a8a8d4a69900c943c1a3c7c70151 (commit) from 76a864be5caf24a319d5946ed4bfafe67981e54f (commit) - Log ----------------------------------------------------------------- commit 3a3ac7caaba1a8a8d4a69900c943c1a3c7c70151 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Mon Oct 4 20:49:05 2010 +0200 bug #3077454, don't apply inner_sql span to query_only mode, this breaks copying databases and rowcount of queries ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 793ae26..a9568c4 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2119,10 +2119,12 @@ if (! defined('PMA_MINIMUM_COMMON')) { $docu = TRUE; break; } // end switch - // inner_sql is a span that exists for all cases + // inner_sql is a span that exists for all cases, except query_only // of $cfg['SQP']['fmtType'] to make possible a replacement // for inline editing - $str .= '<span class="inner_sql">'; + if ($mode!='query_only') { + $str .= '<span class="inner_sql">'; + } $close_docu_link = false; $indent = 0; $bracketlevel = 0; @@ -2617,8 +2619,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { $str .= '</a>'; $close_docu_link = false; } - // close inner_sql span - $str .= '</span>'; + if ($mode!='query_only') { + // close inner_sql span + $str .= '</span>'; + } if ($mode=='color') { // close syntax span $str .= '</span>'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10524-g76a864b
by Marc Delisle 04 Oct '10

04 Oct '10

The branch, master has been updated via 76a864be5caf24a319d5946ed4bfafe67981e54f (commit) from 51129bc12f448883f39e863e1ad25aabed67a514 (commit) - Log ----------------------------------------------------------------- commit 76a864be5caf24a319d5946ed4bfafe67981e54f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 4 12:39:20 2010 -0400 bug 3056712 Two inline edit links when browsing pma_bookmark; I removed this minor feature of seeing a link to execute a bookmark when browsing this table ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 20 -------------------- libraries/display_tbl_links.lib.php | 2 -- 2 files changed, 0 insertions(+), 22 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index c3d833d..da88087 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1118,25 +1118,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } } // end if (1.2.1) - if (isset($GLOBALS['cfg']['Bookmark']['table']) && isset($GLOBALS['cfg']['Bookmark']['db']) && $table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db'] && isset($row[1]) && isset($row[0])) { - $_url_params = array( - 'db' => $row[1], - 'id_bookmark' => $row[0], - 'action_bookmark' => '0', - 'action_bookmark_all' => '1', - 'SQL' => __('Execute bookmarked query'), - ); - $bookmark_go = '<a href="import.php' - . PMA_generate_common_url($_url_params) - .' " title="' . __('Execute bookmarked query') . '">'; - - $bookmark_go .= PMA_getIcon('b_bookmark.png', __('Execute bookmarked query'), true); - - $bookmark_go .= '</a>'; - } else { - $bookmark_go = ''; - } - // 1.2.2 Delete/Kill link(s) if ($is_display['del_lnk'] == 'dr') { // delete row case $_url_params = array( @@ -1448,7 +1429,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if (isset($edit_url)) { $vertical_display['edit'][$row_no] .= ' <td align="center" class="' . $class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n" . PMA_linkOrButton($edit_url, $edit_str, array(), false) - . $bookmark_go . ' </td>' . "\n"; } else { unset($vertical_display['edit'][$row_no]); diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index d261fd0..7398910 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -28,7 +28,6 @@ if ($doWriteModifyAt == 'left') { if (!empty($edit_url)) { echo ' <td class="' . $edit_anchor_class . '" align="center">' . "\n" . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) - . $bookmark_go . ' </td>' . "\n"; } if (!empty($del_url)) { @@ -45,7 +44,6 @@ if ($doWriteModifyAt == 'left') { if (!empty($edit_url)) { echo ' <td class="' . $edit_anchor_class . '" align="center">' . "\n" . PMA_linkOrButton($edit_url, $edit_str, '', FALSE) - . $bookmark_go . ' </td>' . "\n"; } if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10523-g51129bc
by Michal Čihař 04 Oct '10

04 Oct '10

The branch, master has been updated via 51129bc12f448883f39e863e1ad25aabed67a514 (commit) via b4e8007d572fb361143454d7007112be2d4ccab9 (commit) via c7ec6ed3cfa02e945a111ad89bd5b10fbfb1ef39 (commit) from 77e5bd4e07d8c93f62c47a58a4a44f82e8365bf6 (commit) - Log ----------------------------------------------------------------- commit 51129bc12f448883f39e863e1ad25aabed67a514 Merge: 77e5bd4e07d8c93f62c47a58a4a44f82e8365bf6 b4e8007d572fb361143454d7007112be2d4ccab9 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Oct 4 14:49:30 2010 +0200 Merge remote branch 'pootle/master' Conflicts: po/en_GB.po commit b4e8007d572fb361143454d7007112be2d4ccab9 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Mon Oct 4 13:11:11 2010 +0200 Translation update done using Pootle. commit c7ec6ed3cfa02e945a111ad89bd5b10fbfb1ef39 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Mon Oct 4 13:11:08 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index ec8ea0f..85799e3 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-10-04 08:08-0400\n" -"PO-Revision-Date: 2010-09-23 18:12+0200\n" -"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" +"PO-Revision-Date: 2010-10-04 13:11+0200\n" +"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1070,16 +1070,14 @@ msgid "Searching" msgstr "Searching" #: js/messages.php:84 -#, fuzzy #| msgid "SQL Query box" msgid "Hide query box" -msgstr "SQL Query box" +msgstr "Hide query box" #: js/messages.php:85 -#, fuzzy #| msgid "SQL Query box" msgid "Show query box" -msgstr "SQL Query box" +msgstr "Show query box" #: js/messages.php:86 msgid "Inline Edit" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10519-g38334e4
by Marc Delisle 04 Oct '10

04 Oct '10

The branch, master has been updated via 38334e4f9183d94d987f89140be115a678e0a9ba (commit) from 04f1307a45e4a1088c28458d5bb58dfea72f20b5 (commit) - Log ----------------------------------------------------------------- commit 38334e4f9183d94d987f89140be115a678e0a9ba Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 4 08:07:48 2010 -0400 CtrlArrowsMoving not really needed as an option, now always active ----------------------------------------------------------------------- Summary of changes: Documentation.html | 9 +-------- libraries/config.default.php | 7 ------- libraries/config/messages.inc.php | 1 - libraries/config/user_preferences.forms.php | 1 - libraries/tbl_properties.inc.php | 4 ---- tbl_change.php | 2 -- 6 files changed, 1 insertions(+), 23 deletions(-) diff --git a/Documentation.html b/Documentation.html index 71cd175..5910cc3 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1868,11 +1868,6 @@ $cfg['TrustedProxies'] = </dt> <dd>Defines if the whole textarea of the query box will be selected on click.</dd> - <dt id="CtrlArrowsMoving"> - <span id="cfg_CtrlArrowsMoving">$cfg['CtrlArrowsMoving'] </span>boolean - </dt> - <dd>Enable Ctrl+Arrows (Option+Arrows in Safari) moving between fields when - editing.</dd> <dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt> <dd>Maximum number of characters shown in any non-numeric field on browse view. @@ -4082,9 +4077,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); editing fields?</a></h4> <p> You can use Ctrl+arrows (Option+Arrows in Safari) for moving on most pages - with many editing fields (table structure changes, row editing, etc.) - (must be enabled in configuration - see. - <a href="#CtrlArrowsMoving" class="configrule">$cfg['CtrlArrowsMoving']</a>). + with many editing fields (table structure changes, row editing, etc.). You can also have a look at the directive <a href="#DefaultPropDisplay" class="configrule">$cfg['DefaultPropDisplay']</a> ('vertical') and see if this eases up editing for you.</p> diff --git a/libraries/config.default.php b/libraries/config.default.php index 339a40d..cc23cee 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2199,13 +2199,6 @@ $cfg['CharTextareaCols'] = 40; $cfg['CharTextareaRows'] = 2; /** - * Enable Ctrl+Arrows moving between fields when editing? - * - * @global boolean $cfg['CtrlArrowsMoving'] - */ -$cfg['CtrlArrowsMoving'] = true; - -/** * Max field data length in browse mode for all non-numeric fields * * @global integer $cfg['LimitChars'] diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 26d5a78..65545b7 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -39,7 +39,6 @@ $strConfigCompressOnFly_name = __('Compress on the fly'); $strConfigConfigurationFile = __('Configuration file'); $strConfigConfirm_desc = __('Whether a warning ("Are your really sure...") should be displayed when you\'re about to lose data'); $strConfigConfirm_name = __('Confirm DROP queries'); -$strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows'); $strConfigDBG_sql_name = __('Debug SQL'); $strConfigDefaultDisplay_name = __('Default display direction'); $strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used'); diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 025c021..cd9e673 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -115,7 +115,6 @@ $forms['Main_frame']['Edit'] = array( 'InsertRows', 'ForeignKeyDropdownOrder', 'ForeignKeyMaxLimit', - 'CtrlArrowsMoving', 'DefaultPropDisplay'); $forms['Main_frame']['Tabs'] = array( 'LightTabs', diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 001fea6..a00a164 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -597,7 +597,6 @@ for ($i = 0; $i < $num_fields; $i++) { } } // end for -if ($cfg['CtrlArrowsMoving']) { ?> <script src="./js/keyhandler.js" type="text/javascript"></script> <script type="text/javascript"> @@ -606,9 +605,6 @@ var switch_movement = <?php echo $display_type == 'horizontal' ? '0' : '1'; ?>; document.onkeydown = onKeyDownArrowsHandler; // ]]> </script> - <?php -} -?> <form id="<?php echo ($action == 'tbl_create.php' ? 'create_table' : 'append_fields'); ?>_form" method="post" action="<?php echo $action; ?>"> <?php diff --git a/tbl_change.php b/tbl_change.php index bcc0b76..41e8230 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -207,7 +207,6 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5 && // Had to put the URI because when hosted on an https server, // some browsers send wrongly this form to the http server. -if ($cfg['CtrlArrowsMoving']) { ?>  <script src="./js/keyhandler.js" type="text/javascript"></script> @@ -218,7 +217,6 @@ document.onkeydown = onKeyDownArrowsHandler; //]]> </script> <?php -} $_form_params = array( 'db' => $db, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10516-gd1bebc6
by Marc Delisle 03 Oct '10

03 Oct '10

The branch, master has been updated via d1bebc67f6309fcc6fda946953816951d3799bc7 (commit) via 1c49cd3d6422630be2549ce925cd91971565c5c7 (commit) via 1623c7e06593a7b95b9654c51537e29602c5b3a4 (commit) from e91e87861b7e7dff68780fcfc056ac0f0c35885d (commit) - Log ----------------------------------------------------------------- commit d1bebc67f6309fcc6fda946953816951d3799bc7 Merge: e91e87861b7e7dff68780fcfc056ac0f0c35885d 1c49cd3d6422630be2549ce925cd91971565c5c7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 3 09:42:40 2010 -0400 fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/display_tbl.lib.php | 10 ++++++++-- tbl_change.php | 6 +++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d5e79a..49dac18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ - bug #3062455 [core] copy procedures and routines before tables - bug #3062455 [export] with SQL, export procedures and routines before tables - bug #3056023 [import] USE query not working +- bug #3038193 [display] Error when editing row with GEOMETRY column 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 086b47a..e027f23 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -524,7 +524,7 @@ function PMA_DBI_get_fields_meta($result) // so this would override TINYINT and mark all TINYINT as string // https://sf.net/tracker/?func=detail&aid=1532111&group_id=23067&atid=377408 //$typeAr[MYSQLI_TYPE_CHAR] = 'string'; - $typeAr[MYSQLI_TYPE_GEOMETRY] = 'unknown'; + $typeAr[MYSQLI_TYPE_GEOMETRY] = 'geometry'; $typeAr[MYSQLI_TYPE_BIT] = 'bit'; $fields = mysqli_fetch_fields($result); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 3520257..c3d833d 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1330,7 +1330,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"> </td>' . "\n"; } } - // n o t n u m e r i c a n d n o t B L O B + // g e o m e t r y + } elseif ($meta->type == 'geometry') { + $geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta); + $vertical_display['data'][$row_no][$i] = ' <td align="left"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '">' . $geometry_text . '</td>'; + unset($geometry_text); + + // n o t n u m e r i c a n d n o t B L O B } else { if (!isset($row[$i]) || is_null($row[$i])) { $vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n"; @@ -2266,7 +2272,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { * @uses PMA_formatByteDown() * @uses strpos() * @uses str_replace() - * @param string $category BLOB|BINARY + * @param string $category BLOB|BINARY|GEOMETRY * @param string $content the binary content * @param string $transform_function * @param string $transform_options diff --git a/tbl_change.php b/tbl_change.php index 54e0d7f..bcc0b76 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -509,7 +509,7 @@ foreach ($rows as $row_id => $vrow) { if (($cfg['ProtectBinary'] && $field['is_blob'] && !$is_upload) || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { echo ' <td align="center">' . __('Binary') . '</td>' . "\n"; - } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set')) { + } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set') || 'geometry' == $field['pma_type']) { echo ' <td align="center">--</td>' . "\n"; } else { ?> @@ -934,6 +934,10 @@ foreach ($rows as $row_id => $vrow) { } } // end if (web-server upload directory) } // end elseif (binary or blob) + + elseif ('geometry' == $field['pma_type']) { + // ignore this column to avoid changing it + } else { // field size should be at least 4 and max 40 $fieldsize = min(max($field['len'], 4), 40); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_7-15-g1c49cd3
by Marc Delisle 03 Oct '10

03 Oct '10

The branch, QA_3_3 has been updated via 1c49cd3d6422630be2549ce925cd91971565c5c7 (commit) via 1623c7e06593a7b95b9654c51537e29602c5b3a4 (commit) from 22fa5adee3cece9229f457d724d516eb96975186 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/dbi/mysqli.dbi.lib.php | 2 +- libraries/display_tbl.lib.php | 8 +++++++- tbl_change.php | 6 +++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7c8d83..d6f020b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3062455 [core] copy procedures and routines before tables - bug #3062455 [export] with SQL, export procedures and routines before tables - bug #3056023 [import] USE query not working +- bug #3038193 [display] Error when editing row with GEOMETRY column 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 2c00bcd..b064953 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -529,7 +529,7 @@ function PMA_DBI_get_fields_meta($result) // so this would override TINYINT and mark all TINYINT as string // https://sf.net/tracker/?func=detail&aid=1532111&group_id=23067&atid=377408 //$typeAr[MYSQLI_TYPE_CHAR] = 'string'; - $typeAr[MYSQLI_TYPE_GEOMETRY] = 'unknown'; + $typeAr[MYSQLI_TYPE_GEOMETRY] = 'geometry'; $typeAr[MYSQLI_TYPE_BIT] = 'bit'; $fields = mysqli_fetch_fields($result); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d6d93b0..7ef333d 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1343,6 +1343,12 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { $vertical_display['data'][$row_no][$i] = ' <td' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"> </td>' . "\n"; } } + // g e o m e t r y + } elseif ($meta->type == 'geometry') { + $geometry_text = PMA_handle_non_printable_contents('GEOMETRY', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta); + $vertical_display['data'][$row_no][$i] = ' <td align="left"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '">' . $geometry_text . '</td>'; + unset($geometry_text); + // n o t n u m e r i c a n d n o t B L O B } else { if (!isset($row[$i]) || is_null($row[$i])) { @@ -2246,7 +2252,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { * @uses PMA_formatByteDown() * @uses strpos() * @uses str_replace() - * @param string $category BLOB|BINARY + * @param string $category BLOB|BINARY|GEOMETRY * @param string $content the binary content * @param string $transform_function * @param string $transform_options diff --git a/tbl_change.php b/tbl_change.php index aa1a74f..f419bb1 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -497,7 +497,7 @@ foreach ($rows as $row_id => $vrow) { if (($cfg['ProtectBinary'] && $field['is_blob'] && !$is_upload) || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { echo ' <td align="center">' . $strBinary . '</td>' . "\n"; - } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set')) { + } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set') || 'geometry' == $field['pma_type']) { echo ' <td align="center">--</td>' . "\n"; } else { ?> @@ -1027,6 +1027,10 @@ foreach ($rows as $row_id => $vrow) { } } // end if (web-server upload directory) } // end elseif (binary or blob) + + elseif ('geometry' == $field['pma_type']) { + // ignore this column to avoid changing it + } else { // field size should be at least 4 and max 40 $fieldsize = min(max($field['len'], 4), 40); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10513-ge91e878
by Marc Delisle 03 Oct '10

03 Oct '10

The branch, master has been updated via e91e87861b7e7dff68780fcfc056ac0f0c35885d (commit) via 0df2fcd70d5d8f3c2671d38f9fad668f6937251a (commit) via f503d5667e481b65b6249966e3d5da97b013ea3f (commit) via 22fa5adee3cece9229f457d724d516eb96975186 (commit) from 864fb1a0038d1c3c3a7c2e649176e0e86fbdd622 (commit) - Log ----------------------------------------------------------------- commit e91e87861b7e7dff68780fcfc056ac0f0c35885d Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 3 07:45:15 2010 -0400 make USE work in the context of ajaxification commit 0df2fcd70d5d8f3c2671d38f9fad668f6937251a Merge: f503d5667e481b65b6249966e3d5da97b013ea3f 864fb1a0038d1c3c3a7c2e649176e0e86fbdd622 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Oct 2 16:34:55 2010 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit f503d5667e481b65b6249966e3d5da97b013ea3f Merge: 15eda6f4414fc3d2ff0d16346db28a698f52bc00 22fa5adee3cece9229f457d724d516eb96975186 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 29 08:04:47 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 37 ++++++++++++++++++++++++++----------- libraries/import.lib.php | 27 +++++++++++++++++++++++---- sql.php | 5 ++++- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d187e2a..8d5e79a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,6 +123,7 @@ - [core] Update library PHPExcel to version 1.7.4 - bug #3062455 [core] copy procedures and routines before tables - bug #3062455 [export] with SQL, export procedures and routines before tables +- bug #3056023 [import] USE query not working 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/js/sql.js b/js/sql.js index 126784d..285df0f 100644 --- a/js/sql.js +++ b/js/sql.js @@ -155,14 +155,17 @@ $(document).ready(function() { * @memberOf jQuery * @name appendToggleSpan */ - $('<span id="togglequerybox"></span>') - .html(PMA_messages['strToggleQueryBox']) - .appendTo("#sqlqueryform"); - - // Attach the toggling of the query box visibility to a click - $("#togglequerybox").live('click', function() { - $(this).siblings().slideToggle("medium"); - }) + // do not add this span more than once + if (! $('#sqlqueryform').find('span').is('#togglequerybox')) { + $('<span id="togglequerybox"></span>') + .html(PMA_messages['strToggleQueryBox']) + .appendTo("#sqlqueryform"); + + // Attach the toggling of the query box visibility to a click + $("#togglequerybox").bind('click', function() { + $(this).siblings().slideToggle("medium"); + }) + } /** * Ajax Event handler for 'SQL Query Submit' @@ -173,17 +176,29 @@ $(document).ready(function() { */ $("#sqlqueryform").live('submit', function(event) { event.preventDefault(); - + $form = $(this); PMA_ajaxShowMessage(); - $(this).append('<input type="hidden" name="ajax_request" value="true" />'); + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); + } $.post($(this).attr('action'), $(this).serialize() , function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); + // this happens if a USE command was typed + if (typeof data.reload != 'undefined') { + $form.find('input[name=db]').val(data.db); + // need to regenerate the whole upper part + $form.find('input[name=ajax_request]').remove(); + $form.append('<input type="hidden" name="reload" value="true" />'); + $.post('db_sql.php', $form.serialize(), function(data) { + $('body').html(data); + }); // end inner post + } } else if (data.success == false ) { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, 50000); } else { $("#sqlqueryresults").html(data); diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 98221de..79a43b7 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -117,6 +117,8 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) $display_query = ''; } $sql_query = $import_run_buffer['sql']; + // If a 'USE <db>' SQL-clause was found, set our current $db to the new one + list($db, $reload) = PMA_lookForUse($import_run_buffer['sql'], $db, $reload); } elseif ($run_query) { if ($controluser) { $result = PMA_query_as_controluser($import_run_buffer['sql']); @@ -156,10 +158,8 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } // If a 'USE <db>' SQL-clause was found and the query succeeded, set our current $db to the new one - if ($result != FALSE && preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $import_run_buffer['sql'], $match)) { - $db = trim($match[1]); - $db = trim($db,';'); // for example, USE abc; - $reload = TRUE; + if ($result != FALSE) { + list($db, $reload) = PMA_lookForUse($import_run_buffer['sql'], $db, $reload); } if ($result != FALSE && preg_match('@^[\s]*(DROP|CREATE)[\s]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@im', $import_run_buffer['sql'])) { @@ -205,6 +205,25 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } } +/** + * Looks for the presence of USE to possibly change current db + * + * @param string buffer to examine + * @param string current db + * @param boolean reload + * @return array (current or new db, whether to reload) + * @access public + */ +function PMA_lookForUse($buffer, $db, $reload) +{ + if (preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $buffer, $match)) { + $db = trim($match[1]); + $db = trim($db,';'); // for example, USE abc; + $reload = TRUE; + } + return(array($db, $reload)); +} + /** * Returns next part of imported file/buffer diff --git a/sql.php b/sql.php index 698ca8a..898c893 100644 --- a/sql.php +++ b/sql.php @@ -677,7 +677,10 @@ if (0 == $num_rows || $is_affected) { if(isset($GLOBALS['display_query'])) { $extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']); } - + if ($GLOBALS['reload'] == 1) { + $extra_data['reload'] = 1; + $extra_data['db'] = $GLOBALS['db']; + } PMA_ajaxResponse($message, $message->isSuccess(), (isset($extra_data) ? $extra_data : '')); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_7-13-g22fa5ad
by Marc Delisle 03 Oct '10

03 Oct '10

The branch, QA_3_3 has been updated via 22fa5adee3cece9229f457d724d516eb96975186 (commit) from c0d1c7a2ae0d3f70bacac2d5abcb8bdc41590248 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import.lib.php | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 699aaba..a7c8d83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - [core] Update library PHPExcel to version 1.7.4 - bug #3062455 [core] copy procedures and routines before tables - bug #3062455 [export] with SQL, export procedures and routines before tables +- bug #3056023 [import] USE query not working 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 24b27db..12dfbf6 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -118,6 +118,8 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) $display_query = ''; } $sql_query = $import_run_buffer['sql']; + // If a 'USE <db>' SQL-clause was found, set our current $db to the new one + list($db, $reload) = PMA_lookForUse($import_run_buffer['sql'], $db, $reload); } elseif ($run_query) { if ($controluser) { $result = PMA_query_as_controluser($import_run_buffer['sql']); @@ -156,10 +158,8 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } // If a 'USE <db>' SQL-clause was found and the query succeeded, set our current $db to the new one - if ($result != FALSE && preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $import_run_buffer['sql'], $match)) { - $db = trim($match[1]); - $db = trim($db,';'); // for example, USE abc; - $reload = TRUE; + if ($result != FALSE) { + list($db, $reload) = PMA_lookForUse($import_run_buffer['sql'], $db, $reload); } if ($result != FALSE && preg_match('@^[\s]*(DROP|CREATE)[\s]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@im', $import_run_buffer['sql'])) { @@ -205,6 +205,25 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } } +/** + * Looks for the presence of USE to possibly change current db + * + * @param string buffer to examine + * @param string current db + * @param boolean reload + * @return array (current or new db, whether to reload) + * @access public + */ +function PMA_lookForUse($buffer, $db, $reload) +{ + if (preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $buffer, $match)) { + $db = trim($match[1]); + $db = trim($db,';'); // for example, USE abc; + $reload = TRUE; + } + return(array($db, $reload)); +} + /** * Returns next part of imported file/buffer hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10509-g864fb1a
by Michal Čihař 01 Oct '10

01 Oct '10

The branch, master has been updated via 864fb1a0038d1c3c3a7c2e649176e0e86fbdd622 (commit) from 15eda6f4414fc3d2ff0d16346db28a698f52bc00 (commit) - Log ----------------------------------------------------------------- commit 864fb1a0038d1c3c3a7c2e649176e0e86fbdd622 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Sep 30 20:03:27 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index ad2d43b..ba965bd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-21 08:04-0400\n" -"PO-Revision-Date: 2010-09-28 00:29+0200\n" +"PO-Revision-Date: 2010-09-30 20:03+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -8997,7 +8997,7 @@ msgstr "" "gelişi güzel oturum geçersizliklerine sebep olabilir." #: setup/lib/index.lib.php:262 -#, php-format, fuzzy +#, php-format, #| msgid "" #| "[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] " #| "should be set to 1800 seconds (30 minutes) at most. Values larger than " @@ -9006,9 +9006,9 @@ msgid "" "%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at " "most. Values larger than 1800 may pose a security risk such as impersonation." msgstr "" -"%sOturum açma tanımlama%s bilgisi geçerliliği en fazla 1800 saniyeye (30 dakika) " -"ayarlanmalıdır. 1800'den büyük değerler taklit edilme gibi güvenlik riski " -"yaratabilir." +"%sOturum açma tanımlama bilgisi geçerliliği%s en fazla 1800 saniyeye (30 " +"dakika) ayarlanmalıdır. 1800'den büyük değerler taklit edilme gibi güvenlik " +"riski yaratabilir." #: setup/lib/index.lib.php:264 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 7aa204296f47125abf314620abc104cea4547167
by Michal Čihař 29 Sep '10

29 Sep '10

The branch, master has been updated via 7aa204296f47125abf314620abc104cea4547167 (commit) via 7a0ec73825b9f22f0132649299c2a8af655294d4 (commit) via 8ae18fdedd262a8b02a2fb37a01dd1b7e42f611e (commit) via 834fc3bee0b96caec0256d1c73886bbfa303e4f1 (commit) via 34d15cfa144ecb28cbfba6821e0d3f839ee49c43 (commit) via 7c06962151ffcf75fa82c7dfff396cbd7080c0bc (commit) via 954f42f3b3101daf3b752775da39886fbcaeb8b5 (commit) via 9c746ef5a89771636cff12fd4c3c09ea7f0f016c (commit) via e1cfcaba9d0450ac1cb82f1b100c2622ac235c52 (commit) via fcf3a4324431ee864cc345de3780c823e4192917 (commit) via 34aa51de83b514f635a464f334f0e7f9ef015da2 (commit) via aa58b2c92fb5196dc4d89e1fc0b10b0d5110c3f3 (commit) via 28a68d59ed117f4acc574eec59b4660ad76b0914 (commit) via de6706789e6ff63183573a237b7f519235559d4a (commit) via 824388aac0a4bab90ba04409043afa42abfedda7 (commit) via 7db2b18a5c285bbb26bcc29931528dbb8195ffbc (commit) via ba41ef4380561f7a136032d235de244a55b874c8 (commit) via b847d127748c2ee110164d4112db13e48f3cb0d9 (commit) via 4a4086a79c8e8ce960acd1afd7f638700021117f (commit) via f25e89d85612cd5ebe34b9ef49ef2b739c38d4e9 (commit) via 02e6697c717d1e5d7156b03a50245cfddce0a8d9 (commit) via 18ed2746df898644c6310f081a1f331e8dbfcefb (commit) via 356d3ef9d931a0ba7988721e9d27d7ad9b2ae635 (commit) via 276f6f3dd4bfa54bb8280bb3d8637b98a856099f (commit) via 14243d8eaee84daf01167df55eb134bdda2bb03f (commit) via 3c97f1ea7dafa7f305acec35c5658dc176f2651f (commit) via 2d671b206ce4be0a924d89bfd7aa049596f21573 (commit) via c2b5dade661063ae26fe0213fb3968a392f82086 (commit) via dc41956c813b9f361c311cf8c3a38ef17c8feba9 (commit) via 216a7523b9cc7a7c78468eceab5695c5abe1d44a (commit) via f1e9db77bdb7ef794a5223d10e62b2e43272acfb (commit) via 576fcb831d37a98ff181b568dd6c59a27ed218e2 (commit) via 2b848be622f0e00a0f2fe77a415d026a3c096eb4 (commit) via 6f6532f671d4f020c5937b71ccdc8ecaa7810ea4 (commit) via bf64e2049db4dd06e985766b301eb2e245c22b66 (commit) via d41b8777043901490a982fcf22a6b8e0792328d9 (commit) via e63bfe3b131cd4b3f4ff1225af0cbb9cfc4d5bfc (commit) via e8c20ea7e945021ca5ff7accf6b13895865bd875 (commit) via 3c666491822a3f33af0aba5677c41bb5978ff8b4 (commit) via cd8ce31124e0bfad22bcc1daeaf01ea91f2a0f83 (commit) via d9ced34277061bf1feeb0887944d0bc51fd52b8b (commit) via 54c0994d57d22a75937716bf01a55fce258ecdec (commit) via c1feb47fffb1b99833335f8d80d1efb93102ff69 (commit) via 7768c4abbfdf6afe631e619d618c5769899f90d5 (commit) via d7d5a38d20ff31bf6528e592339d35688890b3e0 (commit) via 97445251a58ded46747a36355c65159c6b288ef0 (commit) via a8572f49975db9b8e652c88eeb31b164f53aff9b (commit) via 1eba74624220a8284985ee7cd6a050eb380218da (commit) via c6a5486d5b7dbd121126ad81ba527958d5bd358b (commit) via d168399e2d44769456c486c7cff27140e7cba081 (commit) via c506562ec0025e4d8951675dcf5d3b564af12d7f (commit) via 3bdb57f9264150c37487bd24a325e002c029446f (commit) via ebeb0c848a7b4a6a7af77605da6e1c55fae1846e (commit) via e73cbf68d825a126891d11f22a863e6606d7a4a6 (commit) via 5c4605cfba5ee9ef8311f9126ba6fc63308d406b (commit) via 295eaf6b4fd6e5094493994cf3aa19d641cae86c (commit) via 4b505f3eecba4276fdda26f384b48333f0f2a6df (commit) via 52775efa4bf0c6e866c629940f38d0dbda237e42 (commit) via 97c29299d233b6decd903643f28c65cdab7d61b5 (commit) via 2fc175934bcdd1444bc59f31f59ed9e1d575ae35 (commit) via 19adf4972229f7df67fdf47022575cfbfc7bfdf9 (commit) via d6326c3c5bf120cc6f6362767ffaffa0125280da (commit) via 9330e51229729fcd31b08ab240768c27bcd3fced (commit) via 5a1805f707a8b12b86746753d338bc9047878f1f (commit) via 2d05aea1453526eaa17b684244f2819f7b93fa13 (commit) via 3d72adee3a75a0dd4877ff539bf04bca22e8e0de (commit) via bf82a77e316bf097b3c60ee48f8a3a030675d410 (commit) via bfb907e34f989393902813acee59eeaa699c6b5b (commit) via 65a572d560948d1720dba971cd2242ec8454c232 (commit) via f53b3697539b2a1096da168582a03060bdf4f7f8 (commit) via 80e39124b82e9bdb7499bdea397e5defe28b02a0 (commit) via a3b16577cf91e95ae10186bb170862a93fe9bbab (commit) via a7686ab5001beed3f87b4ad6c0daf7258f352636 (commit) via 2983eaf480a5ade414a54bda2eebd87eca33555b (commit) via 31deaea49fc20f6be1bee3a1846046781b83458c (commit) via f79928426d298590e0dd72c1470f8b64b1684882 (commit) via a6136263fe952000ddaed63df9a7914327b80877 (commit) via 965f655dd6647ae7fd75bdf8ecdbbf4f28c1ca62 (commit) via d492d07291e6c3beae5e4ab1ee163d728f237a25 (commit) via 20fcba745ccd18231303e3c2a75b8dc612d51a6a (commit) via 7703a771bfda93a3b5cd118bdd222e3c138f0de7 (commit) via 3ca2a66a6a3cfbe0774cfeff5bd28291357506e6 (commit) via b3485bb1bec30c3f466301c809b562eebf416510 (commit) via 21a4be280fe8f8e9e0c11dcd5a3802fce2bd61c7 (commit) via dff3dd1e1d7d1b952124557b2573a588fcc496c6 (commit) via 624ff5421e69743c148a7959795f0c406baefc12 (commit) via eebc123eabc9212393e69049907cb8388434a45e (commit) via df7577f7ce1382f2bf1a8d99b5a96b308fa304e8 (commit) via 6893ce96357304ad9eed27316a2720ae6c99954f (commit) via ef83e9f12a7a388fb556012403fc0b41032a7cff (commit) via f730f1942c602d3dd2681f6bd00cb18ca9f72195 (commit) via d2004d8fdeccc8d324da664df8a32ea50870e4a8 (commit) from 746e280345d27ff8cecdbfb4ba301fab8df414e0 (commit) - Log ----------------------------------------------------------------- commit 7aa204296f47125abf314620abc104cea4547167 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Sep 29 16:07:07 2010 +0200 Regenerate. commit 7a0ec73825b9f22f0132649299c2a8af655294d4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:55:09 2010 +0200 Translation update done using Pootle. commit 8ae18fdedd262a8b02a2fb37a01dd1b7e42f611e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:54:19 2010 +0200 Translation update done using Pootle. commit 834fc3bee0b96caec0256d1c73886bbfa303e4f1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:16:25 2010 +0200 Translation update done using Pootle. commit 34d15cfa144ecb28cbfba6821e0d3f839ee49c43 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:16:21 2010 +0200 Translation update done using Pootle. commit 7c06962151ffcf75fa82c7dfff396cbd7080c0bc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:16:00 2010 +0200 Translation update done using Pootle. commit 954f42f3b3101daf3b752775da39886fbcaeb8b5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:15:52 2010 +0200 Translation update done using Pootle. commit 9c746ef5a89771636cff12fd4c3c09ea7f0f016c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:15:01 2010 +0200 Translation update done using Pootle. commit e1cfcaba9d0450ac1cb82f1b100c2622ac235c52 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:14:43 2010 +0200 Translation update done using Pootle. commit fcf3a4324431ee864cc345de3780c823e4192917 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:14:23 2010 +0200 Translation update done using Pootle. commit 34aa51de83b514f635a464f334f0e7f9ef015da2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:14:16 2010 +0200 Translation update done using Pootle. commit aa58b2c92fb5196dc4d89e1fc0b10b0d5110c3f3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:14:05 2010 +0200 Translation update done using Pootle. commit 28a68d59ed117f4acc574eec59b4660ad76b0914 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:13:53 2010 +0200 Translation update done using Pootle. commit de6706789e6ff63183573a237b7f519235559d4a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:13:34 2010 +0200 Translation update done using Pootle. commit 824388aac0a4bab90ba04409043afa42abfedda7 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:13:26 2010 +0200 Translation update done using Pootle. commit 7db2b18a5c285bbb26bcc29931528dbb8195ffbc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:13:02 2010 +0200 Translation update done using Pootle. commit ba41ef4380561f7a136032d235de244a55b874c8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:12:56 2010 +0200 Translation update done using Pootle. commit b847d127748c2ee110164d4112db13e48f3cb0d9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:12:33 2010 +0200 Translation update done using Pootle. commit 4a4086a79c8e8ce960acd1afd7f638700021117f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:12:19 2010 +0200 Translation update done using Pootle. commit f25e89d85612cd5ebe34b9ef49ef2b739c38d4e9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:12:09 2010 +0200 Translation update done using Pootle. commit 02e6697c717d1e5d7156b03a50245cfddce0a8d9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:12:05 2010 +0200 Translation update done using Pootle. commit 18ed2746df898644c6310f081a1f331e8dbfcefb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:11:27 2010 +0200 Translation update done using Pootle. commit 356d3ef9d931a0ba7988721e9d27d7ad9b2ae635 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:11:24 2010 +0200 Translation update done using Pootle. commit 276f6f3dd4bfa54bb8280bb3d8637b98a856099f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:11:13 2010 +0200 Translation update done using Pootle. commit 14243d8eaee84daf01167df55eb134bdda2bb03f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:10:39 2010 +0200 Translation update done using Pootle. commit 3c97f1ea7dafa7f305acec35c5658dc176f2651f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:10:24 2010 +0200 Translation update done using Pootle. commit 2d671b206ce4be0a924d89bfd7aa049596f21573 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:10:14 2010 +0200 Translation update done using Pootle. commit c2b5dade661063ae26fe0213fb3968a392f82086 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:10:08 2010 +0200 Translation update done using Pootle. commit dc41956c813b9f361c311cf8c3a38ef17c8feba9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:09:45 2010 +0200 Translation update done using Pootle. commit 216a7523b9cc7a7c78468eceab5695c5abe1d44a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:09:03 2010 +0200 Translation update done using Pootle. commit f1e9db77bdb7ef794a5223d10e62b2e43272acfb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:08:57 2010 +0200 Translation update done using Pootle. commit 576fcb831d37a98ff181b568dd6c59a27ed218e2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:08:31 2010 +0200 Translation update done using Pootle. commit 2b848be622f0e00a0f2fe77a415d026a3c096eb4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:08:22 2010 +0200 Translation update done using Pootle. commit 6f6532f671d4f020c5937b71ccdc8ecaa7810ea4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:08:18 2010 +0200 Translation update done using Pootle. commit bf64e2049db4dd06e985766b301eb2e245c22b66 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:08:10 2010 +0200 Translation update done using Pootle. commit d41b8777043901490a982fcf22a6b8e0792328d9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:07:46 2010 +0200 Translation update done using Pootle. commit e63bfe3b131cd4b3f4ff1225af0cbb9cfc4d5bfc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:07:21 2010 +0200 Translation update done using Pootle. commit e8c20ea7e945021ca5ff7accf6b13895865bd875 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:07:07 2010 +0200 Translation update done using Pootle. commit 3c666491822a3f33af0aba5677c41bb5978ff8b4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:06:18 2010 +0200 Translation update done using Pootle. commit cd8ce31124e0bfad22bcc1daeaf01ea91f2a0f83 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:06:00 2010 +0200 Translation update done using Pootle. commit d9ced34277061bf1feeb0887944d0bc51fd52b8b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:05:00 2010 +0200 Translation update done using Pootle. commit 54c0994d57d22a75937716bf01a55fce258ecdec Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:04:32 2010 +0200 Translation update done using Pootle. commit c1feb47fffb1b99833335f8d80d1efb93102ff69 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:04:12 2010 +0200 Translation update done using Pootle. commit 7768c4abbfdf6afe631e619d618c5769899f90d5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:03:54 2010 +0200 Translation update done using Pootle. commit d7d5a38d20ff31bf6528e592339d35688890b3e0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:03:43 2010 +0200 Translation update done using Pootle. commit 97445251a58ded46747a36355c65159c6b288ef0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:03:32 2010 +0200 Translation update done using Pootle. commit a8572f49975db9b8e652c88eeb31b164f53aff9b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 12:01:00 2010 +0200 Translation update done using Pootle. commit 1eba74624220a8284985ee7cd6a050eb380218da Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:26:48 2010 +0200 Translation update done using Pootle. commit c6a5486d5b7dbd121126ad81ba527958d5bd358b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:25:44 2010 +0200 Translation update done using Pootle. commit d168399e2d44769456c486c7cff27140e7cba081 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:25:04 2010 +0200 Translation update done using Pootle. commit c506562ec0025e4d8951675dcf5d3b564af12d7f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:23:55 2010 +0200 Translation update done using Pootle. commit 3bdb57f9264150c37487bd24a325e002c029446f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:21:30 2010 +0200 Translation update done using Pootle. commit ebeb0c848a7b4a6a7af77605da6e1c55fae1846e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:20:16 2010 +0200 Translation update done using Pootle. commit e73cbf68d825a126891d11f22a863e6606d7a4a6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:20:05 2010 +0200 Translation update done using Pootle. commit 5c4605cfba5ee9ef8311f9126ba6fc63308d406b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:19:55 2010 +0200 Translation update done using Pootle. commit 295eaf6b4fd6e5094493994cf3aa19d641cae86c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:19:47 2010 +0200 Translation update done using Pootle. commit 4b505f3eecba4276fdda26f384b48333f0f2a6df Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:19:37 2010 +0200 Translation update done using Pootle. commit 52775efa4bf0c6e866c629940f38d0dbda237e42 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:18:48 2010 +0200 Translation update done using Pootle. commit 97c29299d233b6decd903643f28c65cdab7d61b5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:18:35 2010 +0200 Translation update done using Pootle. commit 2fc175934bcdd1444bc59f31f59ed9e1d575ae35 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:18:25 2010 +0200 Translation update done using Pootle. commit 19adf4972229f7df67fdf47022575cfbfc7bfdf9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:18:13 2010 +0200 Translation update done using Pootle. commit d6326c3c5bf120cc6f6362767ffaffa0125280da Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:18:02 2010 +0200 Translation update done using Pootle. commit 9330e51229729fcd31b08ab240768c27bcd3fced Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:17:29 2010 +0200 Translation update done using Pootle. commit 5a1805f707a8b12b86746753d338bc9047878f1f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:17:11 2010 +0200 Translation update done using Pootle. commit 2d05aea1453526eaa17b684244f2819f7b93fa13 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:17:00 2010 +0200 Translation update done using Pootle. commit 3d72adee3a75a0dd4877ff539bf04bca22e8e0de Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:16:55 2010 +0200 Translation update done using Pootle. commit bf82a77e316bf097b3c60ee48f8a3a030675d410 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:16:35 2010 +0200 Translation update done using Pootle. commit bfb907e34f989393902813acee59eeaa699c6b5b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:15:57 2010 +0200 Translation update done using Pootle. commit 65a572d560948d1720dba971cd2242ec8454c232 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Sep 28 00:14:36 2010 +0200 Translation update done using Pootle. commit f53b3697539b2a1096da168582a03060bdf4f7f8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 23:13:25 2010 +0200 Translation update done using Pootle. commit 80e39124b82e9bdb7499bdea397e5defe28b02a0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 23:12:08 2010 +0200 Translation update done using Pootle. commit a3b16577cf91e95ae10186bb170862a93fe9bbab Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 23:05:01 2010 +0200 Translation update done using Pootle. commit a7686ab5001beed3f87b4ad6c0daf7258f352636 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 23:04:51 2010 +0200 Translation update done using Pootle. commit 2983eaf480a5ade414a54bda2eebd87eca33555b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:55:29 2010 +0200 Translation update done using Pootle. commit 31deaea49fc20f6be1bee3a1846046781b83458c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:55:12 2010 +0200 Translation update done using Pootle. commit f79928426d298590e0dd72c1470f8b64b1684882 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:54:20 2010 +0200 Translation update done using Pootle. commit a6136263fe952000ddaed63df9a7914327b80877 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:54:08 2010 +0200 Translation update done using Pootle. commit 965f655dd6647ae7fd75bdf8ecdbbf4f28c1ca62 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:52:55 2010 +0200 Translation update done using Pootle. commit d492d07291e6c3beae5e4ab1ee163d728f237a25 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:52:28 2010 +0200 Translation update done using Pootle. commit 20fcba745ccd18231303e3c2a75b8dc612d51a6a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:52:15 2010 +0200 Translation update done using Pootle. commit 7703a771bfda93a3b5cd118bdd222e3c138f0de7 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:51:51 2010 +0200 Translation update done using Pootle. commit 3ca2a66a6a3cfbe0774cfeff5bd28291357506e6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:51:44 2010 +0200 Translation update done using Pootle. commit b3485bb1bec30c3f466301c809b562eebf416510 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:51:28 2010 +0200 Translation update done using Pootle. commit 21a4be280fe8f8e9e0c11dcd5a3802fce2bd61c7 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:50:48 2010 +0200 Translation update done using Pootle. commit dff3dd1e1d7d1b952124557b2573a588fcc496c6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 18:50:21 2010 +0200 Translation update done using Pootle. commit 624ff5421e69743c148a7959795f0c406baefc12 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 12:29:42 2010 +0200 Translation update done using Pootle. commit eebc123eabc9212393e69049907cb8388434a45e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 12:29:24 2010 +0200 Translation update done using Pootle. commit df7577f7ce1382f2bf1a8d99b5a96b308fa304e8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 12:29:14 2010 +0200 Translation update done using Pootle. commit 6893ce96357304ad9eed27316a2720ae6c99954f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Sep 27 12:29:06 2010 +0200 Translation update done using Pootle. commit ef83e9f12a7a388fb556012403fc0b41032a7cff Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Sep 26 23:07:59 2010 +0200 Translation update done using Pootle. commit f730f1942c602d3dd2681f6bd00cb18ca9f72195 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Sep 26 23:05:28 2010 +0200 Translation update done using Pootle. commit d2004d8fdeccc8d324da664df8a32ea50870e4a8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Sun Sep 26 12:26:38 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: addendum/html_comment.tr | 6 +- output/cs/Documentation.html | 2 +- output/en_GB/Documentation.html | 2 +- output/fr/Documentation.html | 7 +- output/it/Documentation.html | 2 +- output/ja/Documentation.html | 2 +- output/pl/Documentation.html | 2 +- output/pt_BR/Documentation.html | 2 +- output/{sl => tr}/INSTALL | 4 +- output/tr/README | 41 +++++---- output/{it => tr}/TODO | 4 +- output/tr/index.html | 8 +- output/tr/translators.html | 102 ++++++++++---------- output/zh_CN/Documentation.html | 4 +- po/tr.po | 193 ++++++++++++++++++++------------------- po/zh_CN.po | 4 +- 16 files changed, 195 insertions(+), 190 deletions(-) copy output/{sl => tr}/INSTALL (62%) copy output/{it => tr}/TODO (74%) diff --git a/addendum/html_comment.tr b/addendum/html_comment.tr index 4d354ae..1eb587c 100644 --- a/addendum/html_comment.tr +++ b/addendum/html_comment.tr @@ -1,11 +1,11 @@ PO4A-HEADER:mode=before;position=<head>  diff --git a/output/cs/Documentation.html b/output/cs/Documentation.html index c93dfae..d2b90b0 100644 --- a/output/cs/Documentation.html +++ b/output/cs/Documentation.html @@ -1422,7 +1422,7 @@ invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> not lower than the value of $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] číslo [number of seconds]</dt> - <dd>Define how long is login cookie should be stored in browser. Default 0 means + <dd>Define how long login cookie should be stored in browser. Default 0 means that it will be kept for existing session. This is recommended for not trusted environments.</dd> diff --git a/output/en_GB/Documentation.html b/output/en_GB/Documentation.html index d8f46e6..b0131a8 100644 --- a/output/en_GB/Documentation.html +++ b/output/en_GB/Documentation.html @@ -1423,7 +1423,7 @@ invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> not lower than the value of $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> - <dd>Define how long is login cookie should be stored in browser. Default 0 means + <dd>Define how long login cookie should be stored in browser. Default 0 means that it will be kept for existing session. This is recommended for not trusted environments.</dd> diff --git a/output/fr/Documentation.html b/output/fr/Documentation.html index e8bc81a..c42cd71 100644 --- a/output/fr/Documentation.html +++ b/output/fr/Documentation.html @@ -1698,10 +1698,9 @@ cookie de connexion est aussi invalidé. Il est donc conseillé de définir $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] entier ['nombre de secondes']</dt> - <dd>Définit la durée de stockage d'un cookie de connexion dans -votre navigateur. Par défaut, 0 signifie qu'il sera conservé -pour la session en cours. Ceci est recommandé pour les environnements -non sécurisés.</dd> + <dd>Define how long login cookie should be stored in browser. Default 0 means +that it will be kept for existing session. This is recommended for not +trusted environments.</dd> <dt id="cfg_LoginCookieDeleteAll">$cfg['LoginCookieDeleteAll'] booléen</dt> <dd>Si activé (par défaut), la déconnexion supprime les diff --git a/output/it/Documentation.html b/output/it/Documentation.html index c2f2d74..9d42131 100644 --- a/output/it/Documentation.html +++ b/output/it/Documentation.html @@ -1457,7 +1457,7 @@ invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> not lower than the value of $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> - <dd>Define how long is login cookie should be stored in browser. Default 0 means + <dd>Define how long login cookie should be stored in browser. Default 0 means that it will be kept for existing session. This is recommended for not trusted environments.</dd> diff --git a/output/ja/Documentation.html b/output/ja/Documentation.html index 02eb685..53eed44 100644 --- a/output/ja/Documentation.html +++ b/output/ja/Documentation.html @@ -1471,7 +1471,7 @@ invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> not lower than the value of $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> - <dd>Define how long is login cookie should be stored in browser. Default 0 means + <dd>Define how long login cookie should be stored in browser. Default 0 means that it will be kept for existing session. This is recommended for not trusted environments.</dd> diff --git a/output/pl/Documentation.html b/output/pl/Documentation.html index 8a2a23a..8c4c46f 100644 --- a/output/pl/Documentation.html +++ b/output/pl/Documentation.html @@ -1425,7 +1425,7 @@ invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> not lower than the value of $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> - <dd>Define how long is login cookie should be stored in browser. Default 0 means + <dd>Define how long login cookie should be stored in browser. Default 0 means that it will be kept for existing session. This is recommended for not trusted environments.</dd> diff --git a/output/pt_BR/Documentation.html b/output/pt_BR/Documentation.html index 1d3befa..6f10397 100644 --- a/output/pt_BR/Documentation.html +++ b/output/pt_BR/Documentation.html @@ -1442,7 +1442,7 @@ invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> not lower than the value of $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] inteiro [número de segundos]</dt> - <dd>Define how long is login cookie should be stored in browser. Default 0 means + <dd>Define how long login cookie should be stored in browser. Default 0 means that it will be kept for existing session. This is recommended for not trusted environments.</dd> diff --git a/output/sl/INSTALL b/output/tr/INSTALL similarity index 62% copy from output/sl/INSTALL copy to output/tr/INSTALL index fbc6613..fd05a16 100644 --- a/output/sl/INSTALL +++ b/output/tr/INSTALL @@ -1,5 +1,5 @@ -phpMyAdmin - Namestitev ------------------------ +phpMyAdmin - Kurulumu +--------------------- Please have a look to the Documentation.txt or Documentation.html files. diff --git a/output/tr/README b/output/tr/README index 3435690..21eedc0 100644 --- a/output/tr/README +++ b/output/tr/README @@ -1,5 +1,5 @@ -phpMyAdmin - Readme -=================== +phpMyAdmin - Benioku +==================== A set of PHP-scripts to manage MySQL over the web. @@ -34,42 +34,47 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -Requirements -~~~~~~~~~~~~ +Gereksinimler +~~~~~~~~~~~~~ -* PHP 5.2 ya da üstü -* MySQL 5.0 or later +* PHP 5.2 veya üzeri +* MySQL 5.0 veya üzeri * a web-browser (doh!) -Özet~~~~ +Özet +~~~~~ phpMyAdmin is intended to handle the administration of MySQL over the web. For a summary of features, please see the Documentation.txt/.html file. -Download -~~~~~~~~ +İndir +~~~~~~ -En son sürümü http://www.phpmyadmin.net/ adresinden edinebilirsiniz. +En yeni sürümü http://www.phpmyadmin.net/ adresinden alabilirsiniz. -More Information +Daha Fazla Bilgi ~~~~~~~~~~~~~~~~ Lütfen Documentation.txt/.html dosyasını okuyun. -Destek~~~~~ +Destek +~~~~~~ http://www.phpmyadmin.net/ adresindeki destek forumlarındaki referansa bakınız. -Eğlenin!~~~~~~~~ +Keyfini Çıkarın! +~~~~~~~~~~~~~~~~~~~ -The phpMyAdmin Devel team +phpMyAdmin Geliştirme takımı NOT: -~~~~Lütfen bize "PHP'yi MySQL ile nasıl derlerim?"benzeri sorular göndermeyiniz. -~~~~Bedava destek imkanı sağlayacak zamanımız henüz yoktur. -~~~~Lütfen sorularınızı ilgili mail grupları ya da forumlarda paylaşın.. -~~~~Bizimle iletişime geçmeden önce, lütfen Documentation.html adresindeki yazıları okuyun. +Lütfen bize "PHP'yi MySQL desteği ile nasıl derlerim?" gibi sorularla +epostalar göndermeyin. Bedava destek imkanı sağlayacak +zamanımız henüz yok. +Lütfen sorularınızı ilgili posta listelerine / forumlara gönderin. +Bizimle iletişime geçmeden önce, lütfen Documentation.html içindekileri +okuyun (özl. SSS kısmını). diff --git a/output/it/TODO b/output/tr/TODO similarity index 74% copy from output/it/TODO copy to output/tr/TODO index 7e96527..50686ce 100644 --- a/output/it/TODO +++ b/output/tr/TODO @@ -1,5 +1,5 @@ -phpMyAdmin - Todo -================= +phpMyAdmin - Yapılacaklar +========================== We are currently using the Sourceforge Tracker as Todo list: diff --git a/output/tr/index.html b/output/tr/index.html index 8c05717..7f27dd4 100644 --- a/output/tr/index.html +++ b/output/tr/index.html @@ -4,13 +4,13 @@ version="-//W3C//DTD XHTML 1.1//EN" dir="ltr"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin Turkish Documentation</title> + <title>phpMyAdmin Türkçe Belge</title> </head> <body> -<h1>phpMyAdmin Turkish Documentation</h1> -<p>Documents translated to Turkish:</p> +<h1>phpMyAdmin Türkçe Belge</h1> +<p>Belgelerin Türkçeye Çevirilmesi:</p> <ul> -<li><a href="README">README</a></li> +<li><a href="README">BENİOKU</a></li> <li><a href="translators.html">Çevirmenler</a></li> </ul> </body> diff --git a/output/tr/translators.html b/output/tr/translators.html index 045e620..194c6b6 100644 --- a/output/tr/translators.html +++ b/output/tr/translators.html @@ -9,11 +9,11 @@ -->  @@ -21,7 +21,7 @@ düzenleyebilirisiniz. <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.0-dev - Official translators</title> + <title>phpMyAdmin 3.4.0-dev - Resmi çevirmenleri</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -29,7 +29,7 @@ düzenleyebilirisiniz. <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span -class="myadmin">MyAdmin</span></a> 3.4.0-dev official translators list +class="myadmin">MyAdmin</span></a> 3.4.0-dev resmi çevirmenler listesi </h1> </div> @@ -61,7 +61,7 @@ href="http://www.phpmyadmin.net/documentation/">phpMyAdmin documentation</a>. You can contribute to it on our <a href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. </p> -<p> Here is the list of the "official translators" of phpMyAdmin.</p> +<p> İşte phpMyAdmin'in "resmi çevirmenler" listesi.</p> <p> <span class="important">If you want to suggest some improvements on a translation please ask them</span>: we (the phpMyAdmin developement team) @@ -78,20 +78,20 @@ provide e-mail support.</span></p> <table class="translators"> <tr> <th>Dil</th> - <th>Official translator(s)</th> + <th>Resmi çevirmen(ler)</th> </tr> <tr id="afrikaans"> - <td>Afrikaans</td> + <td>Afrikanca</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> <tr id="albanian"> <td>Arnavutça</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -105,7 +105,7 @@ provide e-mail support.</span></p> <tr id="azerbaijani"> <td>Azerice</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -119,7 +119,7 @@ provide e-mail support.</span></p> <tr id="basque"> <td>Bask dili</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -133,7 +133,7 @@ provide e-mail support.</span></p> <tr id="bosnian"> <td>Boşnakça</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -159,14 +159,14 @@ provide e-mail support.</span></p> </tr> <tr id="chinese_traditional"> - <td>Çince-Geleneksel </td> + <td>Çince Geleneksel (BIG5)</td> <td> Siu Sun (siusun(a)best-view.net) </td> </tr> <tr id="chinese_simplified"> - <td>Çince-Basitleştirilmiş</td> + <td>Çince Basitleştirilmiş (GB)</td> <td> Shanyan Baishui (rimyxp(a)users.sourceforge.net) </td> @@ -195,7 +195,7 @@ provide e-mail support.</span></p> </tr> <tr id="dutch"> - <td>Dutch</td> + <td>Flemenkçe</td> <td> Herman van Rink (rink(a)initfour.nl) </td> @@ -204,12 +204,12 @@ provide e-mail support.</span></p> <tr id="english"> <td>İngilizce</td> <td> - the phpMyAdmin development team (phpmyadmin-devel(a)lists.sourceforge.net) + phpMyAdmin geliştirme takımı (phpmyadmin-devel(a)lists.sourceforge.net) </td> </tr> <tr id="english-gb"> - <td>English (United Kingdom)</td> + <td>İngilizce (Birleşik Krallık)</td> <td> Robert Readman (robert_readman(a)hotmail.com) </td> @@ -223,21 +223,21 @@ provide e-mail support.</span></p> </tr> <tr id="finnish"> - <td>Finnish</td> + <td>Fince</td> <td> - Jouni Kahkonen (address withdrawn) + Jouni Kahkonen (adres verilmedi) </td> </tr> <tr id="french"> - <td>French</td> + <td>Fransızca</td> <td> Marc Delisle (marc(a)infomarc.info) </td> </tr> <tr id="galician"> - <td>Galician</td> + <td>Galiççe</td> <td> Xosé Calvo (xosecalvo(a)galizaweb.net) </td> @@ -253,7 +253,7 @@ provide e-mail support.</span></p> <tr id="german"> <td>Almanca</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -267,14 +267,14 @@ provide e-mail support.</span></p> <tr id="hebrew"> <td>İbranice</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> <tr id="hindi"> - <td>Hindi</td> + <td>Hintçe</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -286,9 +286,9 @@ provide e-mail support.</span></p> </tr> <tr id="indonesian"> - <td>Indonesian</td> + <td>Endonezce</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -309,14 +309,14 @@ provide e-mail support.</span></p> <tr id="korean"> <td>Korece</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> <tr id="latvian"> <td>Litvanyaca</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -328,16 +328,16 @@ provide e-mail support.</span></p> </tr> <tr id="malay"> - <td>Malay</td> + <td>Malayca</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> <tr id="macedonian"> <td>Makedonca</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -358,21 +358,21 @@ provide e-mail support.</span></p> <tr id="persian"> <td>Farsça</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> <tr id="polish"> <td>Polonyaca</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> <tr id="portuguese"> - <td>Portuguese</td> + <td>Portegizce</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -386,19 +386,19 @@ provide e-mail support.</span></p> <tr id="russian"> <td>Rusça</td> <td> - Victor Volkov and project php-myadmin.ru + Victor Volkov ve php-myadmin.ru projesi </td> </tr> <tr id="serbian"> - <td>Serbian</td> + <td>Sırpça</td> <td> Mihailo Stefanovic (mikis(a)users.sourceforge.net) </td> </tr> <tr id="sinhala"> - <td>Sinhala</td> + <td>Sinhala dili</td> <td> H.Malinda Siriwardana (malindahs(a)users.sourceforge.net) </td> @@ -414,7 +414,7 @@ provide e-mail support.</span></p> <tr id="slovenian"> <td>Slovence</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -440,7 +440,7 @@ provide e-mail support.</span></p> </tr> <tr id="telugu"> - <td>Telugu</td> + <td>Telugu dili</td> <td> veeven (veeven(a)gmail.com) </td> @@ -449,7 +449,7 @@ provide e-mail support.</span></p> <tr id="thai"> <td>Tayca</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> @@ -463,26 +463,26 @@ provide e-mail support.</span></p> <tr id="ukrainian"> <td>Ukraynaca</td> <td> - volunteer needed + gönüllü gerekli </td> </tr> <tr id="uzbek"> <td>Özbekçe</td> <td> Orzu Samarqandiy (orzu(a)users.sourceforge.net)<br /> - Abdurashid Muhitdinov (cool_zero(a)list.ru + Abdurashid Muhitdinov (cool_zero(a)list.ru) </td> </tr> </table> </div> <ul id="footer"> - <li>Copyright © 2003 - 2010 <a -href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel -team</a></li> - <li><a href="LICENSE">License</a></li> - <li><a href="http://www.phpmyadmin.net/home_page/donate.php">Donate</a></li> - <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a + <li>Telif Hakkı © 2003 - 2010 <a +href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin geliştirme +takımı</a></li> + <li><a href="LICENSE">Lisans</a></li> + <li><a href="http://www.phpmyadmin.net/home_page/donate.php">Bağış</a></li> + <li class="last">Geçerli <a href="http://validator.w3.org/check/referer">HTML</a> ve <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li> </ul> diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html index a945e63..eee965f 100644 --- a/output/zh_CN/Documentation.html +++ b/output/zh_CN/Documentation.html @@ -1154,7 +1154,7 @@ invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> not lower than the value of $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> - <dd>Define how long is login cookie should be stored in browser. Default 0 means + <dd>Define how long login cookie should be stored in browser. Default 0 means that it will be kept for existing session. This is recommended for not trusted environments.</dd> @@ -2126,7 +2126,7 @@ official phpMyAdmin homepage.</p> <h3 id="transformationshowto">2. 使用</h3> -<p> 打开到你的 <i>tbl_structure.php</i> 页面 (如：通过点击一张表的 '结构' 链接) 。点击 "修改" +<p> 打开到你的 <i>tbl_structure.php</i> 页面 (如: 通过点击一张表的 '结构' 链接) 。点击 "修改" (或修改图标) 后你就能看到在最下方多出三栏。它们分别叫 'MIME 类型'、'浏览器转换' 和 '转换选项' 。</p> <ul><li>'MIME 类型' 是一个下拉框。选择与字段内容一致的 MIME 类型。请注意如果没有选择任何 MIME 类型转换功能是不起作� ��的。</li> diff --git a/po/tr.po b/po/tr.po index 387307c..ed9a3db 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-08 13:43+0300\n" -"PO-Revision-Date: 2010-09-15 15:35+0200\n" -"Last-Translator: <biodiscover(a)gmail.com>\n" +"PO-Revision-Date: 2010-09-28 12:55+0200\n" +"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -473,9 +473,8 @@ msgstr "<a href=\"#setup_script\">Betik kur kullanımı</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:169 -#, fuzzy msgid "<a href=\"#linked-tables\">phpMyAdmin configuration storage</a>" -msgstr "<a href=\"#linked-tables\">Bağlı tablo altyapısı</a>" +msgstr "<a href=\"#linked-tables\">phpMyAdmin yapılandırma depolaması</a>" #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:170 @@ -753,9 +752,8 @@ msgstr "" #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:325 -#, fuzzy msgid "phpMyAdmin configuration storage" -msgstr "phpMyAdmin belgeleri" +msgstr "" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:327 @@ -3778,9 +3776,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:1715 -#, fuzzy msgid "none - disable encoding conversion" -msgstr "Şifreleme dönüştürme" +msgstr "" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1717 ../phpmyadmin/Documentation.html:1763 @@ -9143,9 +9140,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:4285 -#, fuzzy msgid "<code>@FIELDS@</code>" -msgstr "AUTO_INCREMENT değeri ekle" +msgstr "" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:4286 @@ -10245,9 +10241,8 @@ msgstr "" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4798 -#, fuzzy msgid "user preferences" -msgstr "Kullanıcı tercihleri" +msgstr "kullanıcı tercihleri" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4801 @@ -10988,16 +10983,19 @@ msgid "" "Copyright © 2003 - 2010 <a href=\"http://www.phpmyadmin.net/home_page/" "team.php\">phpMyAdmin devel team</a>" msgstr "" +"Telif Hakkı © 2003 - 2010 <a " +"href=\"http://www.phpmyadmin.net/home_page/team.php\">phpMyAdmin geliştirme " +"takımı</a>" #. type: Content of: <html><body><ul><li> #: ../phpmyadmin/Documentation.html:5102 ../phpmyadmin/translators.html:463 msgid "<a href=\"LICENSE\">License</a>" -msgstr "" +msgstr "<a href=\"LICENSE\">Lisans</a>" #. type: Content of: <html><body><ul><li> #: ../phpmyadmin/Documentation.html:5103 ../phpmyadmin/translators.html:464 msgid "<a href=\"http://www.phpmyadmin.net/home_page/donate.php\">Donate</a>" -msgstr "" +msgstr "<a href=\"http://www.phpmyadmin.net/home_page/donate.php\">Bağış</a>" #. type: Content of: <html><body><ul><li> #: ../phpmyadmin/Documentation.html:5104 ../phpmyadmin/translators.html:465 @@ -11005,11 +11003,13 @@ msgid "" "Valid <a href=\"http://validator.w3.org/check/referer\">HTML</a> and <a href=" "\"http://jigsaw.w3.org/css-validator/check/referer\">CSS</a>" msgstr "" +"Geçerli <a href=\"http://validator.w3.org/check/referer\">HTML</a> ve <a " +"href=\"http://jigsaw.w3.org/css-validator/check/referer\">CSS</a>" #. type: Content of: <html><head><title> #: ../phpmyadmin/translators.html:13 msgid "phpMyAdmin 3.4.0-dev - Official translators" -msgstr "" +msgstr "phpMyAdmin 3.4.0-dev - Resmi çevirmenleri" #. type: Content of: <html><body><div><h1> #: ../phpmyadmin/translators.html:20 @@ -11017,11 +11017,13 @@ msgid "" "<a href=\"http://www.phpmyadmin.net/\">php<span class=\"myadmin\">MyAdmin</" "span></a> 3.4.0-dev official translators list" msgstr "" +"<a href=\"http://www.phpmyadmin.net/\">php<span " +"class=\"myadmin\">MyAdmin</span></a> 3.4.0-dev resmi çevirmenler listesi" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/translators.html:45 msgid "Here is the list of the "official translators" of phpMyAdmin." -msgstr "" +msgstr "İşte phpMyAdmin'in "resmi çevirmenler" listesi." #. type: Content of: <html><body><div><p> #: ../phpmyadmin/translators.html:48 @@ -11055,12 +11057,12 @@ msgstr "Dil" #. type: Content of: <html><body><div><table><tr><th> #: ../phpmyadmin/translators.html:63 msgid "Official translator(s)" -msgstr "" +msgstr "Resmi çevirmen(ler)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:67 msgid "Afrikaans" -msgstr "" +msgstr "Afrikanca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:69 ../phpmyadmin/translators.html:76 @@ -11074,7 +11076,7 @@ msgstr "" #: ../phpmyadmin/translators.html:399 ../phpmyadmin/translators.html:434 #: ../phpmyadmin/translators.html:448 msgid "volunteer needed" -msgstr "" +msgstr "gönüllü gerekli" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:74 @@ -11159,7 +11161,7 @@ msgstr "Xavier Navarro (xvnavarro(a)gmail.com)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:144 msgid "Chinese Traditional (BIG5)" -msgstr "Çince-Geleneksel " +msgstr "Çince Geleneksel (BIG5)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:146 @@ -11169,7 +11171,7 @@ msgstr "Siu Sun (siusun(a)best-view.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:151 msgid "Chinese Simplified (GB)" -msgstr "Çince-Basitleştirilmiş" +msgstr "Çince Basitleştirilmiş (GB)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:153 @@ -11184,7 +11186,7 @@ msgstr "Hırvatça" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:160 msgid "Renato Pavicic (renato(a)translator-shop.org)" -msgstr "" +msgstr "Renato Pavicic (renato(a)translator-shop.org)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:165 @@ -11194,12 +11196,12 @@ msgstr "Çekçe" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:167 msgid "Michal Čihař (michal(a)cihar.com)" -msgstr "" +msgstr "Michal Čihař (michal(a)cihar.com)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:168 msgid "Ondřej Vadinský (nicky726(a)gmail.com)" -msgstr "" +msgstr "Ondřej Vadinský (nicky726(a)gmail.com)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:173 @@ -11209,17 +11211,17 @@ msgstr "Danca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:175 msgid "Finn Sorensen (dk_alleykat(a)users.sourceforge.net)" -msgstr "" +msgstr "Finn Sorensen (dk_alleykat(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:180 msgid "Dutch" -msgstr "" +msgstr "Flemenkçe" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:182 msgid "Herman van Rink (rink(a)initfour.nl)" -msgstr "" +msgstr "Herman van Rink (rink(a)initfour.nl)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:187 @@ -11230,17 +11232,17 @@ msgstr "İngilizce" #: ../phpmyadmin/translators.html:189 msgid "" "the phpMyAdmin development team (phpmyadmin-devel(a)lists.sourceforge.net)" -msgstr "" +msgstr "phpMyAdmin geliştirme takımı (phpmyadmin-devel(a)lists.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:194 msgid "English (United Kingdom)" -msgstr "" +msgstr "İngilizce (Birleşik Krallık)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:196 msgid "Robert Readman (robert_readman(a)hotmail.com)" -msgstr "" +msgstr "Robert Readman (robert_readman(a)hotmail.com)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:201 @@ -11250,37 +11252,37 @@ msgstr "Estçe" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:203 msgid "Marko Ellermaa (uhuu(a)users.sourceforge.net)" -msgstr "" +msgstr "Marko Ellermaa (uhuu(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:208 msgid "Finnish" -msgstr "" +msgstr "Fince" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:210 msgid "Jouni Kahkonen (address withdrawn)" -msgstr "" +msgstr "Jouni Kahkonen (adres verilmedi)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:215 msgid "French" -msgstr "" +msgstr "Fransızca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:217 msgid "Marc Delisle (marc(a)infomarc.info)" -msgstr "" +msgstr "Marc Delisle (marc(a)infomarc.info)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:222 msgid "Galician" -msgstr "" +msgstr "Galiççe" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:224 msgid "Xosé Calvo (xosecalvo(a)galizaweb.net)" -msgstr "" +msgstr "Xosé Calvo (xosecalvo(a)galizaweb.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:229 @@ -11290,7 +11292,7 @@ msgstr "Gürcüce" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:231 msgid "George Machitidze (gmachitidze(a)users.sourceforge.net)" -msgstr "" +msgstr "George Machitidze (gmachitidze(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:236 @@ -11305,7 +11307,7 @@ msgstr "Yunanca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:245 msgid "Panagiotis Papazoglou (panos78(a)users.sourceforge.net)" -msgstr "" +msgstr "Panagiotis Papazoglou (panos78(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:250 @@ -11315,7 +11317,7 @@ msgstr "İbranice" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:257 msgid "Hindi" -msgstr "" +msgstr "Hintçe" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:264 @@ -11325,12 +11327,12 @@ msgstr "Macarca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:266 msgid "Jozsef Tamas Herczeg (localicer(a)gmail.com)" -msgstr "" +msgstr "Jozsef Tamas Herczeg (localicer(a)gmail.com)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:271 msgid "Indonesian" -msgstr "" +msgstr "Endonezce" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:278 @@ -11340,7 +11342,7 @@ msgstr "İtalyanca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:280 msgid "Luca Rebellato (rebeluca(a)ngi.it)" -msgstr "" +msgstr "Luca Rebellato (rebeluca(a)ngi.it)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:285 @@ -11350,7 +11352,7 @@ msgstr "Japonca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:287 msgid "Tadashi Jokagi (elf2000(a)users.sourceforge.net)" -msgstr "" +msgstr "Tadashi Jokagi (elf2000(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:292 @@ -11370,12 +11372,12 @@ msgstr "Litvanyaca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:308 msgid "Rytis Slatkevicius (rytis_s(a)users.sourceforge.net)" -msgstr "" +msgstr "Rytis Slatkevicius (rytis_s(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:313 msgid "Malay" -msgstr "" +msgstr "Malayca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:320 @@ -11390,7 +11392,7 @@ msgstr "Moğolca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:329 msgid "Bayarsaikhan Enkhtaivan (bayaraa(a)users.sourceforge.net)" -msgstr "" +msgstr "Bayarsaikhan Enkhtaivan (bayaraa(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:334 @@ -11400,7 +11402,7 @@ msgstr "Norveçce (bokmål)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:336 msgid "Sven-Erik Andersen (sven.erik.andersen(a)gmail.com)" -msgstr "" +msgstr "Sven-Erik Andersen (sven.erik.andersen(a)gmail.com)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:341 @@ -11415,7 +11417,7 @@ msgstr "Polonyaca" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:355 msgid "Portuguese" -msgstr "" +msgstr "Portegizce" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:362 @@ -11425,7 +11427,7 @@ msgstr "Romence" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:364 msgid "Sergiu Bivol (sbivol(a)users.sourceforge.net)" -msgstr "" +msgstr "Sergiu Bivol (sbivol(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:369 @@ -11435,27 +11437,27 @@ msgstr "Rusça" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:371 msgid "Victor Volkov and project php-myadmin.ru" -msgstr "" +msgstr "Victor Volkov ve php-myadmin.ru projesi" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:376 msgid "Serbian" -msgstr "" +msgstr "Sırpça" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:378 msgid "Mihailo Stefanovic (mikis(a)users.sourceforge.net)" -msgstr "" +msgstr "Mihailo Stefanovic (mikis(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:383 msgid "Sinhala" -msgstr "" +msgstr "Sinhala dili" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:385 msgid "H.Malinda Siriwardana (malindahs(a)users.sourceforge.net)" -msgstr "" +msgstr "H.Malinda Siriwardana (malindahs(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:390 @@ -11490,7 +11492,7 @@ msgstr "İsveççe" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:413 msgid "Björn T. Hallberg (bjornth(a)users.sourceforge.net)" -msgstr "" +msgstr "Björn T. Hallberg (bjornth(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:418 @@ -11505,12 +11507,12 @@ msgstr "Albert Fazlí (amichauer(a)gmx.de)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:425 msgid "Telugu" -msgstr "" +msgstr "Telugu dili" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:427 msgid "veeven (veeven(a)gmail.com)" -msgstr "" +msgstr "veeven (veeven(a)gmail.com)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:432 @@ -11522,6 +11524,7 @@ msgstr "Tayca" msgid "Turkish" msgstr "Türkçe" +# Burada listelenen isimler phpMyAdmin'in kenidisinin çevirisini yapan kişilerin adlarının listesidir. Siz phpMyAdmin çevirisinin yapımında bulundunuz mu ki buraya adınızın eklenmesi için öneride bulunmuşsunuz. phpMyAdmin için çeviri eksiği ve çevirisini yapan başka kimse bulunmamaktadır. #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:441 msgid "Burak Yavuz (bourock(a)users.sourceforge.net)" @@ -11540,42 +11543,42 @@ msgstr "Özbekçe" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:454 msgid "Orzu Samarqandiy (orzu(a)users.sourceforge.net)" -msgstr "" +msgstr "Orzu Samarqandiy (orzu(a)users.sourceforge.net)" #. type: Content of: <html><body><div><table><tr><td> #: ../phpmyadmin/translators.html:455 msgid "Abdurashid Muhitdinov (cool_zero(a)list.ru" -msgstr "" +msgstr "Abdurashid Muhitdinov (cool_zero(a)list.ru)" #. type: Content of: <html><body><h1> #: output/tr/index-full-template.html:7 output/tr/index-full-template.html:10 msgid "phpMyAdmin Turkish Documentation" -msgstr "" +msgstr "phpMyAdmin Türkçe Belge" #. type: Content of: <html><body><p> #: output/tr/index-full-template.html:11 msgid "Documents translated to Turkish:" -msgstr "" +msgstr "Belgelerin Türkçeye Çevirilmesi:" #. type: Content of: <html><body><ul><li> #: output/tr/index-full-template.html:13 msgid "<a href=\"INSTALL\">INSTALL</a>" -msgstr "" +msgstr "<a href=\"INSTALL\">KUR</a>" #. type: Content of: <html><body><ul><li> #: output/tr/index-full-template.html:14 msgid "<a href=\"TODO\">TODO</a>" -msgstr "" +msgstr "<a href=\"TODO\">YAPILACAKLAR</a>" #. type: Content of: <html><body><ul><li> #: output/tr/index-full-template.html:15 msgid "<a href=\"README\">README</a>" -msgstr "" +msgstr "<a href=\"README\">BENİOKU</a>" #. type: Content of: <html><body><ul><li> #: output/tr/index-full-template.html:16 msgid "<a href=\"Documentation.html\">Main documentation</a>" -msgstr "" +msgstr "<a href=\"Documentation.html\">Ana belge</a>" #. type: Content of: <p> #: addendum/head.html:2 @@ -11602,18 +11605,18 @@ msgstr "" #. type: Title - #: ../phpmyadmin/INSTALL:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Installation\n" -msgstr "phpMyAdmin belgeleri" +msgstr "phpMyAdmin - Kurulumu\n" #. type: Plain text #: ../phpmyadmin/INSTALL:6 @@ -11637,9 +11640,9 @@ msgstr "" #. type: Title = #: ../phpmyadmin/TODO:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Todo\n" -msgstr "phpMyAdmin ana sayfası" +msgstr "phpMyAdmin - Yapılacaklar\n" #. type: Plain text #: ../phpmyadmin/TODO:5 @@ -11659,9 +11662,9 @@ msgstr "" #. type: Title = #: ../phpmyadmin/README:2 -#, fuzzy, no-wrap +#, no-wrap msgid "phpMyAdmin - Readme\n" -msgstr "phpMyAdmin ana sayfası" +msgstr "phpMyAdmin - Benioku\n" #. type: Plain text #: ../phpmyadmin/README:5 @@ -11699,20 +11702,19 @@ msgstr "" #. type: Title ~ #: ../phpmyadmin/README:38 -#, fuzzy, no-wrap +#, no-wrap msgid "Requirements\n" -msgstr "Gereksinimler" +msgstr "Gereksinimler\n" #. type: Plain text #: ../phpmyadmin/README:41 msgid "PHP 5.2 or later" -msgstr "PHP 5.2 ya da üstü" +msgstr "PHP 5.2 veya üzeri" #. type: Plain text #: ../phpmyadmin/README:42 -#, fuzzy msgid "MySQL 5.0 or later" -msgstr "MySQL 4.0 uyumlu" +msgstr "MySQL 5.0 veya üzeri" #. type: Plain text #: ../phpmyadmin/README:43 @@ -11723,7 +11725,7 @@ msgstr "" #: ../phpmyadmin/README:45 #, no-wrap msgid "Summary\n" -msgstr "Özet" +msgstr "Özet\n" #. type: Plain text #: ../phpmyadmin/README:49 @@ -11734,20 +11736,20 @@ msgstr "" #. type: Title ~ #: ../phpmyadmin/README:51 -#, fuzzy, no-wrap +#, no-wrap msgid "Download\n" -msgstr "İndir" +msgstr "İndir\n" #. type: Plain text #: ../phpmyadmin/README:54 msgid "You can get the newest version at http://www.phpmyadmin.net/." -msgstr "En son sürümü http://www.phpmyadmin.net/ adresinden edinebilirsiniz." +msgstr "En yeni sürümü http://www.phpmyadmin.net/ adresinden alabilirsiniz." #. type: Title ~ #: ../phpmyadmin/README:56 -#, fuzzy, no-wrap +#, no-wrap msgid "More Information\n" -msgstr "Bilgi" +msgstr "Daha Fazla Bilgi\n" #. type: Plain text #: ../phpmyadmin/README:59 @@ -11758,7 +11760,7 @@ msgstr "Lütfen Documentation.txt/.html dosyasını okuyun." #: ../phpmyadmin/README:61 #, no-wrap msgid "Support\n" -msgstr "Destek" +msgstr "Destek\n" #. type: Plain text #: ../phpmyadmin/README:64 @@ -11771,13 +11773,12 @@ msgstr "" #: ../phpmyadmin/README:67 #, no-wrap msgid "Enjoy!\n" -msgstr "Eğlenin!" +msgstr "Keyfini Çıkarın!\n" #. type: Plain text #: ../phpmyadmin/README:70 -#, fuzzy msgid "The phpMyAdmin Devel team" -msgstr "phpMyAdmin geliştiricileri için ayarlar" +msgstr "phpMyAdmin Geliştirme takımı" #. type: Plain text #: ../phpmyadmin/README:79 @@ -11792,12 +11793,12 @@ msgid "" " FAQ part).\n" msgstr "" "NOT: \n" -"~~~~Lütfen bize \"PHP'yi MySQL ile nasıl derlerim?\"benzeri sorular " -"göndermeyiniz.\n" -"~~~~Bedava destek imkanı sağlayacak zamanımız henüz yoktur.\n" -"~~~~Lütfen sorularınızı ilgili mail grupları ya da forumlarda paylaşın..\n" -"~~~~Bizimle iletişime geçmeden önce, lütfen Documentation.html adresindeki " -"yazıları okuyun. \n" +"Lütfen bize \"PHP'yi MySQL desteği ile nasıl derlerim?\" gibi sorularla\n" +"epostalar göndermeyin. Bedava destek imkanı sağlayacak\n" +"zamanımız henüz yok.\n" +"Lütfen sorularınızı ilgili posta listelerine / forumlara gönderin.\n" +"Bizimle iletişime geçmeden önce, lütfen Documentation.html içindekileri\n" +"okuyun (özl. SSS kısmını).\n" #~ msgid "Documentation version:" #~ msgstr "Belgeleme sürümü:" diff --git a/po/zh_CN.po b/po/zh_CN.po index 01eb1dc..b28852d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.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: 2010-09-08 13:44+0300\n" -"PO-Revision-Date: 2010-09-19 14:44+0200\n" +"PO-Revision-Date: 2010-09-26 12:26+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -5911,7 +5911,7 @@ msgid "" "They are called 'MIME-type', 'Browser transformation' and 'Transformation " "options'." msgstr "" -"打开到你的 <i>tbl_structure.php</i> 页面 (如：通过点击一张表的 '结构' 链接) 。点击 "修改" " +"打开到你的 <i>tbl_structure.php</i> 页面 (如: 通过点击一张表的 '结构' 链接) 。点击 "修改" " "(或修改图标) 后你就能看到在最下方多出三栏。它们分别叫 'MIME 类型'、'浏览器转换' 和 '转换选项' 。" #. type: Content of: <html><body><div><ul><li> hooks/post-receive -- phpMyAdmin localized documentation

1 0