diff --git a/KNOWN_ISSUES.txt b/KNOWN_ISSUES.txt
index d313328..dbb7746 100644
--- a/KNOWN_ISSUES.txt
+++ b/KNOWN_ISSUES.txt
@@ -4,14 +4,3 @@ MLP KNOWN ISSUES
 * If using the 'Power users can change a rendition's language or article'
 feature, if you change a rendition's language or article ID then the 'View'
 link will not be updated until you reload the article.
-
-* Older version of MLP sometimes lost track of changes to the textpattern
-table made by other plugins such as glz_custom_fields. This manifests
-itself when you save a rendition and the changes are reflected in the
-admin side but _not_ in the public site. To fix this, find any plugin that
-modifies the textpattern table and force it to make a change to the table.
-For example, with glz_custom_fields, visit Extensions->Custom Fields and
-either change an existing field's type, or create a new field. Make sure
-you save the changes and then visit another admin panel which causes MLP
-to resync the tables. You can then change your edited custom field back
-the way it was, if you wish.
diff --git a/plugins/sources/gbp_admin_library.php b/plugins/sources/gbp_admin_library.php
index 834e2bc..dfb9430 100644
--- a/plugins/sources/gbp_admin_library.php
+++ b/plugins/sources/gbp_admin_library.php
@@ -17,7 +17,7 @@
 // 1 = Plugin help is in raw HTML.  Not recommended.
 # $plugin['allow_html_help'] = 1;
 
-$plugin['version'] = '4.6.0.20160216';
+$plugin['version'] = '4.6.2.20170310';
 $plugin['author'] = 'Graeme Porteous';
 $plugin['author_uri'] = '';
 $plugin['description'] = 'GBP Admin-Side Library';
@@ -416,7 +416,7 @@ public function render_tabs () {
 		}
 
 		$out[] = '</p>';
-		$out[] = '</div><div>';
+		$out[] = '</div><div class="clear">';
 
 		echo join('', $out);
 	}
@@ -484,8 +484,7 @@ public function url ($vars = array(), $gp = false) {
 				$out[] = $key.'='.urlencode($value);
 		}
 
-		$script = hu.basename(txpath).'/index.php';
-		return $script . (isset($out)
+		return (isset($out)
 			? '?'.join('&', $out)
 			: '');
 	}
diff --git a/plugins/sources/l10n.php b/plugins/sources/l10n.php
index 1d9a062..fcbd4f7 100644
--- a/plugins/sources/l10n.php
+++ b/plugins/sources/l10n.php
@@ -17,9 +17,9 @@
 // 1 = Plugin help is in raw HTML.  Not recommended.
 # $plugin['allow_html_help'] = 1;
 
-$plugin['version'] = '4.6.0.20160216';
-$plugin['author'] = 'Graeme Porteous, Steve Dickinson, Stef Dawson';
-$plugin['author_uri'] = 'http://txp-plugins.netcarving.com/plugins/mlp-plugin';
+$plugin['version'] = '4.6.2.20170316';
+$plugin['author'] = 'Graeme Porteous, Steve Dickinson, Stef Dawson, Dmitry Shovchko';
+$plugin['author_uri'] = 'https://github.com/Bloke/MLP';
 $plugin['description'] = 'Multi-Lingual Publishing Package.';
 
 // Plugin load order:
@@ -542,7 +542,7 @@ function _l10n_textpattern_comment_submit()
 		#	The REQUEST_URI has to be maintained to ensure comments work and compatibility with
 		# plugins...
 		#
