From ea985e424cf3c91710a455791f2f34359b0b73bd Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 11:56:13 +0200 Subject: [PATCH 001/107] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 4918c1c0e9..8f3a9c90c8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-08 12:19+0200\n" +"PO-Revision-Date: 2011-06-15 11:56+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9717,7 +9717,7 @@ msgstr "(1 回)" #: tbl_operations.php:293 msgid "Move table to (database.table):" -msgstr "テーブルの移動先(database.table):" +msgstr "テーブルを (データベース).(テーブル) へ移動する:" #: tbl_operations.php:351 msgid "Table options" From b3c53f4bed61d55988802c2a2eef6161ab23bcf8 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 11:56:36 +0200 Subject: [PATCH 002/107] Translation update done using Pootle. --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 8f3a9c90c8..33bb12409b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5036,7 +5036,7 @@ msgstr "グラフで表示する" #: libraries/display_tbl.lib.php:2396 msgid "Create view" -msgstr "ビューを作成" +msgstr "ビューを作成する" #: libraries/display_tbl.lib.php:2511 msgid "Link not found" From 6089141ee73a498ac4b27e527c370b4fef0a2cc2 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 11:57:11 +0200 Subject: [PATCH 003/107] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 33bb12409b..bc6cececbe 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 11:56+0200\n" +"PO-Revision-Date: 2011-06-15 11:57+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -4925,7 +4925,7 @@ msgstr "水平" #: libraries/display_tbl.lib.php:398 msgid "horizontal (rotated headers)" -msgstr "水平 (ヘッダも回転)" +msgstr "水平 (縦ヘッダ)" #: libraries/display_tbl.lib.php:399 msgid "vertical" From c80a5d245f48a6435c0ef5dbc7a0ae2427f3bc04 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 11:58:00 +0200 Subject: [PATCH 004/107] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index bc6cececbe..b5877e0da0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 11:57+0200\n" +"PO-Revision-Date: 2011-06-15 11:58+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9679,7 +9679,7 @@ msgstr "" #: tbl_indexes.php:249 #, php-format msgid "Add to index  %s column(s)" -msgstr "インデックスに %s  の列を追加しました" +msgstr "インデックスに %s 個のカラムを追加する" #: tbl_indexes.php:254 tbl_structure.php:684 tbl_structure.php:695 msgid "Column count has to be larger than zero." From 8a210f89d1cd8ddf268a827968f7a5a2e253a627 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 11:58:49 +0200 Subject: [PATCH 005/107] Translation update done using Pootle. --- po/ja.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index b5877e0da0..5ce8b64658 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3053,9 +3053,7 @@ msgstr "変更追跡機能" msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." -msgstr "" -"データベースで行われた変更の追跡機能です。これには、 phpMyAdmin の設定保存場" -"所が必要です。" +msgstr "データベースで行われた変更の追跡機能です。これには、phpMyAdmin の設定保存場所が必要です。" #: libraries/config/messages.inc.php:208 msgid "Customize export options" From f2998c6bb2709b0dd44f718f743a3e1e3b823011 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 11:59:14 +0200 Subject: [PATCH 006/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5ce8b64658..c095e9e02d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 11:58+0200\n" +"PO-Revision-Date: 2011-06-15 11:59+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9346,8 +9346,7 @@ msgstr "" #: setup/lib/index.lib.php:256 #, php-format msgid "This %soption%s should be enabled if your web server supports it." -msgstr "" -"Webサーバでサポートしている場合、この%sオプション%sを有効にするべきです。" +msgstr "ウェブサーバでサポートしている場合、この%sオプション%sを有効にするべきです。" #: setup/lib/index.lib.php:258 #, php-format From cc16828cc11b0430834d5ebade5ac9452b9d75cc Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 11:59:40 +0200 Subject: [PATCH 007/107] Translation update done using Pootle. --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index c095e9e02d..b0d62360eb 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3334,7 +3334,7 @@ msgstr "ロゴリンクのターゲット" #: libraries/config/messages.inc.php:286 msgid "Highlight server under the mouse cursor" -msgstr "マウスカーソルの下のサーバー名を強調表示します。" +msgstr "マウスカーソルの下のサーバ名を強調表示します。" #: libraries/config/messages.inc.php:287 msgid "Enable highlighting" From eea00bf395b76873b187cb70ecd2da570f9c6d83 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 11:59:57 +0200 Subject: [PATCH 008/107] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index b0d62360eb..391d7ae755 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6265,8 +6265,8 @@ msgid "" "Make sure, you have unique server-id in your configuration file (my.cnf). If " "not, please add the following line into [mysqld] section:" msgstr "" -"念のため、設定ファイル (my.cnf) 内でサーバーIDがユニークであるか確認してくだ" -"さい。もしそうでないならば、[mysqld] セクションに以下の行を追加してください。" +"念のため、設定ファイル (my.cnf) 内でサーバ ID がユニークであるか確認してください。もしそうでないならば、[mysqld] " +"セクションに以下の行を追加してください。" #: libraries/replication_gui.lib.php:57 libraries/replication_gui.lib.php:58 #: libraries/replication_gui.lib.php:251 libraries/replication_gui.lib.php:254 From 1516608ce32dc005b9fcf821a7c13a17c5559795 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:00:20 +0200 Subject: [PATCH 009/107] Translation update done using Pootle. --- po/ja.po | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/po/ja.po b/po/ja.po index 391d7ae755..5247740c77 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 11:59+0200\n" +"PO-Revision-Date: 2011-06-15 12:00+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8007,12 +8007,9 @@ msgid "" "ignore all databases by default and allow only certain databases to be " "replicated. Please select the mode:" msgstr "" -"このサーバは、レプリケーションプロセスのマスタサーバーとして構成されていませ" -"ん。以下のいずれかを選択できます。1つは、特定のデータベースを無視して残り全" -"てのデータベースをレプリケーションするモード(データベースの大部分をレプリ" -"ケーションする場合に便利です。)。もう1つは、デフォルトで全てのデータベース" -"を無視して、特定のデータベースだけのレプリケーションを許可するモード。以下よ" -"りいずれかのモードを選択してください。" +"このサーバは、レプリケーションプロセスのマスタサーバとして構成されていません。以下のいずれかを選択できます。1つは、特定のデータベースを無視して残り全て" +"のデータベースをレプリケーションするモード(データベースの大部分をレプリケーションする場合に便利です。)。もう1つは、デフォルトで全てのデータベースを無" +"視して、特定のデータベースだけのレプリケーションを許可するモード。以下よりいずれかのモードを選択してください。" #: server_replication.php:219 msgid "Replicate all databases; Ignore:" From 0168d4ebd41c784cfe96986f94e19dd45e7e42f0 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:00:33 +0200 Subject: [PATCH 010/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5247740c77..7a2874fcae 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8037,9 +8037,8 @@ msgid "" "should see a message informing you, that this server is configured as " "master" msgstr "" -"MySQL サーバが再起動したら、「実行する」ボタンをクリックしてください。その" -"後、このサーバーマスタとして設定されていることを知らせるメッセージが" -"表示されます。" +"MySQL サーバが再起動したら、「実行する」ボタンをクリックしてください。その後、このサーバマスタとして設定されていることを知らせるメ" +"ッセージが表示されます。" #: server_replication.php:291 msgid "Slave SQL Thread not running!" From 65a8bacd038b49ef5c9df2cb2da79f5bd06a5694 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:00:48 +0200 Subject: [PATCH 011/107] Translation update done using Pootle. --- po/ja.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 7a2874fcae..b68d3272ef 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8321,8 +8321,7 @@ msgid "" "For further information about replication status on the server, please visit " "the replication section." msgstr "" -"サーバー上のレプリケーションステータスの詳細については、レプリケーションの節を参照してください。" +"サーバ上のレプリケーションステータスの詳細については、レプリケーションの節を参照してください。" #: server_status.php:643 msgid "Replication status" From ec5118df9467e13429f2daaf0a7ebfa1dd10d8be Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:01:04 +0200 Subject: [PATCH 012/107] Translation update done using Pootle. --- po/ja.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ja.po b/po/ja.po index b68d3272ef..168faa96f3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:00+0200\n" +"PO-Revision-Date: 2011-06-15 12:01+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9161,9 +9161,7 @@ msgstr "" msgid "" "If your server is also configured to accept HTTPS requests follow [a@%s]this " "link[/a] to use a secure connection." -msgstr "" -"サーバーがHTTPS要求を受け入れるように構成されている場合、[a@%s]このリンク[/a]" -"をたどり安全な接続を使用するようにしてください。" +msgstr "サーバが HTTPS 要求を受け入れるように構成されている場合、[a@%s]このリンク[/a]をたどり安全な接続を使用するようにしてください。" #: setup/frames/index.inc.php:64 msgid "Insecure connection" From 51f863dc6c4209589b4ec9a991212be0bbea3c28 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:01:25 +0200 Subject: [PATCH 013/107] Translation update done using Pootle. --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 168faa96f3..831814a4b5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3524,7 +3524,7 @@ msgstr "HTTP 転送の高速化のために GZip の出力バッファリング #: libraries/config/messages.inc.php:326 msgid "GZip output buffering" -msgstr "GZipの出力バッファリング" +msgstr "GZip の出力バッファリング" #: libraries/config/messages.inc.php:327 msgid "" From 85ed8e314199da236c97ad4f4604ffe5606c5224 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:01:58 +0200 Subject: [PATCH 014/107] Translation update done using Pootle. --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 831814a4b5..be4bb44c33 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6196,7 +6196,7 @@ msgstr "PDF の作成" #: libraries/relation.lib.php:121 msgid "Displaying Column Comments" -msgstr "列コメント表示機能" +msgstr "カラムコメント表示機能" #: libraries/relation.lib.php:126 msgid "" From 0f1efeea0793b5a4c5ef9a739803ed31ed6ec033 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:02:54 +0200 Subject: [PATCH 015/107] Translation update done using Pootle. --- po/ja.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ja.po b/po/ja.po index be4bb44c33..56e8ec77ca 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:01+0200\n" +"PO-Revision-Date: 2011-06-15 12:02+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -4084,9 +4084,7 @@ msgstr "バージョンの自動作成" msgid "" "Leave blank for no user preferences storage in database, suggested: [kbd]" "pma_config[/kbd]" -msgstr "" -"データベースにユーザ設定の保存しない場合は空欄にします。[kbd]pma_config[/" -"kbd] としておくのがいいでしょう。" +msgstr "データベースにユーザ環境設定を保存しない場合は空欄にします。[kbd]pma_config[/kbd] としておくのがいいでしょう。" #: libraries/config/messages.inc.php:441 msgid "User preferences storage table" From fc1ee815ba94f8b048fdc566525c954fd314cd11 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:03:05 +0200 Subject: [PATCH 016/107] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 56e8ec77ca..5e300187af 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:02+0200\n" +"PO-Revision-Date: 2011-06-15 12:03+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -4088,7 +4088,7 @@ msgstr "データベースにユーザ環境設定を保存しない場合は空 #: libraries/config/messages.inc.php:441 msgid "User preferences storage table" -msgstr "ユーザ設定保存テーブル" +msgstr "ユーザ環境設定保存テーブル" #: libraries/config/messages.inc.php:443 msgid "User for config auth" From 44cac7029451ffd3ea5286b0f20dccd829264a59 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:03:14 +0200 Subject: [PATCH 017/107] Translation update done using Pootle. --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 5e300187af..a859d1a270 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6219,7 +6219,7 @@ msgstr "永続的な『テーブルのユーザ設定』" #: libraries/relation.lib.php:155 msgid "User preferences" -msgstr "ユーザ設定" +msgstr "ユーザ環境設定" #: libraries/relation.lib.php:159 msgid "Quick steps to setup advanced features:" From cb8e1980e03e5ece0efffa697ad7bbe926e95eeb Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:09:40 +0200 Subject: [PATCH 018/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index a859d1a270..c14552c167 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:03+0200\n" +"PO-Revision-Date: 2011-06-15 12:09+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8196,10 +8196,9 @@ msgid "Runtime Information" msgstr "ランタイム情報" #: server_status.php:367 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic" -msgstr "サーバの選択" +msgstr "サーバのトラフィック" #: server_status.php:368 msgid "Query statistics" From b3e1a0e7411b92a16cf9e0cde5c3124b8373a406 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:11:42 +0200 Subject: [PATCH 019/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index c14552c167..484a6f5ac0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:09+0200\n" +"PO-Revision-Date: 2011-06-15 12:11+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8205,10 +8205,9 @@ msgid "Query statistics" msgstr "クエリの統計" #: server_status.php:369 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "スレーブのステータステーブルを閲覧する" +msgstr "全ての状態変数" #: server_status.php:379 server_status.php:410 #, fuzzy From ea9f4ac7f037ad68db5b0cef263890aacfca9c4e Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:11:59 +0200 Subject: [PATCH 020/107] Translation update done using Pootle. --- po/ja.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 484a6f5ac0..f2d4effa30 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8210,10 +8210,9 @@ msgid "All status variables" msgstr "全ての状態変数" #: server_status.php:379 server_status.php:410 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate" -msgstr "再描画" +msgstr "再描画間隔" #: server_status.php:380 server_status.php:411 #, fuzzy From cf6dbed6a5c620a10ed544fcee50265a93651560 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:12:24 +0200 Subject: [PATCH 021/107] Translation update done using Pootle. --- po/ja.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index f2d4effa30..5f51afe219 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:11+0200\n" +"PO-Revision-Date: 2011-06-15 12:12+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8215,7 +8215,6 @@ msgid "Refresh rate" msgstr "再描画間隔" #: server_status.php:380 server_status.php:411 -#, fuzzy #| msgid "Second" msgid "second" msgstr "秒" From 49531058fc03d5cf68ebdbd9e28d3f7ea791e6c0 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:12:30 +0200 Subject: [PATCH 022/107] Translation update done using Pootle. --- po/ja.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 5f51afe219..23191af590 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8223,7 +8223,6 @@ msgstr "秒" #: server_status.php:384 server_status.php:385 server_status.php:412 #: server_status.php:413 server_status.php:414 server_status.php:415 #: server_status.php:416 -#, fuzzy #| msgid "Second" msgid "seconds" msgstr "秒" From 69e2934ca492ca10c6fbfe8411abf4bc17518203 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:12:37 +0200 Subject: [PATCH 023/107] Translation update done using Pootle. --- po/ja.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 23191af590..35e04f08be 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8230,7 +8230,6 @@ msgstr "秒" #: server_status.php:386 server_status.php:387 server_status.php:388 #: server_status.php:389 server_status.php:417 server_status.php:418 #: server_status.php:419 server_status.php:420 -#, fuzzy #| msgid "Minute" msgid "minutes" msgstr "分" From 977e66cec75e06f5abcae53ab15fe21b40e1f3e8 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:13:40 +0200 Subject: [PATCH 024/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 35e04f08be..02e8a5811c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:12+0200\n" +"PO-Revision-Date: 2011-06-15 12:13+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8235,10 +8235,9 @@ msgid "minutes" msgstr "分" #: server_status.php:440 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "パスワードは変更しない" +msgstr "含まれている文字:" #: server_status.php:445 #, fuzzy From 1266d383dc6e6aee7ac397d387dcf7ac8d60b5e9 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:16:15 +0200 Subject: [PATCH 025/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 02e8a5811c..b8f22f6398 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:13+0200\n" +"PO-Revision-Date: 2011-06-15 12:16+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8240,10 +8240,9 @@ msgid "Containing the word:" msgstr "含まれている文字:" #: server_status.php:445 -#, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "開いているテーブルを表示する" +msgstr "警告値のみ表示する" #: server_status.php:449 msgid "Filter by category..." From 997ac0c266b76f5943d533608f6260d2081b9d27 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:17:44 +0200 Subject: [PATCH 026/107] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index b8f22f6398..a4e6874566 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:16+0200\n" +"PO-Revision-Date: 2011-06-15 12:17+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8246,7 +8246,7 @@ msgstr "警告値のみ表示する" #: server_status.php:449 msgid "Filter by category..." -msgstr "" +msgstr "種別によるフィルタ..." #: server_status.php:462 #, fuzzy From 9de722c13ee8b42c283fc3d12ab7732093605579 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:20:29 +0200 Subject: [PATCH 027/107] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index a4e6874566..da38e19859 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:17+0200\n" +"PO-Revision-Date: 2011-06-15 12:20+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8279,7 +8279,7 @@ msgstr "" #: server_status.php:609 #, php-format msgid "Network traffic since startup: %s" -msgstr "" +msgstr "起動してからのネットワークトラフィック:%s" #: server_status.php:617 #, php-format From bf9eaff2ca308a9db1ca17a543bc69943d66c0ac Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:22:41 +0200 Subject: [PATCH 028/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index da38e19859..26111b2c7d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:20+0200\n" +"PO-Revision-Date: 2011-06-15 12:22+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8362,10 +8362,9 @@ msgid "ID" msgstr "ID" #: server_status.php:840 -#, fuzzy #| msgid "Whether to enable SSL for connection to MySQL server." msgid "The number of failed attempts to connect to the MySQL server." -msgstr "MySQL サーバに接続するのに SSL を有効にするかどうか。" +msgstr "MySQL サーバへの接続を試みて失敗した回数。" #: server_status.php:841 msgid "" From bbab90434370a8ff39f0b65e14b00757901cb932 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:25:41 +0200 Subject: [PATCH 029/107] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 26111b2c7d..5a49ceadf7 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:22+0200\n" +"PO-Revision-Date: 2011-06-15 12:25+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8382,7 +8382,7 @@ msgstr "一時バイナリログキャッシュを使用したトランザクシ #: server_status.php:843 msgid "" "The number of connection attempts (successful or not) to the MySQL server." -msgstr "" +msgstr "MySQL サーバへの接続試行回数(成否に関わらず)。" #: server_status.php:844 msgid "" From 2b64caa9dca24f3ab0f808dd87bbabf5f7273114 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:27:43 +0200 Subject: [PATCH 030/107] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5a49ceadf7..032f78ce72 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:25+0200\n" +"PO-Revision-Date: 2011-06-15 12:27+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8794,7 +8794,7 @@ msgstr "" msgid "" "The maximum number of connections that have been in use simultaneously since " "the server started." -msgstr "" +msgstr "サーバが起動してからの同時接続の最大数。" #: server_status.php:915 msgid "The number of rows waiting to be written in INSERT DELAYED queues." From 0674e697da641f44101422c66bf450632139ad12 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:33:46 +0200 Subject: [PATCH 031/107] Translation update done using Pootle. --- po/ja.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 032f78ce72..e9ce393551 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:27+0200\n" +"PO-Revision-Date: 2011-06-15 12:33+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -8826,6 +8826,8 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" +"クエリキャッシュ内の空きメモリのブロック数。この値が高い場合は 断片化が起こっていることを示しています。FLUSH QUERY CACHE " +"文を発行することによって解決できるかもしれません。" #: server_status.php:921 msgid "The amount of free memory for query cache." From debfc3324882a8b1971d8112af8e028349791290 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:34:26 +0200 Subject: [PATCH 032/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index e9ce393551..f52056eb06 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:33+0200\n" +"PO-Revision-Date: 2011-06-15 12:34+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9563,10 +9563,9 @@ msgid "Stacked" msgstr "積み上げ形式" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "レポートのタイトル:" +msgstr "グラフの題名" #: tbl_chart.php:99 msgid "X-Axis:" From 0f9fdc8a10f0dd458106940c3b5948f84ab372c6 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:34:57 +0200 Subject: [PATCH 033/107] Translation update done using Pootle. --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index f52056eb06..dca3d47866 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9569,7 +9569,7 @@ msgstr "グラフの題名" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "X 軸" #: tbl_chart.php:113 #, fuzzy From 91c3db2fcfdc2f39e05b28e162900846aac6a5ed Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:40:42 +0200 Subject: [PATCH 034/107] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index dca3d47866..8059c80337 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:34+0200\n" +"PO-Revision-Date: 2011-06-15 12:40+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9569,7 +9569,7 @@ msgstr "グラフの題名" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "X 軸" +msgstr "横軸:" #: tbl_chart.php:113 #, fuzzy From e7274c125071c96e30ccfb56358d717e6d41ddc9 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:40:59 +0200 Subject: [PATCH 035/107] Translation update done using Pootle. --- po/ja.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8059c80337..5ff87634c5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9584,10 +9584,9 @@ msgid "The remaining columns" msgstr "textarea の 1 行の文字数" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" -msgstr "横軸のラベル" +msgstr "横軸のラベル:" #: tbl_chart.php:128 #, fuzzy From 28f12211ba430be9d6006992146f0008d7ef07f8 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:41:09 +0200 Subject: [PATCH 036/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5ff87634c5..49fe00444b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:40+0200\n" +"PO-Revision-Date: 2011-06-15 12:41+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9595,10 +9595,9 @@ msgid "X Values" msgstr "値" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" -msgstr "縦軸のラベル" +msgstr "縦軸のラベル:" #: tbl_chart.php:129 #, fuzzy From 61acf395baf9fcfa5e4b9658b331afd6affb39a6 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:44:13 +0200 Subject: [PATCH 037/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 49fe00444b..ca8943260b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:41+0200\n" +"PO-Revision-Date: 2011-06-15 12:44+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9589,10 +9589,9 @@ msgid "X-Axis label:" msgstr "横軸のラベル:" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "値" +msgstr "横軸の値" #: tbl_chart.php:129 #| msgid "Y Axis label" From 1a9d991ce3d3986bbfdaaf16be71a6824e02d290 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:44:21 +0200 Subject: [PATCH 038/107] Translation update done using Pootle. --- po/ja.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index ca8943260b..d92e828ab1 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9599,10 +9599,9 @@ msgid "Y-Axis label:" msgstr "縦軸のラベル:" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "値" +msgstr "縦軸の値" #: tbl_create.php:56 #, php-format From 58a6b6e3d55de1d32e143f75c145799a48f5556f Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 15 Jun 2011 12:47:18 +0200 Subject: [PATCH 039/107] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index d92e828ab1..0a6f799b0f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 12:44+0200\n" +"PO-Revision-Date: 2011-06-15 12:47+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1047,10 +1047,9 @@ msgid "Close" msgstr "閉じる" #: js/messages.php:64 server_status.php:393 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "サーバの選択" +msgstr "リアルタイムでのトラフィックグラフ" #: js/messages.php:65 server_status.php:396 msgid "Live conn./process chart" From efc9f6ddc40d8b4bc41aae1b66c14aa62040c736 Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Wed, 15 Jun 2011 13:17:19 +0200 Subject: [PATCH 040/107] Chart export now works with IE8 --- js/highcharts/exporting.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/js/highcharts/exporting.js b/js/highcharts/exporting.js index 036c6ae5c7..171ea503ca 100644 --- a/js/highcharts/exporting.js +++ b/js/highcharts/exporting.js @@ -308,12 +308,9 @@ extend(Chart.prototype, { chart = this, canvas=createElement('canvas'); - if (typeof FlashCanvas != "undefined") { - FlashCanvas.initElement(canvas); - } - $('body').append(canvas); - $(canvas).hide(); + $(canvas).css('position','absolute'); + $(canvas).css('left','-10000px'); var submitData = function(chartData) { // merge the options @@ -352,11 +349,19 @@ extend(Chart.prototype, { if(options && options.type=='image/svg+xml') { submitData(chart.getSVG(chartOptions)); } else { + if (typeof FlashCanvas != "undefined") { + FlashCanvas.initElement(canvas); + } + // Generate data uri and submit once done canvg(canvas, chart.getSVG(chartOptions),{ ignoreAnimation:true, ignoreMouse:true, - renderCallback:function() { submitData(canvas.toDataURL()); } + renderCallback:function() { + // IE8 fix: flashcanvas doesn't update the canvas immediately, thus requiring setTimeout. + // See also http://groups.google.com/group/flashcanvas/browse_thread/thread/e36ff7a03e1bfb0a + setTimeout(function() { submitData(canvas.toDataURL()); }, 100); + } }); } }, From f1821224cd96a5144deba0000d8c2a7e4fa8698b Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:36:07 +0200 Subject: [PATCH 041/107] Translation update done using Pootle. --- po/pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 5dee6c3bc8..ff06d58da4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-04-14 17:44+0200\n" -"Last-Translator: \n" +"PO-Revision-Date: 2011-06-15 13:36+0200\n" +"Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -489,7 +489,7 @@ msgstr "Usar tabelas" #: db_qbe.php:662 #, php-format msgid "SQL query on database %s:" -msgstr "Consulta no Banco de Dados %s:" +msgstr "Consulta SQL ao Banco de Dados %s:" #: db_qbe.php:955 libraries/common.lib.php:1153 msgid "Submit Query" From 004d4d267524938b34cbbf18bb7575614192cb37 Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:37:44 +0200 Subject: [PATCH 042/107] Translation update done using Pootle. --- po/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index ff06d58da4..97142bd7ea 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:36+0200\n" +"PO-Revision-Date: 2011-06-15 13:37+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" From 47c19f0527ba56e8771812c2c655044e1b807d2f Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:41:46 +0200 Subject: [PATCH 043/107] Translation update done using Pootle. --- po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 97142bd7ea..26409a6c7d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:37+0200\n" +"PO-Revision-Date: 2011-06-15 13:41+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" @@ -638,7 +638,7 @@ msgstr "Soma" #: db_structure.php:455 libraries/StorageEngine.class.php:351 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "%s é o stored engine padrão neste servidor MySQL." +msgstr "%s é o mecanismo de armazenamento padrão neste servidor MySQL." #: db_structure.php:483 db_structure.php:500 db_structure.php:501 #: libraries/display_tbl.lib.php:2220 libraries/display_tbl.lib.php:2225 From 87a9309216b08277669bf2018cb6ed0f8e6de37c Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:43:35 +0200 Subject: [PATCH 044/107] Translation update done using Pootle. --- po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 26409a6c7d..ab8b42f333 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:41+0200\n" +"PO-Revision-Date: 2011-06-15 13:43+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" @@ -707,8 +707,8 @@ msgstr "Reparar tabela" msgid "Analyze table" msgstr "Analizar tabela" +# Adicionar prefixo à tabela #: db_structure.php:521 -#, fuzzy msgid "Add prefix to table" msgstr "Sem bases" From e2f1882570ea7db63047d028687cd345b1832a13 Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:44:29 +0200 Subject: [PATCH 045/107] Translation update done using Pootle. --- po/pt_BR.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index ab8b42f333..ab41cda89e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:43+0200\n" +"PO-Revision-Date: 2011-06-15 13:44+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" @@ -713,10 +713,9 @@ msgid "Add prefix to table" msgstr "Sem bases" #: db_structure.php:523 libraries/mult_submits.inc.php:246 -#, fuzzy #| msgid "Replace table data with file" msgid "Replace table prefix" -msgstr "Substituir os dados da tabela pelos do arquivo" +msgstr "Substituir prefixo da tabela" #: db_structure.php:525 libraries/mult_submits.inc.php:246 #, fuzzy From 857bd9d01c4250bc5b6bcb7057b15e069f1ca8c5 Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:45:25 +0200 Subject: [PATCH 046/107] Translation update done using Pootle. --- po/pt_BR.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index ab41cda89e..740dbb5bb7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:44+0200\n" +"PO-Revision-Date: 2011-06-15 13:45+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" @@ -707,10 +707,9 @@ msgstr "Reparar tabela" msgid "Analyze table" msgstr "Analizar tabela" -# Adicionar prefixo à tabela #: db_structure.php:521 msgid "Add prefix to table" -msgstr "Sem bases" +msgstr "Adicionar prefixo à tabela" #: db_structure.php:523 libraries/mult_submits.inc.php:246 #| msgid "Replace table data with file" From b65f1e18041abdf4fe0a3b6ac7c81e307714a331 Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:46:20 +0200 Subject: [PATCH 047/107] Translation update done using Pootle. --- po/pt_BR.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 740dbb5bb7..a965451f33 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:45+0200\n" +"PO-Revision-Date: 2011-06-15 13:46+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" @@ -717,10 +717,9 @@ msgid "Replace table prefix" msgstr "Substituir prefixo da tabela" #: db_structure.php:525 libraries/mult_submits.inc.php:246 -#, fuzzy #| msgid "Replace table data with file" msgid "Copy table with prefix" -msgstr "Substituir os dados da tabela pelos do arquivo" +msgstr "Copiar tabela com o prefixo" #: db_structure.php:574 libraries/schema/User_Schema.class.php:387 msgid "Data Dictionary" From 2049107eafdbcb2e6cb9965fea5fa9dbeae245d5 Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:47:52 +0200 Subject: [PATCH 048/107] Translation update done using Pootle. --- po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index a965451f33..0fedc8b609 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:46+0200\n" +"PO-Revision-Date: 2011-06-15 13:47+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" @@ -784,7 +784,7 @@ msgstr "Versões" #: db_tracking.php:135 tbl_tracking.php:409 tbl_tracking.php:676 msgid "Tracking report" -msgstr "Relatório de rastreamento" +msgstr "Relatório de monitoramento" #: db_tracking.php:136 tbl_tracking.php:244 tbl_tracking.php:676 msgid "Structure snapshot" From 168e968f2d818cdf9d97377d4275f825472edc3e Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:49:18 +0200 Subject: [PATCH 049/107] Translation update done using Pootle. --- po/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 0fedc8b609..bfa2f2a9f4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:47+0200\n" +"PO-Revision-Date: 2011-06-15 13:49+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" From 0bef847f0812a3b91d1b63a9d6f1a30fb1a08c07 Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:49:57 +0200 Subject: [PATCH 050/107] Translation update done using Pootle. --- po/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index bfa2f2a9f4..c730a4896e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -797,7 +797,7 @@ msgstr "Tabelas não monitoradas" #: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:622 #: tbl_structure.php:624 msgid "Track table" -msgstr "Rastrear tabela" +msgstr "Monitorar tabela" #: db_tracking.php:229 msgid "Database Log" From 66e72289b36e570b790af443d3417413204e7ba7 Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:51:45 +0200 Subject: [PATCH 051/107] Translation update done using Pootle. --- po/pt_BR.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index c730a4896e..ce7c392705 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:49+0200\n" +"PO-Revision-Date: 2011-06-15 13:51+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" @@ -968,10 +968,9 @@ msgid "You are about to DESTROY a complete database!" msgstr "Você está prestes à DESTRUIR completamente o Banco de Dados!" #: js/messages.php:32 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to DESTROY a complete table!" -msgstr "Você está prestes à DESTRUIR completamente o Banco de Dados!" +msgstr "Você está prestes à DESTRUIR completamente a tabela" #: js/messages.php:33 #, fuzzy From d758e77c4e9f6baee1cfd1c8745c63317bbeeba1 Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:53:28 +0200 Subject: [PATCH 052/107] Translation update done using Pootle. --- po/pt_BR.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index ce7c392705..821098073d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:51+0200\n" +"PO-Revision-Date: 2011-06-15 13:53+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" @@ -973,10 +973,9 @@ msgid "You are about to DESTROY a complete table!" msgstr "Você está prestes à DESTRUIR completamente a tabela" #: js/messages.php:33 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to TRUNCATE a complete table!" -msgstr "Você está prestes à DESTRUIR completamente o Banco de Dados!" +msgstr "Você está prestes à TRUNCAR completamente uma tabela!" #: js/messages.php:34 msgid "Dropping Event" From f36f624adb8a64902744688b79eeb491d76eac3f Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:54:00 +0200 Subject: [PATCH 053/107] Translation update done using Pootle. --- po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 821098073d..946f0a92cc 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:53+0200\n" +"PO-Revision-Date: 2011-06-15 13:54+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" @@ -983,7 +983,7 @@ msgstr "Remoção de eventos" #: js/messages.php:35 msgid "Dropping Procedure" -msgstr "Remoção de Procedures" +msgstr "Remoção de procedimentos" #: js/messages.php:37 msgid "Deleting tracking data" From 3240586b67a3e6488385ef6b85d34e6272ac4196 Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:54:51 +0200 Subject: [PATCH 054/107] Translation update done using Pootle. --- po/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 946f0a92cc..46f6387156 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -999,7 +999,7 @@ msgstr "Esta operação pode ser demorada. Deseja prosseguir?" #: js/messages.php:42 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "Você está prestes a desativar um repositório BLOB." +msgstr "Você está prestes a DESATIVAR um repositório BLOB." #: js/messages.php:43 #, php-format From 8244771b50a3765fd6ec876a8fc1d3c71fcef9da Mon Sep 17 00:00:00 2001 From: Jose Ivan Bezerra Vilarouca Filho Date: Wed, 15 Jun 2011 13:55:59 +0200 Subject: [PATCH 055/107] Translation update done using Pootle. --- po/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 46f6387156..2979718eb6 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 13:54+0200\n" +"PO-Revision-Date: 2011-06-15 13:55+0200\n" "Last-Translator: Jose Ivan Bezerra Vilarouca Filho \n" "Language-Team: brazilian_portuguese \n" "Language: pt_BR\n" @@ -10336,7 +10336,7 @@ msgstr "Você não tem direitos suficientes para estar aqui agora!" #: user_password.php:110 msgid "The profile has been updated." -msgstr "A configuração foi atualizada." +msgstr "O perfíl foi atualizado." #: view_create.php:141 msgid "VIEW name" From 39ccdb6abbe3792571f285dc4e2a9d12bc861236 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:25:59 +0200 Subject: [PATCH 056/107] Translation update done using Pootle. --- po/fr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2280163d0f..69564e48c5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-09 22:13+0200\n" +"PO-Revision-Date: 2011-06-15 14:25+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -1018,10 +1018,9 @@ msgstr "Ce n'est pas un nombre !" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "Nombre de fichiers journal" +msgstr "Nombre total" #: js/messages.php:54 msgid "The host name is empty!" From 143ebaf7508aff437a89eff7df96f9ac60a0f022 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:26:57 +0200 Subject: [PATCH 057/107] Translation update done using Pootle. --- po/fr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 69564e48c5..6ffbc320ec 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:25+0200\n" +"PO-Revision-Date: 2011-06-15 14:26+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -1057,10 +1057,9 @@ msgid "Close" msgstr "Fermer" #: js/messages.php:64 server_status.php:393 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Choix du serveur" +msgstr "Tableau du trafic en temps réel" #: js/messages.php:65 server_status.php:396 msgid "Live conn./process chart" From e484233d32cec3e406824ce3e83fc0a6b13424d9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:28:28 +0200 Subject: [PATCH 058/107] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6ffbc320ec..ec9a0344b8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:26+0200\n" +"PO-Revision-Date: 2011-06-15 14:28+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -1063,7 +1063,7 @@ msgstr "Tableau du trafic en temps réel" #: js/messages.php:65 server_status.php:396 msgid "Live conn./process chart" -msgstr "" +msgstr "Tableau des connexions et processus en temps réel" #: js/messages.php:66 server_status.php:423 #, fuzzy From f57d15ba052581568d670a0821570711e27769d1 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:29:16 +0200 Subject: [PATCH 059/107] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index ec9a0344b8..b04c374ba4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:28+0200\n" +"PO-Revision-Date: 2011-06-15 14:29+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -1059,7 +1059,7 @@ msgstr "Fermer" #: js/messages.php:64 server_status.php:393 #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Tableau du trafic en temps réel" +msgstr "Graphique du trafic en temps réel" #: js/messages.php:65 server_status.php:396 msgid "Live conn./process chart" From e9f5dc3e9bce501ab505c25b0754884ff41ea02f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:29:25 +0200 Subject: [PATCH 060/107] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index b04c374ba4..b681db20f8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1063,7 +1063,7 @@ msgstr "Graphique du trafic en temps réel" #: js/messages.php:65 server_status.php:396 msgid "Live conn./process chart" -msgstr "Tableau des connexions et processus en temps réel" +msgstr "Graphique des connexions et processus en temps réel" #: js/messages.php:66 server_status.php:423 #, fuzzy From 1c6f84d6e501554409a78ad228f354e997e64e57 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:29:36 +0200 Subject: [PATCH 061/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index b681db20f8..b4a0475c05 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1066,10 +1066,9 @@ msgid "Live conn./process chart" msgstr "Graphique des connexions et processus en temps réel" #: js/messages.php:66 server_status.php:423 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "Afficher le graphique des requêtes" +msgstr "Graphique des requêtes en temps réel" #: js/messages.php:68 msgid "Static data" From 1fda7c8102625a4109396c9c1193e70e82a9868e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:29:45 +0200 Subject: [PATCH 062/107] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index b4a0475c05..82b688c147 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1072,7 +1072,7 @@ msgstr "Graphique des requêtes en temps réel" #: js/messages.php:68 msgid "Static data" -msgstr "" +msgstr "Données statiques" #. l10n: Total number of queries #: js/messages.php:70 libraries/build_html_for_db.lib.php:45 From 8e9a4603fe6e2ffe39d811f9e7221640485897cb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:29:58 +0200 Subject: [PATCH 063/107] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 82b688c147..ec15f3cc30 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1085,7 +1085,7 @@ msgstr "Total" #. l10n: Other, small valued, queries #: js/messages.php:72 server_status.php:586 msgid "Other" -msgstr "" +msgstr "Autres" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1359 From 3b9df48571afa30378ee96d97ad0ee33fe041979 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:30:13 +0200 Subject: [PATCH 064/107] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index ec15f3cc30..24d193395b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:29+0200\n" +"PO-Revision-Date: 2011-06-15 14:30+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -1090,7 +1090,7 @@ msgstr "Autres" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1359 msgid "," -msgstr " " +msgstr "  " #. l10n: Decimal separator #: js/messages.php:76 libraries/common.lib.php:1361 From 860c45a24e8b1bda6f09ca8ca640f856c3de8856 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:30:46 +0200 Subject: [PATCH 065/107] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 24d193395b..01cb8055bf 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1105,7 +1105,7 @@ msgstr "Annuler" #: js/messages.php:83 msgid "Loading" -msgstr "Chargement" +msgstr "Chargement en cours" #: js/messages.php:84 msgid "Processing Request" From a3e98a2f6f7055f54b7a6afa19eab31c82e9390d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:31:27 +0200 Subject: [PATCH 066/107] Translation update done using Pootle. --- po/fr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 01cb8055bf..0bbb952887 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:30+0200\n" +"PO-Revision-Date: 2011-06-15 14:31+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -8327,10 +8327,9 @@ msgid "Runtime Information" msgstr "Informations sur le serveur" #: server_status.php:367 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic" -msgstr "Choix du serveur" +msgstr "Trafic du serveur" #: server_status.php:368 msgid "Query statistics" From 76ce500031db0071ff7b84cd2873fa3bc77799e7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:31:38 +0200 Subject: [PATCH 067/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0bbb952887..7315ba0821 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8336,10 +8336,9 @@ msgid "Query statistics" msgstr "Statistiques sur les requêtes" #: server_status.php:369 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Montrer l'état de l'esclave" +msgstr "Toutes les variables d'état" #: server_status.php:379 server_status.php:410 #, fuzzy From ccfc5f1382ee6b9d3c4c74e1d3b6937ea8ce3b75 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:32:04 +0200 Subject: [PATCH 068/107] Translation update done using Pootle. --- po/fr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7315ba0821..1fff98acdb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:31+0200\n" +"PO-Revision-Date: 2011-06-15 14:32+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -8341,10 +8341,9 @@ msgid "All status variables" msgstr "Toutes les variables d'état" #: server_status.php:379 server_status.php:410 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate" -msgstr "Actualiser" +msgstr "Taux de rafraîchissement" #: server_status.php:380 server_status.php:411 #, fuzzy From 167defd182e6fea612d8bb6f9929428dee46e6b2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:32:10 +0200 Subject: [PATCH 069/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 1fff98acdb..9961348796 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8346,10 +8346,9 @@ msgid "Refresh rate" msgstr "Taux de rafraîchissement" #: server_status.php:380 server_status.php:411 -#, fuzzy #| msgid "Second" msgid "second" -msgstr "Seconde" +msgstr "seconde" #: server_status.php:381 server_status.php:382 server_status.php:383 #: server_status.php:384 server_status.php:385 server_status.php:412 From dbe5767e4789bcac683a954359983697b81ba1cb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:32:16 +0200 Subject: [PATCH 070/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9961348796..862aff80fc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8354,10 +8354,9 @@ msgstr "seconde" #: server_status.php:384 server_status.php:385 server_status.php:412 #: server_status.php:413 server_status.php:414 server_status.php:415 #: server_status.php:416 -#, fuzzy #| msgid "Second" msgid "seconds" -msgstr "Seconde" +msgstr "secondes" #: server_status.php:386 server_status.php:387 server_status.php:388 #: server_status.php:389 server_status.php:417 server_status.php:418 From 1f54a1ac561a1d163876d813c7ac72f8f10aba76 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:32:21 +0200 Subject: [PATCH 071/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 862aff80fc..4093a96cb1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8361,10 +8361,9 @@ msgstr "secondes" #: server_status.php:386 server_status.php:387 server_status.php:388 #: server_status.php:389 server_status.php:417 server_status.php:418 #: server_status.php:419 server_status.php:420 -#, fuzzy #| msgid "Minute" msgid "minutes" -msgstr "Minute" +msgstr "minutes" #: server_status.php:440 #, fuzzy From 23cffdb0de983cbffab884c5789e8dd3ed0f7b67 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:32:32 +0200 Subject: [PATCH 072/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4093a96cb1..137abf2d01 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8366,10 +8366,9 @@ msgid "minutes" msgstr "minutes" #: server_status.php:440 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "Conserver le mot de passe" +msgstr "Contenant le mot :" #: server_status.php:445 #, fuzzy From a62f0e4f408f741dcf70f0bd94d5127021b65e3e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:32:59 +0200 Subject: [PATCH 073/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 137abf2d01..0ddd438da7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8371,10 +8371,9 @@ msgid "Containing the word:" msgstr "Contenant le mot :" #: server_status.php:445 -#, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "Montrer les tables ouvertes" +msgstr "Afficher uniquement les valeurs d'alerte" #: server_status.php:449 msgid "Filter by category..." From 2a14a1ee04381f1b0dba7d3c1d61c84389853c14 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:33:31 +0200 Subject: [PATCH 074/107] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0ddd438da7..91495379d8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:32+0200\n" +"PO-Revision-Date: 2011-06-15 14:33+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -8377,7 +8377,7 @@ msgstr "Afficher uniquement les valeurs d'alerte" #: server_status.php:449 msgid "Filter by category..." -msgstr "" +msgstr "Filtrer par catégorie..." #: server_status.php:462 #, fuzzy From 4eeecc9038007e8de221316af4e36f216ae4980c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:33:42 +0200 Subject: [PATCH 075/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 91495379d8..c12e6614fb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8380,10 +8380,9 @@ msgid "Filter by category..." msgstr "Filtrer par catégorie..." #: server_status.php:462 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "Liens connexes" +msgstr "Liens connexes:" #: server_status.php:507 server_status.php:539 server_status.php:660 #: server_status.php:705 From d70cb42d130c9c04f39fc58402cbae4aee1a82c4 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:33:49 +0200 Subject: [PATCH 076/107] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index c12e6614fb..8c89d58d06 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8404,7 +8404,7 @@ msgstr "Type de requête" #. l10n: # = Amount of queries #: server_status.php:537 msgid "#" -msgstr "" +msgstr "#" #: server_status.php:609 #, php-format From 94ff7f9f9255f540f765ef50cc13b711b6732d44 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:34:22 +0200 Subject: [PATCH 077/107] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 8c89d58d06..03d4362adf 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:33+0200\n" +"PO-Revision-Date: 2011-06-15 14:34+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -8409,7 +8409,7 @@ msgstr "#" #: server_status.php:609 #, php-format msgid "Network traffic since startup: %s" -msgstr "" +msgstr "Trafic réseau depuis le démarrage : %s" #: server_status.php:617 #, php-format From d2dcb595d2e2e2cba0a132b7980ccc577f7d3081 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:35:28 +0200 Subject: [PATCH 078/107] Translation update done using Pootle. --- po/fr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 03d4362adf..81c31e1021 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:34+0200\n" +"PO-Revision-Date: 2011-06-15 14:35+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -8494,10 +8494,9 @@ msgid "ID" msgstr "ID" #: server_status.php:840 -#, fuzzy #| msgid "Whether to enable SSL for connection to MySQL server." msgid "The number of failed attempts to connect to the MySQL server." -msgstr "Pour activer ou pas une connexion SSL vers le serveur MySQL." +msgstr "Le nombre de tentatives de connexion au serveur MySQL infructueuses." #: server_status.php:841 msgid "" From 63816c774eb982a8ba28e027f2b179345daacf20 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:36:02 +0200 Subject: [PATCH 079/107] Translation update done using Pootle. --- po/fr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 81c31e1021..54807d4dcb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:35+0200\n" +"PO-Revision-Date: 2011-06-15 14:36+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -8517,6 +8517,7 @@ msgstr "" msgid "" "The number of connection attempts (successful or not) to the MySQL server." msgstr "" +"Le nombre de tentatives de connexion (réussies ou non) au serveur MySQL." #: server_status.php:844 msgid "" From 14cacc70acc6582244a7e08203999adb6497f445 Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Wed, 15 Jun 2011 14:37:08 +0200 Subject: [PATCH 080/107] Send correct charset header with ajax responses --- server_status.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/server_status.php b/server_status.php index 6ea2c2912e..1875dc9842 100644 --- a/server_status.php +++ b/server_status.php @@ -21,11 +21,13 @@ require_once './libraries/common.inc.php'; * Ajax request */ -// Prevent ajax requests from being cached if (isset($_REQUEST['ajax_request'])) { - header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 - header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past + // Prevent ajax requests from being cached + header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1 + header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past header_remove('Last-Modified'); + // Send correct charset + header('Content-Type: text/javascript; charset=UTF-8'); if (isset($_REQUEST["query_chart"])) { exit(createQueryChart()); @@ -50,10 +52,10 @@ if (isset($_REQUEST['ajax_request'])) { exit(json_encode($ret)); case 'traffic': $traffic = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Bytes_received" OR Variable_name="Bytes_sent"', 0, 1); - + $ret = Array('x'=>(microtime(true)*1000),'y_sent'=>$traffic['Bytes_sent'],'y_received'=>$traffic['Bytes_received']); exit(json_encode($ret)); - + } } } From 864b846acf2aeb8057c594f62256e462df5ee7bd Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:37:37 +0200 Subject: [PATCH 081/107] Translation update done using Pootle. --- po/fr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 54807d4dcb..fe8e4eb4b8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:36+0200\n" +"PO-Revision-Date: 2011-06-15 14:37+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -8945,6 +8945,7 @@ msgid "" "The maximum number of connections that have been in use simultaneously since " "the server started." msgstr "" +"Le nombre maximum de connexions simultanées depuis le démarrage du serveur." #: server_status.php:915 msgid "The number of rows waiting to be written in INSERT DELAYED queues." From 48627196e77a033b6404347fe0c6dae2f23c8f18 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:39:01 +0200 Subject: [PATCH 082/107] Translation update done using Pootle. --- po/fr.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index fe8e4eb4b8..048d5e74a2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:37+0200\n" +"PO-Revision-Date: 2011-06-15 14:39+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -8977,6 +8977,9 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" +"Le nombre de blocs mémoire libres dans la cache de requêtes. Un nombre élevé " +"peut indiquer des problèmes de fragmentation, qui peuvent être réglés par " +"la commande FLUSH QUERY CACHE." #: server_status.php:921 msgid "The amount of free memory for query cache." From 6094156eb5095870f2729ffae06c27fcdab59c80 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:39:41 +0200 Subject: [PATCH 083/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 048d5e74a2..e035403a59 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9723,10 +9723,9 @@ msgid "Line" msgstr "Ligne" #: tbl_chart.php:88 -#, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "En ligne" +msgstr "Spline" #: tbl_chart.php:89 msgid "Pie" From 4dd9865a350158f0f2360c08e46e9a3d68bba03d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:41:12 +0200 Subject: [PATCH 084/107] Translation update done using Pootle. --- po/fr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index e035403a59..f75223b6e0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:39+0200\n" +"PO-Revision-Date: 2011-06-15 14:41+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -9736,10 +9736,9 @@ msgid "Stacked" msgstr "En piles" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "Titre du rapport :" +msgstr "Titre du graphique" #: tbl_chart.php:99 msgid "X-Axis:" From 940e473b01d5c5243edd7bd072fc2ba4e09533f8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:41:49 +0200 Subject: [PATCH 085/107] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index f75223b6e0..7603f8aef9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9742,7 +9742,7 @@ msgstr "Titre du graphique" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "Axe des X" #: tbl_chart.php:113 #, fuzzy From 62da72ed8247c2dd82ab511e2e990546164c164e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:46:05 +0200 Subject: [PATCH 086/107] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7603f8aef9..433ad0301f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-14 17:22+0200\n" -"PO-Revision-Date: 2011-06-15 14:41+0200\n" +"PO-Revision-Date: 2011-06-15 14:46+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -26,7 +26,7 @@ msgstr "Tout afficher" #: libraries/schema/Pdf_Relation_Schema.class.php:1114 #: libraries/schema/User_Schema.class.php:360 msgid "Page number:" -msgstr "Page n°: " +msgstr "Page n° : " #: browse_foreigners.php:133 msgid "" From 4a50bbcef57598261ee4357bf95fbab04159cc8c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 14:46:22 +0200 Subject: [PATCH 087/107] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 433ad0301f..5911ceb027 100644 --- a/po/fr.po +++ b/po/fr.po @@ -36,7 +36,7 @@ msgid "" msgstr "" "La fenêtre demandée depuis votre navigateur ne peut être rafraîchie. Il est " "possible que vous ayez fermé la fenêtre source , ou encore que votre " -"navigateur bloque les mises à jour inter-fenêtres pour des raisons de " +"navigateur bloque les mises à jour entre fenêtres pour des raisons de " "sécurité." #: browse_foreigners.php:151 libraries/common.lib.php:2747 From 1baf5c7e4c8e24ad049061b142a1889cc687eaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 15 Jun 2011 15:50:49 +0200 Subject: [PATCH 088/107] Send correct mime type (the reply is actually HTML) --- server_status.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_status.php b/server_status.php index 7db187b17d..6e80d7e7a6 100644 --- a/server_status.php +++ b/server_status.php @@ -27,7 +27,7 @@ if (isset($_REQUEST['ajax_request'])) { header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past header_remove('Last-Modified'); // Send correct charset - header('Content-Type: text/javascript; charset=UTF-8'); + header('Content-Type: text/html; charset=UTF-8'); if (isset($_REQUEST["query_chart"])) { exit(createQueryChart()); From f05a988b86049fae9eadfa0c1f29cb020d332930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 15 Jun 2011 15:50:56 +0200 Subject: [PATCH 089/107] Whitespace cleanup --- server_status.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server_status.php b/server_status.php index 6e80d7e7a6..2f06abd8f4 100644 --- a/server_status.php +++ b/server_status.php @@ -52,10 +52,10 @@ if (isset($_REQUEST['ajax_request'])) { exit(json_encode($ret)); case 'traffic': $traffic = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Bytes_received" OR Variable_name="Bytes_sent"', 0, 1); - + $ret = Array('x'=>(microtime(true)*1000),'y_sent'=>$traffic['Bytes_sent'],'y_received'=>$traffic['Bytes_received']); exit(json_encode($ret)); - + } } } From 396e4e99799c91a8c39f2bbe156e6795cdef6ee5 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 15 Jun 2011 20:06:26 +0530 Subject: [PATCH 090/107] bug #3315741 [display] Inline query edit broken --- ChangeLog | 3 ++- js/functions.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d2d054855..5e40b2e14f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -phpMyAdmin - ChangeLog +phpMyAdmin - ChangeLog ====================== 3.4.3.0 (not yet released) @@ -10,6 +10,7 @@ - bug #3313210 [interface] Columns class sometimes changed for nothing - patch #3313326 [interface] Some tooltips do not disappear - bug #3315720 [search] Fix search in non unicode tables +- bug #3315741 [display] Inline query edit broken 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/functions.js b/js/functions.js index cfbb25fc4a..35ec292336 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1116,7 +1116,7 @@ function changeMIMEType(db, table, reference, mime_type) * Jquery Coding for inline editing SQL_QUERY */ $(document).ready(function(){ - $(".inline_edit_sql").click( function(){ + $(".inline_edit_sql").live('click', function(){ var db = $(this).prev().find("input[name='db']").val(); var table = $(this).prev().find("input[name='table']").val(); var token = $(this).prev().find("input[name='token']").val(); From 90c0dc425e350b091d73a55534f0d858e035e9a7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 16:58:22 +0200 Subject: [PATCH 091/107] Translation update done using Pootle. --- po/en_GB.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index b5b3572ca8..eeb64c023f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-15 02:35+0200\n" +"PO-Revision-Date: 2011-06-15 16:58+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: english-gb \n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -4900,10 +4900,9 @@ msgid "Language" msgstr "Language" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Textarea columns" +msgstr "Restore column order" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" From 1c43a338610e023ce94f9484f73c2e8848b14a3f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 16:58:29 +0200 Subject: [PATCH 092/107] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index eeb64c023f..f244ffb87c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4906,7 +4906,7 @@ msgstr "Restore column order" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Drag to reorder" #: libraries/display_tbl.lib.php:412 #, fuzzy From f347b564bee2e3ad90c90790ebb2e1cb11455d59 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 16:58:38 +0200 Subject: [PATCH 093/107] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index f244ffb87c..a0caa6e99a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4909,10 +4909,9 @@ msgid "Drag to reorder" msgstr "Drag to reorder" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Click to select" +msgstr "Click to sort" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" From 5d16747f00a6492e70e36a60fc0232fa3ec92fd0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 16:58:45 +0200 Subject: [PATCH 094/107] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index a0caa6e99a..ce8c8c8cd5 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4915,7 +4915,7 @@ msgstr "Click to sort" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "Click to mark/unmark" #: libraries/display_tbl.lib.php:425 #, php-format From a22921f7b576217d6fdcca28dfaf7134e6bd047b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 16:59:24 +0200 Subject: [PATCH 095/107] Translation update done using Pootle. --- po/fr.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 38c6b0ef9c..59459c1549 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-15 14:46+0200\n" +"PO-Revision-Date: 2011-06-15 16:59+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -4960,10 +4960,9 @@ msgid "Language" msgstr "Langue" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Taille horizontale pour une zone de texte" +msgstr "Restaurer l'ordre des colonnes" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" From 63d4ddf9895e063f65aa573a0daeff2f58101e18 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:00:25 +0200 Subject: [PATCH 096/107] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 59459c1549..2ede718595 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-15 16:59+0200\n" +"PO-Revision-Date: 2011-06-15 17:00+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -4966,7 +4966,7 @@ msgstr "Restaurer l'ordre des colonnes" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Faites glisser pour réordonner" #: libraries/display_tbl.lib.php:412 #, fuzzy From e65b1bec7aa9d6d158bcdc279086af822077806d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:00:33 +0200 Subject: [PATCH 097/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2ede718595..03d6f70a07 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4969,10 +4969,9 @@ msgid "Drag to reorder" msgstr "Faites glisser pour réordonner" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Cliquer pour sélectionner" +msgstr "Cliquer pour trier" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" From 19845079c29f08de54044e7b12d0c21b59a79dbe Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:00:47 +0200 Subject: [PATCH 098/107] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 03d6f70a07..d71960825a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4966,7 +4966,7 @@ msgstr "Restaurer l'ordre des colonnes" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "Faites glisser pour réordonner" +msgstr "Faire glisser pour réordonner" #: libraries/display_tbl.lib.php:412 #| msgid "Click to select" From baa7ffb28fa89caf989f3b3494450d1b3b413f57 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:01:34 +0200 Subject: [PATCH 099/107] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index d71960825a..414bcee1af 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-15 17:00+0200\n" +"PO-Revision-Date: 2011-06-15 17:01+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -4975,7 +4975,7 @@ msgstr "Cliquer pour trier" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "Cliquer pour marquer/enlever les marques" #: libraries/display_tbl.lib.php:425 #, php-format From 3bcdbd2b34f7d71383944364658a0684cadb7d2e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:02:08 +0200 Subject: [PATCH 100/107] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 414bcee1af..1b455df33c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-15 17:01+0200\n" +"PO-Revision-Date: 2011-06-15 17:02+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" From 589272937f4458713a5cda41b19687113dc7b676 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:02:37 +0200 Subject: [PATCH 101/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 1b455df33c..65e17af44f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9762,10 +9762,9 @@ msgid "X-Axis:" msgstr "Axe des X" #: tbl_chart.php:113 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "Requêtes SQL" +msgstr "Séries:" #: tbl_chart.php:115 #, fuzzy From dbc95a1114f3a8194dd72a5b664debd3cea7a9ad Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:02:47 +0200 Subject: [PATCH 102/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 65e17af44f..7c1b91c445 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9767,10 +9767,9 @@ msgid "Series:" msgstr "Séries:" #: tbl_chart.php:115 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Taille horizontale pour une zone de texte" +msgstr "Les colonnes restantes" #: tbl_chart.php:128 #, fuzzy From 1f7452532f257f09fbfe1be3ce01a20f825570b5 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:02:57 +0200 Subject: [PATCH 103/107] Translation update done using Pootle. --- po/fr.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 7c1b91c445..0328984564 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9772,7 +9772,6 @@ msgid "The remaining columns" msgstr "Les colonnes restantes" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" msgstr "Étiquette pour l'axe des X" From 1924fe1690d9625f36e5fb176381ecccc19d7abe Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:03:06 +0200 Subject: [PATCH 104/107] Translation update done using Pootle. --- po/fr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0328984564..b9a40d950d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-15 17:02+0200\n" +"PO-Revision-Date: 2011-06-15 17:03+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -9777,10 +9777,9 @@ msgid "X-Axis label:" msgstr "Étiquette pour l'axe des X" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Valeur" +msgstr "Valeurs en X" #: tbl_chart.php:129 #, fuzzy From bbc1ff47aed0e24b8f8774222e715f098cc2c4d8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:03:12 +0200 Subject: [PATCH 105/107] Translation update done using Pootle. --- po/fr.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index b9a40d950d..4588ac5d7f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9782,7 +9782,6 @@ msgid "X Values" msgstr "Valeurs en X" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" msgstr "Étiquette pour l'axe des Y" From 56a2e05ccd7c3dba725d00cdb7e18e7f32b94998 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Jun 2011 17:03:18 +0200 Subject: [PATCH 106/107] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4588ac5d7f..9228b925ce 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9787,10 +9787,9 @@ msgid "Y-Axis label:" msgstr "Étiquette pour l'axe des Y" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Valeur" +msgstr "Valeurs en Y" #: tbl_create.php:56 #, php-format From 0aa13c5497949196c156c9984b70b8c70fe56709 Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Wed, 15 Jun 2011 19:20:19 +0200 Subject: [PATCH 107/107] No php5.3 dependency & fixes ajax requests broken --- server_status.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/server_status.php b/server_status.php index 1875dc9842..0b8a725836 100644 --- a/server_status.php +++ b/server_status.php @@ -25,13 +25,10 @@ if (isset($_REQUEST['ajax_request'])) { // Prevent ajax requests from being cached header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1 header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past - header_remove('Last-Modified'); // Send correct charset - header('Content-Type: text/javascript; charset=UTF-8'); + header('Content-Type: text/html; charset=UTF-8'); - if (isset($_REQUEST["query_chart"])) { - exit(createQueryChart()); - } + // real-time charting data if(isset($_REQUEST['chart_data'])) { switch($_REQUEST['type']) { case 'proc':