Remove old plugin architecture.

Patch by Leonardo Sapiras, remerged by ioguix.

  * remove old plugin architecture
  * remove plugin Slony

31 files changed, 31 insertions, 5433 deletions

diff --git a/classes/Misc.php b/classes/Misc.php
index fd756ed8..d8e94790 100644
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -374,18 +374,6 @@
 						}
 					}
 					break;
-				case 'slonystatus':
-					switch ($str) {
-					case 'insync':
-						$out = $lang['strhealthy'];
-						break;
-					case 'outofsync':
-						$out = $lang['stroutofsync'];
-						break;
-					default:
-						$out = $lang['strunknown'];
-					}
-					break;
 				default:
 					// If the string contains at least one instance of >1 space in a row, a tab
 					// character, a space at the start of a line, or a space at the start of
@@ -671,7 +659,7 @@
 		 * @param $section The name of the tab bar.
 		 */
 		function getNavTabs($section) {
-			global $data, $lang, $conf, $slony;
+			global $data, $lang, $conf;
 
 			$hide_advanced = ($conf['show_advanced'] === false);
 
@@ -849,14 +837,6 @@
 							'help'  => 'pg.cast',
 							'icon'  => 'Casts',
 						),
-						'slony' => array (
-							'title' => 'Slony',
-							'url'   => 'plugin_slony.php',
-							'urlvars' => array('subject' => 'database', 'action' => 'clusters_properties'),
-							'hide'  => !isset($slony),
-							'help'  => '',
-							'icon'  => 'Replication',
-						),
 						'export' => array (
 							'title' => $lang['strexport'],
 							'url'   => 'database.php',
@@ -1159,46 +1139,6 @@
 						),
 					);
 
-				case 'slony_cluster':
-					return array (
-						'properties' => array (
-							'title' => $lang['strproperties'],
-							'url'   => 'plugin_slony.php',
-							'urlvars' => array(
-									'subject' => 'slony_cluster',
-									'action' => 'cluster_properties',
-									'slony_cluster' => field('slony_cluster')
-								),
-							'help'  => '',
-							'tree'  => false,
-							'icon'  => 'Cluster',
-						),
-						'nodes' => array (
-							'title' => $lang['strnodes'],
-							'url'   => 'plugin_slony.php',
-							'urlvars' => array(
-									'subject' => 'slony_cluster',
-									'action' => 'nodes_properties',
-									'slony_cluster' => field('slony_cluster')
-								),
-							'branch' => 'nodes',
-							'help'  => '',
-							'icon'  => 'Nodes',
-						),
-						'sets' => array (
-							'title' => $lang['strrepsets'],
-							'url'   => 'plugin_slony.php',
-							'urlvars' => array(
-								'subject' => 'slony_cluster',
-								'action' => 'sets_properties',
-								'slony_cluster' => field('slony_cluster')
-							),
-							'branch' => 'sets',
-							'help'  => '',
-							'icon'  => 'ReplicationSets',
-						),
-					);
-
 				case 'column':
 					return array(
 						'properties' => array (
@@ -1453,17 +1393,6 @@
 			}
 			if ($subject == 'schema') $done = true;
 
-			if (isset($_REQUEST['slony_cluster']) && !$done) {
-				$trail['slony_cluster'] = array(
-					'title' => 'Slony Cluster',
-					'text'  => $_REQUEST['slony_cluster'],
-					'url'   => $this->getHREFSubject('slony_cluster'),
-					'help'  => 'sl.cluster',
-					'icon'  => 'Cluster'
-				);
-			}
-			if ($subject == 'slony_cluster') $done = true;
-
 			if (isset($_REQUEST['table']) && !$done) {
 				$trail['table'] = array(
 					'title' => $lang['strtable'],
@@ -1511,22 +1440,6 @@
 							'icon'  => 'Aggregate'
 						);
 						break;
-					case 'slony_node':
-						$trail[$subject] = array(
-							'title' => 'Slony Node',
-							'text'  => $_REQUEST['no_name'],
-							'help'  => 'sl.'.$subject,
-							'icon'  => 'Node'
-						);
-						break;
-					case 'slony_set':
-						$trail[$subject] = array(
-							'title' => $lang['str'.$subject],
-							'text'  => $_REQUEST[$subject],
-							'help'  => 'sl.'.$subject,
-							'icon'  => 'AvailableReplicationSet'
-						);
-						break;
 					case 'column':
 						$trail['column'] = array (
 							'title' => $lang['strcolumn'],
diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 69073d80..0421989f 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -834,15 +834,10 @@ class Postgres extends ADODB_base {
 	 * @return All schemas, sorted alphabetically
 	 */
 	function getSchemas() {
-		global $conf, $slony;
+		global $conf;
 
 		if (!$conf['show_system']) {
 			$where = "WHERE nspname NOT LIKE 'pg@_%' ESCAPE '@' AND nspname != 'information_schema'";
-			if (isset($slony) && $slony->isEnabled()) {
-				$temp = $slony->slony_schema;
-				$this->clean($temp);
-				$where .= " AND nspname != '{$temp}'";
-			}
 
 		}
 		else $where = "WHERE nspname !~ '^pg_t(emp_[0-9]+|oast)$'";
diff --git a/classes/database/Postgres80.php b/classes/database/Postgres80.php
index ce15f976..1f29c1cf 100644
--- a/classes/database/Postgres80.php
+++ b/classes/database/Postgres80.php
@@ -110,16 +110,10 @@ class Postgres80 extends Postgres81 {
 	 * @return All schemas, sorted alphabetically
 	 */
 	function getSchemas() {
-		global $conf, $slony;
+		global $conf;
 
 		if (!$conf['show_system']) {
 			$where = "WHERE nspname NOT LIKE 'pg@_%' ESCAPE '@' AND nspname != 'information_schema'";
-			if (isset($slony) && $slony->isEnabled()) {
-				$temp = $slony->slony_schema;
-				$this->clean($temp);
-				$where .= " AND nspname != '{$temp}'";
-			}
-
 		}
 		else $where = "WHERE nspname !~ '^pg_t(emp_[0-9]+|oast)$'";
 		$sql = "
diff --git a/classes/plugins/Plugin.php b/classes/plugins/Plugin.php
deleted file mode 100755
index 687d4e2e..00000000
--- a/classes/plugins/Plugin.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * A class that implements the plugin system
- *
- * $Id: Plugin.php,v 1.2 2005/06/16 14:40:12 chriskl Exp $
- */
-
-class Plugin {
-
-	var $tabname = null;
-	var $config = null;
-	var $name = null;
-	
-	/**
-	 * Constructor
-	 */
-	function Plugin($name) {
-		$this->name = $name;
-		
-		// Read in configuration
-		if ($this->config !== null) {
-			global $conf;
-			include('./conf/' . $name . '.inc.php');			
-		}
-	}
-
-}
-
-?>
diff --git a/classes/plugins/Slony.php b/classes/plugins/Slony.php
deleted file mode 100755
index e73f9dbe..00000000
--- a/classes/plugins/Slony.php
+++ /dev/null
@@ -1,910 +0,0 @@
-<?php
-
-/**
- * A class that implements the Slony 1.0.x support plugin
- *
- * $Id: Slony.php,v 1.15 2007/10/02 21:36:35 ioguix Exp $
- */
-
-include_once('./classes/plugins/Plugin.php');
-
-class Slony extends Plugin {
-
-	var $slony_version;
-	var $slony_schema;
-	var $slony_cluster;
-	var $slony_owner;
-	var $slony_comment;
-	var $enabled = null;
-	
-	/**
-	 * Constructor
-	 */
-	function Slony() {
-		$this->Plugin('slony');
-		$this->isEnabled();
-	}
-
-	/**
-	 * Determines whether or not Slony is installed in the current
-	 * database.
-	 * @post Will populate version and schema fields, etc.
-	 * @return True if Slony is installed, false otherwise.
-	 */
-	function isEnabled() {
-		// Access cache
-		if ($this->enabled !== null) return $this->enabled;
-		else $this->enabled = false;
-		
-		global $data;
-		
-		// Check for the slonyversion() function and find the schema
-		// it's in.  We put an order by and limit 1 in here to guarantee
-		// only finding the first one, even if there are somehow two
-		// Slony schemas.
-		$sql = "SELECT pn.nspname AS schema, pu.usename AS owner, 
-                    SUBSTRING(pn.nspname FROM 2) AS cluster,
-                    pg_catalog.obj_description(pn.oid, 'pg_namespace') AS 
-                    nspcomment
-                    FROM pg_catalog.pg_proc pp, pg_catalog.pg_namespace pn, 
-                    pg_catalog.pg_user pu 
-					WHERE pp.pronamespace=pn.oid
-					AND pn.nspowner = pu.usesysid
-					AND pp.proname='slonyversion'
-					AND pn.nspname LIKE '@_%' ESCAPE '@'  
-					ORDER BY pn.nspname LIMIT 1";
-		$rs = $data->selectSet($sql);
-		if ($rs->recordCount() == 1) {
-			$schema = $rs->fields['schema'];
-			$this->slony_schema = $schema;
-			$this->slony_owner = $rs->fields['owner'];
-			$this->slony_comment = $rs->fields['nspcomment'];
-			// Cluster name is schema minus "_" prefix.
-			$this->slony_cluster = $rs->fields['cluster'];
-			$data->fieldClean($schema);
-			$sql = "SELECT \"{$schema}\".slonyversion() AS version";
-			$version = $data->selectField($sql, 'version');
-			if ($version === -1) return false;
-			else {
-				$this->slony_version = $version;
-				$this->enabled = true;
-				return true;
-			}
-		}
-		else return false;
-	}	
-
-	// CLUSTERS
-
-	/**
-	 * Gets the clusters in this database
-	 */
-	function getClusters() {
-		include_once('./classes/ArrayRecordSet.php');
-
-		if ($this->isEnabled()) {
-			$clusters = array(array('cluster' => $this->slony_cluster, 'comment' => $this->slony_comment));
-		}
-		else
-			$clusters = array();
-
-		return new ArrayRecordSet($clusters);
-	}
-	
-	/**
-	 * Gets a single cluster
-	 */
-	function getCluster() {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		
-		$sql = "SELECT no_id, no_comment, \"{$schema}\".slonyversion() AS version
-					FROM \"{$schema}\".sl_local_node_id, \"{$schema}\".sl_node
-					WHERE no_id=last_value";
-		
-		
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Drops an entire cluster.
-	 */
-	function dropCluster() {
-		global $data;
-		
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-
-		$sql = "SELECT \"{$schema}\".uninstallnode(); DROP SCHEMA \"{$schema}\" CASCADE";
-		
-		$status = $data->execute($sql);
-		if ($status == 0) {
-			$this->enabled = null;
-			$enabled = $this->isEnabled();
-		}
-		return $status;
-	}
-	
-	/**
-	 * Helper function to get a file into a string and replace
-	 * variables.
-	 * @return The file contents, or FALSE on error.
-	 */
-	function _getFile($file, $cluster) {
-		global $data,$misc;
-		$schema = '_' . $cluster;
-		$data->fieldClean($cluster);
-		
-		$server_info = $misc->getServerInfo();
-		$path = $server_info['slony_sql'] . '/' . $file;
-		
-		// Check that we can access the file
-		if (!file_exists($path) || !is_readable($path)) return false;
-
-		$buffer = null;
-		$handle = fopen($path, 'r');
-		if ($handle === false) return false;

-		while (!feof($handle)) {

-		   $temp = fgets($handle, 4096);
-		   $temp = str_replace('@CLUSTERNAME@', $cluster, $temp);
-		   
-		   $temp = str_replace('@NAMESPACE@', $schema, $temp);
-		   $buffer .= $temp;

-		}

-		fclose($handle);
-		
-		return $buffer;
-	}
-	
-	/**
-	 * Initializes a new cluster
-	 */
-	function initCluster($name, $no_id, $no_comment) {
-		global $data, $misc;
-		
-		// Prevent timeouts since cluster initialization can be slow
-		if (!ini_get('safe_mode')) set_time_limit(0);
-
-		$server_info = $misc->getServerInfo();
-		
-		if (!$data->isSuperUser($server_info['username'])) {
-			return -10;
-		}
-
-		// Determine Slony compatibility version.
-		if ($data->major_version == 7.3)
-			$ver = '73';
-		elseif ($data->major_version >= 7.4)
-			$ver = '74';
-		else {
-			return -11;
-		}
-		
-		$status = $data->beginTransaction();
-		if ($status != 0) return -1;
-
-		// Create the schema
-		$status = $data->createSchema('_' . $name);
-		if ($status != 0) {
-			$data->rollbackTransaction();
-			return -2;
-		}
-
-		$sql = $this->_getFile("xxid.v{$ver}.sql", $name);
-		if ($sql === false) {
-			$data->rollbackTransaction();
-			return -6;
-		}			
-		$status = $data->execute($sql);
-		if ($status != 0) {
-			$data->rollbackTransaction();
-			return -3;
-		}
-		
-		$sql = $this->_getFile('slony1_base.sql', $name);
-		if ($sql === false) {
-			$data->rollbackTransaction();
-			return -6;
-		}			
-		$status = $data->execute($sql);
-		if ($status != 0) {
-			$data->rollbackTransaction();
-			return -3;
-		}
-/* THIS FILE IS EMPTY AND JUST CAUSES ERRORS
-		$sql = $this->_getFile('slony1_base.v74.sql', $name);
-		$status = $data->execute($sql);
-		if ($status != 0) {
-			$data->rollbackTransaction();
-			return -3;
-		}
-*/
-		$sql = $this->_getFile('slony1_funcs.sql', $name);
-		if ($sql === false) {
-			$data->rollbackTransaction();
-			return -6;
-		}			
-		$status = $data->execute($sql);
-		if ($status != 0) {
-			$data->rollbackTransaction();
-			return -3;
-		}
-
-		$sql = $this->_getFile("slony1_funcs.v{$ver}.sql", $name);
-		if ($sql === false) {
-			$data->rollbackTransaction();
-			return -6;
-		}			
-		$status = $data->execute($sql);
-		if ($status != 0) {
-			$data->rollbackTransaction();
-			return -3;
-		}
-		
-		$this->enabled = null;
-		$enabled = $this->isEnabled();
-		if (!$enabled) {
-			$data->rollbackTransaction();
-			return -4;
-		}
-		
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		$data->clean($no_comment);
-
-		$sql = "SELECT \"{$schema}\".initializelocalnode('{$no_id}', '{$no_comment}'); SELECT \"{$schema}\".enablenode('{$no_id}')";
-		$status = $data->execute($sql);
-		if ($status != 0) {
-			$data->rollbackTransaction();
-			return -5;
-		}
-		
-		return $data->endTransaction();
-	}
-	
-	// NODES
-
-	/**
-	 * Gets the nodes in this database
-	 */
-	function getNodes() {
-		global $data;
-		
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		
-		// We use 10 seconds as the default check time since that is the
-		// the default in Slony, and it gives no mechanism to look it up
-		$sql = "SELECT no_id, no_active, no_comment, no_spool, ".
-				"CASE WHEN st_lag_time > '10 seconds'::interval ". 
-				"THEN 'outofsync' ELSE 'insync' END AS no_status ".
-				"FROM \"{$schema}\".sl_node ".
-				"LEFT JOIN \"{$schema}\".sl_status ON (no_id =st_received) ".
-				"ORDER BY no_comment";
-
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Gets a single node
-	 */
-	function getNode($no_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		
-		$sql = "SELECT * FROM \"{$schema}\".sl_node WHERE no_id='{$no_id}'";
-		
-		return $data->selectSet($sql);
-	}
-	
-	/**
-	 * Creates a node
-	 */
-	function createNode($no_id, $no_comment) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_comment);
-		$data->clean($no_id);
-		
-		if ($no_id != '')
-			$sql = "SELECT \"{$schema}\".storenode('{$no_id}', '{$no_comment}')";
-		else
-			$sql = "SELECT \"{$schema}\".storenode((SELECT COALESCE(MAX(no_id), 0) + 1 FROM \"{$schema}\".sl_node), '{$no_comment}')";
-
-		return $data->execute($sql);
-	}
-
-	/**
-	 * Drops a node
-	 */
-	function dropNode($no_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-
-		$sql = "SELECT \"{$schema}\".dropnode('{$no_id}')";
-
-		return $data->execute($sql);
-	}	
-	
-	// REPLICATION SETS
-	
-	/**
-	 * Gets the replication sets in this database
-	 */
-	function getReplicationSets() {
-		global $data;
-		
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		
-		$sql = "SELECT *, set_locked IS NOT NULL AS is_locked FROM \"{$schema}\".sl_set ORDER BY set_id";
-		
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Gets a particular replication set
-	 */
-	function getReplicationSet($set_id) {
-		global $data;
-		
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);
-		
-		$sql = "SELECT *, (SELECT COUNT(*) FROM \"{$schema}\".sl_subscribe ssub WHERE ssub.sub_set=ss.set_id) AS subscriptions,
-					set_locked IS NOT NULL AS is_locked
-					FROM \"{$schema}\".sl_set ss, \"{$schema}\".sl_node sn
-					WHERE ss.set_origin=sn.no_id
-					AND set_id='{$set_id}'";
-		
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Creates a set
-	 */
-	function createReplicationSet($set_id, $set_comment) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_comment);
-		$data->clean($set_id);
-
-		if ($set_id != '')
-			$sql = "SELECT \"{$schema}\".storeset('{$set_id}', '{$set_comment}')";
-		else
-			$sql = "SELECT \"{$schema}\".storeset((SELECT COALESCE(MAX(set_id), 0) + 1 FROM \"{$schema}\".sl_set), '{$set_comment}')";
-
-		return $data->execute($sql);
-	}
-
-	/**
-	 * Drops a set
-	 */
-	function dropReplicationSet($set_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);
-
-		$sql = "SELECT \"{$schema}\".dropset('{$set_id}')";
-
-		return $data->execute($sql);
-	}	
-
-	/**
-	 * Locks or unlocks a set
-	 * @param boolean $lock True to lock, false to unlock
-	 */
-	function lockReplicationSet($set_id, $lock) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);
-
-		if ($lock)
-			$sql = "SELECT \"{$schema}\".lockset('{$set_id}')";
-		else
-			$sql = "SELECT \"{$schema}\".unlockset('{$set_id}')";		
-
-		return $data->execute($sql);
-	}	
-		
-	/**
-	 * Merges two sets
-	 */
-	function mergeReplicationSet($set_id, $target) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);
-		$data->clean($target);
-
-		$sql = "SELECT \"{$schema}\".mergeset('{$target}', '{$set_id}')";
-
-		return $data->execute($sql);
-	}
-
-	/**
-	 * Moves a set to a new origin
-	 */
-	function moveReplicationSet($set_id, $new_origin) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);
-		$data->clean($new_origin);
-
-		$sql = "SELECT \"{$schema}\".moveset('{$set_id}', '{$new_origin}')";
-
-		return $data->execute($sql);
-	}
-
-	/**
-	 * Executes schema changing DDL set on nodes
-	 */
-	function executeReplicationSet($set_id, $script) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);
-		$data->clean($script);
-
-		$sql = "SELECT \"{$schema}\".ddlscript('{$set_id}', '{$script}')";
-
-		return $data->execute($sql);
-	}	
-	
-	// TABLES
-	
-	/**
-	 * Return all tables in a replication set
-	 * @param $set_id The ID of the replication set
-	 * @return Tables in the replication set, sorted alphabetically 
-	 */
-	function getTables($set_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);		
-
-		$sql = "SELECT st.tab_id, c.relname, n.nspname, n.nspname||'.'||c.relname AS qualname,
-					pg_catalog.pg_get_userbyid(c.relowner) AS relowner, 
-					reltuples::bigint";
-		// Tablespace
-		if ($data->hasTablespaces()) {
-			$sql .= ", (SELECT spcname FROM pg_catalog.pg_tablespace pt WHERE pt.oid=c.reltablespace) AS tablespace";
-		}
-		$sql .= " FROM pg_catalog.pg_class c, \"{$schema}\".sl_table st, pg_catalog.pg_namespace n
-					WHERE c.oid=st.tab_reloid
-					AND c.relnamespace=n.oid
-					AND st.tab_set='{$set_id}'
-					ORDER BY n.nspname, c.relname";
-
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Adds a table to a replication set
-	 */
-	function addTable($set_id, $tab_id, $nspname, $relname, $idxname, $comment, $storedtriggers) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);
-		$data->clean($tab_id);
-		$fqname = $nspname . '.' . $relname;
-		$data->clean($fqname);
-		$data->clean($nspname);
-		$data->clean($relname);
-		$data->clean($idxname);
-		$data->clean($comment);
-
-		$hastriggers = (sizeof($storedtriggers) > 0);
-		if ($hastriggers) {
-			// Begin a transaction
-			$status = $data->beginTransaction();
-			if ($status != 0) return -1;
-		}
-
-		if ($tab_id != '')
-			$sql = "SELECT \"{$schema}\".setaddtable('{$set_id}', '{$tab_id}', '{$fqname}', '{$idxname}', '{$comment}')";
-		else {
-			$sql = "SELECT \"{$schema}\".setaddtable('{$set_id}', (SELECT COALESCE(MAX(tab_id), 0) + 1 FROM \"{$schema}\".sl_table), '{$fqname}', '{$idxname}', '{$comment}')";			
-		}
-
-		$status = $data->execute($sql);	
-		if ($status != 0) {
-			if ($hastriggers) $data->rollbackTransaction();
-			return -3;
-		}		
-
-		// If we are storing triggers, we need to know the tab_id that was assigned to the table
-		if ($tab_id == '' && $hastriggers) {
-			$sql = "SELECT tab_id
-						FROM \"{$schema}\".sl_table
-						WHERE tab_set='{$set_id}'
-						AND tab_reloid=(SELECT pc.oid FROM pg_catalog.pg_class pc, pg_namespace pn 
-												WHERE pc.relnamespace=pn.oid AND pc.relname='{$relname}'
-												AND pn.nspname='{$nspname}')";
-			$tab_id = $data->selectField($sql, 'tab_id');
-			if ($tab_id === -1) {
-				$data->rollbackTransaction();
-				return -4;
-			}
-		}
-		
-		// Store requested triggers
-		if ($hastriggers) {
-			foreach ($storedtriggers as $tgname) {
-				$data->clean($tgname);
-				$sql = "SELECT \"{$schema}\".storetrigger('{$tab_id}', '{$tgname}')";
-				$status = $data->execute($sql);	
-				if ($status != 0) {
-					$data->rollbackTransaction();
-					return -5;
-				}		
-			}				
-		}
-
-		if ($hastriggers)
-			return $data->endTransaction();
-		else
-			return $status;
-	}
-		
-	/**
-	 * Drops a table from a replication set
-	 */
-	function dropTable($tab_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($tab_id);
-
-		$sql = "SELECT \"{$schema}\".setdroptable('{$tab_id}')";
-
-		return $data->execute($sql);
-	}		
-
-	/**
-	 * Moves a table to another replication set
-	 */
-	function moveTable($tab_id, $new_set_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($tab_id);
-		$data->clean($new_set_id);
-
-		$sql = "SELECT \"{$schema}\".setmovetable('{$tab_id}', '{$new_set_id}')";
-
-		return $data->execute($sql);
-	}		
-
-    /**
-     * Return all tables we are not current in a replication set
-     */
-    function getNonRepTables()
-    {
-		global $data;
-        /*
-         * we cannot just query pg_tables as we want the OID of the table 
-         * for the subquery against the slony table. We could match on
-         * on schema name and table name, but the slony info isn't updated
-         * if the user renames a table which is in a replication set
-         */
-        $sql = "SELECT c.relname, n.nspname, n.nspname||'.'||c.relname AS qualname, 
-                    pg_get_userbyid(c.relowner) AS relowner
-                    FROM pg_class c
-                    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
-                    WHERE c.relkind = 'r' AND n.nspname NOT IN ('pg_catalog', 
-                    'information_schema', 'pg_toast') AND
-                    NOT(n.nspname = '_{$this->slony_cluster}' AND
-                    relname LIKE 'sl_%') AND 
-                    NOT EXISTS(SELECT 1 FROM _{$this->slony_cluster}.sl_table s
-                    WHERE s.tab_reloid = c.oid)
-                    ORDER BY n.nspname, c.relname";
-        return $data->selectSet($sql);
-    }
-
-	// SEQUENCES
-	
-	/**
-	 * Return all sequences in a replication set
-	 * @param $set_id The ID of the replication set
-	 * @return Sequences in the replication set, sorted alphabetically 
-	 */
-	function getSequences($set_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);		
-
-		$sql = "SELECT ss.seq_id, c.relname AS seqname, n.nspname, n.nspname||'.'||c.relname AS qualname,
-						pg_catalog.obj_description(c.oid, 'pg_class') AS seqcomment,
-						pg_catalog.pg_get_userbyid(c.relowner) AS seqowner 
-					FROM pg_catalog.pg_class c, \"{$schema}\".sl_sequence ss, pg_catalog.pg_namespace n
-					WHERE c.oid=ss.seq_reloid
-					AND c.relnamespace=n.oid
-					AND ss.seq_set='{$set_id}'
-					ORDER BY n.nspname, c.relname";
-
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Adds a sequence to a replication set
-	 */
-	function addSequence($set_id, $seq_id, $fqname, $comment) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);
-		$data->clean($seq_id);
-		$data->clean($fqname);
-		$data->clean($comment);
-
-		if ($seq_id != '')
-			$sql = "SELECT \"{$schema}\".setaddsequence('{$set_id}', '{$seq_id}', '{$fqname}', '{$comment}')";
-		else
-			$sql = "SELECT \"{$schema}\".setaddsequence('{$set_id}', (SELECT COALESCE(MAX(seq_id), 0) + 1 FROM \"{$schema}\".sl_sequence), '{$fqname}', '{$comment}')";
-
-		return $data->execute($sql);	}		
-		
-	/**
-	 * Drops a sequence from a replication set
-	 */
-	function dropSequence($seq_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($seq_id);
-
-		$sql = "SELECT \"{$schema}\".setdropsequence('{$seq_id}')";
-
-		return $data->execute($sql);
-	}		
-
-	/**
-	 * Moves a sequence to another replication set
-	 */
-	function moveSequence($seq_id, $new_set_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($seq_id);
-		$data->clean($new_set_id);
-
-		$sql = "SELECT \"{$schema}\".setmovesequence('{$seq_id}', '{$new_set_id}')";
-
-		return $data->execute($sql);
-	}		
-	
-	// SUBSCRIPTIONS
-	
-	/**
-	 * Gets all nodes subscribing to a set
-	 * @param $set_id The ID of the replication set
-	 * @return Nodes subscribing to this set
-	 */
-	function getSubscribedNodes($set_id) {
-		global $data;
-		
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);		
-		
-		$sql = "SELECT sn.*, ss.sub_set
-					FROM \"{$schema}\".sl_subscribe ss, \"{$schema}\".sl_node sn
-					WHERE ss.sub_set='{$set_id}'
-					AND ss.sub_receiver = sn.no_id
-					ORDER BY sn.no_comment";
-		
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Gets all nodes subscribing to a set
-	 * @param $set_id The ID of the replication set
-	 * @return Nodes subscribing to this set
-	 */
-	function getSubscription($set_id, $no_id) {
-		global $data;
-		
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($set_id);
-		$data->clean($no_id);
-		
-		$sql = "SELECT ss.*, sn.no_comment AS receiver, sn2.no_comment AS provider
-					FROM \"{$schema}\".sl_subscribe ss, \"{$schema}\".sl_node sn, \"{$schema}\".sl_node sn2
-					WHERE ss.sub_set='{$set_id}'
-					AND ss.sub_receiver = sn.no_id
-					AND ss.sub_provider = sn2.no_id
-					AND sn.no_id='{$no_id}'";
-		
-		return $data->selectSet($sql);
-	}
-	
-	// NODES
-	
-	/**
-	 * Gets node paths
-	 */
-	function getPaths($no_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		
-		$sql = "SELECT * FROM \"{$schema}\".sl_path sp, \"{$schema}\".sl_node sn
-					WHERE sp.pa_server=sn.no_id 
-					AND sp.pa_client='{$no_id}'
-					ORDER BY sn.no_comment";
-		
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Gets node path details
-	 */
-	function getPath($no_id, $path_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		$data->clean($path_id);
-		
-		$sql = "SELECT * FROM \"{$schema}\".sl_path sp, \"{$schema}\".sl_node sn
-					WHERE sp.pa_server=sn.no_id 
-					AND sp.pa_client='{$no_id}'
-					AND sn.no_id='{$path_id}'";
-		
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Creates a path
-	 */
-	function createPath($no_id, $server, $conn, $retry) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		$data->clean($server);
-		$data->clean($conn);
-		$data->clean($retry);
-
-		$sql = "SELECT \"{$schema}\".storepath('{$server}', '{$no_id}', '{$conn}', '{$retry}')";
-
-		return $data->execute($sql);
-	}
-
-	/**
-	 * Drops a path
-	 */
-	function dropPath($no_id, $path_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		$data->clean($path_id);
-
-		$sql = "SELECT \"{$schema}\".droppath('{$path_id}', '{$no_id}')";
-
-		return $data->execute($sql);
-	}	
-	
-	// LISTENS
-	
-	/**
-	 * Gets node listens
-	 */
-	function getListens($no_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		
-		$sql = "SELECT * FROM \"{$schema}\".sl_listen sl, \"{$schema}\".sl_node sn
-					WHERE sl.li_provider=sn.no_id 
-					AND sl.li_receiver='{$no_id}'
-					ORDER BY sn.no_comment";
-		
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Gets node listen details
-	 */
-	function getListen($no_id, $listen_id) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		$data->clean($listen_id);
-		
-		$sql = "SELECT sl.*, sn.*, sn2.no_comment AS origin FROM \"{$schema}\".sl_listen sl, \"{$schema}\".sl_node sn, \"{$schema}\".sl_node sn2
-					WHERE sl.li_provider=sn.no_id 
-					AND sl.li_receiver='{$no_id}'
-					AND sn.no_id='{$listen_id}'
-					AND sn2.no_id=sl.li_origin";
-		
-		return $data->selectSet($sql);
-	}
-
-	/**
-	 * Creates a listen
-	 */
-	function createListen($no_id, $origin, $provider) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		$data->clean($origin);
-		$data->clean($provider);
-
-		$sql = "SELECT \"{$schema}\".storelisten('{$origin}', '{$provider}', '{$no_id}')";
-
-		return $data->execute($sql);
-	}
-
-	/**
-	 * Drops a listen
-	 */
-	function dropListen($no_id, $origin, $provider) {
-		global $data;
-
-		$schema = $this->slony_schema;
-		$data->fieldClean($schema);
-		$data->clean($no_id);
-		$data->clean($origin);
-		$data->clean($provider);
-
-		$sql = "SELECT \"{$schema}\".droplisten('{$origin}', '{$provider}', '{$no_id}')";
-
-		return $data->execute($sql);
-	}	
-	
-	// ACTIONS
-	
-	
-
-}
-
-?>
diff --git a/conf/config.inc.php-dist b/conf/config.inc.php-dist
index e08f9a39..2c70d315 100644
--- a/conf/config.inc.php-dist
+++ b/conf/config.inc.php-dist
@@ -35,12 +35,6 @@
 	$conf['servers'][0]['pg_dump_path'] = '/usr/bin/pg_dump';
 	$conf['servers'][0]['pg_dumpall_path'] = '/usr/bin/pg_dumpall';
 
-	// Slony (www.slony.info) support?
-	$conf['servers'][0]['slony_support'] = false;
-	// Specify the path to the Slony SQL scripts (where slony1_base.sql is located, etc.)
-	// No trailing slash.
-	$conf['servers'][0]['slony_sql'] = '/usr/share/pgsql';
-
 	// Example for a second server (PostgreSQL for Windows)
 	//$conf['servers'][1]['desc'] = 'Test Server';
 	//$conf['servers'][1]['host'] = '127.0.0.1';
@@ -49,8 +43,6 @@
 	//$conf['servers'][1]['defaultdb'] = 'template1';
 	//$conf['servers'][1]['pg_dump_path'] = 'C:\\Program Files\\PostgreSQL\\8.0\\bin\\pg_dump.exe';
 	//$conf['servers'][1]['pg_dumpall_path'] = 'C:\\Program Files\\PostgreSQL\\8.0\\bin\\pg_dumpall.exe';
-	//$conf['servers'][1]['slony_support'] = false;
-	//$conf['servers'][1]['slony_sql'] = 'C:\\Program Files\\PostgreSQL\\8.0\\share';
 	
 	
 	/* Groups definition */