-		if ($prefs['l10n_l10n-url_default_lang_marker'] === '1' || isset($_SESSION['l10n_request_uri']))
+		if ((isset($prefs['l10n_l10n-url_default_lang_marker']) && $prefs['l10n_l10n-url_default_lang_marker'] === '1') || isset($_SESSION['l10n_request_uri']))
 		{
 			if (isset($_SESSION['l10n_request_uri'])) {
 				$pretext['request_uri'] = $_SERVER['REQUEST_URI'] = $_SESSION['l10n_request_uri'];
@@ -721,7 +721,7 @@ function _l10n_inject_lang_markers_cb( $matches )
 			$default_lang_long = $site_langs[0];
 			$default_lang_short = substr( $default_lang_long , 0 , 2 );
 
-			if ( $prefs['l10n_l10n-url_default_lang_marker'] === '1' || ($callback_language_marker !== $default_lang_short) )
+			if ( (isset($prefs['l10n_l10n-url_default_lang_marker']) && $prefs['l10n_l10n-url_default_lang_marker'] === '1') || ($callback_language_marker !== $default_lang_short) )
 				{
 				$result = $l10n_replace_strings['start_rep'].$matches[1].'/'.$callback_language_marker.$extra.$matches[2].$l10n_replace_strings['stop_rep'];
 				}
@@ -746,6 +746,16 @@ function _l10n_inject_rss_lang_markers( $buffer )
 		_l10n_make_exclusion_list();
 
 		global $l10n_replace_strings;
+                
+		# Insert the language code into all permlinks...
+                $l10n_replace_strings['start'] = ' href=["|\']';
+                $l10n_replace_strings['start_rep'] = ' href="';
+                $l10n_replace_strings['stop']  = '["|\']';
+                $l10n_replace_strings['stop_rep'] = '"';
+                $l10n_replace_strings['insert_blank'] = true;
+                $pattern1 = _l10n_make_pattern();
+                $buffer = _l10n_preg_replace_callback( $pattern1 , '_l10n_inject_lang_markers_cb' , $buffer );
+
 		$l10n_replace_strings['start'] = $l10n_replace_strings['start_rep'] = '<link>';
 		$l10n_replace_strings['stop']  = $l10n_replace_strings['stop_rep']  = '</link>';
 		$l10n_replace_strings['insert_blank'] = true;
@@ -845,6 +855,24 @@ function _l10n_inject_lang_markers( $buffer )
 		$pattern2 = _l10n_make_pattern();
 		$buffer = _l10n_preg_replace_callback( $pattern2 , '_l10n_inject_lang_markers_cb' , $buffer );
 
+                $l10n_replace_strings['start'] = $l10n_replace_strings['start_rep'] = '<loc>';
+                $l10n_replace_strings['stop']  = $l10n_replace_strings['stop_rep']  = '</loc>';
+                $l10n_replace_strings['insert_blank'] = false;
+                $pattern3 = _l10n_make_pattern();
+                $buffer = _l10n_preg_replace_callback( $pattern3 , '_l10n_inject_lang_markers_cb' , $buffer );
+
+                $l10n_replace_strings['start'] = $l10n_replace_strings['start_rep'] = '<link>';
+                $l10n_replace_strings['stop']  = $l10n_replace_strings['stop_rep']  = '</link>';
+                $l10n_replace_strings['insert_blank'] = false;
+                $pattern4 = _l10n_make_pattern();
+                $buffer = _l10n_preg_replace_callback( $pattern4 , '_l10n_inject_lang_markers_cb' , $buffer );
+
+                $l10n_replace_strings['start'] = $l10n_replace_strings['start_rep'] = '<guid>';
+                $l10n_replace_strings['stop']  = $l10n_replace_strings['stop_rep']  = '</guid>';
+                $l10n_replace_strings['insert_blank'] = false;
+                $pattern5 = _l10n_make_pattern();
+                $buffer = _l10n_preg_replace_callback( $pattern5 , '_l10n_inject_lang_markers_cb' , $buffer );
+
 		if (0)	#debug
 			$buffer = 'Exclusions... :' . join( ', ' , $l10n_url_exclusions ) . $buffer;
 
diff --git a/plugins/sources/zem_contact_lang-mlp.php b/plugins/sources/zem_contact_lang-mlp.php
index 3ef0dae..05b396a 100644
--- a/plugins/sources/zem_contact_lang-mlp.php
+++ b/plugins/sources/zem_contact_lang-mlp.php
@@ -1,13 +1,74 @@
 <?php
 
-$plugin['name'] 		= 'zem_contact_lang-mlp';
-$plugin['version'] 		= '4.0.3.6-MLP';
-$plugin['author'] 		= 'Netcarver & the TXP Community';
-$plugin['author_uri'] 	= 'http://forum.textpattern.com/viewtopic.php?id=12956';
-$plugin['description'] 	= 'MLP strings plug-in for Zem Contact Reborn';
-$plugin['type'] 		= 0;
-
-@include_once('../zem_tpl.php');
+// This is a PLUGIN TEMPLATE for Textpattern CMS.
+
+// Copy this file to a new name like abc_myplugin.php.  Edit the code, then
+// run this file at the command line to produce a plugin for distribution:
+// $ php abc_myplugin.php > abc_myplugin-0.1.txt
+
+// Plugin name is optional.  If unset, it will be extracted from the current
+// file name. Plugin names should start with a three letter prefix which is
+// unique and reserved for each plugin author ("abc" is just an example).
+// Uncomment and edit this line to override:
+$plugin['name'] = 'zem_contact_lang-mlp';
+
+// Allow raw HTML help, as opposed to Textile.
+// 0 = Plugin help is in Textile format, no raw HTML allowed (default).
+// 1 = Plugin help is in raw HTML.  Not recommended.
+# $plugin['allow_html_help'] = 1;
+
+$plugin['version'] = '4.6.2.20170316';
+$plugin['author'] = 'Netcarver & the TXP Community';
+$plugin['author_uri'] = 'http://forum.textpattern.com/viewtopic.php?id=12956';
+$plugin['description'] = 'MLP strings plug-in for Zem Contact Reborn';
+
+// Plugin load order:
+// The default value of 5 would fit most plugins, while for instance comment
+// spam evaluators or URL redirectors would probably want to run earlier
+// (1...4) to prepare the environment for everything else that follows.
+// Values 6...9 should be considered for plugins which would work late.
+// This order is user-overrideable.
+$plugin['order'] = '0';
+
+// Plugin 'type' defines where the plugin is loaded
+// 0 = public              : only on the public side of the website (default)
+// 1 = public+admin        : on both the public and admin side
+// 2 = library             : only when include_plugin() or require_plugin() is called
+// 3 = admin               : only on the admin side (no AJAX)
+// 4 = admin+ajax          : only on the admin side (AJAX supported)
+// 5 = public+admin+ajax   : on both the public and admin side (AJAX supported)
+$plugin['type'] = '0';
+
+// Plugin "flags" signal the presence of optional capabilities to the core plugin loader.
+// Use an appropriately OR-ed combination of these flags.
+// The four high-order bits 0xf000 are available for this plugin's private use
+if (!defined('PLUGIN_HAS_PREFS')) define('PLUGIN_HAS_PREFS', 0x0001); // This plugin wants to receive "plugin_prefs.{$plugin['name']}" events
+if (!defined('PLUGIN_LIFECYCLE_NOTIFY')) define('PLUGIN_LIFECYCLE_NOTIFY', 0x0002); // This plugin wants to receive "plugin_lifecycle.{$plugin['name']}" events
+
+$plugin['flags'] = '0';
+
+// Plugin 'textpack' is optional. It provides i18n strings to be used in conjunction with gTxt().
+// Syntax:
+// ## arbitrary comment
+// #@event
+// #@language ISO-LANGUAGE-CODE
+// abc_string_name => Localized String
+
+/** Uncomment me, if you need a textpack
+$plugin['textpack'] = <<< EOT
+#@admin
+#@language en-gb
+abc_sample_string => Sample String
+abc_one_more => One more
+#@language de-de
+abc_sample_string => Beispieltext
+abc_one_more => Noch einer
+EOT;
+**/
+// End of textpack
+
+if (!defined('txpinterface'))
+        @include_once('zem_tpl.php');
 
 # --- BEGIN PLUGIN CODE ---
 #
@@ -59,7 +120,8 @@
 #	Register the callback for the enumerate string event.
 # If the MLP pack is not present and active this will NOT get called.
 #
-register_callback( 'zem_crl_enumerate_strings' , 'l10n.enumerate_strings' );
+if (defined('txpinterface'))
+        register_callback( 'zem_crl_enumerate_strings' , 'l10n.enumerate_strings' );
 
 #
 #	Here's a callback routine used to register the above strings with
diff --git a/textpattern/l10n.css b/textpattern/l10n.css
index 2cd076a..bb861d3 100644
--- a/textpattern/l10n.css
+++ b/textpattern/l10n.css
@@ -39,7 +39,7 @@ l10n styles for other tabs...
 
 .l10n_values_list	{ float: right; width: 50%; }
 .l10n_string_list	{ float: left; width: 25%; }
-.l10n_subtab		{ padding: 0 30px; }
+.l10n_subtab		{ padding: 0 30px; clear:both; }
 .l10n_list			{ float: left; width: 50%; }
 .l10n_edit			{ float: right; width: 50%; }
 .l10n_owner_list	{ float: left; width: 20%; }
diff --git a/textpattern/lib/l10n_admin.php b/textpattern/lib/l10n_admin.php
index 51180a8..60efb01 100644
--- a/textpattern/lib/l10n_admin.php
+++ b/textpattern/lib/l10n_admin.php
@@ -91,10 +91,6 @@
 			}
 		}
 
