- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11268-g938e807
by Marc Delisle 21 Jul '11

21 Jul '11

The branch, master has been updated via 938e807173a997b4ce69095d7189262cd3b8273a (commit) via 33627e953385e67cdf531ce1a560df2cfd00fc5e (commit) via 788fb45a1d6c70d52e8b627023bf01de34a22a4d (commit) via d00cf18325c07a0e23265eb83ab51b0fc3c567af (commit) via 7c3dfb454c3d0788e26e08415970577e720954c0 (commit) via 1c333e0a0828381d6afbed50a0d2c0f0e3a3433b (commit) via 379b0723bb4de8d9dee45863ee2a6f051dc36ac4 (commit) via 2111910a0777c432571e5ad8399ab26e7fd1c0b6 (commit) via f2ff3c3dc0aea2e7711d8490a8c7316d819e6e1b (commit) via 4e19ef1cbf42decb8ef5e4ea6041915af24239cb (commit) from 63c162d615db9d4275b287aed7bd9471ab0e6b8e (commit) - Log ----------------------------------------------------------------- commit 938e807173a997b4ce69095d7189262cd3b8273a Merge: 33627e953385e67cdf531ce1a560df2cfd00fc5e 63c162d615db9d4275b287aed7bd9471ab0e6b8e Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 21 09:19:46 2011 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 33627e953385e67cdf531ce1a560df2cfd00fc5e Merge: 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 788fb45a1d6c70d52e8b627023bf01de34a22a4d Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jul 21 09:18:44 2011 -0400 Merge commit '788fb45a1d6c70d52e8b627023bf01de34a22a4d' commit 788fb45a1d6c70d52e8b627023bf01de34a22a4d Merge: d00cf18325c07a0e23265eb83ab51b0fc3c567af 167d10385d610ec235d791d9b76da7bfdb008363 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Thu Jul 21 10:01:58 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit d00cf18325c07a0e23265eb83ab51b0fc3c567af Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Thu Jul 21 10:01:21 2011 +0530 Fixed bugs in convert foot notes to tooltips logic commit 7c3dfb454c3d0788e26e08415970577e720954c0 Merge: 1c333e0a0828381d6afbed50a0d2c0f0e3a3433b 964664525cd657ba52e82dd47c4314143ccd2516 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue Jul 19 23:00:12 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 1c333e0a0828381d6afbed50a0d2c0f0e3a3433b Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue Jul 19 22:59:22 2011 +0530 Fixed iid dulplication issue in footnote convertion using classes commit 379b0723bb4de8d9dee45863ee2a6f051dc36ac4 Merge: 2111910a0777c432571e5ad8399ab26e7fd1c0b6 8a2d7fbc22bdc58aa4f4bb488b724c1bab6a3c52 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 17 07:18:30 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 2111910a0777c432571e5ad8399ab26e7fd1c0b6 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 17 07:18:07 2011 +0530 Fixed bugs in modified initTooltips function in functions.js file commit f2ff3c3dc0aea2e7711d8490a8c7316d819e6e1b Merge: 4e19ef1cbf42decb8ef5e4ea6041915af24239cb 10fa6c5e255f3b631c7d64950baa5005236e45e3 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 16 20:42:32 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 4e19ef1cbf42decb8ef5e4ea6041915af24239cb Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 16 20:36:31 2011 +0530 MOdified init tooltips function ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 9 +++++- js/functions.js | 58 ++++++++++++++++++++++++++++++++++------------ libraries/common.lib.php | 7 +---- 3 files changed, 51 insertions(+), 23 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index b1c2ff0..1f2d0e6 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -63,9 +63,12 @@ $(document).ready(function() { currrent_insert_table = $(this); var $url = $(this).attr("href"); if ($url.substring(0, 15) == "tbl_change.php?") { - $url = $url.substring(15); + $url = $url.substring(15); } + if ($("#insert_table_dialog").length > 0) { + $("#insert_table_dialog").remove(); + } var $div = $('<div id="insert_table_dialog"></div>'); var target = "tbl_change.php"; @@ -110,10 +113,12 @@ $(document).ready(function() { $dialog.find("#topmenucontainer").hide(); //Adding the datetime pikers for the dialog $dialog.find('.datefield, .datetimefield').each(function () { - PMA_addDatepicker($(this)); + PMA_addDatepicker($(this)); }); $(".insertRowTable").addClass("ajax"); $("#buttonYes").addClass("ajax"); + $div = $("#insert_table_dialog"); + PMA_convertFootnotesToTooltips($div); } PMA_ajaxRemoveMessage($msgbox); }) // end $.get() diff --git a/js/functions.js b/js/functions.js index 7f0c90f..5dac084 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2242,7 +2242,9 @@ function displayMoreTableOpts() { } } -$(document).ready(initTooltips); +$(document).ready(function(){ + PMA_convertFootnotesToTooltips(); +}); /** * Ensures indexes names are valid according to their type and, for a primary @@ -2278,27 +2280,53 @@ function checkIndexName(form_id) return true; } // end of the 'checkIndexName()' function - -/* Displays tooltips */ -function initTooltips() { +/** + * function to convert the footnotes to tooltips + * + * @param jquery-Object $div a div jquery object which crries the domain + * for searching footnootes. If we ommit this + * parameter the function searches the footnotes + * in the whole body + **/ +function PMA_convertFootnotesToTooltips($div) { // Hide the footnotes from the footer (which are displayed for // JavaScript-disabled browsers) since the tooltip is sufficient - $(".footnotes").hide(); - $(".footnotes span").each(function() { + + if ($div == undefined || ! $div instanceof jQuery || $div.length == 0) { + $div = $("#serverinfo").parent(); + } + + $footnotes = $div.find(".footnotes"); + + $footnotes.hide(); + $footnotes.find('span').each(function() { $(this).children("sup").remove(); }); // The border and padding must be removed otherwise a thin yellow box remains visible - $(".footnotes").css("border", "none"); - $(".footnotes").css("padding", "0px"); + $footnotes.css("border", "none"); + $footnotes.css("padding", "0px"); // Replace the superscripts with the help icon - $("sup[class='footnotemarker']").hide(); - $("img[class='footnotemarker']").show(); - - $("img[class='footnotemarker']").each(function() { - var span_id = $(this).attr("id"); - span_id = span_id.split("_")[1]; - var tooltip_text = $(".footnotes span[id='footnote_" + span_id + "']").html(); + $div.find("sup.footnotemarker").hide(); + $div.find("img.footnotemarker").show(); + + $div.find("img.footnotemarker").each(function() { + var img_class = $(this).attr("class"); + /** img contains two classes, as example "footnotemarker footnote_1_1". + * We spit it by second classs and take it for the id of span + */ + img_class = img_class.split(" "); + for (i = 0; i < img_class.length; i++) { + if (img_class[i].split("_")[0] == "footnote") { + var span_id = img_class[i].split("_")[1]; + } + } + /** + * Now we get the #id of the span with span_id variable. As an example if we + * initially get the img class as "footnotemarker footnote_2_3", now we get + * #2 as the span_id. Using that we can find footnote_2 in footnotes. + * */ + var tooltip_text = $footnotes.find("span[id='footnote_" + span_id + "']").html(); $(this).qtip({ content: tooltip_text, show: { delay: 0 }, diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 9e27e6c..cb85c10 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -459,18 +459,13 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') $GLOBALS['footnotes'] = array(); } $nr = count($GLOBALS['footnotes']) + 1; - // this is the first instance of this message - $instance = 1; $GLOBALS['footnotes'][$key] = array( 'note' => $message, 'type' => $type, 'nr' => $nr, - 'instance' => $instance ); } else { $nr = $GLOBALS['footnotes'][$key]['nr']; - // another instance of this message (to ensure ids are unique) - $instance = ++$GLOBALS['footnotes'][$key]['instance']; } if ($bbcode) { @@ -479,7 +474,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') // footnotemarker used in js/tooltip.js return '<sup class="footnotemarker">' . $nr . '</sup>' . - '<img class="footnotemarker" id="footnote_' . $nr . '_' . $instance . '" src="' . + '<img class="footnotemarker footnote_' . $nr . '" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" alt="" />'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11258-g63c162d
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 63c162d615db9d4275b287aed7bd9471ab0e6b8e (commit) via 00c1d8881cf724f03827b5ca337a647d5fa41d13 (commit) via 29dbb1506f4f766b9469bca18663b6c85b055680 (commit) via b25aff1d3519edf5f37b48e9b834190595bae01a (commit) via 519802fa3fdb46c87bb5e2eec5984ec83900b45d (commit) via 293c5c49aae0dc7ba47e08e93d457b3dbffa5540 (commit) via 347f490e96baf744aed4cbd549dd26689589aa14 (commit) via 146396adec0c49a3e5de5e35b62d0a0beaf7458f (commit) via 4b3d468a21cf2af01748089d1dee20f519eddfb1 (commit) via 667065e4233807046b17f5c4aacdf93393b34cce (commit) via df6aba87f3afe616ca1439354c7efc1f473bf8d6 (commit) via 66fe0c9d7cf98839c8193d01e31f44cd1d9b8ca7 (commit) via 9c924d0a47ed14ee0c63ac41e7a293e97a01a39f (commit) via 4d102b2fe410bae9ce29b716b944098e5dbe7159 (commit) via a256fe685512349232f1f8c615ed946d4e6d1863 (commit) via df3aec325b77901644bbc6f0f07e6fd24cc120f6 (commit) via 8f56013823d692b7bcd8a9ec4b8d61518a6d9adc (commit) via 2b24140ffaafe1da82f4a985a3fcb554a9d51811 (commit) via f160d2184814e17f768f20f86a8945c7d1168259 (commit) via 44c1af1494d56f3e9011a3f8e7e396858b1dca68 (commit) via 024bb4de1a4b08c27407054ce3313825c0a80a15 (commit) via 6fb8887fe29f0497a9bf16803f2a284079106701 (commit) via c58e9fa849623a4a04d4e54e860f80e903aa82ff (commit) via 622ef2cb4f82fb078d866b1724b6e2a8aa99dcdf (commit) via a961064bf1f891cce56589243f53bf321929dc68 (commit) via e81e9a0aebe12f07456cf1add9f5384f2f5e76cc (commit) via 218c39a606bc4454053a26dd052e6ce0377f29e6 (commit) via 815dc39bcecabfd69819af4946ecd77a854b5690 (commit) via 153492869e25b342d2c78d10641c9d4638e57098 (commit) via 9aa37fa4d8cff3fae903afdf4b541362ce27242b (commit) via 2242f7243f62f81ad8caad756f769f1dea564fae (commit) via ffdb23bdf12dc667f60acaa9c8fa0aea47f80538 (commit) via d86c935f8e3d793df9c2120f3552130b03f7ff6e (commit) via e750e9257b695b4989c7173196209e01dd887ea6 (commit) from 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 (commit) - Log ----------------------------------------------------------------- commit 63c162d615db9d4275b287aed7bd9471ab0e6b8e Merge: 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 00c1d8881cf724f03827b5ca337a647d5fa41d13 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 15:19:48 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 00c1d8881cf724f03827b5ca337a647d5fa41d13 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:18:33 2011 +0200 Translation update done using Pootle. commit 29dbb1506f4f766b9469bca18663b6c85b055680 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:18:02 2011 +0200 Translation update done using Pootle. commit b25aff1d3519edf5f37b48e9b834190595bae01a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:17:29 2011 +0200 Translation update done using Pootle. commit 519802fa3fdb46c87bb5e2eec5984ec83900b45d Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:16:50 2011 +0200 Translation update done using Pootle. commit 293c5c49aae0dc7ba47e08e93d457b3dbffa5540 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:16:39 2011 +0200 Translation update done using Pootle. commit 347f490e96baf744aed4cbd549dd26689589aa14 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:16:34 2011 +0200 Translation update done using Pootle. commit 146396adec0c49a3e5de5e35b62d0a0beaf7458f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:16:22 2011 +0200 Translation update done using Pootle. commit 4b3d468a21cf2af01748089d1dee20f519eddfb1 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:15:59 2011 +0200 Translation update done using Pootle. commit 667065e4233807046b17f5c4aacdf93393b34cce Author: mrbendig <mrbendig(a)mrbendig.com> Date: Thu Jul 21 15:15:39 2011 +0200 Translation update done using Pootle. commit df6aba87f3afe616ca1439354c7efc1f473bf8d6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:15:22 2011 +0200 Translation update done using Pootle. commit 66fe0c9d7cf98839c8193d01e31f44cd1d9b8ca7 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:14:46 2011 +0200 Translation update done using Pootle. commit 9c924d0a47ed14ee0c63ac41e7a293e97a01a39f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:14:19 2011 +0200 Translation update done using Pootle. commit 4d102b2fe410bae9ce29b716b944098e5dbe7159 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:14:09 2011 +0200 Translation update done using Pootle. commit a256fe685512349232f1f8c615ed946d4e6d1863 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:13:52 2011 +0200 Translation update done using Pootle. commit df3aec325b77901644bbc6f0f07e6fd24cc120f6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:13:40 2011 +0200 Translation update done using Pootle. commit 8f56013823d692b7bcd8a9ec4b8d61518a6d9adc Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:13:16 2011 +0200 Translation update done using Pootle. commit 2b24140ffaafe1da82f4a985a3fcb554a9d51811 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:12:31 2011 +0200 Translation update done using Pootle. commit f160d2184814e17f768f20f86a8945c7d1168259 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:12:16 2011 +0200 Translation update done using Pootle. commit 44c1af1494d56f3e9011a3f8e7e396858b1dca68 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:12:05 2011 +0200 Translation update done using Pootle. commit 024bb4de1a4b08c27407054ce3313825c0a80a15 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:59 2011 +0200 Translation update done using Pootle. commit 6fb8887fe29f0497a9bf16803f2a284079106701 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:50 2011 +0200 Translation update done using Pootle. commit c58e9fa849623a4a04d4e54e860f80e903aa82ff Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:35 2011 +0200 Translation update done using Pootle. commit 622ef2cb4f82fb078d866b1724b6e2a8aa99dcdf Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:25 2011 +0200 Translation update done using Pootle. commit a961064bf1f891cce56589243f53bf321929dc68 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:18 2011 +0200 Translation update done using Pootle. commit e81e9a0aebe12f07456cf1add9f5384f2f5e76cc Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:11:00 2011 +0200 Translation update done using Pootle. commit 218c39a606bc4454053a26dd052e6ce0377f29e6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:10:53 2011 +0200 Translation update done using Pootle. commit 815dc39bcecabfd69819af4946ecd77a854b5690 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:10:41 2011 +0200 Translation update done using Pootle. commit 153492869e25b342d2c78d10641c9d4638e57098 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:10:34 2011 +0200 Translation update done using Pootle. commit 9aa37fa4d8cff3fae903afdf4b541362ce27242b Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:10:16 2011 +0200 Translation update done using Pootle. commit 2242f7243f62f81ad8caad756f769f1dea564fae Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:10:06 2011 +0200 Translation update done using Pootle. commit ffdb23bdf12dc667f60acaa9c8fa0aea47f80538 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:09:49 2011 +0200 Translation update done using Pootle. commit d86c935f8e3d793df9c2120f3552130b03f7ff6e Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:09:35 2011 +0200 Translation update done using Pootle. commit e750e9257b695b4989c7173196209e01dd887ea6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:09:19 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 79 ++++++++++++++++++++++++++++--------------------------------- po/de.po | 8 ++---- 2 files changed, 39 insertions(+), 48 deletions(-) diff --git a/po/cs.po b/po/cs.po index 3973f51..589dcb0 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-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-21 15:08+0200\n" +"PO-Revision-Date: 2011-07-21 15:18+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -1246,13 +1246,14 @@ msgstr "" #: js/messages.php:121 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time je nastaven na %d sekund." #: js/messages.php:122 msgid "" "Following settings will be applied globally and reset to default on server " "restart:" msgstr "" +"Budou provedeny následující změny, které budou platné do restartu serveru:" #. l10n: %s is FILE or TABLE #: js/messages.php:124 @@ -1279,13 +1280,15 @@ msgstr "Vypnout %s" #: js/messages.php:130 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "Nastavit long_query_time na %ds" #: js/messages.php:131 msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"Nemůžete změnit uvedené proměnné. Prosím přihlašte se jako root nebo " +"kontaktujte vašeho správce databáze." #: js/messages.php:132 #| msgid "Manage your settings" @@ -1311,7 +1314,7 @@ msgstr "Rozdíly" #: js/messages.php:138 #, php-format msgid "Divided by %s:" -msgstr "" +msgstr "Vyděleno %s:" #: js/messages.php:140 #| msgid "Select page" @@ -1320,7 +1323,7 @@ msgstr "Zvolený časový rozsah:" #: js/messages.php:141 msgid "Group together INSERTs into same table" -msgstr "" +msgstr "Sloučit dotazy INSERT pro stejné tabulky" #: js/messages.php:142 msgid "" @@ -1330,15 +1333,15 @@ msgstr "" #: js/messages.php:143 msgid "From slow log" -msgstr "" +msgstr "Ze zánamu pomalých dotazů" #: js/messages.php:144 msgid "From general log" -msgstr "" +msgstr "Z obecného zánamu dotazů" #: js/messages.php:145 msgid "Analysing & loading logs. This may take a while." -msgstr "" +msgstr "Načítám a analyzuji záznamy. To může chvíli trvat." #: js/messages.php:146 msgid "" @@ -1357,6 +1360,8 @@ msgstr "" #: js/messages.php:148 msgid "Log data loaded. Queries executed in this time span:" msgstr "" +"Záznamy byly načteny. V tomto časovém rozmezí byly spuštěny následující " +"dotazy:" #: js/messages.php:150 #| msgid "Jump to database" @@ -1366,6 +1371,8 @@ msgstr "Přejít na tabulku se záznamem" #: js/messages.php:151 msgid "Log analysed, but not data found in this time span." msgstr "" +"Záznamy byly načteny, ale v tomto časovém rozmezí nebyly nalezeny žádné " +"dotazy." #: js/messages.php:155 libraries/tbl_properties.inc.php:780 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 @@ -9799,39 +9806,35 @@ msgstr "Návod/Nastavení" #: server_status.php:1302 msgid "Done rearranging/editing charts" -msgstr "" +msgstr "Ukončit upravování grafů" #: server_status.php:1309 -#, fuzzy #| msgid "Add parameter" msgid "Add chart" -msgstr "Přidat parametr" +msgstr "Přidat graf" #: server_status.php:1311 msgid "Rearrange/edit charts" -msgstr "" +msgstr "Upravit/Uspořádat grafy" #: server_status.php:1313 msgid "Refresh rate:" msgstr "Obnovovací frekvence:" #: server_status.php:1316 -#, fuzzy #| msgid "Textarea columns" msgid "Chart columns:" -msgstr "Sloupců v textové oblasti" +msgstr "Sloupců grafů:" #: server_status.php:1330 -#, fuzzy #| msgid "User for config auth" msgid "Clear monitor config" -msgstr "Uživatel pro přihlašování config" +msgstr "Odstranit nastavení monitoru" #: server_status.php:1333 -#, fuzzy #| msgid "1. Introduction" msgid "Monitor Instructions" -msgstr "1. Úvod" +msgstr "Instrukce monitoru" #: server_status.php:1334 msgid "" @@ -9863,84 +9866,74 @@ msgid "" msgstr "" #: server_status.php:1361 -#, fuzzy #| msgid "Usage" msgid "CPU Usage" -msgstr "Používá" +msgstr "Využití procesoru" #: server_status.php:1364 -#, fuzzy #| msgid "2. Usage" msgid "Memory Usage" -msgstr "2. Použití" +msgstr "Využití paměti" #: server_status.php:1367 -#, fuzzy #| msgid "Usage" msgid "Swap Usage" -msgstr "Používá" +msgstr "Využití odkládacího prostoru" #: server_status.php:1370 -#, fuzzy #| msgid "All status variables" msgid "Status variable(s)" -msgstr "Všechny stavové proměnné" +msgstr "Stavové proměnné" #: server_status.php:1372 -#, fuzzy #| msgid "Select Tables" msgid "Select series:" -msgstr "Vybrat tabulky" +msgstr "Vyberte série:" #: server_status.php:1374 msgid "Commonly monitored" -msgstr "" +msgstr "Obvykle monitorované" #: server_status.php:1389 -#, fuzzy #| msgid "You must provide a valid table name" msgid "or type variable name:" -msgstr "Musíte zadat platné jméno tabulky" +msgstr "nebo zadejte jméno proměnné:" #: server_status.php:1393 msgid "Display as differential value" -msgstr "" +msgstr "Zobrazit jako rozdíl" #: server_status.php:1395 msgid "Apply a divisor" -msgstr "" +msgstr "Vynásobit" #: server_status.php:1402 msgid "Append unit to data values" -msgstr "" +msgstr "Přidat jednoty" #: server_status.php:1408 -#, fuzzy #| msgid "Add trigger" msgid "Add this series" -msgstr "Přidat spoušť" +msgstr "Přidat tuto sérii" #: server_status.php:1410 msgid "Clear series" -msgstr "" +msgstr "Odstranit série" #: server_status.php:1413 -#, fuzzy #| msgid "Series:" msgid "Series in Chart:" -msgstr "Série:" +msgstr "Série v grafu::" #: server_status.php:1421 -#, fuzzy #| msgid "Loading" msgid "Loading logs" -msgstr "Nahrávám" +msgstr "Nahrávám záznamy" #: server_status.php:1424 -#, fuzzy #| msgid "Show statistics" msgid "Log statistics" -msgstr "Zobrazit statistiky" +msgstr "Statistiky záznamů" #: server_synchronize.php:92 msgid "Could not connect to the source" diff --git a/po/de.po b/po/de.po index 60297d2..4f5c04e 100644 --- a/po/de.po +++ b/po/de.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-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-20 00:23+0200\n" +"PO-Revision-Date: 2011-07-21 15:15+0200\n" "Last-Translator: <mrbendig(a)mrbendig.com>\n" "Language-Team: german <de(a)li.org>\n" "Language: de\n" @@ -1285,7 +1285,6 @@ msgid "Set long_query_time to %ds" msgstr "Setze long_query_time auf %ds" #: js/messages.php:131 -#, fuzzy #| msgid "" #| "You don't have super user rights to change this variables. Please log in " #| "as root account or contact your database administrator." @@ -1293,9 +1292,8 @@ msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" -"Sie haben keine super user Rechte um diese Variable zu ändern. Bitte melden " -"Sie sich mit einem Root-Benutzer ein, oder kontaktieren Sie Ihren Datenbank-" -"Administrator." +"Sie können diese Variablen nicht ändern. Bitte melden Sie sich mit einem " +"Root-Benutzer ein, oder kontaktieren Sie Ihren Datenbank-Administrator." #: js/messages.php:132 msgid "Change settings" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11224-g2ece3cd
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 (commit) via 2e872bbfd4d2b561ae28ceda4157c6bfb4533a32 (commit) via fd8e1538671c4a78f320d07b333e3663958efed3 (commit) via 941c157b01bd0da8f0187f4e85771b328c740f60 (commit) via c9bbbc4f4b6287d2998728083800b02501cd879a (commit) via f1fd722c5496217938eeb4d043885c9b6224e956 (commit) via 506e8030d524c0da6fe39fe6f99291d36ac979e4 (commit) via 7992a8901576d8a4d7006c0b3dcf73f8ac8693e8 (commit) via 27c45cd499b8116aba1d6e970a4be992ad14e560 (commit) via a8e9fa1d1a27f021c5f953ccecdcfd881931c29b (commit) via ecadea809a75a91f442eeceec16511993381a4bb (commit) via c6cc6bdfa2447c3b9377c37d2f96e619f586ffc6 (commit) via bb43346c066eced2dec4adda341d12b91f970233 (commit) via ea734959aa29b9a3bc95808a3fcbc917133c3c8a (commit) via a9007694cf9c52b515e172f7ec113b26d6819f6f (commit) via 2b90b163c963887dfb6ead5b2534cd585769f283 (commit) via 6ce2f6e794346436f519cb2e13c058fd568edfb1 (commit) via f6ab1191f5a61a754f678e6b81707157fc996892 (commit) via 06cbcc1019931cdbed9d215ec965a6287ea58775 (commit) via 5d2760313bff0b1822ca91bb391b2ad1c5d3bc9a (commit) via 86fc7e0259a528e60863db0e90e921b4f739e42f (commit) via fce78ba8e9805fb05620b1a830dee1cabc679cbe (commit) via c247c32f7fa0f026119331a9c2d715da6698b0f4 (commit) via 9bfcb5a704b09d87105ff28988f96a3bcd183bbd (commit) via c60d1d184034b73f9a5533219da24122181dde72 (commit) via 3f87ae9cc271b2144ba7f3d3156671430193f905 (commit) via 7b02bfc9cda81d76317ce026a5af3d951ed258e3 (commit) via 387ce9840f626bc070790616ddf7dc3440f252d4 (commit) via da0a6861876b1d8ca70ba270fbc62c17c9454e32 (commit) via 78022141105f89848ec9e8fa833ae66f703a6f8d (commit) via 80b1335d992d700468b6b2424d796bf7a1ae5323 (commit) via 5058b30fe702bcbac056e7dc47e6665dd4ac581a (commit) via 4e26314fd5b50ef5a7296ab384c3c65428649812 (commit) via 1519a56e26cae0111bf878bf7597afedd6bc3dc8 (commit) via 28f59c58c88fa622153090107aa06c0e24dcfbd1 (commit) via cfc4d7b893af4fe4f31c7bae7efa5c73e4eb8340 (commit) via 0748980d8037ef1443af9f16b22ed22e61dbde77 (commit) via a73b8c46b4279cd48f2fe1244ea7fb7682604c0f (commit) via 829ae4302fc943e7bc2adf6c3ca00d53ab812f3d (commit) via e7bc03273c57109aa4e14e3edcf14945822382d7 (commit) via db887bc04b82e3750b0b83760c8a23a22bcf8959 (commit) from 06655a8a96a98de1c8ce4b136a10e7c4b285f398 (commit) - Log ----------------------------------------------------------------- commit 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 Merge: 06655a8a96a98de1c8ce4b136a10e7c4b285f398 2e872bbfd4d2b561ae28ceda4157c6bfb4533a32 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 15:09:53 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 2e872bbfd4d2b561ae28ceda4157c6bfb4533a32 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:08:49 2011 +0200 Translation update done using Pootle. commit fd8e1538671c4a78f320d07b333e3663958efed3 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:08:38 2011 +0200 Translation update done using Pootle. commit 941c157b01bd0da8f0187f4e85771b328c740f60 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:08:27 2011 +0200 Translation update done using Pootle. commit c9bbbc4f4b6287d2998728083800b02501cd879a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:08:12 2011 +0200 Translation update done using Pootle. commit f1fd722c5496217938eeb4d043885c9b6224e956 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:08:02 2011 +0200 Translation update done using Pootle. commit 506e8030d524c0da6fe39fe6f99291d36ac979e4 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:07:58 2011 +0200 Translation update done using Pootle. commit 7992a8901576d8a4d7006c0b3dcf73f8ac8693e8 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:07:53 2011 +0200 Translation update done using Pootle. commit 27c45cd499b8116aba1d6e970a4be992ad14e560 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:07:39 2011 +0200 Translation update done using Pootle. commit a8e9fa1d1a27f021c5f953ccecdcfd881931c29b Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:07:19 2011 +0200 Translation update done using Pootle. commit ecadea809a75a91f442eeceec16511993381a4bb Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:07:05 2011 +0200 Translation update done using Pootle. commit c6cc6bdfa2447c3b9377c37d2f96e619f586ffc6 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:06:59 2011 +0200 Translation update done using Pootle. commit bb43346c066eced2dec4adda341d12b91f970233 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:06:43 2011 +0200 Translation update done using Pootle. commit ea734959aa29b9a3bc95808a3fcbc917133c3c8a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:06:12 2011 +0200 Translation update done using Pootle. commit a9007694cf9c52b515e172f7ec113b26d6819f6f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:56 2011 +0200 Translation update done using Pootle. commit 2b90b163c963887dfb6ead5b2534cd585769f283 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:51 2011 +0200 Translation update done using Pootle. commit 6ce2f6e794346436f519cb2e13c058fd568edfb1 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:47 2011 +0200 Translation update done using Pootle. commit f6ab1191f5a61a754f678e6b81707157fc996892 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:42 2011 +0200 Translation update done using Pootle. commit 06cbcc1019931cdbed9d215ec965a6287ea58775 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:28 2011 +0200 Translation update done using Pootle. commit 5d2760313bff0b1822ca91bb391b2ad1c5d3bc9a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:23 2011 +0200 Translation update done using Pootle. commit 86fc7e0259a528e60863db0e90e921b4f739e42f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:05:05 2011 +0200 Translation update done using Pootle. commit fce78ba8e9805fb05620b1a830dee1cabc679cbe Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:04:51 2011 +0200 Translation update done using Pootle. commit c247c32f7fa0f026119331a9c2d715da6698b0f4 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:04:27 2011 +0200 Translation update done using Pootle. commit 9bfcb5a704b09d87105ff28988f96a3bcd183bbd Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:04:23 2011 +0200 Translation update done using Pootle. commit c60d1d184034b73f9a5533219da24122181dde72 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:04:16 2011 +0200 Translation update done using Pootle. commit 3f87ae9cc271b2144ba7f3d3156671430193f905 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:04:03 2011 +0200 Translation update done using Pootle. commit 7b02bfc9cda81d76317ce026a5af3d951ed258e3 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:55 2011 +0200 Translation update done using Pootle. commit 387ce9840f626bc070790616ddf7dc3440f252d4 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:48 2011 +0200 Translation update done using Pootle. commit da0a6861876b1d8ca70ba270fbc62c17c9454e32 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:34 2011 +0200 Translation update done using Pootle. commit 78022141105f89848ec9e8fa833ae66f703a6f8d Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:24 2011 +0200 Translation update done using Pootle. commit 80b1335d992d700468b6b2424d796bf7a1ae5323 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:14 2011 +0200 Translation update done using Pootle. commit 5058b30fe702bcbac056e7dc47e6665dd4ac581a Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:03:03 2011 +0200 Translation update done using Pootle. commit 4e26314fd5b50ef5a7296ab384c3c65428649812 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:57 2011 +0200 Translation update done using Pootle. commit 1519a56e26cae0111bf878bf7597afedd6bc3dc8 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:36 2011 +0200 Translation update done using Pootle. commit 28f59c58c88fa622153090107aa06c0e24dcfbd1 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:26 2011 +0200 Translation update done using Pootle. commit cfc4d7b893af4fe4f31c7bae7efa5c73e4eb8340 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:17 2011 +0200 Translation update done using Pootle. commit 0748980d8037ef1443af9f16b22ed22e61dbde77 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:12 2011 +0200 Translation update done using Pootle. commit a73b8c46b4279cd48f2fe1244ea7fb7682604c0f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:02:06 2011 +0200 Translation update done using Pootle. commit 829ae4302fc943e7bc2adf6c3ca00d53ab812f3d Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:01:56 2011 +0200 Translation update done using Pootle. commit e7bc03273c57109aa4e14e3edcf14945822382d7 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:01:46 2011 +0200 Translation update done using Pootle. commit db887bc04b82e3750b0b83760c8a23a22bcf8959 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jul 21 15:01:30 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 94 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 40 insertions(+), 54 deletions(-) diff --git a/po/cs.po b/po/cs.po index 0478db7..3973f51 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-07-21 14:00+0200\n" -"PO-Revision-Date: 2011-07-21 09:33+0200\n" +"PO-Revision-Date: 2011-07-21 15:08+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -1133,7 +1133,7 @@ msgstr "Dotazů od poslední aktualizace" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:89 msgid "Questions (executed statements by the server)" -msgstr "" +msgstr "Dotazy (příkazy spuštěné na serveru)" #: js/messages.php:91 server_status.php:587 msgid "Query statistics" @@ -1145,11 +1145,11 @@ msgstr "Využití CPU" #: js/messages.php:95 msgid "System memory" -msgstr "" +msgstr "Operační paměť" #: js/messages.php:96 msgid "System swap" -msgstr "" +msgstr "Odkládací oblast" #: js/messages.php:97 libraries/common.lib.php:1276 server_status.php:1398 msgid "MiB" @@ -1161,14 +1161,13 @@ msgstr "KiB" #: js/messages.php:100 msgid "Average load" -msgstr "" +msgstr "Průměrné zatížení" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 -#, fuzzy #| msgid "Versions" msgid "Questions" -msgstr "Verze" +msgstr "Dotazy" #: js/messages.php:103 server_status.php:864 msgid "Traffic" @@ -1180,24 +1179,22 @@ msgid "Settings" msgstr "Nastavení" #: js/messages.php:105 -#, fuzzy #| msgid "Remove database" msgid "Remove chart" -msgstr "Odstranit databázi" +msgstr "Odstranit graf" #: js/messages.php:106 msgid "Edit labels and series" -msgstr "" +msgstr "Upravit popisky a série" #: js/messages.php:107 -#, fuzzy #| msgid "Snap to grid" msgid "Add chart to grid" -msgstr "Zachytávat na mřížku" +msgstr "Přidat graf do mřížky" #: js/messages.php:109 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "Prosím přidejte do série alespoň jednu hodnotu" #: js/messages.php:110 libraries/display_export.lib.php:306 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1039 @@ -1208,35 +1205,35 @@ msgstr "Žádná" #: js/messages.php:111 msgid "Resume monitor" -msgstr "" +msgstr "Obnovit monitor" #: js/messages.php:112 msgid "Pause monitor" -msgstr "" +msgstr "Přerušit monitor" #: js/messages.php:114 msgid "general_log and slow_query_log is enabled." -msgstr "" +msgstr "general_log a slow_query_log jsou povoleny." #: js/messages.php:115 msgid "general_log is enabled." -msgstr "" +msgstr "general_log je povolen." #: js/messages.php:116 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log je povolen." #: js/messages.php:117 msgid "slow_query_log and general_log is disabled." -msgstr "" +msgstr "slow_query_log a general_log jsou zakázány." #: js/messages.php:118 msgid "log_output is not set to TABLE." -msgstr "" +msgstr "log_output není nastaven na tabulku." #: js/messages.php:119 msgid "log_output is set to TABLE." -msgstr "" +msgstr "log_output je nastaven na tabulku." #: js/messages.php:120 #, php-format @@ -1259,24 +1256,24 @@ msgstr "" #. l10n: %s is FILE or TABLE #: js/messages.php:124 -#, fuzzy, php-format +#, php-format #| msgid "Save output to a file" msgid "Set log_output to %s" -msgstr "Uložit do souboru" +msgstr "Nastavit log_output na %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:126 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" -msgstr "Zapnuto" +msgstr "Zapnout %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:128 -#, fuzzy, php-format +#, php-format #| msgid "Disabled" msgid "Disable %s" -msgstr "Vypnuto" +msgstr "Vypnout %s" #. l10n: %d seconds #: js/messages.php:130 @@ -1291,26 +1288,22 @@ msgid "" msgstr "" #: js/messages.php:132 -#, fuzzy #| msgid "Manage your settings" msgid "Change settings" -msgstr "Spravujte svoje nastavení" +msgstr "Změnit nastavení" #: js/messages.php:133 -#, fuzzy #| msgid "More settings" msgid "Current settings" -msgstr "Více nastavení" +msgstr "Aktuální nastavení" #: js/messages.php:135 server_status.php:1358 -#, fuzzy #| msgid "Chart title" msgid "Chart Title" msgstr "Název grafu" #. l10n: As in differential values #: js/messages.php:137 -#, fuzzy #| msgid "Difference" msgid "Differential" msgstr "Rozdíly" @@ -1321,10 +1314,9 @@ msgid "Divided by %s:" msgstr "" #: js/messages.php:140 -#, fuzzy #| msgid "Select page" msgid "Selected time range:" -msgstr "Zvolte stránku" +msgstr "Zvolený časový rozsah:" #: js/messages.php:141 msgid "Group together INSERTs into same table" @@ -1367,10 +1359,9 @@ msgid "Log data loaded. Queries executed in this time span:" msgstr "" #: js/messages.php:150 -#, fuzzy #| msgid "Jump to database" msgid "Jump to Log table" -msgstr "Přejít na databázi" +msgstr "Přejít na tabulku se záznamem" #: js/messages.php:151 msgid "Log analysed, but not data found in this time span." @@ -1838,10 +1829,9 @@ msgstr "Velikost písma" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "Soubor nebyl nahrán." #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." msgstr "Neznámá chyba při nahrávání souboru." @@ -1889,11 +1879,11 @@ msgstr "" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "Chyba při přesouvání nahraného souboru." #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." -msgstr "" +msgstr "Nahraný soubor nelze přečíst (přesunout)." #: libraries/Index.class.php:418 tbl_relation.php:526 msgid "No index defined!" @@ -2443,10 +2433,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s dnů, %s hodin, %s minut a %s sekund" #: libraries/common.lib.php:1876 -#, fuzzy #| msgid "Routine parameters" msgid "Missing parameter:" -msgstr "Parametry rutiny" +msgstr "Chybějící parametr:" #: libraries/common.lib.php:2182 libraries/common.lib.php:2185 #: libraries/display_tbl.lib.php:299 @@ -9022,13 +9011,12 @@ msgstr "Všechny stavové proměnné" #: server_status.php:589 msgid "Monitor" -msgstr "" +msgstr "Monitor" #: server_status.php:599 server_status.php:621 -#, fuzzy #| msgid "Refresh rate:" msgid "Refresh rate: " -msgstr "Obnovovací frekvence:" +msgstr "Obnovovací frekvence: " #: server_status.php:642 msgid "Containing the word:" @@ -9048,10 +9036,10 @@ msgstr "Související odkazy:" #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:708 -#, fuzzy, php-format +#, php-format #| msgid "Network traffic since startup: %s" msgid "Questions since startup: %s" -msgstr "Síťový provoz od spuštění: %s" +msgstr "Dotazů od spuštění: %s" #: server_status.php:714 server_status.php:749 server_status.php:865 #: server_status.php:910 @@ -9081,10 +9069,10 @@ msgid "Network traffic since startup: %s" msgstr "Síťový provoz od spuštění: %s" #: server_status.php:822 -#, fuzzy, php-format +#, php-format #| msgid "This MySQL server has been running for %s. It started up on %s." msgid "This MySQL server has been running for %1$s. It started up on %2$s." -msgstr "Tento MySQL server běží %s. Čas spuštění: %s." +msgstr "Tento MySQL server běží %1$s. Čas spuštění: %2$s." #: server_status.php:832 msgid "" @@ -9800,16 +9788,14 @@ msgid "The number of threads that are not sleeping." msgstr "Počet vláken, která nespí." #: server_status.php:1290 -#, fuzzy #| msgid "Start row" msgid "Start Monitor" -msgstr "Počáteční řádek" +msgstr "Spustit monitor" #: server_status.php:1298 -#, fuzzy #| msgid "Introduction" msgid "Instructions/Setup" -msgstr "Úvod" +msgstr "Návod/Nastavení" #: server_status.php:1302 msgid "Done rearranging/editing charts" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11183-g06655a8
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 06655a8a96a98de1c8ce4b136a10e7c4b285f398 (commit) from dd641ef16437e9c3c232889fd2181833ef8a4e2c (commit) - Log ----------------------------------------------------------------- commit 06655a8a96a98de1c8ce4b136a10e7c4b285f398 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:58:47 2011 +0200 Document that functions do not return anything ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 3b929d3..c32ac4d 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -19,6 +19,7 @@ * @param array &$uncommon_source_tables empty array passed by reference to save * names of tables present in source database * but absent from target database + * @return nothing */ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables) { @@ -45,6 +46,7 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un * @param array &$uncommon_target_tables empty array passed by reference to save * names of tables presnet in target database * but absent from source database + * @return nothing */ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables) { @@ -85,6 +87,7 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * contain number of fields for each matching table * @param array $matching_table_index Index of a table from $matching_table array * @param array &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table + * @return nothing */ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching_table, &$matching_tables_fields, &$update_array, &$insert_array, &$delete_array, &$fields_num, $matching_table_index, &$matching_tables_keys) @@ -302,6 +305,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching * @param db_link $trg_link connection established with target server * @param string $src_db name of source database * @param db_link $src_link connection established with source server + * @return nothing */ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link, $src_db, $src_link) { @@ -373,6 +377,7 @@ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $ma * @param $src_link connection established with source server * @param $index index of a table from $matching_table array * @param $row_count number of rows + * @return nothing */ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_link, $index, &$row_count) { @@ -394,6 +399,7 @@ function PMA_dataDiffInUncommonTables($source_tables_uncommon, $src_db, $src_lin * @param $matching_table_index index of matching table in matching_table_array * @param $matching_table_keys * @param $display true/false value + * @return nothing */ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_link, $matching_table_index, $matching_table_keys, $display) { @@ -465,6 +471,7 @@ function PMA_updateTargetTables($table, $update_array, $src_db, $trg_db, $trg_li * @param $delete_array array containing rows that are to be deleted * @param $update_array array containing rows that are to be updated in target * @param $display true/false value + * @return nothing */ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, $trg_link, $table_fields, &$array_insert, $matching_table_index, $matching_tables_keys, $source_columns, &$add_column_array, $criteria, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields,$uncommon_cols, @@ -588,6 +595,7 @@ function PMA_insertIntoTargetTable($matching_table, $src_db, $trg_db, $src_link, * @param $table_index index of table in $uncommon_tables array * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value + * @return nothing */ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncommon_tables, $table_index, &$uncommon_tables_fields, $display) { @@ -641,7 +649,9 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value * - * FIXME: This turns NULL values into '' (empty string) + * @return nothing + * + * @todo This turns NULL values into '' (empty string) */ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) { @@ -679,6 +689,7 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom * @param $target_tables_keys primary key names of the target tables * @param $delete_array array containing the key values of rows that are to be deleted * @param $display true/false value + * @return nothing */ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_index, $target_tables_keys, $delete_array, $display) { @@ -743,6 +754,7 @@ function PMA_deleteFromTargetTable($trg_db, $trg_link, $matching_tables, $table_ * @param $criteria array containing the criterias which are to be checked for field that is present in source table and target table * @param $target_tables_keys array containing the field names which is key in the target table * @param $matching_table_index integer number of the matching table + * @return nothing */ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_columns, &$target_columns, &$alter_str_array, &$add_column_array, &$uncommon_columns, $criteria, &$target_tables_keys, $matching_table_index) @@ -806,6 +818,7 @@ function PMA_structureDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matc * @param $table_counter integer number of the matching table * @param $uncommon_cols * @param $display true/false value + * @return nothing */ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $matching_tables, $source_columns, &$add_column_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $uncommon_tables, &$uncommon_tables_fields, $table_counter, $uncommon_cols, $display) @@ -896,6 +909,7 @@ function PMA_addColumnsInTargetTable($src_db, $trg_db, $src_link, $trg_link, $ma * @param $uncommon_tables array containing names that are uncommon * @param $uncommon_tables_fields field names of the uncommon table * @param $display true/false value + * @return nothing */ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$referenced_table, &$uncommon_tables, &$uncommon_tables_fields, $display) { @@ -929,6 +943,7 @@ function PMA_checkForeignKeys($src_db, $src_link, $trg_db, $trg_link ,$reference * @param $target_tables_keys array containing the field names which is key in the target table * @param $matching_table_index integer number of the matching table * @param $display true/false value + * @return nothing */ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$source_columns, &$alter_str_array, $matching_tables_fields, $criteria, &$matching_tables_keys, &$target_tables_keys, $matching_table_index, $display) @@ -1058,6 +1073,7 @@ function PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, &$s * @param $uncommon_columns array containing the names of the column which are to be dropped from the target table * @param $table_counter index of the matching table as in $matchiing_tables array * @param $display true/false value + * @return nothing */ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, $uncommon_columns, $table_counter, $display) { @@ -1118,6 +1134,7 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, * @param $alter_indexes_array array containing the key name which needs to be altered * @param $remove_indexes_array array containing the key name of the index which is to be removed from the target table * @param $table_counter number of the matching table + * @return nothing */ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matching_tables, &$source_indexes, &$target_indexes, &$add_indexes_array, &$alter_indexes_array, &$remove_indexes_array, $table_counter) @@ -1181,6 +1198,7 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi * @param $remove_indexes_array array containing the key name of the indexes which are to be removed from the target table * @param $table_counter number of the matching table * @param $display true/false value + * @return nothing */ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_indexes, $target_indexes, $add_indexes_array, $alter_indexes_array, $remove_indexes_array, $table_counter, $display) @@ -1259,6 +1277,7 @@ function PMA_applyIndexesDiff ($trg_db, $trg_link, $matching_tables, $source_ind * into account * * @param $query the query to display + * @return nothing */ function PMA_displayQuery($query) { if (strlen($query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { @@ -1271,6 +1290,7 @@ function PMA_displayQuery($query) { * PMA_syncDisplayHeaderSource() shows the header for source database * * @param string $src_db source db name + * @return nothing */ function PMA_syncDisplayHeaderSource($src_db) { echo '<div id="serverstatus" style = "overflow: auto; width: 1020px; height: 220px; border-left: 1px gray solid; border-bottom: 1px gray solid; padding:0; margin-bottom: 1em "> '; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11182-gdd641ef
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via dd641ef16437e9c3c232889fd2181833ef8a4e2c (commit) from 85e680c39689f60a913cfa15c5392f0aafd79fc8 (commit) - Log ----------------------------------------------------------------- commit dd641ef16437e9c3c232889fd2181833ef8a4e2c Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:49:25 2011 +0200 Wrap some long lines ----------------------------------------------------------------------- Summary of changes: libraries/export/sql.php | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index c87f926..81058a8 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -27,7 +27,9 @@ if (isset($plugin_list)) { 'mime_type' => 'text/x-sql', 'options' => array()); - $plugin_list['sql']['options'][] = array('type' => 'begin_group', 'name' => 'general_opts'); + $plugin_list['sql']['options'][] = array( + 'type' => 'begin_group', + 'name' => 'general_opts'); /* comments */ $plugin_list['sql']['options'][] = array( @@ -77,7 +79,10 @@ if (isset($plugin_list)) { 'type' => 'bool', 'name' => 'disable_fk', 'text' => __('Disable foreign key checks'), - 'doc' => array('manual_MySQL_Database_Administration', 'server-system-variables', 'sysvar_foreign_key_checks') + 'doc' => array( + 'manual_MySQL_Database_Administration', + 'server-system-variables', + 'sysvar_foreign_key_checks') ); $plugin_list['sql']['options_text'] = __('Options'); @@ -94,7 +99,9 @@ if (isset($plugin_list)) { 'name' => 'compatibility', 'text' => __('Database system or older MySQL server to maximize output compatibility with:'), 'values' => $values, - 'doc' => array('manual_MySQL_Database_Administration', 'Server_SQL_mode') + 'doc' => array( + 'manual_MySQL_Database_Administration', + 'Server_SQL_mode') ); unset($values); } @@ -324,9 +331,12 @@ function PMA_exportRoutines($db) { foreach ($procedure_names as $procedure_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $text .= 'DROP PROCEDURE IF EXISTS ' . PMA_backquote($procedure_name) . $delimiter . $crlf; + $text .= 'DROP PROCEDURE IF EXISTS ' + . PMA_backquote($procedure_name) + . $delimiter . $crlf; } - $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name) . $delimiter . $crlf . $crlf; + $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name) + . $delimiter . $crlf . $crlf; } } @@ -338,9 +348,12 @@ function PMA_exportRoutines($db) { foreach ($function_names as $function_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $text .= 'DROP FUNCTION IF EXISTS ' . PMA_backquote($function_name) . $delimiter . $crlf; + $text .= 'DROP FUNCTION IF EXISTS ' + . PMA_backquote($function_name) + . $delimiter . $crlf; } - $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name) . $delimiter . $crlf . $crlf; + $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name) + . $delimiter . $crlf . $crlf; } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11181-g85e680c
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 85e680c39689f60a913cfa15c5392f0aafd79fc8 (commit) from 0d2c07306507cf10b75ebb5ee369e82c77bfa00b (commit) - Log ----------------------------------------------------------------- commit 85e680c39689f60a913cfa15c5392f0aafd79fc8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:45:43 2011 +0200 Remove function names used as first word in docblock ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 52232b8..3b929d3 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -7,11 +7,10 @@ */ /** - * PMA_getMatchingTables places matching tables in source - * and target databases in $matching_tables array whereas - * $uncommon_source_tables array gets the tables present in - * source database but are absent from target database. - * Criterion for matching tables is just comparing their names. + * Places matching tables in source and target databases in $matching_tables + * array whereas $uncommon_source_tables array gets the tables present in + * source database but are absent from target database. Criterion for + * matching tables is just comparing their names. * * @param array $trg_tables array of target database table names, * @param array $src_tables array of source database table names, @@ -38,8 +37,7 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un } /** - * PMA_getNonMatchingTargetTables() places tables present - * in target database but are absent from source database + * Places tables present in target database but are absent from source database * * @param array $trg_tables array of target database table names, * @param array $matching_tables matching tables array containing names @@ -64,7 +62,7 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo } /** - * PMA_dataDiffInTables() finds the difference in source and target matching tables by + * Finds the difference in source and target matching tables by * first comparing source table's primary key entries with target table enteries. * It gets the field names for the matching table also for comparisons. * If the entry is found in target table also then it is checked for the remaining @@ -72,7 +70,6 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * If update is required, it is placed in $update_array * Otherwise that entry is placed in the $insert_array. * - * * @param string $src_db name of source database * @param string $trg_db name of target database * @param db_link $src_link connection established with source server @@ -294,7 +291,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching } /** - * PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted from target table. + * Finds the rows which are to be deleted from target table. * * @param array &$delete_array array containing rows that are to be deleted * @param array $matching_table array containing matching table names @@ -306,7 +303,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching * @param string $src_db name of source database * @param db_link $src_link connection established with source server */ -function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db, $src_link) +function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link, $src_db, $src_link) { if (isset($trg_keys[$matching_table_index])) { $target_key_values = PMA_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11180-g0d2c073
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 0d2c07306507cf10b75ebb5ee369e82c77bfa00b (commit) via 8aa62d4931a3c83d095f5b8dc180dda252ebcbc2 (commit) via 4c16ac5d060493dc2aa9cb91491ade140a16d203 (commit) via 625a35bd87037ace91b4534c5fc9482e021e4257 (commit) from 7986ea8f35c539699f279b3bbd7a9196822a096d (commit) - Log ----------------------------------------------------------------- commit 0d2c07306507cf10b75ebb5ee369e82c77bfa00b Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:43:54 2011 +0200 Add parameter types commit 8aa62d4931a3c83d095f5b8dc180dda252ebcbc2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:41:52 2011 +0200 Minor fix in coding style commit 4c16ac5d060493dc2aa9cb91491ade140a16d203 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:41:37 2011 +0200 Missing references in doc block commit 625a35bd87037ace91b4534c5fc9482e021e4257 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:40:46 2011 +0200 Wrap some long lines ----------------------------------------------------------------------- Summary of changes: libraries/server_synchronize.lib.php | 47 ++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 3a6a666..52232b8 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -15,9 +15,11 @@ * * @param array $trg_tables array of target database table names, * @param array $src_tables array of source database table names, - * @param array &$matching_tables empty array passed by reference to save names of matching tables, - * @param array &$uncommon_source_tables empty array passed by reference to save names of tables present in - * source database but absent from target database + * @param array &$matching_tables empty array passed by reference to save + * names of matching tables, + * @param array &$uncommon_source_tables empty array passed by reference to save + * names of tables present in source database + * but absent from target database */ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$uncommon_source_tables) { @@ -40,16 +42,17 @@ function PMA_getMatchingTables($trg_tables, $src_tables, &$matching_tables, &$un * in target database but are absent from source database * * @param array $trg_tables array of target database table names, - * @param array $matching_tables $matching tables array containing names of matching tables, - * @param array &$uncommon_target_tables empty array passed by reference to save names of tables presnet in - * target database but absent from source database + * @param array $matching_tables matching tables array containing names + * of matching tables, + * @param array &$uncommon_target_tables empty array passed by reference to save + * names of tables presnet in target database + * but absent from source database */ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommon_target_tables) { for ($c=0; $c<sizeof($trg_tables); $c++) { $match = false; - for ($d=0; $d < sizeof($matching_tables); $d++) - { + for ($d=0; $d < sizeof($matching_tables); $d++) { if ($trg_tables[$c] === $matching_tables[$d]) { $match=true; } @@ -74,14 +77,14 @@ function PMA_getNonMatchingTargetTables($trg_tables, $matching_tables, &$uncommo * @param string $trg_db name of target database * @param db_link $src_link connection established with source server * @param db_link $trg_link connection established with target server - * @param array $matching_table array containing matching table names + * @param array &$matching_table array containing matching table names * @param array &$matching_tables_fields A two dimensional array passed by reference to contain names of fields for each matching table - * @param array $update_array A three dimensional array passed by reference to + * @param array &$update_array A three dimensional array passed by reference to * contain updates required for each matching table - * @param array $insert_array A three dimensional array passed by reference to + * @param array &$insert_array A three dimensional array passed by reference to * contain inserts required for each matching table - * @param array $delete_array Unused - * @param array $fields_num A two dimensional array passed by reference to + * @param array &$delete_array Unused + * @param array &$fields_num A two dimensional array passed by reference to * contain number of fields for each matching table * @param array $matching_table_index Index of a table from $matching_table array * @param array &$matching_tables_keys A two dimensional array passed by reference to contain names of keys for each matching table @@ -293,15 +296,15 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching /** * PMA_findDeleteRowsFromTargetTables finds the rows which are to be deleted from target table. * - * @param $delete_array array containing rows that are to be deleted - * @param $matching_table array containing matching table names - * @param $matching_table_index index of a table from $matching_table array - * @param $trg_keys array of target table keys - * @param $src_keys array of source table keys - * @param $trg_db name of target database - * @param $trg_link connection established with target server - * @param $src_db name of source database - * @param $src_link connection established with source server + * @param array &$delete_array array containing rows that are to be deleted + * @param array $matching_table array containing matching table names + * @param int $matching_table_index index of a table from $matching_table array + * @param array $trg_keys array of target table keys + * @param array $src_keys array of source table keys + * @param string $trg_db name of target database + * @param db_link $trg_link connection established with target server + * @param string $src_db name of source database + * @param db_link $src_link connection established with source server */ function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db, $src_link) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11176-g7986ea8
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 7986ea8f35c539699f279b3bbd7a9196822a096d (commit) via dafefcd2759178980f8d9ed87edbbafe2ee94a5e (commit) from 008b96aaec574b7d3310883c893f6023d620fc01 (commit) - Log ----------------------------------------------------------------- commit 7986ea8f35c539699f279b3bbd7a9196822a096d Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:36:01 2011 +0200 Free result once we do not need it commit dafefcd2759178980f8d9ed87edbbafe2ee94a5e Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:35:43 2011 +0200 More replacement of double quotes ----------------------------------------------------------------------- Summary of changes: libraries/export/codegen.php | 54 +++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index a533dd4..35fe21d 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -242,44 +242,45 @@ class TableProperty function handleNHibernateCSBody($db, $table, $crlf) { $lines=array(); - $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); + $result=PMA_DBI_query(sprintf('DESC %s.%s', PMA_backquote($db), PMA_backquote($table))); if ($result) { $tableProperties=array(); while ($row = PMA_DBI_fetch_row($result)) { $tableProperties[] = new TableProperty($row); } - $lines[] = "using System;"; - $lines[] = "using System.Collections;"; - $lines[] = "using System.Collections.Generic;"; - $lines[] = "using System.Text;"; - $lines[] = "namespace ".cgMakeIdentifier($db); - $lines[] = "{"; - $lines[] = " #region ".cgMakeIdentifier($table); - $lines[] = " public class ".cgMakeIdentifier($table); - $lines[] = " {"; - $lines[] = " #region Member Variables"; + PMA_DBI_free_result($result); + $lines[] = 'using System;'; + $lines[] = 'using System.Collections;'; + $lines[] = 'using System.Collections.Generic;'; + $lines[] = 'using System.Text;'; + $lines[] = 'namespace ' . cgMakeIdentifier($db); + $lines[] = '{'; + $lines[] = ' #region ' . cgMakeIdentifier($table); + $lines[] = ' public class ' . cgMakeIdentifier($table); + $lines[] = ' {'; + $lines[] = ' #region Member Variables'; foreach ($tableProperties as $tablePropertie) { - $lines[] = $tablePropertie->formatCs(" protected #dotNetPrimitiveType# _#name#;"); + $lines[] = $tablePropertie->formatCs(' protected #dotNetPrimitiveType# _#name#;'); } - $lines[] = " #endregion"; - $lines[] = " #region Constructors"; - $lines[] = " public ".cgMakeIdentifier($table)."() { }"; + $lines[] = ' #endregion'; + $lines[] = ' #region Constructors'; + $lines[] = ' public ' . cgMakeIdentifier($table).'() { }'; $temp = array(); foreach ($tableProperties as $tablePropertie) { if (! $tablePropertie->isPK()) { - $temp[] = $tablePropertie->formatCs("#dotNetPrimitiveType# #name#"); + $temp[] = $tablePropertie->formatCs('#dotNetPrimitiveType# #name#'); } } - $lines[] = " public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")"; - $lines[] = " {"; + $lines[] = ' public ' . cgMakeIdentifier($table) . '(' . implode(', ', $temp) . ')'; + $lines[] = ' {'; foreach ($tableProperties as $tablePropertie) { if (! $tablePropertie->isPK()) { - $lines[] = $tablePropertie->formatCs(" this._#name#=#name#;"); + $lines[] = $tablePropertie->formatCs(' this._#name#=#name#;'); } } - $lines[] = " }"; - $lines[] = " #endregion"; - $lines[] = " #region Public Properties"; + $lines[] = ' }'; + $lines[] = ' #endregion'; + $lines[] = ' #region Public Properties'; foreach ($tableProperties as $tablePropertie) { $lines[] = $tablePropertie->formatCs('' . ' public virtual #dotNetPrimitiveType# #ucfirstName#' . "\n" @@ -289,11 +290,10 @@ class TableProperty . ' }' ); } - $lines[] = " #endregion"; - $lines[] = " }"; - $lines[] = " #endregion"; - $lines[] = "}"; - PMA_DBI_free_result($result); + $lines[] = ' #endregion'; + $lines[] = ' }'; + $lines[] = ' #endregion'; + $lines[] = '}'; } return implode("\n", $lines); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11174-g008b96a
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 008b96aaec574b7d3310883c893f6023d620fc01 (commit) via 5330cabd37d043c1c63ca5406c726bbf83b6c428 (commit) from c03c7bbc69d7b05ad3290d3378d48f3debb80745 (commit) - Log ----------------------------------------------------------------- commit 008b96aaec574b7d3310883c893f6023d620fc01 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:29:36 2011 +0200 Coding style Wrap ling lines, add missing {} around for and if. commit 5330cabd37d043c1c63ca5406c726bbf83b6c428 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:28:22 2011 +0200 Remove rest of custom color support This seems to be stray code for it. Also adjusted documentation to represent real return value. ----------------------------------------------------------------------- Summary of changes: libraries/Config.class.php | 5 ++--- libraries/export/codegen.php | 33 ++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 58ea577..28f9ac3 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -674,7 +674,7 @@ class PMA_Config * or the theme changes * must also check the pma_fontsize cookie in case there is no * config file - * @return int Unix timestamp + * @return int Summary of unix timestamps and fontsize, to be unique on theme parameters change */ function getThemeUniqueValue() { @@ -691,8 +691,7 @@ class PMA_Config $this->default_source_mtime + $this->get('user_preferences_mtime') + $_SESSION['PMA_Theme']->mtime_info + - $_SESSION['PMA_Theme']->filesize_info) - . (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'], 1, 6) : ''); + $_SESSION['PMA_Theme']->filesize_info); } /** diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 94971e8..a533dd4 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -245,8 +245,9 @@ class TableProperty $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); if ($result) { $tableProperties=array(); - while ($row = PMA_DBI_fetch_row($result)) + while ($row = PMA_DBI_fetch_row($result)) { $tableProperties[] = new TableProperty($row); + } $lines[] = "using System;"; $lines[] = "using System.Collections;"; $lines[] = "using System.Collections.Generic;"; @@ -257,25 +258,37 @@ class TableProperty $lines[] = " public class ".cgMakeIdentifier($table); $lines[] = " {"; $lines[] = " #region Member Variables"; - foreach ($tableProperties as $tablePropertie) + foreach ($tableProperties as $tablePropertie) { $lines[] = $tablePropertie->formatCs(" protected #dotNetPrimitiveType# _#name#;"); + } $lines[] = " #endregion"; $lines[] = " #region Constructors"; $lines[] = " public ".cgMakeIdentifier($table)."() { }"; $temp = array(); - foreach ($tableProperties as $tablePropertie) - if (! $tablePropertie->isPK()) + foreach ($tableProperties as $tablePropertie) { + if (! $tablePropertie->isPK()) { $temp[] = $tablePropertie->formatCs("#dotNetPrimitiveType# #name#"); + } + } $lines[] = " public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")"; $lines[] = " {"; - foreach ($tableProperties as $tablePropertie) - if (! $tablePropertie->isPK()) + foreach ($tableProperties as $tablePropertie) { + if (! $tablePropertie->isPK()) { $lines[] = $tablePropertie->formatCs(" this._#name#=#name#;"); + } + } $lines[] = " }"; $lines[] = " #endregion"; $lines[] = " #region Public Properties"; - foreach ($tableProperties as $tablePropertie) - $lines[] = $tablePropertie->formatCs(" public virtual #dotNetPrimitiveType# #ucfirstName#\n {\n get {return _#name#;}\n set {_#name#=value;}\n }"); + foreach ($tableProperties as $tablePropertie) { + $lines[] = $tablePropertie->formatCs('' + . ' public virtual #dotNetPrimitiveType# #ucfirstName#' . "\n" + . ' {' . "\n" + . ' get {return _#name#;}' . "\n" + . ' set {_#name#=value;}' . "\n" + . ' }' + ); + } $lines[] = " #endregion"; $lines[] = " }"; $lines[] = " #endregion"; @@ -292,7 +305,9 @@ class TableProperty $lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" ' . 'namespace="' . cgMakeIdentifier($db) . '" ' . 'assembly="' . cgMakeIdentifier($db) . '">'; - $lines[] = ' <class name="' . cgMakeIdentifier($table) . '" table="' . cgMakeIdentifier($table) . '">'; + $lines[] = ' <class ' + . 'name="' . cgMakeIdentifier($table) . '" ' + . 'table="' . cgMakeIdentifier($table) . '">'; $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); if ($result) { while ($row = PMA_DBI_fetch_row($result)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11172-gc03c7bb
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via c03c7bbc69d7b05ad3290d3378d48f3debb80745 (commit) via 7f629c66ff17ecfe5502fdf3fdc389d4c4bb5851 (commit) via b349356a83ad44bfc657101337f08c760e3bdd75 (commit) via 79af2a937435c04ab04ec2c0540d01fd27d7e0a8 (commit) from 73bb9302b6dec3befea195cfdd9c95614281a639 (commit) - Log ----------------------------------------------------------------- commit c03c7bbc69d7b05ad3290d3378d48f3debb80745 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:25:31 2011 +0200 Better formatting for code commit 7f629c66ff17ecfe5502fdf3fdc389d4c4bb5851 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:22:01 2011 +0200 Remove method used only in single place as a function commit b349356a83ad44bfc657101337f08c760e3bdd75 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:20:11 2011 +0200 Avoid storing table data when we don't need it commit 79af2a937435c04ab04ec2c0540d01fd27d7e0a8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 14:19:07 2011 +0200 Minimize need for escaping by using single quotes ----------------------------------------------------------------------- Summary of changes: libraries/export/codegen.php | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index bc0dada..94971e8 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -123,8 +123,8 @@ function PMA_exportDBCreate($db) */ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { - global $CG_FORMATS, $CG_HANDLERS; - $format = cgGetOption("format"); + global $CG_FORMATS, $CG_HANDLERS, $what; + $format = $GLOBALS[$what . '_format']; if (isset($CG_FORMATS[$format])) { return PMA_exportOutputHandler($CG_HANDLERS[$format]($db, $table, $crlf)); } @@ -287,7 +287,7 @@ class TableProperty function handleNHibernateXMLBody($db, $table, $crlf) { - $lines=array(); + $lines = array(); $lines[] = '<?xml version="1.0" encoding="utf-8" ?' . '>'; $lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" ' . 'namespace="' . cgMakeIdentifier($db) . '" ' @@ -295,26 +295,25 @@ class TableProperty $lines[] = ' <class name="' . cgMakeIdentifier($table) . '" table="' . cgMakeIdentifier($table) . '">'; $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); if ($result) { - $tableProperties = array(); - while ($row = PMA_DBI_fetch_row($result)) - $tableProperties[] = new TableProperty($row); - foreach ($tableProperties as $tablePropertie) { + while ($row = PMA_DBI_fetch_row($result)) { + $tablePropertie = new TableProperty($row); if ($tablePropertie->isPK()) - $lines[] = $tablePropertie->formatXml(" <id name=\"#ucfirstName#\" type=\"#dotNetObjectType#\" unsaved-value=\"0\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" unique=\"#unique#\" index=\"PRIMARY\"/>\n <generator class=\"native\" />\n </id>"); + $lines[] = $tablePropertie->formatXml('' + . ' <id name="#ucfirstName#" type="#dotNetObjectType#" unsaved-value="0">' . "\n" + . ' <column name="#name#" sql-type="#type#" not-null="#notNull#" unique="#unique#" index="PRIMARY"/>' . "\n" + . ' <generator class="native" />' . "\n" + . ' </id>'); else - $lines[] = $tablePropertie->formatXml(" <property name=\"#ucfirstName#\" type=\"#dotNetObjectType#\">\n <column name=\"#name#\" sql-type=\"#type#\" not-null=\"#notNull#\" #indexName#/>\n </property>"); + $lines[] = $tablePropertie->formatXml('' + . ' <property name="#ucfirstName#" type="#dotNetObjectType#">' . "\n" + . ' <column name="#name#" sql-type="#type#" not-null="#notNull#" #indexName#/>' . "\n" + . ' </property>'); } PMA_DBI_free_result($result); } - $lines[]=" </class>"; - $lines[]="</hibernate-mapping>"; + $lines[] = ' </class>'; + $lines[] = '</hibernate-mapping>'; return implode("\n", $lines); } - - function cgGetOption($optionName) - { - global $what; - return $GLOBALS[$what . "_" . $optionName]; - } } ?> hooks/post-receive -- phpMyAdmin

1 0