diff --git a/database.php b/database.php
index 03a3b7ca..c49f0748 100755
--- a/database.php
+++ b/database.php
@@ -592,7 +592,7 @@
 	}
 
 	function doTree() {
-		global $misc, $data, $lang, $slony;
+		global $misc, $data, $lang;
 
 		$reqvars = $misc->getRequestVars('database');
 
diff --git a/fulltext.php b/fulltext.php
index 04fae720..9c8733ca 100644
--- a/fulltext.php
+++ b/fulltext.php
@@ -889,7 +889,7 @@
 	 * Generate XML for the browser tree.
 	 */
 	function doTree() {
-		global $misc, $data, $lang, $slony;
+		global $misc, $data, $lang;
 
 		$tabs = $misc->getNavTabs('fulltext');
 		$items = $misc->adjustTabsForTree($tabs);
diff --git a/lang/catalan.php b/lang/catalan.php
index 13025703..d478fad3 100644
--- a/lang/catalan.php
+++ b/lang/catalan.php
@@ -148,6 +148,7 @@
         $lang['strstop']  =  'Para';
         $lang['strgotoppage']  =  'Torna al principi';
         $lang['strtheme']  =  'Tema';
+	$lang['strcluster'] = 'Clúster';
 	
 	// Admin
         $lang['stradminondatabase']  =  'Les següents tasques administratives s\'apliquen a tota la base de dades %s.';
@@ -801,119 +802,7 @@
 	$lang['strtablespacedroppedbad'] = 'No s\'ha pogut eliminar el tablespace.';
 	$lang['strtablespacealtered'] = 'Tablespace modificat.';
 	$lang['strtablespacealteredbad'] = 'No s\'ha pogut modifcar el tablespace.';
-
-	// Slony clusters
-	$lang['strcluster'] = 'Clúster';
-	$lang['strnoclusters'] = 'No s\'han trobat clústers';
-	$lang['strconfdropcluster'] = 'Està segur de voler eliminar el clúster "%s"?';
-	$lang['strclusterdropped'] = 'Clúster eliminat.';
-	$lang['strclusterdroppedbad'] = 'No s\'ha pogut eliminar el clúster.';
-	$lang['strinitcluster'] = 'Inicialitza el clúster';
-	$lang['strclustercreated'] = 'Clúster inicialitzat.';
-	$lang['strclustercreatedbad'] = 'No s\'ha pogut inicialitzar el clúster.';
-	$lang['strclusterneedsname'] = 'Ha de donar un nom al clúster.';
-	$lang['strclusterneedsnodeid'] = 'Ha de donar una ID al node local.';
 	
-	// Slony nodes
-	$lang['strnodes'] = 'Nodes';
-	$lang['strnonodes'] = 'No s\'han trobat nodes.';
-	$lang['strcreatenode'] = 'Crea un node';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = 'Activa';
-	$lang['strnodecreated'] = 'Node creat.';
-	$lang['strnodecreatedbad'] = 'No s\'ha pogut crear el node.';
-	$lang['strconfdropnode'] = 'Està segur de voler eliminar el node "%s"?';
-	$lang['strnodedropped'] = 'Node eliminat.';
-	$lang['strnodedroppedbad'] = 'No s\'ha pogut eliminar el node';
-	$lang['strfailover'] = 'Filtra';
-	$lang['strnodefailedover'] = 'Node filtrat.';
-	$lang['strnodefailedoverbad'] = 'No s\'ha pogut filtrar el node.';
-	$lang['strstatus'] = 'Estat';	
-	$lang['strhealthy'] = 'Saludable';
-	$lang['stroutofsync'] = 'Fora de sincronisme';
-	$lang['strunknown'] = 'Desconegut';	
-	
-	// Slony paths	
-	$lang['strpaths'] = 'Rutes';
-	$lang['strnopaths'] = 'No s\'han trobat rutes.';
-	$lang['strcreatepath'] = 'Crea una ruta';
-	$lang['strnodename'] = 'Nom del node';
-	$lang['strnodeid'] = 'ID del node';
-	$lang['strconninfo'] = 'Cadena de connexió';
-	$lang['strconnretry'] = 'Segons abans de reintentar la connexió';
-	$lang['strpathneedsconninfo'] = 'Ha de donar una cadena de connexió per a la ruta.';
-	$lang['strpathneedsconnretry'] = 'Ha de donar el num. de seg. d\'espera abans de reintentar la connexió.';
-	$lang['strpathcreated'] = 'Ruta creada.';
-	$lang['strpathcreatedbad'] = 'La creació de la ruta ha fallat.';
-	$lang['strconfdroppath'] = 'Està segur de voler eliminar la ruta "%s"?';
-	$lang['strpathdropped'] = 'Ruta eliminada.';
-	$lang['strpathdroppedbad'] = 'No s\ha pogut eliminar la ruta.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Escoltes';
-	$lang['strnolistens'] = 'No s\'han trobat escoltes.';
-	$lang['strcreatelisten'] = 'Crea una escolta';
-	$lang['strlistencreated'] = 'Escolta creada.';
-	$lang['strlistencreatedbad'] = 'La creació de l\'escolta ha fallat.';
-	$lang['strconfdroplisten'] = 'Està segur de voler eliminar l\'escolta "%s"?';
-	$lang['strlistendropped'] = 'Escolta eliminada.';
-	$lang['strlistendroppedbad'] = 'No s\'ha pogut eliminar l\'escolta.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Conjunts de replicació';
-	$lang['strnorepsets'] = 'No s\'han trobat conjunts de replicació.';
-	$lang['strcreaterepset'] = 'Crea un conjunt de replicació';
-	$lang['strrepsetcreated'] = 'Conjunt de replicació creat.';
-	$lang['strrepsetcreatedbad'] = 'No s\'ha pogut crear el conjunt de replicació.';
-	$lang['strconfdroprepset'] = 'Està segur de voler eliminar el conjunt de replicació "%s"?';
-	$lang['strrepsetdropped'] = 'Conjunt de replicació eliminat.';
-	$lang['strrepsetdroppedbad'] = 'No s\'ha pogut eliminar el conjunt de replicació.';
-	$lang['strmerge'] = 'Uneix';
-	$lang['strmergeinto'] = 'Uneix a';
-	$lang['strrepsetmerged'] = 'Conjunts de replicació units.';
-	$lang['strrepsetmergedbad'] = 'No s\'han pogut unir els conjunts de replicació.';
-	$lang['strmove'] = 'Mou';
-	$lang['strneworigin'] = 'Nou origen';
-	$lang['strrepsetmoved'] = 'Conjunt de replicació traslladat.';
-	$lang['strrepsetmovedbad'] = 'No s\'ha pogut traslladar el conjunt de replicació.';
-	$lang['strnewrepset'] = 'Nou conjunt de replicació';
-	$lang['strlock'] = 'Bloqueja';
-	$lang['strlocked'] = 'Bloquejat';
-	$lang['strunlock'] = 'Desbloqueja';
-	$lang['strconflockrepset'] = 'Està segur de voler bloquejar el conjunt de replicació "%s"?';
-	$lang['strrepsetlocked'] = 'Conjunt de replicació bloquejat.';
-	$lang['strrepsetlockedbad'] = 'No s\'ha pogut bloquejar el conjunt de replicació.';
-	$lang['strconfunlockrepset'] = 'Està segur de voler desbloquejar el conjunt de replicació "%s"?';
-	$lang['strrepsetunlocked'] = 'Conjunt de replicació desbloquejat.';
-	$lang['strrepsetunlockedbad'] = 'No s\'ha pogut desbloquejar el conjunt de replicació.';
-	$lang['stronlyonnode'] = 'Només en el node';
-	$lang['strddlscript'] = 'Script DDL';
-	$lang['strscriptneedsbody'] = 'Ha de subministrar un script per ser executat a tots els nodes.';
-	$lang['strscriptexecuted'] = 'Script DDL del conjunt de replicació executat.';
-	$lang['strscriptexecutedbad'] = 'Fallada executant l\'script DDL del conjunt de replicació.';
-	$lang['strtabletriggerstoretain'] = 'Els següents disparadors NO seran inhabilitats per l\'Slony:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Afegeix una taula';
-	$lang['strtableneedsuniquekey'] = 'La taula que s\'ha d\'afegir requereix una clau primària o única.';
-	$lang['strtableaddedtorepset'] = 'Taula afegida al conjunt de replicació.';
-	$lang['strtableaddedtorepsetbad'] = 'No s\'ha pogut afegir la taula al conjunt de replicació.';
-	$lang['strconfremovetablefromrepset'] = 'Està segur de voler eliminar la taula "%s" del conjunt de replicació "%s"?';
-	$lang['strtableremovedfromrepset'] = 'Taula eliminada del conjunt de replicació.';
-	$lang['strtableremovedfromrepsetbad'] = 'No s\'ha pogut eliminar la taula del conjunt de replicació.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Afegeix una seqüència';
-	$lang['strsequenceaddedtorepset'] = 'Seqüència afegida al conjunt de replicació.';
-	$lang['strsequenceaddedtorepsetbad'] = 'No s\'ha pogut afegir la seqüència al conjunt de replicació.';
-	$lang['strconfremovesequencefromrepset'] = 'Està segur de voler eliminar la seqüència "%s" del conjunt de replicació "%s"?';
-	$lang['strsequenceremovedfromrepset'] = 'Seqüència eliminada del conjunt de replicació.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'No s\'ha pogut eliminar la seqüència del conjunt de replicació.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Subscripcions';
-	$lang['strnosubscriptions'] = 'No s\'han trobat subscripcions.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s corrent a %s:%s -- Ha entrat com a usuari "%s"';
 	$lang['strtimefmt'] = 'jS M, Y g:iA';
diff --git a/lang/chinese-utf8-zh_CN.php b/lang/chinese-utf8-zh_CN.php
index 21605018..85a1e875 100644
--- a/lang/chinese-utf8-zh_CN.php
+++ b/lang/chinese-utf8-zh_CN.php
@@ -453,6 +453,7 @@
 	$lang['strconfcluster'] = '确定要集群 "%s"吗?';
 	$lang['strclusteredgood'] = '集群完成。';
 	$lang['strclusteredbad'] = '集群失败。';
+	$lang['strcluster'] = '集群';
 	
 	// Rules
 	$lang['strrules'] = '规则';
@@ -768,118 +769,6 @@
 	$lang['strtablespacealtered'] = '表空间已变更。';
 	$lang['strtablespacealteredbad'] = '表空间变更失败。';
 	
-	// Slony clusters
-	$lang['strcluster'] = '集群';
-	$lang['strnoclusters'] = '查无此集群。';
-	$lang['strconfdropcluster'] = '确定要删除集群 "%s"吗?';
-	$lang['strclusterdropped'] = '集群已删除。';
-	$lang['strclusterdroppedbad'] = '集群删除失败。';
-	$lang['strinitcluster'] = '初始化集群';
-	$lang['strclustercreated'] = '集群已初始化。';
-	$lang['strclustercreatedbad'] = '集群初始化失败。';
-	$lang['strclusterneedsname'] = '必须指定集群名称。';
-	$lang['strclusterneedsnodeid'] = '必须指定本地节点ID。';
-	
-	// Slony nodes
-	$lang['strnodes'] = '节点';
-	$lang['strnonodes'] = '查无节点。';
-	$lang['strcreatenode'] = '创建节点';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = '活动的';
-	$lang['strnodecreated'] = '节点已创建。';
-	$lang['strnodecreatedbad'] = '节点创建失败。';
-	$lang['strconfdropnode'] = '确定要删除节点 "%s"吗?';
-	$lang['strnodedropped'] = '节点已删除。';
-	$lang['strnodedroppedbad'] = '节点删除失败';
-	$lang['strfailover'] = '故障切换';
-	$lang['strnodefailedover'] = '节点已故障切换。';
-	$lang['strnodefailedoverbad'] = '节点故障切换失败。';
-	$lang['strstatus'] = '状态';
-	$lang['strhealthy'] = '健康度';
-	$lang['stroutofsync'] = '同步过期';
-	$lang['strunknown'] = '未知的';
-	
-	// Slony paths
-	$lang['strpaths'] = '路径';
-	$lang['strnopaths'] = '查无路径。';
-	$lang['strcreatepath'] = '创建路径';
-	$lang['strnodename'] = '节点名称';
-	$lang['strnodeid'] = '节点 ID';
-	$lang['strconninfo'] = '连接字符串';
-	$lang['strconnretry'] = '重试连接间隔时间';
-	$lang['strpathneedsconninfo'] = '必须指定路径的连接字符串。';
-	$lang['strpathneedsconnretry'] = '必须指定重试连接间隔时间。';
-	$lang['strpathcreated'] = '路径已创建。';
-	$lang['strpathcreatedbad'] = '路径创建失败。';
-	$lang['strconfdroppath'] = '确定要删除路径 "%s"吗?';
-	$lang['strpathdropped'] = '路径已删除。';
-	$lang['strpathdroppedbad'] = '路径删除失败。';
-	
-	// Slony listens
-	$lang['strlistens'] = '监听';
-	$lang['strnolistens'] = '查无监听。';
-	$lang['strcreatelisten'] = '创建监听';
-	$lang['strlistencreated'] = '监听已创建。';
-	$lang['strlistencreatedbad'] = '监听创建失败。';
-	$lang['strconfdroplisten'] = '确定要删除监听 "%s"吗?';
-	$lang['strlistendropped'] = '监听已删除。';
-	$lang['strlistendroppedbad'] = '监听删除失败。';
-	
-	// Slony replication sets
-	$lang['strrepsets'] = '复写群组';
-	$lang['strnorepsets'] = '查无复写群组。';
-	$lang['strcreaterepset'] = '创建复写群组';
-	$lang['strrepsetcreated'] = '复写群组已创建。';
-	$lang['strrepsetcreatedbad'] = '复写群组创建失败。';
-	$lang['strconfdroprepset'] = '确定要删除复写群组 "%s"吗?';
-	$lang['strrepsetdropped'] = '复写群组已删除。';
-	$lang['strrepsetdroppedbad'] = '复写群组删除失败。';
-	$lang['strmerge'] = '合并';
-	$lang['strmergeinto'] = '合并进';
-	$lang['strrepsetmerged'] = '复写群组已合并。';
-	$lang['strrepsetmergedbad'] = '复写群组合并失败。';
-	$lang['strmove'] = '移动';
-	$lang['strneworigin'] = '新建初始点';
-	$lang['strrepsetmoved'] = '复写群组已移动。';
-	$lang['strrepsetmovedbad'] = '复写群组移动失败。';
-	$lang['strnewrepset'] = '新建件复写群组';
-	$lang['strlock'] = '锁定';
-	$lang['strlocked'] = '已锁定';
-	$lang['strunlock'] = '解锁';
-	$lang['strconflockrepset'] = '确定要锁定复写群组 "%s"吗?';
-	$lang['strrepsetlocked'] = '复写群组已锁定。';
-	$lang['strrepsetlockedbad'] = '复写群组锁定失败。';
-	$lang['strconfunlockrepset'] = '确定要解锁复写群组 "%s"吗?';
-	$lang['strrepsetunlocked'] = '复写群组已解锁。';
-	$lang['strrepsetunlockedbad'] = '复写群组解锁失败。';
-	$lang['stronlyonnode'] = '仅一个节点';
-	$lang['strddlscript'] = 'DDL 脚本';
-	$lang['strscriptneedsbody'] = '必须在所有节点上执行该脚本。';
-	$lang['strscriptexecuted'] = '复写群组 DDL 脚本已执行。';
-	$lang['strscriptexecutedbad'] = '复写群组 DDL 脚本执行失败。';
-	$lang['strtabletriggerstoretain'] = '以下触发器将不会被Slony禁用:';
-	
-	// Slony tables in replication sets
-	$lang['straddtable'] = '添加表';
-	$lang['strtableneedsuniquekey'] = '要添加的表需要指定主键或者唯一键。';
-	$lang['strtableaddedtorepset'] = '表已添加到复写群组。';
-	$lang['strtableaddedtorepsetbad'] = '表添加到复写群组失败。';
-	$lang['strconfremovetablefromrepset'] = '确定要将表 "%s" 从复写群组 "%s"中删除吗?';
-	$lang['strtableremovedfromrepset'] = '表已从复写群组中删除。';
-	$lang['strtableremovedfromrepsetbad'] = '表从复写群组中删除失败';
-	
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = '添加序列';
-	$lang['strsequenceaddedtorepset'] = '序列已添加到复写群组。';
-	$lang['strsequenceaddedtorepsetbad'] = '序列添加到复写群组失败。';
-	$lang['strconfremovesequencefromrepset'] = '确定要将序列 "%s" 从复写群组 "%s"中删除吗?';
-	$lang['strsequenceremovedfromrepset'] = '序列已从复写群组中删除。';
-	$lang['strsequenceremovedfromrepsetbad'] = '序列从复写群组中删除失败。';
-	
-	// Slony subscriptions
-	$lang['strsubscriptions'] = '订阅';
-	$lang['strnosubscriptions'] = '查无订阅。';
-	
 	// Miscellaneous
 	$lang['strtopbar'] = '%s 架于 %s：%s － 您是 "%s"';
 	$lang['strtimefmt'] = 'jS M, Y g:iA';
diff --git a/lang/chinese-utf8-zh_TW.php b/lang/chinese-utf8-zh_TW.php
index 0d41598e..4f9f4e3b 100644
--- a/lang/chinese-utf8-zh_TW.php
+++ b/lang/chinese-utf8-zh_TW.php
@@ -135,6 +135,7 @@
 	$lang['stractionsonmultiplelines'] = '動作在多個行列上';
 	$lang['strcheckall'] = '檢查全部';
 	$lang['struncheckall'] = '不檢查全部';
+	$lang['strcluster'] = '叢集';
 
 	// User-supplied SQL history
 	$lang['strhistory'] = '歷程';
@@ -763,120 +764,7 @@
 	$lang['strtablespacedroppedbad'] = '表空間移除已失敗。';
 	$lang['strtablespacealtered'] = '表空間已修改。';
 	$lang['strtablespacealteredbad'] = '表空間修改已失敗。';
-
-	// Slony clusters
-	$lang['strcluster'] = '叢集';
-	$lang['strnoclusters'] = '找不到任何叢集。';
-	$lang['strconfdropcluster'] = '您確定您要移除這個叢集 "%s" 嗎?';
-	$lang['strclusterdropped'] = '叢集已移除。';
-	$lang['strclusterdroppedbad'] = '叢集移除失敗。';
-	$lang['strinitcluster'] = '初始化叢集';
-	$lang['strclustercreated'] = '叢集已初始化。';
-	$lang['strclustercreatedbad'] = '叢集初始化失敗。';
-	$lang['strclusterneedsname'] = '您必需為這個叢集給一個名稱。';
-	$lang['strclusterneedsnodeid'] = '您必需給這個本地節點給一個 ID。';
 	
-	// Slony nodes
-	$lang['strnodes'] = '節點';
-	$lang['strnonodes'] = '找不到任何節點。';
-	$lang['strcreatenode'] = '建立節點';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = '活躍';
-	$lang['strnodecreated'] = '節點已建立。';
-	$lang['strnodecreatedbad'] = '節點建立失敗。';
-	$lang['strconfdropnode'] = '您確定你要移除節點 "%s"?';
-	$lang['strnodedropped'] = '節點已移除。';
-	$lang['strnodedroppedbad'] = '節點移除失敗。';
-	$lang['strfailover'] = '災難復原';
-	$lang['strnodefailedover'] = '節點受災難失敗。';
-	$lang['strnodefailedoverbad'] = '節點災難復原失敗。';
-	$lang['strstatus'] = '狀態';	
-	$lang['strhealthy'] = '健全度';
-	$lang['stroutofsync'] = '超出同步(Out of Sync)';
-	$lang['strunknown'] = '未知的';	
-
-	
-	// Slony paths	
-	$lang['strpaths'] = '路徑';
-	$lang['strnopaths'] = '找不到任何路徑。';
-	$lang['strcreatepath'] = '建立路徑';
-	$lang['strnodename'] = '節點名稱';
-	$lang['strnodeid'] = '節點 ID';
-	$lang['strconninfo'] = '連線字串';
-	$lang['strconnretry'] = '秒之前重試連線';
-	$lang['strpathneedsconninfo'] = '您必需給這個路徑一個連線字串。';
-	$lang['strpathneedsconnretry'] = '您必需在連線之前給一個等待重試的秒數字。';
-	$lang['strpathcreated'] = '路徑已建立。';
-	$lang['strpathcreatedbad'] = '路徑建立已失敗。';
-	$lang['strconfdroppath'] = '您確定您要移除路徑 "%s" 嗎?';
-	$lang['strpathdropped'] = '路徑已移除。';
-	$lang['strpathdroppedbad'] = '路徑移除已失敗。';
-
-	// Slony listens
-	$lang['strlistens'] = '監聽';
-	$lang['strnolistens'] = '找不到任何監聽。';
-	$lang['strcreatelisten'] = '建立監聽';
-	$lang['strlistencreated'] = '監聽已建立。';
-	$lang['strlistencreatedbad'] = '監聽建立已失敗。';
-	$lang['strconfdroplisten'] = '您確定你要移除監聽 "%s"?';
-	$lang['strlistendropped'] = '監聽已移除。';
-	$lang['strlistendroppedbad'] = '監聽移除已失敗。';
-
-	// Slony replication sets
-	$lang['strrepsets'] = '複寫叢集設定';
-	$lang['strnorepsets'] = '找不到任何複寫叢集設定。';
-	$lang['strcreaterepset'] = '建立複寫叢集設定';
-	$lang['strrepsetcreated'] = '複寫叢集設定已建立。';
-	$lang['strrepsetcreatedbad'] = '複寫叢集設定建立已失敗。';
-	$lang['strconfdroprepset'] = '您確定您要移除複寫叢集設定 "%s"?';
-	$lang['strrepsetdropped'] = '複寫叢集設定已移除。';
-	$lang['strrepsetdroppedbad'] = '複寫叢集設定移除已失敗。';
-	$lang['strmerge'] = '合併';
-	$lang['strmergeinto'] = '合併成為';
-	$lang['strrepsetmerged'] = '複寫叢集設定已合併。';
-	$lang['strrepsetmergedbad'] = '複寫叢集設定合併已失敗。';
-	$lang['strmove'] = '遷移';
-	$lang['strneworigin'] = '新起點';
-	$lang['strrepsetmoved'] = '複寫叢集設定已遷移。';
-	$lang['strrepsetmovedbad'] = '複寫叢集設定遷移已失敗。';
-	$lang['strnewrepset'] = '新複寫叢集設定';
-	$lang['strlock'] = '鎖定';
-	$lang['strlocked'] = '已鎖定';
-	$lang['strunlock'] = '未鎖定';
-	$lang['strconflockrepset'] = '您確定您要鎖定複寫叢集設定 "%s"?';
-	$lang['strrepsetlocked'] = '複寫叢集設定已鎖定。';
-	$lang['strrepsetlockedbad'] = '複寫叢集設定鎖定已失敗。';
-	$lang['strconfunlockrepset'] = '您確定您要解鎖複寫叢集設定 "%s"?';
-	$lang['strrepsetunlocked'] = '複寫叢集設定未鎖定。';
-	$lang['strrepsetunlockedbad'] = '複寫叢集設定解鎖已失敗。';
-	$lang['stronlyonnode'] = '僅在節點上';
-	$lang['strddlscript'] = '資料定義語言(DDL)稿本';
-	$lang['strscriptneedsbody'] = '您必需提供一個稿本在這全部節點上被執行。';
-	$lang['strscriptexecuted'] = '複寫叢集設定 DDL 稿本已執行。';
-	$lang['strscriptexecutedbad'] = '執行複寫叢集設定 DDL 稿本中失敗。';
-	$lang['strtabletriggerstoretain'] = '這將隨著觸發器不會停用 Slony 在以下: ';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = '增加資料表';
-	$lang['strtableneedsuniquekey'] = '資料表的增加要求一個主建(pkey)或唯一鍵。';
-	$lang['strtableaddedtorepset'] = '資料表已增加到複寫叢集設定。';
-	$lang['strtableaddedtorepsetbad'] = '資料表增加到複寫叢集設定失敗。';
-	$lang['strconfremovetablefromrepset'] = '您確定您要從複寫叢集設定 "%s" 移除這資料表 "%s" 嗎?';
-	$lang['strtableremovedfromrepset'] = '資料表已從複寫叢集設定移除。';
-	$lang['strtableremovedfromrepsetbad'] = '資料表從複寫叢集設定移除失敗。';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = '增加序列號';
-	$lang['strsequenceaddedtorepset'] = '序列號增加到複寫叢集設定。';
-	$lang['strsequenceaddedtorepsetbad'] = '增加序列號到複寫叢集設定已失敗。';
-	$lang['strconfremovesequencefromrepset'] = '您確定您要從複寫叢集設定 "%s" 移除序列號 "%s" 嗎?';
-	$lang['strsequenceremovedfromrepset'] = '序列號已從複寫叢集設定移除。';
-	$lang['strsequenceremovedfromrepsetbad'] = '序列號從複寫叢集設定移除已失敗。';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = '訂閱';
-	$lang['strnosubscriptions'] = '找不到任何訂閱。';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s 運作於 %s: %s -- 您是已登入的使用者 "%s"';
 	$lang['strtimefmt'] = 'jS M, Y g: iA';
diff --git a/lang/czech.php b/lang/czech.php
index 7f6dfb06..6e84d2ed 100644
--- a/lang/czech.php
+++ b/lang/czech.php
@@ -148,6 +148,7 @@
 	$lang['strstop'] = 'Zastavit';
 	$lang['strgotoppage'] = 'zpět nahoru';
 	$lang['strtheme'] = 'Motiv';
+	$lang['strcluster'] = 'Klastr';
 	
 	// Admin
 	$lang['stradminondatabase'] = 'Následující úlohy správy použít na celou databázi %s.';
@@ -802,118 +803,6 @@
 	$lang['strtablespacealtered'] = 'Změny v prostoru tabulek byly provedeny.';
 	$lang['strtablespacealteredbad'] = 'Nezdařilo se provést změny v prostoru tabulek.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Klastr';
-	$lang['strnoclusters'] = 'Nebyly nalezeny žádné klastry.';
-	$lang['strconfdropcluster'] = 'Opravdu chcete odstranit klastr „%s“?';
-	$lang['strclusterdropped'] = 'Klastr byl odstraněn.';
-	$lang['strclusterdroppedbad'] = 'Nezdařilo se odstranit klastr.';
-	$lang['strinitcluster'] = 'Inicializovat klastr';
-	$lang['strclustercreated'] = 'Klastr byl inicializován.';
-	$lang['strclustercreatedbad'] = 'Nezdařilo se inicializovat klastr.';
-	$lang['strclusterneedsname'] = 'Musíte zadat název pro klastr.';
-	$lang['strclusterneedsnodeid'] = 'Musíte zadat ID pro lokální uzel.';
-
-	// Slony nodes
-	$lang['strnodes'] = 'Uzly';
-	$lang['strnonodes'] = 'Nenalezeny žádné uzly.';
-	$lang['strcreatenode'] = 'Vytvořit uzel';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = 'Aktivní';
-	$lang['strnodecreated'] = 'Uzel byl vytvořen.';
-	$lang['strnodecreatedbad'] = 'Nezdařilo se vytvořit uzel.';
-	$lang['strconfdropnode'] = 'Opravdu chcete odstranit uzel „%s“?';
-	$lang['strnodedropped'] = 'Uzel byl odstraněn.';
-	$lang['strnodedroppedbad'] = 'Nezdařilo se odstranit uzel.';
-	$lang['strfailover'] = 'Překlenout výpadek';
-	$lang['strnodefailedover'] = 'Uzel překlenul výpadek.';
-	$lang['strnodefailedoverbad'] = 'Uzlu se nezdařilo překlenout výpadek.';
-	$lang['strstatus'] = 'Stav';	
-	$lang['strhealthy'] = 'V pořádku';
-	$lang['stroutofsync'] = 'Nesladěno';
-	$lang['strunknown'] = 'Neznámo';	
-
-	// Slony paths	
-	$lang['strpaths'] = 'Cesty';
-	$lang['strnopaths'] = 'Nenalezeny žádné cesty.';
-	$lang['strcreatepath'] = 'Vytvořit cestu';
-	$lang['strnodename'] = 'Název uzlu';
-	$lang['strnodeid'] = 'ID uzlu';
-	$lang['strconninfo'] = 'Připojovací řetězec';
-	$lang['strconnretry'] = 'Čekání v sekundách před novým pokusem připojení';
-	$lang['strpathneedsconninfo'] = 'Musíte zadat připojovací řetězec pro cestu.';
-	$lang['strpathneedsconnretry'] = 'Musíte zadat dobu v sekundách, po kterou se bude čekat, než se zkusí znovu připojit.';
-	$lang['strpathcreated'] = 'Cesta byla vytvořena.';
-	$lang['strpathcreatedbad'] = 'Nezdařilo se vytvořit cestu.';
-	$lang['strconfdroppath'] = 'Opravdu chcete odstranit cestu „%s“?';
-	$lang['strpathdropped'] = 'Cesta byla odstraněna.';
-	$lang['strpathdroppedbad'] = 'Nezdařilo se odstranit cestu.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Naslouchání';
-	$lang['strnolistens'] = 'Nebyla nalezena žádná naslouchání.';
-	$lang['strcreatelisten'] = 'Vytvořit naslouchání';
-	$lang['strlistencreated'] = 'Naslouchání bylo vytvořeno.';
-	$lang['strlistencreatedbad'] = 'Nezdařilo se vytvořit naslouchání.';
-	$lang['strconfdroplisten'] = 'Opravdu chcete odstranit naslouchání „%s“?';
-	$lang['strlistendropped'] = 'Naslouchání bylo odstraněno.';
-	$lang['strlistendroppedbad'] = 'Nezdařilo se odstranit naslouchání.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Replikační sady';
-	$lang['strnorepsets'] = 'Nebyly nalezeny žádné replikační sady.';
-	$lang['strcreaterepset'] = 'Vytvořit replikační sadu';
-	$lang['strrepsetcreated'] = 'Replikační sada byla vytvořena.';
-	$lang['strrepsetcreatedbad'] = 'Nezdařilo se vytvořit replikační sadu.';
-	$lang['strconfdroprepset'] = 'Opravdu chcete odstranit replikační sadu „%s“?';
-	$lang['strrepsetdropped'] = 'Replikační sada byla odstraněna.';
-	$lang['strrepsetdroppedbad'] = 'Nezdařilo se odstranit replikační sadu.';
-	$lang['strmerge'] = 'Sloučit';
-	$lang['strmergeinto'] = 'Sloučit s';
-	$lang['strrepsetmerged'] = 'Replikační sady byly sloučeny.';
-	$lang['strrepsetmergedbad'] = 'Nezdařilo se sloučit replikační sady.';
-	$lang['strmove'] = 'Přesunout';
-	$lang['strneworigin'] = 'Nový počátek';
-	$lang['strrepsetmoved'] = 'Replikační sada byla přesunuta.';
-	$lang['strrepsetmovedbad'] = 'Nezdařilo se přesunout replikační sadu.';
-	$lang['strnewrepset'] = 'Nová replikační sada';
-	$lang['strlock'] = 'Zamknout';
-	$lang['strlocked'] = 'Zamknuto';
-	$lang['strunlock'] = 'Odemknout';
-	$lang['strconflockrepset'] = 'Opravdu chcete zamknout replikační sadu „%s“?';
-	$lang['strrepsetlocked'] = 'Replikační sada byla zamknuta.';
-	$lang['strrepsetlockedbad'] = 'Nezdařilo se zamknout replikační sadu.';
-	$lang['strconfunlockrepset'] = 'Opravdu chcete odemknout replikační sadu „%s“?';
-	$lang['strrepsetunlocked'] = 'Replikační sada byla odemknuta.';
-	$lang['strrepsetunlockedbad'] = 'Nezdařilo se odemknout replikační sadu.';
-	$lang['stronlyonnode'] = 'Poze v uzlu';
-	$lang['strddlscript'] = 'Skript DDL';
-	$lang['strscriptneedsbody'] = 'Musíte zajistit, aby se skript spustil na všech uzlech.';
-	$lang['strscriptexecuted'] = 'Skript DDL replikační sady byl vykonán.';
-	$lang['strscriptexecutedbad'] = 'Nezdařilo se vykonat skript DDL replikační sady.';
-	$lang['strtabletriggerstoretain'] = 'Následující triggery NEBUDOU replikačním systémem Slony zakázány:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Přidat tabulku';
-	$lang['strtableneedsuniquekey'] = 'Přidávaná tabulka musí obsahovat primární nebo jedinečný klíč.';
-	$lang['strtableaddedtorepset'] = 'Tabulka byla přidána do replikační sady.';
-	$lang['strtableaddedtorepsetbad'] = 'Tabulku se nezdařilo přidat do replikační sady.';
-	$lang['strconfremovetablefromrepset'] = 'Opravdu chcete odebrat tabulku „%s“ z replikační sady „%s“?';
-	$lang['strtableremovedfromrepset'] = 'Tabulka byla odebrána z replikační sady.';
-	$lang['strtableremovedfromrepsetbad'] = 'Tabulku se nezdařilo odebrat z replikační sady.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Přidat sekvenci';
-	$lang['strsequenceaddedtorepset'] = 'Sekvence byla přidána do replikační sady.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Sekvenci se nezdařilo přidat do replikační sady.';
-	$lang['strconfremovesequencefromrepset'] = 'Opravdu chcete odebrat sekvenci „%s“ z replikační sady „%s“?';
-	$lang['strsequenceremovedfromrepset'] = 'Sekvence byla odebrána z replikační sady.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Sekvenci se nezdařilo odebrat z replikační sady.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Odběry';
-	$lang['strnosubscriptions'] = 'Nebyly nalezeny žádné odběry.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s běžící na %s:%s -- Jste přihlášený jako uživatel „%s“';
 	$lang['strtimefmt'] = 'j. M Y G:i';
diff --git a/lang/english.php b/lang/english.php
index 6b4a1060..2434b0b3 100644
--- a/lang/english.php
+++ b/lang/english.php
@@ -148,6 +148,7 @@
 	$lang['strstop'] = 'Stop';
 	$lang['strgotoppage'] = 'back to top';
 	$lang['strtheme'] = 'Theme';
+	$lang['strcluster'] = 'Cluster';
 	
 	// Admin
 	$lang['stradminondatabase'] = 'The following administrative tasks apply on the whole %s database.';
@@ -804,118 +805,6 @@
 	$lang['strtablespacealtered'] = 'Tablespace altered.';
 	$lang['strtablespacealteredbad'] = 'Tablespace alteration failed.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Cluster';
-	$lang['strnoclusters'] = 'No clusters found.';
-	$lang['strconfdropcluster'] = 'Are you sure you want to drop cluster "%s"?';
-	$lang['strclusterdropped'] = 'Cluster dropped.';
-	$lang['strclusterdroppedbad'] = 'Cluster drop failed.';
-	$lang['strinitcluster'] = 'Initialize cluster';
-	$lang['strclustercreated'] = 'Cluster initialized.';
-	$lang['strclustercreatedbad'] = 'Cluster initialization failed.';
-	$lang['strclusterneedsname'] = 'You must give a name for the cluster.';
-	$lang['strclusterneedsnodeid'] = 'You must give an ID for the local node.';
-
-	// Slony nodes
-	$lang['strnodes'] = 'Nodes';
-	$lang['strnonodes'] = 'No nodes found.';
-	$lang['strcreatenode'] = 'Create node';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = 'Active';
-	$lang['strnodecreated'] = 'Node created.';
-	$lang['strnodecreatedbad'] = 'Node creation failed.';
-	$lang['strconfdropnode'] = 'Are you sure you want to drop node "%s"?';
-	$lang['strnodedropped'] = 'Node dropped.';
-	$lang['strnodedroppedbad'] = 'Node drop failed.';
-	$lang['strfailover'] = 'Failover';
-	$lang['strnodefailedover'] = 'Node failed over.';
-	$lang['strnodefailedoverbad'] = 'Node failover failed.';
-	$lang['strstatus'] = 'Status';	
-	$lang['strhealthy'] = 'Healthy';
-	$lang['stroutofsync'] = 'Out of sync';
-	$lang['strunknown'] = 'Unknown';	
-
-	// Slony paths	
-	$lang['strpaths'] = 'Paths';
-	$lang['strnopaths'] = 'No paths found.';
-	$lang['strcreatepath'] = 'Create path';
-	$lang['strnodename'] = 'Node name';
-	$lang['strnodeid'] = 'Node ID';
-	$lang['strconninfo'] = 'Connection string';
-	$lang['strconnretry'] = 'Seconds before retry to connect';
-	$lang['strpathneedsconninfo'] = 'You must give a connection string for the path.';
-	$lang['strpathneedsconnretry'] = 'You must give the number of seconds to wait before retry to connect.';
-	$lang['strpathcreated'] = 'Path created.';
-	$lang['strpathcreatedbad'] = 'Path creation failed.';
-	$lang['strconfdroppath'] = 'Are you sure you want to drop path "%s"?';
-	$lang['strpathdropped'] = 'Path dropped.';
-	$lang['strpathdroppedbad'] = 'Path drop failed.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Listens';
-	$lang['strnolistens'] = 'No listens found.';
-	$lang['strcreatelisten'] = 'Create listen';
-	$lang['strlistencreated'] = 'Listen created.';
-	$lang['strlistencreatedbad'] = 'Listen creation failed.';
-	$lang['strconfdroplisten'] = 'Are you sure you want to drop listen "%s"?';
-	$lang['strlistendropped'] = 'Listen dropped.';
-	$lang['strlistendroppedbad'] = 'Listen drop failed.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Replication sets';
-	$lang['strnorepsets'] = 'No replication sets found.';
-	$lang['strcreaterepset'] = 'Create replication set';
-	$lang['strrepsetcreated'] = 'Replication set created.';
-	$lang['strrepsetcreatedbad'] = 'Replication set creation failed.';
-	$lang['strconfdroprepset'] = 'Are you sure you want to drop replication set "%s"?';
-	$lang['strrepsetdropped'] = 'Replication set dropped.';
-	$lang['strrepsetdroppedbad'] = 'Replication set drop failed.';
-	$lang['strmerge'] = 'Merge';
-	$lang['strmergeinto'] = 'Merge into';
-	$lang['strrepsetmerged'] = 'Replication sets merged.';
-	$lang['strrepsetmergedbad'] = 'Replication sets merge failed.';
-	$lang['strmove'] = 'Move';
-	$lang['strneworigin'] = 'New origin';
-	$lang['strrepsetmoved'] = 'Replication set moved.';
-	$lang['strrepsetmovedbad'] = 'Replication set move failed.';
-	$lang['strnewrepset'] = 'New replication set';
-	$lang['strlock'] = 'Lock';
-	$lang['strlocked'] = 'Locked';
-	$lang['strunlock'] = 'Unlock';
-	$lang['strconflockrepset'] = 'Are you sure you want to lock replication set "%s"?';
-	$lang['strrepsetlocked'] = 'Replication set locked.';
-	$lang['strrepsetlockedbad'] = 'Replication set lock failed.';
-	$lang['strconfunlockrepset'] = 'Are you sure you want to unlock replication set "%s"?';
-	$lang['strrepsetunlocked'] = 'Replication set unlocked.';
-	$lang['strrepsetunlockedbad'] = 'Replication set unlock failed.';
-	$lang['stronlyonnode'] = 'Only on node';
-	$lang['strddlscript'] = 'DDL script';
-	$lang['strscriptneedsbody'] = 'You must supply a script to be executed on all nodes.';
-	$lang['strscriptexecuted'] = 'Replication set DDL script executed.';
-	$lang['strscriptexecutedbad'] = 'Failed executing replication set DDL script.';
-	$lang['strtabletriggerstoretain'] = 'The following triggers will NOT be disabled by Slony:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Add table';
-	$lang['strtableneedsuniquekey'] = 'Table to be added requires a primary or unique key.';
-	$lang['strtableaddedtorepset'] = 'Table added to replication set.';
-	$lang['strtableaddedtorepsetbad'] = 'Failed adding table to replication set.';
-	$lang['strconfremovetablefromrepset'] = 'Are you sure you want to drop the table "%s" from replication set "%s"?';
-	$lang['strtableremovedfromrepset'] = 'Table dropped from replication set.';
-	$lang['strtableremovedfromrepsetbad'] = 'Failed to drop table from replication set.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Add sequence';
-	$lang['strsequenceaddedtorepset'] = 'Sequence added to replication set.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Failed adding sequence to replication set.';
-	$lang['strconfremovesequencefromrepset'] = 'Are you sure you want to drop the sequence "%s" from replication set "%s"?';
-	$lang['strsequenceremovedfromrepset'] = 'Sequence dropped from replication set.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Failed to drop sequence from replication set.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Subscriptions';
-	$lang['strnosubscriptions'] = 'No subscriptions found.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s running on %s:%s -- You are logged in as user "%s"';
 	$lang['strtimefmt'] = 'jS M, Y g:iA';
diff --git a/lang/french.php b/lang/french.php
index 3d3a8d68..43865e9f 100644
--- a/lang/french.php
+++ b/lang/french.php
@@ -490,6 +490,7 @@
 	$lang['strclusteredbad'] = 'Échec du cluster.';
 	$lang['strconcurrently'] = 'En parallèle';
 	$lang['strnoclusteravailable'] = 'La table n\'est pas encore ordonnée selon un index.';
+	$lang['strcluster'] = 'Cluster';
 
 	// Rules
 	$lang['strrules'] = 'Règles';
@@ -804,118 +805,6 @@
 	$lang['strtablespacealtered'] = 'Tablespace modifié.';
 	$lang['strtablespacealteredbad'] = 'Échec lors de la modification du tablespace.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Cluster';
-	$lang['strnoclusters'] = 'Aucun cluster trouvé.';
-	$lang['strconfdropcluster'] = 'Êtesvous sûr de vouloir supprimer le cluster « %s » ?';
-	$lang['strclusterdropped'] = 'Cluster supprimé.';
-	$lang['strclusterdroppedbad'] = 'Échec lors de la suppression du cluster.';
-	$lang['strinitcluster'] = 'Initialiser le cluster';
-	$lang['strclustercreated'] = 'Cluster initialisé.';
-	$lang['strclustercreatedbad'] = 'Échec lors de l\'initialisation du cluster.';
-	$lang['strclusterneedsname'] = 'Vous devez donner un nom au cluster.';
-	$lang['strclusterneedsnodeid'] = 'Vous devez donner un ID au noeud local.';
-
-	// Slony nodes
-	$lang['strnodes'] = 'Noeuds';
-	$lang['strnonodes'] = 'Aucun noeud trouvé.';
-	$lang['strcreatenode'] = 'Créer un noeud';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = 'Actif';
-	$lang['strnodecreated'] = 'Noeud créé.';
-	$lang['strnodecreatedbad'] = 'Échec lors de la création du noeud.';
-	$lang['strconfdropnode'] = 'Êtes-vous sûr de vouloir supprimer le noeud « %s » ?';
-	$lang['strnodedropped'] = 'Noeud supprimé.';
-	$lang['strnodedroppedbad'] = 'Échec lors de la suppression du noeud';
-	$lang['strfailover'] = 'Basculer (failover)';
-	$lang['strnodefailedover'] = 'Node basculé.';
-	$lang['strnodefailedoverbad'] = 'Échec lors du basculement du noeud.';
-	$lang['strstatus'] = 'Statut';	
-	$lang['strhealthy'] = 'État';
-	$lang['stroutofsync'] = 'Hors synchro';
-	$lang['strunknown'] = 'Inconnu';
-
-	// Slony paths 
-	$lang['strpaths'] = 'Chemins';
-	$lang['strnopaths'] = 'Aucun chemin trouvé.';
-	$lang['strcreatepath'] = 'Créer un chemin';
-	$lang['strnodename'] = 'Nom du noeud';
-	$lang['strnodeid'] = 'ID du noeud';
-	$lang['strconninfo'] = 'Chaîne de connexion';
-	$lang['strconnretry'] = 'Secondes avant une nouvelle tentative de connexion';
-	$lang['strpathneedsconninfo'] = 'Vous devez donner une chaîne de connexion pour le chemin.';
-	$lang['strpathneedsconnretry'] = 'Vous devez donner le nombre de secondes d\'attente avant une nouvelle tentative de connexion.';
-	$lang['strpathcreated'] = 'Chemin créé.';
-	$lang['strpathcreatedbad'] = 'Échec lors de la création du chemin.';
-	$lang['strconfdroppath'] = 'Êtes-vous sûr de vouloir supprimer le chemin « %s » ?';
-	$lang['strpathdropped'] = 'Chemin supprimé.';
-	$lang['strpathdroppedbad'] = 'Échec lors de la suppression du chemin.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Écoutes';
-	$lang['strnolistens'] = 'Aucune écoute trouvée.';
-	$lang['strcreatelisten'] = 'Créer une écoute';
-	$lang['strlistencreated'] = 'Écoute créée.';
-	$lang['strlistencreatedbad'] = 'Échec lors de la création de l\'écoute.';
-	$lang['strconfdroplisten'] = 'Êtes-vous sûr de vouloir supprimer l\'écoute « %s » ?';
-	$lang['strlistendropped'] = 'Écoute supprimé.';
-	$lang['strlistendroppedbad'] = 'Échec lors de la suppression de l\'écoute.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Ensembles de réplication';
-	$lang['strnorepsets'] = 'Aucun ensemble de réplication trouvé.';
-	$lang['strcreaterepset'] = 'Créer un ensemble de réplication';
-	$lang['strrepsetcreated'] = 'Ensemble de réplication créé.';
-	$lang['strrepsetcreatedbad'] = 'Échec lors de la création de l\'ensemble de réplication.';
-	$lang['strconfdroprepset'] = 'Êtes-vous sûr de vouloir supprimer l\'ensemble de réplication « %s » ?';
-	$lang['strrepsetdropped'] = 'Ensemble de réplication supprimé.';
-	$lang['strrepsetdroppedbad'] = 'Échec lors de la suppression de l\'ensemble de réplication.';
-	$lang['strmerge'] = 'Assemblage';
-	$lang['strmergeinto'] = 'Assembler dans';
-	$lang['strrepsetmerged'] = 'Ensembles de réplication assemblés.';
-	$lang['strrepsetmergedbad'] = 'Échec lors de l\'assemblage des ensembles de réplication.';
-	$lang['strmove'] = 'Déplacement';
-	$lang['strneworigin'] = 'Nouvelle origine';
-	$lang['strrepsetmoved'] = 'Ensemble de réplication déplacé.';
-	$lang['strrepsetmovedbad'] = 'Échec lors du déplacement de l\'ensemble de réplication.';
-	$lang['strnewrepset'] = 'Nouvel ensemble de réplication';
-	$lang['strlock'] = 'Verrou';
-	$lang['strlocked'] = 'Verrouillé';
-	$lang['strunlock'] = 'Déverrouillé';
-	$lang['strconflockrepset'] = 'Êtes-vous sûr de vouloir verrouiller l\'ensemble de réplication « %s » ?';
-	$lang['strrepsetlocked'] = 'Ensemble de réplication verrouillé.';
-	$lang['strrepsetlockedbad'] = 'Échec lors du verrouillage de l\'ensemble de réplication.';
-	$lang['strconfunlockrepset'] = 'Êtes-vous sûr de vouloir déverrouiller l\'ensemble de réplication « %s » ?';
-	$lang['strrepsetunlocked'] = 'Ensemble de réplication déverrouillé.';
-	$lang['strrepsetunlockedbad'] = 'Échec lors du déverrouillage de l\'ensemble de réplication.';
-	$lang['stronlyonnode'] = 'Seulement sur le noeud';
-	$lang['strddlscript'] = 'Script DDL';
-	$lang['strscriptneedsbody'] = 'Vous devez fournir un script à exécuter sur tous les noeuds.';
-	$lang['strscriptexecuted'] = 'Script DDL de l\'ensemble de réplication exécuté.';
-	$lang['strscriptexecutedbad'] = 'Échec lors de l\'exécution du script DDL de l\'ensemble de réplication.';
-	$lang['strtabletriggerstoretain'] = 'Les triggers suivants ne seront PAS désactivés par Slony:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Ajouter une table';
-	$lang['strtableneedsuniquekey'] = 'La table à ajouter doit avoir une clé primaire ou une clé unique.';
-	$lang['strtableaddedtorepset'] = 'Table ajouter à l\'ensemble de réplication.';
-	$lang['strtableaddedtorepsetbad'] = 'Échec lors de l\'ajout de la table dans l\'ensemble de réplication.';
-	$lang['strconfremovetablefromrepset'] = 'Êtes-vous sûr de vouloir supprimer la table « %s » de l\'ensemble de réplication « %s » ?';
-	$lang['strtableremovedfromrepset'] = 'Table supprimée de l\'ensemble de réplication.';
-	$lang['strtableremovedfromrepsetbad'] = 'Échec lors de la suppression de la table de l\'ensemble de réplication.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Ajouter une séquence';
-	$lang['strsequenceaddedtorepset'] = 'Séquence ajoutée à l\'ensemble de réplication.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Échec lors de l\'ajout de la séquence à l\'ensemble de réplication.';
-	$lang['strconfremovesequencefromrepset'] = 'Êtes-vous sûr de vouloir supprimer la séquence « %s » de l\'ensemble de réplication « %s »?';
-	$lang['strsequenceremovedfromrepset'] = 'Séquence supprimée de l\'ensemble de réplication.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Échec lors de la suppression de la séquence à partir de l\'ensemble de réplication.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Souscriptions';
-	$lang['strnosubscriptions'] = 'Aucune souscription trouvée.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s lancé sur %s:%s -- Vous êtes connecté avec le profil « %s »';
 	$lang['strtimefmt'] = 'j M Y, H:i';
diff --git a/lang/galician.php b/lang/galician.php
index 48dbff1a..750aa801 100644
--- a/lang/galician.php
+++ b/lang/galician.php
@@ -159,6 +159,7 @@
 	$lang['strstop'] = 'Deter';
 	$lang['strgotoppage'] = 'Volver arriba';
 	$lang['strtheme'] = 'Tema visual';
+	$lang['strcluster'] = 'Concentrador';
 
 	// Admin
 	$lang['stradminondatabase'] = 'As seguintes tarefas administrativas realizaranse en toda a base de datos «%s».';
@@ -814,118 +815,6 @@
 	$lang['strtablespacealtered'] = 'Modificouse o alias de ruta.';
 	$lang['strtablespacealteredbad'] = 'Non se conseguiu modificar o alias de ruta.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Concentrador';
-	$lang['strnoclusters'] = 'Non se atopou concentrador algún.';
-	$lang['strconfdropcluster'] = 'Está seguro de que quere eliminar o concentrador «%s»?';
-	$lang['strclusterdropped'] = 'Eliminouse o concentrador.';
-	$lang['strclusterdroppedbad'] = 'Non se conseguiu eliminar o concentrador.';
-	$lang['strinitcluster'] = 'Inicializar o concentrador';
-	$lang['strclustercreated'] = 'Inicializouse o concentrador.';
-	$lang['strclustercreatedbad'] = 'Non se conseguiu inicializar o concentrador.';
-	$lang['strclusterneedsname'] = 'Debe fornecer un nome para o concentrador.';
-	$lang['strclusterneedsnodeid'] = 'Debe fornecer un identificador para o nodo local.';
-
-	// Slony nodes
-	$lang['strnodes'] = 'Nodos';
-	$lang['strnonodes'] = 'Non se atopou nodo algún.';
-	$lang['strcreatenode'] = 'Crear un nodo';
-	$lang['strid'] = 'Identificador';
-	$lang['stractive'] = 'Activo';
-	$lang['strnodecreated'] = 'Creouse o nodo.';
-	$lang['strnodecreatedbad'] = 'Non se conseguiu crear o nodo.';
-	$lang['strconfdropnode'] = 'Está seguro de que quere eliminar o nodo «%s»?';
-	$lang['strnodedropped'] = 'Eliminouse o nodo.';
-	$lang['strnodedroppedbad'] = 'Non se conseguiu eliminar o nodo.';
-	$lang['strfailover'] = 'Tolerancia de erros';
-	$lang['strnodefailedover'] = 'O nodo tolerou o erro.';
-	$lang['strnodefailedoverbad'] = 'O nodo non deu tolerado o erro.';
-	$lang['strstatus'] = 'Estado';
-	$lang['strhealthy'] = 'Saúde';
-	$lang['stroutofsync'] = 'Sen sincronizar';
-	$lang['strunknown'] = 'Descoñecido';
-
-	// Slony paths
-	$lang['strpaths'] = 'Rutas';
-	$lang['strnopaths'] = 'Non se atopou ruta algunha.';
-	$lang['strcreatepath'] = 'Crear unha ruta';
-	$lang['strnodename'] = 'Nome do nodo';
-	$lang['strnodeid'] = 'Identificador do nodo';
-	$lang['strconninfo'] = 'Cadea de conexión';
-	$lang['strconnretry'] = 'Segundos entre os intentos de conexión';
-	$lang['strpathneedsconninfo'] = 'Debe fornecer unha cadea de conexión para a ruta.';
-	$lang['strpathneedsconnretry'] = 'Debe indicar cantos segundos se ha de agardar para volver intentar establecer unha conexión.';
-	$lang['strpathcreated'] = 'Creouse a ruta.';
-	$lang['strpathcreatedbad'] = 'Non se conseguiu crear a ruta.';
-	$lang['strconfdroppath'] = 'Está seguro de que quere eliminar a ruta «%s»?';
-	$lang['strpathdropped'] = 'Eliminouse a ruta.';
-	$lang['strpathdroppedbad'] = 'Non se conseguiu eliminar a ruta.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Escoitas';
-	$lang['strnolistens'] = 'Non se atopou escoita algunha.';
-	$lang['strcreatelisten'] = 'Crear unha escoita';
-	$lang['strlistencreated'] = 'Creouse a escoita.';
-	$lang['strlistencreatedbad'] = 'Non se conseguiu crear a escoita.';
-	$lang['strconfdroplisten'] = 'Está seguro de que quere eliminar a escoita «%s»?';
-	$lang['strlistendropped'] = 'Eliminouse a escoita.';
-	$lang['strlistendroppedbad'] = 'Non se conseguiu eliminar a escoita.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Grupos de réplicas';
-	$lang['strnorepsets'] = 'Non se atopou grupo de réplicas algún.';
-	$lang['strcreaterepset'] = 'Crear un grupo de réplicas';
-	$lang['strrepsetcreated'] = 'Creouse o grupo de réplicas.';
-	$lang['strrepsetcreatedbad'] = 'Non se conseguiu crear o grupo de réplicas.';
-	$lang['strconfdroprepset'] = 'Está seguro de que quere borrar o grupo de réplicas «%s»?';
-	$lang['strrepsetdropped'] = 'Eliminouse o grupo de réplicas.';
-	$lang['strrepsetdroppedbad'] = 'Non se conseguiu eliminar o grupo de réplicas.';
-	$lang['strmerge'] = 'Mesturar';
-	$lang['strmergeinto'] = 'Mesturar con';
-	$lang['strrepsetmerged'] = 'Mesturáronse os grupos de réplicas.';
-	$lang['strrepsetmergedbad'] = 'Non se conseguiu mesturar os grupos de réplicas.';
-	$lang['strmove'] = 'Mover';
-	$lang['strneworigin'] = 'Nova orixe';
-	$lang['strrepsetmoved'] = 'Moveuse o grupo de réplicas.';
-	$lang['strrepsetmovedbad'] = 'Non se conseguiu mover o grupo de réplicas.';
-	$lang['strnewrepset'] = 'Novo grupo de réplicas';
-	$lang['strlock'] = 'Bloquear';
-	$lang['strlocked'] = 'Bloqueado';
-	$lang['strunlock'] = 'Desbloquear';
-	$lang['strconflockrepset'] = 'Está seguro de que quere bloquear o grupo de réplicas «%s»?';
-	$lang['strrepsetlocked'] = 'Bloqueouse o grupo de réplicas.';
-	$lang['strrepsetlockedbad'] = 'Non se conseguiu bloquear o grupo de réplicas.';
-	$lang['strconfunlockrepset'] = 'Está seguro de que quere desbloquear o grupo de réplicas «%s»?';
-	$lang['strrepsetunlocked'] = 'Desbloqueouse o grupo de réplicas.';
-	$lang['strrepsetunlockedbad'] = 'Non se conseguiu desbloquear o grupo de réplicas.';
-	$lang['stronlyonnode'] = 'Só no nodo';
-	$lang['strddlscript'] = 'Guión DDL';
-	$lang['strscriptneedsbody'] = 'Debe fornecer un guión para que se execute en todos os nodos.';
-	$lang['strscriptexecuted'] = 'Executouse o guión DDL do grupo de réplicas.';
-	$lang['strscriptexecutedbad'] = 'Non se conseguiu executar o guión DDL do grupo de réplicas.';
-	$lang['strtabletriggerstoretain'] = 'Slony non vai desactivar o seguintes disparadores::';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Engadir unha táboa';
-	$lang['strtableneedsuniquekey'] = 'A táboa a engadir necesita dunha clave primaria ou única.';
-	$lang['strtableaddedtorepset'] = 'Engadiuse a táboa ao grupo de réplicas.';
-	$lang['strtableaddedtorepsetbad'] = 'Non se conseguiu engadir a táboa ao grupo de réplicas.';
-	$lang['strconfremovetablefromrepset'] = 'Está seguro de que quere eliminar a táboa «%s» do grupo de réplicas «%s»?';
-	$lang['strtableremovedfromrepset'] = 'Eliminouse a táboa do grupo de réplicas.';
-	$lang['strtableremovedfromrepsetbad'] = 'Non se conseguiu eliminar a táboa do grupo de réplicas.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Engadir unha secuencia';
-	$lang['strsequenceaddedtorepset'] = 'Engadiuse a secuencia ao grupo de réplicas.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Non se conseguiu engadir a secuencia ao grupo de réplicas.';
-	$lang['strconfremovesequencefromrepset'] = 'Está seguro de que quere eliminar a secuencia «%s» do grupo de réplicas «%s»?';
-	$lang['strsequenceremovedfromrepset'] = 'Eliminouse a secuencia do grupo de réplicas.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Non se conseguiu eliminar a secuencia do grupo de réplicas.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Subscricións';
-	$lang['strnosubscriptions'] = 'Non se atopou subscrición algunha.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s, executándose no enderezo %s:%s. Está identificado coma «%s».';
 	$lang['strtimefmt'] = 'd/m/Y, G:i:s';
diff --git a/lang/german.php b/lang/german.php
index a94e2f69..6c98c894 100644
--- a/lang/german.php
+++ b/lang/german.php
@@ -137,6 +137,7 @@
 	$lang['strselectall'] = 'Alle auswählen';
 	$lang['strunselectall'] = 'Alle abwählen';
 	$lang['strlocale'] = 'Spracheinstellung';
+	$lang['strcluster'] = 'Cluster';
 
 	// User-supplied SQL history
 	$lang['strhistory'] = 'Befehlsspeicher';
@@ -768,118 +769,6 @@
 	$lang['strtablespacealtered'] = 'Tablespace geändert.';
 	$lang['strtablespacealteredbad'] = 'Ändern des Tablespace fehlgeschlagen.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Cluster';
-	$lang['strnoclusters'] = 'Keine Cluster gefunden.';
-	$lang['strconfdropcluster'] = 'Sind Sie sicher, dass Sie den Cluster "%s" löschen möchten?';
-	$lang['strclusterdropped'] = 'Cluster gelöscht.';
-	$lang['strclusterdroppedbad'] = 'Löschen des Clusters fehlgeschlagen.';
-	$lang['strinitcluster'] = 'Cluster initialisieren';
-	$lang['strclustercreated'] = 'Cluster initialisiert.';
-	$lang['strclustercreatedbad'] = 'Initialisierung des Clusters fehlgeschlagen.';
-	$lang['strclusterneedsname'] = 'Sie müssen einen Namen für den Cluster angeben.';
-	$lang['strclusterneedsnodeid'] = 'Sie müssen eine ID für den lokalen Cluster-Knoten angeben.';
-
-	// Slony nodes
-	$lang['strnodes'] = 'Cluster-Knoten';
-	$lang['strnonodes'] = 'Keine Cluster-Knoten gefunden.';
-	$lang['strcreatenode'] = 'Cluster-Knoten erstellen';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = 'Aktiv';
-	$lang['strnodecreated'] = 'Cluster-Knoten erstellt.';
-	$lang['strnodecreatedbad'] = 'Erstellen des Cluster-Knotens fehlgeschlagen.';
-	$lang['strconfdropnode'] = 'Sind Sie sicher, dass Sie Cluster-Knoten "%s" löschen möchten?';
-	$lang['strnodedropped'] = 'Cluster-Knoten gelöscht.';
-	$lang['strnodedroppedbad'] = 'Löschen des Cluster-Knotens fehlgeschlagen.';
-	$lang['strfailover'] = 'Übernahme';
-	$lang['strnodefailedover'] = 'Cluster-Knoten übernommen.';
-	$lang['strnodefailedoverbad'] = 'Übernahme des Cluster-Knotens fehlgeschlagen.';
-	$lang['strstatus'] = 'Status';	
-	$lang['strhealthy'] = 'Gesund';
-	$lang['stroutofsync'] = 'Nicht Synchronisiert';
-	$lang['strunknown'] = 'Unbekannt';	
-
-	// Slony paths	
-	$lang['strpaths'] = 'Kommunikationspfade';
-	$lang['strnopaths'] = 'Keine Kommunikationspfade gefunden.';
-	$lang['strcreatepath'] = 'Kommunikationspfad erstellen';
-	$lang['strnodename'] = 'Name des Cluster-Knotens';
-	$lang['strnodeid'] = 'ID des Cluster-Knotens';
-	$lang['strconninfo'] = 'Connection-String';
-	$lang['strconnretry'] = 'Wartezeit vor erneutem Verbindungsversuch in Sekunden';
-	$lang['strpathneedsconninfo'] = 'Sie müssen einen Connection-String für den Kommunikationspfad angeben.';
-	$lang['strpathneedsconnretry'] = 'Sie müssen die Wartezeit vor einem erneuten Verbindungsversuch angeben.';
-	$lang['strpathcreated'] = 'Kommunikationspfad erstellt.';
-	$lang['strpathcreatedbad'] = 'Erstellen des Kommunikationspfades fehlgeschlagen.';
-	$lang['strconfdroppath'] = 'Sind Sie sicher, dass Sie den Kommunikationspfad "%s" löschen möchten?';
-	$lang['strpathdropped'] = 'Kommunikationspfad gelöscht.';
-	$lang['strpathdroppedbad'] = 'Löschen des Kommunikationspfades fehlgeschlagen.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Zuhörer';
-	$lang['strnolistens'] = 'Keine Zuhörer gefunden.';
-	$lang['strcreatelisten'] = 'Zuhörer erstellen';
-	$lang['strlistencreated'] = 'Zuhörer erstellt.';
-	$lang['strlistencreatedbad'] = 'Erstellen des Zuhörers fehlgeschlagen.';
-	$lang['strconfdroplisten'] = 'Sind Sie sicher, dass Sie Zuhörer "%s" löschen möchten?';
-	$lang['strlistendropped'] = 'Zuhörer gelöscht.';
-	$lang['strlistendroppedbad'] = 'Löschen des Zuhörers fehlgeschlagen.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Replikationsgruppe';
-	$lang['strnorepsets'] = 'Keine Replikationsgruppen gefunden.';
-	$lang['strcreaterepset'] = 'Replikationsgruppe erstellen';
-	$lang['strrepsetcreated'] = 'Replikationsgruppe erstellt.';
-	$lang['strrepsetcreatedbad'] = 'Erstellen der Replikationsgruppe fehlgeschlagen.';
-	$lang['strconfdroprepset'] = 'Sind Sie sicher, dass Sie Replikationsgruppe "%s" löschen möchten?';
-	$lang['strrepsetdropped'] = 'Replikationsgruppe gelöscht.';
-	$lang['strrepsetdroppedbad'] = 'Löschen der Replikationsgruppe fehlgeschlagen.';
-	$lang['strmerge'] = 'Vereinigen';
-	$lang['strmergeinto'] = 'Vereinigen mit';
-	$lang['strrepsetmerged'] = 'Replikationsgruppen vereinige.';
-	$lang['strrepsetmergedbad'] = 'Vereinigung der Replikationsgruppen fehlgeschlagen.';
-	$lang['strmove'] = 'Verschieben';
-	$lang['strneworigin'] = 'Neuer Usrprung';
-	$lang['strrepsetmoved'] = 'Replikationsgruppe verschoben.';
-	$lang['strrepsetmovedbad'] = 'Verschieben der Replikationsgruppe fehlgeschlagen.';
-	$lang['strnewrepset'] = 'Neue Replikationsgruppe';
-	$lang['strlock'] = 'Sperren';
-	$lang['strlocked'] = 'Gesperrt';
-	$lang['strunlock'] = 'Entsperren';
-	$lang['strconflockrepset'] = 'Sind Sie sicher, dass Sie Replikationsgruppe "%s" sperren möchten?';
-	$lang['strrepsetlocked'] = 'Replikationsgruppe gesperrt.';
-	$lang['strrepsetlockedbad'] = 'Sperren der Replikationsgruppe fehlgeschlagen.';
-	$lang['strconfunlockrepset'] = 'Sind Sie sicher, dass Sie Replikationsgruppe "%s" entsperren möchten?';
-	$lang['strrepsetunlocked'] = 'Replikationsgruppe entsperrt.';
-	$lang['strrepsetunlockedbad'] = 'Entsperren der Replikationsgruppe fehlgeschlagen.';
-	$lang['stronlyonnode'] = 'Nur auf dem Cluster-Knoten';
-	$lang['strddlscript'] = 'DDL-Script';
-	$lang['strscriptneedsbody'] = 'Sie müssen ein Script angeben, das auf allen Cluster-Knoten ausgeführt werden soll.';
-	$lang['strscriptexecuted'] = 'DDL-Script für die Replikationsgruppe ausgeführt.';
-	$lang['strscriptexecutedbad'] = 'Ausführung des DDL-Scripts für die Replikationsgruppe fehlgeschlagen.';
-	$lang['strtabletriggerstoretain'] = 'Die folgenden Trigger werden von Slony NICHT deaktiviert:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Tabelle hinzufügen';
-	$lang['strtableneedsuniquekey'] = 'Damit eine Tabelle hinzugefügt werden kann, muss sie einen Primärschlüssel oder einen eindeutigen Schlüssel besitzen.';
-	$lang['strtableaddedtorepset'] = 'Tabelle zu Replikationsgruppe hinzugefügt.';
-	$lang['strtableaddedtorepsetbad'] = 'Hinzufügen der Tabelle zur Replikationsgruppe fehlgeschlagen.';
-	$lang['strconfremovetablefromrepset'] = 'Sind Sie sicher, dass Sie die Tabelle "%s" aus der Replikationsgruppe "%s" entfernen möchten?';
-	$lang['strtableremovedfromrepset'] = 'Tabelle aus Replikationsgruppe entfernt.';
-	$lang['strtableremovedfromrepsetbad'] = 'Entfernen der Tabelle aus der Replikationsgruppe fehlgeschlagen.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Sequenz hinzufügen';
-	$lang['strsequenceaddedtorepset'] = 'Sequenz zu Replikationsgruppe hinzugefügt.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Hinzufügen der Sequenz zur Replikationsgruppe fehlgeschlagen.';
-	$lang['strconfremovesequencefromrepset'] = 'Sind Sie sicher, dass Sie die Sequenz "%s" aus der Replikationsgruppe "%s" entfernen möchten?';
-	$lang['strsequenceremovedfromrepset'] = 'Sequenz aus Replikationsgruppe entfernt.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Entfernen der Sequenz aus der Replikationsgruppe fehlgeschlagen.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Abonnements';
-	$lang['strnosubscriptions'] = 'Keine Abonnements gefunden.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s läuft auf %s:%s -- Sie sind als "%s" angemeldet';
 	$lang['strtimefmt'] = 'D, j. n. Y, G:i';
diff --git a/lang/greek.php b/lang/greek.php
index 40183271..49e32a88 100644
--- a/lang/greek.php
+++ b/lang/greek.php
@@ -130,6 +130,7 @@
 	$lang['strfile'] = 'Αρχείο';
 	$lang['strfileimported'] = 'Αρχείο εισήχθη.';
 	$lang['strtrycred'] = 'Χρήση αυτών των διαπιστευτηρίων για όλους τους διακομιστές';
+	$lang['strexecute'] = 'Εκτέλεση';
 
 	// Database Sizes
 	$lang['strsize'] = 'Μέγεθος';
@@ -414,6 +415,7 @@
 	$lang['strconfcluster'] = 'Να ομαδοποιηθούν τα "%s"?';
 	$lang['strclusteredgood'] = 'Η ομαδοποίηση ολοκληρώθηκε.';
 	$lang['strclusteredbad'] = 'Η ομαδοποίηση απέτυχε.';
+	$lang['strcluster'] = 'Συστοιχία';
 
 	// Rules
 	$lang['strrules'] = 'Κανόνες';
@@ -718,120 +720,6 @@
 	$lang['strtablespacealtered'] = 'Η τοποθεσία τροποποιήθηκε.';
 	$lang['strtablespacealteredbad'] = 'Η τροποποίηση της τοποθεσίας απέτυχε.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Συστοιχία';
-	$lang['strnoclusters'] = 'Δε βρέθηκαν συστοιχίες.';
-	$lang['strconfdropcluster'] = 'Να διαγραφεί η συστοιχία "%s"?';
-	$lang['strclusterdropped'] = 'Η συστοιχία διαγράφηκε.';
-	$lang['strclusterdroppedbad'] = 'Η διαγραφή της συστοιχίας διαγράφηκε.';
-	$lang['strinitcluster'] = 'Δημιουργία συστοιχίας';
-	$lang['strclustercreated'] = 'Η συστοιχία δημιουργήθηκε.';
-	$lang['strclustercreatedbad'] = 'Η δημιουργία της συστοιχίας απέτυχε.';
-	$lang['strclusterneedsname'] = 'Πρέπει να δώσετε όνομα στη συστοιχία.';
-	$lang['strclusterneedsnodeid'] = 'Πρέπει να δώσετε ταυτότητα στον τοπικό κόμβο της συστοιχίας.';
-	
-	// Slony nodes
-	$lang['strnodes'] = 'Κόμβοι';
-	$lang['strnonodes'] = 'Δε βρέθηκαν κόμβοι.';
-	$lang['strcreatenode'] = 'Δημιουργία κόμβου';
-	$lang['strid'] = 'Ταυτότητα';
-	$lang['stractive'] = 'Ενεργός';
-	$lang['strnodecreated'] = 'Ο κόμβος δημιουργήθηκε.';
-	$lang['strnodecreatedbad'] = 'Η δημιουργία του κόμβου απέτυχε.';
-	$lang['strconfdropnode'] = 'Να διαγραφεί ο κόμβος "%s"?';
-	$lang['strnodedropped'] = 'Ο κόμβος διαγράφηκε.';
-	$lang['strnodedroppedbad'] = 'Η διαγραφή του κόμβου απέτυχε';
-	$lang['strfailover'] = 'Εφεδρικός';
-	$lang['strnodefailedover'] = 'Η εφεδρεία του κόμβου ήταν επιτυχής.';
-	$lang['strnodefailedoverbad'] = 'Η εφεδρεία του κόμβου απέτυχε.';
-	$lang['strstatus'] = 'Κατάσταση';	
-	$lang['strhealthy'] = 'Υγιής';
-	$lang['stroutofsync'] = 'Αποσυγχρονισμένος';
-	$lang['strunknown'] = 'Αγνωστη';	
-
-	
-	// Slony paths	
-	$lang['strpaths'] = 'Μονοπάτια';
-	$lang['strnopaths'] = 'Δε βρέθηκαν μονοπάτια.';
-	$lang['strcreatepath'] = 'Δημιουργία μονοπατιού';
-	$lang['strnodename'] = 'Ονομα κόμβου';
-	$lang['strnodeid'] = 'Ταυτότητα κόμβου';
-	$lang['strconninfo'] = 'Πληροφορίες σύνδεσης';
-	$lang['strconnretry'] = 'Χρόνος αναμονής σε δευτερόλεπτα πριν την προσπάθεια επανασύνδεσης';
-	$lang['strpathneedsconninfo'] = 'Πρέπει να εισάγετε τις πληροφορίες σύνδεσης.';
-	$lang['strpathneedsconnretry'] = 'Πρέπει να εισάγετε το χρόνο αναμονής.';
-	$lang['strpathcreated'] = 'Το μονοπάτι δημιουργήθηκε.';
-	$lang['strpathcreatedbad'] = 'Η δημιουργία του μονοπατιού απέτυχε.';
-	$lang['strconfdroppath'] = 'Να διαγραφεί το μονοπάτι "%s"?';
-	$lang['strpathdropped'] = 'Το μονοπάτι διαγράφηκε.';
-	$lang['strpathdroppedbad'] = 'Η διαγραφή του μονοπατιού απέτυχε.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Ακροάσεις';
-	$lang['strnolistens'] = 'Δε βρέθηκαν ακροάσεις.';
-	$lang['strcreatelisten'] = 'Δημιουργία ακρόασης';
-	$lang['strlistencreated'] = 'Η ακρόαση δημιουργήθηκε.';
-	$lang['strlistencreatedbad'] = 'Η δημιουργία ακρόασης απέτυχε.';
-	$lang['strconfdroplisten'] = 'Να διαγραφεί η ακρόαση "%s"?';
-	$lang['strlistendropped'] = 'Η ακρόαση διαγράφηκε.';
-	$lang['strlistendroppedbad'] = 'Η διαγραφή της ακρόασης απέτυχε.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Αναπαραγόμενα σύνολα';
-	$lang['strnorepsets'] = 'Δε βρέθηκαν αναπαραγόμενα σύνολα.';
-	$lang['strcreaterepset'] = 'Δημιουργία αναπαραγόμενων συνόλων';
-	$lang['strrepsetcreated'] = 'Το αναπαραγόμενο σύνολο δημιουργήθηκε.';
-	$lang['strrepsetcreatedbad'] = 'Η δημιουργία του αναπαραγόμενου συνόλου απέτυχε.';
-	$lang['strconfdroprepset'] = 'Να διαγραφεί το αναπαραγόμενο σύνολο "%s"?';
-	$lang['strrepsetdropped'] = 'Το αναπαραγόμενο σύνολο διαγράφηκε.';
-	$lang['strrepsetdroppedbad'] = 'Η διαγραφή του αναπαραγόμενου συνόλου απέτυχε.';
-	$lang['strmerge'] = 'Συγχώνευση';
-	$lang['strmergeinto'] = 'Συγχώνευση με';
-	$lang['strrepsetmerged'] = 'Τα αναπαραγόμενα σύνολα συγχωνεύθηκαν.';
-	$lang['strrepsetmergedbad'] = 'Η συγχώνευση των αναπαραγόμενων συνόλων απέτυχε.';
-	$lang['strmove'] = 'Μετακίνηση';
-	$lang['strneworigin'] = 'Νέα προέλευση';
-	$lang['strrepsetmoved'] = 'Το αναπαραγόμενο σύνολο μετακινήθηκε.';
-	$lang['strrepsetmovedbad'] = 'Η μετακίνηση του αναπαραγόμενου συνόλου απέτυχε.';
-	$lang['strnewrepset'] = 'Νέο αναπαραγόμενο σύνολο';
-	$lang['strlock'] = 'Κλείδωμα';
-	$lang['strlocked'] = 'Κλειδώθηκε';
-	$lang['strunlock'] = 'Ξεκλείδωμα';
-	$lang['strconflockrepset'] = 'Να κλειδωθεί το αναπαραγόμενο σύνολο "%s"?';
-	$lang['strrepsetlocked'] = 'Το αναπαραγόμενο σύνολο κλειδώθηκε.';
-	$lang['strrepsetlockedbad'] = 'Το κλείδωμα του αναπαραγόμενου συνόλου απέτυχε.';
-	$lang['strconfunlockrepset'] = 'Να ξεκλειδωθεί το αναπαραγόμενο σύνολο "%s"?';
-	$lang['strrepsetunlocked'] = 'Το αναπαραγόμενο σύνολο ξεκλειδώθηκε.';
-	$lang['strrepsetunlockedbad'] = 'Το ξεκλείδωμα του αναπαραγόμενου συνόλου απέτυχε.';
-	$lang['strexecute'] = 'Εκτέλεση';
-	$lang['stronlyonnode'] = 'Μόνο στον κόμβο';
-	$lang['strddlscript'] = 'Σενάριο DDL';
-	$lang['strscriptneedsbody'] = 'Πρέπει να ορίσετε σενάριο προς εκτέλεση σε όλους τους κόμβους.';
-	$lang['strscriptexecuted'] = 'Το σενάριο DDL εκτελέστηκε.';
-	$lang['strscriptexecutedbad'] = 'Η εκτέλεση του σεναρίου DDL απέτυχε.';
-	$lang['strtabletriggerstoretain'] = 'Τα ακόλουθα εναύσματα ΔΕ θα απενεργοποιηθούν από το Slony:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Προσθήκη πίνακα';
-	$lang['strtableneedsuniquekey'] = 'Η προσθήκη πίνακα απαιτεί πρωτεύον ή μοναδικό κλειδί.';
-	$lang['strtableaddedtorepset'] = 'Ο πίνακας προστέθηκε στο αναπαραγόμενο σύνολο.';
-	$lang['strtableaddedtorepsetbad'] = 'Η προσθήκη πίνακα στο αναπαραγόμενο σύνολο απέτυχε.';
-	$lang['strconfremovetablefromrepset'] = 'Να διαγραφεί ο πίνακας "%s" από το αναπαραγόμενο σύνολο "%s"?';
-	$lang['strtableremovedfromrepset'] = 'Ο πίνακας διαγράφηκε από το αναπαραγόμενο σύνολο.';
-	$lang['strtableremovedfromrepsetbad'] = 'Η διαγραφή του πίνακα από το αναπαραγόμενο σύνολο απέτυχε.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Προσθήκη ακολουθίας';
-	$lang['strsequenceaddedtorepset'] = 'Η ακολουθία προστέθηκε στο αναπαραγόμενο σύνολο.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Η προσθήκη ακολουθίας στο αναπαραγόμενο σύνολο απέτυχε.';
-	$lang['strconfremovesequencefromrepset'] = 'Να διαγραφεί η ακολουθία "%s" από το αναπαραγόμενο σύνολο "%s"?';
-	$lang['strsequenceremovedfromrepset'] = 'Η ακολουθία διαγράφηκε από το αναπαραγόμενο σύνολο.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Η διαγραφή της ακολουθίας από το αναπαραγόμενο σύνολο απέτυχε.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Προεγγραφές';
-	$lang['strnosubscriptions'] = 'Δε βρέθηκαν προεγγραφές.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s στο %s:%s -- Είστε συνδεδεμένος ως "%s"';
 	$lang['strtimefmt'] = 'jS M, Y g:iA';
diff --git a/lang/hungarian.php b/lang/hungarian.php
index 84d436b1..19140d74 100644
--- a/lang/hungarian.php
+++ b/lang/hungarian.php
@@ -148,6 +148,7 @@
 	$lang['strstop'] = 'Leállít';
 	$lang['strgotoppage'] = 'vissza a tetejére';
 	$lang['strtheme'] = 'Téma';
+	$lang['strcluster']  =  'Fürt';
 	
 	// Admin
 	$lang['stradminondatabase'] = 'A következő adminisztratív feladatok %s adatbázis egészére vonatkoznak.';
@@ -801,119 +802,7 @@
 	$lang['strtablespacedroppedbad']  =  'Nem sikerült kidobni a táblahelyet.';
 	$lang['strtablespacealtered']  =  'Táblahely megváltoztatva.';
 	$lang['strtablespacealteredbad']  =  'Nem sikerült megváltoztatni a táblahelyet.';
-
-	// Slony clusters
-	$lang['strcluster']  =  'Fürt';
-	$lang['strnoclusters']  =  'Nincs fürt.';
-	$lang['strconfdropcluster']  =  'Biztosan töröljük „%s” fürtöt?';
-	$lang['strclusterdropped']  =  'Fürt törölve.';
-	$lang['strclusterdroppedbad']  =  'Nem sikerült törölni a fürtöt.';
-	$lang['strinitcluster']  =  'Fürtöt készít';
-	$lang['strclustercreated']  =  'Fürt kész.';
-	$lang['strclustercreatedbad']  =  'Nem sikerült fürtöt készíteni.';
-	$lang['strclusterneedsname']  =  'Nevet kell adnia a fürtnek.';
-	$lang['strclusterneedsnodeid']  =  'Azonosítót kell adnia a helyi csomópontnak.';
 	
-	// Slony nodes
-	$lang['strnodes']  =  'Csomópontok';
-	$lang['strnonodes']  =  'Nincs csomópont.';
-	$lang['strcreatenode']  =  'Csomópontot teremt';
-	$lang['strid']  =  'Az';
-	$lang['stractive']  =  'Aktív';
-	$lang['strnodecreated']  =  'Csomópont megteremtve.';
-	$lang['strnodecreatedbad']  =  'Nem sikerült csomópontot teremteni.';
-	$lang['strconfdropnode']  =  'Biztosan el akarja dobni „%s” csomópontot?';
-	$lang['strnodedropped']  =  'Csomópont eldobva.';
-	$lang['strnodedroppedbad']  =  'Nem sikerült eldobni a csomópontot.';
-	$lang['strfailover']  =  'Áthidal';
-	$lang['strnodefailedover']  =  'Végponti hiba áthidalva.';
-	$lang['strnodefailedoverbad']  =  'Nem sikerült áthidalni a végpont hibáját.';
-	$lang['strstatus']  =  'Állapot';	
-	$lang['strhealthy']  =  'Ép';
-	$lang['stroutofsync']  =  'Lemaradás';
-	$lang['strunknown']  =  'Ismeretlen';	
-	
-	// Slony paths	
-	$lang['strpaths']  =  'Ösvények';
-	$lang['strnopaths']  =  'Nincs ösvény.';
-	$lang['strcreatepath']  =  'Ösvényt teremt';
-	$lang['strnodename']  =  'Csomópont neve';
-	$lang['strnodeid']  =  'Csomópont-azonosító';
-	$lang['strconninfo']  =  'Csatlakozás tájékoztató';
-	$lang['strconnretry']  =  'Másodpercek a csatlakozás ismétléséig';
-	$lang['strpathneedsconninfo']  =  'Meg kell adnia a kapcsolati szöveget az ösvényhez.';
-	$lang['strpathneedsconnretry']  =  'Meg kell adnia a csatlakozás ismétléséig történő várakozás idejét másodpercekben.';
-	$lang['strpathcreated']  =  'Ösvény megteremtve.';
-	$lang['strpathcreatedbad']  =  'Nem sikerült ösvényt teremteni.';
-	$lang['strconfdroppath']  =  'Biztosan el akarja dobni „%s” ösvényt?';
-	$lang['strpathdropped']  =  'Ösvény eldobva.';
-	$lang['strpathdroppedbad']  =  'Nem sikerült az ösvényt eldobni.';
-
-	// Slony listens
-	$lang['strlistens']  =  'Figyelők';
-	$lang['strnolistens']  =  'Nincs figyelő.';
-	$lang['strcreatelisten']  =  'Figyelőt teremt';
-	$lang['strlistencreated']  =  'Figyelő megteremtve.';
-	$lang['strlistencreatedbad']  =  'Nem sikerült figyelőt teremteni.';
-	$lang['strconfdroplisten']  =  'Biztosan törölni akarja „%s” figyelőt?';
-	$lang['strlistendropped']  =  'Figyelő törölve.';
-	$lang['strlistendroppedbad']  =  'Nem sikerült törölni a figyelőt.';
-
-	// Slony replication sets
-	$lang['strrepsets']  =  'Másodlatok';
-	$lang['strnorepsets']  =  'Nincs másodlat.';
-	$lang['strcreaterepset']  =  'Másodlatot teremt';
-	$lang['strrepsetcreated']  =  'Másodlat megteremtve.';
-	$lang['strrepsetcreatedbad']  =  'Nem sikerült másodlatot teremteni.';
-	$lang['strconfdroprepset']  =  'Biztosan törölni akarja „%s” másodlatot?';
-	$lang['strrepsetdropped']  =  'Másodlat törölve.';
-	$lang['strrepsetdroppedbad']  =  'Nem sikerült törölni a másodlatot.';
-	$lang['strmerge']  =  'Összefésül';
-	$lang['strmergeinto']  =  'Összefésül ide';
-	$lang['strrepsetmerged']  =  'Másodlatok összefésülve.';
-	$lang['strrepsetmergedbad']  =  'Nem sikerült összefésülni a másodlatokat.';
-	$lang['strmove']  =  'Mozgat';
-	$lang['strneworigin']  =  'Új eredet';
-	$lang['strrepsetmoved']  =  'Másodlat mozgatva.';
-	$lang['strrepsetmovedbad']  =  'Nem sikerült elmozgatni a másodlatot.';
-	$lang['strnewrepset']  =  'Új másodlat';
-	$lang['strlock']  =  'Zárol';
-	$lang['strlocked']  =  'Zárolva';
-	$lang['strunlock']  =  'Kioldás';
-	$lang['strconflockrepset']  =  'Biztosan zárolni akarja „%s” másodlatot?';
-	$lang['strrepsetlocked']  =  'Másodlat zárolva.';
-	$lang['strrepsetlockedbad']  =  'Nem sikerült zárolni a másodlatot.';
-	$lang['strconfunlockrepset']  =  'Biztosan ki akarja oldani „%s” másodlatot?';
-	$lang['strrepsetunlocked']  =  'Másodlat kioldva.';
-	$lang['strrepsetunlockedbad']  =  'Nem sikerült kioldani a másodlatot.';
-	$lang['stronlyonnode']  =  'Csak helyben';
-	$lang['strddlscript']  =  'DDL-írás';
-	$lang['strscriptneedsbody']  =  'Meg kell adnia egy írást, amit minden helyen végrehajtanak.';
-	$lang['strscriptexecuted']  =  'Másodlati DDL-írás végrehajtva.';
-	$lang['strscriptexecutedbad']  =  'Nem sikerült végrehajtani a másodlati DDL-írást.';
-	$lang['strtabletriggerstoretain']  =  'A következő triggereket Slony NEM tiltja le:';
-
-	// Slony tables in replication sets
-	$lang['straddtable']  =  'Táblát felvesz';
-	$lang['strtableneedsuniquekey']  =  'Tábla felvételéhez elsődleges vagy egyedi kulcs kell.';
-	$lang['strtableaddedtorepset']  =  'Tábla felvéve a másodlatba.';
-	$lang['strtableaddedtorepsetbad']  =  'Nem sikerült felvenni a táblát a másodlatba.';
-	$lang['strconfremovetablefromrepset']  =  'Biztosan törölni akarja „%s” táblát „%s” másodlatból?';
-	$lang['strtableremovedfromrepset']  =  'Tábla törölve a másodlatból.';
-	$lang['strtableremovedfromrepsetbad']  =  'Nem sikerült törölni a táblát a másodlatból.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence']  =  'Sorozatot felvesz';
-	$lang['strsequenceaddedtorepset']  =  'Sorozat felvéve a másodlatba.';
-	$lang['strsequenceaddedtorepsetbad']  =  'Nem sikerült felvenni a sorozatot a másodlatba.';
-	$lang['strconfremovesequencefromrepset']  =  'Biztosan törölni akarja „%s” sorozatot „%s” másodlatból?';
-	$lang['strsequenceremovedfromrepset']  =  'Sorozat törölve a másodlatból.';
-	$lang['strsequenceremovedfromrepsetbad']  =  'Nem sikerült törölni a sorozatot a másodlatból.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions']  =  'Feliratkozások';
-	$lang['strnosubscriptions']  =  'Nincs feliratkozás.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s fut %s:%s címen — Ön „%s” néven jelentkezett be.';
 	$lang['strtimefmt'] = 'Y.m.d. H:i';