-	register_callback('_l10n_category_extend', 'category_ui', 'extend_detail_form');
-	register_callback('_l10n_image_extend',    'image_ui',    'extend_detail_form');
-	register_callback('_l10n_link_extend',     'link_ui',     'extend_detail_form');
-
 	if ($app_mode !== 'async') {
 		ob_start('_l10n_process_admin_page');
 	}
@@ -234,37 +230,9 @@ function _l10n_check_index()
 	}
 function _l10n_post_save( $event , $step )
 {
-	$fields = array();
-	if ($event === 'section')
-	{
-		$fields[] = 'Section';
-	}
-	else if ($event === 'category' && strpos($step, '_save') !== false)
-	{
-		$fields = array('Category1', 'Category2');
-	}
-
-	if (empty($fields))
-	{
-		return false;
-	}
-
-	$old_name = doSlash( ps('old_name') );
-	$name     = doSlash( sanitizeForUrl( ps('name') ) );
-
-	if( $name !== $old_name )
-	{
-		$langs = MLPLanguageHandler::get_site_langs();
-		foreach( $langs as $lang )
-		{
-			$table = _l10n_make_textpattern_name(array('long'=>$lang));
-			foreach ($fields as $field)
-			{
-				$clause = $field . " = '$old_name'" ;
-				safe_update( $table , $field . " = '$name'", $clause );
-			}
-		}
-	}
+	#
+	#	Nothing to do, when tables are replaced by views 
+	#
 }
 
 function _l10n_list_filter( $event, $step )
@@ -306,7 +274,7 @@ function _l10n_list_filter( $event, $step )
 				}
 			}
 			$languages = join( ',' , $selected );
-			_l10n_create_temp_textpattern( $languages );
+//			_l10n_create_temp_textpattern( $languages );
 			break;
 		default:
 			break;
@@ -875,38 +843,15 @@ function _l10n_article_buffer_processor( $buffer )
 
 function _l10n_replace_rendition( $lang , $replace=false , $id='' )
 	{
-	$op = 'INSERT';
-	if( $replace )
-		$op = 'REPLACE';
-
-	if( empty($id) )
-		{
-		if(!empty($GLOBALS['ID']))
-			$id = intval($GLOBALS['ID']);
-		else
-			$id = gps('ID');
-		}
-
-	if( !MLPLanguageHandler::is_valid_code($lang) )
-		{
-		echo br , "Invalid language code '$lang' calculated in _l10n_add_rendition()";
-		return;
-		}
-	$table_name = safe_pfx( _l10n_make_textpattern_name($lang) );
-	$safe_txp = safe_pfx( 'textpattern' );
-
-	$sql = $op." INTO $table_name SELECT * FROM $safe_txp WHERE $safe_txp.ID='$id' LIMIT 1";
-	safe_query( $sql );
+		#
+		#	Nothing to do, when tables are replaced by views 
+		#
 	}
 function _l10n_remove_rendition( $lang , $id )
 	{
-	if( !MLPLanguageHandler::is_valid_code($lang) )
-		{
-		echo br , "Invalid language code '$lang' calculated in _l10n_add_rendition()";
-		return;
-		}
-	$table_name = safe_pfx( _l10n_make_textpattern_name($lang) );
-	safe_delete( $table_name , "`ID`='$id'" );
+		#
+		#	Nothing to do, when tables are replaced by views 
+		#
 	}
 function _l10n_add_rendition_to_article_cb( $event , $step )
 	{
@@ -1129,28 +1074,9 @@ function _l10n_pre_multi_edit_cb( $event , $step )
 
 function _l10n_observe_table_changes( $event , $step )
 {
-	static $l10n_hashes = array();
-
-	if (isset($l10n_hashes['textpattern'])) {
-		$rs = $l10n_hashes['textpattern'];
-	} else {
-		$rs = safe_show('COLUMNS', 'textpattern');
-		$l10n_hashes['textpattern'] = $rs;
-	}
-
-	$txp_table_hash = md5(serialize($l10n_hashes['textpattern']));
-	$previous_hashes = unserialize(get_pref('l10n_hashes'));
-
-	if ($previous_hashes['textpattern'] !== $txp_table_hash) {
-		_l10n_sync_table_definitions( $l10n_hashes );
-//	_l10n_update_dirty_flag( 'DIRTY' );
-	}
-
-	// Regenerate the hash table and stash it
-	$hash_table = array();
-	$hash_table['textpattern'] = $txp_table_hash;
-
-	set_pref('l10n_hashes', serialize($hash_table), 'l10n', PREF_HIDDEN);
+	#
+	#	Nothing to do, when tables are replaced by views 
+	#
 }
 
 function _l10n_check_lang_code( $lang )
@@ -1200,25 +1126,39 @@ function _l10n_check_lang_table( $lang )
 
 	$code = $result;
 	$table_name = _l10n_make_textpattern_name( $code );
-	if( safe_query( "SHOW COLUMNS FROM `$table_name`" ) )
-		{
-		return true;
+	$type = NULL;
+	if ( $r = safe_query( 'SHOW FULL TABLES') ) {
+		$type = 'NONE';
+		if ( mysqli_num_rows( $r ) > 0 ) {
+			while ( $a = mysqli_fetch_row( $r ) ) {
+				if ( $a[0] === PFX.$table_name ) {
+					$type = strtoupper($a[1]);
+				}
+			}
+	
+			mysqli_free_result( $r );
 		}
-	return array($code, $table_name);
+	}
+	
+	return array($code, $table_name, $type);
 	}
 function _l10n_generate_lang_table( $lang )
 	{
 	$result = _l10n_check_lang_table( $lang );
 	if( !is_array($result) ) return $result;
 
-	list($code, $table_name) = $result;
-	$where = ' WHERE `'.L10N_COL_LANG."`='$lang'";
-
-	safe_query( 'LOCK TABLES `'.PFX.$table_name.'` WRITE' );
-	safe_query( 'CREATE TABLE `'.PFX.$table_name.'` LIKE `'.PFX.'textpattern`' );
-	safe_query( 'INSERT INTO `'.PFX.$table_name.'` SELECT * FROM `'.PFX.'textpattern`'.$where );
-	safe_query( 'OPTIMIZE TABLE `'.PFX.$table_name.'`' );
-	safe_query( 'UNLOCK TABLES' );
+	list($code, $table_name, $type) = $result;
+	switch( $type ) {
+		case 'BASE TABLE':
+			safe_query( 'DROP TABLE `'.PFX.$table_name.'`' );
+			
+		case 'NONE':
+			$where = ' WHERE `'.L10N_COL_LANG."`='$lang'";
+			safe_query( 'CREATE VIEW `'.PFX.$table_name.'` AS SELECT * FROM `'.PFX.'textpattern`'.$where );
+			
+		case 'VIEW':
+		default:
+	}
 	}
 
 function _l10n_check_localise_table( $lang )
@@ -1293,88 +1233,9 @@ function _l10n_generate_localise_table_fields( $lang )
 */
 function _l10n_sync_table_definitions( $source = array() )
 {
-	if (!is_array($source)) {
-		return false;
-	}
-
-	foreach ($source as $table => $definition)
-	{
-//dmp($definition);
-		switch ($table)
-		{
-			case 'textpattern':
-				$langs = MLPLanguageHandler::get_site_langs();
-
-				foreach ($langs as $lang)
-				{
-					$sql = array();
-					$safe_lang = _l10n_check_lang_code( $lang );
-					if( !is_string($safe_lang) ) continue;
-
-					$table = _l10n_make_textpattern_name(array('long' => $lang));
-					$rs = safe_show('COLUMNS', $table);
-
-					foreach ($definition as $def)
-					{
-						$field = $def['Field'];
-
-						$type = $def['Type'];
-						$null = $def['Null'];
-						$default = $def['Default'];
-						$extra = $def['Extra'];
-
-						$found = false;
-						foreach ($rs as $idx => $lang_field) {
-							if ( $lang_field['Field'] === $field) {
-								$found = $idx;
-								break;
-							}
-						}
-
-						// ID fields can't be altered here due to auto_increment differences
-						// This can't be done earlier as we don't know the position in the destination table until now
-						if ($field === 'ID') {
-							unset($rs[$found]);
-							continue;
-						}
-
-						if ($found !== false) {
-							// Field exists in destination table so update its definition if anything's changed
-							$dest_type = $rs[$found]['Type'];
-							$dest_null = $rs[$found]['Null'];
-							$dest_default = $rs[$found]['Default'];
-							$dest_extra = $rs[$found]['Extra'];
-
-							if ( $type !== $dest_type
-									|| $null !== $dest_null
-									|| $default !== $dest_default
-									|| $extra !== $dest_extra )
-								{
-									$sql[] = 'MODIFY ' .$field. ' ' .$type . ($null === 'NO' ? ' NOT NULL' : ' NULL') . ($default ? ' DEFAULT "'.$default.'"' : '') . ' ' .$extra;
-								}
-
-							// Removing each found item from the destination table serves two purposes:
-							// 1) it speeds the loop up as things move forward
-							// 2) it means that any fields left over by the time the loop ends are fields that need removing
-							unset($rs[$found]);
-
-						} else {
-							// New field (or possibly a renamed field, but if that happens there are more urgent things to worry about!)
-							$sql[] = 'ADD ' .$field. ' ' .$type . ($null === 'NO' ? ' NOT NULL' : ' NULL') . ($default ? ' DEFAULT "'.$default.'"' : '') . ' ' .$extra;
-						}
-					}
-
-					// Extraneous fields: remove them
-					foreach ($rs as $def) {
-						$sql[] = 'DROP ' . $def['Field'];
-					}
-					foreach ($sql as $statement) {
-						safe_alter($table, $statement);
-					}
-				}
-			break;
-		}
-	}
+	#
+	#	Nothing to do, when tables are replaced by views 
+	#
 }
 
 function _l10n_pre_discuss_multi_edit( $event , $step )
@@ -1454,10 +1315,10 @@ function _l10n_build_sql_set( $table )
 	global $l10n_mappings;
 	$langs = MLPLanguageHandler::get_site_langs();
 	$default = MLPLanguageHandler::get_site_default_lang();
-	$set = '';
+	$set = array();
 
 	if( !isset($l10n_mappings[$table]) )
-		return $set;
+		return '';
 
 	$fields = $l10n_mappings[$table];
 	foreach( $fields as $field => $attributes )
@@ -1480,57 +1341,55 @@ function _l10n_build_sql_set( $table )
 	return join( ', ', $set );
 	}
 
