- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-268-g8d862a8
by Marc Delisle 01 May '11

01 May '11

The branch, master has been updated via 8d862a8cb5c9b8dc37ae1aea10205eec35e68ae8 (commit) from 626477ac8f1db0129f009f2e3076d71f053f81a0 (commit) - Log ----------------------------------------------------------------- commit 8d862a8cb5c9b8dc37ae1aea10205eec35e68ae8 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun May 1 06:50:37 2011 -0400 Bug #3294818 Fatal error in server_privileges.php (bot access) ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 308739c..a9ebcd9 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1451,7 +1451,9 @@ if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && (!isset($_REQU $extra_data['new_privileges'] = $new_privileges; } - PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + if ($message instanceof PMA_Message) { + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + } } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-267-g626477a
by Madhura Jayaratne 01 May '11

01 May '11

The branch, master has been updated via 626477ac8f1db0129f009f2e3076d71f053f81a0 (commit) from eec80b2a1fd7ef5283b2e8ed4665d02d007b4414 (commit) - Log ----------------------------------------------------------------- commit 626477ac8f1db0129f009f2e3076d71f053f81a0 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 1 11:31:55 2011 +0530 Bug #3295529 - SQL tab multiple AJAX requests on one click ----------------------------------------------------------------------- Summary of changes: js/sql.js | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/js/sql.js b/js/sql.js index 77717a7..bd068cf 100644 --- a/js/sql.js +++ b/js/sql.js @@ -274,6 +274,8 @@ $(document).ready(function() { $('#sqlqueryresults').show(); // this happens if a USE command was typed if (typeof data.reload != 'undefined') { + // Unbind the submit event before reloading. See bug #3295529 + $("#sqlqueryform.ajax").die('submit'); $form.find('input[name=db]').val(data.db); // need to regenerate the whole upper part $form.find('input[name=ajax_request]').remove(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-266-geec80b2
by Marc Delisle 30 Apr '11

30 Apr '11

The branch, master has been updated via eec80b2a1fd7ef5283b2e8ed4665d02d007b4414 (commit) from fcaedaf75bf6560d2c899aafa912320c52ff4505 (commit) - Log ----------------------------------------------------------------- commit eec80b2a1fd7ef5283b2e8ed4665d02d007b4414 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Apr 30 14:56:02 2011 -0400 Bug #3291923, Insert Ajax form does not generate default values - partial fix for text fields ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 2 +- tbl_change.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 896700b..8fc7eca 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -387,7 +387,7 @@ $(document).ready(function() { if ($this_element.is('.textfield')) { // do not remove the 'value' attribute for ENUM columns if ($this_element.closest('tr').find('span.column_type').html() != 'enum') { - $this_element.attr('value', ''); + $this_element.attr('value', $this_element.closest('tr').find('span.default_value').html()); } $this_element .unbind('change') diff --git a/tbl_change.php b/tbl_change.php index 1b6a2b6..22584db 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -694,6 +694,9 @@ foreach ($rows as $row_id => $vrow) { // HTML attribute echo ' <td>' . "\n"; + // Will be used by js/tbl_change.js to set the default value + // for the "Continue insertion" feature + echo '' . $special_chars . ''; if ($foreignData['foreign_link'] == true) { echo $backup_field . "\n"; ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-265-gfcaedaf
by Marc Delisle 30 Apr '11

30 Apr '11

The branch, master has been updated via fcaedaf75bf6560d2c899aafa912320c52ff4505 (commit) from 70100c8044d719300a87ee76807bf4c19d8517f5 (commit) - Log ----------------------------------------------------------------- commit fcaedaf75bf6560d2c899aafa912320c52ff4505 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Apr 30 11:05:47 2011 -0400 Invalid value class did not work on input fields for pmahomme ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 4d18832..25692d2 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1673,8 +1673,10 @@ table#serverconnection_trg_local { /** * Validation error message styles */ -.invalid_value -{background:#F00;} +input[type=text].invalid_value, +.invalid_value { + background:#F00; +} /** * Ajax notification styling hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-264-g70100c8
by Marc Delisle 30 Apr '11

30 Apr '11