diff --git a/lang/italian.php b/lang/italian.php
index 84a5b54f..217151d6 100644
--- a/lang/italian.php
+++ b/lang/italian.php
@@ -423,6 +423,7 @@
 	$lang['strconfcluster'] = 'Clusterizzare "%s"?';
 	$lang['strclusteredgood'] = 'Clusterizzazione completata.';
 	$lang['strclusteredbad'] = 'Clusterizzazione fallita.';
+	$lang['strcluster'] = 'Cluster';
 
 	// Rules - Regole
 	$lang['strrules'] = 'Regole';
@@ -708,12 +709,6 @@
 	$lang['strtablespacealtered'] = 'Tablespace modificato.';
 	$lang['strtablespacealteredbad'] = 'Modifica del tablespace fallita.';
 
-	// Slony clusters - Cluster Slony
-	$lang['strcluster'] = 'Cluster';
-
-	// Slony nodes - Nodi Slony
-	$lang['strid'] = 'ID';
-
 	// Miscellaneous - Varie
 	$lang['strtopbar'] = '%s in esecuzione su %s:%s -- Utente "%s"';
 	$lang['strtimefmt'] = 'j M Y - g:iA';
diff --git a/lang/japanese.php b/lang/japanese.php
index 5ed0d58e..9c4ab55e 100644
--- a/lang/japanese.php
+++ b/lang/japanese.php
@@ -453,6 +453,7 @@ $lang['striscalled']  =  'Will increment last value before returning next value
 	$lang['strconfcluster'] = '本当に「%s」をクラスターにしますか?';
 	$lang['strclusteredgood'] = 'クラスター完了です。';
 	$lang['strclusteredbad'] = 'クラスターに失敗しました。';
