- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3RC1-8-ge8ee4eb
by Rouslan Placella 22 Jun '11

22 Jun '11

The branch, QA_3_4 has been updated via e8ee4eb11b784b56d51bf4d37dd4811e8d213569 (commit) from 9e224184d786068317b801291c8f960109f0bdc5 (commit) - Log ----------------------------------------------------------------- commit e8ee4eb11b784b56d51bf4d37dd4811e8d213569 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Jun 22 12:51:16 2011 +0100 Fixed changelog (bugfixes for 3.4.4, were filed under 3.4.3) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e12b271..70dab96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ phpMyAdmin - ChangeLog ====================== 3.4.4.0 (not yet released) +- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes +- bug #3323101 [parser] Invalid escape sequence in SQL parser 3.4.3.0 (not yet released) - bug #3311170 [sync] Missing helper icons in Synchronize @@ -17,8 +19,6 @@ phpMyAdmin - ChangeLog - bug #3317293 [edit] Inline edit places HTML line breaks in edit area - bug #3319466 [interface] Inline query edit does not escape special characters - minor XSS (require a valid token) -- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes -- bug #3323101 [parser] Invalid escape sequence in SQL parser 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4769-g4b75560
by Rouslan Placella 22 Jun '11

22 Jun '11

The branch, master has been updated via 4b75560c3b08ccdaff7cf427e747d83a6ff3ca54 (commit) via bcedd1c97a4776b3bc0b76cfee1f0a11f2fdebdc (commit) from 6286494b91e9ef291db697715b6ae4f96146b7a1 (commit) - Log ----------------------------------------------------------------- commit 4b75560c3b08ccdaff7cf427e747d83a6ff3ca54 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Jun 22 12:51:16 2011 +0100 Fixed changelog (bugfixes for 3.4.4, were filed under 3.4.3) commit bcedd1c97a4776b3bc0b76cfee1f0a11f2fdebdc Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Jun 22 12:49:21 2011 +0100 Fixed jumpy animation in PMA_slidingMessage() ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++-- js/functions.js | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85b66b8..16c8f88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,8 @@ phpMyAdmin - ChangeLog + [display] GIS data visualization 3.4.4.0 (not yet released) +- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes +- bug #3323101 [parser] Invalid escape sequence in SQL parser 3.4.3.0 (not yet released) - bug #3311170 [sync] Missing helper icons in Synchronize @@ -42,8 +44,6 @@ phpMyAdmin - ChangeLog - bug #3317293 [edit] Inline edit places HTML line breaks in edit area - bug #3319466 [interface] Inline query edit does not escape special characters - minor XSS (require a valid token) -- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes -- bug #3323101 [parser] Invalid escape sequence in SQL parser 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 f0966d0..436805c 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2468,7 +2468,8 @@ function PMA_slidingMessage(msg, $obj) { // we might have to create a new DOM node. if ($('#PMA_slidingMessage').length == 0) { $('#topmenucontainer') - .after('<span id="PMA_slidingMessage"></span>'); + .after('<span id="PMA_slidingMessage" ' + + 'style="display: inline-block;"></span>'); } $obj = $('#PMA_slidingMessage'); } @@ -2494,12 +2495,20 @@ function PMA_slidingMessage(msg, $obj) { } else { // Object does not already have a message // inside it, so we simply slide it down + var h = $obj + .width('100%') + .html('<div style="display: none;">' + msg + '</div>') + .find('div') + .first() + .height(); $obj - .width('100%') - .html('<div style="display: none;">' + msg + '</div>') .find('div') .first() - .slideDown(function() { + .css('height', 0) + .show() + .animate({ + height: h + }, function() { // Set the height of the parent // to the height of the child $obj hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4767-g6286494
by Michal Čihař 22 Jun '11

22 Jun '11

