From 27d3a8f92f7109d4951a56c1eb1977c070699bd2 Mon Sep 17 00:00:00 2001 From: soranzo Date: Tue, 24 Apr 2007 15:31:29 +0000 Subject: [PATCH] Start i18n of multiactions. Use 'Execute' instead of 'Run'. --- classes/Misc.php | 4 ++-- database.php | 4 ++-- lang/english.php | 4 ++-- lang/recoded/english.php | 4 ++-- reports.php | 4 ++-- sqledit.php | 4 ++-- tests/testcase/Server/ReportsTest.php | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/classes/Misc.php b/classes/Misc.php index b53b590ca..308db30d0 100644 --- a/classes/Misc.php +++ b/classes/Misc.php @@ -2,7 +2,7 @@ /** * Class to hold various commonly used functions * - * $Id: Misc.php,v 1.146 2007/04/24 15:00:02 soranzo Exp $ + * $Id: Misc.php,v 1.147 2007/04/24 15:31:29 soranzo Exp $ */ class Misc { @@ -1686,7 +1686,7 @@ function printTable(&$tabledata, &$columns, &$actions, $nodata = null, $pre_fn = foreach($multiactions['actions'] as $o) echo "\t\t\n"; echo "\t\n"; - echo "\n"; + echo "\n"; echo $misc->form; echo "\n"; echo "\n"; diff --git a/database.php b/database.php index 3bb242c2a..5625526e2 100755 --- a/database.php +++ b/database.php @@ -3,7 +3,7 @@ /** * Manage schemas within a database * - * $Id: database.php,v 1.95 2007/04/23 18:48:06 soranzo Exp $ + * $Id: database.php,v 1.96 2007/04/24 15:31:29 soranzo Exp $ */ // Include application functions @@ -871,7 +871,7 @@ function doSQL() { } echo "

\n"; - echo "

\n"; + echo "

\n"; if ($data->hasFullExplain()) { echo "\n"; echo "\n"; diff --git a/lang/english.php b/lang/english.php index 63ba3c0b1..b50e399e5 100755 --- a/lang/english.php +++ b/lang/english.php @@ -4,7 +4,7 @@ * English language file for phpPgAdmin. Use this as a basis * for new translations. * - * $Id: english.php,v 1.207 2007/04/24 15:00:03 soranzo Exp $ + * $Id: english.php,v 1.208 2007/04/24 15:31:29 soranzo Exp $ */ // Language and character set @@ -100,7 +100,7 @@ $lang['strclusterindex'] = 'Cluster'; $lang['strclustered'] = 'Clustered?'; $lang['strreindex'] = 'Reindex'; - $lang['strrun'] = 'Run'; + $lang['strexecute'] = 'Execute'; $lang['stradd'] = 'Add'; $lang['strevent'] = 'Event'; $lang['strwhere'] = 'Where'; diff --git a/lang/recoded/english.php b/lang/recoded/english.php index 16b77e8b0..84a259e92 100644 --- a/lang/recoded/english.php +++ b/lang/recoded/english.php @@ -4,7 +4,7 @@ * English language file for phpPgAdmin. Use this as a basis * for new translations. * - * $Id: english.php,v 1.159 2007/04/24 15:00:03 soranzo Exp $ + * $Id: english.php,v 1.160 2007/04/24 15:31:29 soranzo Exp $ */ // Language and character set @@ -100,7 +100,7 @@ $lang['strclusterindex'] = 'Cluster'; $lang['strclustered'] = 'Clustered?'; $lang['strreindex'] = 'Reindex'; - $lang['strrun'] = 'Run'; + $lang['strexecute'] = 'Execute'; $lang['stradd'] = 'Add'; $lang['strevent'] = 'Event'; $lang['strwhere'] = 'Where'; diff --git a/reports.php b/reports.php index 5ff2efc2d..747c6f7ba 100644 --- a/reports.php +++ b/reports.php @@ -3,7 +3,7 @@ /** * List reports in a database * - * $Id: reports.php,v 1.26 2007/04/22 00:41:58 mr-russ Exp $ + * $Id: reports.php,v 1.27 2007/04/24 15:31:29 soranzo Exp $ */ // Include application functions @@ -278,7 +278,7 @@ function doDefault($msg = '') { 'vars' => array('report_id' => 'report_id'), ), 'run' => array( - 'title' => $lang['strrun'], + 'title' => $lang['strexecute'], 'url' => "sql.php?subject=report&{$misc->href}&return_url={$return_url}&return_desc=".urlencode($lang['strback'])."&", 'vars' => array('report' => 'report_name', 'database' => 'db_name', 'query' => 'report_sql', 'paginate' => 'paginate'), ), diff --git a/sqledit.php b/sqledit.php index bd3f3d6bf..db916ffbe 100644 --- a/sqledit.php +++ b/sqledit.php @@ -3,7 +3,7 @@ /** * Alternative SQL editing window * - * $Id: sqledit.php,v 1.32 2007/04/22 00:41:58 mr-russ Exp $ + * $Id: sqledit.php,v 1.33 2007/04/24 15:31:29 soranzo Exp $ */ // Include application functions @@ -169,7 +169,7 @@ function doDefault() { htmlspecialchars($_REQUEST['query']), "\n"; echo "\n"; - echo "

\n"; + echo "

\n"; if ($data->hasFullExplain()) { echo "\n"; echo "\n"; diff --git a/tests/testcase/Server/ReportsTest.php b/tests/testcase/Server/ReportsTest.php index 373fef9b4..aa821e1e9 100644 --- a/tests/testcase/Server/ReportsTest.php +++ b/tests/testcase/Server/ReportsTest.php @@ -81,7 +81,7 @@ function testRun() // Run the existing report and verify it. $this->assertTrue($this->get($webUrl . '/reports.php')); - $this->assertTrue($this->clickLink($lang['strrun'])); + $this->assertTrue($this->clickLink($lang['strexecute'])); $this->assertWantedText($lang['strnodata']); $this->assertTrue($this->clickLink($lang['strrefresh']));