+	$lang['strcluster']  =  'クラスター';
 
 	// Rules
 	$lang['strrules'] = 'ルール';
@@ -769,118 +770,6 @@ $lang['strtrusted'] = 'Trusted';
 	$lang['strtablespacealtered'] = 'テーブル空間を変更しました。';
 	$lang['strtablespacealteredbad'] = 'テーブル空間の変更に失敗しました。';
 
-	// Slony clusters
-	$lang['strcluster']  =  'クラスター';
-	$lang['strnoclusters']  =  'クラスターが見つかりません。';
-	$lang['strconfdropcluster']  =  '本当にクラスター「%s」を破棄しますか?';
-	$lang['strclusterdropped']  =  'クラスターを破棄しました。';
-	$lang['strclusterdroppedbad']  =  'クラスターの破棄に失敗しました。';
-	$lang['strinitcluster']  =  'クラスターを初期化する';
-	$lang['strclustercreated']  =  'クラスターを初期化しました。';
-	$lang['strclustercreatedbad']  =  'クラスターの初期化に失敗しました。';
-	$lang['strclusterneedsname']  =  'クラスターの名前を与える必要があります。';
-	$lang['strclusterneedsnodeid']  =  'ローカルノードの ID を与える必要があります。';
-	
-	// Slony nodes
-	$lang['strnodes']  =  'ノード';
-	$lang['strnonodes']  =  'ノードが見つかりません。';
-	$lang['strcreatenode']  =  'ノードを作成する';
-	$lang['strid']  =  'ID';
-	$lang['stractive']  =  'アクティブ';
-	$lang['strnodecreated']  =  'ノードを作成しました。';
-	$lang['strnodecreatedbad']  =  'ノードの作成に失敗しました。';
-	$lang['strconfdropnode']  =  '本当にノード「%s」を破棄しますか?';
-	$lang['strnodedropped']  =  'ノードを破棄しました。';
-	$lang['strnodedroppedbad']  =  'ノードの破棄に失敗しました。';
-	$lang['strfailover']  =  'フェイルオーバーする';
-	$lang['strnodefailedover']  =  'ノードをフェイルオーバーしました。';
-	$lang['strnodefailedoverbad']  =  'ノードのフェイルオーバーに失敗しました。';
-	$lang['strstatus']  =  '状態';
-$lang['strhealthy']  =  'Healthy';
-$lang['stroutofsync']  =  'Out of Sync';
-	$lang['strunknown']  =  '不明';	
-
-	// Slony paths	
-	$lang['strpaths']  =  'パス';
-	$lang['strnopaths']  =  'パスが見つかりません。';
-	$lang['strcreatepath']  =  'パスを作成する';
-	$lang['strnodename']  =  'ノード名';
-	$lang['strnodeid']  =  'ノード ID';
-	$lang['strconninfo']  =  '接続文字列';
-	$lang['strconnretry']  =  '接続の再実行までの秒数';
-	$lang['strpathneedsconninfo']  =  'パスの接続文字列を与える必要があります。';
-	$lang['strpathneedsconnretry']  =  '接続の再実行までの秒数を与える必要があります。';
-	$lang['strpathcreated']  =  'パスを作成しました。';
-	$lang['strpathcreatedbad']  =  'パスの作成に失敗しました。';
-	$lang['strconfdroppath']  =  '本当にパス「%s」を破棄しますか?';
-	$lang['strpathdropped']  =  'パスを破棄しました。';
-	$lang['strpathdroppedbad']  =  'パスの破棄に失敗しました。';
-
-	// Slony listens
-	$lang['strlistens']  =  'リッスン';
-	$lang['strnolistens']  =  'リッスンが見つかりません。';
-	$lang['strcreatelisten']  =  'リッスンを作成する';
-	$lang['strlistencreated']  =  'リッスンを作成しました。';
-	$lang['strlistencreatedbad']  =  'リッスンの作成に失敗しました。';
-	$lang['strconfdroplisten']  =  '本当にリッスン「%s」を破棄しますか?';
-	$lang['strlistendropped']  =  'リッスンを破棄しました。';
-	$lang['strlistendroppedbad']  =  'リッスンの破棄に失敗しました。';
-
-	// Slony replication sets
-	$lang['strrepsets']  =  'レプリケーションセット';
-	$lang['strnorepsets']  =  'レプリケーションセットが見つかりません。';
-	$lang['strcreaterepset']  =  'レプリケーションセットを作成する';
-	$lang['strrepsetcreated']  =  'レプリケーションセットを作成しました。';
-	$lang['strrepsetcreatedbad']  =  'レプリケーションセットの作成に失敗しました。';
-	$lang['strconfdroprepset']  =  '本当にレプリケーションセット「%s」を破棄しますか?';
-	$lang['strrepsetdropped']  =  'レプリケーションセットを破棄しました。';
-	$lang['strrepsetdroppedbad']  =  'レプリケーションセットの破棄に失敗しました。';
-	$lang['strmerge']  =  '統合する';
-	$lang['strmergeinto']  =  '統合先';
-	$lang['strrepsetmerged']  =  'レプリケーションセットを統合しました。';
-	$lang['strrepsetmergedbad']  =  'レプリケーションセットの統合に失敗しました。';
-	$lang['strmove']  =  '移動する';
-	$lang['strneworigin']  =  '新規オリジン';
-	$lang['strrepsetmoved']  =  'レプリケーションセットを移動しました。';
-	$lang['strrepsetmovedbad']  =  'レプリケーションセットの移動に失敗しました。';
-	$lang['strnewrepset']  =  '新規レプリケーションセット';
-	$lang['strlock']  =  'ロック';
-	$lang['strlocked']  =  'ロック済';
-	$lang['strunlock']  =  'ロック解除';
-	$lang['strconflockrepset']  =  '本当にレプリケーションセット「%s」をロックしますか?';
-	$lang['strrepsetlocked']  =  'レプリケーションセットをロックしました。';
-	$lang['strrepsetlockedbad']  =  'レプリケーションセットのロックに失敗しました。';
-	$lang['strconfunlockrepset']  =  '本当にレプリケーションセット「%s」のロックを解除しますか?';
-	$lang['strrepsetunlocked']  =  'レプリケーションセットを解除しました。';
-	$lang['strrepsetunlockedbad']  =  'レプリケーションセットの解除に失敗しました。';
-	$lang['stronlyonnode']  =  'ノードでのみ';
-	$lang['strddlscript']  =  'DDL スクリプト';
-	$lang['strscriptneedsbody']  =  'すべてのノード上で実行されるスクリプトを提供しなければなりません。';
-	$lang['strscriptexecuted']  =  'レプリケーションセットで DDL スクリプトを実行しました。';
-	$lang['strscriptexecutedbad']  =  'レプリケーションセットでの DDL スクリプトの実行に失敗しました。';
-	$lang['strtabletriggerstoretain']  =  '次のトリガーは Slony により無効にならないでしょう:';
-
-	// Slony tables in replication sets
-	$lang['straddtable']  =  'テーブルを追加する';
-	$lang['strtableneedsuniquekey']  =  '追加されるテーブルはプライマリかユニークキーを要求します。';
-	$lang['strtableaddedtorepset']  =  'レプリケーションセットにテーブルを追加しました。';
-	$lang['strtableaddedtorepsetbad']  =  'レプリケーションセットへのテーブル追加に失敗しました。';
-	$lang['strconfremovetablefromrepset']  =  '本当にレプリケーションセット「%s」からテーブル「%s」を削除しますか?';
-	$lang['strtableremovedfromrepset']  =  'レプリケーションセットからテーブルを削除しました。';
-	$lang['strtableremovedfromrepsetbad']  =  'レプリケーションセットからテーブルの削除に失敗しました。';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence']  =  'シーケンスを追加する';
-	$lang['strsequenceaddedtorepset']  =  'レプリケーションセットにシーケンスを追加しました。';
-	$lang['strsequenceaddedtorepsetbad']  =  'レプリケーションセットへのシーケンスの追加に失敗しました。';
-	$lang['strconfremovesequencefromrepset']  =  '本当にレプリケーションセット「%s」からシーケンス「%s」を削除しますか?';
-	$lang['strsequenceremovedfromrepset']  =  'レプリケーションセットからシーケンスを削除しました。';
-	$lang['strsequenceremovedfromrepsetbad']  =  'レプリケーションセットからシーケンスの削除に失敗しました。';
-
-	// Slony subscriptions
-	$lang['strsubscriptions']  =  'サブスクリプション';
-	$lang['strnosubscriptions']  =  'サブスクリプションが見つかりません。';
-
 	// Miscellaneous
 	$lang['strtopbar'] = 'サーバー %2$s のポート番号 %3$s で実行中の %1$s に接続中 -- ユーザー「%4$s」としてログイン中';
 	$lang['strtimefmt'] = 'Y 年 n 月 j 日 G:i';
@@ -976,6 +865,4 @@ $lang['strftsinit']  =  'Init';
 	$lang['strftstabconfigs']  =  '設定';
 	$lang['strftstabdicts']  =  '辞書';
 	$lang['strftstabparsers']  =  'パーサー';
-    
-    
 ?>
diff --git a/lang/lithuanian.php b/lang/lithuanian.php
index d8f47b10..f3c5504f 100644
--- a/lang/lithuanian.php
+++ b/lang/lithuanian.php
@@ -148,6 +148,7 @@ $lang['strctype'] = 'Character Type';//Simbolių(ženklų) tipas
 	$lang['strstop'] = 'Stabdyti';
 	$lang['strgotoppage'] = 'atgal į viršų';
 	$lang['strtheme'] = 'Apipavidalinimas';
+	$lang['strcluster'] = 'Klasteris';
 	
 	// Admin
 	$lang['stradminondatabase'] = 'Šios administracinės užduotys taikomos visai %s duomenų bazei.';
@@ -803,118 +804,6 @@ $lang['strtoastindex'] = 'TOAST Indeksas';
 	$lang['strtablespacealtered'] = 'Lentelių erdvė pakeista.';
 	$lang['strtablespacealteredbad'] = 'Nepavyko pakeisti lentelių erdvės.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Klasteris';
-	$lang['strnoclusters'] = 'Klasterių nerasta.';
-	$lang['strconfdropcluster'] = 'Ar tikrai norite šalinti klasterį "%s"?';
-	$lang['strclusterdropped'] = 'Klasteris pašalintas.';
-	$lang['strclusterdroppedbad'] = 'Nepavyko pašalinti klasterio.';
-	$lang['strinitcluster'] = 'Inicijuoti klasterį';
-	$lang['strclustercreated'] = 'Klasteris inicijuotas.';
-	$lang['strclustercreatedbad'] = 'Nepavyko inicijuoti klasterio.';
-	$lang['strclusterneedsname'] = 'Turite suteikti klasteriui pavadinimą.';
-	$lang['strclusterneedsnodeid'] = 'Turite nurodyti identifikatorių vietiniam mazgui.';
-
-	// Slony nodes
-	$lang['strnodes'] = 'Mazgai';
-	$lang['strnonodes'] = 'Mazgų nerasta.';
-	$lang['strcreatenode'] = 'Kurti mazgą';
-	$lang['strid'] = 'Identifikatorius';
-	$lang['stractive'] = 'Aktyvus';
-	$lang['strnodecreated'] = 'Mazgas sukurtas.';
-	$lang['strnodecreatedbad'] = 'Nepavyko sukurti mazgo.';
-	$lang['strconfdropnode'] = 'Ar tikrai norite šalinti mazgą "%s"?';
-	$lang['strnodedropped'] = 'Mazgas pašalintas.';
-	$lang['strnodedroppedbad'] = 'Nepavyko pašalinti mazgo.';
-	$lang['strfailover'] = 'Perjungimas';
-	$lang['strnodefailedover'] = 'Mazgas perjungtas.';
-	$lang['strnodefailedoverbad'] = 'Nepavyko perjungti mazgo.';
-	$lang['strstatus'] = 'Būsena';	
-	$lang['strhealthy'] = 'Stabili';
-	$lang['stroutofsync'] = 'Asinchroninė';
-	$lang['strunknown'] = 'Nežinoma';	
-
-	// Slony paths	
-	$lang['strpaths'] = 'Keliai';
-	$lang['strnopaths'] = 'Kelių nerasta.';
-	$lang['strcreatepath'] = 'Kurti kelią';
-	$lang['strnodename'] = 'Mazgo pavadinimas';
-	$lang['strnodeid'] = 'Mazgo identifikatorius';
-	$lang['strconninfo'] = 'Prisijungimo eilutė';
-	$lang['strconnretry'] = 'Sekundės tarp bandymų prisijungti';
-	$lang['strpathneedsconninfo'] = 'Turite pateikti kelio prisijungimo eilutę.';
-	$lang['strpathneedsconnretry'] = 'Turite nurodyti kiek sekundžių laukti prieš bandydant prisijungti iš naujo.';
-	$lang['strpathcreated'] = 'Kelias sukurtas.';
-	$lang['strpathcreatedbad'] = 'Nepavyko sukurti kelio.';
-	$lang['strconfdroppath'] = 'Ar tikrai norite šalinti kelią "%s"?';
-	$lang['strpathdropped'] = 'Kelias pašalintas.';
-	$lang['strpathdroppedbad'] = 'Nepavyko pašalinti kelio.';
-
-	// Slony listens
-$lang['strlistens'] = 'Listens';
-$lang['strnolistens'] = 'No listens found.';
-$lang['strcreatelisten'] = 'Create listen';
-$lang['strlistencreated'] = 'Listen created.';
-$lang['strlistencreatedbad'] = 'Listen creation failed.';
-$lang['strconfdroplisten'] = 'Are you sure you want to drop listen "%s"?';
-$lang['strlistendropped'] = 'Listen dropped.';
-$lang['strlistendroppedbad'] = 'Listen drop failed.';
-
-	// Slony replication sets
-$lang['strrepsets'] = 'Replication sets';
-$lang['strnorepsets'] = 'No replication sets found.';
-$lang['strcreaterepset'] = 'Create replication set';
-$lang['strrepsetcreated'] = 'Replication set created.';
-$lang['strrepsetcreatedbad'] = 'Replication set creation failed.';
-$lang['strconfdroprepset'] = 'Are you sure you want to drop replication set "%s"?';
-$lang['strrepsetdropped'] = 'Replication set dropped.';
-$lang['strrepsetdroppedbad'] = 'Replication set drop failed.';
-	$lang['strmerge'] = 'Sulieti';
-	$lang['strmergeinto'] = 'Įlieti į';
-$lang['strrepsetmerged'] = 'Replication sets merged.';
-$lang['strrepsetmergedbad'] = 'Replication sets merge failed.';
-	$lang['strmove'] = 'Perkelti';
-$lang['strneworigin'] = 'New origin';
-$lang['strrepsetmoved'] = 'Replication set moved.';
-$lang['strrepsetmovedbad'] = 'Replication set move failed.';
-$lang['strnewrepset'] = 'New replication set';
-	$lang['strlock'] = 'Blokuoti';
-	$lang['strlocked'] = 'Užblokuota';
-	$lang['strunlock'] = 'Neblokuoti';
-$lang['strconflockrepset'] = 'Are you sure you want to lock replication set "%s"?';
-$lang['strrepsetlocked'] = 'Replication set locked.';
-$lang['strrepsetlockedbad'] = 'Replication set lock failed.';
-$lang['strconfunlockrepset'] = 'Are you sure you want to unlock replication set "%s"?';
-$lang['strrepsetunlocked'] = 'Replication set unlocked.';
-$lang['strrepsetunlockedbad'] = 'Replication set unlock failed.';
-$lang['stronlyonnode'] = 'Only on node';
-$lang['strddlscript'] = 'DDL script';
-$lang['strscriptneedsbody'] = 'You must supply a script to be executed on all nodes.';
-$lang['strscriptexecuted'] = 'Replication set DDL script executed.';
-$lang['strscriptexecutedbad'] = 'Failed executing replication set DDL script.';
-$lang['strtabletriggerstoretain'] = 'The following triggers will NOT be disabled by Slony:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Pridėti lentelę';
-	$lang['strtableneedsuniquekey'] = 'Pridedama lentelė turi turėti pirminį arba unikalų raktą.';
-$lang['strtableaddedtorepset'] = 'Table added to replication set.';
-$lang['strtableaddedtorepsetbad'] = 'Failed adding table to replication set.';
-$lang['strconfremovetablefromrepset'] = 'Are you sure you want to drop the table "%s" from replication set "%s"?';
-$lang['strtableremovedfromrepset'] = 'Table dropped from replication set.';
-$lang['strtableremovedfromrepsetbad'] = 'Failed to drop table from replication set.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Pridėti seką';
-$lang['strsequenceaddedtorepset'] = 'Sequence added to replication set.';
-$lang['strsequenceaddedtorepsetbad'] = 'Failed adding sequence to replication set.';
-$lang['strconfremovesequencefromrepset'] = 'Are you sure you want to drop the sequence "%s" from replication set "%s"?';
-$lang['strsequenceremovedfromrepset'] = 'Sequence dropped from replication set.';
-$lang['strsequenceremovedfromrepsetbad'] = 'Failed to drop sequence from replication set.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Prenumeratos';
-	$lang['strnosubscriptions'] = 'Prenumeratų nerasta.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s veikia %s:%s -- Jūs esate prisijungęs kaip "%s"';
 	$lang['strtimefmt'] = 'j M Y - g:iA';