The branch, master has been updated via 70100c8044d719300a87ee76807bf4c19d8517f5 (commit) from b27672866683d4a1b3f0d82278804165b0d63466 (commit) - Log ----------------------------------------------------------------- commit 70100c8044d719300a87ee76807bf4c19d8517f5 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Apr 30 10:57:30 2011 -0400 Remove invalid_value class before validation ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index a6d4be9..896700b 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -215,6 +215,7 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType){ } //validate for integer type if(theType.substring(0,3) == "int"){ + $this_input.removeClass("invalid_value"); if(isNaN($this_input.val())){ $this_input.addClass("invalid_value"); return false; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-263-gb276728
by Marc Delisle 30 Apr '11

30 Apr '11

The branch, master has been updated via b27672866683d4a1b3f0d82278804165b0d63466 (commit) from 55693163892d4cbae2a7b8abb4c8445e0fb7b6b1 (commit) - Log ----------------------------------------------------------------- commit b27672866683d4a1b3f0d82278804165b0d63466 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Apr 30 10:54:03 2011 -0400 Undefined variable ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 2d33884..a6d4be9 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -165,7 +165,7 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType){ // Unchecks the Ignore checkbox for the current row $("input[name='insert_ignore_" + multi_edit + "']").attr({'checked': false}); - $this_input = $("input[name='fields[multi_edit][" + multi_edit + "][" + urlField + "]']"); + var $this_input = $("input[name='fields[multi_edit][" + multi_edit + "][" + urlField + "]']"); // Does this field come from datepicker? if ($this_input.data('comes_from') == 'datepicker') { @@ -214,11 +214,10 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType){ } } //validate for integer type - if(theType.substring(0,3)=="int"){ - - if(isNaN(dt.value)){ - dt.className="invalid_value"; - return false; + if(theType.substring(0,3) == "int"){ + if(isNaN($this_input.val())){ + $this_input.addClass("invalid_value"); + return false; } } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-262-g5569316
by Herman van Rink 29 Apr '11

29 Apr '11

The branch, master has been updated via 55693163892d4cbae2a7b8abb4c8445e0fb7b6b1 (commit) from 4cb7e7fd9197716a0a15ccab5f2fb6f5ab0611d0 (commit) - Log ----------------------------------------------------------------- commit 55693163892d4cbae2a7b8abb4c8445e0fb7b6b1 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Apr 29 22:06:48 2011 +0200 bug #3285929 [privileges] Don't fail silently on missing priviledge to execute REVOKE ALL PRIVILEGES ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3261e05..5a15934 100644 --- a/ChangeLog +++ b/ChangeLog @@ -154,6 +154,7 @@ - bug #3134495 [synchronization] Data containing single quotes prevents sync, thanks to jviewer - Remove the custom color picker feature +- bug #3285929 [privileges] Don't fail silently on missing priviledge to execute REVOKE ALL PRIVILEGES 3.3.11.0 (not yet released) diff --git a/server_privileges.php b/server_privileges.php index 09104e1..308739c 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1187,8 +1187,9 @@ if (!empty($update_privs)) { } $sql_query2 .= ';'; } - if (! PMA_DBI_try_query($sql_query0)) { - // this query may fail, but this does not matter :o) + if (! PMA_DBI_query($sql_query0)) { + // This might fail when the executing user does not have ALL PRIVILEGES himself. + // See https://sourceforge.net/tracker/index.php?func=detail&aid=3285929&group_id=… $sql_query0 = ''; } if (isset($sql_query1) && !PMA_DBI_try_query($sql_query1)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-261-g4cb7e7f
by Michal Čihař 29 Apr '11

29 Apr '11

The branch, master has been updated via 4cb7e7fd9197716a0a15ccab5f2fb6f5ab0611d0 (commit) from 5f98fcf412c8e0eb7265d37158c698ed8e81876b (commit) - Log ----------------------------------------------------------------- commit 4cb7e7fd9197716a0a15ccab5f2fb6f5ab0611d0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 11:14:15 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 54dd023..5b8d8f3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:27+0200\n" -"PO-Revision-Date: 2011-04-29 11:05+0200\n" +"PO-Revision-Date: 2011-04-29 11:14+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -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 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-260-g5f98fcf
by Michal Čihař 29 Apr '11

29 Apr '11

The branch, master has been updated via 5f98fcf412c8e0eb7265d37158c698ed8e81876b (commit) via 484f7e17ef177284b82cab2560e69b4357094db1 (commit) via 31babfd63690d8aea049e72a12f3e66ab5d5ccd4 (commit) via b6d170bf839e8f0778bf3ad37c7a5d6cc299c56e (commit) via 7e43bb648af445278a93eb0d73eea176c5fa04f8 (commit) via 49e2ef19a454a494bcf4eabb7040bc26b6aca212 (commit) via 38df6071b56da75ce9d7e6650adfe9318fabef4a (commit) via 7f4e5c5089266fdaea7c03953f2a3fdfa431aff7 (commit) via 29fb6a9c3a76f6eb0b0ff46326a580a5801c67e3 (commit) via 27be2ea5dab76d6cecca4731b58e2820a1e9d2f6 (commit) via cd8c47862e8880f9cfa5e4308437ac7ba942391e (commit) via a2ae26a13623db3f0964d97ee829f5b4aade2977 (commit) via 926a76da0c96c20cdf9c9a19362f48e718d4a6db (commit) from c44b2faaf42f0281b3fde0a813cc4c37ea945192 (commit) - Log ----------------------------------------------------------------- commit 5f98fcf412c8e0eb7265d37158c698ed8e81876b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 11:05:37 2011 +0200 Translation update done using Pootle. commit 484f7e17ef177284b82cab2560e69b4357094db1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 11:04:55 2011 +0200 Translation update done using Pootle. commit 31babfd63690d8aea049e72a12f3e66ab5d5ccd4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 11:02:50 2011 +0200 Translation update done using Pootle. commit b6d170bf839e8f0778bf3ad37c7a5d6cc299c56e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 11:02:07 2011 +0200 Translation update done using Pootle. commit 7e43bb648af445278a93eb0d73eea176c5fa04f8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 11:01:32 2011 +0200 Translation update done using Pootle. commit 49e2ef19a454a494bcf4eabb7040bc26b6aca212 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 11:01:19 2011 +0200 Translation update done using Pootle. commit 38df6071b56da75ce9d7e6650adfe9318fabef4a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:58:32 2011 +0200 Translation update done using Pootle. commit 7f4e5c5089266fdaea7c03953f2a3fdfa431aff7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:57:44 2011 +0200 Translation update done using Pootle. commit 29fb6a9c3a76f6eb0b0ff46326a580a5801c67e3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:56:55 2011 +0200 Translation update done using Pootle. commit 27be2ea5dab76d6cecca4731b58e2820a1e9d2f6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:56:16 2011 +0200 Translation update done using Pootle. commit cd8c47862e8880f9cfa5e4308437ac7ba942391e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:53:12 2011 +0200 Translation update done using Pootle. commit a2ae26a13623db3f0964d97ee829f5b4aade2977 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:52:33 2011 +0200 Translation update done using Pootle. commit 926a76da0c96c20cdf9c9a19362f48e718d4a6db Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:42:02 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/po/ja.po b/po/ja.po index 765a842..54dd023 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:27+0200\n" -"PO-Revision-Date: 2011-04-29 10:36+0200\n" +"PO-Revision-Date: 2011-04-29 11:05+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1682,7 +1682,7 @@ msgstr "クッキーを有効にしてください" #: libraries/auth/signon.auth.lib.php:206 msgid "" "Login without a password is forbidden by configuration (see AllowNoPassword)" -msgstr "" +msgstr "パスワードなしログインは設定 (AllowNoPassword) によって禁止されています。" #: libraries/auth/cookie.auth.lib.php:647 #: libraries/auth/signon.auth.lib.php:210 @@ -2174,29 +2174,29 @@ 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 msgid "Not a valid port number" -msgstr "" +msgstr "有効なポート番号ではありません" #: libraries/config/FormDisplay.class.php:86 #: libraries/config/FormDisplay.class.php:574 #: libraries/config/validate.lib.php:360 libraries/config/validate.lib.php:450 msgid "Incorrect value" -msgstr "" +msgstr "不正な値です" #: libraries/config/FormDisplay.class.php:87 #: libraries/config/validate.lib.php:464 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "値は %s 以下でなければいけません" #: libraries/config/FormDisplay.class.php:538 #, php-format @@ -7131,11 +7131,11 @@ msgstr "ファイルから読み込む" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "ブラウザに保存されている設定を読み込む" +msgstr "ブラウザ (Web Storage) から設定を読み込む" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "設定をブラウザから読み込みます。ローカルの保存場所ですがクッキーではありません。" +msgstr "設定をブラウザ (Web Storage) から読み込みます。ローカルの保存場所ですがクッキーではありません。" #: prefs_manage.php:254 msgid "You have no saved settings!" @@ -7143,7 +7143,7 @@ msgstr "保存されている設定はありません！" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" -msgstr "" +msgstr "この機能はブラウザよってサポートされていません。" #: prefs_manage.php:263 msgid "Merge with current configuration" @@ -7158,11 +7158,11 @@ msgstr "%sセットアップスクリプト%sを使用するなどして config. #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "ブラウザに保存する（クッキーでない別の保存場所）" +msgstr "ブラウザ (Web Storage) に保存する" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." -msgstr "設定がブラウザに保存されます。ローカルの保存場所ですがクッキーではありません。" +msgstr "設定がブラウザ (Web Storage) に保存されます。ローカルの保存場所ですがクッキーではありません。" #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-247-gc44b2fa
by Michal Čihař 29 Apr '11

29 Apr '11

The branch, master has been updated via c44b2faaf42f0281b3fde0a813cc4c37ea945192 (commit) via 06698e02ec4e245d3929f97370bb3cb8cbf4a3c2 (commit) via bea96cd9161e6d6c9e1976be0dc3b3af76add913 (commit) via 48bd6c7de652bab5c9af4a5a100e0ecbbaa5aea7 (commit) via 5d69b9d735cd1e0a1689b7e799bcd6c5b19f3386 (commit) via 4226ff41c03411fe2eb174b65ca1c0620274879f (commit) via ef529718fd6bece8cc97c3ed6c4005596def9d9e (commit) via 3f7f261eeedd104c5d61b4992f4f9418f07e8cbf (commit) via bfc9911e0b20f174755d013d6e7eb6e1efc2c579 (commit) via bc4029b84fea3da7bbf888b5bc20a8bbb21b4bbb (commit) via 20891da8e51b51c85339fc698e7e695e766112a4 (commit) via 7de94e3099188ca9482222e0fde34e6da7c88e61 (commit) via da014f5bd84164ffeb05b6d318dfdb008764e299 (commit) via 676124662ddf668bc8b2c6be5511021e90055500 (commit) via f024404e0b9d0b47633e949d76638963d417f84f (commit) via 2c6728cb6bd2de730c0aa87a7e1335a19d32d3a9 (commit) via 825f45111213fd5286c3c9643f145a2dc3aad4a2 (commit) via 80210b4228268544c1cc85c869571cd16e84a877 (commit) via da81027f012bee3e220d7725259956a008926764 (commit) via bb6095d1155b92b521f7744d81b48f141bb8f3a7 (commit) via 2e0c391c245dc1a81b0fcd84ae3d0a55308a77f3 (commit) from 79934bb075aada44a1c976db479be613a6240803 (commit) - Log ----------------------------------------------------------------- commit c44b2faaf42f0281b3fde0a813cc4c37ea945192 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:36:30 2011 +0200 Translation update done using Pootle. commit 06698e02ec4e245d3929f97370bb3cb8cbf4a3c2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:34:34 2011 +0200 Translation update done using Pootle. commit bea96cd9161e6d6c9e1976be0dc3b3af76add913 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:34:18 2011 +0200 Translation update done using Pootle. commit 48bd6c7de652bab5c9af4a5a100e0ecbbaa5aea7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:33:50 2011 +0200 Translation update done using Pootle. commit 5d69b9d735cd1e0a1689b7e799bcd6c5b19f3386 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:33:40 2011 +0200 Translation update done using Pootle. commit 4226ff41c03411fe2eb174b65ca1c0620274879f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:32:44 2011 +0200 Translation update done using Pootle. commit ef529718fd6bece8cc97c3ed6c4005596def9d9e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:32:29 2011 +0200 Translation update done using Pootle. commit 3f7f261eeedd104c5d61b4992f4f9418f07e8cbf Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:32:08 2011 +0200 Translation update done using Pootle. commit bfc9911e0b20f174755d013d6e7eb6e1efc2c579 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:31:48 2011 +0200 Translation update done using Pootle. commit bc4029b84fea3da7bbf888b5bc20a8bbb21b4bbb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:31:07 2011 +0200 Translation update done using Pootle. commit 20891da8e51b51c85339fc698e7e695e766112a4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:29:16 2011 +0200 Translation update done using Pootle. commit 7de94e3099188ca9482222e0fde34e6da7c88e61 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:28:36 2011 +0200 Translation update done using Pootle. commit da014f5bd84164ffeb05b6d318dfdb008764e299 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:27:13 2011 +0200 Translation update done using Pootle. commit 676124662ddf668bc8b2c6be5511021e90055500 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:26:21 2011 +0200 Translation update done using Pootle. commit f024404e0b9d0b47633e949d76638963d417f84f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:26:08 2011 +0200 Translation update done using Pootle. commit 2c6728cb6bd2de730c0aa87a7e1335a19d32d3a9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:25:10 2011 +0200 Translation update done using Pootle. commit 825f45111213fd5286c3c9643f145a2dc3aad4a2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:24:47 2011 +0200 Translation update done using Pootle. commit 80210b4228268544c1cc85c869571cd16e84a877 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:24:19 2011 +0200 Translation update done using Pootle. commit da81027f012bee3e220d7725259956a008926764 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:23:53 2011 +0200 Translation update done using Pootle. commit bb6095d1155b92b521f7744d81b48f141bb8f3a7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:23:25 2011 +0200 Translation update done using Pootle. commit 2e0c391c245dc1a81b0fcd84ae3d0a55308a77f3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Apr 29 10:22:52 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 52 ++++++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/po/ja.po b/po/ja.po index 22a8896..765a842 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-rc2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-04-21 14:27+0200\n" -"PO-Revision-Date: 2011-04-28 12:14+0200\n" +"PO-Revision-Date: 2011-04-29 10:36+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -660,7 +660,7 @@ msgstr "すべてのチェックを外す" #: db_structure.php:495 msgid "Check tables having overhead" -msgstr "オーバーヘッドのあるテーブルを確認してください" +msgstr "オーバーヘッドのあるテーブルを確認する" #: db_structure.php:503 libraries/config/messages.inc.php:161 #: libraries/db_links.inc.php:56 libraries/display_tbl.lib.php:2153 @@ -3090,7 +3090,7 @@ msgstr "空の行はインポートしない" #: libraries/config/messages.inc.php:253 msgid "Import currencies ($5.00 to 5.00)" -msgstr "金額は単位を取り除く（例えば $5.00 を 5.00）" +msgstr "金額は単位を取り除く（例えば、$5.00 を 5.00）" #: libraries/config/messages.inc.php:254 msgid "Import percentages as proper decimals (12.00% to .12)" @@ -3107,7 +3107,7 @@ msgstr "部分インポート（クエリのスキップ）" #: libraries/config/messages.inc.php:258 msgid "Do not use AUTO_INCREMENT for zero values" -msgstr "値がゼロのものに対してAUTO_INCREMENTを使用しない" +msgstr "値がゼロのものに対して AUTO_INCREMENT を使用しない" #: libraries/config/messages.inc.php:261 msgid "Initial state for sliders" @@ -3291,7 +3291,7 @@ msgstr "SQL クエリが表示されているときに使用される文字の #: libraries/config/messages.inc.php:301 msgid "Maximum displayed SQL length" -msgstr "表示できるSQL文の最大の長さ" +msgstr "表示できる SQL 文の最大の長さ" #: libraries/config/messages.inc.php:302 libraries/config/messages.inc.php:307 #: libraries/config/messages.inc.php:335 @@ -5497,8 +5497,8 @@ msgid "" "Dump TIMESTAMP columns in UTC (enables TIMESTAMP columns to be dumped and " "reloaded between servers in different time zones)" msgstr "" -"TIMESTAMP " -"のカラムをUTC（協定世界時）でダンプする(ダンプするサーバと読み込ませるサーバのタイムゾーンが異なる場合に有効です。)" +"TIMESTAMP のカラムを " +"UTC（協定世界時）でダンプする(ダンプするサーバと読み込ませるサーバのタイムゾーンが異なる場合に有効です。)" #: libraries/export/sql.php:209 libraries/export/xml.php:34 msgid "Procedures" @@ -5672,7 +5672,7 @@ msgstr "パーセントは適切な小数に変換する（例えば、12.00% #: libraries/import/ods.php:29 msgid "Import currencies (ex. $5.00 to 5.00)" -msgstr "金額は単位を取り除く（例えば $5.00 を 5.00）" +msgstr "金額は単位を取り除く（例えば、$5.00 を 5.00）" #: libraries/import/sql.php:32 msgid "SQL compatibility mode:" @@ -5680,7 +5680,7 @@ msgstr "SQL互換モード:" #: libraries/import/sql.php:42 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values" -msgstr "値がゼロのものに対して<code>AUTO_INCREMENT</code>を使用しない" +msgstr "値がゼロのものに対して <code>AUTO_INCREMENT</code> を使用しない" #: libraries/import/xml.php:74 libraries/import/xml.php:130 msgid "" @@ -6296,7 +6296,7 @@ msgstr "リモートサーバ" #: libraries/server_synchronize.lib.php:1344 msgid "Difference" -msgstr "" +msgstr "差分" #: libraries/server_synchronize.lib.php:1360 server_synchronize.php:1117 msgid "Target database" @@ -8679,11 +8679,11 @@ msgstr "レプリケーションステータス" #: server_synchronize.php:92 msgid "Could not connect to the source" -msgstr "" +msgstr "元のデータベースに接続できませんでした。" #: server_synchronize.php:95 msgid "Could not connect to the target" -msgstr "" +msgstr "対象先のデータベースに接続できませんでした。" #: server_synchronize.php:120 server_synchronize.php:123 tbl_create.php:76 #: tbl_get_field.php:19 @@ -8705,11 +8705,11 @@ msgstr "" #: server_synchronize.php:423 server_synchronize.php:866 msgid "Structure Difference" -msgstr "" +msgstr "構造の差分" #: server_synchronize.php:424 server_synchronize.php:867 msgid "Data Difference" -msgstr "" +msgstr "データの差分" #: server_synchronize.php:429 server_synchronize.php:872 msgid "Add column(s)" @@ -8753,19 +8753,19 @@ msgstr "データベースの同期" #: server_synchronize.php:463 msgid "Selected target tables have been synchronized with source tables." -msgstr "" +msgstr "選択された対象先のテーブルは、元のテーブルと同期されています。" #: server_synchronize.php:941 msgid "Target database has been synchronized with source database" -msgstr "" +msgstr "対象先のデータベースが、元のデータベースと同期されています。" #: server_synchronize.php:1002 msgid "The following queries have been executed:" -msgstr "" +msgstr "次のクエリが実行されます：" #: server_synchronize.php:1130 msgid "Enter manually" -msgstr "" +msgstr "手動で入力する" #: server_synchronize.php:1138 #| msgid "max. concurrent connections" @@ -8816,10 +8816,9 @@ msgid "" "level directory as described in [a(a)Documentation.html#setup_script]" "documentation[/a]. Otherwise you will be only able to download or display it." msgstr "" -"[a@../Documentation.html#setup_script]ドキュメント[/a]で説明されるように" -"phpMyAdminのトップレベルディレクトリにウェブサーバで書き込める[em]config[/em]" -"フォルダを作成してください。そうしない場合は、ダウンロードするか表示するかの" -"みになります。" +"[a@../Documentation.html#setup_script]ドキュメント[/a]で説明されるように phpMyAdmin " +"のトップレベルディレクトリにウェブサーバで書き込める [em]config[/em] " +"フォルダを作成してください。そうしない場合は、ダウンロードするか表示するかのみになります。" #: setup/frames/index.inc.php:57 msgid "" @@ -8864,7 +8863,7 @@ msgstr "デフォルト言語" #: setup/frames/index.inc.php:183 msgid "let the user choose" -msgstr "" +msgstr "ユーザに選択させる" #: setup/frames/index.inc.php:194 msgid "- none -" @@ -8967,6 +8966,8 @@ msgid "" "so a key was automatically generated for you. It is used to encrypt cookies; " "you don't need to remember it." msgstr "" +"blowfish 暗号のパスフレーズなしで cookie 認証が有効にされましたので、パスフレーズを自動的に生成しました。パスフレーズはクッキーを暗号化" +"するために使用されますが、管理者がそれを覚えておく必要はありません。" #: setup/lib/index.lib.php:253 #, php-format @@ -9028,6 +9029,9 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" +"これが必要であると思われる場合、追加の保護設定（%sホスト認証%s設定および%s信頼されたプロキシのリスト%" +"s）を使用してください。しかしながら、ユーザー数千人もいるような ISP に所属している、使用している、接続されている場合には、IP " +"アドレスを基にした保護は信頼性が高いとはいえません。" #: setup/lib/index.lib.php:268 #, php-format @@ -9063,7 +9067,7 @@ msgstr "パフォーマンス上の理由から mysqli の使用する必要が #: setup/lib/index.lib.php:331 msgid "You allow for connecting to the server without a password." -msgstr "" +msgstr "パスワードなしでサーバへの接続が許されています。" #: setup/lib/index.lib.php:351 msgid "Key is too short, it should have at least 8 characters." hooks/post-receive -- phpMyAdmin

1 0