-function _l10n_category_extend ($evt, $stp, $data, $rs) {
+function _l10n_category_paint( $page )
+	{
 	$default = MLPLanguageHandler::get_site_default_lang();
 
+	#
+	#	Insert the default title field's language's direction...
+	#
+	$dir = MLPLanguageHandler::get_lang_direction_markup( $default ) . ' ';
+	$f = '<input type="text" name="title"';
+	$page = str_replace( $f , $f.$dir , $page );
+
+	#
+	#	Insert the default title field's language name...
+	#
+	$f = '<label for="category_title">'.gTxt($row['type'].'_category_title');
+	$r = ' ['.MLPLanguageHandler::get_native_name_of_lang( $default ).']';
+	$page = str_replace( $f , $f.sp.$r , $page );
+
 	#
 	#	Insert the remaining language fields...
 	#
 	global $l10n_mappings;
 	$langs = MLPLanguageHandler::get_site_langs();
  	$fields = $l10n_mappings['txp_category'];
-	$r = '';
-	$id = $rs['id'];
-
+	$id = gps( 'id' );
+	assert_int($id);
+	$row = safe_row( '*' , 'txp_category' , "`id`='$id'" );
+	preg_match_all('/<div class="txp-form-field edit-category-title">([^<]*<[^>]*>){8}/', $page, $m);
+	$f = $m[0][0];
+	
 	foreach( $fields as $field => $attributes )
 		{
+		$r = '';
 		foreach( $langs as $lang )
 			{
 			$full_name = MLPLanguageHandler::get_native_name_of_lang( $lang );
 			$dir = MLPLanguageHandler::get_lang_direction_markup( $lang );
- 			if( $lang !== $default )
+			
+			if( $lang !== $default )
 				{
 				$field_name = _l10n_make_field_name( $field , $lang );
-				$r .= '<p class="edit-category-title"><span class="edit-label"><label for="category_title_'.$lang.'">['.$full_name.']</label></span>';
-				$r .= '<span class="edit-value"><input id="category_title_'.$lang.'" name="' . $field_name . '" value="'.$rs[$field_name].'" size="'.INPUT_REGULAR.'" type="text" '.$dir.' />';
-				$r .= '</span></p>'.n;
+				$r .= '<div class="txp-form-field edit-category-title">';
+				$r .= '<div class="txp-form-field-label"><label for="category_title_'.$lang.'">'.gTxt($row['type'].'_category_title').' ['. $full_name .']</label></div>';
+				$r .= '<div class="txp-form-field-value"><input id="category_title_'.$lang.'" '.$dir.' name="'. $field_name .'" type="text" size="'.INPUT_REGULAR.'" value="'. $row[$field_name] .'" /></div>';
+				$r .= '</div>';
 				}
 			}
+			$page = str_replace( $f , $f.n.$r , $page );
 		}
-	return $r;
-}
-
-function _l10n_category_paint( $page )
-	{
-	$default = MLPLanguageHandler::get_site_default_lang();
-
-	$id = gps( 'id' );
-	assert_int($id);
-	$row = safe_row( '*' , 'txp_category' , "`id`='$id'" );
-
-	#
-	#	Insert the default title field's language's direction...
-	#
-	$dir = MLPLanguageHandler::get_lang_direction_markup( $default ) . ' ';
-	$f = '<input type="text" name="title"';
-	$page = str_replace( $f , $f.$dir , $page );
-
-	#
-	#	Insert the default title field's language name...
-	#
-	$f = '<label for="category_title">'.gTxt($row['type'].'_category_title');
-	$r = ' ['.MLPLanguageHandler::get_native_name_of_lang( $default ).']';
-	$page = str_replace( $f , $f.sp.$r , $page );
 
 	return $page;
 	}
@@ -1556,6 +1415,20 @@ function _l10n_section_paint( $page )
 	{
 	$default = MLPLanguageHandler::get_site_default_lang();
 
+	#
+	#	Insert the default title field's language's direction...
+	#
+	$dir = MLPLanguageHandler::get_lang_direction_markup( $default ) . ' ';
+	$f = 'id="section_title"';
+	$page = str_replace( $f , $f.$dir , $page );
+
+	#
+	#	Insert the default title field's language name...
+	#
+	$f = '">'.gTxt('section_longtitle');
+	$r = '['.MLPLanguageHandler::get_native_name_of_lang( $default ) . ']';
+	$page = str_replace( $f , $f.n.$r , $page );
+	
 	#
 	#	Insert the remaining language title fields...
 	#
@@ -1566,11 +1439,8 @@ function _l10n_section_paint( $page )
 	$row = safe_row( '*' , 'txp_section' , "`name`='".doSlash($editing)."'" );
 	if( $row )
 		{
-		$ver = $prefs['version'];
-
-		$name  = txpspecialchars($row['name']);
-		$title = txpspecialchars($row['title']);
-		$f = 'id="section_title" /></span></p>';
+		preg_match_all('/<div class="txp-form-field edit-section-longtitle">([^<]*<[^>]*>){8}/', $page, $m);
+		$f = $m[0][0];
 
 		foreach( $fields as $field => $attributes )
 			{
@@ -1579,34 +1449,23 @@ function _l10n_section_paint( $page )
 				{
 				$full_name = MLPLanguageHandler::get_native_name_of_lang( $lang );
 				$dir = MLPLanguageHandler::get_lang_direction_markup( $lang );
+				
 				if( $lang !== $default )
 					{
 					$field_name = _l10n_make_field_name( $field , $lang );
-					$field_value = $row[$field_name];
-					$r .= '<p class="edit-section-title"><span class="edit-label"><label for="section_title_'.$lang.'">['. $full_name .']</label></span>';
-					$r .= '<span class="edit-value"><input id="section_title_'.$lang.'" type="text" size="'.INPUT_REGULAR.'" name="'. $field_name .'" value="'. $row[$field_name] .'"'.$dir.' /></span></p>';
+					$r .= '<div class="txp-form-field edit-section-longtitle">';
+					$r .= '<div class="txp-form-field-label"><label for="section_title_'.$lang.'">'.gTxt('section_longtitle').' ['. $full_name .']</label></div>';
+					$r .= '<div class="txp-form-field-value"><input id="section_title_'.$lang.'" '.$dir.' name="'. $field_name .'" type="text" size="'.INPUT_REGULAR.'" value="'. $row[$field_name] .'" /></div>';
+					$r .= '</div>';
 					}
 				}
 				$page = str_replace( $f , $f.n.$r , $page );
 			}
 		}
 
-	#
-	#	Insert the default title field's language's direction...
-	#
-	$dir = MLPLanguageHandler::get_lang_direction_markup( $default ) . ' ';
-	$f = 'id="section_title"';
-	$page = str_replace( $f , $f.$dir , $page );
-
-	#
-	#	Insert the default title field's language name...
-	#
-	$f = '">'.gTxt('section_longtitle');
-	$r = '['.MLPLanguageHandler::get_native_name_of_lang( $default ) . ']';
-	$page = str_replace( $f , $f.n.$r , $page );
-
 	return $page;
 	}
+
 function _l10n_section_save( $event , $step )
 	{
 	$id_name = 'name';
@@ -1621,6 +1480,20 @@ function _l10n_file_paint( $page )
 	{
 	$default = MLPLanguageHandler::get_site_default_lang();
 
+	#
+	#	Insert the default description field's language name...
+	#
+	$f = '<label for="file_description">'.gTxt('description');
+	$r = ' ['.MLPLanguageHandler::get_native_name_of_lang( $default ) . ']';
+	$page = str_replace( $f , $f.sp.$r , $page );
+
+	#
+	#	Insert the default title field's language name...
+	#
+	$f = '<label for="file_title">'.gTxt('title');
+	$r = ' ['.MLPLanguageHandler::get_native_name_of_lang( $default ) . ']';
+	$page = str_replace( $f , $f.sp.$r , $page );
+	
 	#
 	#	Insert the remaining language fields...
 	#
@@ -1630,10 +1503,19 @@ function _l10n_file_paint( $page )
 	$id = gps( 'id' );
 	assert_int($id);
 	$row = safe_row( '*' , 'txp_file' , "`id`='$id'" );
-	$dir = MLPLanguageHandler::get_lang_direction_markup( $default ) . ' ';
 	foreach( $fields as $field => $attributes )
 		{
 		$r = '';
+		if( $field === 'title' )
+			{
+				preg_match_all('/<div class="txp-form-field edit-file-title">([^<]*<[^>]*>){8}/', $page, $m);
+				$f = $m[0][0];
+			}
+		else
+			{
+				preg_match_all('/<div class="txp-form-field txp-form-field-textarea edit-file-description">([^<]*<[^>]*>){9}/', $page, $m);
+				$f = $m[0][0];
+			}
 
 		foreach( $langs as $lang )
 			{
@@ -1646,36 +1528,23 @@ function _l10n_file_paint( $page )
 
 				if( $field === 'title' )
 					{
-					$r .= '<p class="edit-file-title"><span class="edit-label"><label for="file_title_'.$lang.'">['.$full_name.']</label></span>';
-					$r .= '<span class="edit-value"><input type="text" id="file_title_'.$lang.'" name="'.$field_name.'" '.$dir.' value="'.$row[$field_name].'" size="'.INPUT_REGULAR.'" /></span></p>'.n;
-					$f = '<p class="edit-file-category">';
+					$r .= '<div class="txp-form-field edit-file-title">';
+					$r .= '<div class="txp-form-field-label"><label for="file_title_'.$lang.'">'.gTxt('title').' ['.$full_name.']</label></div>';
+					$r .= '<div class="txp-form-field-value"><input type="text" id="file_title_'.$lang.'" name="'.$field_name.'" '.$dir.' value="'.$row[$field_name].'" size="'.INPUT_REGULAR.'" /></div>';
+					$r .= '</div>';
 					}
 				else
 					{
-					$r .= '<p class="edit-file-description"><span class="edit-label"><label for="file_description_'.$lang.'">['.$full_name.']</label></span>';
-					$r .= '<textarea id="file_description_'.$lang.'" name="'.$field_name .'" cols="'.INPUT_LARGE.'" rows="'.INPUT_XSMALL.'"'.$dir.'>';
-					$r .= $row[$field_name].'</textarea></p>'.n;
-					$f = '<fieldset class="file-created">';
+					$r .= '<div class="txp-form-field txp-form-field-textarea edit-file-description">';
+					$r .= '<div class="txp-form-field-label"><label for="file_description_'.$lang.'">'.gTxt('description').' ['.$full_name.']</label></div>';
+					$r .= '<div class="txp-form-field-value"><textarea id="file_description_'.$lang.'" '.$dir.' name="'.$field_name .'" cols="'.INPUT_LARGE.'" rows="'.INPUT_XSMALL.'">'.$row[$field_name].'</textarea></div>';
+					$r .= '</div>';
 					}
 				}
 			}
-			$page = str_replace( $f , $r.n.$f , $page );
+			$page = str_replace( $f , $f.n.$r , $page );
 		}
 
-	#
-	#	Insert the default description field's language name...
-	#
-	$f = '<label for="file_description">'.gTxt('description');
-	$r = ' ['.MLPLanguageHandler::get_native_name_of_lang( $default ) . ']';
-	$page = str_replace( $f , $f.sp.$r , $page );
-
-	#
-	#	Insert the default title field's language name...
-	#
-	$f = '<label for="file_title">'.gTxt('title');
-	$r = ' ['.MLPLanguageHandler::get_native_name_of_lang( $default ) . ']';
-	$page = str_replace( $f , $f.sp.$r , $page );
-
 	return $page;
 	}
 
@@ -1690,58 +1559,59 @@ function _l10n_file_save( $event , $step )
 	safe_update( $table , $set , $where );
 	}
 