diff --git a/lang/polish.php b/lang/polish.php
index a30e8dec..51e942fa 100644
--- a/lang/polish.php
+++ b/lang/polish.php
@@ -135,6 +135,7 @@
 	$lang['strfile'] = 'Plik';
 	$lang['strfileimported'] = 'Plik został zaimportowany.';
 	$lang['strtrycred'] = 'Użyj tych parametrów dla wszystkich serwerów';
+	$lang['strexecute'] = 'Wykonaj';
 
 	// Database Sizes
 	$lang['strsize'] = 'Rozmiar';
@@ -411,6 +412,7 @@
 	$lang['strconfcluster'] = 'Czy na pewno chcesz zklastrować "%s"?';
 	$lang['strclusteredgood'] = 'Klastrowanie zostało zakończone.';
 	$lang['strclusteredbad'] = 'Próba klastrowania się nie powiodła.';
+	$lang['strcluster'] = 'Klaster';
 
 	// Rules
 	$lang['strrules'] = 'Reguły';
@@ -718,119 +720,6 @@ $lang['straggrneedsstype']  =  'You must specify the data type for the aggregate
 	$lang['strtablespacealtered'] = 'Przestrzeń tabel została zmieniona.';
 	$lang['strtablespacealteredbad'] = 'Próba modyfikacji przestrzeni tabel się nie powiodła.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Klaster';
-	$lang['strnoclusters'] = 'Nie znaleziono klastrów.';
-	$lang['strconfdropcluster'] = 'Czy na pewno chcesz usunąć klaster "%s"?';
-	$lang['strclusterdropped'] = 'Klaster został usunięty.';
-	$lang['strclusterdroppedbad'] = 'Próba usunięcia klastra się nie powiodła.';
-	$lang['strinitcluster'] = 'Utwórz klaster';	
-	$lang['strclustercreated'] = 'Klaster został utworzony.';
-	$lang['strclustercreatedbad'] = 'Próba utworzenia klastra się nie powiodła.';
-	$lang['strclusterneedsname'] = 'Musisz podać nazwę klastra.';
-	$lang['strclusterneedsnodeid'] = 'Musisz podać identyfikator lokalnego węzła.';
-	
-	// Slony nodes
-	$lang['strnodes'] = 'Węzły';
-	$lang['strnonodes'] = 'Nie znaleziono węzłów.';
-	$lang['strcreatenode'] = 'Utwórz węzeł';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = 'Aktywny';
-	$lang['strnodecreated'] = 'Węzeł został utworzony.';
-	$lang['strnodecreatedbad'] = 'Próba utworzenia węzła się nie powiodła.';
-	$lang['strconfdropnode'] = 'Czy na pewno chcesz usunąć węzeł "%s"?';
-	$lang['strnodedropped'] = 'Węzeł został usunięty.';
-	$lang['strnodedroppedbad'] = 'Próba usunięcia węzła się nie powiodła.';
-	$lang['strfailover'] = 'Przełączenie awaryjne';
-	$lang['strnodefailedover'] = 'Węzeł został przełączony awaryjnie.';
-	$lang['strnodefailedoverbad'] = 'Próba awaryjnego przełączenia węzła się nie powiodła.';
-	$lang['strstatus']  =  'Stan';	
-	$lang['strhealthy']  =  'Poprawny';
-	$lang['stroutofsync']  =  'Niezsynchronizowany';
-	$lang['strunknown']  =  'Nieznany';	
-
-	
-	// Slony paths	
-	$lang['strpaths'] = 'Ścieżki';
-	$lang['strnopaths'] = 'Nie znaleziono ścieżek.';
-	$lang['strcreatepath'] = 'Utwórz ścieżkę';
-	$lang['strnodename'] = 'Nazwa węzła';
-	$lang['strnodeid'] = 'Identyfikator węzła';
-	$lang['strconninfo'] = 'Parametry połączenia';
-	$lang['strconnretry'] = 'Czas przed próbą ponownego połączenia';
-	$lang['strpathneedsconninfo'] = 'Musisz podać parametry połączenia.';
-	$lang['strpathneedsconnretry'] = 'Musisz określić ilość sekund, którą należy odczekać przed ponowieniem połączenia.';
-	$lang['strpathcreated'] = 'Ścieżka została utworzona.';
-	$lang['strpathcreatedbad'] = 'Próba utworzenia ścieżki się nie powiodła.';
-	$lang['strconfdroppath'] = 'Czy na pewno chcesz usunąć ścieżkę "%s"?';
-	$lang['strpathdropped'] = 'Ścieżka została usunięta.';
-	$lang['strpathdroppedbad'] = 'Próba usunięcia ścieżki się nie powiodła.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Nasłuchy';
-	$lang['strnolistens'] = 'Nie znaleziono nasłuchów.';
-	$lang['strcreatelisten'] = 'Utwórz nasłuch';
-	$lang['strlistencreated'] = 'Nasłuch został utworzony.';
-	$lang['strlistencreatedbad'] = 'Próba usunięcia nasłuchu się nie powiodła.';
-	$lang['strconfdroplisten'] = 'Czy na pewno chcesz usunąć nasłuch "%s"?';
-	$lang['strlistendropped'] = 'Nasłuch został usunięty.';
-	$lang['strlistendroppedbad'] = 'Próba usunięcia nasłuchu się nie powiodła.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Zbiory replikacji';
-	$lang['strnorepsets'] = 'Nie znaleziono zbiorów replikacji.';
-	$lang['strcreaterepset'] = 'Utwórz zbiór replikacji';
-	$lang['strrepsetcreated'] = 'Zbiór replikacji został utworzony.';
-	$lang['strrepsetcreatedbad'] = 'Próba utworzenia zbioru replikacji się nie powiodła.';
-	$lang['strconfdroprepset'] = 'Czy na pewno chcesz usunąć zbiór replikacji "%s"?';
-	$lang['strrepsetdropped'] = 'Zbiór replikacji został usunięty.';
-	$lang['strrepsetdroppedbad'] = 'Próba usunięcia zbioru replikacji się nie powiodła.';
-	$lang['strmerge'] = 'Połącz';
-	$lang['strmergeinto'] = 'Połącz w';
-	$lang['strrepsetmerged'] = 'Zbiory replikacji zostały połączone.';
-	$lang['strrepsetmergedbad'] = 'Próba połączenia zbiorów replikacji się nie powiodła.';
-	$lang['strmove'] = 'Przenieś';
-	$lang['strneworigin'] = 'Nowe położenie';
-	$lang['strrepsetmoved'] = 'Zbiór replikacji został przeniesiony.';
-	$lang['strrepsetmovedbad'] = 'Próba przeniesienia zbioru replikacji się nie powiodła.';
-	$lang['strnewrepset'] = 'Nowy zbiór replikacji';
-	$lang['strlock'] = 'Zablokuj';
-	$lang['strlocked'] = 'Zablokowany';
-	$lang['strunlock'] = 'Odblokuj';
-	$lang['strconflockrepset'] = 'Czy na pewno chcesz zablokować zbiór replikacji "%s"?';
-	$lang['strrepsetlocked'] = 'Zbiór replikacji został zablokowany.';
-	$lang['strrepsetlockedbad'] = 'Próba zablokowania zbioru replikacji się nie powiodła.';
-	$lang['strconfunlockrepset'] = 'Czy na pewno chcesz odblokować zbiór replikacji "%s"?';
-	$lang['strrepsetunlocked'] = 'Zbiór replikacji został odblokowany.';
-	$lang['strrepsetunlockedbad'] = 'Próba odblokowania zbioru replikacji się nie powiodła.';
-	$lang['strexecute'] = 'Wykonaj';
-	$lang['stronlyonnode'] = 'Tylko w węźle';
-	$lang['strddlscript'] = 'Skrypt DDL';
-	$lang['strscriptneedsbody'] = 'Musisz podać skrypt, który należy wykonać na wszystkich węzłach.';
-	$lang['strscriptexecuted'] = 'Skrypt DDL został wykonany w zbiorze replikacji.';
-	$lang['strscriptexecutedbad'] = 'Próba wykonania skryptu DDL w zbiorze replikacji się nie powiodła.';
-	$lang['strtabletriggerstoretain'] = 'Następujące wyzwalacze NIE zostaną wyłączone przez Slony:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Dodaj tabelę';
-	$lang['strtableneedsuniquekey'] = 'Dodawana tabela musi mieć klucz główny lub unikatowy.';
-	$lang['strtableaddedtorepset'] = 'Tabela została dodana do zbioru replikacji.';
-	$lang['strtableaddedtorepsetbad'] = 'Próba dodania tabeli do zbioru replikacji się nie powiodła.';
-	$lang['strconfremovetablefromrepset'] = 'Czy na pewno chcesz usunąć tabelę "%s" ze zbioru replikacji "%s"?';
-	$lang['strtableremovedfromrepset'] = 'Tabela została usunięta ze zbioru replikacji.';
-	$lang['strtableremovedfromrepsetbad'] = 'Próba usunięcia tabeli ze zbioru replikacji się nie powiodła.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Dodaj sekwencję';
-	$lang['strsequenceaddedtorepset'] = 'Sekwencja została dodana do zbioru replikacji.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Próba dodania sekwencji do zbioru replikacji się nie powiodła.';
-	$lang['strconfremovesequencefromrepset'] = 'Czy na pewno chcesz usunąć sekwencję "%s" ze zbioru replikacji "%s"?';
-	$lang['strsequenceremovedfromrepset'] = 'Sekwencja została usunięta ze zbioru replikacji.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Próba usunięcia sekwencji ze zbioru replikacji się nie powiodła.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Subskrypcje';
-	$lang['strnosubscriptions'] = 'Nie znaleziono subskrypcji.';
 
 	// Miscellaneous
 	$lang['strtopbar'] = '%s uruchomiony na %s:%s -- Jesteś zalogowany jako "%s"';
diff --git a/lang/portuguese-br.php b/lang/portuguese-br.php
index 40c512c6..5f8e77cc 100644
--- a/lang/portuguese-br.php
+++ b/lang/portuguese-br.php
@@ -487,6 +487,7 @@
 	$lang['strconfcluster'] = 'Você têm certeza que deseja clusterizar "%s"?';
 	$lang['strclusteredgood'] = 'Clusterização completa.';
 	$lang['strclusteredbad'] = 'Falha ao clusterizar.';
+	$lang['strcluster'] = 'Cluster';
 	$lang['strconcurrently'] = 'Simultaneamente';
 	$lang['strnoclusteravailable'] = 'Tabela não clusterizada em um índice.';
 
@@ -803,118 +804,6 @@
 	$lang['strtablespacealtered'] = 'Tablespace alterado.';
 	$lang['strtablespacealteredbad'] = 'Falha ao alterar o tablespace.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Cluster';
-	$lang['strnoclusters'] = 'Nenhum cluster encontrado.';
-	$lang['strconfdropcluster'] = 'Você têm certeza que deseja deletar o cluster "%s"?';
-	$lang['strclusterdropped'] = 'Cluster deletado.';
-	$lang['strclusterdroppedbad'] = 'Falha ao deletar o cluster.';
-	$lang['strinitcluster'] = 'Inicializar cluster';
-	$lang['strclustercreated'] = 'Cluster inicializado.';
-	$lang['strclustercreatedbad'] = 'Falha ao inicializar cluster.';
-	$lang['strclusterneedsname'] = 'Você deve informar um nome para o cluster.';
-	$lang['strclusterneedsnodeid'] = 'Você deve informar uma ID para o nodo local.';
-
-	// Slony nodes
-	$lang['strnodes'] = 'Nodos';
-	$lang['strnonodes'] = 'Nenhum nodo encontrado.';
-	$lang['strcreatenode'] = 'Criar nodo';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = 'Ativo';
-	$lang['strnodecreated'] = 'Nodo criado.';
-	$lang['strnodecreatedbad'] = 'Falha ao criar nodo.';
-	$lang['strconfdropnode'] = 'Você têm certeza que deseja deletar o nodo "%s"?';
-	$lang['strnodedropped'] = 'Nodo deletado.';
-	$lang['strnodedroppedbad'] = 'Falha ao deletar o nodo.';
-	$lang['strfailover'] = 'Failover';
-	$lang['strnodefailedover'] = 'Nodo failed over.';
-	$lang['strnodefailedoverbad'] = 'Falha de failover sobre o nodo.';
-	$lang['strstatus'] = 'Estado';	
-	$lang['strhealthy'] = 'Saudável';
-	$lang['stroutofsync'] = 'Fora de sinc';
-	$lang['strunknown'] = 'Desconhecido';	
-
-	// Slony paths	
-	$lang['strpaths'] = 'Diretórios';
-	$lang['strnopaths'] = 'Nenhum diretório encontrado.';
-	$lang['strcreatepath'] = 'Criar diretório';
-	$lang['strnodename'] = 'Nome do nodo';
-	$lang['strnodeid'] = 'ID do nodo';
-	$lang['strconninfo'] = 'String de conexão';
-	$lang['strconnretry'] = 'Segundos antes de tentar reconectar';
-	$lang['strpathneedsconninfo'] = 'Você deve informar uma string de conexão para o diretório.';
-	$lang['strpathneedsconnretry'] = 'Você deve informar um número de segundos a esperar antes de tentar reconectar.';
-	$lang['strpathcreated'] = 'Diretório criado.';
-	$lang['strpathcreatedbad'] = 'Falha ao criar o diretório.';
-	$lang['strconfdroppath'] = 'Você têm certeza que deseja deletar o diretório "%s"?';
-	$lang['strpathdropped'] = 'Diretório deletado.';
-	$lang['strpathdroppedbad'] = 'Falha ao deletar o diretório.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Escutas';
-	$lang['strnolistens'] = 'Nenhuma escuta encontrada.';
-	$lang['strcreatelisten'] = 'Criar escuta';
-	$lang['strlistencreated'] = 'Escuta criada.';
-	$lang['strlistencreatedbad'] = 'Falha ao criar a escuta.';
-	$lang['strconfdroplisten'] = 'Você têm certeza que deseja deletar a escuta "%s"?';
-	$lang['strlistendropped'] = 'Escuta deletada.';
-	$lang['strlistendroppedbad'] = 'Falha ao deletar a escuta.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Conjuntos de replicação';
-	$lang['strnorepsets'] = 'Nenhum conjunto de replicação encontrado.';
-	$lang['strcreaterepset'] = 'Criar conjunto de replicação';
-	$lang['strrepsetcreated'] = 'Conjunto de replicação criado.';
-	$lang['strrepsetcreatedbad'] = 'Falha ao criar o conjunto de replicação.';
-	$lang['strconfdroprepset'] = 'Você têm certeza que deseja deletar o conjunto de replicação "%s"?';
-	$lang['strrepsetdropped'] = 'Conjunto de replicação deletado.';
-	$lang['strrepsetdroppedbad'] = 'Falha ao deletar o conjunto de replicação.';
-	$lang['strmerge'] = 'Fundir';
-	$lang['strmergeinto'] = 'Fundir em';
-	$lang['strrepsetmerged'] = 'Conjuntos de replicação fundidos.';
-	$lang['strrepsetmergedbad'] = 'Falha ao fundir os conjuntos de replicação.';
-	$lang['strmove'] = 'Mover';
-	$lang['strneworigin'] = 'Nova origem';
-	$lang['strrepsetmoved'] = 'Conjunto de replicação movido.';
-	$lang['strrepsetmovedbad'] = 'Falha ao mover o conjunto de replicação.';
-	$lang['strnewrepset'] = 'Novo conjunto de replicação';
-	$lang['strlock'] = 'Trava';
-	$lang['strlocked'] = 'Travado';
-	$lang['strunlock'] = 'Destravado';
-	$lang['strconflockrepset'] = 'Você têm certeza que deseja travar o conjunto de replicação "%s"?';
-	$lang['strrepsetlocked'] = 'Conjunto de replicação travado.';
-	$lang['strrepsetlockedbad'] = 'Falha ao travar o conjunto de replicação.';
-	$lang['strconfunlockrepset'] = 'Você têm certeza que deseja destravar o conjunto de replicação "%s"?';
-	$lang['strrepsetunlocked'] = 'Conjunto de replicação destravado.';
-	$lang['strrepsetunlockedbad'] = 'Falha ao destravar o conjunto de replicação.';
-	$lang['stronlyonnode'] = 'Somente sobre o nodo';
-	$lang['strddlscript'] = 'Script DDL';
-	$lang['strscriptneedsbody'] = 'Você deve fornecer um script para ser executado sobre todos os nodos.';
-	$lang['strscriptexecuted'] = 'Script DDL executado sobre o conjunto de replicação.';
-	$lang['strscriptexecutedbad'] = 'Falha ao executar o script DDL sobre o conjunto de replicação.';
-	$lang['strtabletriggerstoretain'] = 'Os seguintes gatilhos NÃO serão desativados pelo Slony:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Adicionar Tabela';
-	$lang['strtableneedsuniquekey'] = 'Tabela a ser adicionada requer uma chave primária ou única.';
-	$lang['strtableaddedtorepset'] = 'Tabela adicionada ao conjunto de replicação.';
-	$lang['strtableaddedtorepsetbad'] = 'Falha ao adicionar a tabela no conjunto de replicação.';
-	$lang['strconfremovetablefromrepset'] = 'Você têm certeza que deseja deletar a tabela "%s" do conjunto de replicação "%s"?';
-	$lang['strtableremovedfromrepset'] = 'Tabela deletada do conjunto de replicação.';
-	$lang['strtableremovedfromrepsetbad'] = 'Falha ao deletar a tabela do conjunto de replicação.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Adicionar seqüência';
-	$lang['strsequenceaddedtorepset'] = 'Seqüência adicionada ao conjunto de replicação.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Falha ao adicionar a seqüência no conjunto de replicação.';
-	$lang['strconfremovesequencefromrepset'] = 'Você têm certeza que deseja deletar a seqüência "%s" do conjunto de replicação "%s"?';
-	$lang['strsequenceremovedfromrepset'] = 'Seqüência deletada do conjunto de replicação.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Falha ao deletar a seqüência do conjunto de replicação.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Subscrições';
-	$lang['strnosubscriptions'] = 'Nenhuma subscrição encontrada.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s rodando em %s:%s -- Você está logado como usuário "%s"';
 	$lang['strtimefmt'] = 'jS M, Y g:iA';
diff --git a/lang/romanian.php b/lang/romanian.php
index eb8c15f2..8248f6c8 100644
--- a/lang/romanian.php
+++ b/lang/romanian.php
@@ -132,6 +132,7 @@
 	$lang['strfile'] = 'Fişier';
 	$lang['strfileimported'] = 'Fişier importat';
 	$lang['strtrycred'] = 'Folosiţi aceste acreditări pentru toate serverele';
+	$lang['strexecute'] = 'Executare';
 
 	// Database sizes
 	$lang['strsize'] = 'Dimensiune';
@@ -420,6 +421,7 @@
 	$lang['strconfcluster'] = 'Sigur grupaţi "%s"?';
 	$lang['strclusteredgood'] = 'Grupare completă.';
 	$lang['strclusteredbad'] = 'Grupare eşuată.';
+	$lang['strcluster'] = 'Grupare';
 
 	// Rules
 	$lang['strrules'] = 'Reguli';
@@ -726,119 +728,6 @@
 	$lang['strtablespacealtered'] = 'Spaţiu de tabele modificat.';
 	$lang['strtablespacealteredbad'] = 'Modificare şpaţiu de tabele eşuată.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Grupare';
-	$lang['strnoclusters'] = 'Nici o grupare găsită.';
-	$lang['strconfdropcluster'] = 'Sigur ştergeţi gruparea "%s"?';
-	$lang['strclusterdropped'] = 'Grupare ştearsă.';
-	$lang['strclusterdroppedbad'] = 'Ştergere grupare eşuată.';
-	$lang['strinitcluster'] = 'Iniţializare grupare';
-	$lang['strclustercreated'] = 'Grupare iniţializată.';
-	$lang['strclustercreatedbad'] = 'Iniţializare grupare eşuată.';
-	$lang['strclusterneedsname'] = 'Trebuie să daţi un nume grupării.';
-	$lang['strclusterneedsnodeid'] = 'Trebuie să daţi un identificator nodului local.';
-
-	// Slony nodes
-	$lang['strnodes'] = 'Noduri';
-	$lang['strnonodes'] = 'Nici un nod găsit.';
-	$lang['strcreatenode'] = 'Creare nod';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = 'Activ(ă)';
-	$lang['strnodecreated'] = 'Nod creat.';
-	$lang['strnodecreatedbad'] = 'Creare nod eşuată.';
-	$lang['strconfdropnode'] = 'Sigur ştergeţi nodul "%s"?';
-	$lang['strnodedropped'] = 'Nod şters.';
-	$lang['strnodedroppedbad'] = 'Ştergere nod eşuată';
-	$lang['strfailover'] = 'Failover';
-	$lang['strnodefailedover'] = 'Node failed over.';
-	$lang['strnodefailedoverbad'] = 'Node failover failed.';
-	$lang['strstatus'] = 'Stare';
-	$lang['strhealthy'] = 'Intact';
-	$lang['stroutofsync'] = 'Desincronizat';
-	$lang['strunknown'] = 'Necunoscut';
-
-	// Slony paths
-	$lang['strpaths'] = 'Căi';
-	$lang['strnopaths'] = 'Nici o cale găsită.';
-	$lang['strcreatepath'] = 'Creare cale';
-	$lang['strnodename'] = 'Nume nod';
-	$lang['strnodeid'] = 'ID nod';
-	$lang['strconninfo'] = 'Şir pentru conectare';
-	$lang['strconnretry'] = 'Secunde până la o nouă încercare de conectare';
-	$lang['strpathneedsconninfo'] = 'Trebuie să daţi un şir de conectare pentru cale.';
-	$lang['strpathneedsconnretry'] = 'Trebuie să daţi numărul de secunde până la o nouă încercare de conectare.';
-	$lang['strpathcreated'] = 'Cale creată.';
-	$lang['strpathcreatedbad'] = 'Creare cale eşuată.';
-	$lang['strconfdroppath'] = 'Sigur ştergeţi calea "%s"?';
-	$lang['strpathdropped'] = 'Cale ştearsă.';
-	$lang['strpathdroppedbad'] = 'Ştergere cale eşuată.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Ascultări';
-	$lang['strnolistens'] = 'Nici o ascultare găsită.';
-	$lang['strcreatelisten'] = 'Creare ascultare';
-	$lang['strlistencreated'] = 'Ascultare creată.';
-	$lang['strlistencreatedbad'] = 'Creare ascultare eşuată.';
-	$lang['strconfdroplisten'] = 'Sigur ştergeţi ascultarea "%s"?';
-	$lang['strlistendropped'] = 'Ascultare ştearsă.';
-	$lang['strlistendroppedbad'] = 'Ştergere ascultare eşuată.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Seturi de replicare';
-	$lang['strnorepsets'] = 'Nici un set de replicare găsit.';
-	$lang['strcreaterepset'] = 'Creare set de replicare';
-	$lang['strrepsetcreated'] = 'Set de replicare creat';
-	$lang['strrepsetcreatedbad'] = 'Creare set de replicare eşuată';
-	$lang['strconfdroprepset'] = 'Sigur ştergeţi setul de replicare "%s"?';
-	$lang['strrepsetdropped'] = 'Set de replicare şters';
-	$lang['strrepsetdroppedbad'] = 'Ştergere set de replicare eşuată.';
-	$lang['strmerge'] = 'Contopire';
-	$lang['strmergeinto'] = 'Contopire în';
-	$lang['strrepsetmerged'] = 'Seturi de replicare contopite';
-	$lang['strrepsetmergedbad'] = 'Contopire seturi de replicare eşuată.';
-	$lang['strmove'] = 'Mutare';
-	$lang['strneworigin'] = 'Origine nouă';
-	$lang['strrepsetmoved'] = 'Set de replicare mutat';
-	$lang['strrepsetmovedbad'] = 'Mutare set de replicare eşuată.';
-	$lang['strnewrepset'] = 'Set de replicare nou';
-	$lang['strlock'] = 'Blocare';
-	$lang['strlocked'] = 'Blocat';
-	$lang['strunlock'] = 'Deblocare';
-	$lang['strconflockrepset'] = 'Siguri blocaţi setul de replicare "%s"?';
-	$lang['strrepsetlocked'] = 'Set de replicare blocat';
-	$lang['strrepsetlockedbad'] = 'Blocare set de replicare eşuată.';
-	$lang['strconfunlockrepset'] = 'Sigur deblocaţi setul de replicare "%s"?';
-	$lang['strrepsetunlocked'] = 'Set de replicare deblocat';
-	$lang['strrepsetunlockedbad'] = 'Deblocare set de replicare eşuată.';
-	$lang['strexecute'] = 'Executare';
-	$lang['stronlyonnode'] = 'Numai pentru nodul';
-	$lang['strddlscript'] = 'Script DDL';
-	$lang['strscriptneedsbody'] = 'Trebuie să furnizaţi un script care să fie executat pentru toate nodurile.';
-	$lang['strscriptexecuted'] = 'Scriptul DDL pentru setul de replicare a fost executat.';
-	$lang['strscriptexecutedbad'] = 'Executare script DDL pentru setul de replicare eşuată.';
-	$lang['strtabletriggerstoretain'] = 'Următoarele declanşatoare NU vor fi dezactivate de Slony:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Adăugare tabelă';
-	$lang['strtableneedsuniquekey'] = 'Tabela adăugată necesită o cheie primară sau unică.';
-	$lang['strtableaddedtorepset'] = 'Tabelă adăugată setului de replicare.';
-	$lang['strtableaddedtorepsetbad'] = 'Adăugare tabelă la setul de replicare eşuată.';
-	$lang['strconfremovetablefromrepset'] = 'Sigur eliminaţi tabela "%s" din setul de replicare "%s"?';
-	$lang['strtableremovedfromrepset'] = 'Tabelă eliminată din setul de replicare.';
-	$lang['strtableremovedfromrepsetbad'] = 'Eliminare tabelă din setul de replicare eşuată.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Adăugare secvenţă';
-	$lang['strsequenceaddedtorepset'] = 'Secvenţă adăugată setului de replicare.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Adăugare secvenţă la setul de replicare eşuată.';
-	$lang['strconfremovesequencefromrepset'] = 'Sigur eliminaţi secvenţa "%s" din setul de replicare "%s"?';
-	$lang['strsequenceremovedfromrepset'] = 'Secvenţă eliminată din setul de replicare.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Eliminare secvenţă din setul de replicare eşuată.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Subscriere';
-	$lang['strnosubscriptions'] = 'Nici o subscriere găsită.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s rulând pe %s:%s -- Sunteţi autentificat ca utilizator "%s"';
 	$lang['strtimefmt'] = 'jS M, Y g:iA';
diff --git a/lang/russian-utf8.php b/lang/russian-utf8.php
index f04970bb..ee6af314 100644
--- a/lang/russian-utf8.php
+++ b/lang/russian-utf8.php
@@ -148,6 +148,7 @@
 	$lang['strstop'] = 'Остановить автоматическое обновление';
 	$lang['strgotoppage'] = 'вверх';
 	$lang['strtheme'] = 'Тема';
+	$lang['strcluster'] = 'Кластер';
 	
 	// Admin
 	$lang['stradminondatabase'] = 'Следующие административные задачи применяются ко всей базе данных %s.';
@@ -799,118 +800,6 @@
 	$lang['strtablespacealtered'] = 'Табличное пространство изменено.';
 	$lang['strtablespacealteredbad'] = 'Изменение табличного пространства прервано.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Кластер';
-	$lang['strnoclusters'] = 'Кластеры не найдены.';
-	$lang['strconfdropcluster'] = 'Вы действительно хотите удалить кластер "%s"?';
-	$lang['strclusterdropped'] = 'Кластер удален.';
-	$lang['strclusterdroppedbad'] = 'Удаление кластера прервано.';
-	$lang['strinitcluster'] = 'Инициализировать кластер';
-	$lang['strclustercreated'] = 'Кластер инициализирован.';
-	$lang['strclustercreatedbad'] = 'Инициализация кластера прервана.';
-	$lang['strclusterneedsname'] = 'Вам необходимо определить имя кластера.';
-	$lang['strclusterneedsnodeid'] = 'Вам необходимо указать ID для локальной ноды.';
-
-	// Slony nodes
-	$lang['strnodes'] = 'Ноды';
-	$lang['strnonodes'] = 'Ноды не найдены.';
-	$lang['strcreatenode'] = 'Создать ноду';
-	$lang['strid'] = 'ID';
-	$lang['stractive'] = 'Активна';
-	$lang['strnodecreated'] = 'Нода создана.';
-	$lang['strnodecreatedbad'] = 'Создание ноды прервано.';
-	$lang['strconfdropnode'] = 'Вы действительно хотите удалить ноду "%s"?';
-	$lang['strnodedropped'] = 'Нода удалена.';
-	$lang['strnodedroppedbad'] = 'Удаление ноды прервано.';
-	$lang['strfailover'] = 'Перехват управления при отказе';
-	$lang['strnodefailedover'] = 'Ноде будет передано управление при отказе.';
-	$lang['strnodefailedoverbad'] = 'Невозможно передать управление ноде при отказе.';
-	$lang['strstatus'] = 'Статус';
-	$lang['strhealthy'] = 'Исправно';
-	$lang['stroutofsync'] = 'Рассинхронизовано';
-	$lang['strunknown'] = 'Неизвестно';
-
-	// Slony paths	
-	$lang['strpaths'] = 'Пути';
-	$lang['strnopaths'] = 'Пути не найдены.';
-	$lang['strcreatepath'] = 'Создать путь';
-	$lang['strnodename'] = 'Имя ноды';
-	$lang['strnodeid'] = 'ID ноды';
-	$lang['strconninfo'] = 'Строка соединения';
-	$lang['strconnretry'] = 'Секунд между попытками подключения';
-	$lang['strpathneedsconninfo'] = 'Вам необходимо указать строку соединения для пути.';
-	$lang['strpathneedsconnretry'] = 'Вам необходимо указать число секунд ожидания перед повторной попыткой подключения';
-	$lang['strpathcreated'] = 'Путь создан.';
-	$lang['strpathcreatedbad'] = 'Создание пути прервано.';
-	$lang['strconfdroppath'] = 'Вы действительно хотите удалить путь "%s"?';
-	$lang['strpathdropped'] = 'Путь удален.';
-	$lang['strpathdroppedbad'] = 'Удаление пути прервано.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Прослушивания';
-	$lang['strnolistens'] = 'Прослушивания не найдены.';
-	$lang['strcreatelisten'] = 'Создать прослушивание';
-	$lang['strlistencreated'] = 'Прослушивание создано.';
-	$lang['strlistencreatedbad'] = 'Создание прослушивания прервано.';
-	$lang['strconfdroplisten'] = 'Вы действительно хотите удалить прослушивание "%s"?';
-	$lang['strlistendropped'] = 'Прослушивание удалено.';
-	$lang['strlistendroppedbad'] = 'Удаление прослушивания прервано.';
-
-	// Slony replication sets
-	$lang['strrepsets'] = 'Репликационные наборы';
-	$lang['strnorepsets'] = 'Репликационных наборов не найдено.';
-	$lang['strcreaterepset'] = 'Создать репликационный набор';
-	$lang['strrepsetcreated'] = 'Репликационный набор создан.';
-	$lang['strrepsetcreatedbad'] = 'Создание репликационного набора прервано.';
-	$lang['strconfdroprepset'] = 'Вы действительно хотите удалить репликационный набор "%s"?';
-	$lang['strrepsetdropped'] = 'Репликационный набор удален.';
-	$lang['strrepsetdroppedbad'] = 'Удаление репликационного набора прервано.';
-	$lang['strmerge'] = 'Слить';
-	$lang['strmergeinto'] = 'Слить в';
-	$lang['strrepsetmerged'] = 'Репликационные наборы слиты.';
-	$lang['strrepsetmergedbad'] = 'Слияние репликационных наборов прервано.';
-	$lang['strmove'] = 'Переместить';
-	$lang['strneworigin'] = 'Новый источник';
-	$lang['strrepsetmoved'] = 'Репликационный набор перемещен.';
-	$lang['strrepsetmovedbad'] = 'Перемещение репликационного набора прервано.';
-	$lang['strnewrepset'] = 'Новый репликационный набор';
-	$lang['strlock'] = 'Заблокировать';
-	$lang['strlocked'] = 'Заблокирован';
-	$lang['strunlock'] = 'Разблокировать';
-	$lang['strconflockrepset'] = 'Вы действительно хотите заблокировать репликационный набор "%s"?';
-	$lang['strrepsetlocked'] = 'Репликационный набор заблокирован.';
-	$lang['strrepsetlockedbad'] = 'Блокирование репликационного набора прервано.';
-	$lang['strconfunlockrepset'] = 'Вы действительно хотите разблокировать репликационный набор "%s"?';
-	$lang['strrepsetunlocked'] = 'Репликационный набор разблокирован.';
-	$lang['strrepsetunlockedbad'] = 'Разблокирование репликационного набора прервано.';
-	$lang['stronlyonnode'] = 'Только на ноде';
-	$lang['strddlscript'] = 'Скрипт DDL';
-	$lang['strscriptneedsbody'] = 'Вам необходимо предоставить скрипт для выполнения на всех нодах.';
-	$lang['strscriptexecuted'] = 'DDL скрипт репликационного набора выполнен.';
-	$lang['strscriptexecutedbad'] = 'Выполнение DLL скрипта репликационного набора прервано.';
-	$lang['strtabletriggerstoretain'] = 'Следующие триггеры Slony НЕ выключит:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Добавить таблицу';
-	$lang['strtableneedsuniquekey'] = 'Таблица для добавления должна иметь первичный или уникальный ключ.';
-	$lang['strtableaddedtorepset'] = 'Таблица добавлена в репликационный набор.';
-	$lang['strtableaddedtorepsetbad'] = 'Добавление таблицы в репликационный набор прервано.';
-	$lang['strconfremovetablefromrepset'] = 'Вы действительно хотите удалить таблицу "%s" из репликационного набора "%s"?';
-	$lang['strtableremovedfromrepset'] = 'Таблица удалена из репликационного набора.';
-	$lang['strtableremovedfromrepsetbad'] = 'Удаление таблицы из репликационного набора прервано.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Добавить последовательность';
-	$lang['strsequenceaddedtorepset'] = 'Последовательность добавлена в репликационный набор.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Добавление последовательности в репликационный набор прервано.';
-	$lang['strconfremovesequencefromrepset'] = 'Вы действительно хотите удалить последовательность "%s" из репликационного набора "%s"?';
-	$lang['strsequenceremovedfromrepset'] = 'Последовательность удалена из репликационного набора.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Удаление последовательности из репликационного набора прервано.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions'] = 'Подписки';
-	$lang['strnosubscriptions'] = 'Подписки не найдены.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s выполняется на %s:%s -- Вы зарегистрированы как "%s"';
 	$lang['strtimefmt'] = ' j-m-Y  g:i';
