Git

git@phpmyadmin.net

18 participants
38269 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2044-g0b5f441
by Marc Delisle 27 May '11

27 May '11

The branch, master has been updated via 0b5f4410cd653b2ce132e5f7537e03949cef59f9 (commit) via 293a7d6244264ce92165ba88dc61498f6ed9dc66 (commit) via 948b13f02b38dfdf67e50c1081b64dc7743f50ee (commit) via 07f553f3f28e92467b2dce98a25324dd5008eb4f (commit) via f0c56fd49a133c659e0c625b4fa8f0a3807f9582 (commit) via 42c36b1fb82af8fb60afd7861a4c217cc3cbabb8 (commit) via 0598d99925efdda3983656a6b9497e159f9d7e82 (commit) from 434d233e5b710dc6d3ac82b6825cf726aac22cb3 (commit) - Log ----------------------------------------------------------------- commit 0b5f4410cd653b2ce132e5f7537e03949cef59f9 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri May 27 15:56:15 2011 +0530 Changed the add columns fieldset to top of the create table form commit 293a7d6244264ce92165ba88dc61498f6ed9dc66 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri May 27 15:55:02 2011 +0530 Changed the number of columns in the create table dialog in to defalut value 2 commit 948b13f02b38dfdf67e50c1081b64dc7743f50ee Merge: 07f553f3f28e92467b2dce98a25324dd5008eb4f 434d233e5b710dc6d3ac82b6825cf726aac22cb3 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri May 27 15:46:12 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 07f553f3f28e92467b2dce98a25324dd5008eb4f Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Wed May 25 23:32:43 2011 +0530 Added the PMA_createTableDialog function in functions js file commit f0c56fd49a133c659e0c625b4fa8f0a3807f9582 Merge: 76194fd122690cbe3947bfa25ae5d40de82d1d35 42c36b1fb82af8fb60afd7861a4c217cc3cbabb8 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Wed May 25 22:29:17 2011 +0530 merged chages in navigation.js commit 42c36b1fb82af8fb60afd7861a4c217cc3cbabb8 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Wed May 25 21:03:13 2011 +0530 Bug fixed the create table option in navigation panel commit 0598d99925efdda3983656a6b9497e159f9d7e82 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat May 21 16:45:51 2011 +0530 Ajaxify the create table option in navigation panel - have bugs ----------------------------------------------------------------------- Summary of changes: js/functions.js | 98 +++++++++++++++++++++----------------- js/navigation.js | 20 +++++++- libraries/common.inc.php | 1 + libraries/tbl_properties.inc.php | 29 +++++------ navigation.php | 6 ++- 5 files changed, 94 insertions(+), 60 deletions(-) diff --git a/js/functions.js b/js/functions.js index c9f6112..be5a8bb 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1310,6 +1310,53 @@ function PMA_showNoticeForEnum(selectElement) { } /** + * Generates a dialog box to pop up the create_table form + */ +function PMA_createTableDialog( div, url , target){ + /** + * @var button_options Object that stores the options passed to jQueryUI + * dialog + */ + var button_options = {}; + // in the following function we need to use $(this) + button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();} + + var button_options_error = {}; + button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();} + + var $msgbox = PMA_ajaxShowMessage(); + + $.get( target , url , function(data) { + //in the case of an error, show the error message returned. + if (data.success != undefined && data.success == false) { + div + .append(data.error) + .dialog({ + title: PMA_messages['strCreateTable'], + height: 230, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options_error + })// end dialog options + //remove the redundant [Back] link in the error message. + .find('fieldset').remove(); + } else { + div + .append(data) + .dialog({ + title: PMA_messages['strCreateTable'], + height: 600, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options + }); // end dialog options + } + PMA_ajaxRemoveMessage($msgbox); + }) // end $.get() + +} + +/** * jQuery function that uses jQueryUI's dialogs to confirm with user. Does not * return a jQuery object yet and hence cannot be chained * @@ -1403,7 +1450,7 @@ jQuery.fn.PMA_sort_table = function(text_selector) { */ $(document).ready(function() { - /** + /** * Attach event handler to the submit action of the create table minimal form * and retrieve the full table form and display it in a dialog * @@ -1412,50 +1459,15 @@ $(document).ready(function() { $("#create_table_form_minimal.ajax").live('submit', function(event) { event.preventDefault(); $form = $(this); - - /* @todo Validate this form! */ - - /** - * @var button_options Object that stores the options passed to jQueryUI - * dialog - */ - var button_options = {}; - // in the following function we need to use $(this) - button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} - - var button_options_error = {}; - button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();} - - var $msgbox = PMA_ajaxShowMessage(); PMA_prepareForAjaxRequest($form); - $.get($form.attr('action'), $form.serialize(), function(data) { - //in the case of an error, show the error message returned. - if (data.success != undefined && data.success == false) { - $('<div id="create_table_dialog"></div>') - .append(data.error) - .dialog({ - title: PMA_messages['strCreateTable'], - height: 230, - width: 900, - open: PMA_verifyTypeOfAllColumns, - buttons : button_options_error - })// end dialog options - //remove the redundant [Back] link in the error message. - .find('fieldset').remove(); - } else { - $('<div id="create_table_dialog"></div>') - .append(data) - .dialog({ - title: PMA_messages['strCreateTable'], - height: 600, - width: 900, - open: PMA_verifyTypeOfAllColumns, - buttons : button_options - }); // end dialog options - } - PMA_ajaxRemoveMessage($msgbox); - }) // end $.get() + /*variables which stores the common attributes*/ + var url = $form.serialize(); + var action = $form.attr('action'); + var div = $('<div id="create_table_dialog"></div>'); + + /*Calling to the createTableDialog function*/ + PMA_createTableDialog(div, url, action); // empty table name and number of columns from the minimal form $form.find('input[name=table],input[name=num_fields]').val(''); diff --git a/js/navigation.js b/js/navigation.js index 52d13cf..7f9a013 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -202,4 +202,22 @@ $(document).ready(function(){ window.parent.refreshMain($('#LeftDefaultTabTable')[0].value); } }); -}); + + /* Create table */ + $('#newtable a.ajax').click(function(event){ + event.preventDefault(); + /*Getting the url */ + var url = $('#newtable a').attr("href"); + if (url.substring(0, 15) == "tbl_create.php?") { + url = url.substring(15); + } + url = url +"&num_fields=&ajax_request=true"; + /*Creating a div on the frame_content frame */ + var div = parent.frame_content.$('<div id="create_table_dialog"></div>'); + var target = "tbl_create.php"; + + /*Calling to the createTableDialog function*/ + PMA_createTableDialog(div , url , target); + });//end of create new table +});//end of document get ready + diff --git a/libraries/common.inc.php b/libraries/common.inc.php index d75084b..70b70fe 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -540,6 +540,7 @@ $_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], ''); */ $GLOBALS['js_include'] = array(); $GLOBALS['js_include'][] = 'jquery/jquery-1.6.1.js'; +$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'update-location.js'; /** diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 395fa7b..501e243 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -613,14 +613,22 @@ unset($_form_params); if ($action == 'tbl_create.php') { ?> <table> - <tr valign="top"> - <th><?php echo __('Table name'); ?>: </th> - </tr> - <tr><td><input type="text" name="table" size="40" maxlength="80" + <tr valign="top"> + <th><?php echo __('Table name'); ?>: </th> + </tr> + <tr><td><input type="text" name="table" size="40" maxlength="80" value="<?php echo (isset($_REQUEST['table']) ? htmlspecialchars($_REQUEST['table']) : ''); ?>" class="textfield" /> - </td> - </tr> + </td> + <td> + <?php if ($action == 'tbl_create.php' || $action == 'tbl_addfield.php') { ?> + <?php echo sprintf(__('Add %s column(s)'), '<input type="text" id="added_fields" name="added_fields" size="2" value="1" onfocus="this.select()" />'); ?> + <input type="submit" name="submit_num_fields" value="<?php echo __('Go'); ?>" + onclick="return checkFormElementInRange(this.form, 'added_fields', '<?php echo str_replace('\'', '\\\'', __('You have to add at least one column.')); ?>', 1)" + /> + <?php } ?> + </td> + </tr> </table> <?php } @@ -775,15 +783,6 @@ if ($action == 'tbl_create.php') { <fieldset class="tblFooters"> <input type="submit" name="do_save_data" value="<?php echo __('Save'); ?>" /> -<?php if ($action == 'tbl_create.php' || $action == 'tbl_addfield.php') { ?> - <?php echo __('Or'); ?> - <?php echo sprintf(__('Add %s column(s)'), '<input type="text" id="added_fields" name="added_fields" size="2" value="1" onfocus="this.select()" />'); ?> - <input type="submit" name="submit_num_fields" - value="<?php echo __('Go'); ?>" -<?php /* onclick="if (addField()) return false;" */ ?> - onclick="return checkFormElementInRange(this.form, 'added_fields', '<?php echo str_replace('\'', '\\\'', __('You have to add at least one column.')); ?>', 1)" - /> -<?php } ?> </fieldset> <div id="properties_message"></div> </form> diff --git a/navigation.php b/navigation.php index ac12807..dc68489 100644 --- a/navigation.php +++ b/navigation.php @@ -137,8 +137,10 @@ require_once './libraries/header_http.inc.php'; <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <script src="./js/jquery/jquery-1.6.1.js" type="text/javascript"></script> + <script src="./js/jquery/jquery-ui-1.8.custom.js" type="text/javascript"></script> <script type="text/javascript" src="js/navigation.js"></script> <script type="text/javascript" src="js/functions.js"></script> + <script type="text/javascript" src="js/messages.php"></script> <script type="text/javascript"> // <![CDATA[ var image_minus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_minus.png'; @@ -322,7 +324,9 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { } unset($table_list); if ($db != 'information_schema') { - echo '<ul id="newtable"><li><a target="frame_content" href="tbl_create.php' . PMA_generate_common_url(array('db' => $GLOBALS['db'])) . '">' + $class = ''; + $GLOBALS['cfg']['AjaxEnable'] ? $class="ajax" : ''; + echo '<ul id="newtable"><li><a target="frame_content" href="tbl_create.php' . PMA_generate_common_url(array('db' => $GLOBALS['db'])) . '" class="'.$class .'" >' .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_snewtbl.png" id="icon_newtable" alt="' . _pgettext('short form', 'Create table') . '" />' . _pgettext('short form', 'Create table') . '</a></li></ul>'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2037-g434d233
by Marc Delisle 26 May '11

26 May '11

The branch, master has been updated via 434d233e5b710dc6d3ac82b6825cf726aac22cb3 (commit) from 89e54ceb3a463267371749aaeb12383c6b58f987 (commit) - Log ----------------------------------------------------------------- commit 434d233e5b710dc6d3ac82b6825cf726aac22cb3 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu May 26 13:16:06 2011 -0400 - vim modeline - remove tab characters ----------------------------------------------------------------------- Summary of changes: js/config.js | 71 +++++++++++++++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 35 deletions(-) diff --git a/js/config.js b/js/config.js index 0596928..a753034 100644 --- a/js/config.js +++ b/js/config.js @@ -1,3 +1,4 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Functions used in configuration forms and on user preferences pages */ @@ -14,9 +15,9 @@ var PMA_messages = {}; * @param {Element} field */ function getFieldType(field) { - field = $(field); + field = $(field); var tagName = field.prop('tagName'); - if (tagName == 'INPUT') { + if (tagName == 'INPUT') { return field.attr('type'); } else if (tagName == 'SELECT') { return 'select'; @@ -40,7 +41,7 @@ function getFieldType(field) { * @param {String|Boolean} [value] */ function setFieldValue(field, field_type, value) { - field = $(field); + field = $(field); switch (field_type) { case 'text': field.attr('value', (value != undefined ? value : field.attr('defaultValue'))); @@ -50,14 +51,14 @@ function setFieldValue(field, field_type, value) { break; case 'select': var options = field.attr('options'); - var i, imax = options.length; + var i, imax = options.length; if (value == undefined) { for (i = 0; i < imax; i++) { - options[i].selected = options[i].defaultSelected; + options[i].selected = options[i].defaultSelected; } } else { for (i = 0; i < imax; i++) { - options[i].selected = (value.indexOf(options[i].value) != -1); + options[i].selected = (value.indexOf(options[i].value) != -1); } } break; @@ -78,14 +79,14 @@ function setFieldValue(field, field_type, value) { * @type Boolean|String|String[] */ function getFieldValue(field, field_type) { - field = $(field); + field = $(field); switch (field_type) { case 'text': return field.prop('value'); case 'checkbox': return field.prop('checked'); case 'select': - var options = field.prop('options'); + var options = field.prop('options'); var i, imax = options.length, items = []; for (i = 0; i < imax; i++) { if (options[i].selected) { @@ -354,7 +355,7 @@ function displayErrors(error_list) { * @param {Object} errors */ function validate_fieldset(fieldset, isKeyUp, errors) { - fieldset = $(fieldset); + fieldset = $(fieldset); if (fieldset.length && typeof validators._fieldset[fieldset.attr('id')] != 'undefined') { var fieldset_errors = validators._fieldset[fieldset.attr('id')].apply(fieldset[0], [isKeyUp]); for (var field_id in fieldset_errors) { @@ -377,8 +378,8 @@ function validate_fieldset(fieldset, isKeyUp, errors) { * @param {Object} errors */ function validate_field(field, isKeyUp, errors) { - field = $(field); - var field_id = field.attr('id'); + field = $(field); + var field_id = field.attr('id'); errors[field_id] = []; var functions = getFieldValidators(field_id, isKeyUp); for (var i = 0; i < functions.length; i++) { @@ -389,7 +390,7 @@ function validate_field(field, isKeyUp, errors) { var result = functions[i][0].apply(field[0], args); if (result !== true) { if (typeof result == 'string') { - result = [result]; + result = [result]; } $.merge(errors[field_id], result); } @@ -403,7 +404,7 @@ function validate_field(field, isKeyUp, errors) { * @param {boolean} isKeyUp */ function validate_field_and_fieldset(field, isKeyUp) { - field = $(field); + field = $(field); var errors = {}; validate_field(field, isKeyUp, errors); validate_fieldset(field.closest('fieldset'), isKeyUp, errors); @@ -416,7 +417,7 @@ function validate_field_and_fieldset(field, isKeyUp) { * @param {Element} field */ function markField(field) { - field = $(field); + field = $(field); var type = getFieldType(field); var isDefault = checkFieldDefault(field, type); @@ -439,7 +440,7 @@ function setRestoreDefaultBtn(field, display) { $(function() { // register validators and mark custom values - var elements = $('input[id], select[id], textarea[id]'); + var elements = $('input[id], select[id], textarea[id]'); $('input[id], select[id], textarea[id]').each(function(){ markField(this); var el = $(this); @@ -450,35 +451,35 @@ $(function() { var tagName = el.attr('tagName'); // text fields can be validated after each change if (tagName == 'INPUT' && el.attr('type') == 'text') { - el.keyup(function() { + el.keyup(function() { validate_field_and_fieldset(el, true); markField(el); }); } // disable textarea spellcheck if (tagName == 'TEXTAREA') { - el.attr('spellcheck', false); + el.attr('spellcheck', false); } }); - // check whether we've refreshed a page and browser remembered modified - // form values - var check_page_refresh = $('#check_page_refresh'); - if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') { - // run all field validators - var errors = {}; - for (var i = 0; i < elements.length; i++) { - validate_field(elements[i], false, errors); - } - // run all fieldset validators - $('fieldset').each(function(){ - validate_fieldset(this, false, errors); - }); - - displayErrors(errors); - } else if (check_page_refresh) { - check_page_refresh.val('1'); - } + // check whether we've refreshed a page and browser remembered modified + // form values + var check_page_refresh = $('#check_page_refresh'); + if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') { + // run all field validators + var errors = {}; + for (var i = 0; i < elements.length; i++) { + validate_field(elements[i], false, errors); + } + // run all fieldset validators + $('fieldset').each(function(){ + validate_fieldset(this, false, errors); + }); + + displayErrors(errors); + } else if (check_page_refresh) { + check_page_refresh.val('1'); + } }); // hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-42-g4a4d312
by Marc Delisle 26 May '11

26 May '11

The branch, QA_3_4 has been updated via 4a4d312edba630029909a4cd194a768035b53380 (commit) from be9fdfbd687698f2da85c88afcbc71944b7c8bba (commit) - Log ----------------------------------------------------------------- commit 4a4d312edba630029909a4cd194a768035b53380 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu May 26 13:07:08 2011 -0400 - add vim modeline - remove tab characters ----------------------------------------------------------------------- Summary of changes: js/config.js | 71 +++++++++++++++++++++++++++++---------------------------- 1 files changed, 36 insertions(+), 35 deletions(-) diff --git a/js/config.js b/js/config.js index 7f55503..5b0abfc 100644 --- a/js/config.js +++ b/js/config.js @@ -1,3 +1,4 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Functions used in configuration forms and on user preferences pages */ @@ -14,9 +15,9 @@ var PMA_messages = {}; * @param {Element} field */ function getFieldType(field) { - field = $(field); + field = $(field); var tagName = field.attr('tagName'); - if (tagName == 'INPUT') { + if (tagName == 'INPUT') { return field.attr('type'); } else if (tagName == 'SELECT') { return 'select'; @@ -40,7 +41,7 @@ function getFieldType(field) { * @param {String|Boolean} [value] */ function setFieldValue(field, field_type, value) { - field = $(field); + field = $(field); switch (field_type) { case 'text': field.attr('value', (value != undefined ? value : field.attr('defaultValue'))); @@ -50,14 +51,14 @@ function setFieldValue(field, field_type, value) { break; case 'select': var options = field.attr('options'); - var i, imax = options.length; + var i, imax = options.length; if (value == undefined) { for (i = 0; i < imax; i++) { - options[i].selected = options[i].defaultSelected; + options[i].selected = options[i].defaultSelected; } } else { for (i = 0; i < imax; i++) { - options[i].selected = (value.indexOf(options[i].value) != -1); + options[i].selected = (value.indexOf(options[i].value) != -1); } } break; @@ -78,14 +79,14 @@ function setFieldValue(field, field_type, value) { * @type Boolean|String|String[] */ function getFieldValue(field, field_type) { - field = $(field); + field = $(field); switch (field_type) { case 'text': return field.attr('value'); case 'checkbox': return field.attr('checked'); case 'select': - var options = field.attr('options'); + var options = field.attr('options'); var i, imax = options.length, items = []; for (i = 0; i < imax; i++) { if (options[i].selected) { @@ -354,7 +355,7 @@ function displayErrors(error_list) { * @param {Object} errors */ function validate_fieldset(fieldset, isKeyUp, errors) { - fieldset = $(fieldset); + fieldset = $(fieldset); if (fieldset.length && typeof validators._fieldset[fieldset.attr('id')] != 'undefined') { var fieldset_errors = validators._fieldset[fieldset.attr('id')].apply(fieldset[0], [isKeyUp]); for (var field_id in fieldset_errors) { @@ -377,8 +378,8 @@ function validate_fieldset(fieldset, isKeyUp, errors) { * @param {Object} errors */ function validate_field(field, isKeyUp, errors) { - field = $(field); - var field_id = field.attr('id'); + field = $(field); + var field_id = field.attr('id'); errors[field_id] = []; var functions = getFieldValidators(field_id, isKeyUp); for (var i = 0; i < functions.length; i++) { @@ -389,7 +390,7 @@ function validate_field(field, isKeyUp, errors) { var result = functions[i][0].apply(field[0], args); if (result !== true) { if (typeof result == 'string') { - result = [result]; + result = [result]; } $.merge(errors[field_id], result); } @@ -403,7 +404,7 @@ function validate_field(field, isKeyUp, errors) { * @param {boolean} isKeyUp */ function validate_field_and_fieldset(field, isKeyUp) { - field = $(field); + field = $(field); var errors = {}; validate_field(field, isKeyUp, errors); validate_fieldset(field.closest('fieldset'), isKeyUp, errors); @@ -416,7 +417,7 @@ function validate_field_and_fieldset(field, isKeyUp) { * @param {Element} field */ function markField(field) { - field = $(field); + field = $(field); var type = getFieldType(field); var isDefault = checkFieldDefault(field, type); @@ -439,7 +440,7 @@ function setRestoreDefaultBtn(field, display) { $(function() { // register validators and mark custom values - var elements = $('input[id], select[id], textarea[id]'); + var elements = $('input[id], select[id], textarea[id]'); $('input[id], select[id], textarea[id]').each(function(){ markField(this); var el = $(this); @@ -450,35 +451,35 @@ $(function() { var tagName = el.attr('tagName'); // text fields can be validated after each change if (tagName == 'INPUT' && el.attr('type') == 'text') { - el.keyup(function() { + el.keyup(function() { validate_field_and_fieldset(el, true); markField(el); }); } // disable textarea spellcheck if (tagName == 'TEXTAREA') { - el.attr('spellcheck', false); + el.attr('spellcheck', false); } }); - // check whether we've refreshed a page and browser remembered modified - // form values - var check_page_refresh = $('#check_page_refresh'); - if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') { - // run all field validators - var errors = {}; - for (var i = 0; i < elements.length; i++) { - validate_field(elements[i], false, errors); - } - // run all fieldset validators - $('fieldset').each(function(){ - validate_fieldset(this, false, errors); - }); - - displayErrors(errors); - } else if (check_page_refresh) { - check_page_refresh.val('1'); - } + // check whether we've refreshed a page and browser remembered modified + // form values + var check_page_refresh = $('#check_page_refresh'); + if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') { + // run all field validators + var errors = {}; + for (var i = 0; i < elements.length; i++) { + validate_field(elements[i], false, errors); + } + // run all fieldset validators + $('fieldset').each(function(){ + validate_fieldset(this, false, errors); + }); + + displayErrors(errors); + } else if (check_page_refresh) { + check_page_refresh.val('1'); + } }); // hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2036-g89e54ce
by Marc Delisle 26 May '11

26 May '11

The branch, master has been updated via 89e54ceb3a463267371749aaeb12383c6b58f987 (commit) from d012edac93bdd1f2a7b519b6e9ad0534cc45b1b4 (commit) - Log ----------------------------------------------------------------- commit 89e54ceb3a463267371749aaeb12383c6b58f987 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu May 26 13:01:06 2011 -0400 These must now be accessed with .prop() ----------------------------------------------------------------------- Summary of changes: js/config.js | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/config.js b/js/config.js index 7f55503..0596928 100644 --- a/js/config.js +++ b/js/config.js @@ -15,7 +15,7 @@ var PMA_messages = {}; */ function getFieldType(field) { field = $(field); - var tagName = field.attr('tagName'); + var tagName = field.prop('tagName'); if (tagName == 'INPUT') { return field.attr('type'); } else if (tagName == 'SELECT') { @@ -81,11 +81,11 @@ function getFieldValue(field, field_type) { field = $(field); switch (field_type) { case 'text': - return field.attr('value'); + return field.prop('value'); case 'checkbox': - return field.attr('checked'); + return field.prop('checked'); case 'select': - var options = field.attr('options'); + var options = field.prop('options'); var i, imax = options.length, items = []; for (i = 0; i < imax; i++) { if (options[i].selected) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2035-gd012eda
by Michal Čihař 26 May '11

26 May '11

The branch, master has been updated via d012edac93bdd1f2a7b519b6e9ad0534cc45b1b4 (commit) via 2c3fdaf2227d3791b7175271ff02d56a1682f4c2 (commit) via e3ef126710771f6dd5a66df83398b7aa5b647326 (commit) via 076f36b5fbdf74b29be4cbc1737d4a142caaba5f (commit) via 5fbcd5afabaa71ac9897a14a01f08d26cc94ca3e (commit) via d40a6665ed945c80c4b43a41be5f09ff2dff5b36 (commit) via c09e7e44217d7db0f47909d2c2ee45e11c9ca4b0 (commit) via 4ebfbd6440f505bfc2011bc946952161c9bb1fe6 (commit) via e096d0538a428d4215cb663af0c999d86f28230e (commit) via 46e22f3f291885bffd3009ef3c7f4545561693c4 (commit) via a760257c380b23be5599475a770969c7a43b9d08 (commit) via c9f774098814217dc95731b8b8b7529619cc0a53 (commit) via b2af3b6a07a66512a1969533ce7bfcfe189c26e6 (commit) via 71224d82ef8ece5c09dc214d5b59922563f10589 (commit) via 2809a8f0a4b222353290f4335d4f9a2e35bb8ac1 (commit) via 64f63723f67600e54a3711a465c9473bb0e80fe2 (commit) via 6118043b65effe91952ea7d4105610af1b170734 (commit) via 1fd17dba64fe0e98c473082ac3b42f30595283c7 (commit) via 40a7bd59031e034bb50a1832be4bb6dd50d9ed07 (commit) via cfdb63a3f49748919d1649626389a393d58a1370 (commit) via e3b60e19720291d1b6eb7360dc370bdc627484a2 (commit) via 470399606bd54b8af7766bf85f2d8861d4ab79bc (commit) via ca765d2149591231cb02e74c6318d30f7f1a0d14 (commit) via 043d49add8021607caa60732d669d3e1fe5aff93 (commit) via bb786d872c2aa6b94f05ece3fc2cf7b9dfc8bb60 (commit) via 5865c2bbd5937f35894daaa00ae31b1dcd4bb666 (commit) from 46ba122b8f72fa5d577d1ca0eef39e0f2dd9e39c (commit) - Log ----------------------------------------------------------------- commit d012edac93bdd1f2a7b519b6e9ad0534cc45b1b4 Merge: 2c3fdaf2227d3791b7175271ff02d56a1682f4c2 46ba122b8f72fa5d577d1ca0eef39e0f2dd9e39c Author: Pootle server <pootle(a)cihar.com> Date: Thu May 26 00:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit 2c3fdaf2227d3791b7175271ff02d56a1682f4c2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:43:45 2011 +0200 Translation update done using Pootle. commit e3ef126710771f6dd5a66df83398b7aa5b647326 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:42:13 2011 +0200 Translation update done using Pootle. commit 076f36b5fbdf74b29be4cbc1737d4a142caaba5f Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:41:43 2011 +0200 Translation update done using Pootle. commit 5fbcd5afabaa71ac9897a14a01f08d26cc94ca3e Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:40:32 2011 +0200 Translation update done using Pootle. commit d40a6665ed945c80c4b43a41be5f09ff2dff5b36 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:39:58 2011 +0200 Translation update done using Pootle. commit c09e7e44217d7db0f47909d2c2ee45e11c9ca4b0 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:39:22 2011 +0200 Translation update done using Pootle. commit 4ebfbd6440f505bfc2011bc946952161c9bb1fe6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:37:14 2011 +0200 Translation update done using Pootle. commit e096d0538a428d4215cb663af0c999d86f28230e Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:37:02 2011 +0200 Translation update done using Pootle. commit 46e22f3f291885bffd3009ef3c7f4545561693c4 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:36:27 2011 +0200 Translation update done using Pootle. commit a760257c380b23be5599475a770969c7a43b9d08 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:36:19 2011 +0200 Translation update done using Pootle. commit c9f774098814217dc95731b8b8b7529619cc0a53 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:36:03 2011 +0200 Translation update done using Pootle. commit b2af3b6a07a66512a1969533ce7bfcfe189c26e6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:36:00 2011 +0200 Translation update done using Pootle. commit 71224d82ef8ece5c09dc214d5b59922563f10589 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:35:54 2011 +0200 Translation update done using Pootle. commit 2809a8f0a4b222353290f4335d4f9a2e35bb8ac1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:35:42 2011 +0200 Translation update done using Pootle. commit 64f63723f67600e54a3711a465c9473bb0e80fe2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:35:06 2011 +0200 Translation update done using Pootle. commit 6118043b65effe91952ea7d4105610af1b170734 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:33:51 2011 +0200 Translation update done using Pootle. commit 1fd17dba64fe0e98c473082ac3b42f30595283c7 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:32:02 2011 +0200 Translation update done using Pootle. commit 40a7bd59031e034bb50a1832be4bb6dd50d9ed07 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:31:58 2011 +0200 Translation update done using Pootle. commit cfdb63a3f49748919d1649626389a393d58a1370 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:31:39 2011 +0200 Translation update done using Pootle. commit e3b60e19720291d1b6eb7360dc370bdc627484a2 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:31:27 2011 +0200 Translation update done using Pootle. commit 470399606bd54b8af7766bf85f2d8861d4ab79bc Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:31:02 2011 +0200 Translation update done using Pootle. commit ca765d2149591231cb02e74c6318d30f7f1a0d14 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:30:34 2011 +0200 Translation update done using Pootle. commit 043d49add8021607caa60732d669d3e1fe5aff93 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:30:14 2011 +0200 Translation update done using Pootle. commit bb786d872c2aa6b94f05ece3fc2cf7b9dfc8bb60 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:29:57 2011 +0200 Translation update done using Pootle. commit 5865c2bbd5937f35894daaa00ae31b1dcd4bb666 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed May 25 22:29:31 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/it.po | 71 +++++++++++++++++++++++++++---------------------------------- 1 files changed, 31 insertions(+), 40 deletions(-) diff --git a/po/it.po b/po/it.po index 558fc76..2a7a8e6 100644 --- a/po/it.po +++ b/po/it.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-04-05 14:27+0200\n" -"Last-Translator: <rebeluca(a)gmail.com>\n" +"PO-Revision-Date: 2011-05-25 22:43+0200\n" +"Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n" "Language-Team: italian <it(a)li.org>\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -709,22 +709,19 @@ msgid "Analyze table" msgstr "Analizza tabella" #: db_structure.php:521 -#, fuzzy #| msgid "Go to table" msgid "Add prefix to table" -msgstr "Vai alla tabella" +msgstr "Aggiungi prefisso alla tabella" #: db_structure.php:523 libraries/mult_submits.inc.php:246 -#, fuzzy #| msgid "Replace table data with file" msgid "Replace table prefix" -msgstr "Sostituisci i dati della tabella col file" +msgstr "Sostituisci il prefisso della tabella" #: db_structure.php:525 libraries/mult_submits.inc.php:246 -#, fuzzy #| msgid "Replace table data with file" msgid "Copy table with prefix" -msgstr "Sostituisci i dati della tabella col file" +msgstr "Copia tabella col prefisso" #: db_structure.php:574 libraries/schema/User_Schema.class.php:387 msgid "Data Dictionary" @@ -977,16 +974,14 @@ msgid "You are about to DESTROY a complete database!" msgstr "Si sta per DISTRUGGERE COMPLETAMENTE un intero database!" #: js/messages.php:32 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to DESTROY a complete table!" -msgstr "Si sta per DISTRUGGERE COMPLETAMENTE un intero database!" +msgstr "Si sta per DISTRUGGERE COMPLETAMENTE un intera tabella!" #: js/messages.php:33 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to TRUNCATE a complete table!" -msgstr "Si sta per DISTRUGGERE COMPLETAMENTE un intero database!" +msgstr "Si sta per DISTRUGGERE COMPLETAMENTE il contenuto della tabella!" #: js/messages.php:34 msgid "Dropping Event" @@ -1124,33 +1119,31 @@ msgid "Searching" msgstr "Ricerca in corso" #: js/messages.php:84 -#, fuzzy #| msgid "Hide search criteria" msgid "Hide search results" -msgstr "Nascondi criteri di ricerca" +msgstr "Nascondi i risultati della ricerca" #: js/messages.php:85 -#, fuzzy #| msgid "Show search criteria" msgid "Show search results" -msgstr "Mostra criteri di ricerca" +msgstr "Mostra i risultati della ricerca" #: js/messages.php:86 -#, fuzzy #| msgid "Browse" msgid "Browsing" -msgstr "Mostra" +msgstr "Navigazione" #: js/messages.php:87 -#, fuzzy #| msgid "Deleting %s" msgid "Deleting" -msgstr "Cancellazione in corso di %s" +msgstr "Cancellazione" #: js/messages.php:90 msgid "" "Note: If the file contains multiple tables, they will be combined into one" msgstr "" +"Nota: Se il file contiene piú di una tabella, i dati saranno combinati in un " +"unica tabella" #: js/messages.php:93 msgid "Hide query box" @@ -1220,6 +1213,8 @@ msgid "" "You haven't saved the changes in the layout. They will be lost if you don't " "save them.Do you want to continue?" msgstr "" +"Non hai salvato i cambiamenti della disposizione. Questi cambiamenti saranno " +"persi se non li salvi. Vuoi procedere?" #: js/messages.php:115 msgid "Add an option for column " @@ -1256,10 +1251,9 @@ msgid ", latest stable version:" msgstr ", versione stabile piú recente:" #: js/messages.php:129 -#, fuzzy #| msgid "Jump to database" msgid "up to date" -msgstr "Vai al database" +msgstr "aggiornata" #. l10n: Display text for calendar close link #: js/messages.php:147 @@ -4642,7 +4636,6 @@ msgstr "Compatibile con MySQL 4.0" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" msgstr "Crea un nuovo database" @@ -5976,14 +5969,13 @@ msgid "Convert to Kana" msgstr "Converti a Kana" #: libraries/mult_submits.inc.php:249 -#, fuzzy #| msgid "Fr" msgid "From" -msgstr "Ve" +msgstr "Da" #: libraries/mult_submits.inc.php:252 msgid "To" -msgstr "" +msgstr "A" #: libraries/mult_submits.inc.php:257 libraries/mult_submits.inc.php:271 #: libraries/sql_query_form.lib.php:440 @@ -5992,13 +5984,12 @@ msgstr "Invia" #: libraries/mult_submits.inc.php:263 msgid "Add table prefix" -msgstr "" +msgstr "Aggiungi un prefisso alla tabella" #: libraries/mult_submits.inc.php:266 -#, fuzzy #| msgid "Add index" msgid "Add prefix" -msgstr "Aggiungi indice" +msgstr "Aggiungi prefisso" #: libraries/mult_submits.inc.php:477 tbl_replace.php:331 msgid "No change" @@ -8056,10 +8047,10 @@ msgid "Unable to change master" msgstr "Impossibile modificare il master" #: server_replication.php:72 -#, fuzzy, php-format +#, php-format #| msgid "Master server changed succesfully to %s" msgid "Master server changed successfully to %s" -msgstr "Il server master modificato a %s con successo" +msgstr "Il server master modificato con successo a %s" #: server_replication.php:180 msgid "This server is configured as master in a replication process." @@ -9228,16 +9219,18 @@ msgid "Insecure connection" msgstr "Connessione non sicura" #: setup/frames/index.inc.php:92 -#, fuzzy #| msgid "Configuration storage" msgid "Configuration saved." -msgstr "Configurazione di memorizzazione" +msgstr "Configurazione salvata." #: setup/frames/index.inc.php:93 msgid "" "Configuration saved to file config/config.inc.php in phpMyAdmin top level " "directory, copy it to top level one and delete directory config to use it." msgstr "" +"Configurazione salvata nel file config/config.inc.php nella cartella " +"principale di phpMyAdmin, copialo alla cartella principale a rimuovi la " +"cartella config per utilizzarlo." #: setup/frames/index.inc.php:100 setup/frames/menu.inc.php:15 msgid "Overview" @@ -10102,22 +10095,21 @@ msgid "Version %s snapshot (SQL code)" msgstr "Versione %s del snapshot (codice SQL)" #: tbl_tracking.php:382 -#, fuzzy #| msgid "Track these data definition statements:" msgid "Tracking data definition successfully deleted" -msgstr "Monitora le istuzioni delle definizioni dei dati:" +msgstr "Le definizioni dei dati di monitoraggio eliminati con successo" #: tbl_tracking.php:384 tbl_tracking.php:401 #, fuzzy #| msgid "Gather errors" msgid "Query error" -msgstr "Accumula gli errori" +msgstr "Errore della query" #: tbl_tracking.php:399 #, fuzzy #| msgid "Track these data manipulation statements:" msgid "Tracking data manipulation successfully deleted" -msgstr "Monitora le istuzioni delle manipulazioni dei dati:" +msgstr "Le manipolazioni dei dati di monitoraggio eliminati con successo" #: tbl_tracking.php:411 msgid "Tracking statements" @@ -10135,10 +10127,9 @@ msgid "Delete tracking data row from report" msgstr "Cancella dati di tracciamento per questa tabella" #: tbl_tracking.php:443 -#, fuzzy #| msgid "No databases" msgid "No data" -msgstr "Nessun database" +msgstr "Nessun dato" #: tbl_tracking.php:453 tbl_tracking.php:510 msgid "Date" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2009-g46ba122
by Piotr Przybylski 25 May '11

25 May '11

The branch, master has been updated via 46ba122b8f72fa5d577d1ca0eef39e0f2dd9e39c (commit) from 76194fd122690cbe3947bfa25ae5d40de82d1d35 (commit) - Log ----------------------------------------------------------------- commit 46ba122b8f72fa5d577d1ca0eef39e0f2dd9e39c Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed May 25 18:59:21 2011 +0200 Add 'nockick' class to databases that can't be dropped in server database list ----------------------------------------------------------------------- Summary of changes: server_databases.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/server_databases.php b/server_databases.php index 365055a..051345d 100644 --- a/server_databases.php +++ b/server_databases.php @@ -197,7 +197,11 @@ if ($databases_count > 0) { $odd_row = true; foreach ($databases as $current) { - echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"; + $tr_class = $odd_row ? 'odd' : 'even'; + if ($current['SCHEMA_NAME'] == 'mysql' || $current['SCHEMA_NAME'] == 'information_schema') { + $tr_class .= ' noclick'; + } + echo '<tr class="' . $tr_class . '">' . "\n"; $odd_row = ! $odd_row; list($column_order, $generated_html) = PMA_buildHtmlForDb($current, $is_superuser, (isset($checkall) ? $checkall : ''), $url_query, $column_order, $replication_types, $replication_info); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. a085c5116076adbfe0dd982349710f2ff70cf5a8
by Michal Čihař 25 May '11

25 May '11

The branch, master has been updated via a085c5116076adbfe0dd982349710f2ff70cf5a8 (commit) via eeff6b4cf80459bfbfec7c04b99c66394ef244c8 (commit) via ebe423bec288f1c535646a374fbd5b5c682f9620 (commit) via 33410d5b198957d1bad49a0a94409d04ea8a00f8 (commit) via dd5fa79754604613d09850b9438412fb381e8cd9 (commit) via 58d0b7e63c240d231ce5f99a26a62e17a136ff7d (commit) via 3aa10fcab6640cdb7a0fb85317d1e587b4dd0324 (commit) via 214b228328d6cd4d9c52b3b1c359edaa6e29ba76 (commit) via 2cc572c15f92e8e184568039fdfc447c8c5df3e9 (commit) via 06537d7d5ed315c65d43ab3a4d31d4c74d0406a8 (commit) via 2a281d79228d1fee6c6a2e3b17b2a5a7a39a95a5 (commit) via 2dddf45665353cdc9ab75b870eb4e9cbe0dc0d9a (commit) via 3c959e0aff4866077395db6aeb25b2cdb40d3e68 (commit) via 5c9931195f3c104c87221457e02c95bce9fcac37 (commit) via 88dcb18aae064c2307bf5038d4e06c03c73accda (commit) via 271fe70fd67bb80f00155ed0bede12b41a8c306b (commit) via 6707e483693a88385d862660175da2546d74a57b (commit) via aa8885b22dff0eec6a2444e12ecd3120a60bff9a (commit) via a40f815703b6afe386edc188e9c6c2bba564536e (commit) via 33ce9f95e25a1229baf02c905081b51972672b48 (commit) via 3c7b548620b99d16a78c4a30a269dc553ed18956 (commit) via e77a4ccb32a07eb6cf3cefc8143c44a834014bd8 (commit) via aa57de8d3f6cee395cb33e4c1bb53946b3f5f5dc (commit) via cba019522d32378e75341d9685c3c461005d9aa1 (commit) via 42f1a904ccca4c930b2ebc1e7d430746b5074e68 (commit) via 29d20c5223131e8abdda0c6ad952fc48673624d0 (commit) via e216709b7ffdc3b263eee708bcf3a5e3e3dc8316 (commit) via b13775a5436712ebf12659a2d7d5162f48660f9a (commit) via 6b4f65ac728efe04b6e581ff412a0988a5045668 (commit) via d9cbd80a0be3abb8fea5e8a70cc1df49e0bf5b74 (commit) via 0d79adb9d07edab437b612b1d9df32d819d5fde8 (commit) via f2e45e42c193811f33a62036717168c33cbe2789 (commit) via 7244c804a81bc5ca36cbd99f5d28b3709b924fb6 (commit) via 0c5be7a35724fd95489bd4a5d1ac0b219de1a813 (commit) via f70aa951a4d5b1b38de764fd0ccc4e604ee0e93b (commit) via 087589a0fc903f937bf276775d4f6ca8d6171181 (commit) via 124aeae561286fca8641c05480cd21e2d7aff7bb (commit) via 9fa3e652793cbea36c81efc5b4b0f7c580587a9a (commit) via 5869a0cb22522d6d57712689637596623bd6bd35 (commit) via b9b27087b0a2e4918fafadd056ecce9ffb4286b0 (commit) via 8a47875290512bbe900a401f9c0a290e98236f85 (commit) via cd0a019891eb6c74bd44711aa9e49d3983011850 (commit) via b076e32d37cd891cbc8a44892fb140df1af9b65d (commit) via 6bd7c7f0ce1a4d9131d6d7fb1ca3b24931a309a9 (commit) via d463c03e63dfa1fb35728b9bef886773073a8fa8 (commit) via e85213b3073d56a572d490ad039ef69d1666ea18 (commit) via 759990730f0ed01f4824e7b9d70abf8837337bcc (commit) via 1d7d424f34afc18a442d123f1c9cb99d72a8e1c3 (commit) via a85cf66b716f051f4e2980c3dcf1ac4039e084c2 (commit) via 6adab42947c22db01e03754c402b3a7f7899ce02 (commit) via 17b6acd50431a0ec3f45e8fe6082dff3ab2dca1d (commit) via 6bd773f87e1d517e0828dda0f09c9747ce857eaf (commit) via b942af3fa8144840b7418a12afc103ce732d3eee (commit) via bd87e4648e1db2d1d29d167fc847bd6aec5983f9 (commit) via 58de9f3b891eef068b229c335342b3e66ec0ac28 (commit) via 7df84f35c33858592a4d0895c65288d9a67364c7 (commit) via a9cae299b6725ac4bf7620d680e596bb86a5d7e0 (commit) via 0a8076acaa02401da820a0ebfc2182ff41ea84bd (commit) via 019c32bf7016a59177bfa8ee2f40e01ff9b5ca75 (commit) via 6b97a8a21b633152cc911bf9153ea65553a2b325 (commit) via e4c1867e0ca449f7ce8cf9c425fc592216f4e0e3 (commit) via 93f93782d5c819cedb2c869e1efeb61bf3d4039f (commit) via fa8611c318b6c70b1fe1898a1200a7b78db95ba7 (commit) via 1e8e40abd8602885ed010d98850cc83ea207118f (commit) via b913da379a4c70da746d08aca54ba61cf07fbe76 (commit) via 6e369f3ce865dbd704c4f46a8456129252be264d (commit) via 6a2dc6ca227312f3b99edf0a0dde6437d88e936c (commit) via 79a879ac40c5cfb01a4f544fa41b2dcd21a44a5c (commit) via f6a4492dd73035d6fdd34fcdd3ab7f510cadc107 (commit) via 67d87c380eb24e1bdd933b1e67caa0c18a0e6482 (commit) via a8ae5188d2bd67485ad04a4cfd0dabb0b1e2b367 (commit) via d5754943523ca9696b3af1ee83fa1e773b7b6b5d (commit) via 84088d514d2fb825565e396c6e6c8d4e81a39be2 (commit) via dd0625238925cd6671f30119ef1a991607acb022 (commit) from d2f75009d2204c171dfcd64999f8809a8bd1319a (commit) - Log ----------------------------------------------------------------- commit a085c5116076adbfe0dd982349710f2ff70cf5a8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:32:25 2011 +0200 Translation update done using Pootle. commit eeff6b4cf80459bfbfec7c04b99c66394ef244c8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:28:54 2011 +0200 Translation update done using Pootle. commit ebe423bec288f1c535646a374fbd5b5c682f9620 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:27:15 2011 +0200 Translation update done using Pootle. commit 33410d5b198957d1bad49a0a94409d04ea8a00f8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:25:48 2011 +0200 Translation update done using Pootle. commit dd5fa79754604613d09850b9438412fb381e8cd9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:23:04 2011 +0200 Translation update done using Pootle. commit 58d0b7e63c240d231ce5f99a26a62e17a136ff7d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:22:03 2011 +0200 Translation update done using Pootle. commit 3aa10fcab6640cdb7a0fb85317d1e587b4dd0324 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:18:43 2011 +0200 Translation update done using Pootle. commit 214b228328d6cd4d9c52b3b1c359edaa6e29ba76 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:16:32 2011 +0200 Translation update done using Pootle. commit 2cc572c15f92e8e184568039fdfc447c8c5df3e9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:15:56 2011 +0200 Translation update done using Pootle. commit 06537d7d5ed315c65d43ab3a4d31d4c74d0406a8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:14:11 2011 +0200 Translation update done using Pootle. commit 2a281d79228d1fee6c6a2e3b17b2a5a7a39a95a5 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:11:43 2011 +0200 Translation update done using Pootle. commit 2dddf45665353cdc9ab75b870eb4e9cbe0dc0d9a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:08:57 2011 +0200 Translation update done using Pootle. commit 3c959e0aff4866077395db6aeb25b2cdb40d3e68 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:06:30 2011 +0200 Translation update done using Pootle. commit 5c9931195f3c104c87221457e02c95bce9fcac37 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:06:17 2011 +0200 Translation update done using Pootle. commit 88dcb18aae064c2307bf5038d4e06c03c73accda Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 11:05:37 2011 +0200 Translation update done using Pootle. commit 271fe70fd67bb80f00155ed0bede12b41a8c306b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:58:20 2011 +0200 Translation update done using Pootle. commit 6707e483693a88385d862660175da2546d74a57b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:39:28 2011 +0200 Translation update done using Pootle. commit aa8885b22dff0eec6a2444e12ecd3120a60bff9a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:35:04 2011 +0200 Translation update done using Pootle. commit a40f815703b6afe386edc188e9c6c2bba564536e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:34:34 2011 +0200 Translation update done using Pootle. commit 33ce9f95e25a1229baf02c905081b51972672b48 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:34:12 2011 +0200 Translation update done using Pootle. commit 3c7b548620b99d16a78c4a30a269dc553ed18956 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:33:55 2011 +0200 Translation update done using Pootle. commit e77a4ccb32a07eb6cf3cefc8143c44a834014bd8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:32:46 2011 +0200 Translation update done using Pootle. commit aa57de8d3f6cee395cb33e4c1bb53946b3f5f5dc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:32:35 2011 +0200 Translation update done using Pootle. commit cba019522d32378e75341d9685c3c461005d9aa1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:32:15 2011 +0200 Translation update done using Pootle. commit 42f1a904ccca4c930b2ebc1e7d430746b5074e68 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:31:56 2011 +0200 Translation update done using Pootle. commit 29d20c5223131e8abdda0c6ad952fc48673624d0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:31:21 2011 +0200 Translation update done using Pootle. commit e216709b7ffdc3b263eee708bcf3a5e3e3dc8316 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:30:33 2011 +0200 Translation update done using Pootle. commit b13775a5436712ebf12659a2d7d5162f48660f9a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:29:38 2011 +0200 Translation update done using Pootle. commit 6b4f65ac728efe04b6e581ff412a0988a5045668 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:29:32 2011 +0200 Translation update done using Pootle. commit d9cbd80a0be3abb8fea5e8a70cc1df49e0bf5b74 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:29:02 2011 +0200 Translation update done using Pootle. commit 0d79adb9d07edab437b612b1d9df32d819d5fde8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:28:44 2011 +0200 Translation update done using Pootle. commit f2e45e42c193811f33a62036717168c33cbe2789 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:28:39 2011 +0200 Translation update done using Pootle. commit 7244c804a81bc5ca36cbd99f5d28b3709b924fb6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:28:28 2011 +0200 Translation update done using Pootle. commit 0c5be7a35724fd95489bd4a5d1ac0b219de1a813 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:28:17 2011 +0200 Translation update done using Pootle. commit f70aa951a4d5b1b38de764fd0ccc4e604ee0e93b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:27:47 2011 +0200 Translation update done using Pootle. commit 087589a0fc903f937bf276775d4f6ca8d6171181 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:27:14 2011 +0200 Translation update done using Pootle. commit 124aeae561286fca8641c05480cd21e2d7aff7bb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:26:45 2011 +0200 Translation update done using Pootle. commit 9fa3e652793cbea36c81efc5b4b0f7c580587a9a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:26:08 2011 +0200 Translation update done using Pootle. commit 5869a0cb22522d6d57712689637596623bd6bd35 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:25:52 2011 +0200 Translation update done using Pootle. commit b9b27087b0a2e4918fafadd056ecce9ffb4286b0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:25:32 2011 +0200 Translation update done using Pootle. commit 8a47875290512bbe900a401f9c0a290e98236f85 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:25:18 2011 +0200 Translation update done using Pootle. commit cd0a019891eb6c74bd44711aa9e49d3983011850 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:25:01 2011 +0200 Translation update done using Pootle. commit b076e32d37cd891cbc8a44892fb140df1af9b65d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:24:30 2011 +0200 Translation update done using Pootle. commit 6bd7c7f0ce1a4d9131d6d7fb1ca3b24931a309a9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:24:15 2011 +0200 Translation update done using Pootle. commit d463c03e63dfa1fb35728b9bef886773073a8fa8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:23:51 2011 +0200 Translation update done using Pootle. commit e85213b3073d56a572d490ad039ef69d1666ea18 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:23:29 2011 +0200 Translation update done using Pootle. commit 759990730f0ed01f4824e7b9d70abf8837337bcc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:23:17 2011 +0200 Translation update done using Pootle. commit 1d7d424f34afc18a442d123f1c9cb99d72a8e1c3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:22:32 2011 +0200 Translation update done using Pootle. commit a85cf66b716f051f4e2980c3dcf1ac4039e084c2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:22:16 2011 +0200 Translation update done using Pootle. commit 6adab42947c22db01e03754c402b3a7f7899ce02 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:21:45 2011 +0200 Translation update done using Pootle. commit 17b6acd50431a0ec3f45e8fe6082dff3ab2dca1d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:21:09 2011 +0200 Translation update done using Pootle. commit 6bd773f87e1d517e0828dda0f09c9747ce857eaf Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:19:55 2011 +0200 Translation update done using Pootle. commit b942af3fa8144840b7418a12afc103ce732d3eee Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:18:09 2011 +0200 Translation update done using Pootle. commit bd87e4648e1db2d1d29d167fc847bd6aec5983f9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:17:04 2011 +0200 Translation update done using Pootle. commit 58de9f3b891eef068b229c335342b3e66ec0ac28 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:16:03 2011 +0200 Translation update done using Pootle. commit 7df84f35c33858592a4d0895c65288d9a67364c7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:14:59 2011 +0200 Translation update done using Pootle. commit a9cae299b6725ac4bf7620d680e596bb86a5d7e0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:14:36 2011 +0200 Translation update done using Pootle. commit 0a8076acaa02401da820a0ebfc2182ff41ea84bd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:14:04 2011 +0200 Translation update done using Pootle. commit 019c32bf7016a59177bfa8ee2f40e01ff9b5ca75 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:13:29 2011 +0200 Translation update done using Pootle. commit 6b97a8a21b633152cc911bf9153ea65553a2b325 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:12:50 2011 +0200 Translation update done using Pootle. commit e4c1867e0ca449f7ce8cf9c425fc592216f4e0e3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:12:17 2011 +0200 Translation update done using Pootle. commit 93f93782d5c819cedb2c869e1efeb61bf3d4039f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:11:52 2011 +0200 Translation update done using Pootle. commit fa8611c318b6c70b1fe1898a1200a7b78db95ba7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:11:25 2011 +0200 Translation update done using Pootle. commit 1e8e40abd8602885ed010d98850cc83ea207118f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:10:51 2011 +0200 Translation update done using Pootle. commit b913da379a4c70da746d08aca54ba61cf07fbe76 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:10:36 2011 +0200 Translation update done using Pootle. commit 6e369f3ce865dbd704c4f46a8456129252be264d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:08:45 2011 +0200 Translation update done using Pootle. commit 6a2dc6ca227312f3b99edf0a0dde6437d88e936c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:07:24 2011 +0200 Translation update done using Pootle. commit 79a879ac40c5cfb01a4f544fa41b2dcd21a44a5c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:06:47 2011 +0200 Translation update done using Pootle. commit f6a4492dd73035d6fdd34fcdd3ab7f510cadc107 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:05:55 2011 +0200 Translation update done using Pootle. commit 67d87c380eb24e1bdd933b1e67caa0c18a0e6482 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:04:49 2011 +0200 Translation update done using Pootle. commit a8ae5188d2bd67485ad04a4cfd0dabb0b1e2b367 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:04:08 2011 +0200 Translation update done using Pootle. commit d5754943523ca9696b3af1ee83fa1e773b7b6b5d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:03:19 2011 +0200 Translation update done using Pootle. commit 84088d514d2fb825565e396c6e6c8d4e81a39be2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:02:57 2011 +0200 Translation update done using Pootle. commit dd0625238925cd6671f30119ef1a991607acb022 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed May 25 10:02:36 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 316 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 177 insertions(+), 139 deletions(-) diff --git a/po/ja.po b/po/ja.po index 7ba8b0e..286fc22 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-20 08:29+0300\n" -"PO-Revision-Date: 2011-05-22 04:35+0200\n" +"PO-Revision-Date: 2011-05-25 11:32+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: Japan <jp(a)li.org>\n" "Language: ja\n" @@ -813,6 +813,10 @@ msgid "" "cross side scripting vulnerabilities that might happen to be found in that " "code." msgstr "" +"ウェブサーバの設定でサブフォルダ <tt>./libraries</tt> と <tt>./setup/lib</tt> " +"へのアクセスを拒否しておく必要があります。Apache の場合、該当フォルダに提供されている .htaccess ファイルを使用することができます。他の" +"ウェブサーバの場合は、各自で設定する必要があります。このような設定を行うことにより、サブフォルダの露出を防ぎ、万一、そこのコードにクロスサイドスクリプテ" +"ィングの脆弱性が見つかっても、利用されることはありません。" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:315 @@ -858,27 +862,26 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:335 -#, fuzzy msgid "" "Please look at your <tt>./scripts/</tt> directory, where you should find a " "file called <i>create_tables.sql</i>. (If you are using a Windows server, " "pay special attention to <a href=\"#faq1_23\"> <abbr title=\"Frequently " "Asked Questions\">FAQ</abbr> 1.23</a>)." msgstr "" -"scripts/ ディレクトリを確認してください。<i>create_tables.sql</i> というファ" -"イルがあるはずです（Windows サーバをお使いの場合は <a href=\"#faq1_23\">FAQ " -"1.23</a> をよくお読みください）。" +"<tt>./scripts/</tt> ディレクトリを確認してください。<i>create_tables.sql</i> " +"というファイルがあるはずです（Windows サーバをお使いの場合は <a href=\"#faq1_23\"><abbr " +"title=\"よくある質問\">FAQ</abbr> 1.23</a> をよくお読みください）。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:340 -#, fuzzy msgid "" "If you already had this infrastructure and upgraded to MySQL 4.1.2 or newer, " "please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> and then create " "new tables by importing <i>./scripts/create_tables.sql</i>." msgstr "" -"既存のテーブル構造を MySQL 4.1.2 以降にアップグレードする場合は " -"<i>upgrade_tables_mysql_4_1_2+.sql</i> をお使いください。" +"既存のテーブル構造を MySQL 4.1.2 " +"以降にアップグレードする場合は、<i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> を使ってから " +"<i>./scripts/create_tables.sql</i> をインポートして新しいテーブルを作成するようにしてください。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:344 @@ -1385,7 +1388,7 @@ msgstr "Swekey 認証" msgid "" "The Swekey is a low cost authentication USB key that can be used in web " "applications." -msgstr "" +msgstr "Swekey は、Web アプリケーションで使用することができる低コストの USB 認証キーです。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:545 @@ -1395,11 +1398,13 @@ msgid "" "cookie authentication mode only). Swekey Authentication is disabled by " "default." msgstr "" +"Swekey 認証が有効にされている場合、phpMyAdmin はログインページに入る前にユーザの Swekey " +"を接続しておく必要があります（現在はクッキー認証モードのみサポート）。 Swekey 認証は、デフォルトでは無効になっています。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:549 msgid "To enable it, add the following line to <tt>config.inc.php</tt>:" -msgstr "" +msgstr "これを有効にするには、<tt>config.inc.php</tt> に以下の行を追加します。" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:552 @@ -1416,6 +1421,9 @@ msgid "" "etc</tt>). A self documented sample file is provided in the <tt>contrib</tt> " "directory. Feel free to use it with your own users' information." msgstr "" +"その後、各ユーザと Swekey ID が関連付けられている <tt>swekey.conf</tt> ファイルを作成する必要があります。このファイルを " +"Web サーバのドキュメントルート外に置いておくことが重要です（上の例では、<tt>/etc</tt> にあります）。これのサンプルファイルが " +"<tt>contrib</tt> ディレクトリにあります。これらはユーザ情報ではありますが、管理者が見たりしても特に問題はありません。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:560 @@ -1424,6 +1432,9 @@ msgid "" "net/auth_key\">http://phpmyadmin.net/auth_key</a> since this link provides " "funding for phpMyAdmin." msgstr "" +"Swekey を購入したい場合は、<a " +"href=\"http://phpmyadmin.net/auth_key\">http://phpmyadmin.net/auth_key</a> " +"より訪問するようお願いいたします。このリンクを通すことにより phpMyAdmin へ紹介料が提供されますので。" #. type: Content of: <html><body><div><h3> #: orig-docs/Documentation.html:565 orig-docs/Documentation.html:3093 @@ -1441,10 +1452,9 @@ msgid "" "saving a script you have modified." msgstr "" "<span class=\"important\"><acronym title=\"Apple Macintosh\">Mac</acronym> " -"ユーザ向けの警告：</span> PHP は <acronym title=\"Apple Macintosh\">Mac</" -"acronym> の改行文字（「<tt>¥r</tt>」）と相性がよくないようです。かならずテキ" -"ストエディタで UNIX/Linux の改行文字（「<tt>¥n</tt>」）を使えるようにするオプ" -"ションを選択してから修正したスクリプトを保存してください。" +"ユーザ向けの警告：</span> PHP は <acronym title=\"Apple Macintosh\">Mac</acronym> " +"の改行文字（「<tt>¥r</tt>」）と相性がよくないようです。必ずテキストエディタで UNIX/Linux " +"の改行文字（「<tt>¥n</tt>」）を使えるようにするオプションを選択してから修正したスクリプトを保存してください。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:574 @@ -1904,11 +1914,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:742 -#, fuzzy msgid "" "Whether config or cookie or <abbr title=\"HyperText Transfer Protocol" "\">HTTP</abbr> or signon authentication should be used for this server." -msgstr "そのサーバで利用する認証方法が入ります（config／cookie／http）。" +msgstr "" +"そのサーバで利用する認証方法が入ります（config／cookie／<abbr title=\"HyperText Transfer " +"Protocol\">HTTP</abbr>／signon）。" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:745 @@ -2190,10 +2201,8 @@ msgid "" "on your system, for example. For HTTP auth, all non-US-ASCII characters will " "be stripped." msgstr "" -"複数のサーバエントリがあるなら便利です。設定しておくと、メインページのプルダ" -"ウンメニューに、ホスト名ではなく、この文字列が表示されます。たとえば、システ" -"ム上のいくつかのデータベースのみ表示させる場合には便利でしょう。HTTP認証の場" -"合、非ASCII文字は全て無視されるかもしれません。" +"複数のサーバエントリがあるなら便利です。設定しておくと、メインページのプルダウンメニューに、ホスト名ではなく、この文字列が表示されます。たとえば、システ" +"ム上のいくつかのデータベースのみ表示させる場合には便利でしょう。HTTP 認証の場合、非 ASCII 文字は全て無視されるかもしれません。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:867 @@ -2533,13 +2542,10 @@ msgstr "" msgid "" "Since release 2.3.0 you can store comments to describe each column for each " "table. These will then be shown on the "printview"." -msgstr "" -"リリース 2.3.0 以降、テーブルごとに各コラムの説明を保管できるようになりまし" -"た。このコメントは「印刷用表示」の際に表示されます。" +msgstr "リリース 2.3.0 以降、テーブルごとに各カラムの説明を保管できるようになりました。このコメントは「印刷用表示」の際に表示されます。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:996 -#, fuzzy msgid "" "Starting with release 2.5.0, comments are consequently used on the table " "property pages and table browse view, showing up as tool-tips above the " @@ -2547,10 +2553,9 @@ msgid "" "browse view. They can also be shown in a table dump. Please see the relevant " "configuration directives later on." msgstr "" -"リリース 2.5.0 以降、テーブルのプロパティページやテーブルの表示機能でもコメン" -"トを利用するようになりました。カラム名の上に表示されるツールチップ（プロパ" -"ティページ）や表示機能のテーブルヘッダに埋め込まれます。また、テーブルをダン" -"プする際に表示することもできます。後述の関連ディレクティブもご覧ください。" +"リリース 2.5.0 以降、テーブルのプロパティページやテーブルの表示機能でもコメントを利用するようになりました。カラム名の上に表示されるツールチップ（" +"プロパティページ）や表示機能のテーブルヘッダに埋め込まれます。また、テーブルをダンプする際に表示することもできます。後述の関連ディレクティブもご覧くださ" +"い。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1002 @@ -2591,13 +2596,16 @@ msgid "" " ADD `transformation` VARCHAR( 255 ) NOT NULL,\n" " ADD `transformation_options` VARCHAR( 255 ) NOT NULL;\n" msgstr "" +"ALTER TABLE `pma_column_comments`\n" +" ADD `mimetype` VARCHAR( 255 ) NOT NULL,\n" +" ADD `transformation` VARCHAR( 255 ) NOT NULL,\n" +" ADD `transformation_options` VARCHAR( 255 ) NOT NULL;\n" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1023 -#, fuzzy msgid "" "and remember that the Variable in <i>config.inc.php</i> has been renamed from" -msgstr "</tt> また、忘れずに <i>config.inc.php</i> の変数を" +msgstr "また、忘れずに <i>config.inc.php</i> にある変数を" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1025 @@ -2617,7 +2625,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1033 -#, fuzzy msgid "" "Since release 2.5.0 you can store your <abbr title=\"structured query " "language\">SQL</abbr> history, which means all queries you entered manually " @@ -2625,21 +2632,21 @@ msgid "" "history, you can use the JavaScript-based history. Using that, all your " "history items are deleted when closing the window." msgstr "" -"リリース 2.5.0 以降、SQL の履歴（phpMyAdmin インタフェースに手入力したすべて" -"のクエリ）を保管できるようになりました。テーブルベースの履歴は利用したくない" -"場合、JavaScriptベースの履歴を利用することもできます。この場合、ウインドウを" -"閉じるとすべての履歴が削除されます。" +"リリース 2.5.0 以降、<abbr title=\"structured query language\">SQL</abbr> " +"の履歴（phpMyAdmin " +"インタフェースに手入力したすべてのクエリ）を保管できるようになりました。テーブルベースの履歴は利用したくない場合、JavaScript " +"ベースの履歴を利用することもできます。この場合、ウインドウを閉じるとすべての履歴が削除されます。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1040 -#, fuzzy msgid "" "Using <a href=\"#cfg_QueryHistoryMax\" class=\"configrule\">$cfg" "['QueryHistoryMax']</a> you can specify an amount of history items you want " "to have on hold. On every login, this list gets cut to the maximum amount." msgstr "" -"<b>$cfg['QueryHistoryMax']</b> を使うと保持しておきたい履歴アイテムの数を指定" -"できます。このリストはログインのたびに上限値にまで切り詰められます。" +"<a href=\"#cfg_QueryHistoryMax\" " +"class=\"configrule\">$cfg['QueryHistoryMax']</a> " +"を使うと、保持しておきたい履歴アイテムの数を指定できます。このリストはログインのたびに上限値にまで切り詰められます。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1045 @@ -2902,7 +2909,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1182 -#, fuzzy msgid "" "Because release 2.5.0 introduced the new MIME-transformation support, the " "column_info table got enhanced with three new columns. If the above variable " @@ -2910,11 +2916,9 @@ msgid "" "latest table structure available. If not, it will emit a warning to the " "superuser." msgstr "" -"リリース 2.5.0 では新しい MIME 変換機能をサポートするようになったため、" -"column_info テーブルに新しいフィールドが 3 つ追加されました。この変数を " -"<tt>TRUE</tt>（デフォルト）にセットしておくと、最新のテーブル構造が利用できる" -"ようになっているかチェックします。利用できない場合はスーパーユーザに警告を発" -"します。" +"リリース 2.5.0 では新しい MIME 変換機能をサポートするようになったため、column_info テーブルに新しいカラムが 3 " +"つ追加されました。この変数を <tt>TRUE</tt>（デフォルト）にセットしておくと、phpMyAdmin " +"は最新のテーブル構造が利用できるようになっているかチェックします。利用できない場合はスーパーユーザに警告を発します。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1188 @@ -2988,17 +2992,14 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1210 -#, fuzzy msgid "" "If your rule order is set to <tt>'deny,allow'</tt> then the system applies " "all deny rules followed by allow rules. Access is allowed by default. Any " "client which does not match a Deny command or does match an Allow command " "will be allowed access to the server." msgstr "" -"規則の適用順が <tt>「deny,allow」</tt> の場合、システムはすべての拒否規則を適" -"用してから許可規則を適用します。アクセスは許可がデフォルトです。拒否コマンド" -"に一致しないクライアント、許可コマンドに一致するクライアントはすべてサーバへ" -"のアクセスが許可されます。" +"規則の適用順が <tt>「deny,allow」</tt> の場合、システムは全ての拒否規則を適用してから許可規則を適用します。アクセスは許可がデフォル" +"トです。拒否コマンドに一致しないクライアント、許可コマンドに一致するクライアントはすべてサーバへのアクセスが許可されます。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1215 @@ -3015,7 +3016,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1220 -#, fuzzy msgid "" "If your rule order is set to 'explicit', authorization is performed in a " "similar fashion to rule order 'deny,allow', with the added restriction that " @@ -3024,11 +3024,10 @@ msgid "" "secure means of using Allow/Deny rules, and was available in Apache by " "specifying allow and deny rules without setting any order." msgstr "" -"規則の適用順が「explicit」の場合、認証は「deny,allow」と同様に行われますが、" -"制限が追加されて、ホスト名／ユーザ名の組が <i>allow</i> 規則に含まれ、かつ、" -"<i>deny</i> 規則には含まれない<b>必要があります</b>。これは「Allow/Deny」規則" -"を利用するうえでは<b>最も</b>安全な方法です。以前は Apache で順番を指定せずに" -"許可・拒否規則を指定することで実現していたものです。" +"規則の適用順が「explicit」の場合、認証は「deny,allow」と同様に行われますが、制限が追加されて、ホスト名／ユーザ名の組が " +"<i>allow</i> 規則に含まれ、且つ、<i>deny</i> " +"規則には含まれない<b>必要があります</b>。これは「Allow/Deny」規則を利用するうえでは<b>最も</b>安全な方法です。以前は " +"Apache で順番を指定せずに許可・拒否規則を指定することで実現していたものです。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1228 @@ -3053,9 +3052,9 @@ msgstr "この規則の一般的なフォーマットは次の通りです。" #. type: Content of: <html><body><div><dl><dd><pre> #: orig-docs/Documentation.html:1238 -#, fuzzy, no-wrap +#, no-wrap msgid "<'allow' | 'deny'> <username> [from] <ipmask>\n" -msgstr "<tt>       <'allow' | 'deny'> <username> [from] <ipmask> </tt>" +msgstr "<'allow' | 'deny'> <username> [from] <ipmask>\n" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1241 @@ -3355,28 +3354,24 @@ msgstr "$cfg['OBGzip'] 文字列/boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1328 -#, fuzzy msgid "" "Defines whether to use GZip output buffering for increased speed in <abbr " "title=\"HyperText Transfer Protocol\">HTTP</abbr> transfers." msgstr "" -"HTTP 転送のスピードアップのために GZip 出力バッファリングを利用するかどうかを" -"定義します。" +"<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> 転送のスピードアップのために GZip " +"出力バッファリングを利用するかどうかを定義します。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1330 -#, fuzzy msgid "" "Set to true/false for enabling/disabling. When set to 'auto' (string), " "phpMyAdmin tries to enable output buffering and will automatically disable " "it if your browser has some problems with buffering. IE6 with a certain " "patch is known to cause data corruption when having enabled buffering." msgstr "" -"true／false にセットすると有効／無効になります。（文字列で）「auto」にする" -"と、phpMyAdmin は出力バッファリングを有効にしようとしますが、ブラウザの方で何" -"かバッファリングに問題が出た場合は自動的に無効にします。IE6 に特定のパッチを" -"あてると、バッファリングを有効にしたときにデータが壊れる問題があることがわ" -"かっています。" +"true／false にセットすると有効／無効になります。（文字列で）「auto」にすると、phpMyAdmin " +"は出力バッファリングを有効にしようとしますが、ブラウザの方で何かバッファリングに問題が出た場合は自動的に無効にします。IE6 " +"に特定のパッチをあてると、バッファリングを有効にしたときにデータが壊れる問題があることが分かっています。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1335 @@ -3417,13 +3412,11 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1345 -#, fuzzy msgid "" "This setting is used while importing/exporting dump files and in the " "Synchronize feature but has no effect when PHP is running in safe mode." msgstr "" -"この設定はダンプファイルのインポート／エクスポートをする際に利用されますが、" -"PHP がセーフモードになっているときは効果がありません。" +"この設定はダンプファイルのインポート／エクスポートをする際および同期機能で利用されますが、PHP がセーフモードになっているときは効果がありません。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1348 @@ -3436,6 +3429,8 @@ msgid "" "Path for storing session data (<a href=\"http://php.net/session_save_path" "\">session_save_path PHP parameter</a>)." msgstr "" +"セッションデータを保存のためのパス（<a " +"href=\"http://php.net/session_save_path\">session_save_path PHP パラメータ</a>）" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1352 @@ -3444,24 +3439,20 @@ msgstr "$cfg['MemoryLimit'] 文字列 [バイト]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1353 -#, fuzzy msgid "" "Set the number of bytes a script is allowed to allocate. If set to zero, no " "limit is imposed." -msgstr "" -"スクリプトが実行していられる秒数を指定します。秒数を 0 にすると時間制限はなく" -"なります。" +msgstr "スクリプトが確保できるバイト数を指定します。0 にすると制限はなくなります。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1355 -#, fuzzy msgid "" "This setting is used while importing/exporting dump files and at some other " "places in phpMyAdmin so you definitely don't want to put here a too low " "value. It has no effect when PHP is running in safe mode." msgstr "" -"この設定はダンプファイルのインポート／エクスポートをする際に利用されますが、" -"PHP がセーフモードになっているときは効果がありません。" +"この設定はダンプファイルのインポート／エクスポートをする際および phpMyAdmin " +"内の他のいくつかの場所で利用されます。この値を極端に低くくする必要は全くありません。PHP がセーフモードになっているときは効果がありません。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1358 @@ -3477,13 +3468,10 @@ msgstr "$cfg['SkipLockedTables'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1362 -#, fuzzy msgid "" "Mark used tables and make it possible to show databases with locked tables " "(since MySQL 3.23.30)." -msgstr "" -"利用しているテーブルに印をつけることで、テーブルがロックされているデータベー" -"スを表示できるようにします（3.23.30 以降）。" +msgstr "利用しているテーブルに印をつけることで、テーブルがロックされているデータベースを表示できるようにします（3.23.30 以降）。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1365 @@ -3492,11 +3480,12 @@ msgstr "$cfg['ShowSQL'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1366 -#, fuzzy msgid "" "Defines whether <abbr title=\"structured query language\">SQL</abbr> queries " "generated by phpMyAdmin should be displayed or not." -msgstr "phpMyAdmin が生成する SQL クエリを表示するかどうかを定義します。" +msgstr "" +"phpMyAdmin が生成する <abbr title=\"structured query language\">SQL</abbr> " +"クエリを表示するかどうかを定義します。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1369 @@ -3505,7 +3494,6 @@ msgstr "$cfg['AllowUserDropDatabase'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1370 -#, fuzzy msgid "" "Defines whether normal users (non-administrator) are allowed to delete their " "own database or not. If set as FALSE, the link "Drop Database" " @@ -3513,10 +3501,10 @@ msgid "" "rejected. Quite practical for <abbr title=\"Internet service provider\">ISP</" "abbr>'s with many customers." msgstr "" -"通常ユーザ（administrator 以外のユーザ）に自分自身のデータベースの削除を許可" -"するかどうかを定義します。FALSE にすると、「データベースを削除（Drop " -"Database）」のリンクは表示されませんし、「DROP DATABASE mydatabase」すらも拒" -"否されます。多くの顧客をかかえる ISP にとってはきわめて実用的です。" +"通常ユーザ（administrator 以外のユーザ）に自分自身のデータベースの削除を許可するかどうかを定義します。FALSE " +"にすると、「データベースの削除（Drop Database）」のリンクは表示されませんし、「DROP DATABASE " +"(自身のデータベース名)」すらも拒否されます。多くの顧客をかかえる <abbr title=\"Internet service " +"provider\">ISP</abbr> にとってはきわめて実用的です。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1376 @@ -3526,6 +3514,8 @@ msgid "" "quite complicated. So this choice should be viewed as help to avoid " "accidental dropping rather than strict privilege limitation." msgstr "" +"SQL クエリに対するこの制限は、MySQL の権限を使用するほど厳格ではないことに注意してください。これは SQL クエリの性質によるもので、非常に複" +"雑になる可能性があります。この設定は、厳密な権限の制限というよりも、削除事故回避ためにヘルプとして表示するようなものです。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1382 @@ -3939,16 +3929,14 @@ msgstr "$cfg['LeftDefaultTabTable'] 文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1524 -#, fuzzy msgid "" "Defines the tab displayed by default when clicking the small icon next to " "each table name in the navigation panel. Possible values: "" "tbl_structure.php", "tbl_sql.php", "tbl_select." "php", "tbl_change.php" or "sql.php"." msgstr "" -"テーブル表示の際にデフォルトで表示されるタブを定義します。可能な値は次の通り" -"です：「tbl_properties_structure.php」、「tbl_properties.php」、「tbl_select." -"php」、「tbl_change.php」" +"各テーブル名の隣にある小さなアイコンをクリックしたときにデフォルトで表示されるタブを定義します。可能な値は次のいずれかです。「tbl_structure" +".php」、「tbl_sql.php」、「tbl_select.php」、「tbl_change.php」、「sql.php」。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1530 @@ -4269,9 +4257,8 @@ msgid "" "one or both of the following strings: <i>'content-id'</i>, <i>'id-content'</" "i>." msgstr "" -"外部キーのドロップダウンフィールドには、いくつかの表示方法がありますが、キー" -"と値データの双方が表示されます。この配列には次の文字列のいずれか、または双方" -"が入ります: <i>'content-id'</i>、<i>'id-content'</i>" +"外部キーのドロップダウンフィールドには、いくつかの表示方法がありますが、キーと値データの双方が表示されます。この配列には、<i>'content-" +"id'</i>、<i>'id-content'</i> のいずれか、または双方が入ります。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1635 @@ -4398,14 +4385,13 @@ msgstr "$cfg['DefaultTabDatabase'] 文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1675 -#, fuzzy msgid "" "Defines the tab displayed by default on database view. Possible values: " ""db_structure.php", "db_sql.php" or "db_search." "php"." msgstr "" -"データベース表示の際にデフォルトで表示されるタブを定義します。可能な値は次の" -"通りです：「db_details_structure.php」、「db_details.php」、「db_search.php」" +"データベース表示の際にデフォルトで表示されるタブを定義します。可能な値は次のいずれかです。「db_structure.php」、「db_sql.php」" +"、「db_search.php」。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1679 @@ -4414,15 +4400,13 @@ msgstr "$cfg['DefaultTabTable'] 文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1680 -#, fuzzy msgid "" "Defines the tab displayed by default on table view. Possible values: "" "tbl_structure.php", "tbl_sql.php", "tbl_select." "php", "tbl_change.php" or "sql.php"." msgstr "" -"テーブル表示の際にデフォルトで表示されるタブを定義します。可能な値は次の通り" -"です：「tbl_properties_structure.php」、「tbl_properties.php」、「tbl_select." -"php」、「tbl_change.php」" +"テーブル表示の際にデフォルトで表示されるタブを定義します。可能な値は次のいずれかです。「tbl_structure.php」、「tbl_sql.php」" +"、「tbl_select.php」、「tbl_change.php」、「sql.php」。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1685 @@ -4431,15 +4415,15 @@ msgstr "$cfg['MySQLManualBase'] 文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1686 -#, fuzzy msgid "" "If set to an <abbr title=\"Uniform Resource Locator\">URL</abbr> which " "points to the MySQL documentation (type depends on <a href=" "\"#cfg_MySQLManualType\" class=\"configrule\">$cfg['MySQLManualType']</a>), " "appropriate help links are generated." msgstr "" -"MySQL 文書の URI を設定すると（文書のタイプは <tt>$cfg['MySQLManualType']</" -"tt> の値によります）、適切なヘルプ用のリンクが生成されます。" +"MySQL ドキュメントの <abbr title=\"Uniform Resource Locator\">URL</abbr> " +"を設定すると（ドキュメントのタイプは <a href=\"#cfg_MySQLManualType\" " +"class=\"configrule\">$cfg['MySQLManualType']</a> の値によります）、適切なヘルプ用のリンクが生成されます。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1690 @@ -4521,21 +4505,17 @@ msgstr "$cfg['DefaultConnectionCollation'] 文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1711 -#, fuzzy msgid "Defines the default connection collation to use, if not user-defined." -msgstr "" -"ブラウザもユーザも言語を定義していないときに利用するデフォルトの言語を定義し" -"ます。" +msgstr "ユーザが定義されていないときに使用するデフォルトの接続の照合順序を定義します。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1713 -#, fuzzy msgid "" "See the <a href=\"http://dev.mysql.com/doc/mysql/en/charset-charsets.html" "\">MySQL documentation</a> for list of possible values." msgstr "" -"MySQL マニュアルとそのタイプの詳細については <a href=\"http://dev.mysql.com/" -"doc/\">MySQL ドキュメントのページ</a> をご覧ください。" +"サポートされる値の一覧については <a href=\"http://dev.mysql.com/doc/mysql/ja/charset-" +"charsets.html\">MySQL ドキュメント</a>をご覧ください。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1716 @@ -4545,7 +4525,7 @@ msgstr "$cfg['Lang'] 文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1717 msgid "Force language to use." -msgstr "" +msgstr "強制的に使用する言語。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1722 @@ -5230,7 +5210,7 @@ msgstr "$cfg['SQLQuery']['Edit'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1944 msgid "Whether to display an edit link to change a query in any SQL Query box." -msgstr "" +msgstr "SQL クエリボックスにクエリを変更する編集リンクを表示するかどうか。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1946 @@ -5241,7 +5221,7 @@ msgstr "$cfg['SQLQuery']['Explain'] boolean" #: orig-docs/Documentation.html:1947 msgid "" "Whether to display a link to explain a SELECT query in any SQL Query box." -msgstr "" +msgstr "SQL クエリボックスに SELECT クエリを EXPLAIN するリンクを表示するかどうか。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1949 @@ -5252,7 +5232,7 @@ msgstr "$cfg['SQLQuery']['ShowAsPHP'] boolean" #: orig-docs/Documentation.html:1950 msgid "" "Whether to display a link to wrap a query in PHP code in any SQL Query box." -msgstr "" +msgstr "SQL クエリボックスにクエリを PHP コードで形成するリンクを表示するかどうか。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1952 @@ -5265,6 +5245,8 @@ msgid "" "Whether to display a link to validate a query in any SQL Query box. See " "also <tt><a href=\"#cfg_SQLValidator\">$cfg_SQLValidator</a></tt>." msgstr "" +"SQL クエリボックスにクエリを検証するリンクを表示するかどうか。<tt><a " +"href=\"#cfg_SQLValidator\">$cfg_SQLValidator</a></tt> もご覧になってください。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1956 @@ -5274,7 +5256,7 @@ msgstr "$cfg['SQLQuery']['Refresh'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1957 msgid "Whether to display a link to refresh a query in any SQL Query box." -msgstr "" +msgstr "SQL クエリボックスにクエリを再描画するリンクを表示するかどうか。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1959 @@ -8178,18 +8160,20 @@ msgid "" "<a href=\"#faq1_40\">1.40 When accessing phpMyAdmin via an Apache reverse " "proxy, cookie login does not work.</a>" msgstr "" +"<a href=\"#faq1_40\">1.40 Apache のリバースプロキシを介して phpMyAdmin " +"にアクセスするとき、クッキーログインが動作しません。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3061 msgid "" "To be able to use cookie auth Apache must know that it has to rewrite the " "set-cookie headers." -msgstr "" +msgstr "クッキー認証を使用している場合、set-cookie ヘッダを書き換える必要があることを Apache が認識する必要があります。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3062 msgid "Example from the Apache 2.2 documentation:" -msgstr "" +msgstr "サンプル：Apache 2.2 のドキュメントより。" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:3064 @@ -8200,6 +8184,10 @@ msgid "" "ProxyPassReverseCookieDomain backend.example.com public.example.com \n" "ProxyPassReverseCookiePath / /mirror/foo/ \n" msgstr "" +"ProxyPass /mirror/foo/ http://backend.example.com/\n" +"ProxyPassReverse /mirror/foo/ http://backend.example.com/\n" +"ProxyPassReverseCookieDomain backend.example.com public.example.com \n" +"ProxyPassReverseCookiePath / /mirror/foo/ \n" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3070 @@ -8208,6 +8196,9 @@ msgid "" "(~) must be url encoded as %7E in the ProxyPassReverse* lines. This is not " "specific to phpmyadmin, it's just the behavior of Apache." msgstr "" +"注：バックエンド URL が http://host/~user/phpmyadmin のように見える場合、チルダ (~) は " +"ProxyPassReverse* 行において %7E として URL エンコードする必要があります。これは、Apache " +"の動作上だけで、phpMyAdmin 固有のものではありません。" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:3076 @@ -8218,6 +8209,10 @@ msgid "" "http://backend.example.com/%7Euser/phpmyadmin\n" "ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo\n" msgstr "" +"ProxyPass /mirror/foo/ http://backend.example.com/~user/phpmyadmin\n" +"ProxyPassReverse /mirror/foo/\n" +"http://backend.example.com/%7Euser/phpmyadmin\n" +"ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo\n" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3082 @@ -8225,6 +8220,8 @@ msgid "" "See <a href=\"http://httpd.apache.org/docs/2.2/mod/mod_proxy.html\">http://" "httpd.apache.org/docs/2.2/mod/mod_proxy.html</a> for more details." msgstr "" +"詳細は <a href=\"http://httpd.apache.org/docs/2.2/mod/mod_proxy.html\">http://htt" +"pd.apache.org/docs/2.2/mod/mod_proxy.html</a> を参照してください。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3086 @@ -8817,11 +8814,10 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3312 -#, fuzzy msgid "" "The problem is that older versions of <code>mysqldump</code> created invalid " "comments like this:" -msgstr "この問題は mysqldump が下記のような無効なコメントを作成するためです：" +msgstr "この問題は、古いバージョンの <code>mysqldump</code> が下記のような無効なコメントを作成するためです。" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:3315 @@ -8847,11 +8843,10 @@ msgid "" "dump you have to turn it into valid MySQL. This means, you have to add a " "whitespace after the first two dashes of the line or add a # before it:" msgstr "" -"このコードで無効なのは - を並べた区切り線の部分です。この区切り線は、" -"mysqldump で作成したダンプにはかならず一度登場します。このダンプを利用するに" -"は、ダンプを修正して MySQL で有効な形にする必要があります。つまり、問題の行の" -"先頭 2 つのハイフンのあとに空白を入れるか、問題の行の先頭に # を付け加える必" -"要があるということです：" +"このコードで無効なのは - を並べた区切り線の部分です。この区切り線は、mysqldump " +"で作成したダンプにはかならず一度登場します。このダンプを利用するには、ダンプを修正して MySQL " +"で有効な形にする必要があります。つまり、問題の行の先頭 2 つのハイフンのあとに空白を入れるか、問題の行の先頭に # " +"を付け加える必要があるということです。" #. type: Content of: <html><body><div><p><code> #: orig-docs/Documentation.html:3327 @@ -9930,7 +9925,7 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3783 msgid "Common errors include:" -msgstr "ありがちなエラーの例です：" +msgstr "ありがちなエラーの例です。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3786 @@ -10140,11 +10135,38 @@ msgid "" "INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');\n" "INSERT INTO REL_towns VALUES ('M', 'Montréal');\n" msgstr "" +"CREATE TABLE REL_countries (\n" +" country_code char(1) NOT NULL default '',\n" +" description varchar(10) NOT NULL default '',\n" +" PRIMARY KEY (country_code)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_countries VALUES ('C', 'Canada');\n" +"\n" +"CREATE TABLE REL_persons (\n" +" id tinyint(4) NOT NULL auto_increment,\n" +" person_name varchar(32) NOT NULL default '',\n" +" town_code varchar(5) default '0',\n" +" country_code char(1) NOT NULL default '',\n" +" PRIMARY KEY (id)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_persons VALUES (11, 'Marc', 'S', '');\n" +"INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C');\n" +"\n" +"CREATE TABLE REL_towns (\n" +" town_code varchar(5) NOT NULL default '0',\n" +" description varchar(30) NOT NULL default '',\n" +" PRIMARY KEY (town_code)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');\n" +"INSERT INTO REL_towns VALUES ('M', 'Montréal');\n" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3889 msgid "To setup appropriate links and display information:" -msgstr "適切なリンクと表示情報をセットアップするには：" +msgstr "適切なリンクと表示情報をセットアップするには、" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3891 @@ -10190,7 +10212,7 @@ msgstr "「REL_countries」テーブルについても上記の手順を繰り #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3899 msgid "Then test like this:" -msgstr "それが済んだら、以下のようなテストをします：" +msgstr "それが済んだら、以下のようなテストをします。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3901 @@ -12481,9 +12503,8 @@ msgstr "Ivan A Kirillov" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4793 -#, fuzzy msgid "new relations Designer" -msgstr "内部リレーション" +msgstr "新しいレプリケーションデザイナ" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4796 @@ -12503,7 +12524,7 @@ msgstr "Piotr Przybylski (Google Summer of Code 2008 and 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4803 msgid "improved setup script" -msgstr "" +msgstr "セットアップスクリプトの改良" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4804 @@ -12518,7 +12539,7 @@ msgstr "Derek Schaefer (Google Summer of Code 2009)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4809 msgid "Improved the import system" -msgstr "" +msgstr "インポートシステムの改良" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4812 @@ -12568,7 +12589,7 @@ msgstr "Lori Lee (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4834 msgid "User interface improvements" -msgstr "" +msgstr "ユーザーインターフェイスの改善" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4835 @@ -12578,7 +12599,7 @@ msgstr "ENUM/SET エディタ" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4836 msgid "Simplified interface for export/import" -msgstr "" +msgstr "エクスポート／インポートの簡易インターフェース" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4839 @@ -12810,6 +12831,8 @@ msgid "" "<a href=\"http://www.wikipedia.org/wiki/Blowfish_%28cipher%29\">Blowfish</a> " "- a keyed, symmetric block cipher, designed in 1993 by Bruce Schneier." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/Blowfish\">Blowfish</a> - Bruce " +"Schneier 氏によって 1993 年に設計された対称ブロック暗号およびそのキー" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4947 @@ -12964,7 +12987,7 @@ msgid "" "dynamically manipulating images." msgstr "" "<a id=\"gd\" href=\"http://ja.wikipedia.org/wiki/GD_Graphics_Library\">GD " -"グラフィックライブラリ</a> - Thomas Boutell 他によって開発された動的に画像を操作するためのライブラリ" +"グラフィックライブラリ</a> - Thomas Boutell 氏他によって開発された動的に画像を操作するためのライブラリ" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4989 @@ -13018,6 +13041,8 @@ msgid "" "<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>-connection with " "additional security measures." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/HTTPS\">https</a> - セキュリティ対策を付加した <abbr " +"title=\"HyperText Transfer Protocol\">HTTP</abbr> 接続" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5004 @@ -13108,6 +13133,8 @@ msgid "" "big></sub>X</a> - a document preparation system for the T<sub>E</sub>X " "typesetting program." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/LaTeX\">L<sup>A</sup>T<sub><big>E</big>" +"</sub>X</a> - T<sub>E</sub>X 組版プログラムのためのドキュメント処理システム" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5026 @@ -13138,13 +13165,13 @@ msgstr "" msgid "" "<a href=\"http://www.wikipedia.org/wiki/MCrypt\">MCrypt</a> - a " "cryptographic library." -msgstr "" +msgstr "<a href=\"http://www.wikipedia.org/wiki/MCrypt\">MCrypt</a> - 暗号ライブラリ" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5034 msgid "" "<a href=\"http://php.net/mcrypt\">mcrypt</a> - the MCrypt PHP extension." -msgstr "" +msgstr "<a href=\"http://php.net/mcrypt\">mcrypt</a> - MCrypt の PHP 拡張" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5036 @@ -13206,6 +13233,10 @@ msgid "" "\"Apple Macintosh\">Mac</acronym> <abbr title=\"operating system\">OS</abbr> " "X</a>." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/OS_X\"><abbr " +"title=\"オペレーティング・システム\">OS</abbr> X</a> - → <a " +"href=\"#glossar_mac_os_x\"><acronym title=\"Apple Macintosh\">Mac</acronym> " +"<abbr title=\"オペレーティング・システム\">OS</abbr> X</a>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5051 @@ -13242,6 +13273,9 @@ msgid "" "used mainly for developing server-side applications and dynamic web content, " "and more recently, a broader range of software applications." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/PHP:_Hypertext_Preprocessor\">PHP</a> - " +"「PHP: Hypertext Preprocessor」の略称。オープンソース。主にサーバ側のアプリケーション開発と動的な Web " +"コンテンツのために使用されるリフレクションプログラミング言語。最近では、ソフトウェアアプリケーションの広い範囲で使われている。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5065 @@ -13267,6 +13301,8 @@ msgid "" "<a href=\"http://www.ietf.org/rfc/rfc1952.txt\">RFC 1952</a> - GZIP file " "format specification version 4.3" msgstr "" +"<a href=\"http://www.ietf.org/rfc/rfc1952.txt\">RFC 1952</a> - GZIP " +"ファイル形式の仕様バージョン 4.3" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5073 @@ -13310,6 +13346,8 @@ msgid "" "Sockets Layer)</a> - a cryptographic protocol which provides secure " "communication on the Internet." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/Transport_Layer_Security\">SSL (Secure " +"Sockets Layer)</a> - インターネット上のセキュアな通信を提供する暗号プロトコル" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5085 @@ -13405,8 +13443,8 @@ msgid "" "<a href=\"http://www.wikipedia.org/wiki/Zlib\">zlib</a> - an open-source, " "cross-platform data compression library by Jean-loup Gailly and Mark Adler." msgstr "" -"<a href=\"http://ja.wikipedia.org/wiki/Zlib\">zlib</a> - Jean-loup Gailly および " -"Mark Adlerによるオープンソースでクロスプラットフォームのデータ圧縮ライブラリ" +"<a href=\"http://ja.wikipedia.org/wiki/Zlib\">zlib</a> - Jean-loup Gailly、Mark " +"Adler 両氏によるオープンソースでクロスプラットフォームのデータ圧縮ライブラリ" #. type: Content of: <html><body><ul><li> #: orig-docs/Documentation.html:5118 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-41-gbe9fdfb
by Michal Čihař 25 May '11

25 May '11

The branch, QA_3_4 has been updated via be9fdfbd687698f2da85c88afcbc71944b7c8bba (commit) from e3a73f0e7a16611552058b235ab1e1452e731b08 (commit) - Log ----------------------------------------------------------------- commit be9fdfbd687698f2da85c88afcbc71944b7c8bba Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 25 16:40:07 2011 +0200 Update from master ----------------------------------------------------------------------- Summary of changes: po/bg.po | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/po/bg.po b/po/bg.po index 23eb015..52823b2 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1709,7 +1709,7 @@ msgstr "Грешно име/парола. Достъп отказан." #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "Файлът %s не съдържа идентификатор на ключ" #: libraries/auth/swekey/swekey.auth.lib.php:157 #: libraries/auth/swekey/swekey.auth.lib.php:180 @@ -1980,7 +1980,7 @@ msgstr "" #: libraries/common.lib.php:1334 libraries/common.lib.php:1350 msgid "Profiling" -msgstr "" +msgstr "Профилиране" #: libraries/common.lib.php:1355 libraries/tbl_triggers.lib.php:27 #: server_processlist.php:70 @@ -2103,7 +2103,7 @@ msgstr "Разглеждане на компютъра:" #: libraries/common.lib.php:2979 #, php-format msgid "Select from the web server upload directory <b>%s</b>:" -msgstr "" +msgstr "Избор от директорията за качване <b>%s</b>:" #: libraries/common.lib.php:2991 libraries/sql_query_form.lib.php:501 #: tbl_change.php:962 @@ -2167,21 +2167,21 @@ msgstr "разширени INSERT-и" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "и двете по-горе" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "никое от горните" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:422 msgid "Not a positive number" -msgstr "" +msgstr "Не е положително число" #: libraries/config/FormDisplay.class.php:84 #: libraries/config/validate.lib.php:435 msgid "Not a non-negative number" -msgstr "" +msgstr "Не е неотрицателно число" #: libraries/config/FormDisplay.class.php:85 #: libraries/config/validate.lib.php:409 @@ -2241,7 +2241,7 @@ msgstr "най-много %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" -msgstr "" +msgstr "Тази настройка е изключена, тя няма да влияе на конфигурацията" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 @@ -2256,11 +2256,11 @@ msgstr "Стойност: %s" #: libraries/config/FormDisplay.tpl.php:253 #: libraries/config/messages.inc.php:350 msgid "Restore default value" -msgstr "" +msgstr "Стойност по подразбиране" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Позволение на потребители да променят стойността" #: libraries/config/FormDisplay.tpl.php:333 #: libraries/schema/User_Schema.class.php:470 prefs_manage.php:320 @@ -2270,7 +2270,7 @@ msgstr "Изчистване" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "Подобрява ефективността при презареждане на екрана" #: libraries/config/messages.inc.php:18 msgid "Enable Ajax" @@ -2298,7 +2298,7 @@ msgstr "" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" -msgstr "" +msgstr "Показване връзката "Изтриване БД" на обикновени потребители" #: libraries/config/messages.inc.php:24 msgid "" @@ -2308,11 +2308,11 @@ msgstr "" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "Тайна Blowfish фраза" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "Изпъкване избрани редове" #: libraries/config/messages.inc.php:27 msgid "Row marker" @@ -2320,7 +2320,7 @@ msgstr "Маркер на ред" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "Изпъкване редовете, посочени с мишка" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" @@ -2345,27 +2345,27 @@ msgstr "" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "Редакция на CHAR колони" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Брой колони за CHAR/VARCHAR текстови полета" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea columns" -msgstr "" +msgstr "Колони за CHAR текство поле" #: libraries/config/messages.inc.php:36 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Брой редове за CHAR/VARCHAR текстови полета" #: libraries/config/messages.inc.php:37 msgid "CHAR textarea rows" -msgstr "" +msgstr "Редове за CHAR текство поле" #: libraries/config/messages.inc.php:38 msgid "Check config file permissions" -msgstr "" +msgstr "Проверка на правата върху конфигурационния файл" #: libraries/config/messages.inc.php:39 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2008-g76194fd
by Michal Čihař 25 May '11

25 May '11

The branch, master has been updated via 76194fd122690cbe3947bfa25ae5d40de82d1d35 (commit) via 9e8a9ad3165f356410aa55553b49122e5b8e6a5f (commit) via 002ae91d0bcd2e572c8931f23afc372f613bd64c (commit) via 39941e4701e0ba0de18c298062626bf33c7cc8f2 (commit) via c1014510e02c43a5ccbf23ba1c9967ee24b9e79a (commit) via 894f20440190b3519d89904a6109369d63e457e4 (commit) via 234e4c4cd764e14a49263565c5ab13be82f8ed3d (commit) via d4005c6fba194cd8d569c62c1ed2e9c66c47c90b (commit) via 7e16b4e92bd97b6968f6b98b2a48ff70ac59659b (commit) via 712c19b6d25bdf9b298e402c3c3d77f5f4221eaf (commit) via a935d956632aac4be12a4d42f81300c4739d26a9 (commit) via 3a92508a55ef4dbbf32d4cd33f01155c36f548fa (commit) via 74b9894f337afceaa27532007056d541986d5e89 (commit) via ab951ca26d0d7637473e8d75b9059b601c91dccd (commit) via 8c7e229775e6213139df5bef03e9456a45fdf063 (commit) via 9cce7e4d767e2c0c31525acfa8e42e177170a351 (commit) via 0b303a4d80f7107594e17a7405055a3a46901a46 (commit) via 07fd3f9d8a383936e47f470e174009a137204aa7 (commit) via de01275451995519036ff99a75bb8e7bda59d851 (commit) via a6f8346944b0649e46c3aed7b51059701bf87ee9 (commit) via 76bf1e1a2977dbc7ff7fa5082c1c2cca977701d2 (commit) via 9f4222b4893e8ac570410dab0e55f786fcfa1e72 (commit) via 68595c1b3c9ce35f50c1b5622ccdea2572b20f44 (commit) via b6616cc93d14f2e9bd8d091e6facfa0257aafa48 (commit) via 86d23d1050ab4e4cb4b5ef22c4af0ffae98df53f (commit) from 05d20b31daf3e6d3d3f205cc5267c288ddd3dec9 (commit) - Log ----------------------------------------------------------------- commit 76194fd122690cbe3947bfa25ae5d40de82d1d35 Merge: 05d20b31daf3e6d3d3f205cc5267c288ddd3dec9 9e8a9ad3165f356410aa55553b49122e5b8e6a5f Author: Michal Čihař <mcihar(a)novell.com> Date: Wed May 25 16:39:31 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 9e8a9ad3165f356410aa55553b49122e5b8e6a5f Merge: 002ae91d0bcd2e572c8931f23afc372f613bd64c 6c938c0f7339b7c7263e0b0e7e055254827b0b1b Author: Pootle server <pootle(a)cihar.com> Date: Wed May 25 14:40:05 2011 +0200 Merge remote-tracking branch 'origin/master' commit 002ae91d0bcd2e572c8931f23afc372f613bd64c Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:05:12 2011 +0200 Translation update done using Pootle. commit 39941e4701e0ba0de18c298062626bf33c7cc8f2 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:04:57 2011 +0200 Translation update done using Pootle. commit c1014510e02c43a5ccbf23ba1c9967ee24b9e79a Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:04:51 2011 +0200 Translation update done using Pootle. commit 894f20440190b3519d89904a6109369d63e457e4 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:04:43 2011 +0200 Translation update done using Pootle. commit 234e4c4cd764e14a49263565c5ab13be82f8ed3d Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:04:36 2011 +0200 Translation update done using Pootle. commit d4005c6fba194cd8d569c62c1ed2e9c66c47c90b Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:04:20 2011 +0200 Translation update done using Pootle. commit 7e16b4e92bd97b6968f6b98b2a48ff70ac59659b Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:04:13 2011 +0200 Translation update done using Pootle. commit 712c19b6d25bdf9b298e402c3c3d77f5f4221eaf Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:04:09 2011 +0200 Translation update done using Pootle. commit a935d956632aac4be12a4d42f81300c4739d26a9 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:04:02 2011 +0200 Translation update done using Pootle. commit 3a92508a55ef4dbbf32d4cd33f01155c36f548fa Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:03:40 2011 +0200 Translation update done using Pootle. commit 74b9894f337afceaa27532007056d541986d5e89 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:03:21 2011 +0200 Translation update done using Pootle. commit ab951ca26d0d7637473e8d75b9059b601c91dccd Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:03:14 2011 +0200 Translation update done using Pootle. commit 8c7e229775e6213139df5bef03e9456a45fdf063 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:03:09 2011 +0200 Translation update done using Pootle. commit 9cce7e4d767e2c0c31525acfa8e42e177170a351 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:02:48 2011 +0200 Translation update done using Pootle. commit 0b303a4d80f7107594e17a7405055a3a46901a46 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:02:42 2011 +0200 Translation update done using Pootle. commit 07fd3f9d8a383936e47f470e174009a137204aa7 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:02:37 2011 +0200 Translation update done using Pootle. commit de01275451995519036ff99a75bb8e7bda59d851 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:02:30 2011 +0200 Translation update done using Pootle. commit a6f8346944b0649e46c3aed7b51059701bf87ee9 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:02:23 2011 +0200 Translation update done using Pootle. commit 76bf1e1a2977dbc7ff7fa5082c1c2cca977701d2 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:02:09 2011 +0200 Translation update done using Pootle. commit 9f4222b4893e8ac570410dab0e55f786fcfa1e72 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:02:02 2011 +0200 Translation update done using Pootle. commit 68595c1b3c9ce35f50c1b5622ccdea2572b20f44 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:01:54 2011 +0200 Translation update done using Pootle. commit b6616cc93d14f2e9bd8d091e6facfa0257aafa48 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:01:37 2011 +0200 Translation update done using Pootle. commit 86d23d1050ab4e4cb4b5ef22c4af0ffae98df53f Author: stoyanster <stoyanster(a)gmail.com> Date: Wed May 25 12:01:29 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/bg.po | 49 ++++++++++++++++++++++++------------------------- 1 files changed, 24 insertions(+), 25 deletions(-) diff --git a/po/bg.po b/po/bg.po index e34bdfb..bb5f003 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-19 08:30+0200\n" +"PO-Revision-Date: 2011-05-25 12:05+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1763,7 +1763,7 @@ msgstr "Грешно име/парола. Достъп отказан." #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "Файлът %s не съдържа идентификатор на ключ" #: libraries/auth/swekey/swekey.auth.lib.php:157 #: libraries/auth/swekey/swekey.auth.lib.php:180 @@ -2034,7 +2034,7 @@ msgstr "" #: libraries/common.lib.php:1334 libraries/common.lib.php:1350 msgid "Profiling" -msgstr "" +msgstr "Профилиране" #: libraries/common.lib.php:1355 libraries/tbl_triggers.lib.php:27 #: server_processlist.php:70 @@ -2157,7 +2157,7 @@ msgstr "Разглеждане на компютъра:" #: libraries/common.lib.php:2979 #, php-format msgid "Select from the web server upload directory <b>%s</b>:" -msgstr "" +msgstr "Избор от директорията за качване <b>%s</b>:" #: libraries/common.lib.php:2991 libraries/sql_query_form.lib.php:501 #: tbl_change.php:962 @@ -2221,21 +2221,21 @@ msgstr "разширени INSERT-и" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "и двете по-горе" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "никое от горните" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:422 msgid "Not a positive number" -msgstr "" +msgstr "Не е положително число" #: libraries/config/FormDisplay.class.php:84 #: libraries/config/validate.lib.php:435 msgid "Not a non-negative number" -msgstr "" +msgstr "Не е неотрицателно число" #: libraries/config/FormDisplay.class.php:85 #: libraries/config/validate.lib.php:409 @@ -2295,7 +2295,7 @@ msgstr "най-много %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" -msgstr "" +msgstr "Тази настройка е изключена, тя няма да влияе на конфигурацията" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 @@ -2310,11 +2310,11 @@ msgstr "Стойност: %s" #: libraries/config/FormDisplay.tpl.php:253 #: libraries/config/messages.inc.php:350 msgid "Restore default value" -msgstr "" +msgstr "Стойност по подразбиране" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Позволение на потребители да променят стойността" #: libraries/config/FormDisplay.tpl.php:333 #: libraries/schema/User_Schema.class.php:470 prefs_manage.php:320 @@ -2324,7 +2324,7 @@ msgstr "Изчистване" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "Подобрява ефективността при презареждане на екрана" #: libraries/config/messages.inc.php:18 msgid "Enable Ajax" @@ -2352,7 +2352,7 @@ msgstr "" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" -msgstr "" +msgstr "Показване връзката "Изтриване БД" на обикновени потребители" #: libraries/config/messages.inc.php:24 msgid "" @@ -2362,11 +2362,11 @@ msgstr "" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "Тайна Blowfish фраза" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "Изпъкване избрани редове" #: libraries/config/messages.inc.php:27 msgid "Row marker" @@ -2374,7 +2374,7 @@ msgstr "Маркер на ред" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "Изпъкване редовете, посочени с мишка" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" @@ -2399,27 +2399,27 @@ msgstr "" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "Редакция на CHAR колони" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Брой колони за CHAR/VARCHAR текстови полета" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea columns" -msgstr "" +msgstr "Колони за CHAR текство поле" #: libraries/config/messages.inc.php:36 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Брой редове за CHAR/VARCHAR текстови полета" #: libraries/config/messages.inc.php:37 msgid "CHAR textarea rows" -msgstr "" +msgstr "Редове за CHAR текство поле" #: libraries/config/messages.inc.php:38 msgid "Check config file permissions" -msgstr "" +msgstr "Проверка на правата върху конфигурационния файл" #: libraries/config/messages.inc.php:39 msgid "" @@ -4381,10 +4381,9 @@ msgstr "MySQL 4.0 съвместимо" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" -msgstr "Създаване нова БД" +msgstr "Създаване БД" #: libraries/display_create_database.lib.php:33 msgid "Create" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1983-g05d20b3
by Marc Delisle 25 May '11

25 May '11

The branch, master has been updated via 05d20b31daf3e6d3d3f205cc5267c288ddd3dec9 (commit) from 6c938c0f7339b7c7263e0b0e7e055254827b0b1b (commit) - Log ----------------------------------------------------------------- commit 05d20b31daf3e6d3d3f205cc5267c288ddd3dec9 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Wed May 25 20:01:16 2011 +0700 Recent tables: Additional fix for frame_navigation.PMA_reloadRecentTable() not found ----------------------------------------------------------------------- Summary of changes: js/functions.js | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/js/functions.js b/js/functions.js index 0380a3d..c9f6112 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2288,7 +2288,9 @@ $(document).ready(function() { }); $('#update_recent_tables').ready(function() { - if (window.parent.frame_navigation != undefined) { + if (window.parent.frame_navigation != undefined + && window.parent.frame_navigation.PMA_reloadRecentTable != undefined) + { window.parent.frame_navigation.PMA_reloadRecentTable(); } }); hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git