[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11115-g9fe1aef

Michal Čihař nijel at users.sourceforge.net
Thu Jul 21 10:24:01 CEST 2011


The branch, master has been updated
       via  9fe1aefb8ab22fdd0d99645492dac4d60a05988d (commit)
       via  dd0e9396a910872a0bf397343b33a49a308e46c3 (commit)
       via  50527d9d6b7a42db6b5893263607f59ded131e9a (commit)
      from  627149dce1c2a68979a2b38745e6c80cc030a21e (commit)


- Log -----------------------------------------------------------------
commit 9fe1aefb8ab22fdd0d99645492dac4d60a05988d
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 10:24:23 2011 +0200

    Add missing setup to PMA_buildActionTitles_test

commit dd0e9396a910872a0bf397343b33a49a308e46c3
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 10:22:29 2011 +0200

    Add missing step to setup phase

commit 50527d9d6b7a42db6b5893263607f59ded131e9a
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 09:33:16 2011 +0200

    Czech translation update

-----------------------------------------------------------------------

Summary of changes:
 po/cs.po                                           |    9 ++++-----
 .../common/PMA_buildActionTitles_test.php          |    7 ++++++-
 test/libraries/common/PMA_checkParameters_test.php |    3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index af98b19..3d995eb 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 at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-21 09:04+0200\n"
-"PO-Revision-Date: 2011-07-17 20:07+0200\n"
+"PO-Revision-Date: 2011-07-21 09:33+0200\n"
 "Last-Translator: Michal Čihař <michal at cihar.com>\n"
 "Language-Team: czech <cs at li.org>\n"
 "Language: cs\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: libraries/display_tbl.lib.php:354 libraries/display_tbl.lib.php:421
 #: server_privileges.php:1583
 msgid "Show all"
-msgstr "Zobrazit vše"
+msgstr "Zobrazit vše "
 
 #: browse_foreigners.php:70 libraries/common.lib.php:2173
 #: libraries/export/pdf.php:135
@@ -1127,10 +1127,9 @@ msgstr "Připojení / Procesů"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:87
-#, fuzzy
 #| msgid "Connections since last refresh"
 msgid "Questions since last refresh"
-msgstr "Spojení od posledního obnovaní"
+msgstr "Dotazů od poslední aktualizace"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:89
@@ -1143,7 +1142,7 @@ msgstr "Statistika dotazů"
 
 #: js/messages.php:94
 msgid "System CPU Usage"
-msgstr ""
+msgstr "Využití CPU"
 
 #: js/messages.php:95
 msgid "System memory"
diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php
index 130a972..310bf8f 100644
--- a/test/libraries/common/PMA_buildActionTitles_test.php
+++ b/test/libraries/common/PMA_buildActionTitles_test.php
@@ -15,6 +15,11 @@ require_once 'libraries/common.lib.php';
 
 class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase{
 
+    function setup()
+    {
+        $GLOBALS['cfg'] = array('PropertiesIconic' => 'both');
+    }
+
     function testBuildActionTitles(){
         $titles = array();
 
@@ -39,4 +44,4 @@ class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase{
         $this->assertEquals($titles, PMA_buildActionTitles());
 
     }
-}
\ No newline at end of file
+}
diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php
index f72b880..b18f498 100644
--- a/test/libraries/common/PMA_checkParameters_test.php
+++ b/test/libraries/common/PMA_checkParameters_test.php
@@ -20,6 +20,7 @@ class PMA_checkParameters_test extends PHPUnit_Extensions_OutputTestCase
     {
         $GLOBALS['PMA_Config'] = new PMA_Config();
         $_SESSION['PMA_Theme'] = new PMA_Theme();
+        $GLOBALS['cfg'] = array('ReplaceHelpImg' => true);
     }
 
     function testCheckParameterMissing()
@@ -43,4 +44,4 @@ class PMA_checkParameters_test extends PHPUnit_Extensions_OutputTestCase
         $this->expectOutputString("");
         PMA_checkParameters(array('db', 'table', 'field', 'sql_query'), false);
     }
-}
\ No newline at end of file
+}


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list