diff --git a/lang/slovak.php b/lang/slovak.php
index 0b9b1313..77b39dfe 100644
--- a/lang/slovak.php
+++ b/lang/slovak.php
@@ -131,6 +131,7 @@
 	$lang['strfile']  =  'Súbor';
 	$lang['strfileimported']  =  'Súbor importovaný.';
 	$lang['strtrycred']  =  'Použiť tieto hodnoty pre všetky hodnoty';
+$lang['strexecute']  =  'Execute';
 
 	// Error handling
 	$lang['strnoframes']  =  'Táto aplikácia funguje najlapšie s prehliadačom, ktorý podporuje technológiu frame-ov, no môže byť použitý aj takým, ktorý to nepodporuje nasledovaním tohto odkazu:';
@@ -377,6 +378,7 @@
 	$lang['strconfcluster'] = 'Naozaj chceš vytvoriť cluster "%s"?';
 	$lang['strclusteredgood'] = 'Cluster hotový.';
 	$lang['strclusteredbad'] = 'Cluster nebol vytvorený.';
+$lang['strcluster']  =  'Cluster';
 
 	// Rules
 	$lang['strrules'] = 'Pravidlá';
@@ -643,115 +645,7 @@
 	$lang['strtablespacedroppedbad']  =  'Odstránenie priestoru zlyhalo.';
 	$lang['strtablespacealtered']  =  'Priestor tabuľky zmenený.';
 	$lang['strtablespacealteredbad']  =  'Zmenenie priestoru tabuľky zlyhalo.';
-
-	// Slony clusters
-$lang['strcluster']  =  'Cluster';
-$lang['strnoclusters']  =  'No clusters found.';
-$lang['strconfdropcluster']  =  'Are you sure you want to drop cluster "%s"?';
-$lang['strclusterdropped']  =  'Cluster dropped.';
-$lang['strclusterdroppedbad']  =  'Cluster drop failed.';
-$lang['strinitcluster']  =  'Initialize cluster';
-$lang['strclustercreated']  =  'Cluster initialized.';
-$lang['strclustercreatedbad']  =  'Cluster initialization failed.';
-$lang['strclusterneedsname']  =  'You must give a name for the cluster.';
-$lang['strclusterneedsnodeid']  =  'You must give an ID for the local node.';
-	
-	// Slony nodes
-$lang['strnodes']  =  'Nodes';
-$lang['strnonodes']  =  'No nodes found.';
-$lang['strcreatenode']  =  'Create node';
-$lang['strid']  =  'ID';
-$lang['stractive']  =  'Active';
-$lang['strnodecreated']  =  'Node created.';
-$lang['strnodecreatedbad']  =  'Node creation failed.';
-$lang['strconfdropnode']  =  'Are you sure you want to drop node "%s"?';
-$lang['strnodedropped']  =  'Node dropped.';
-$lang['strnodedroppedbad']  =  'Node drop failed';
-$lang['strfailover']  =  'Failover';
-$lang['strnodefailedover']  =  'Node failed over.';
-$lang['strnodefailedoverbad']  =  'Node failover failed.';
 	
-	// Slony paths	
-$lang['strpaths']  =  'Paths';
-$lang['strnopaths']  =  'No paths found.';
-$lang['strcreatepath']  =  'Create path';
-$lang['strnodename']  =  'Node name';
-$lang['strnodeid']  =  'Node ID';
-$lang['strconninfo']  =  'Connection string';
-$lang['strconnretry']  =  'Seconds before retry to connect';
-$lang['strpathneedsconninfo']  =  'You must give a connection string for the path.';
-$lang['strpathneedsconnretry']  =  'You must give the number of seconds to wait before retry to connect.';
-$lang['strpathcreated']  =  'Path created.';
-$lang['strpathcreatedbad']  =  'Path creation failed.';
-$lang['strconfdroppath']  =  'Are you sure you want to drop path "%s"?';
-$lang['strpathdropped']  =  'Path dropped.';
-$lang['strpathdroppedbad']  =  'Path drop failed.';
-
-	// Slony listens
-$lang['strlistens']  =  'Listens';
-$lang['strnolistens']  =  'No listens found.';
-$lang['strcreatelisten']  =  'Create listen';
-$lang['strlistencreated']  =  'Listen created.';
-$lang['strlistencreatedbad']  =  'Listen creation failed.';
-$lang['strconfdroplisten']  =  'Are you sure you want to drop listen "%s"?';
-$lang['strlistendropped']  =  'Listen dropped.';
-$lang['strlistendroppedbad']  =  'Listen drop failed.';
-
-	// Slony replication sets
-$lang['strrepsets']  =  'Replication sets';
-$lang['strnorepsets']  =  'No replication sets found.';
-$lang['strcreaterepset']  =  'Create replication set';
-$lang['strrepsetcreated']  =  'Replication set created.';
-$lang['strrepsetcreatedbad']  =  'Replication set creation failed.';
-$lang['strconfdroprepset']  =  'Are you sure you want to drop replication set "%s"?';
-$lang['strrepsetdropped']  =  'Replication set dropped.';
-$lang['strrepsetdroppedbad']  =  'Replication set drop failed.';
-$lang['strmerge']  =  'Merge';
-$lang['strmergeinto']  =  'Merge into';
-$lang['strrepsetmerged']  =  'Replication sets merged.';
-$lang['strrepsetmergedbad']  =  'Replication sets merge failed.';
-$lang['strmove']  =  'Move';
-$lang['strneworigin']  =  'New origin';
-$lang['strrepsetmoved']  =  'Replication set moved.';
-$lang['strrepsetmovedbad']  =  'Replication set move failed.';
-$lang['strnewrepset']  =  'New replication set';
-$lang['strlock']  =  'Lock';
-$lang['strlocked']  =  'Locked';
-$lang['strunlock']  =  'Unlock';
-$lang['strconflockrepset']  =  'Are you sure you want to lock replication set "%s"?';
-$lang['strrepsetlocked']  =  'Replication set locked.';
-$lang['strrepsetlockedbad']  =  'Replication set lock failed.';
-$lang['strconfunlockrepset']  =  'Are you sure you want to unlock replication set "%s"?';
-$lang['strrepsetunlocked']  =  'Replication set unlocked.';
-$lang['strrepsetunlockedbad']  =  'Replication set unlock failed.';
-$lang['strexecute']  =  'Execute';
-$lang['stronlyonnode']  =  'Only on node';
-$lang['strddlscript']  =  'DDL script';
-$lang['strscriptneedsbody']  =  'You must supply a script to be executed on all nodes.';
-$lang['strscriptexecuted']  =  'Replication set DDL script executed.';
-$lang['strscriptexecutedbad']  =  'Failed executing replication set DDL script.';
-$lang['strtabletriggerstoretain']  =  'The following triggers will NOT be disabled by Slony:';
-
-	// Slony tables in replication sets
-$lang['straddtable']  =  'Add table';
-$lang['strtableneedsuniquekey']  =  'Table to be added requires a primary or unique key.';
-$lang['strtableaddedtorepset']  =  'Table added to replication set.';
-$lang['strtableaddedtorepsetbad']  =  'Failed adding table to replication set.';
-$lang['strconfremovetablefromrepset']  =  'Are you sure you want to remove the table "%s" from replication set "%s"?';
-$lang['strtableremovedfromrepset']  =  'Table removed from replication set.';
-$lang['strtableremovedfromrepsetbad']  =  'Failed to remove table from replication set.';
-
-	// Slony sequences in replication sets
-$lang['straddsequence']  =  'Add sequence';
-$lang['strsequenceaddedtorepset']  =  'Sequence added to replication set.';
-$lang['strsequenceaddedtorepsetbad']  =  'Failed adding sequence to replication set.';
-$lang['strconfremovesequencefromrepset']  =  'Are you sure you want to remove the sequence "%s" from replication set "%s"?';
-$lang['strsequenceremovedfromrepset']  =  'Sequence removed from replication set.';
-$lang['strsequenceremovedfromrepsetbad']  =  'Failed to remove sequence from replication set.';
-
-	// Slony subscriptions
-$lang['strsubscriptions']  =  'Subscriptions';
-$lang['strnosubscriptions']  =  'No subscriptions found.';
 
 	// Miscellaneous
 	$lang['strtopbar']  =  '%s beží na %s:%s -- si prihlásený ako "%s"';
diff --git a/lang/spanish.php b/lang/spanish.php
index 7413be11..b3bb31e8 100644
--- a/lang/spanish.php
+++ b/lang/spanish.php
@@ -489,6 +489,7 @@
 	$lang['strclusteredbad'] = 'Falló al ordenar tabla.';
 	$lang['strconcurrently'] = 'Concurrente';
 	$lang['strnoclusteravailable'] = 'Tabla no ordenada en un índice.';
+	$lang['strcluster'] = 'Clúster';
 
 	// Rules
 	$lang['strrules'] = 'Reglas';
@@ -803,118 +804,6 @@
 	$lang['strtablespacealtered']  =  'Tablespace modificado.';
 	$lang['strtablespacealteredbad']  =  'Falló la modificación del Tablespace.';
 
-	// Slony clusters
-	$lang['strcluster'] = 'Clúster';
-	$lang['strnoclusters'] = 'No se encontraron clústeres.';
-	$lang['strconfdropcluster'] = '¿Estás seguro que desea eliminar el clúster "%s"?';
-	$lang['strclusterdropped'] = 'Clúster eliminado.';
-	$lang['strclusterdroppedbad'] = 'Falló la eliminación del clúster.';
-	$lang['strinitcluster'] = 'Inicializar clúster';
-	$lang['strclustercreated'] = 'Clúster inicializado.';
-	$lang['strclustercreatedbad'] = 'Falló la inicialización del clúster.';
-	$lang['strclusterneedsname'] = 'Debe especificar un nombre para el clúster.';
-	$lang['strclusterneedsnodeid'] = 'Debe especificar un ID para el nodo local.';
-
-	// Slony nodes
-	$lang['strnodes']  =  'Nodos';
-	$lang['strnonodes'] = 'No se encontraron los nodos.';
-	$lang['strcreatenode']  =  'Crear nodo';
-	$lang['strid']  =  'ID';
-	$lang['stractive'] = 'Activo';
-	$lang['strnodecreated'] = 'Nodo creado.';
-	$lang['strnodecreatedbad'] = 'Falló la creación del nodo.';
-	$lang['strconfdropnode'] = '¿Estás seguro que desea eliminar el nodo "%s"?';
-	$lang['strnodedropped'] = 'Nodo eliminado.';
-	$lang['strnodedroppedbad'] = 'Falló la eliminación del nodo.';
-	$lang['strfailover'] = 'Conmutación por error';
-	$lang['strnodefailedover'] = 'Conmutación por error del nodo.';
-	$lang['strnodefailedoverbad'] = 'Falló la conmutación por error del nodo.';
-	$lang['strstatus'] = 'Estado';
-	$lang['strhealthy'] = 'Estable';
-	$lang['stroutofsync'] = 'Fuera de sincronización';
-	$lang['strunknown'] = 'Desconocido';
-
-	// Slony paths    
-	$lang['strpaths']  =  'Rutas';
-	$lang['strnopaths'] = 'No se encontraron rutas.';
-	$lang['strcreatepath']  =  'Crear ruta';
-	$lang['strnodename'] = 'Nombre del nodo';
-	$lang['strnodeid'] = 'ID del nodo';
-	$lang['strconninfo'] = 'Cadena de conexión';
-	$lang['strconnretry'] = 'Segundos de espera para reintentar la conexión';
-	$lang['strpathneedsconninfo'] = 'Debe suministrar una cadena de conexión para la ruta.';
-	$lang['strpathneedsconnretry'] = 'Debe suministrar el número de segundos de espera para reintentar la conexión.';
-	$lang['strpathcreated'] = 'Ruta creada.';
-	$lang['strpathcreatedbad'] = 'Falló la creación de la ruta.';
-	$lang['strconfdroppath'] = 'Está seguro que desea eliminar la ruta "%s"?';
-	$lang['strpathdropped'] = 'Ruta eliminada.';
-	$lang['strpathdroppedbad'] = 'Falló la eliminación de la ruta.';
-
-	// Slony listens
-	$lang['strlistens'] = 'Listens';
-	$lang['strnolistens'] = 'No se encontraron listens.';
-	$lang['strcreatelisten'] = 'Crear listen';
-	$lang['strlistencreated'] = 'Listen creado.';
-	$lang['strlistencreatedbad'] = 'Falló la creación del listen.';
-	$lang['strconfdroplisten'] = '¿Esta seguro de eliminar el listen "%s"?';
-	$lang['strlistendropped'] = 'Listen eliminado.';
-	$lang['strlistendroppedbad'] = 'Falló la eliminación del listen.';
-
-	// Slony replication sets
-	$lang['strrepsets']  =  'Conjuntos de Replicación';
-	$lang['strnorepsets'] = 'No se encontraron conjuntos de replicación.';
-	$lang['strcreaterepset']  =  'Crear un conjunto de replicación';
-	$lang['strrepsetcreated'] = 'Conjunto de replicación creada.';
-	$lang['strrepsetcreatedbad'] = 'Falló la creación del conjunto de replicación.';
-	$lang['strconfdroprepset'] = '¿Estás seguro que desea eliminar el conjunto de replicación "%s"?';
-	$lang['strrepsetdropped'] = 'Conjunto de replicación eliminado.';
-	$lang['strrepsetdroppedbad'] = 'Falló la eliminación del conjunto de replicación.';
-	$lang['strmerge']  =  'Unir';
-	$lang['strmergeinto'] = 'Unir a';
-	$lang['strrepsetmerged'] = 'Conjuntos de replicación unidos.';
-	$lang['strrepsetmergedbad'] = 'Falló la union de los conjuntos de replicación.';
-	$lang['strmove']  =  'Mover';
-	$lang['strneworigin']  =  'Origen Nuevo';
-	$lang['strrepsetmoved'] = 'Mover el conjunto de replicación.';
-	$lang['strrepsetmovedbad'] = 'Falló al mover el conjunto de replicación.';
-	$lang['strnewrepset']  =  'Nuevo conjunto de replicación';
-	$lang['strlock'] = 'Bloquear';
-	$lang['strlocked'] = 'Bloqueado';
-	$lang['strunlock'] = 'Desbloquear';
-	$lang['strconflockrepset'] = '¿Estás seguro que desea bloquear el conjunto de replicación "%s"?';
-	$lang['strrepsetlocked'] = 'Conjunto de replicación bloqueado.';
-	$lang['strrepsetlockedbad'] = 'Falló el bloqueo del conjunto de replicación.';
-	$lang['strconfunlockrepset'] = '¿Estás seguro que desea desbloquear el conjunto de replicación "%s"?';
-	$lang['strrepsetunlocked'] = 'Conjunto de replicación desbloqueado.';
-	$lang['strrepsetunlockedbad'] = 'Falló el desbloqueo del conjunto de replicación.';
-	$lang['stronlyonnode'] = 'Sólo en el nodo';
-	$lang['strddlscript'] = 'Script DDL';
-	$lang['strscriptneedsbody'] = 'Debe suministrar un script para aplicar en los nodos.';
-	$lang['strscriptexecuted'] = 'Ejecutado el script  DDL  del conjunto de replicación.';
-	$lang['strscriptexecutedbad'] = 'Falló la ejecución del script  DDL  del conjunto de replicación.';
-	$lang['strtabletriggerstoretain'] = 'Los siguientes disparadores no serán desactivados por Slony:';
-
-	// Slony tables in replication sets
-	$lang['straddtable'] = 'Agregar tabla';
-	$lang['strtableneedsuniquekey'] = 'La tabla a agregar requiere una clave primaria o única.';
-	$lang['strtableaddedtorepset'] = 'Tabla agregada al conjunto de replicación.';
-	$lang['strtableaddedtorepsetbad'] = 'Falló al agregar la tabla al conjunto de replicación.';
-	$lang['strconfremovetablefromrepset'] = '¿Estás seguro de eliminar la tabla "%s" del conjunto de replicación "%s"?';
-	$lang['strtableremovedfromrepset'] = 'Tabla eliminada del conjunto de replicación.';
-	$lang['strtableremovedfromrepsetbad'] = 'Falló la eliminación de la tabla del conjunto de replicación.';
-
-	// Slony sequences in replication sets
-	$lang['straddsequence'] = 'Agregar secuencia';
-	$lang['strsequenceaddedtorepset'] = 'Agregar secuencia al conjunto de replicación.';
-	$lang['strsequenceaddedtorepsetbad'] = 'Falló al agregar la secuencia al conjunto de replicación.';
-	$lang['strconfremovesequencefromrepset'] = '¿Este seguro que desea eliminar la secuencia "%s" del conjunto de replicación "%s"?';
-	$lang['strsequenceremovedfromrepset'] = 'Secuencia eliminada del conjunto de replicación.';
-	$lang['strsequenceremovedfromrepsetbad'] = 'Falló la eliminación de la secuencia del conjunto de replicación.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions']  =  'Suscripciones';
-	$lang['strnosubscriptions']  =  'No se encontraron suscripciones.';
-
 	// Miscellaneous
 	$lang['strtopbar'] = '%s corriendo en %s:%s -- Usted ha iniciado sesión con el usuario "%s"';
 	$lang['strtimefmt'] = 'd/m/Y, G:i:s';
diff --git a/lang/turkish.php b/lang/turkish.php
index 2a315005..6eae9e93 100644
--- a/lang/turkish.php
+++ b/lang/turkish.php
@@ -133,6 +133,7 @@
 	$lang['strfile']  =  'Dosya';
 	$lang['strfileimported']  =  'Dosya import edildi.';
 	$lang['strtrycred']  =  'Giriş bilgilerini tüm sunucular için kullan';
+$lang['strexecute']  =  'Execute';
 
 	// Error handling
 	$lang['strnoframes']  =  'Bu uygulama en iyi olarak frame destekli bir tarayıcı ile kullanılabilir; ancak frameler ile kullanmak istemiyorsanız aşağıdaki linke tıklayabilirsiniz.';
@@ -378,6 +379,7 @@ $lang['strcannotdumponwindows']  =  'Dumping of complex table and schema names o
 	$lang['strconfcluster']  =  '"%s" tablosunu cluster etmek istiyor musunuz?';
 	$lang['strclusteredgood']  =  'Cluster tamamlandı.';
 	$lang['strclusteredbad']  =  'Cluster başarısız oldu.';
+	$lang['strcluster']  =  'Küme';
 
 	// Rules
 	$lang['strrules'] = 'Rules';
@@ -639,115 +641,6 @@ $lang['strcannotdumponwindows']  =  'Dumping of complex table and schema names o
 	$lang['strtablespacealtered'] = 'Tablespace değiştirildi.';
 	$lang['strtablespacealteredbad'] = 'Tablespace değiştirilemedi.';
 
-	// Slony clusters
-	$lang['strcluster']  =  'Küme';
-	$lang['strnoclusters']  =  'Hiç küme bulunamadı.';
-	$lang['strconfdropcluster']  =  '"%s" kümesini kaldırmak istediğinize emin misiniz?';
-	$lang['strclusterdropped']  =  'Küme kaldırıldı.';
-	$lang['strclusterdroppedbad']  =  'Küme kaldırma işlemi başarısız oldu.';
-	$lang['strinitcluster']  =  'Kümeyi ilklendir';
-	$lang['strclustercreated']  =  'Küme ilklendirildi.';
-	$lang['strclustercreatedbad']  =  'Küme ilklendirme başarısız oldu.';
-	$lang['strclusterneedsname']  =  'Küme için bir ad vermelisiniz.';
-	$lang['strclusterneedsnodeid']  =  'Yerel uç için bir ID vermelisiniz.';
-	
-	// Slony nodes
-	$lang['strnodes']  =  'Uçlar';
-	$lang['strnonodes']  =  'Hiç uç bulunamadı.';
-	$lang['strcreatenode']  =  'Uç yarat';
-	$lang['strid']  =  'ID';
-	$lang['stractive']  =  'Etkin';
-	$lang['strnodecreated']  =  'Uç yaratıldı.';
-	$lang['strnodecreatedbad']  =  'Uç yaratma başarısız oldu.';
-	$lang['strconfdropnode']  =  '"%s" adlı ucu kaldırmak istediğinize emin misiniz?';
-	$lang['strnodedropped']  =  'Uç kaldırıldı.';
-	$lang['strnodedroppedbad']  =  'Uç kaldırma başarısız oldu.';
-	$lang['strfailover']  =  'Failover';
-$lang['strnodefailedover']  =  'Node failed over.';
-$lang['strnodefailedoverbad']  =  'Node failover failed.';
-	
-	// Slony paths	
-$lang['strpaths']  =  'Paths';
-$lang['strnopaths']  =  'No paths found.';
-$lang['strcreatepath']  =  'Create path';
-	$lang['strnodename']  =  'Uç adı';
-$lang['strnodeid']  =  'Node ID';
-$lang['strconninfo']  =  'Connection string';
-	$lang['strconnretry']  =  'yeniden bağlanmadan önce kaç saniye gerekecek';
-$lang['strpathneedsconninfo']  =  'You must give a connection string for the path.';
-$lang['strpathneedsconnretry']  =  'You must give the number of seconds to wait before retry to connect.';
-$lang['strpathcreated']  =  'Path created.';
-$lang['strpathcreatedbad']  =  'Path creation failed.';
-$lang['strconfdroppath']  =  'Are you sure you want to drop path "%s"?';
-$lang['strpathdropped']  =  'Path dropped.';
-$lang['strpathdroppedbad']  =  'Path drop failed.';
-
-	// Slony listens
-$lang['strlistens']  =  'Listens';
-$lang['strnolistens']  =  'No listens found.';
-$lang['strcreatelisten']  =  'Create listen';
-$lang['strlistencreated']  =  'Listen created.';
-$lang['strlistencreatedbad']  =  'Listen creation failed.';
-$lang['strconfdroplisten']  =  'Are you sure you want to drop listen "%s"?';
-$lang['strlistendropped']  =  'Listen dropped.';
-$lang['strlistendroppedbad']  =  'Listen drop failed.';
-
-	// Slony replication sets
-	$lang['strrepsets']  =  'Replikasyon kümesi';
-	$lang['strnorepsets']  =  'Hiç replikasyon kümesi bulunamadı.';
-	$lang['strcreaterepset']  =  'Replikasyon kümesi yarat';
-	$lang['strrepsetcreated']  =  'Replikasyon kümesi yaratıldı.';
-	$lang['strrepsetcreatedbad']  =  'Replikasyon kümesi yaratma başarısız oldu.';
-$lang['strconfdroprepset']  =  'Are you sure you want to drop replication set "%s"?';
-	$lang['strrepsetdropped']  =  'Replikasyon kümesi kaldırıldı.';
-	$lang['strrepsetdroppedbad']  =  'Replikasyon kümesi kaldırma başarısız oldu.';
-$lang['strmerge']  =  'Merge';
-$lang['strmergeinto']  =  'Merge into';
-$lang['strrepsetmerged']  =  'Replication sets merged.';
-$lang['strrepsetmergedbad']  =  'Replication sets merge failed.';
-	$lang['strmove']  =  'Taşı';
-$lang['strneworigin']  =  'New origin';
-	$lang['strrepsetmoved']  =  'Replikasyon kümesi taşındı.';
-	$lang['strrepsetmovedbad']  =  'Replikasyon kümesi taşıma başarısız oldu.';
-	$lang['strnewrepset']  =  'Yeni replikasyon kümesi';
-	$lang['strlock']  =  'Kilitle';
-	$lang['strlocked']  =  'Kilitlendi';
-	$lang['strunlock']  =  'Kilidi aç';
-	$lang['strconflockrepset']  =  '"%s" replikasyon kümesini kilitlemek istediğinize emin misiniz?';
-	$lang['strrepsetlocked']  =  'Replikasyon kümesi kilitlendi.';
-	$lang['strrepsetlockedbad']  =  'Replikasyon kümesi kilitleme başarısız oldu.';
-$lang['strconfunlockrepset']  =  'Are you sure you want to unlock replication set "%s"?';
-	$lang['strrepsetunlocked']  =  'Replikasyon kümesinin kilidi açıldı.';
-$lang['strrepsetunlockedbad']  =  'Replikasyon kümesi kilit açma başarısız oldu.';
-$lang['strexecute']  =  'Execute';
-$lang['stronlyonnode']  =  'Only on node';
-	$lang['strddlscript']  =  'DDL betiği';
-$lang['strscriptneedsbody']  =  'You must supply a script to be executed on all nodes.';
-$lang['strscriptexecuted']  =  'Replication set DDL script executed.';
-$lang['strscriptexecutedbad']  =  'Failed executing replication set DDL script.';
-$lang['strtabletriggerstoretain']  =  'The following triggers will NOT be disabled by Slony:';
-
-	// Slony tables in replication sets
-	$lang['straddtable']  =  'Tablo ekle';
-$lang['strtableneedsuniquekey']  =  'Table to be added requires a primary or unique key.';
-$lang['strtableaddedtorepset']  =  'Table added to replication set.';
-$lang['strtableaddedtorepsetbad']  =  'Failed adding table to replication set.';
-$lang['strconfremovetablefromrepset']  =  'Are you sure you want to remove the table "%s" from replication set "%s"?';
-$lang['strtableremovedfromrepset']  =  'Table removed from replication set.';
-$lang['strtableremovedfromrepsetbad']  =  'Failed to remove table from replication set.';
-
-	// Slony sequences in replication sets
-$lang['straddsequence']  =  'Add sequence';
-$lang['strsequenceaddedtorepset']  =  'Sequence added to replication set.';
-$lang['strsequenceaddedtorepsetbad']  =  'Failed adding sequence to replication set.';
-$lang['strconfremovesequencefromrepset']  =  'Are you sure you want to remove the sequence "%s" from replication set "%s"?';
-$lang['strsequenceremovedfromrepset']  =  'Sequence removed from replication set.';
-$lang['strsequenceremovedfromrepsetbad']  =  'Failed to remove sequence from replication set.';
-
-	// Slony subscriptions
-	$lang['strsubscriptions']  =  'Üyelikler';
-	$lang['strnosubscriptions']  =  'Üyelik bulunamadı.';
-
 	// Miscellaneous
 	$lang['strtopbar']  =  '%s, %s:%s üzerinde çalışıyor-- "%s" kullanıcısı ile sisteme giriş yaptınız.';
         $lang['strtimefmt']  =  'jS M, Y g:iA';
@@ -758,6 +651,5 @@ $lang['strsequenceremovedfromrepsetbad']  =  'Failed to remove sequence from rep
 	$lang['strloading']  =  'Yükleniyor...';
 	$lang['strerrorloading']  =  'Yükleme hatası';
 	$lang['strclicktoreload']  =  'Yeniden yüklemek için tıklayın.';
-
 ?>
 
diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index 568ca991..10772e99 100644
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -219,12 +219,6 @@
 				exit;
 			}
 		}