-function _l10n_link_extend ($evt, $stp, $data, $rs) {
+function _l10n_link_paint( $page )
+	{
 	$default = MLPLanguageHandler::get_site_default_lang();
 
+	#
+	#	Insert the default title field's language's direction...
+	#
+	$dir = MLPLanguageHandler::get_lang_direction_markup( $default ) . ' ';
+	$f = 'id="link-description"';
+	$page = str_replace( $f , $f.$dir , $page );
+
+	#
+	#	Insert the default title field's language name...
+	#
+	$f = 'for="link_description">'.gTxt('description');
+	$r = '['.MLPLanguageHandler::get_native_name_of_lang( $default ) . ']';
+	$page = str_replace( $f , $f.n.$r , $page );
+	
 	#
 	#	Insert the remaining language fields...
 	#
 	global $l10n_mappings;
 	$langs = MLPLanguageHandler::get_site_langs();
  	$fields = $l10n_mappings['txp_link'];
-	$r = '';
-	$id = $rs['id'];
+	$id = gps( 'id' );
+	assert_int($id);
+	$row = safe_row( '*' , 'txp_link' , "`id`='$id'" );
+	preg_match_all('/<div class="txp-form-field txp-form-field-textarea edit-link-description">([^<]*<[^>]*>){11}/', $page, $m);
+	$f = $m[0][0];
 
 	foreach( $fields as $field => $attributes )
 		{
+		$r = '';
 		foreach( $langs as $lang )
 			{
 			$full_name = MLPLanguageHandler::get_native_name_of_lang( $lang );
 			$dir = MLPLanguageHandler::get_lang_direction_markup( $lang );
- 			if( $lang !== $default )
+			
+			if( $lang !== $default )
 				{
 				$field_name = _l10n_make_field_name( $field , $lang );
-				$r .= '<p class="edit-link-description"><span class="edit-label">';
-				$r .= '<label for="link_description_'.$lang.'">['.$full_name.']</label></span>';
-				$r .= '<textarea id="link_description_'.$lang.'" name="'.$field_name .'" cols="'.INPUT_LARGE.'" rows="'.INPUT_SMALL.'"'.$dir.'>';
-				$r .= $rs[$field_name];
-				$r .= '</textarea></p>'.n;
+				$r .= '<div class="txp-form-field txp-form-field-textarea edit-link-description">';
+				$r .= '<div class="txp-form-field-label"><label for="link_description_'.$lang.'">'.gTxt('description').' ['. $full_name .']</label></div>';
+				$r .= '<div class="txp-form-field-value"><textarea id="link_description_'.$lang.'" '.$dir.' name="'.$field_name.'" cols="'.INPUT_LARGE.'" rows="'.INPUT_XSMALL.'">'.$row[$field_name].'</textarea></div>';
+				$r .= '</div>';
 				}
 			}
+			$page = str_replace( $f , $f.n.$r , $page );
 		}
-	return $r;
-}
-
-function _l10n_link_paint( $page )
-	{
-	$default = MLPLanguageHandler::get_site_default_lang();
-
-	#
-	#	Insert the default title field's language's direction...
-	#
-	$dir = MLPLanguageHandler::get_lang_direction_markup( $default ) . ' ';
-	$f = 'id="link-description"';
-	$page = str_replace( $f , $f.$dir , $page );
-
-	#
-	#	Insert the default title field's language name...
-	#
-	$f = 'for="link_description">'.gTxt('description');
-	$r = '['.MLPLanguageHandler::get_native_name_of_lang( $default ) . ']';
-	$page = str_replace( $f , $f.n.$r , $page );
 
 	return $page;
 	}
+
 function _l10n_link_save( $event , $step )
 	{
 	$id_name = 'id';
@@ -1753,45 +1623,6 @@ function _l10n_link_save( $event , $step )
 	safe_update( $table , $set , $where );
 	}
 
-function _l10n_image_extend ($evt, $stp, $data, $rs) {
-	$default = MLPLanguageHandler::get_site_default_lang();
-
-	#
-	#	Insert the remaining language fields...
-	#
-	global $l10n_mappings;
-	$langs = MLPLanguageHandler::get_site_langs();
- 	$fields = $l10n_mappings['txp_image'];
-	$id = $rs['id'];
-	$r = '';
-	foreach( $langs as $lang )
-		{
-		if( $lang !== $default )
-			{
-			$full_name = MLPLanguageHandler::get_native_name_of_lang( $lang );
-			$dir = MLPLanguageHandler::get_lang_direction_markup( $lang );
-			foreach( $fields as $field => $attributes )
-				{
-				$field_name = _l10n_make_field_name( $field , $lang );
-
-				if( $field === 'alt' )
-					{
-					$r .= '<p class="edit-image-alt-text"><span class="edit-label"><label for="image_alt_text_'.$lang.'">'.gTxt('alt_text').' ['.$full_name.']</label></span>';
-					$r .= '<span class="edit-value"><input type="text" name="'.$field_name.'" '.$dir.' value="'.$rs[$field_name].'" size="'.INPUT_REGULAR.'" id="image_alt_text_'.$lang.'" /></span></p>'.n;
-					}
-				else
-					{
-					$r .= '<p class="edit-image-caption"><span class="edit-label"><label for="image_caption_'.$lang.'">'.gTxt('caption').' ['.$full_name.']</label></span>';
-					$r .= '<textarea id="image_caption_'.$lang.'" name="'.$field_name .'" cols="'.INPUT_LARGE.'" rows="'.INPUT_XSMALL.'"'.$dir.'>';
-					$r .= $rs[$field_name].'</textarea></p>'.n;
-					}
-				}
-			}
-		}
-
-	return $r;
-}
-
 function _l10n_image_paint( $page )
 	{
 	$default = MLPLanguageHandler::get_site_default_lang();
@@ -1814,8 +1645,72 @@ function _l10n_image_paint( $page )
 	$f = 'for="image_caption">'.gTxt('caption');
 	$page = str_replace( $f , $f.n.$r , $page );
 
+	#
+	#	Insert the remaining language fields...
+	#
+	global $l10n_mappings;
+	$langs = MLPLanguageHandler::get_site_langs();
+ 	$fields = $l10n_mappings['txp_image'];
+	$id = gps( 'id' );
+	assert_int($id);
+	$row = safe_row( '*' , 'txp_image' , "`id`='$id'" );
+	foreach( $fields as $field => $attributes )
+		{
+		$r = '';
+		if( $field === 'alt' )
+			{
+				// convert input to textarea - begin
+				preg_match_all('/<div class="txp-form-field edit-image-alt-text">([^<]*<[^>]*>){8}/', $page, $m);
+				$f = $m[0][0];
+				$full_name = MLPLanguageHandler::get_native_name_of_lang( $default );
+				$dir = MLPLanguageHandler::get_lang_direction_markup( $default );
+				$r .= '<div class="txp-form-field edit-image-alt-text">';
+				$r .= '<div class="txp-form-field-label"><label for="image_alt_text">'.gTxt('alt_text').' ['.$full_name.']</label></div>';
+				$r .= '<div class="txp-form-field-value"><textarea id="image_alt_text" '.$dir.' name="'.$field .'" cols="'.INPUT_LARGE.'" rows="'.INPUT_XSMALL.'">'.$row[$field].'</textarea></div>';
+				$r .= '</div>';
+				$page = str_replace( $f , $r , $page );
+				$r = '';
+				// convert input to textarea - end
+				preg_match_all('/<div class="txp-form-field edit-image-alt-text">([^<]*<[^>]*>){9}/', $page, $m);
+				$f = $m[0][0];
+			}
+		else
+			{
+				preg_match_all('/<div class="txp-form-field txp-form-field-textarea edit-image-caption">([^<]*<[^>]*>){9}/', $page, $m);
+				$f = $m[0][0];
+			}
+
+		foreach( $langs as $lang )
+			{
+			$field_name = _l10n_make_field_name( $field , $lang );
+
+			if( $lang !== $default )
+				{
+				$full_name = MLPLanguageHandler::get_native_name_of_lang( $lang );
+				$dir = MLPLanguageHandler::get_lang_direction_markup( $lang );
+
+				if( $field === 'alt' )
+					{
+					$r .= '<div class="txp-form-field edit-image-alt-text">';
+					$r .= '<div class="txp-form-field-label"><label for="image_alt_text_'.$lang.'">'.gTxt('alt_text').' ['.$full_name.']</label></div>';
+					$r .= '<div class="txp-form-field-value"><textarea id="image_alt_text_'.$lang.'" '.$dir.' name="'.$field_name .'" cols="'.INPUT_LARGE.'" rows="'.INPUT_XSMALL.'">'.$row[$field_name].'</textarea></div>';
+					$r .= '</div>';
+					}
+				else
+					{
+					$r .= '<div class="txp-form-field txp-form-field-textarea edit-image-caption">';
+					$r .= '<div class="txp-form-field-label"><label for="image_caption_'.$lang.'">'.gTxt('caption').' ['.$full_name.']</label></div>';
+					$r .= '<div class="txp-form-field-value"><textarea id="image_caption_'.$lang.'" '.$dir.' name="'.$field_name .'" cols="'.INPUT_LARGE.'" rows="'.INPUT_XSMALL.'">'.$row[$field_name].'</textarea></div>';
+					$r .= '</div>';
+					}
+				}
+			}
+			$page = str_replace( $f , $f.n.$r , $page );
+		}
+	
 	return $page;
 	}
+
 function _l10n_image_save( $event , $step )
 	{
 	$id_name = 'id';
diff --git a/textpattern/lib/l10n_admin_classes.php b/textpattern/lib/l10n_admin_classes.php
index 4b435bf..c5299bf 100644
--- a/textpattern/lib/l10n_admin_classes.php
+++ b/textpattern/lib/l10n_admin_classes.php
@@ -1276,7 +1276,7 @@ static function build_txp_langfile( $lang , $exclude_plugins = true , $media = '
 		$out[] = '#';
 		$out[] = '# =====================================================================';
 		$out[] = '# ';
-		$out[] = "#@version 4.5.2;".$time;
+		$out[] = "#@version 4.6.2;".$time;
 		$out[] = '# ';
 		foreach( $strings as $string )
 			{
@@ -1523,9 +1523,8 @@ function prefs_save_cb( $event='' , $step='' )
 				#
 				#	Add language tables as needed and populate them as far as possible...
 				#
-				$indexes = "(PRIMARY KEY  (`ID`), KEY `categories_idx` (`Category1`(10),`Category2`(10)), KEY `Posted` (`Posted`), FULLTEXT KEY `searching` (`Title`,`Body`))";
-				$sql = "create table `$full_name` $indexes ENGINE=MyISAM select * from `".PFX."textpattern` where ".L10N_COL_LANG."='$lang'";
-				$ok = safe_query( $sql );
+                                $sql = "CREATE VIEW `$full_name` AS SELECT * FROM `".PFX."textpattern` WHERE ".L10N_COL_LANG."='$lang'";
+                                $ok = safe_query( $sql );
 
 				#
 				#	Add fields for this language...
@@ -1553,7 +1552,7 @@ function prefs_save_cb( $event='' , $step='' )
 				#
 				#	Drop language tables that are no longer needed...
 				#
-				$sql = 'drop table `'.$full_name.'`';
+                                $sql = 'DROP VIEW `'.$full_name.'`';
 				$ok = safe_query( $sql );
 
 				#
@@ -3616,6 +3615,7 @@ function _clone_rendition( $source , $article_id , $target_lang , $new_author=''
 			$source['AuthorID'] = $new_author;
 		$source[L10N_COL_LANG] = $target_lang;
 		$source['Status'] = 1;
+		$source['Posted'] = 'now()';
 		$source['LastMod'] = 'now()';
 		$source['feed_time'] = 'now()';
 		$source['uid'] = md5(uniqid(rand(),true));
@@ -3643,15 +3643,6 @@ function _clone_rendition( $source , $article_id , $target_lang , $new_author=''
 		#
 		MLPArticles::add_rendition( $article_id , $rendition_id , $target_lang );
 
-		#
-		#	Add into the rendition table for this lang ensuring this has the ID of the
-		# just added master entry!
-		#
-		$insert[] = '`ID`='.doSlash( $rendition_id );
-		$insert_sql = join( ', ' , $insert );
-		$table_name = _l10n_make_textpattern_name( array( 'long'=>$target_lang ) );
-		safe_insert( $table_name , $insert_sql );
-
 		return $rendition_id;
 		}
 
@@ -3791,16 +3782,6 @@ function delete_article()
 		#
 		$master_deleted = safe_delete( 'textpattern' , L10N_COL_GROUP."=$article" );
 
-		#
-		#	Delete from the rendition tables...
-		#
-		foreach( $renditions as $rendition )
-			{
-			$lang = $rendition[L10N_COL_LANG];
-			$rendition_table = _l10n_make_textpattern_name( array( 'long'=>$lang ) );
-			safe_delete( $rendition_table , L10N_COL_GROUP."=$article" );
-			}
-
 		#
 		#	Delete from the articles table...
 		#
@@ -3838,8 +3819,8 @@ function delete_rendition()
 		#
 		#	Delete from the correct language rendition table...
 		#
-		$rendition_table = _l10n_make_textpattern_name( array( 'long'=>$lang ) );
-		$rendition_deleted = safe_delete( $rendition_table , "`ID`=$rendition" );
+		# (not required, as tables changed by views)
+		$rendition_deleted = true;
 
 		#
 		#	Delete from the article table...
@@ -4035,6 +4016,7 @@ function get_rendition_counts()
 
 	function render_article_table()
 		{
+		global $article_list_pageby;
 		$event = $this->parent->event;
 
 		#
@@ -5217,9 +5199,8 @@ function setup_7()		# Create per-language copies of textpattern table
 			{
 			$code       = MLPLanguageHandler::compact_code( $lang );
 			$table_name = _l10n_make_textpattern_name( $code );
-			$indexes = "(PRIMARY KEY  (`ID`), KEY `categories_idx` (`Category1`(10),`Category2`(10)), KEY `Posted` (`Posted`), FULLTEXT KEY `searching` (`Title`,`Body`))";
 
-			$sql = "create table `".PFX."$table_name` $indexes ENGINE=MyISAM select * from `".PFX."textpattern` where `".L10N_COL_LANG."`='$lang'";
+                        $sql = "CREATE VIEW `".PFX."$table_name` AS SELECT * FROM `".PFX."textpattern` WHERE ".L10N_COL_LANG."='$lang'";
 			$ok = safe_query( $sql );
 			if (mysqli_error($DB->link) == "Table '".PFX."$table_name' already exists")
 				$ok = 'skipped';
@@ -5377,7 +5358,7 @@ function cleanup_7()	# Drop the per-language textpattern_XX tables...
 			{
 			$code  = MLPLanguageHandler::compact_code( $lang );
 			$table_name = _l10n_make_textpattern_name( $code );
-			$sql = 'drop table `'.PFX.$table_name.'`';
+                        $sql = 'DROP VIEW `'.PFX.$table_name.'`';
 			$ok = safe_query( $sql );
 			$this->add_report_item( gTxt('l10n-op_table',array('{op}'=>'Drop' ,'{table}'=>MLPLanguageHandler::get_native_name_of_lang( $lang ).' ['.$table_name.']')) , $ok , true );
 			}
diff --git a/textpattern/vendors/Netcarver/MLP/Kickstart.php b/textpattern/vendors/Netcarver/MLP/Kickstart.php
index 0e26d2a..041b1f5 100644
--- a/textpattern/vendors/Netcarver/MLP/Kickstart.php
+++ b/textpattern/vendors/Netcarver/MLP/Kickstart.php
@@ -14,7 +14,7 @@
 class Kickstart
 {
     // IMPORTANT: Bump this for each release so the dirty flag is set
-    protected $l10n_release_version = '4.6.0.20160216';
+    protected $l10n_release_version = '4.6.2.20170125';
     protected $l10n_install_version = '';
 
     /**
@@ -27,7 +27,7 @@ public function l10n_upgrade()
         if (txpinterface === 'admin') {
             $this->l10n_install_version = get_pref('l10n_version', '', 1);
 
-            if (!$dbversion || ($dbversion != $thisversion) || ($l10n_release_version != $installed_l10n_version) || $txp_using_svn) {
+            if (!$dbversion || ($dbversion != $thisversion) || ($this->l10n_release_version != $this->l10n_install_version) || $txp_using_svn) {
                 // Dirty: perform upgrade.
                 // Ensure new indexes are present in case of upgrade.
                 _l10n_check_index();