The branch, master has been updated via 6286494b91e9ef291db697715b6ae4f96146b7a1 (commit) via 2c75df36168154268f17836cd1e5731bb0ea256b (commit) via c16bb47bb100b10b1c69c2b68409e6bd5d877148 (commit) via c61fc2be84d093d22bda2e4418b482bcad238c17 (commit) via 5c73e476c8b2a0fed9b465544a749b4641fc3f64 (commit) via 8896aadb55920cf0833516e11bfc4251b131ebf6 (commit) via 4ffb2cc323d4e726ba2ac8985a7c9724ef7f3a42 (commit) via b4a63b224ab46fb7c9ab6ea7e4045b9b5dd8ad71 (commit) via c93594628416432dc3227a06e6850f178ff4464a (commit) via b6a5c99b2b8990b277073e0c0a36e40a695da4f7 (commit) via c0b4d3b983d36fd1b7811310e08931d7d013dedd (commit) via bd8d8487bc18a1661b310806b89e503ed523bdbc (commit) via 1044574de9d61dc2a2ae0827da62a860e3325869 (commit) via 1c269941e0d456af3ec98a22969b58ad58e84687 (commit) via dc2116ed7fb3d7d90da2087c5e76e0cb2aa1121b (commit) via 8189fdc7f6236774ce7613e3ed3f065d23665567 (commit) via 97b956e03c13e4f3bbea126636644571b2a89e36 (commit) via 9870c3e5e1df34bb5a31f860968ca8afb484c0c3 (commit) via c3c1c746d5debdd89fa852e5e01171d9b6cc5850 (commit) via ba120c7e406a161f1653831d831e1754ee7d5d11 (commit) via e4647c88b435639eb49d42f3dfada4890ff9752c (commit) via 07308bf836a2088cd0577f24d926fb25d17459da (commit) via 3b39cad6fad00ecf3b844362d862b6745dca6fba (commit) via 6c4b57905b492b5dfdf476cdb8b01d2b1b142ca9 (commit) via 3f187c88ac558a419ff81ff8faa4fdb1661b9c00 (commit) via 07567716f4434c9c0da902e1aae7889214ce5554 (commit) via c889d2eb177410d5df50ad5785bcb2e91cd2f815 (commit) via fb018efebc420598734620de7c006470a8614420 (commit) via 2052e19ed840859761cd1266c83a3b8f40e829af (commit) from 60dad887b00398be8821196b8c397ec06a21082d (commit) - Log ----------------------------------------------------------------- commit 6286494b91e9ef291db697715b6ae4f96146b7a1 Merge: 60dad887b00398be8821196b8c397ec06a21082d 2c75df36168154268f17836cd1e5731bb0ea256b Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 13:24:13 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 2c75df36168154268f17836cd1e5731bb0ea256b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 12:41:30 2011 +0200 Translation update done using Pootle. commit c16bb47bb100b10b1c69c2b68409e6bd5d877148 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 12:33:43 2011 +0200 Translation update done using Pootle. commit c61fc2be84d093d22bda2e4418b482bcad238c17 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 12:31:42 2011 +0200 Translation update done using Pootle. commit 5c73e476c8b2a0fed9b465544a749b4641fc3f64 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 12:13:01 2011 +0200 Translation update done using Pootle. commit 8896aadb55920cf0833516e11bfc4251b131ebf6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 12:02:16 2011 +0200 Translation update done using Pootle. commit 4ffb2cc323d4e726ba2ac8985a7c9724ef7f3a42 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:59:26 2011 +0200 Translation update done using Pootle. commit b4a63b224ab46fb7c9ab6ea7e4045b9b5dd8ad71 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:57:54 2011 +0200 Translation update done using Pootle. commit c93594628416432dc3227a06e6850f178ff4464a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:56:53 2011 +0200 Translation update done using Pootle. commit b6a5c99b2b8990b277073e0c0a36e40a695da4f7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:52:20 2011 +0200 Translation update done using Pootle. commit c0b4d3b983d36fd1b7811310e08931d7d013dedd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:49:39 2011 +0200 Translation update done using Pootle. commit bd8d8487bc18a1661b310806b89e503ed523bdbc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:47:35 2011 +0200 Translation update done using Pootle. commit 1044574de9d61dc2a2ae0827da62a860e3325869 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:46:27 2011 +0200 Translation update done using Pootle. commit 1c269941e0d456af3ec98a22969b58ad58e84687 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:42:42 2011 +0200 Translation update done using Pootle. commit dc2116ed7fb3d7d90da2087c5e76e0cb2aa1121b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:35:44 2011 +0200 Translation update done using Pootle. commit 8189fdc7f6236774ce7613e3ed3f065d23665567 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:28:36 2011 +0200 Translation update done using Pootle. commit 97b956e03c13e4f3bbea126636644571b2a89e36 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:28:27 2011 +0200 Translation update done using Pootle. commit 9870c3e5e1df34bb5a31f860968ca8afb484c0c3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:27:54 2011 +0200 Translation update done using Pootle. commit c3c1c746d5debdd89fa852e5e01171d9b6cc5850 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:26:26 2011 +0200 Translation update done using Pootle. commit ba120c7e406a161f1653831d831e1754ee7d5d11 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:25:52 2011 +0200 Translation update done using Pootle. commit e4647c88b435639eb49d42f3dfada4890ff9752c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:25:03 2011 +0200 Translation update done using Pootle. commit 07308bf836a2088cd0577f24d926fb25d17459da Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:24:28 2011 +0200 Translation update done using Pootle. commit 3b39cad6fad00ecf3b844362d862b6745dca6fba Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:23:44 2011 +0200 Translation update done using Pootle. commit 6c4b57905b492b5dfdf476cdb8b01d2b1b142ca9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:23:10 2011 +0200 Translation update done using Pootle. commit 3f187c88ac558a419ff81ff8faa4fdb1661b9c00 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:22:07 2011 +0200 Translation update done using Pootle. commit 07567716f4434c9c0da902e1aae7889214ce5554 Merge: c889d2eb177410d5df50ad5785bcb2e91cd2f815 8c6e88002232949f539b989b73cb97a6e5ff3eca Author: Pootle server <pootle(a)cihar.com> Date: Wed Jun 22 11:21:58 2011 +0200 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit c889d2eb177410d5df50ad5785bcb2e91cd2f815 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:20:43 2011 +0200 Translation update done using Pootle. commit fb018efebc420598734620de7c006470a8614420 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:19:57 2011 +0200 Translation update done using Pootle. commit 2052e19ed840859761cd1266c83a3b8f40e829af Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:18:20 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 67 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 31 insertions(+), 36 deletions(-) diff --git a/po/ja.po b/po/ja.po index 983e7c6..649cd10 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(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-22 10:16+0200\n" -"PO-Revision-Date: 2011-06-22 11:17+0200\n" +"PO-Revision-Date: 2011-06-22 12:41+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -124,7 +124,7 @@ msgstr "データベース %1$s を作成しました。" #: db_datadict.php:48 db_operations.php:362 msgid "Database comment: " -msgstr "データベースのコメント:" +msgstr "データベースのコメント" #: db_datadict.php:157 libraries/schema/Pdf_Relation_Schema.class.php:1210 #: libraries/tbl_properties.inc.php:714 tbl_operations.php:362 @@ -507,7 +507,7 @@ msgstr "SQL は正常に実行されました" #, php-format msgid "%d row affected by the last statement inside the procedure" msgid_plural "%d rows affected by the last statement inside the procedure" -msgstr[0] "" +msgstr[0] "プロシージャ内の最後のステートメントは %d 行の変更を行いました" #: db_routines.php:165 #, php-format @@ -573,7 +573,7 @@ msgstr "ルーチン %1$s を作成しました。" #: db_routines.php:330 msgid "<b>One or more errors have occured while processing your request:</b>" -msgstr "" +msgstr "<b>リクエストの処理中に 1 つ以上のエラーが発生しました：</b>" #: db_routines.php:374 msgid "Create routine" @@ -589,6 +589,9 @@ msgid "" "handling multi queries. <b>The execution of some stored routines may fail!</" "b> Please use the improved 'mysqli' extension to avoid any problems." msgstr "" +"「mysql」拡張を使用されていますが、将来的に PHP " +"で廃止予定になっています。この拡張はマルチクエリに対応できていません。<b>ストアドルーチンの実行が失敗する可能性があります！</b> " +"問題を回避するためには、改良された「mysqli」拡張を使用するようにしてください。" #: db_search.php:54 libraries/auth/config.auth.lib.php:83 #: libraries/auth/config.auth.lib.php:102 @@ -658,7 +661,6 @@ msgid "Search in database" msgstr "データベース内検索" #: db_search.php:300 -#, fuzzy #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgid "Words or values to search for (wildcard: \"%\"):" msgstr "検索する単語や値 (ワイルドカード: \"%\"):" @@ -672,7 +674,6 @@ msgid "Words are separated by a space character (\" \")." msgstr "各単語は空白文字(\" \")で区切ってください" #: db_search.php:323 -#, fuzzy #| msgid "Inside table(s):" msgid "Inside tables:" msgstr "検索するテーブル:" @@ -1169,7 +1170,7 @@ msgstr "合計" #. l10n: Other, small valued, queries #: js/messages.php:72 server_status.php:602 msgid "Other" -msgstr "" +msgstr "その他" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1374 @@ -1722,7 +1723,7 @@ msgstr "インデックスが定義されていません!" #: libraries/Index.class.php:435 libraries/build_html_for_db.lib.php:40 #: tbl_tracking.php:309 msgid "Indexes" -msgstr "インデックスサイズ" +msgstr "インデックス" #: libraries/Index.class.php:446 libraries/tbl_properties.inc.php:503 #: tbl_structure.php:157 tbl_structure.php:162 tbl_structure.php:606 @@ -2329,7 +2330,7 @@ msgstr "アップロードファイルがありません" #: libraries/common.lib.php:2964 libraries/common.lib.php:2965 msgid "Execute" -msgstr "" +msgstr "実行" #: libraries/config.values.php:45 libraries/config.values.php:47 #: libraries/config.values.php:51 @@ -4682,22 +4683,22 @@ msgid "The %s extension is missing. Please check your PHP configuration." msgstr "%s 拡張がありません。PHP の設定をチェックしてみてください。" #: libraries/db_events.inc.php:30 -#, fuzzy, php-format +#, php-format #| msgid "Export contents" msgid "Export of event %s" -msgstr "内容をエクスポートする" +msgstr "イベント %s をエクスポートする" #: libraries/db_events.inc.php:34 -#, fuzzy, php-format +#, php-format #| msgid "Export contents" msgid "Export of event \"%s\"" -msgstr "内容をエクスポートする" +msgstr "イベント \"%s\" をエクスポートする" #: libraries/db_events.inc.php:40 -#, fuzzy, php-format +#, php-format #| msgid "No tables found in database" msgid "No event with name %s found in database %s" -msgstr "このデータベースにはテーブルがありません" +msgstr "データベース %2$s に %1$s という名前のイベントはありません" #: libraries/db_events.inc.php:56 libraries/db_links.inc.php:101 #: libraries/export/sql.php:609 @@ -4705,10 +4706,9 @@ msgid "Events" msgstr "イベント" #: libraries/db_events.inc.php:58 libraries/db_events.inc.php:60 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no events to display." -msgstr "アップロードファイルがありません" +msgstr "表示できるイベントがありません" #: libraries/db_events.inc.php:67 libraries/db_routines.lib.php:690 #: libraries/db_routines.lib.php:846 libraries/db_routines.lib.php:1214 @@ -4735,10 +4735,9 @@ msgid "Turn it off" msgstr "" #: libraries/db_events.inc.php:141 -#, fuzzy #| msgid "Add a new server" msgid "Add a new Event" -msgstr "新しいサーバの追加" +msgstr "新しいイベントを追加する" #: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43 #: libraries/db_links.inc.php:44 @@ -4792,10 +4791,9 @@ msgid "Parameters" msgstr "パラメータ" #: libraries/db_routines.lib.php:689 -#, fuzzy #| msgid "Direct links" msgid "Direction" -msgstr "直リンク" +msgstr "入出力" #: libraries/db_routines.lib.php:692 libraries/tbl_properties.inc.php:105 msgid "Length/Values" @@ -4846,10 +4844,9 @@ msgid "Return options" msgstr "テーブルオプション" #: libraries/db_routines.lib.php:745 -#, fuzzy #| msgid "Description" msgid "Definition" -msgstr "説明" +msgstr "定義" #: libraries/db_routines.lib.php:749 msgid "Is deterministic" @@ -4886,26 +4883,26 @@ msgstr "値" #: libraries/db_routines.lib.php:965 msgid "You must provide a routine name" -msgstr "ルーチン名を入力する必要があります" +msgstr "ルーチン名は必須です" #: libraries/db_routines.lib.php:984 #, php-format msgid "Invalid direction \"%s\" given for parameter." -msgstr "" +msgstr "パラメータに対して不正な入出力「%s」が与えられています。" #: libraries/db_routines.lib.php:995 libraries/db_routines.lib.php:1036 msgid "" "You must provide length/values for routine parameters of type ENUM, SET, " "VARCHAR and VARBINARY." -msgstr "" +msgstr "ルーチンパラメータが ENUM、SET、VARCHAR、VARBINARY の場合、長さ/値は必須です。" #: libraries/db_routines.lib.php:1020 msgid "You must provide a name and a type for each routine parameter." -msgstr "" +msgstr "ルーチンの各パラメータに対して、名前と種別は必須です" #: libraries/db_routines.lib.php:1077 msgid "You must provide a routine definition." -msgstr "" +msgstr "ルーチンの定義は必須です" #: libraries/db_routines.lib.php:1209 msgid "There are no routines to display." @@ -5239,20 +5236,18 @@ msgid "Language" msgstr "言語" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "textarea の 1 行の文字数" +msgstr "カラムの順番を元に戻す" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "ドラッグでカラムの入れ替え" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "クリックで選択" +msgstr "クリックでソート" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" @@ -10238,11 +10233,11 @@ msgstr "\"query by example\"を実行 (ワイルドカード: \"%\")" #: tbl_select.php:234 msgid "Select columns (at least one):" -msgstr "カラムを選択してください(最低 1 つ):" +msgstr "カラムを選択してください (最低 1 つ)" #: tbl_select.php:252 msgid "Add search conditions (body of the \"where\" clause):" -msgstr "検索条件(\"where\"節の内容)を追加してください:" +msgstr "または検索条件 (WHERE 節の内容) を追加してください" #: tbl_select.php:259 msgid "Number of rows per page" @@ -10250,7 +10245,7 @@ msgstr "ページあたりの行数" #: tbl_select.php:265 msgid "Display order:" -msgstr "表示順:" +msgstr "表示順" #: tbl_structure.php:158 tbl_structure.php:163 tbl_structure.php:611 msgid "Spatial" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4738-g60dad88
by Michal Čihař 22 Jun '11

22 Jun '11

The branch, master has been updated via 60dad887b00398be8821196b8c397ec06a21082d (commit) from 8c6e88002232949f539b989b73cb97a6e5ff3eca (commit) - Log ----------------------------------------------------------------- commit 60dad887b00398be8821196b8c397ec06a21082d Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 13:23:35 2011 +0200 Fix condition for mcrypt warning ----------------------------------------------------------------------- Summary of changes: main.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/main.php b/main.php index fecb0d7..f340e80 100644 --- a/main.php +++ b/main.php @@ -344,7 +344,7 @@ if ($cfg['SuhosinDisableWarning'] == false && @ini_get('suhosin.request.max_valu /** * Warning about mcrypt. */ -if (!$GLOBALS['cfg']['McryptDisableWarning']) { +if (!function_exists('mcrypt_encrypt') && !$GLOBALS['cfg']['McryptDisableWarning']) { PMA_warnMissingExtension('mcrypt'); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4737-g8c6e880
by Michal Čihař 22 Jun '11

22 Jun '11

The branch, master has been updated via 8c6e88002232949f539b989b73cb97a6e5ff3eca (commit) via 7f817f50eba7d7bc8bab407000c7f7e0cb2ba914 (commit) from 4aa470e27e354c30865d6c78eec4de7653759859 (commit) - Log ----------------------------------------------------------------- commit 8c6e88002232949f539b989b73cb97a6e5ff3eca Merge: 4aa470e27e354c30865d6c78eec4de7653759859 7f817f50eba7d7bc8bab407000c7f7e0cb2ba914 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 11:17:52 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 7f817f50eba7d7bc8bab407000c7f7e0cb2ba914 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 22 11:17:40 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 88a6d19..983e7c6 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(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-22 10:16+0200\n" -"PO-Revision-Date: 2011-06-21 12:38+0200\n" +"PO-Revision-Date: 2011-06-22 11:17+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -290,7 +290,7 @@ msgstr "データベース %s を削除しました" #: db_operations.php:457 msgid "Drop the database (DROP)" -msgstr "データベースを削除する(DROP)" +msgstr "データベースを削除する (DROP)" #: db_operations.php:487 msgid "Copy database to" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4735-g4aa470e
by Michal Čihař 22 Jun '11

22 Jun '11

The branch, master has been updated via 4aa470e27e354c30865d6c78eec4de7653759859 (commit) via e0c7147806d2d4ec9c7f5f0d26e95dd1be67940e (commit) via 568a0e03deed56b53379fe27468840c2e525c0e7 (commit) from 83850004da19238eeaf338293b66b80177d7c3d3 (commit) - Log ----------------------------------------------------------------- commit 4aa470e27e354c30865d6c78eec4de7653759859 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 11:03:38 2011 +0200 Indentation fixes commit e0c7147806d2d4ec9c7f5f0d26e95dd1be67940e Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 11:02:13 2011 +0200 This is a fatal error rather than place for warning It is not necessary to translate as this really should not happen. commit 568a0e03deed56b53379fe27468840c2e525c0e7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 11:00:45 2011 +0200 Show mcrypt waring only on main page and not on every page ----------------------------------------------------------------------- Summary of changes: libraries/auth/cookie.auth.lib.php | 14 +++++--------- main.php | 7 +++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 23b6ff0..8660ff0 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -28,13 +28,12 @@ if (function_exists('mcrypt_encrypt')) { * further decryption. I don't think necessary to have one iv * per server so I don't put the server number in the cookie name. */ - if (empty($_COOKIE['pma_mcrypt_iv']) - || false === ($iv = base64_decode($_COOKIE['pma_mcrypt_iv'], true))) { + if (empty($_COOKIE['pma_mcrypt_iv']) || false === ($iv = base64_decode($_COOKIE['pma_mcrypt_iv'], true))) { srand((double) microtime() * 1000000); - $td = mcrypt_module_open(MCRYPT_BLOWFISH, '', MCRYPT_MODE_CBC, ''); - if ($td === false) { - PMA_warnMissingExtension('mcrypt'); - } + $td = mcrypt_module_open(MCRYPT_BLOWFISH, '', MCRYPT_MODE_CBC, ''); + if ($td === false) { + die('Failed to use Blowfish from mcrypt!'); + } $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND); $GLOBALS['PMA_Config']->setCookie('pma_mcrypt_iv', base64_encode($iv)); } @@ -75,9 +74,6 @@ if (function_exists('mcrypt_encrypt')) { } else { require_once './libraries/blowfish.php'; - if (!$GLOBALS['cfg']['McryptDisableWarning']) { - PMA_warnMissingExtension('mcrypt'); - } } /** diff --git a/main.php b/main.php index c508bd0..fecb0d7 100644 --- a/main.php +++ b/main.php @@ -342,6 +342,13 @@ if ($cfg['SuhosinDisableWarning'] == false && @ini_get('suhosin.request.max_valu } /** + * Warning about mcrypt. + */ +if (!$GLOBALS['cfg']['McryptDisableWarning']) { + PMA_warnMissingExtension('mcrypt'); +} + +/** * Warning about incomplete translations. * * The data file is created while creating release by ./scripts/remove-incomplete-mo hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4732-g8385000
by Michal Čihař 22 Jun '11

22 Jun '11

The branch, master has been updated via 83850004da19238eeaf338293b66b80177d7c3d3 (commit) from 5e28671e752d7e0d365600387e8f2d79707c4a51 (commit) - Log ----------------------------------------------------------------- commit 83850004da19238eeaf338293b66b80177d7c3d3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 10:47:01 2011 +0200 Fix format string ----------------------------------------------------------------------- Summary of changes: po/br.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/br.po b/po/br.po index 54d47ac..ae00171 100644 --- a/po/br.po +++ b/po/br.po @@ -124,7 +124,7 @@ msgstr "" #: db_create.php:58 #, php-format msgid "Database %1$s has been created." -msgstr "Krouet eo bet an diaz roadennoù % 1$s." +msgstr "Krouet eo bet an diaz roadennoù %1$s." #: db_datadict.php:48 db_operations.php:362 msgid "Database comment: " hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4731-g5e28671
by Michal Čihař 22 Jun '11

22 Jun '11

The branch, master has been updated via 5e28671e752d7e0d365600387e8f2d79707c4a51 (commit) via dafe9a17c6ba6185f9141f694a3332105dac065a (commit) via 5f127dd3f0ee7758e17bdcaf022c6bbebd171f86 (commit) via f0aa35c24f810eef925e9678b8b282a497ef71f4 (commit) via 6ca5d5ba45737a365e256dae901c8685a1fdd969 (commit) via 01543b145bcbca5a67b995b35a9cec56d04365ad (commit) via 4d8a524041573fc67903f9484bd29195cacd4268 (commit) via 6a34a1e226250ae298c05bab16b0728616805e73 (commit) via 394b14ff4d1524e6771a11c1e2c55b13da965794 (commit) via a56e9b06c06555ca41966c22f899f3dab66842d7 (commit) via 1678570af416fe42331eaf4c9c5c77067fd72323 (commit) via dcd265fa5f9d66a5dcfe8bb6cadb0f0d64bccdae (commit) via da6b529a3347965a467aae56ac2f715966267c19 (commit) via 8a59e55551ad0cda95355df363fd41fed707967c (commit) via a0778d3723735c49abe8a8ce8c5cbf28f5fcff3e (commit) via 5fa3e3ca54f527c270cbc94d8d19399c67bbf485 (commit) via 9340121edba31b25b0d7d781295da18a0a1750bb (commit) via 413ab4c0d7d595c3710cefcba3463ddb528f501e (commit) via 0322811b3bf9a06dd0e9d3258668e36be892e6eb (commit) via 0082539406179eb99342a13127e20c94c133fc32 (commit) via b60bb297c01136df7a0dcfe3bc86ab2a6470d064 (commit) via 9194f7a92f04c4976d9f1330d9acec550210c6b7 (commit) via 610b06990f23cbe5c7c5fe08f8a6b06902f9bfb8 (commit) via b6631679f8682a324fb08b94400ce596caa55384 (commit) via e25b6d7e896d5401ae655c4ca2dd3baed9a684e3 (commit) via 935f3c078f89e3c21872f0f8c468c6c1f6e09252 (commit) via 723845ad7b6934f1b7a13c425fd9a76b08902b43 (commit) via 9cb5f1c348ce3b1a1742b92e78c92cf7c7a517e8 (commit) via 7aac981ecf540e8243956298a6887857acb19221 (commit) via 3fc3db9c2aecec4fbf359020d84b0420b0bc6e9b (commit) via b17b5aafb42dc84279fa7d9ae231dc60ce535d57 (commit) via f76a2c5a290feca26cc162fcb389f09aed2f72dd (commit) via 1f73a3d67356800feb7f6e2069d7684aec417ee8 (commit) from 14b3f69f7dacadfe637c1aec5af81d788f2e0c2a (commit) - Log ----------------------------------------------------------------- commit 5e28671e752d7e0d365600387e8f2d79707c4a51 Merge: 4d8a524041573fc67903f9484bd29195cacd4268 dafe9a17c6ba6185f9141f694a3332105dac065a Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 10:46:15 2011 +0200 Merge remote-tracking branch 'pootle/master' commit dafe9a17c6ba6185f9141f694a3332105dac065a Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:46:08 2011 +0200 Translation update done using Pootle. commit 5f127dd3f0ee7758e17bdcaf022c6bbebd171f86 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:45:11 2011 +0200 Translation update done using Pootle. commit f0aa35c24f810eef925e9678b8b282a497ef71f4 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:45:00 2011 +0200 Translation update done using Pootle. commit 6ca5d5ba45737a365e256dae901c8685a1fdd969 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:44:54 2011 +0200 Translation update done using Pootle. commit 01543b145bcbca5a67b995b35a9cec56d04365ad Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:44:44 2011 +0200 Translation update done using Pootle. commit 4d8a524041573fc67903f9484bd29195cacd4268 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 10:44:40 2011 +0200 Fix typo commit 6a34a1e226250ae298c05bab16b0728616805e73 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:44:17 2011 +0200 Translation update done using Pootle. commit 394b14ff4d1524e6771a11c1e2c55b13da965794 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:43:09 2011 +0200 Translation update done using Pootle. commit a56e9b06c06555ca41966c22f899f3dab66842d7 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:43:02 2011 +0200 Translation update done using Pootle. commit 1678570af416fe42331eaf4c9c5c77067fd72323 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:42:57 2011 +0200 Translation update done using Pootle. commit dcd265fa5f9d66a5dcfe8bb6cadb0f0d64bccdae Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:42:25 2011 +0200 Translation update done using Pootle. commit da6b529a3347965a467aae56ac2f715966267c19 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:42:09 2011 +0200 Translation update done using Pootle. commit 8a59e55551ad0cda95355df363fd41fed707967c Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:41:57 2011 +0200 Translation update done using Pootle. commit a0778d3723735c49abe8a8ce8c5cbf28f5fcff3e Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:41:50 2011 +0200 Translation update done using Pootle. commit 5fa3e3ca54f527c270cbc94d8d19399c67bbf485 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:41:39 2011 +0200 Translation update done using Pootle. commit 9340121edba31b25b0d7d781295da18a0a1750bb Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:41:09 2011 +0200 Translation update done using Pootle. commit 413ab4c0d7d595c3710cefcba3463ddb528f501e Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:41:03 2011 +0200 Translation update done using Pootle. commit 0322811b3bf9a06dd0e9d3258668e36be892e6eb Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:40:58 2011 +0200 Translation update done using Pootle. commit 0082539406179eb99342a13127e20c94c133fc32 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:40:48 2011 +0200 Translation update done using Pootle. commit b60bb297c01136df7a0dcfe3bc86ab2a6470d064 Merge: 9194f7a92f04c4976d9f1330d9acec550210c6b7 14b3f69f7dacadfe637c1aec5af81d788f2e0c2a Author: Pootle server <pootle(a)cihar.com> Date: Wed Jun 22 10:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' commit 9194f7a92f04c4976d9f1330d9acec550210c6b7 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:40:01 2011 +0200 Translation update done using Pootle. commit 610b06990f23cbe5c7c5fe08f8a6b06902f9bfb8 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:39:59 2011 +0200 Translation update done using Pootle. commit b6631679f8682a324fb08b94400ce596caa55384 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:39:42 2011 +0200 Translation update done using Pootle. commit e25b6d7e896d5401ae655c4ca2dd3baed9a684e3 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:39:36 2011 +0200 Translation update done using Pootle. commit 935f3c078f89e3c21872f0f8c468c6c1f6e09252 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:39:20 2011 +0200 Translation update done using Pootle. commit 723845ad7b6934f1b7a13c425fd9a76b08902b43 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:39:01 2011 +0200 Translation update done using Pootle. commit 9cb5f1c348ce3b1a1742b92e78c92cf7c7a517e8 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:36:56 2011 +0200 Translation update done using Pootle. commit 7aac981ecf540e8243956298a6887857acb19221 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:36:24 2011 +0200 Translation update done using Pootle. commit 3fc3db9c2aecec4fbf359020d84b0420b0bc6e9b Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:36:12 2011 +0200 Translation update done using Pootle. commit b17b5aafb42dc84279fa7d9ae231dc60ce535d57 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:35:58 2011 +0200 Translation update done using Pootle. commit f76a2c5a290feca26cc162fcb389f09aed2f72dd Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:35:38 2011 +0200 Translation update done using Pootle. commit 1f73a3d67356800feb7f6e2069d7684aec417ee8 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:35:32 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 84 +++++++++++++++++++++++++------------------------------------- 1 files changed, 34 insertions(+), 50 deletions(-) diff --git a/po/cs.po b/po/cs.po index bc46637..dcf8911 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-22 10:16+0200\n" -"PO-Revision-Date: 2011-06-22 10:13+0200\n" +"PO-Revision-Date: 2011-06-22 10:46+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -680,7 +680,6 @@ msgid "Search in database" msgstr "Vyhledávání v databázi" #: db_search.php:300 -#, fuzzy #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgid "Words or values to search for (wildcard: \"%\"):" msgstr "Slova nebo hodnoty, které chcete vyhledat (zástupný znak: „%“):" @@ -694,7 +693,6 @@ msgid "Words are separated by a space character (\" \")." msgstr "Slova jsou oddělena mezerou („ “)." #: db_search.php:323 -#, fuzzy #| msgid "Inside table(s):" msgid "Inside tables:" msgstr "V tabulkách:" @@ -1322,10 +1320,9 @@ msgid "The definition of a stored function must contain a RETURN statement!" msgstr "Definice uložené funkce musí obsahovat příkaz RETURN!" #: js/messages.php:123 -#, fuzzy #| msgid "Missing value in the form!" msgid "Value too long in the form!" -msgstr "Chybějící hodnota ve formuláři!" +msgstr "Hodnota ve formuláři je příliš dlouhá!" #: js/messages.php:126 msgid "" @@ -2103,10 +2100,9 @@ msgid "Check Privileges" msgstr "Zkontrolovat oprávnění" #: libraries/common.inc.php:587 -#, fuzzy #| msgid "Could not save configuration" msgid "Failed to to read configuration file" -msgstr "Nepodařilo se uložit nastavení" +msgstr "Nepodařilo se načíst konfigurační soubor" #: libraries/common.inc.php:588 msgid "" @@ -3155,7 +3151,7 @@ msgstr "Přizpůsobit nastavení okna dotazů" #: libraries/config/messages.inc.php:196 msgid "Security" -msgstr "Zabezpeční" +msgstr "Zabezpečení" #: libraries/config/messages.inc.php:197 msgid "" @@ -4707,22 +4703,22 @@ msgid "The %s extension is missing. Please check your PHP configuration." msgstr "Chybí rozšíření %s. Prosím zkontrolujte nastavení PHP." #: libraries/db_events.inc.php:30 -#, fuzzy, php-format +#, php-format #| msgid "Export contents" msgid "Export of event %s" -msgstr "Exportovat obsah" +msgstr "Exportovat událost %s" #: libraries/db_events.inc.php:34 -#, fuzzy, php-format +#, php-format #| msgid "Export contents" msgid "Export of event \"%s\"" -msgstr "Exportovat obsah" +msgstr "Export události „%s“" #: libraries/db_events.inc.php:40 -#, fuzzy, php-format +#, php-format #| msgid "No tables found in database" msgid "No event with name %s found in database %s" -msgstr "V databázi nebyly nalezeny žádné tabulky" +msgstr "V databázi %2$s nebyla nalezen událost se jménem %1$s" #: libraries/db_events.inc.php:56 libraries/db_links.inc.php:101 #: libraries/export/sql.php:609 @@ -4730,10 +4726,9 @@ msgid "Events" msgstr "Události" #: libraries/db_events.inc.php:58 libraries/db_events.inc.php:60 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no events to display." -msgstr "Nebyl zvolen žádný soubor pro nahrání" +msgstr "Nejsou zde žádné události k zobrazení." #: libraries/db_events.inc.php:67 libraries/db_routines.lib.php:690 #: libraries/db_routines.lib.php:846 libraries/db_routines.lib.php:1214 @@ -4745,25 +4740,24 @@ msgstr "Název" #: libraries/db_events.inc.php:129 msgid "The event scheduler is enabled" -msgstr "" +msgstr "Plánovač událostí je zapnutý" #: libraries/db_events.inc.php:129 msgid "The event scheduler is disabled" -msgstr "" +msgstr "Plánovač událostí je vypnutý" #: libraries/db_events.inc.php:131 msgid "Turn it on" -msgstr "" +msgstr "Zapnout" #: libraries/db_events.inc.php:131 msgid "Turn it off" -msgstr "" +msgstr "Vypnout" #: libraries/db_events.inc.php:141 -#, fuzzy #| msgid "Add a new server" msgid "Add a new Event" -msgstr "Přidat nový server" +msgstr "Přidat novou událost" #: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43 #: libraries/db_links.inc.php:44 @@ -4799,32 +4793,29 @@ msgid "Triggers" msgstr "Spouště" #: libraries/db_routines.lib.php:659 -#, fuzzy #| msgid "Details..." msgid "Details" -msgstr "Podrobnosti..." +msgstr "Podrobnosti" #: libraries/db_routines.lib.php:662 -#, fuzzy #| msgid "Routines" msgid "Routine name" -msgstr "Rutiny" +msgstr "Jméno rutiny" #: libraries/db_routines.lib.php:679 -#, fuzzy, php-format +#, php-format #| msgid "Change" msgid "Change to %s" -msgstr "Změnit" +msgstr "Změnit na %s" #: libraries/db_routines.lib.php:684 msgid "Parameters" -msgstr "" +msgstr "Parametry" #: libraries/db_routines.lib.php:689 -#, fuzzy #| msgid "Direct links" msgid "Direction" -msgstr "Přímé spoje" +msgstr "Směr" #: libraries/db_routines.lib.php:692 libraries/tbl_properties.inc.php:105 msgid "Length/Values" @@ -4849,62 +4840,55 @@ msgid "Options" msgstr "Nastavení" #: libraries/db_routines.lib.php:707 -#, fuzzy #| msgid "Add prefix" msgid "Add parameter" -msgstr "Přidat předponu" +msgstr "Přidat parametr" #: libraries/db_routines.lib.php:710 -#, fuzzy #| msgid "Remove database" msgid "Remove last parameter" -msgstr "Odstranit databázi" +msgstr "Odstranit poslední parametr" #: libraries/db_routines.lib.php:715 libraries/db_routines.lib.php:1217 msgid "Return type" msgstr "Návratový typ" #: libraries/db_routines.lib.php:721 -#, fuzzy #| msgid "Length/Values" msgid "Return length/values" -msgstr "Délka/Množina" +msgstr "Návratová délka/hodnoty" #: libraries/db_routines.lib.php:726 -#, fuzzy #| msgid "Table options" msgid "Return options" -msgstr "Parametry tabulky" +msgstr "Možnosti návratové hodnoty" #: libraries/db_routines.lib.php:745 -#, fuzzy #| msgid "Description" msgid "Definition" -msgstr "Popis" +msgstr "Definice" #: libraries/db_routines.lib.php:749 msgid "Is deterministic" -msgstr "" +msgstr "je deterministická" #: libraries/db_routines.lib.php:753 msgid "Definer" -msgstr "" +msgstr "Zadavatel" #: libraries/db_routines.lib.php:758 -#, fuzzy #| msgid "Security" msgid "Security type" -msgstr "Zabezpeční" +msgstr "Typ zabezpečení" #: libraries/db_routines.lib.php:765 msgid "SQL data access" -msgstr "" +msgstr "Přístup k SQL datům" #: libraries/db_routines.lib.php:839 libraries/db_routines.lib.php:842 -#, fuzzy #| msgid "Routines" msgid "Routine parameters" -msgstr "Rutiny" +msgstr "Parametry rutiny" #: libraries/db_routines.lib.php:849 tbl_change.php:284 tbl_change.php:322 msgid "Function" @@ -4919,12 +4903,12 @@ msgstr "Hodnota" #: libraries/db_routines.lib.php:965 msgid "You must provide a routine name" -msgstr "" +msgstr "Musíte zadat jméno rutiny" #: libraries/db_routines.lib.php:984 #, php-format msgid "Invalid direction \"%s\" given for parameter." -msgstr "" +msgstr "„%s“ je chybný směr parametru." #: libraries/db_routines.lib.php:995 libraries/db_routines.lib.php:1036 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4698-g14b3f69
by Michal Čihař 22 Jun '11

22 Jun '11

The branch, master has been updated via 14b3f69f7dacadfe637c1aec5af81d788f2e0c2a (commit) from bbafbd302ef46b103a1fc0d422f8b798714997c0 (commit) - Log ----------------------------------------------------------------- commit 14b3f69f7dacadfe637c1aec5af81d788f2e0c2a Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 10:38:02 2011 +0200 Use Czech style of quotes ----------------------------------------------------------------------- Summary of changes: po/cs.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index 3399655..bc46637 100644 --- a/po/cs.po +++ b/po/cs.po @@ -530,7 +530,7 @@ msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)." #: db_routines.php:319 #, php-format msgid "Query \"%s\" failed" -msgstr "Dotaz \"%s\" selhal" +msgstr "Dotaz „%s“ selhal" #: db_routines.php:191 db_routines.php:291 db_routines.php:296 #: db_routines.php:306 db_routines.php:320 libraries/common.lib.php:609 @@ -4081,7 +4081,7 @@ msgid "" "Leave blank for no \"persistent\" recently used tables across sessions, " "suggested: [kbd]pma_recent[/kbd]" msgstr "" -"Nechte prázdné pro vypnutí \"trvalého\" ukládání nedávných tabulek, výchozí " +"Nechte prázdné pro vypnutí „trvalého“ ukládání nedávných tabulek, výchozí " "nastavení: [kbd]pma_recent[/kbd]" #: libraries/config/messages.inc.php:410 @@ -4169,7 +4169,7 @@ msgid "" "Leave blank for no \"persistent\" tables'UI preferences across sessions, " "suggested: [kbd]pma_table_uiprefs[/kbd]" msgstr "" -"Nechte prázdné pro vypnutí podpory pro \"trvalé\" ukládání nastavení " +"Nechte prázdné pro vypnutí podpory pro „trvalé“ ukládání nastavení " "procházení tabulek, výchozí nastavení: [kbd]pma_uiprefs[/kbd]" #: libraries/config/messages.inc.php:427 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4697-gbbafbd3
by Michal Čihař 22 Jun '11

22 Jun '11

The branch, master has been updated via bbafbd302ef46b103a1fc0d422f8b798714997c0 (commit) via 4ffb148cae799c2585a9ac424a0e979fc8db5fdd (commit) via e374ed692e994fe0691cb99aa89ca6bb90bb858d (commit) via c5333b263aaa6d46bf96196913686ad9b1674c58 (commit) via 56442f4c5f3454b9f01a21e1e33f56afedecd109 (commit) via efb3066544a834a1db4d2a27db7c64d33fd307c6 (commit) via 5d2380cc25faaf606ce0e36b5b8fe8457beda303 (commit) via 8ee402050105f50bf28515ed37fa9321da507de2 (commit) via c04e1cbf6b6365545e627ee808cb3cdf33e55da8 (commit) via 629d33ffe1e1112b5f04f7d38a9b9328b0f2f13f (commit) via 7e8a74eb2303041528cd350b70e62d7d569f6b2a (commit) via 6f82931f61d77cc9b28b442e062c400548f05895 (commit) via 2870f11309a6c5ce5192571df86a6da019e11dfc (commit) via d5a773f890462c1af088f9095b996cbce6264f45 (commit) via a549767ebd039426525a8b8b0ac0bcf7de34f49e (commit) via 9bbd1669114b7ceb7ed9810e8320237658680354 (commit) via e0a3ffddfd397c2835c5825a5a5d26d728e5f1c3 (commit) via 169a8fc1c74b3152037bcbd38b9e20953ef617f2 (commit) via 1c69c6b9541f1950ec863b91fc484b37659dc394 (commit) via ef05d2275d59b9858298ec1dadaa6572095af00b (commit) via 3cd8d7344861c1bc02de80ae38cef7e2940e2282 (commit) via 6120ad3d374c6117683ea383619d549f8d842a50 (commit) via afca639412b6d1be81696eac4885bf57414bafa0 (commit) via a49a9d604c090c96e1a50a8ffcb7a162f8cd8bd3 (commit) via 1ce011677e8b584982e21ce3582c92e86d42ea6a (commit) via 4b9b121191b5f59e27174bda9b647f2c40d7088f (commit) via 29683df95bdbf25e9940fa03cfacd7b0fb1ebb0a (commit) via 6f08b16e3539eed5291e06b96cfca9bc6a73b449 (commit) via a6bd0c31f9fe6e07c57d4cc61cb3d705f49839f3 (commit) via 3852f37d47149ff8fe4169fb422bf8e3a065634b (commit) via 3e86878d2cb7ce8a86f3bf11af2651e3d9f1cdf0 (commit) from 3d74915b4e9f6e9a57a0d6ee5d009b02a49f79b7 (commit) - Log ----------------------------------------------------------------- commit bbafbd302ef46b103a1fc0d422f8b798714997c0 Merge: 3d74915b4e9f6e9a57a0d6ee5d009b02a49f79b7 4ffb148cae799c2585a9ac424a0e979fc8db5fdd Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jun 22 10:34:27 2011 +0200 Merge remote-tracking branch 'pootle/master' Conflicts: po/br.po po/cs.po commit 4ffb148cae799c2585a9ac424a0e979fc8db5fdd Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:13:41 2011 +0200 Translation update done using Pootle. commit e374ed692e994fe0691cb99aa89ca6bb90bb858d Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:13:36 2011 +0200 Translation update done using Pootle. commit c5333b263aaa6d46bf96196913686ad9b1674c58 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:13:28 2011 +0200 Translation update done using Pootle. commit 56442f4c5f3454b9f01a21e1e33f56afedecd109 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:13:14 2011 +0200 Translation update done using Pootle. commit efb3066544a834a1db4d2a27db7c64d33fd307c6 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:13:13 2011 +0200 Translation update done using Pootle. commit 5d2380cc25faaf606ce0e36b5b8fe8457beda303 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:13:04 2011 +0200 Translation update done using Pootle. commit 8ee402050105f50bf28515ed37fa9321da507de2 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:13:02 2011 +0200 Translation update done using Pootle. commit c04e1cbf6b6365545e627ee808cb3cdf33e55da8 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:12:17 2011 +0200 Translation update done using Pootle. commit 629d33ffe1e1112b5f04f7d38a9b9328b0f2f13f Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:11:47 2011 +0200 Translation update done using Pootle. commit 7e8a74eb2303041528cd350b70e62d7d569f6b2a Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:11:09 2011 +0200 Translation update done using Pootle. commit 6f82931f61d77cc9b28b442e062c400548f05895 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:10:58 2011 +0200 Translation update done using Pootle. commit 2870f11309a6c5ce5192571df86a6da019e11dfc Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:10:47 2011 +0200 Translation update done using Pootle. commit d5a773f890462c1af088f9095b996cbce6264f45 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:10:41 2011 +0200 Translation update done using Pootle. commit a549767ebd039426525a8b8b0ac0bcf7de34f49e Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:10:35 2011 +0200 Translation update done using Pootle. commit 9bbd1669114b7ceb7ed9810e8320237658680354 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:10:27 2011 +0200 Translation update done using Pootle. commit e0a3ffddfd397c2835c5825a5a5d26d728e5f1c3 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:10:19 2011 +0200 Translation update done using Pootle. commit 169a8fc1c74b3152037bcbd38b9e20953ef617f2 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jun 22 10:10:08 2011 +0200 Translation update done using Pootle. commit 1c69c6b9541f1950ec863b91fc484b37659dc394 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:10:06 2011 +0200 Translation update done using Pootle. commit ef05d2275d59b9858298ec1dadaa6572095af00b Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:09:40 2011 +0200 Translation update done using Pootle. commit 3cd8d7344861c1bc02de80ae38cef7e2940e2282 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:09:30 2011 +0200 Translation update done using Pootle. commit 6120ad3d374c6117683ea383619d549f8d842a50 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:09:26 2011 +0200 Translation update done using Pootle. commit afca639412b6d1be81696eac4885bf57414bafa0 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:09:12 2011 +0200 Translation update done using Pootle. commit a49a9d604c090c96e1a50a8ffcb7a162f8cd8bd3 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:09:04 2011 +0200 Translation update done using Pootle. commit 1ce011677e8b584982e21ce3582c92e86d42ea6a Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:08:55 2011 +0200 Translation update done using Pootle. commit 4b9b121191b5f59e27174bda9b647f2c40d7088f Merge: 29683df95bdbf25e9940fa03cfacd7b0fb1ebb0a a6facee514dce369580cff6106cd80bf9858ab43 Author: Pootle server <pootle(a)cihar.com> Date: Wed Jun 22 10:08:51 2011 +0200 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 29683df95bdbf25e9940fa03cfacd7b0fb1ebb0a Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:08:44 2011 +0200 Translation update done using Pootle. commit 6f08b16e3539eed5291e06b96cfca9bc6a73b449 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:08:39 2011 +0200 Translation update done using Pootle. commit a6bd0c31f9fe6e07c57d4cc61cb3d705f49839f3 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:08:35 2011 +0200 Translation update done using Pootle. commit 3852f37d47149ff8fe4169fb422bf8e3a065634b Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:08:30 2011 +0200 Translation update done using Pootle. commit 3e86878d2cb7ce8a86f3bf11af2651e3d9f1cdf0 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 22 10:08:21 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/br.po | 36 ++++++++++++++++++------------------ po/cs.po | 24 +++++++++++++----------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/po/br.po b/po/br.po index 1f98b8e..54d47ac 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-22 10:16+0200\n" -"PO-Revision-Date: 2011-06-22 10:08+0200\n" +"PO-Revision-Date: 2011-06-22 10:13+0200\n" "Last-Translator: <fulup.jakez(a)ofis-bzh.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: br\n" @@ -429,84 +429,84 @@ msgstr "mod gwelet" #: db_qbe.php:222 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:927 msgid "Sort" -msgstr "" +msgstr "Urzhiañ" #: db_qbe.php:231 db_qbe.php:265 libraries/db_structure.lib.php:102 #: libraries/display_tbl.lib.php:549 libraries/display_tbl.lib.php:888 #: server_databases.php:158 server_databases.php:175 tbl_operations.php:275 #: tbl_select.php:278 msgid "Ascending" -msgstr "" +msgstr "War gresk" #: db_qbe.php:232 db_qbe.php:273 libraries/db_structure.lib.php:110 #: libraries/display_tbl.lib.php:554 libraries/display_tbl.lib.php:885 #: server_databases.php:158 server_databases.php:175 tbl_operations.php:276 #: tbl_select.php:279 msgid "Descending" -msgstr "" +msgstr "War zigresk" #: db_qbe.php:286 db_tracking.php:91 libraries/display_tbl.lib.php:429 #: tbl_change.php:279 tbl_tracking.php:648 msgid "Show" -msgstr "" +msgstr "Diskouez" #: db_qbe.php:322 msgid "Criteria" -msgstr "" +msgstr "Dezverk" #: db_qbe.php:375 db_qbe.php:457 db_qbe.php:549 db_qbe.php:580 msgid "Ins" -msgstr "" +msgstr "Ensoc'hañ" #: db_qbe.php:379 db_qbe.php:461 db_qbe.php:546 db_qbe.php:577 msgid "And" -msgstr "" +msgstr "Ha" #: db_qbe.php:388 db_qbe.php:469 db_qbe.php:551 db_qbe.php:582 msgid "Del" -msgstr "" +msgstr "Diverk." #: db_qbe.php:392 db_qbe.php:473 db_qbe.php:544 db_qbe.php:575 #: server_privileges.php:307 tbl_change.php:887 tbl_indexes.php:256 #: tbl_select.php:252 msgid "Or" -msgstr "" +msgstr "Pe" #: db_qbe.php:529 msgid "Modify" -msgstr "" +msgstr "Kemmañ" #: db_qbe.php:606 msgid "Add/Delete criteria rows" -msgstr "" +msgstr "Ouzhpennañ/Diverkañ linennoù dezverkoù" #: db_qbe.php:618 msgid "Add/Delete columns" -msgstr "" +msgstr "Ouzhpennañ/Diverkañ bannoù" #: db_qbe.php:631 db_qbe.php:656 msgid "Update Query" -msgstr "" +msgstr "Hizivaat ar reked" #: db_qbe.php:639 msgid "Use Tables" -msgstr "" +msgstr "Implijout taolennoù" #: db_qbe.php:662 #, php-format msgid "SQL query on database <b>%s</b>:" -msgstr "" +msgstr "Reked SQL ouzh an diaz roadennoù <b>%s</b>:" #: db_qbe.php:955 libraries/common.lib.php:1168 msgid "Submit Query" -msgstr "" +msgstr "Kas ar reked" #: db_routines.php:152 import.php:453 libraries/Message.class.php:185 #: libraries/display_tbl.lib.php:2272 libraries/sql_query_form.lib.php:139 #: tbl_operations.php:228 tbl_relation.php:289 tbl_row_action.php:126 #: view_operations.php:60 msgid "Your SQL query has been executed successfully" -msgstr "" +msgstr "Sevenet eo bet ho reked SQL ervat" #: db_routines.php:155 #, php-format diff --git a/po/cs.po b/po/cs.po index 06522bc..3399655 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-22 10:16+0200\n" -"PO-Revision-Date: 2011-06-17 15:05+0200\n" +"PO-Revision-Date: 2011-06-22 10:13+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -511,9 +511,9 @@ msgstr "Váš SQL-dotaz byl úspěšně vykonán" #, php-format msgid "%d row affected by the last statement inside the procedure" msgid_plural "%d rows affected by the last statement inside the procedure" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Posledním příkazem v proceduře byla ovlivněna %d řádka" +msgstr[1] "Posledním příkazem v proceduře byly ovlivněny %d řádky" +msgstr[2] "Posledním příkazem v proceduře bylo ovlivněno %d řádek" #: db_routines.php:165 #, fuzzy, php-format @@ -530,7 +530,7 @@ msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)." #: db_routines.php:319 #, php-format msgid "Query \"%s\" failed" -msgstr "" +msgstr "Dotaz \"%s\" selhal" #: db_routines.php:191 db_routines.php:291 db_routines.php:296 #: db_routines.php:306 db_routines.php:320 libraries/common.lib.php:609 @@ -551,7 +551,7 @@ msgstr "V databázi nebyly nalezeny žádné tabulky" #: db_routines.php:230 db_routines.php:234 msgid "Execute routine" -msgstr "" +msgstr "Spustit rutinu" #: db_routines.php:254 db_routines.php:258 #, fuzzy, php-format @@ -567,11 +567,11 @@ msgstr "Chybný index serveru: „%s“" #: db_routines.php:304 msgid "Sorry, we failed to restore the dropped routine." -msgstr "" +msgstr "Bohužel se nepodařilo obnovit odstraněnou rutinu." #: db_routines.php:305 msgid "The backed up query was:" -msgstr "" +msgstr "Záložní dotaz byl:" #: db_routines.php:309 #, fuzzy, php-format @@ -587,7 +587,7 @@ msgstr "Byla vytvořena tabulka %1$s." #: db_routines.php:330 msgid "<b>One or more errors have occured while processing your request:</b>" -msgstr "" +msgstr "<b>Při zpracování požadavku došlo k několika chybám:</b>" #: db_routines.php:374 #, fuzzy @@ -1319,7 +1319,7 @@ msgstr "Odstraňuji" #: js/messages.php:122 msgid "The definition of a stored function must contain a RETURN statement!" -msgstr "" +msgstr "Definice uložené funkce musí obsahovat příkaz RETURN!" #: js/messages.php:123 #, fuzzy @@ -2113,6 +2113,8 @@ msgid "" "This usually means there is a syntax error in it, please check any errors " "shown bellow." msgstr "" +"Obvykle to je způsobenou chybou v tomto souboru, prosím opravte jakékoliv " +"chyby vypsané níže." #: libraries/common.inc.php:595 #, php-format @@ -2354,7 +2356,7 @@ msgstr "Nebyl zvolen žádný soubor pro nahrání" #: libraries/common.lib.php:2964 libraries/common.lib.php:2965 msgid "Execute" -msgstr "" +msgstr "Spustit" #: libraries/config.values.php:45 libraries/config.values.php:47 #: libraries/config.values.php:51 hooks/post-receive -- phpMyAdmin

1 0