-
-		// Load Slony if required
-		if (isset($_server_info['slony_support']) && $_server_info['slony_support']) {
-			include('./classes/plugins/Slony.php');
-			$slony = new Slony();
-		}
 	}
 
 	if (!function_exists("htmlspecialchars_decode")) {
diff --git a/plugin_slony.php b/plugin_slony.php
deleted file mode 100755
index fdb8d8ab..00000000
--- a/plugin_slony.php
+++ /dev/null
@@ -1,2240 +0,0 @@
-<?php
-
-	/**
-	 * Slony database tab plugin
-	 *
-	 * $Id: plugin_slony.php,v 1.24 2007/09/13 13:41:01 ioguix Exp $
-	 */
-
-	// Include application functions
-	include_once('./libraries/lib.inc.php');
-
-	$action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
-
-	// Avoid database connections whenever possible
-	switch ($action) {
-		case 'clusters_top':
-		case 'nodes_top':
-		case 'sets_top':
-			$_no_db_connection = true;
-			break;
-		default:
-	}
-
-	// Include 'slony_cluster' in $misc->href if present
-	if (isset($_REQUEST['slony_cluster'])) {
-		$misc->href .= '&amp;slony_cluster=' . urlencode($_REQUEST['slony_cluster']);
-	}
-
-	/**
-	 * Generate the somewhat complex Slony tree
-	 * @param string $subject The tree node to return
-	 */
-	function doTree($subject) {
-		global $misc, $data, $lang, $slony;
-
-		$reqvars = $misc->getRequestVars('database');
-		if (isset($slony))
-			$reqvars['slony_cluster'] = $slony->slony_cluster;
-
-		// Determine what actual tree we are building
-		switch ($subject) {
-			case 'clusters':
-				// Clusters
-				
-				// Enabled check here is just a hack.
-				if ($slony->isEnabled()) {
-						$tabs = array('cluster' => array (
-											'title' => $slony->slony_cluster,
-											'url'   => 'plugin_slony.php',
-											'urlvars' => array('subject' => 'clusters_top'),
-											'icon'  => 'Cluster',
-										));
-				}
-				else $tabs = array();
-					
-				$items = $misc->adjustTabsForTree($tabs);
-				
-				$attrs = array(
-					'text'   => field('title'),
-					'icon'   => field('icon'),
-					'action' => url(field('url'),
-									$reqvars,
-									array('action'  => 'cluster_properties')
-								),
-					'branch' => url(field('url'),
-									$reqvars,
-									field('urlvars'),
-									array('action' => 'clusters_top')
-								),
-				);
-				
-				$misc->printTreeXML($items, $attrs);
-
-				break;			
-			case 'clusters_top':
-				// Top level Nodes and Replication sets folders
-				$tabs = array('nodes' => array (
-										'title' => $lang['strnodes'],
-										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'nodes'),
-										'icon'  => 'Nodes',
-									));
-				
-				$items = $misc->adjustTabsForTree($tabs);
-				
-				$attrs = array(
-					'text'   => field('title'),
-					'icon'   => field('icon'),
-					'action' => url(field('url'),
-									$reqvars,
-									field('urlvars', array()),
-									array(
-										'action' => 'nodes_properties'
-									)
-								),
-					'branch' => url(field('url'),
-									$reqvars,
-									field('urlvars'),
-									array('action' => 'nodes')
-								),
-					'nofoot' => true
-				);
-				
-				$misc->printTreeXML($items, $attrs);
-
-				$tabs = array('sets' => array (
-										'title' => 	$lang['strrepsets'],
-										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'sets'),
-										'icon'  => 'ReplicationSets',
-									));
-				
-				$items = $misc->adjustTabsForTree($tabs);
-				
-				$attrs = array(
-					'text'   => field('title'),
-					'icon'   => field('icon'),
-					'action' => url(field('url'),
-									$reqvars,
-									field('urlvars', array()),
-									array('action' => 'sets_properties')
-								),
-					'branch' => url(field('url'),
-									$reqvars,
-									field('urlvars'),
-									array('action' => 'sets')
-								),
-					'nohead' => true
-				);
-				
-				$misc->printTreeXML($items, $attrs);
-				
-				break;
-			case 'nodes':			
-				$nodes = $slony->getNodes();
-				
-				$attrs = array(
-					'text'   => field('no_comment'),
-					'icon'   => 'Node',
-					'action' => url('plugin_slony.php',
-									$reqvars,
-									array(
-										'subject' => 'slony_node',
-										'action'  => 'node_properties',
-										'no_id' => field('no_id'),
-										'no_name' => field('no_comment'),
-										'slony_cluster' => $slony->slony_cluster
-									)
-								),
-					'branch' => url('plugin_slony.php',
-									$reqvars,
-									array(
-										'action'  => 'nodes_top',
-										'no_id' => field('no_id')
-									)
-								)
-				);
-
-				$misc->printTreeXML($nodes, $attrs);
-				
-				break;
-			case 'nodes_top':
-				// Nodes paths and listens entries
-				
-				$tabs = array('paths' => array (
-										'title' => $lang['strpaths'],
-										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'paths'),
-										'icon'  => 'Paths',
-									));
-				
-				$items = $misc->adjustTabsForTree($tabs);
-				
-				$attrs = array(
-					'text'   => field('title'),
-					'icon'   => field('icon'),
-					'action' => url(field('url'),
-									$reqvars,
-									field('urlvars', array()),
-									array('action' => 'paths_properties', 'no_id' => $_REQUEST['no_id'])
-								),
-					'branch' => url(field('url'),
-									$reqvars,
-									field('urlvars'),
-									array('action' => 'paths', 'no_id' => $_REQUEST['no_id'])
-								),
-					'nofoot' => true
-				);
-				
-				$misc->printTreeXML($items, $attrs);
-
-				$tabs = array('listens' => array (
-										'title' => $lang['strlistens'],
-										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'listens'),
-										'icon'  => 'Listens',
-									));
-				
-				$items = $misc->adjustTabsForTree($tabs);
-				
-				$attrs = array(
-					'text'   => field('title'),
-					'icon'   => field('icon'),
-					'action' => url(field('url'),
-									$reqvars,
-									field('urlvars', array()),
-									array('action' => 'listens_properties', 'no_id' => $_REQUEST['no_id'])
-								),
-					'branch' => url(field('url'),
-									$reqvars,
-									field('urlvars'),
-									array('action' => 'listens', 'no_id' => $_REQUEST['no_id'])
-								),
-					'nohead' => true
-				);
-				
-				$misc->printTreeXML($items, $attrs);
-				
-				break;			
-			case 'paths':
-				$tables = $slony->getPaths($_REQUEST['no_id']);
-				
-				$attrs = array(
-					'text'   => field('no_comment'),
-					'icon'   => 'Path',
-					'action' => url('plugin_slony.php',
-									$reqvars,
-									array('no_id' => field('pa_client'), 'path_id' => field('no_id'), 'action' => 'path_properties')
-								)
-				);
-				
-				$misc->printTreeXML($tables, $attrs);
-			
-				break;
-			case 'listens':
-				$tables = $slony->getListens($_REQUEST['no_id']);
-				
-				$attrs = array(
-					'text'   => field('no_comment'),
-					'icon'   => 'Listen',
-					'action' => url('plugin_slony.php',
-									$reqvars,
-									array('no_id' => field('li_receiver'), 'listen_id' => field('no_id'), 'action' => 'listen_properties')
-								)
-				);
-				
-				$misc->printTreeXML($tables, $attrs);
-			
-				break;
-			case 'sets':
-				$sets = $slony->getReplicationSets();
-			
-				$attrs = array(
-					'text'   => field('set_comment'),
-					'icon'   => 'AvailableReplicationSet',
-					'action' => url('plugin_slony.php',
-									$reqvars,
-									array(
-										'action'  => 'set_properties',
-										'set_id' => field('set_id')
-									)
-								),
-					'branch' => url('plugin_slony.php',
-									$reqvars,
-									array(
-										'action'  => 'sets_top',
-										'set_id' => field('set_id')
-									)
-								)
-				);
-				
-				$misc->printTreeXML($sets, $attrs);
-				break;
-			case 'sets_top':
-				// Top level Nodes and Replication sets folders
-				
-				$tabs = array('sequences' => array (
-										'title' => $lang['strsequences'],
-										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'sequences'),
-										'icon'  => 'Sequences'
-									));
-				
-				$items = $misc->adjustTabsForTree($tabs);
-				
-				$attrs = array(
-					'text'   => field('title'),
-					'icon'   => field('icon'),
-					'action' => url(field('url'),
-									$reqvars,
-									field('urlvars', array()),
-									array('action' => 'sequences_properties', 'set_id' => $_REQUEST['set_id'])
-								),
-					'branch' => url(field('url'),
-									$reqvars,
-									field('urlvars'),
-									array('action' => 'sequences', 'set_id' => $_REQUEST['set_id'])
-								),
-					'nofoot' => true
-				);
-				
-				$misc->printTreeXML($items, $attrs);
-
-				$tabs = array('tables' => array (
-										'title' => $lang['strtables'],
-										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'tables'),
-										'icon'  => 'Tables',
-									));
-				
-				$items = $misc->adjustTabsForTree($tabs);
-				
-				$attrs = array(
-					'text'   => field('title'),
-					'icon'   => field('icon'),
-					'action' => url(field('url'),
-									$reqvars,
-									field('urlvars', array()),
-									array('action' => 'tables_properties', 'set_id' => $_REQUEST['set_id'])
-								),
-					'branch' => url(field('url'),
-									$reqvars,
-									field('urlvars'),
-									array('action' => 'tables', 'set_id' => $_REQUEST['set_id'])
-								),
-					'nohead' => true,
-					'nofoot' => true
-				);
-				
-				$misc->printTreeXML($items, $attrs);
-
-				$tabs = array('subscriptions' => array (
-										'title' => $lang['strsubscriptions'],
-										'url'   => 'plugin_slony.php',
-										'urlvars' => array('subject' => 'subscriptions'),
-										'icon'  => 'Subscriptions',
-									));
-				
-				$items = $misc->adjustTabsForTree($tabs);
-				
-				$attrs = array(
-					'text'   => field('title'),
-					'icon'   => field('icon'),
-					'action' => url(field('url'),
-									$reqvars,
-									field('urlvars', array()),
-									array('action' => 'subscriptions_properties', 'set_id' => $_REQUEST['set_id'])
-								),
-					'branch' => url(field('url'),
-									$reqvars,
-									field('urlvars'),
-									array('action' => 'subscriptions', 'set_id' => $_REQUEST['set_id'])
-								),
-					'nohead' => true
-				);
-				
-				$misc->printTreeXML($items, $attrs);
-				
-				break;
-			case 'sequences':
-				$tables = $slony->getSequences($_REQUEST['set_id']);
-				
-				$reqvars = $misc->getRequestVars('sequence');
-
-				$attrs = array(
-					'text'   => field('qualname'),
-					'icon'   => 'Sequence',
-					'toolTip'=> field('seqcomment'),
-					'action' => url('sequences.php',
-									$reqvars,
-									array (
-										'action' => 'properties',
-										'sequence' => field('seqname'),
-										'schema' => field('nspname')
-									)
-								)
-				);
-				
-				$misc->printTreeXML($tables, $attrs);
-			
-				break;
-			case 'tables':
-				$tables = $slony->getTables($_REQUEST['set_id']);
-				
-				$reqvars = $misc->getRequestVars('table');
-				
-				$attrs = array(
-					'text'   => field('qualname'),
-					'icon'   => 'Table',
-					'toolTip'=> field('relcomment'),
-					'action' => url('redirect.php',
-									$reqvars,
-									array('table' => field('relname'), 'schema' => field('nspname'))
-								)
-				);
-				
-				$misc->printTreeXML($tables, $attrs);
-			
-				break;
-			case 'subscriptions':
-				$tables = $slony->getSubscribedNodes($_REQUEST['set_id']);
-				
-				$attrs = array(
-					'text'   => field('no_comment'),
-					'icon'   => 'AvailableSubscription',
-					'action' => url('plugin_slony.php',
-									$reqvars,
-									array('set_id' => field('sub_set'), 'no_id' => field('no_id'), 'action' => 'subscription_properties')
-								)
-				);
-				
-				$misc->printTreeXML($tables, $attrs);
-			
-				break;
-		}
-			
-		exit;
-	}
-
-	/**
-	 * Display the slony clusters (we only support one)
-	 */	 
-	function doClusters($msg = '') {
-		global $slony, $misc;
-		global $lang;
-
-		$misc->printTrail('database');
-		$misc->printTabs('database', 'slony');
-		$misc->printMsg($msg);
-
-		$clusters = $slony->getClusters();
-
-		$columns = array(
-			'no_name' => array(
-				'title' => $lang['strcluster'],
-				'field' => field('cluster'),
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=cluster_properties&amp;",
-				'vars'  => array('slony_cluster' => 'cluster'),
-			),
-			'actions' => array(
-				'title' => $lang['stractions'],
-			),
-			'no_comment' => array(
-				'title' => $lang['strcomment'],
-				'field' => field('comment'),
-			)
-		);
-		
-		$actions = array (
-			'drop' => array(
-				'title' => $lang['strdrop'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_drop_cluster&amp;",
-				'vars'  => array('slony_cluster' => 'cluster'),
-			)
-		);
-		
-		$misc->printTable($clusters, $columns, $actions, $lang['strnoclusters']);
-
-		if ($clusters->recordCount() == 0) {		
-			echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=create_cluster&amp;{$misc->href}\">{$lang['strinitcluster']}</a></p>\n";
-		}
-	}
-
-	// CLUSTERS
-
-	/**
-	 * Display the properties of a slony cluster
-	 */	 
-	function doCluster($msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		$misc->printTrail('slony_cluster');
-		$misc->printTabs('slony_cluster', 'properties');
-		$misc->printMsg($msg);
-		
-		// Fetch the cluster information
-		$cluster = $slony->getCluster();
-		
-		if (is_object($cluster) && $cluster->recordCount() > 0) {			
-			echo "<table>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strname']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($slony->slony_cluster), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Local Node ID</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($cluster->fields['no_id']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Local Node</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($cluster->fields['no_comment']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Version</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($cluster->fields['version']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strowner']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($slony->slony_owner), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strcomment']}</th>\n";
-			echo "<td class=\"data1\"></td></tr>\n";
-			echo "</table>\n";
-		}
-		else echo "<p>{$lang['strnodata']}</p>\n";
-	}
-
-	/**
-	 * Displays a screen where they can enter a new cluster
-	 */
-	function doCreateCluster($confirm, $msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		if ($confirm) {
-			if (!isset($_POST['cluster'])) $_POST['cluster'] = '';
-			if (!isset($_POST['no_id'])) $_POST['no_id'] = '1';
-			if (!isset($_POST['no_comment'])) $_POST['no_comment'] = '';
-	
-			$misc->printTrail('slony_clusters');
-			$misc->printTitle($lang['strinitcluster']);
-			$misc->printMsg($msg);
-	
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo "<table style=\"width: 100%\">\n";
-			echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strcluster']}</th>\n";
-			echo "\t\t<td class=\"data1\"><input name=\"cluster\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
-				htmlspecialchars($_POST['cluster']), "\" /></td>\n\t</tr>\n";
-			echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strid']}</th>\n";
-			echo "\t\t<td class=\"data1\"><input name=\"no_id\" size=\"5\" value=\"",
-				htmlspecialchars($_POST['no_id']), "\" /></td>\n\t</tr>\n";
-			echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-			echo "\t\t<td class=\"data1\"><textarea name=\"no_comment\" rows=\"3\" cols=\"32\">", 
-				htmlspecialchars($_POST['no_comment']), "</textarea></td>\n\t</tr>\n";
-			echo "</table>\n";
-			echo "<p>\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"save_create_cluster\" />\n";
-			echo $misc->form;
-			echo "<input type=\"submit\" value=\"{$lang['strinitcluster']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</p>\n";
-			echo "</form>\n";
-		}
-		else {
-			if (trim($_POST['cluster']) == '') {
-				doCreateCluster(true, $lang['strclusterneedsname']);
-				return;
-			}
-			elseif (trim($_POST['no_id']) == '') {
-				doCreateCluster(true, $lang['strclusterneedsnodeid']);
-				return;
-			}
-			
-			$status = $slony->initCluster($_POST['cluster'], $_POST['no_id'], $_POST['no_comment']);
-			if ($status == 0)
-				doClusters($lang['strclustercreated']);
-			else
-				doCreateCluster(true, $lang['strclustercreatedbad'] . ':' . $status);
-		}
-	}
-
-	/**
-	 * Show confirmation of drop and perform actual drop of a cluster
-	 */
-	function doDropCluster($confirm) {
-		global $slony, $misc;
-		global $lang;
-
-		if ($confirm) {
-			$misc->printTrail('slony_cluster');
-			$misc->printTitle($lang['strdrop']);
-
-			echo "<p>", sprintf($lang['strconfdropcluster'], $misc->printVal($slony->slony_cluster)), "</p>\n";
-
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"drop_cluster\" />\n";
-			echo $misc->form;
-			echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->dropCluster();
-			if ($status == 0)
-				doClusters($lang['strclusterdropped']);
-			else
-				doClusters($lang['strclusterdroppedbad']);
-		}
-	}
-
-	// NODES
-	
-	/**
-	 * List all the nodes
-	 */
-	function doNodes($msg = '') {
-		global $slony, $misc;
-		global $lang;
-
-		$misc->printTrail('slony_cluster');
-		$misc->printTabs('slony_cluster', 'nodes');
-		$misc->printMsg($msg);
-
-		$nodes = $slony->getNodes();
-
-		$columns = array(
-			'no_name' => array(
-				'title' => $lang['strname'],
-				'field' => field('no_comment'),
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=node_properties&amp;subject=slony_node&amp;",
-				'vars'  => array('no_id' => 'no_id', 'no_name' => 'no_comment'),
-			),
-			'no_status' => array(
-				'title' => $lang['strstatus'],
-				'field' => field('no_status'),
-				'type' => 'slonystatus',
-			),
-			'actions' => array(
-				'title' => $lang['stractions'],
-			),
-			'no_comment' => array(
-				'title' => $lang['strcomment'],
-				'field' => field('no_comment'),
-			)
-		);
-		
-		$actions = array (
-			'drop' => array(
-				'title' => $lang['strdrop'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_drop_node&amp;subject=slony_node&amp;",
-				'vars'  => array('no_id' => 'no_id', 'no_name' => 'no_comment'),
-			)
-		);
-		
-		$misc->printTable($nodes, $columns, $actions, $lang['strnonodes']);
-		
-		echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=create_node&amp;{$misc->href}\">{$lang['strcreatenode']}</a></p>\n";
-	}
-	
-	/**
-	 * Display the properties of a node
-	 */	 
-	function doNode($msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		$misc->printTrail('slony_node');
-		$misc->printTitle($lang['strproperties']);
-		$misc->printMsg($msg);
-		
-		// Fetch the node information
-		$node = $slony->getNode($_REQUEST['no_id']);		
-		
-		if (is_object($node) && $node->recordCount() > 0) {			
-			// Show comment if any
-			if ($node->fields['no_comment'] !== null)
-				echo "<p class=\"comment\">", $misc->printVal($node->fields['no_comment']), "</p>\n";
-
-			echo "<table>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strname']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($node->fields['no_comment']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strid']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($node->fields['no_id']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['stractive']}</th>\n";
-			echo "<td class=\"data1\">", ($data->phpBool($node->fields['no_active'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strcomment']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($node->fields['no_comment']), "</td></tr>\n";
-			echo "</table>\n";
-		}
-		else echo "<p>{$lang['strnodata']}</p>\n";
-
-		echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=confirm_drop_node&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}\">{$lang['strdrop']}</a></p>\n";
-	}
-
-	/**
-	 * Displays a screen where they can enter a new node
-	 */
-	function doCreateNode($confirm, $msg = '') {
-		global $slony, $misc;
-		global $lang;
-		
-		if ($confirm) {
-			if (!isset($_POST['nodeid'])) $_POST['nodeid'] = '';
-			if (!isset($_POST['nodecomment'])) $_POST['nodecomment'] = '';
-	
-			$misc->printTrail('slony_nodes');
-			$misc->printTitle($lang['strcreatenode']);
-			$misc->printMsg($msg);
-	
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo $misc->form;
-			echo "<table style=\"width: 100%\">\n";
-			echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strid']}</th>\n";
-			echo "\t\t<td class=\"data1\"><input name=\"nodeid\" size=\"5\" value=\"",
-				htmlspecialchars($_POST['nodeid']), "\" /></td>\n\t</tr>\n";
-			echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-			echo "\t\t<td class=\"data1\"><textarea name=\"nodecomment\" rows=\"3\" cols=\"32\">", 
-				htmlspecialchars($_POST['nodecomment']), "</textarea></td>\n\t</tr>\n";
-				
-			echo "\t</tr>\n";
-			echo "</table>\n";
-			echo "<p>\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"save_create_node\" />\n";
-			echo "<input type=\"submit\" value=\"{$lang['strcreate']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</p>\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->createNode($_POST['nodeid'], $_POST['nodecomment']);
-			if ($status == 0)
-				doNodes($lang['strnodecreated']);
-			else
-				doCreateNode(true, $lang['strnodecreatedbad']);
-		}
-	}
-
-	/**
-	 * Show confirmation of drop and perform actual drop of a node
-	 */
-	function doDropNode($confirm) {
-		global $slony, $misc;
-		global $lang;
-
-		if ($confirm) {
-			$misc->printTrail('slony_cluster');
-			$misc->printTitle($lang['strdrop']);
-
-			echo "<p>", sprintf($lang['strconfdropnode'], $misc->printVal($_REQUEST['no_id'])), "</p>\n";
-
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"drop_node\" />\n";
-			echo "<input type=\"hidden\" name=\"no_id\" value=\"", htmlspecialchars($_REQUEST['no_id']), "\" />\n";
-			echo $misc->form;
-			echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->dropNode($_REQUEST['no_id']);
-			if ($status == 0)
-				doNodes($lang['strnodedropped']);
-			else
-				doNodes($lang['strnodedroppedbad']);
-		}
-	}
-			
-	// PATHS
-
-	/**
-	 * List all the paths
-	 */
-	function doPaths($msg = '') {
-		global $slony, $misc;
-		global $lang;
-
-		$misc->printTrail('database');
-		$misc->printMsg($msg);
-
-		$paths = $slony->getPaths($_REQUEST['no_id']);
-
-		$columns = array(
-			'no_name' => array(
-				'title' => $lang['strname'],
-				'field' => field('no_comment'),
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=path_properties&amp;",
-				'vars'  => array('no_id' => 'pa_client', 'path_id' => 'no_id'),
-			),
-			'actions' => array(
-				'title' => $lang['stractions'],
-			),
-			'no_comment' => array(
-				'title' => $lang['strcomment'],
-				'field' => field('no_comment'),
-			)
-		);
-		
-		$actions = array (
-			'drop' => array(
-				'title' => $lang['strdrop'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_drop_path&amp;",
-				'vars'  => array('no_id' => 'pa_client', 'path_id' => 'no_id'),
-			)
-		);
-		
-		$misc->printTable($paths, $columns, $actions, $lang['strnopaths']);
-	
-		echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=create_path&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}\">{$lang['strcreatepath']}</a></p>\n";
-	}
-	
-	/**
-	 * Display the properties of a path
-	 */	 
-	function doPath($msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		$misc->printTrail('slony_path');
-		$misc->printTitle($lang['strproperties']);
-		$misc->printMsg($msg);
-		
-		// Fetch the path information
-		$path = $slony->getPath($_REQUEST['no_id'], $_REQUEST['path_id']);		
-		
-		if (is_object($path) && $path->recordCount() > 0) {			
-			// Show comment if any
-			if ($path->fields['no_comment'] !== null)
-				echo "<p class=\"comment\">", $misc->printVal($path->fields['no_comment']), "</p>\n";
-
-			echo "<table>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strnodename']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($path->fields['no_comment']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strnodeid']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($path->fields['no_id']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strconninfo']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($path->fields['pa_conninfo']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strconnretry']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($path->fields['pa_connretry']), "</td></tr>\n";
-			echo "</table>\n";
-		}
-		else echo "<p>{$lang['strnodata']}</p>\n";
-
-		echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=confirm_drop_path&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}&amp;path_id={$_REQUEST['path_id']}\">{$lang['strdrop']}</a></p>\n";
-	}
-
-	/**
-	 * Displays a screen where they can enter a new path
-	 */
-	function doCreatePath($confirm, $msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		if ($confirm) {
-			if (!isset($_POST['pathserver'])) $_POST['pathserver'] = '';
-			if (!isset($_POST['pathconn'])) $_POST['pathconn'] = '';
-			if (!isset($_POST['pathretry'])) $_POST['pathretry'] = '10';
-	
-			// Fetch all servers
-			$nodes = $slony->getNodes();
-
-			$misc->printTrail('slony_paths');
-			$misc->printTitle($lang['strcreatepath']);
-			$misc->printMsg($msg);
-	
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo $misc->form;
-			echo "<table style=\"width: 100%\">\n";
-			echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strnodename']}</th>\n";
-			echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"pathserver\">\n";
-			while (!$nodes->EOF) {
-				echo "\t\t\t\t<option value=\"{$nodes->fields['no_id']}\"",
-					($nodes->fields['no_id'] == $_POST['pathserver']) ? ' selected="selected"' : '', ">", htmlspecialchars($nodes->fields['no_comment']), "</option>\n";
-				$nodes->moveNext();
-			}
-			echo "\t\t\t</select>\n\t\t</td>\n\t\n";		
-			echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strconninfo']}</th>\n";
-			echo "\t\t<td class=\"data1\"><input name=\"pathconn\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
-				htmlspecialchars($_POST['pathconn']), "\" /></td>\n\t</tr>\n";
-			echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strconnretry']}</th>\n";
-			echo "\t\t<td class=\"data1\"><input name=\"pathretry\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
-				htmlspecialchars($_POST['pathretry']), "\" /></td>\n\t</tr>\n";
-				
-			echo "\t</tr>\n";
-			echo "</table>\n";
-			echo "<p>\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"save_create_path\" />\n";
-			echo "<input type=\"hidden\" name=\"no_id\" value=\"", htmlspecialchars($_REQUEST['no_id']), "\" />\n";
-			echo "<input type=\"submit\" value=\"{$lang['strcreate']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</p>\n";
-			echo "</form>\n";
-		}
-		else {
-			if (trim($_POST['pathconn']) == '') {
-				doCreatePath(true, $lang['strpathneedsconninfo']);
-				return;
-			}
-			elseif (trim($_POST['pathretry']) == '') {
-				doCreatePath(true, $lang['strpathneedsconnretry']);
-				return;
-			}
-				
-			$status = $slony->createPath($_POST['no_id'], $_POST['pathserver'], $_POST['pathconn'], $_POST['pathretry']);
-			if ($status == 0)
-				doPaths($lang['strpathcreated']);
-			else
-				doCreatePath(true, $lang['strpathcreatedbad']);
-		}
-	}
-
-	/**
-	 * Show confirmation of drop and perform actual drop of a path
-	 */
-	function doDropPath($confirm) {
-		global $slony, $misc;
-		global $lang;
-
-		if ($confirm) {
-			$misc->printTrail('slony_cluster');
-			$misc->printTitle($lang['strdrop']);
-
-			echo "<p>", sprintf($lang['strconfdroppath'], $misc->printVal($_REQUEST['path_id'])), "</p>\n";
-
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"drop_path\" />\n";
-			echo "<input type=\"hidden\" name=\"no_id\" value=\"", htmlspecialchars($_REQUEST['no_id']), "\" />\n";
-			echo "<input type=\"hidden\" name=\"path_id\" value=\"", htmlspecialchars($_REQUEST['path_id']), "\" />\n";
-			echo $misc->form;
-			echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->dropPath($_REQUEST['no_id'], $_REQUEST['path_id']);
-			if ($status == 0)
-				doPaths($lang['strpathdropped']);
-			else
-				doPaths($lang['strpathdroppedbad']);
-		}
-	}
-	
-	// LISTENS
-	
-	/**
-	 * List all the listens
-	 */
-	function doListens($msg = '') {
-		global $slony, $misc;
-		global $lang;
-
-		$misc->printTrail('database');
-		$misc->printMsg($msg);
-
-		$listens = $slony->getListens($_REQUEST['no_id']);
-
-		$columns = array(
-			'no_name' => array(
-				'title' => $lang['strname'],
-				'field' => field('no_comment'),
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=listen_properties&amp;",
-				'vars'  => array('no_id' => 'li_receiver', 'listen_id' => 'no_id', 'origin_id' => 'li_origin'),
-			),
-			'actions' => array(
-				'title' => $lang['stractions'],
-			),
-			'no_comment' => array(
-				'title' => $lang['strcomment'],
-				'field' => field('no_comment'),
-			)
-		);
-		
-		$actions = array (
-			'drop' => array(
-				'title' => $lang['strdrop'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_drop_listen&amp;",
-				'vars'  => array('no_id' => 'li_receiver', 'listen_id' => 'no_id', 'origin_id' => 'li_origin'),
-			)
-
-		);
-		
-		$misc->printTable($listens, $columns, $actions, $lang['strnolistens']);
-
-		echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=create_listen&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}\">{$lang['strcreatelisten']}</a></p>\n";
-	}
-
-	/**
-	 * Display the properties of a listen
-	 */	 
-	function doListen($msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		$misc->printTrail('slony_path');
-		$misc->printTitle($lang['strproperties']);
-		$misc->printMsg($msg);
-		
-		// Fetch the listen information
-		$listen = $slony->getListen($_REQUEST['no_id'], $_REQUEST['listen_id']);		
-		
-		if (is_object($listen) && $listen->recordCount() > 0) {			
-			// Show comment if any
-			if ($listen->fields['no_comment'] !== null)
-				echo "<p class=\"comment\">", $misc->printVal($listen->fields['no_comment']), "</p>\n";
-
-			echo "<table>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Provider</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($listen->fields['no_comment']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Provider ID</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($listen->fields['li_provider']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Origin</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($listen->fields['origin']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Origin ID</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($listen->fields['li_origin']), "</td></tr>\n";
-			echo "</table>\n";
-		}
-		else echo "<p>{$lang['strnodata']}</p>\n";
-
-		echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=confirm_drop_listen&amp;{$misc->href}&amp;no_id={$_REQUEST['no_id']}&amp;listen_id={$_REQUEST['listen_id']}&amp;origin_id={$listen->fields['li_origin']}\">{$lang['strdrop']}</a></p>\n";
-	}
-
-	/**
-	 * Displays a screen where they can enter a new listen
-	 */
-	function doCreateListen($confirm, $msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		if ($confirm) {
-			if (!isset($_POST['listenorigin'])) $_POST['listenorigin'] = '';
-			if (!isset($_POST['listenprovider'])) $_POST['listenprovider'] = '';
-	
-			// Fetch all servers
-			$nodes = $slony->getNodes();
-
-			$misc->printTrail('slony_listens');
-			$misc->printTitle($lang['strcreatelisten']);
-			$misc->printMsg($msg);
-	
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo $misc->form;
-			echo "<table style=\"width: 100%\">\n";
-			echo "\t<tr>\n\t\t<th class=\"data left required\">Origin</th>\n";
-			echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"listenorigin\">\n";
-			while (!$nodes->EOF) {
-				echo "\t\t\t\t<option value=\"{$nodes->fields['no_id']}\"",
-					($nodes->fields['no_id'] == $_POST['listenorigin']) ? ' selected="selected"' : '', ">", htmlspecialchars($nodes->fields['no_comment']), "</option>\n";
-				$nodes->moveNext();
-			}
-			echo "\t\t\t</select>\n\t\t</td>\n\t\n";
-			echo "\t<tr>\n\t\t<th class=\"data left required\">Provider</th>\n";
-			echo "\t\t<td class=\"data1\">\n\t\t\t<select name=\"listenprovider\">\n";
-			$nodes->moveFirst();
-			while (!$nodes->EOF) {
-				echo "\t\t\t\t<option value=\"{$nodes->fields['no_id']}\"",
-					($nodes->fields['no_id'] == $_POST['listenprovider']) ? ' selected="selected"' : '', ">", htmlspecialchars($nodes->fields['no_comment']), "</option>\n";
-				$nodes->moveNext();
-			}
-			echo "\t\t\t</select>\n\t\t</td>\n\t\n";		
-			echo "\t</tr>\n";
-			echo "</table>\n";
-			echo "<p>\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"save_create_listen\" />\n";
-			echo "<input type=\"hidden\" name=\"no_id\" value=\"", htmlspecialchars($_REQUEST['no_id']), "\" />\n";
-			echo "<input type=\"submit\" value=\"{$lang['strcreate']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</p>\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->createListen($_POST['no_id'], $_POST['listenorigin'], $_POST['listenprovider']);
-			if ($status == 0)
-				doListens($lang['strlistencreated']);
-			else
-				doCreateListen(true, $lang['strlistencreatedbad']);
-		}
-	}
-
-	/**
-	 * Show confirmation of drop and perform actual drop of a listen
-	 */
-	function doDropListen($confirm) {
-		global $slony, $misc;
-		global $lang;
-
-		if ($confirm) {
-			$misc->printTrail('slony_cluster');
-			$misc->printTitle($lang['strdrop']);
-
-			echo "<p>", sprintf($lang['strconfdroplisten'], $misc->printVal($_REQUEST['listen_id'])), "</p>\n";
-
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"drop_listen\" />\n";
-			echo "<input type=\"hidden\" name=\"no_id\" value=\"", htmlspecialchars($_REQUEST['no_id']), "\" />\n";
-			echo "<input type=\"hidden\" name=\"listen_id\" value=\"", htmlspecialchars($_REQUEST['listen_id']), "\" />\n";
-			echo "<input type=\"hidden\" name=\"origin_id\" value=\"", htmlspecialchars($_REQUEST['origin_id']), "\" />\n";
-			echo $misc->form;
-			echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->dropListen($_REQUEST['no_id'], $_REQUEST['origin_id'], $_REQUEST['listen_id']);
-			if ($status == 0)
-				doListens($lang['strlistendropped']);
-			else
-				doListens($lang['strlistendroppedbad']);
-		}
-	}
-	
-	// REPLICATION SETS
-		
-	/**
-	 * List all the replication sets
-	 */
-	function doReplicationSets($msg = '') {
-		global $slony, $misc;
-		global $lang;
-
-		$misc->printTrail('slony_cluster');
-		$misc->printTabs('slony_cluster', 'sets');
-		$misc->printMsg($msg);
-
-		$sets = $slony->getReplicationSets();
-
-		$columns = array(
-			'set_name' => array(
-				'title' => $lang['strname'],
-				'field' => field('set_comment'),
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=set_properties&amp;",
-				'vars'  => array('set_id' => 'set_id'),
-			),
-			'actions' => array(
-				'title' => $lang['stractions'],
-			),
-			'set_comment' => array(
-				'title' => $lang['strcomment'],
-				'field' => field('set_comment'),
-			)
-		);
-		
-		$actions = array (
-			'drop' => array(
-				'title' => $lang['strdrop'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_drop_set&amp;",
-				'vars'  => array('set_id' => 'set_id'),
-			),
-			'lock' => array(
-				'title' => $lang['strlock'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_lock_set&amp;",
-				'vars'  => array('set_id' => 'set_id'),
-			),
-			'unlock' => array(
-				'title' => $lang['strunlock'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_unlock_set&amp;",
-				'vars'  => array('set_id' => 'set_id'),
-			),
-			'merge' => array(
-				'title' => $lang['strmerge'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=merge_set&amp;",
-				'vars'  => array('set_id' => 'set_id'),
-			),
-			'move' => array(
-				'title' => $lang['strmove'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=move_set&amp;",
-				'vars'  => array('set_id' => 'set_id'),
-			),
-			'execute' => array(
-				'title' => $lang['strexecute'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=execute_set&amp;",
-				'vars'  => array('set_id' => 'set_id'),
-			)
-		);
-		
-		$misc->printTable($sets, $columns, $actions, $lang['strnorepsets']);
-		
-		echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=create_set&amp;{$misc->href}\">{$lang['strcreaterepset']}</a></p>\n";
-	}	
-
-	/**
-	 * Display the properties of a replication set
-	 */	 
-	function doReplicationSet($msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		$misc->printTrail('slony_set');
-		$misc->printTitle($lang['strproperties']);
-		$misc->printMsg($msg);
-		
-		// Fetch the set information
-		$set = $slony->getReplicationSet($_REQUEST['set_id']);		
-		
-		if (is_object($set) && $set->recordCount() > 0) {			
-			// Show comment if any
-			if ($set->fields['set_comment'] !== null)
-				echo "<p class=\"comment\">", $misc->printVal($set->fields['set_comment']), "</p>\n";
-
-			echo "<table>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strname']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($set->fields['set_comment']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strid']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($set->fields['set_id']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strlocked']}</th>\n";
-			echo "<td class=\"data1\">", ($data->phpBool($set->fields['is_locked'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Origin ID</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($set->fields['set_origin']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Origin Node</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($set->fields['no_comment']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Subscriptions</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($set->fields['subscriptions']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['strcomment']}</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($set->fields['set_comment']), "</td></tr>\n";
-			echo "</table>\n";
-		}
-		else echo "<p>{$lang['strnodata']}</p>\n";
-
-		echo "<ul class=\"navlink\"><li><a href=\"plugin_slony.php?action=confirm_drop_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strdrop']}</a></li>\n";
-		echo "\t<li><a href=\"plugin_slony.php?action=confirm_lock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strlock']}</a></li>\n";
-		echo "\t<li><a href=\"plugin_slony.php?action=confirm_unlock_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strunlock']}</a></li>\n";
-		echo "\t<li><a href=\"plugin_slony.php?action=merge_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmerge']}</a></li>\n";
-		echo "\t<li><a href=\"plugin_slony.php?action=move_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strmove']}</a></li>\n";
-		echo "\t<li><a href=\"plugin_slony.php?action=execute_set&amp;{$misc->href}&amp;set_id={$_REQUEST['set_id']}\">{$lang['strexecute']}</a></li></ul>\n";
-	}
-
-	/**
-	 * Displays a screen where they can enter a new set
-	 */
-	function doCreateReplicationSet($confirm, $msg = '') {
-		global $slony, $misc;
-		global $lang;
-		
-		if ($confirm) {
-			if (!isset($_POST['setid'])) $_POST['setid'] = '';
-			if (!isset($_POST['setcomment'])) $_POST['setcomment'] = '';
-	
-			$misc->printTrail('slony_sets');
-			$misc->printTitle($lang['strcreaterepset']);
-			$misc->printMsg($msg);
-	
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo $misc->form;
-			echo "<table style=\"width: 100%\">\n";
-			echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strid']}</th>\n";
-			echo "\t\t<td class=\"data1\"><input name=\"setid\" size=\"5\" value=\"",
-				htmlspecialchars($_POST['setid']), "\" /></td>\n\t</tr>\n";
-			echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-			echo "\t\t<td class=\"data1\"><textarea name=\"setcomment\" rows=\"3\" cols=\"32\">", 
-				htmlspecialchars($_POST['setcomment']), "</textarea></td>\n\t</tr>\n";
-				
-			echo "\t</tr>\n";
-			echo "</table>\n";
-			echo "<p>\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"save_create_set\" />\n";
-			echo "<input type=\"submit\" value=\"{$lang['strcreate']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</p>\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->createReplicationSet($_POST['setid'], $_POST['setcomment']);
-			if ($status == 0)
-				doReplicationSets($lang['strrepsetcreated']);
-			else
-				doCreateReplicationSet(true, $lang['strrepsetcreatedbad']);
-		}
-	}
-
-	/**
-	 * Show confirmation of drop and perform actual drop of a set
-	 */
-	function doDropReplicationSet($confirm) {
-		global $slony, $misc;
-		global $lang;
-
-		if ($confirm) {
-			$misc->printTrail('slony_cluster');
-			$misc->printTitle($lang['strdrop']);
-
-			echo "<p>", sprintf($lang['strconfdroprepset'], $misc->printVal($_REQUEST['set_id'])), "</p>\n";
-
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"drop_set\" />\n";
-			echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-			echo $misc->form;
-			echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->dropReplicationSet($_REQUEST['set_id']);
-			if ($status == 0)
-				doReplicationSet($lang['strrepsetdropped']);
-			else
-				doReplicationSet($lang['strrepsetdroppedbad']);
-		}
-	}
-
-	/**
-	 * Show confirmation of lock and perform actual lock of a set
-	 */
-	function doLockReplicationSet($confirm) {
-		global $slony, $misc;
-		global $lang;
-
-		if ($confirm) {
-			$misc->printTrail('slony_cluster');
-			$misc->printTitle($lang['strlock']);
-
-			echo "<p>", sprintf($lang['strconflockrepset'], $misc->printVal($_REQUEST['set_id'])), "</p>\n";
-
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"lock_set\" />\n";
-			echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-			echo $misc->form;
-			echo "<input type=\"submit\" name=\"lock\" value=\"{$lang['strlock']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->lockReplicationSet($_REQUEST['set_id'], true);
-			if ($status == 0)
-				doReplicationSet($lang['strrepsetlocked']);
-			else
-				doReplicationSet($lang['strrepsetlockedbad']);
-		}
-	}
-
-	/**
-	 * Show confirmation of unlock and perform actual unlock of a set
-	 */
-	function doUnlockReplicationSet($confirm) {
-		global $slony, $misc;
-		global $lang;
-
-		if ($confirm) {
-			$misc->printTrail('slony_cluster');
-			$misc->printTitle($lang['strunlock']);
-
-			echo "<p>", sprintf($lang['strconfunlockrepset'], $misc->printVal($_REQUEST['set_id'])), "</p>\n";
-
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"unlock_set\" />\n";
-			echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-			echo $misc->form;
-			echo "<input type=\"submit\" name=\"unlock\" value=\"{$lang['strunlock']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->lockReplicationSet($_REQUEST['set_id'], false);
-			if ($status == 0)
-				doReplicationSets($lang['strrepsetunlocked']);
-			else
-				doReplicationSets($lang['strrepsetunlockedbad']);
-		}
-	}
-	
-	/**
-	 * Displays a screen where they can merge one set into another
-	 */
-	function doMergeReplicationSet($confirm, $msg = '') {
-		global $slony, $misc;
-		global $lang;
-		
-		if ($confirm) {
-			if (!isset($_POST['target'])) $_POST['target'] = '';
-	
-			$sets = $slony->getReplicationSets();
-	
-			$misc->printTrail('slony_sets');
-			$misc->printTitle($lang['strmerge']);
-			$misc->printMsg($msg);
-	
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo $misc->form;
-			echo "<table>\n";
-			echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strmergeinto']}</th>\n";
-			echo "<td class=\"data1\" colspan=\"3\"><select name=\"target\">";
-			while (!$sets->EOF) {
-				if ($sets->fields['set_id'] != $_REQUEST['set_id']) {
-					echo "<option value=\"{$sets->fields['set_id']}\">";
-					echo htmlspecialchars($sets->fields['set_comment']), "</option>\n";
-				}
-				$sets->moveNext();	
-			}
-			echo "</select></td></tr>\n";
-			echo "</table>\n";
-			echo "<p>\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"save_merge_set\" />\n";
-			echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-			echo "<input type=\"submit\" value=\"{$lang['strmerge']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</p>\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->mergeReplicationSet($_POST['set_id'], $_POST['target']);
-			if ($status == 0)
-				doReplicationSet($lang['strrepsetmerged']);
-			else
-				doMergeReplicationSet(true, $lang['strrepsetmergedbad']);
-		}
-	}
-
-	/**
-	 * Displays a screen where they can move one set into another
-	 */
-	function doMoveReplicationSet($confirm, $msg = '') {
-		global $slony, $misc;
-		global $lang;
-		
-		if ($confirm) {
-			if (!isset($_POST['new_origin'])) $_POST['new_origin'] = '';
-	
-			$nodes = $slony->getNodes();
-			$set = $slony->getReplicationSet($_REQUEST['set_id']);
-	
-			$misc->printTrail('slony_sets');
-			$misc->printTitle($lang['strmove']);
-			$misc->printMsg($msg);
-	
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo $misc->form;
-			echo "<table>\n";
-			echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strneworigin']}</th>\n";
-			echo "<td class=\"data1\" colspan=\"3\"><select name=\"new_origin\">";
-			while (!$nodes->EOF) {
-				if ($nodes->fields['no_id'] != $set->fields['set_origin']) {
-					echo "<option value=\"{$nodes->fields['no_id']}\">";
-					echo htmlspecialchars($nodes->fields['no_comment']), "</option>\n";
-				}
-				$nodes->moveNext();	
-			}
-			echo "</select></td></tr>\n";
-			echo "</table>\n";
-			echo "<p>\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"save_move_set\" />\n";
-			echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-			echo "<input type=\"submit\" value=\"{$lang['strmove']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</p>\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->moveReplicationSet($_POST['set_id'], $_POST['new_origin']);
-			if ($status == 0)
-				doReplicationSet($lang['strrepsetmoved']);
-			else
-				doMoveReplicationSet(true, $lang['strrepsetmovedbad']);
-		}
-	}
-
-	/**
-	 * Displays a screen where they can enter a DDL script to
-	 * be executed on all or a particular node, for this set.
-	 */
-	function doExecuteReplicationSet($confirm, $msg = '') {
-		global $slony, $misc;
-		global $lang;
-		
-		if ($confirm) {
-			if (!isset($_POST['script'])) $_POST['script'] = '';
-	
-			$nodes = $slony->getNodes();
-	
-			$misc->printTrail('slony_sets');
-			$misc->printTitle($lang['strexecute']);
-			$misc->printMsg($msg);
-	
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo $misc->form;
-			echo "<table>\n";
-			/* Slony 1.1 only
-			echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['stronlyonnode']}</th>\n";
-			echo "<td class=\"data1\" colspan=\"3\"><select name=\"only_on_node\">";
-			echo "<option value=\"0\"></option>\n";
-			while (!$nodes->EOF) {
-				echo "<option value=\"{$nodes->fields['no_id']}\"", ($_POST['only_on_node'] == $nodes->fields['no_id'] ? ' selected="selected"' : ''), ">";
-				echo htmlspecialchars($nodes->fields['no_comment']), "</option>\n";
-				$nodes->moveNext();	
-			}
-			echo "</select></td></tr>\n";
-			*/
-			echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strddlscript']}</th>\n";
-			echo "\t\t<td class=\"data1\"><textarea name=\"script\" rows=\"20\" cols=\"40\">", 
-				htmlspecialchars($_POST['script']), "</textarea></td>\n\t</tr>\n";
-			echo "</table>\n";
-			echo "<p>\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"save_execute_set\" />\n";
-			echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-			echo "<input type=\"submit\" value=\"{$lang['strexecute']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</p>\n";
-			echo "</form>\n";
-		}
-		else {
-			if (trim($_POST['script']) == '') {
-				doExecuteReplicationSet(true, $lang['strscriptneedsbody']);
-				return;
-			}
-			
-			$status = $slony->executeReplicationSet($_POST['set_id'], $_POST['script']);
-			if ($status == 0)
-				doReplicationSet($lang['strscriptexecuted']);
-			else
-				doExecuteReplicationSet(true, $lang['strscriptexecutedbad']);
-		}
-	}
-			
-	// TABLES
-	
-	/**
-	 * List all the tables in a replication set
-	 */
-	function doTables($msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-
-		$misc->printTrail('database');
-		$misc->printMsg($msg);
-
-		$tables = $slony->getTables($_REQUEST['set_id']);
-
-		$columns = array(
-			'table' => array(
-				'title' => $lang['strtable'],
-				'field' => field('qualname'),
-				'url'   => "redirect.php?subject=table&amp;{$misc->href}&amp;",
-				'vars'  => array('table' => 'relname', 'schema' => 'nspname'),
-			),
-			'owner' => array(
-				'title' => $lang['strowner'],
-				'field' => field('relowner'),
-			),
-			'tablespace' => array(
-				'title' => $lang['strtablespace'],
-				'field' => field('tablespace'),
-			),
-			'tuples' => array(
-				'title' => $lang['strestimatedrowcount'],
-				'field' => field('reltuples'),
-				'type'  => 'numeric',
-			),
-			'actions' => array(
-				'title' => $lang['stractions'],
-			),
-			'comment' => array(
-				'title' => $lang['strcomment'],
-				'field' => field('relcomment'),
-			),
-		);
-		
-		$actions = array(
-			'drop' => array(
-				'title' => $lang['strdrop'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_drop_table&amp;set_id={$_REQUEST['set_id']}&amp;",
-				'vars'  => array('tab_id' => 'tab_id', 'qualname' => 'qualname'),
-			),
-			'move' => array(
-				'title' => $lang['strmove'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=move_table&amp;set_id={$_REQUEST['set_id']}&amp;stage=1&amp;",
-				'vars'  => array('tab_id' => 'tab_id'),
-			)
-		);
-		
-		if (!$data->hasTablespaces()) unset($columns['tablespace']);
-
-		$misc->printTable($tables, $columns, $actions, $lang['strnotables']);
-		
-		echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=add_table&amp;stage=1&amp;set_id={$_REQUEST['set_id']}&amp;{$misc->href}\">{$lang['straddtable']}</a></p>\n";
-	}
-
-	/**
-	 * Displays a screen where they can add a table to a 
-	 * replication set.
-	 */
-	function doAddTable($stage, $msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		switch ($stage) {
-			case 1:
-				if (!isset($_POST['tab_id'])) $_POST['tab_id'] = '';
-				if (!isset($_POST['comment'])) $_POST['comment'] = '';
-				
-				$tables = $slony->getNonRepTables();
-	
-				$misc->printTrail('slony_sets');
-				$misc->printTitle($lang['straddtable']);
-				$misc->printMsg($msg);
-		
-				echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-				echo $misc->form;
-				echo "<table style=\"width: 100%\">\n";
-				echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strtable']}</th>\n";
-				echo "<td class=\"data1\" colspan=\"3\"><select name=\"target\">";
-				while (!$tables->EOF) {
-					$key = array('schemaname' => $tables->fields['nspname'], 'tablename' => $tables->fields['relname']);
-					$key = serialize($key);
-					echo "<option value=\"", htmlspecialchars($key), "\">";
-					echo htmlspecialchars($tables->fields['nspname']), '.';
-					echo htmlspecialchars($tables->fields['relname']), "</option>\n";
-					$tables->moveNext();	
-				}
-				echo "</select></td></tr>\n";
-				echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strid']}</th>\n";
-				echo "\t\t<td class=\"data1\"><input name=\"tab_id\" size=\"5\" value=\"",
-					htmlspecialchars($_POST['tab_id']), "\" /></td>\n\t</tr>\n";
-				echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-				echo "\t\t<td class=\"data1\"><textarea name=\"comment\" rows=\"3\" cols=\"32\">", 
-					htmlspecialchars($_POST['comment']), "</textarea></td>\n\t</tr>\n";
-					
-				echo "\t</tr>\n";
-				echo "</table>\n";
-				echo "<p>\n";
-				echo "<input type=\"hidden\" name=\"action\" value=\"add_table\" />\n";
-				echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"stage\" value=\"2\" />\n";
-				echo "<input type=\"submit\" value=\"{$lang['strnext']}\" />\n";
-				echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-				echo "</p>\n";
-				echo "</form>\n";
-				break;
-			case 2:
-				// Unserialize table and fetch. This is a bit messy
-				// because the table could be in another schema.
-				$_REQUEST['target'] = unserialize($_REQUEST['target']);
-				$data->setSchema($_REQUEST['target']['schemaname']);
-				// Get indexes
-				$indexes = $data->getIndexes($_REQUEST['target']['tablename'], true);
-				if ($indexes->recordCount() == 0) {
-					doAddTable(1, $lang['strtableneedsuniquekey']);
-					return;
-				}
-				
-				// Get triggers
-				$triggers = $data->getTriggers($_REQUEST['target']['tablename']);				
-
-				// If only one index and no triggers then jump to next step
-				if ($indexes->recordCount() == 1 && $triggers->recordCount() == 0) {
-					$_REQUEST['idxname'] = $indexes->fields['indname'];
-					$_REQUEST['nspname'] = $_REQUEST['target']['schemaname'];
-					$_REQUEST['relname'] = $_REQUEST['target']['tablename'];
-					$_REQUEST['target'] = serialize($_REQUEST['target']);
-					doAddTable(3);
-					return;
-				}
-				
-				$misc->printTrail('slony_sets');
-				$misc->printTitle($lang['straddtable']);
-				$misc->printMsg($msg);
-		
-				echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-				echo $misc->form;
-				echo "<table>\n";
-				if ($indexes->recordCount() > 1) {
-					echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strindex']}</th>\n";
-					echo "<td class=\"data1\" colspan=\"3\"><select name=\"idxname\">";
-					while (!$indexes->EOF) {
-						echo "<option value=\"", htmlspecialchars($indexes->fields['indname']), "\">";
-						echo htmlspecialchars($indexes->fields['indname']), "</option>\n";
-						$indexes->moveNext();	
-					}
-					echo "</select></td></tr>\n";
-				}
-				else {
-					echo "<input type=\"hidden\" name=\"idxname\" value=\"", htmlspecialchars($indexes->fields['indname']), "\" />\n";
-				}
-				if ($triggers->recordCount() > 0) {
-					echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strtriggers']}</th>\n";
-					echo "<td class=\"data1\" colspan=\"3\"><p>{$lang['strtabletriggerstoretain']}</p>\n";
-					while (!$triggers->EOF) {
-						echo "<input type=\"checkbox\" id=\"storedtriggers[", htmlspecialchars($triggers->fields['tgname']), "]\" name=\"storedtriggers[", htmlspecialchars($triggers->fields['tgname']), "]\">";
-						echo "<label for=\"storedtriggers[", htmlspecialchars($triggers->fields['tgname']), "]\">", htmlspecialchars($triggers->fields['tgname']), "</label><br/>\n";
-						$triggers->moveNext();	
-					}
-					echo "</select></td></tr>\n";					
-				}
-				echo "</table>\n";
-				echo "<p>\n";
-				echo "<input type=\"hidden\" name=\"action\" value=\"add_table\" />\n";
-				echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"tab_id\" value=\"", htmlspecialchars($_REQUEST['tab_id']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"comment\" value=\"", htmlspecialchars($_REQUEST['comment']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"nspname\" value=\"", htmlspecialchars($_REQUEST['target']['schemaname']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"relname\" value=\"", htmlspecialchars($_REQUEST['target']['tablename']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"target\" value=\"", htmlspecialchars(serialize($_REQUEST['target'])), "\" />\n";
-				echo "<input type=\"hidden\" name=\"stage\" value=\"3\" />\n";
-				echo "<input type=\"submit\" value=\"{$lang['stradd']}\" />\n";
-				echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-				echo "</p>\n";
-				echo "</form>\n";
-				break;
-			case 3:
-				if (!isset($_REQUEST['storedtriggers'])) $_REQUEST['storedtriggers'] = array();
-				$status = $slony->addTable($_REQUEST['set_id'], $_REQUEST['tab_id'], $_REQUEST['nspname'], $_REQUEST['relname'], 
-														$_REQUEST['idxname'], $_REQUEST['comment'], array_keys($_REQUEST['storedtriggers']));
-				if ($status == 0)
-					doTables($lang['strtableaddedtorepset']);
-				else
-					doAddTable(2, $lang['strtableaddedtorepsetbad']);
-				break;
-		}
-	}
-
-	/**
-	 * Displays a screen where they can move a table to a 
-	 * replication set.
-	 */
-	function doMoveTable($stage, $msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		switch ($stage) {
-			case 1:
-				if (!isset($_POST['new_set_id'])) $_POST['new_set_id'] = '';
-				
-				$sets = $slony->getReplicationSets();
-		
-				$misc->printTrail('slony_sets');
-				$misc->printTitle($lang['strmove']);
-				$misc->printMsg($msg);
-		
-				echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-				echo $misc->form;
-				echo "<table>\n";
-				echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strnewrepset']}</th>\n";
-				echo "<td class=\"data1\" colspan=\"3\"><select name=\"new_set_id\">";
-				while (!$sets->EOF) {
-					if ($sets->fields['set_id'] != $_REQUEST['set_id']) {
-						echo "<option value=\"{$sets->fields['set_id']}\">";
-						echo htmlspecialchars($sets->fields['set_comment']), "</option>\n";
-					}
-					$sets->moveNext();	
-				}
-				echo "</select></td></tr>\n";
-				echo "</table>\n";
-				echo "<p>\n";
-				echo "<input type=\"hidden\" name=\"action\" value=\"move_table\" />\n";
-				echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"tab_id\" value=\"", htmlspecialchars($_REQUEST['tab_id']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"stage\" value=\"2\" />\n";
-				echo "<input type=\"submit\" value=\"{$lang['strmove']}\" />\n";
-				echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-				echo "</p>\n";
-				echo "</form>\n";
-				break;
-			case 2:
-				$status = $slony->moveTable($_REQUEST['tab_id'], $_REQUEST['new_set_id']);
-				if ($status == 0)
-					doTables('Table moved to replication set.');
-				else
-					doMoveTable(1, 'Failed moving table to replication set.');
-				break;
-		}
-	}
-
-	/**
-	 * Show confirmation of drop and perform actual drop of a table from a
-	 * replication set.
-	 */
-	function doDropTable($confirm) {
-		global $slony, $misc;
-		global $lang;
-
-		if ($confirm) {
-			$misc->printTrail('slony_cluster');
-			$misc->printTitle($lang['strdrop']);
-
-			echo "<p>", sprintf($lang['strconfremovetablefromrepset'], 
-				$misc->printVal($_REQUEST['qualname']), $misc->printVal($_REQUEST['set_id'])), "</p>\n";
-
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"drop_table\" />\n";
-			echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-			echo "<input type=\"hidden\" name=\"tab_id\" value=\"", htmlspecialchars($_REQUEST['tab_id']), "\" />\n";
-			echo $misc->form;
-			echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->dropTable($_REQUEST['tab_id']);
-			if ($status == 0)
-				doTables($lang['strtableremovedfromrepset']);
-			else
-				doTables($lang['strtableremovedfromrepsetbad']);
-		}
-	}
-
-	// SEQUENCES
-	
-	/**
-	 * List all the sequences in a replication set
-	 */
-	function doSequences($msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-
-		$misc->printTrail('database');
-		$misc->printMsg($msg);
-
-		$sequences = $slony->getSequences($_REQUEST['set_id']);
-
-		$columns = array(
-			'sequence' => array(
-				'title' => $lang['strsequence'],
-				'field' => field('qualname'),
-				'url'   => "sequences.php?action=properties&amp;{$misc->href}&amp;",
-				'vars'  => array('sequence' => 'seqname', 'schema' => 'nspname'),
-			),
-			'owner' => array(
-				'title' => $lang['strowner'],
-				'field' => field('seqowner'),
-			),
-			'actions' => array(
-				'title' => $lang['stractions'],
-			),
-			'comment' => array(
-				'title' => $lang['strcomment'],
-				'field' => field('seqcomment'),
-			),
-		);
-		
-		$actions = array(
-			'drop' => array(
-				'title' => $lang['strdrop'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=confirm_drop_sequence&amp;set_id={$_REQUEST['set_id']}&amp;",
-				'vars'  => array('seq_id' => 'seq_id', 'qualname' => 'qualname'),
-			),
-			'move' => array(
-				'title' => $lang['strmove'],
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=move_sequence&amp;set_id={$_REQUEST['set_id']}&amp;stage=1&amp;",
-				'vars'  => array('seq_id' => 'seq_id'),
-			)
-		);
-		
-		$misc->printTable($sequences, $columns, $actions, $lang['strnosequences']);
-		
-		echo "<p><a class=\"navlink\" href=\"plugin_slony.php?action=add_sequence&amp;stage=1&amp;set_id={$_REQUEST['set_id']}&amp;{$misc->href}\">{$lang['straddsequence']}</a></p>\n";
-	}
-
-	/**
-	 * Displays a screen where they can add a sequence to a 
-	 * replication set.
-	 */
-	function doAddSequence($stage, $msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		switch ($stage) {
-			case 1:
-				if (!isset($_POST['seq_id'])) $_POST['seq_id'] = '';
-				if (!isset($_POST['comment'])) $_POST['comment'] = '';
-				
-				$sequences = $data->getSequences(true);
-		
-				$misc->printTrail('slony_sets');
-				$misc->printTitle($lang['straddsequence']);
-				$misc->printMsg($msg);
-		
-				echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-				echo $misc->form;
-				echo "<table style=\"width: 100%\">\n";
-				echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strsequence']}</th>\n";
-				echo "<td class=\"data1\" colspan=\"3\"><select name=\"target\">";
-				while (!$sequences->EOF) {
-					$key = array('schemaname' => $sequences->fields['nspname'], 'sequencename' => $sequences->fields['seqname']);
-					$key = serialize($key);
-					echo "<option value=\"", htmlspecialchars($key), "\">";
-					echo htmlspecialchars($sequences->fields['nspname']), '.';
-					echo htmlspecialchars($sequences->fields['seqname']), "</option>\n";
-					$sequences->moveNext();	
-				}
-				echo "</select></td></tr>\n";
-				echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strid']}</th>\n";
-				echo "\t\t<td class=\"data1\"><input name=\"seq_id\" size=\"5\" value=\"",
-					htmlspecialchars($_POST['seq_id']), "\" /></td>\n\t</tr>\n";
-				echo "\t<tr>\n\t\t<th class=\"data left\">{$lang['strcomment']}</th>\n";
-				echo "\t\t<td class=\"data1\"><textarea name=\"comment\" rows=\"3\" cols=\"32\">", 
-					htmlspecialchars($_POST['comment']), "</textarea></td>\n\t</tr>\n";
-					
-				echo "\t</tr>\n";
-				echo "</table>\n";
-				echo "<p>\n";
-				echo "<input type=\"hidden\" name=\"action\" value=\"add_sequence\" />\n";
-				echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"stage\" value=\"2\" />\n";
-				echo "<input type=\"submit\" value=\"{$lang['stradd']}\" />\n";
-				echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-				echo "</p>\n";
-				echo "</form>\n";
-				break;
-			case 2:
-				// Unserialize sequence.
-				$_REQUEST['target'] = unserialize($_REQUEST['target']);
-
-				$status = $slony->addSequence($_REQUEST['set_id'], $_REQUEST['seq_id'], 
-															$_REQUEST['target']['schemaname'] . '.' . $_REQUEST['target']['sequencename'],
-															$_REQUEST['comment']);
-				if ($status == 0)
-					doSequences($lang['strsequenceaddedtorepset']);
-				else
-					doAddSequence(1, $lang['strsequenceaddedtorepsetbad']);
-				break;
-		}
-	}
-
-	/**
-	 * Show confirmation of drop and perform actual drop of a sequence from a
-	 * replication set.
-	 */
-	function doDropSequence($confirm) {
-		global $slony, $misc;
-		global $lang;
-
-		if ($confirm) {
-			$misc->printTrail('slony_cluster');
-			$misc->printTitle($lang['strdrop']);
-
-			echo "<p>", sprintf($lang['strconfremovesequencefromrepset'], 
-				$misc->printVal($_REQUEST['qualname']), $misc->printVal($_REQUEST['set_id'])), "</p>\n";
-
-			echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"drop_sequence\" />\n";
-			echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-			echo "<input type=\"hidden\" name=\"seq_id\" value=\"", htmlspecialchars($_REQUEST['seq_id']), "\" />\n";
-			echo $misc->form;
-			echo "<input type=\"submit\" name=\"drop\" value=\"{$lang['strdrop']}\" />\n";
-			echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-			echo "</form>\n";
-		}
-		else {
-			$status = $slony->dropSequence($_REQUEST['seq_id']);
-			if ($status == 0)
-				doSequences($lang['strsequenceremovedfromrepset']);
-			else
-				doSequences($lang['strsequenceremovedfromrepsetbad']);
-		}
-	}
-
-	/**
-	 * Displays a screen where they can move a sequence to a 
-	 * replication set.
-	 */
-	function doMoveSequence($stage, $msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		switch ($stage) {
-			case 1:
-				if (!isset($_POST['new_set_id'])) $_POST['new_set_id'] = '';
-				
-				$sets = $slony->getReplicationSets();
-		
-				$misc->printTrail('slony_sets');
-				$misc->printTitle($lang['strmove']);
-				$misc->printMsg($msg);
-		
-				echo "<form action=\"plugin_slony.php\" method=\"post\">\n";
-				echo $misc->form;
-				echo "<sequence>\n";
-				echo "\t<tr>\n\t\t<th class=\"data left required\">{$lang['strnewrepset']}</th>\n";
-				echo "<td class=\"data1\" colspan=\"3\"><select name=\"new_set_id\">";
-				while (!$sets->EOF) {
-					if ($sets->fields['set_id'] != $_REQUEST['set_id']) {
-						echo "<option value=\"{$sets->fields['set_id']}\">";
-						echo htmlspecialchars($sets->fields['set_comment']), "</option>\n";
-					}
-					$sets->moveNext();	
-				}
-				echo "</select></td></tr>\n";
-				echo "</sequence>\n";
-				echo "<p>\n";
-				echo "<input type=\"hidden\" name=\"action\" value=\"move_sequence\" />\n";
-				echo "<input type=\"hidden\" name=\"set_id\" value=\"", htmlspecialchars($_REQUEST['set_id']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"seq_id\" value=\"", htmlspecialchars($_REQUEST['seq_id']), "\" />\n";
-				echo "<input type=\"hidden\" name=\"stage\" value=\"2\" />\n";
-				echo "<input type=\"submit\" value=\"{$lang['strmove']}\" />\n";
-				echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n";
-				echo "</p>\n";
-				echo "</form>\n";
-				break;
-			case 2:
-				$status = $slony->moveSequence($_REQUEST['seq_id'], $_REQUEST['new_set_id']);
-				if ($status == 0)
-					doSequences('Sequence moved to replication set.');
-				else
-					doMoveSequence(1, 'Failed moving sequence to replication set.');
-				break;
-		}
-	}
-				
-	// SUBSCRIPTIONS
-	
-	/**
-	 * List all the subscriptions
-	 */
-	function doSubscriptions($msg = '') {
-		global $slony, $misc;
-		global $lang;
-
-		$misc->printTrail('database');
-		$misc->printMsg($msg);
-
-		$subscriptions = $slony->getSubscribedNodes($_REQUEST['set_id']);
-
-		$columns = array(
-			'no_name' => array(
-				'title' => $lang['strname'],
-				'field' => field('no_comment'),
-				'url'   => "plugin_slony.php?{$misc->href}&amp;action=subscription_properties&amp;",
-				'vars'  => array('set_id' => 'sub_set', 'no_id' => 'no_id'),
-			),
-			'no_comment' => array(
-				'title' => $lang['strcomment'],
-				'field' => field('no_comment'),
-			)
-		);
-		
-		$actions = array ();
-		
-		$misc->printTable($subscriptions, $columns, $actions, $lang['strnosubscriptions']);
-	}
-	
-	/**
-	 * Display the properties of a subscription
-	 */	 
-	function doSubscription($msg = '') {
-		global $data, $slony, $misc;
-		global $lang;
-		
-		$misc->printTrail('slony_subscription');
-		$misc->printTitle($lang['strproperties']);
-		$misc->printMsg($msg);
-		
-		// Fetch the subscription information
-		$subscription = $slony->getSubscription($_REQUEST['set_id'], $_REQUEST['no_id']);		
-		
-		if (is_object($subscription) && $subscription->recordCount() > 0) {			
-			// Show comment if any
-			if ($subscription->fields['receiver'] !== null)
-				echo "<p class=\"comment\">", $misc->printVal($subscription->fields['receiver']), "</p>\n";
-
-			echo "<table>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Provider ID</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($subscription->fields['sub_provider']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Provider Name</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($subscription->fields['provider']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Receiver ID</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($subscription->fields['sub_receiver']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">Receiver Name</th>\n";
-			echo "<td class=\"data1\">", $misc->printVal($subscription->fields['receiver']), "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">{$lang['stractive']}</th>\n";
-			echo "<td class=\"data1\">", ($data->phpBool($subscription->fields['sub_active'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
-			echo "<tr><th class=\"data left\" style=\"width: 70px\">May Forward</th>\n";
-			echo "<td class=\"data1\">", ($data->phpBool($subscription->fields['sub_forward'])) ? $lang['stryes'] : $lang['strno'], "</td></tr>\n";
-			echo "</table>\n";
-		}
-		else echo "<p>{$lang['strnodata']}</p>\n";
-	}
-
-	// Tree actions
-	if ($action == 'tree') doTree('clusters');
-	elseif ($action == 'clusters_top') doTree('clusters_top');
-	elseif ($action == 'nodes') doTree('nodes');
-	elseif ($action == 'nodes_top') doTree('nodes_top');
-	elseif ($action == 'paths') doTree('paths');
-	elseif ($action == 'listens') doTree('listens');
-	elseif ($action == 'sets') doTree('sets');
-	elseif ($action == 'sets_top') doTree('sets_top');
-	elseif ($action == 'subscriptions') doTree('subscriptions');
-	elseif ($action == 'sequences') doTree('sequences');
-	elseif ($action == 'tables') doTree('tables');
-
-	$misc->printHeader('Slony');
-	$misc->printBody();
-
-	switch ($action) {
-		case 'save_create_cluster':
-			if (isset($_POST['cancel'])) doClusters();
-			else doCreateCluster(false);
-			break;
-		case 'create_cluster':
-			doCreateCluster(true);
-			break;
-		case 'drop_cluster':
-			if (isset($_POST['cancel'])) doClusters();
-			else doDropCluster(false);
-			break;
-		case 'confirm_drop_cluster':
-			doDropCluster(true);
-			break;
-		case 'nodes_properties':
-			doNodes();
-			break;
-		case 'node_properties':
-			doNode();
-			break;
-		case 'save_create_node':
-			if (isset($_POST['cancel'])) doNodes();
-			else doCreateNode(false);
-			break;
-		case 'create_node':
-			doCreateNode(true);
-			break;
-		case 'drop_node':
-			if (isset($_POST['cancel'])) doNodes();
-			else doDropNode(false);
-			break;
-		case 'confirm_drop_node':
-			doDropNode(true);
-			break;
-		case 'failover_node':
-			if (isset($_POST['cancel'])) doNodes();
-			else doFailoverNode(false);
-			break;
-		case 'confirm_failover_node':
-			doFailoverNode(true);
-			break;
-		case 'paths_properties':
-			doPaths();
-			break;
-		case 'path_properties':
-			doPath();
-			break;
-		case 'save_create_path':
-			if (isset($_POST['cancel'])) doPaths();
-			else doCreatePath(false);
-			break;
-		case 'create_path':
-			doCreatePath(true);
-			break;
-		case 'drop_path':
-			if (isset($_POST['cancel'])) doPaths();
-			else doDropPath(false);
-			break;
-		case 'confirm_drop_path':
-			doDropPath(true);
-			break;
-		case 'listens_properties':
-			doListens();
-			break;
-		case 'listen_properties':
-			doListen();
-			break;
-		case 'save_create_listen':
-			if (isset($_POST['cancel'])) doListens();
-			else doCreateListen(false);
-			break;
-		case 'create_listen':
-			doCreateListen(true);
-			break;
-		case 'drop_listen':
-			if (isset($_POST['cancel'])) doListens();
-			else doDropListen(false);
-			break;
-		case 'confirm_drop_listen':
-			doDropListen(true);
-			break;
-		case 'sets_properties':
-			doReplicationSets();
-			break;
-		case 'set_properties':
-			doReplicationSet();
-			break;
-		case 'save_create_set':
-			if (isset($_POST['cancel'])) doReplicationSets();
-			else doCreateReplicationSet(false);
-			break;
-		case 'create_set':
-			doCreateReplicationSet(true);
-			break;
-		case 'drop_set':
-			if (isset($_POST['cancel'])) doReplicationSets();
-			else doDropReplicationSet(false);
-			break;
-		case 'confirm_drop_set':
-			doDropReplicationSet(true);
-			break;
-		case 'lock_set':
-			if (isset($_POST['cancel'])) doReplicationSets();
-			else doLockReplicationSet(false);
-			break;
-		case 'confirm_lock_set':
-			doLockReplicationSet(true);
-			break;
-		case 'unlock_set':
-			if (isset($_POST['cancel'])) doReplicationSets();
-			else doUnlockReplicationSet(false);
-			break;
-		case 'confirm_unlock_set':
-			doUnlockReplicationSet(true);
-			break;
-		case 'save_merge_set':
-			if (isset($_POST['cancel'])) doReplicationSet();
-			else doMergeReplicationSet(false);
-			break;
-		case 'merge_set':
-			doMergeReplicationSet(true);
-			break;
-		case 'save_move_set':
-			if (isset($_POST['cancel'])) doReplicationSet();
-			else doMoveReplicationSet(false);
-			break;
-		case 'move_set':
-			doMoveReplicationSet(true);
-			break;
-		case 'save_execute_set':
-			if (isset($_POST['cancel'])) doReplicationSet();
-			else doExecuteReplicationSet(false);
-			break;
-		case 'execute_set':
-			doExecuteReplicationSet(true);
-			break;
-		case 'tables_properties':
-			doTables();
-			break;
-		case 'add_table':
-			if (isset($_REQUEST['cancel'])) doTables();
-			else doAddTable($_REQUEST['stage']);
-			break;
-		case 'drop_table':
-			if (isset($_POST['cancel'])) doTables();
-			else doDropTable(false);
-			break;
-		case 'confirm_drop_table':
-			doDropTable(true);
-			break;
-		case 'move_table':
-			if (isset($_REQUEST['cancel'])) doTables();
-			else doMoveTable($_REQUEST['stage']);
-			break;
-		case 'sequences_properties':
-			doSequences();
-			break;
-		case 'add_sequence':
-			if (isset($_REQUEST['cancel'])) doSequences();
-			else doAddSequence($_REQUEST['stage']);
-			break;
-		case 'drop_sequence':
-			if (isset($_POST['cancel'])) doSequences();
-			else doDropSequence(false);
-			break;
-		case 'confirm_drop_sequence':
-			doDropSequence(true);
-			break;
-		case 'move_sequence':
-			if (isset($_REQUEST['cancel'])) doSequences();
-			else doMoveSequence($_REQUEST['stage']);
-			break;
-		case 'subscriptions_properties':
-			doSubscriptions();
-			break;
-		case 'subscription_properties':
-			doSubscription();
-			break;
-		case 'cluster_properties':
-			doCluster();
-			break;
-		case 'clusters_properties':
-		default:
-			doClusters();
-			break;
-	}
-	
-	$misc->printFooter();
-
-?>
diff --git a/schemas.php b/schemas.php
index 7ad336e5..c6be3655 100755
--- a/schemas.php
+++ b/schemas.php
@@ -355,7 +355,7 @@
 	 * Generate XML for the browser tree.
 	 */
 	function doTree() {
-		global $misc, $data, $lang, $slony;
+		global $misc, $data, $lang;
 
 		$schemas = $data->getSchemas();