diff --git a/acf.php b/acf.php
index 7513672..3383e17 100644
--- a/acf.php
+++ b/acf.php
@@ -3,7 +3,7 @@
 Plugin Name: Advanced Custom Fields PRO
 Plugin URI: https://www.advancedcustomfields.com/
 Description: Customise WordPress with powerful, professional and intuitive fields
-Version: 5.3.10
+Version: 5.4.4
 Author: Elliot Condon
 Author URI: http://www.elliotcondon.com/
 Copyright: Elliot Condon
@@ -58,7 +58,7 @@ class acf {
 			
 			// basic
 			'name'				=> __('Advanced Custom Fields', 'acf'),
-			'version'			=> '5.3.10',
+			'version'			=> '5.4.4',
 						
 			// urls
 			'basename'			=> plugin_basename( __FILE__ ),
@@ -81,7 +81,9 @@ class acf {
 			'l10n'				=> true,
 			'l10n_textdomain'	=> '',
 			'google_api_key'	=> '',
-			'google_api_client'	=> ''
+			'google_api_client'	=> '',
+			'enqueue_google_maps'	=> true,
+			'enqueue_select2'		=> true,
 		);
 		
 		
@@ -98,6 +100,8 @@ class acf {
 		
 		// core
 		acf_include('core/ajax.php');
+		acf_include('core/cache.php');
+		acf_include('core/fields.php');
 		acf_include('core/field.php');
 		acf_include('core/input.php');
 		acf_include('core/validation.php');
@@ -441,11 +445,64 @@ class acf {
 	
 	
 	/*
-function posts_request( $thing ) {
+	*  get_setting
+	*
+	*  This function will return a value from the settings array found in the acf object
+	*
+	*  @type	function
+	*  @date	28/09/13
+	*  @since	5.0.0
+	*
+	*  @param	$name (string) the setting name to return
+	*  @param	$value (mixed) default value
+	*  @return	$value
+	*/
+	
+	function get_setting( $name, $value = null ) {
+		
+		// check settings
+		if( isset($this->settings[ $name ]) ) {
+			
+			$value = $this->settings[ $name ];
+			
+		}
+		
+		
+		// filter for 3rd party customization
+		if( substr($name, 0, 1) !== '_' ) {
+			
+			$value = apply_filters( "acf/settings/{$name}", $value );
+			
+		}
+		
+		
+		// return
+		return $value;
+		
+	}
+	
+	
+	/*
+	*  update_setting
+	*
+	*  This function will update a value into the settings array found in the acf object
+	*
+	*  @type	function
+	*  @date	28/09/13
+	*  @since	5.0.0
+	*
+	*  @param	$name (string)
+	*  @param	$value (mixed)
+	*  @return	n/a
+	*/
+	
+	function update_setting( $name, $value ) {
+		
+		$this->settings[ $name ] = $value;
+		
+		return true;
 		
-		return $thing;
 	}
-*/
 	
 }
 
diff --git a/admin/field-group.php b/admin/field-group.php
index 10476b0..25579d5 100644
--- a/admin/field-group.php
+++ b/admin/field-group.php
@@ -102,8 +102,8 @@ class acf_admin_field_group {
 		if( !acf_is_screen('acf-field-group') ) return;
 		
 		
-		// disable JSON to avoid conflicts between DB and JSON
-		acf_disable_local();
+		// disable filters to ensure ACF loads raw data from DB
+		acf_disable_filters();
 		
 		
 		// enqueue scripts
@@ -219,7 +219,7 @@ class acf_admin_field_group {
 		
 		// render post data
 		acf_form_data(array( 
-			'post_id'	=> $post->post_id, 
+			'post_id'	=> $post->ID, 
 			'nonce'		=> 'field_group',
 			'ajax'		=> 0
 		));
@@ -463,13 +463,11 @@ class acf_admin_field_group {
 		}
         
         
-        // disable local to avoid conflicts between DB and local
-		acf_disable_local();
+        // disable filters to ensure ACF loads raw data from DB
+		acf_disable_filters();
+		
 		
-        
         // save fields
-		unset( $_POST['acf_fields']['acfcloneindex'] );
-		
 		if( !empty($_POST['acf_fields']) ) {
 			
 			foreach( $_POST['acf_fields'] as $field ) {
@@ -509,16 +507,20 @@ class acf_admin_field_group {
 		// delete fields
         if( $_POST['_acf_delete_fields'] ) {
         	
+        	// clean
 	    	$ids = explode('|', $_POST['_acf_delete_fields']);
 	    	$ids = array_map( 'intval', $ids );
 	    	
+	    	
+	    	// loop
 			foreach( $ids as $id ) {
-			
-				if( $id != 0 ) {
 				
-					acf_delete_field( $id );
-					
-				}
+				// bai early if no id
+				if( !$id ) continue;
+				
+				
+				// delete
+				acf_delete_field( $id );
 				
 			}
 			
@@ -560,7 +562,8 @@ class acf_admin_field_group {
 		
 		// get fields
 		$view = array(
-			'fields' => acf_get_fields_by_id( $field_group['ID'] )
+			'fields'	=> acf_get_fields_by_id( $field_group['ID'] ),
+			'parent'	=> 0
 		);
 		
 		
@@ -1124,8 +1127,8 @@ class acf_admin_field_group {
 	
 	function ajax_move_field() {
 		
-		// disable JSON to avoid conflicts between DB and JSON
-		acf_disable_local();
+		// disable filters to ensure ACF loads raw data from DB
+		acf_disable_filters();
 		
 		
 		$args = acf_parse_args($_POST, array(
diff --git a/admin/settings-tools.php b/admin/settings-tools.php
index 4c88dc3..65b4024 100644
--- a/admin/settings-tools.php
+++ b/admin/settings-tools.php
@@ -71,8 +71,8 @@ class acf_settings_tools {
 	
 	function load() {
 		
-		// all export pages should not load local fields
-		acf_disable_local();
+		// disable filters to ensure ACF loads raw data from DB
+		acf_disable_filters();
 		
 		
 		// run import / export
diff --git a/admin/update-network.php b/admin/update-network.php
index 0b704af..cbebf55 100644
--- a/admin/update-network.php
+++ b/admin/update-network.php
@@ -54,7 +54,7 @@ class acf_admin_update_network {
 		
 		
 		// loop through sites and find updates
-		$sites = wp_get_sites();
+		$sites = acf_get_sites();
 		
 		if( $sites ) {
 			
@@ -177,7 +177,7 @@ class acf_admin_update_network {
 		
 		
 		// loop through sites and find updates
-		$sites = wp_get_sites();
+		$sites = acf_get_sites();
 		
 		if( $sites ) {
 			
@@ -239,4 +239,49 @@ new acf_admin_update_network();
 
 endif;
 
+
+/*
+*  acf_get_sites
+*
+*  This function will return an array of site data
+*
+*  @type	function
+*  @date	29/08/2016
+*  @since	5.4.0
+*
+*  @param	n/a
+*  @return	(array)
+*/
+
+function acf_get_sites() {
+	
+	// vars
+	$sites = array();
+	
+	
+	// WP >= 4.6
+	if( function_exists('get_sites') ) {
+		
+		$_sites = get_sites();
+		
+		foreach( $_sites as $_site ) {
+			
+	        $_site = get_site( $_site );
+	        $sites[] = $_site->to_array();
+	        
+	    }
+		
+	// WP < 4.6	
+	} else {
+		
+		$sites = wp_get_sites();
+		
+	}
+	
+	
+	// return
+	return $sites;
+	
+}
+
 ?>
diff --git a/admin/views/field-group-field.php b/admin/views/field-group-field.php
index 640d315..ed3b613 100644
--- a/admin/views/field-group-field.php
+++ b/admin/views/field-group-field.php
@@ -1,7 +1,8 @@
 <?php 
 
-// global
-global $post;
+// vars
+$field = false;
+$i = 0;
 
 
 // extract args
diff --git a/admin/views/field-group-fields.php b/admin/views/field-group-fields.php
index 76c1ad0..34e3bf4 100644
--- a/admin/views/field-group-fields.php
+++ b/admin/views/field-group-fields.php
@@ -1,27 +1,15 @@
 <?php 
 
 // vars
-// Note: $args is always passed to this view from above
-$fields = array();
+$fields = false;
 $layout = false;
 $parent = 0;
+$clone = false;
 
 
 // use fields if passed in
 extract( $args );
 
-
-// add clone
-$fields[] = acf_get_valid_field(array(
-	'ID'		=> 'acfcloneindex',
-	'key'		=> 'acfcloneindex',
-	'label'		=> __('New Field','acf'),
-	'name'		=> 'new_field',
-	'type'		=> 'text',
-	'parent'	=> $parent
-));
-
-
 ?>
 <div class="acf-field-list-wrap">
 	
@@ -32,18 +20,23 @@ $fields[] = acf_get_valid_field(array(
 		<li class="li-field-type"><?php _e('Type','acf'); ?></li>
 	</ul>
 	
-	<div class="acf-field-list<?php if( $layout ){ echo " layout-{$layout}"; } ?>">
+	<div class="acf-field-list<?php if( $layout ){ echo " layout-{$layout}"; } ?>">	
+		<?php
 		
-		<?php foreach( $fields as $i => $field ): ?>
+		if( $fields ) {
 			
-			<?php acf_get_view('field-group-field', array( 'field' => $field, 'i' => $i )); ?>
-			
-		<?php endforeach; ?>
+			foreach( $fields as $i => $field ) {
+				
+				acf_get_view('field-group-field', array( 'field' => $field, 'i' => $i ));
+				
+			}
 		
-		<div class="no-fields-message" <?php if(count($fields) > 1){ echo 'style="display:none;"'; } ?>>
+		}
+		
+		?>
+		<div class="no-fields-message" <?php if( $fields ){ echo 'style="display:none;"'; } ?>>
 			<?php _e("No fields. Click the <strong>+ Add Field</strong> button to create your first field.",'acf'); ?>
 		</div>
-		
 	</div>
 	
 	<ul class="acf-hl acf-tfoot">
@@ -51,5 +44,22 @@ $fields[] = acf_get_valid_field(array(
 			<a href="#" class="button button-primary button-large add-field"><?php _e('+ Add Field','acf'); ?></a>
 		</li>
 	</ul>
-
+	
+<?php if( !$parent ):
+	
+	// get clone
+	$clone = acf_get_valid_field(array(
+		'ID'		=> 'acfcloneindex',
+		'key'		=> 'acfcloneindex',
+		'label'		=> __('New Field','acf'),
+		'name'		=> 'new_field',
+		'type'		=> 'text'
+	));
+	
+	?>
+	<script type="text/html" id="tmpl-acf-field">
+	<?php acf_get_view('field-group-field', array( 'field' => $clone )); ?>
+	</script>
+<?php endif;?>
+	
 </div>
diff --git a/admin/views/settings-addons.php b/admin/views/settings-addons.php
index ff67a76..1c4519e 100644
--- a/admin/views/settings-addons.php
+++ b/admin/views/settings-addons.php
@@ -14,7 +14,7 @@ $json = acf_extract_var( $args, 'json');
 			
 			<?php foreach( $json as $addon ): 
 				
-				$addon = acf_parse_args($addon, array(
+				$addon = wp_parse_args($addon, array(
 					"title"			=> "",
 			        "slug"			=> "",
 			        "description"	=> "",
diff --git a/api/api-field-group.php b/api/api-field-group.php
index d531dcf..d2d1a45 100644
--- a/api/api-field-group.php
+++ b/api/api-field-group.php
@@ -53,7 +53,7 @@ function acf_is_field_group_key( $key = '' ) {
 function acf_get_valid_field_group( $field_group = false ) {
 	
 	// parse in defaults
-	$field_group = acf_parse_args( $field_group, array(
+	$field_group = wp_parse_args( $field_group, array(
 		'ID'					=> 0,
 		'key'					=> '',
 		'title'					=> '',
@@ -140,54 +140,71 @@ function acf_get_field_groups( $args = false ) {
 	
 	// vars
 	$field_groups = array();
+	$post_ids = array();
+	$cache_key = "get_field_groups";
 	
 	
-	// cache
-	$found = false;
-	$cache = wp_cache_get( 'get_field_groups', 'acf', false, $found );
-	
-	if( $found ) {
+	// check cache for ids
+	if( acf_isset_cache($cache_key) ) {
 		
-		return acf_filter_field_groups( $cache, $args );
+		$post_ids = acf_get_cache($cache_key);
+	
+	// query DB for child ids
+	} else {
+		
+		// query
+		$posts = get_posts(array(
+			'post_type'					=> 'acf-field-group',
+			'posts_per_page'			=> -1,
+			'orderby' 					=> 'menu_order title',
+			'order' 					=> 'asc',
+			'suppress_filters'			=> false, // allow WPML to modify the query
+			'post_status'				=> array('publish', 'acf-disabled'),
+			'update_post_meta_cache'	=> false
+		));
+		
+		
+		// loop
+		if( $posts ) {
+			
+			foreach( $posts as $post ) {
+				
+				$post_ids[] = $post->ID;
+				
+			}
+				
+		}
+		
+		
+		// update cache
+		acf_set_cache($cache_key, $post_ids);
 		
 	}
 	
 	
-	// load from DB
-	$posts = get_posts(array(
-		'post_type'					=> 'acf-field-group',
-		'posts_per_page'			=> -1,
-		'orderby' 					=> 'menu_order title',
-		'order' 					=> 'asc',
-		'suppress_filters'			=> false, // allow WPML to modify the query
-		'post_status'				=> array('publish', 'acf-disabled'),
-		'update_post_meta_cache'	=> false
-	));
-	
-	
-	// loop through and load field groups
-	if( $posts ) {
+	// load field groups
+	foreach( $post_ids as $post_id ) {
 		
-		foreach( $posts as $post ) {
-			
-			// add to return array
-			$field_groups[] = acf_get_field_group( $post );
-			
-		}
+		$field_groups[] = acf_get_field_group( $post_id );
 		
 	}
 	
 	
 	// filter
+	// - allows local field groups to be appended
 	$field_groups = apply_filters('acf/get_field_groups', $field_groups);
 	
 	
-	// set cache
-	wp_cache_set( 'get_field_groups', $field_groups, 'acf' );
-			
+	// filter via args
+	if( $args ) {
+		
+		$field_groups = acf_filter_field_groups( $field_groups, $args );
+		
+	}
+	
 	
 	// return		
-	return acf_filter_field_groups( $field_groups, $args );
+	return $field_groups;
 	
 }
 
@@ -261,28 +278,29 @@ function acf_filter_field_groups( $field_groups, $args = false ) {
 *  @return	$field_group (array)
 */
 
-function acf_get_field_group( $selector = false ) {
+function acf_get_field_group( $selector = null ) {
 	
 	// vars
 	$field_group = false;
-	$k = 'ID';
-	$v = 0;
+	$type = 'ID';
 	
 	
-	// $post_id or $key
+	// ID
 	if( is_numeric($selector) ) {
 		
-		$v = $selector;
-		
-	} elseif( is_string($selector) ) {
-		
-		$k = 'key';
-		$v = $selector;
-		
+		// do nothing
+	
+	// object
 	} elseif( is_object($selector) ) {
 		
-		$v = $selector->ID;
+		$selector = $selector->ID;
+	
+	// string
+	} elseif( is_string($selector) ) {
 		
+		$type = 'key';
+	
+	// other
 	} else {
 		
 		return false;
@@ -290,39 +308,50 @@ function acf_get_field_group( $selector = false ) {
 	}
 	
 	
-	// get cache key
-	$cache_key = "get_field_group/{$k}={$v}";
+	// return early if cache is found
+	$cache_key = "get_field_group/{$type}={$selector}";
 	
-	
-	// get cache
-	$found = false;
-	$cache = wp_cache_get( $cache_key, 'acf', false, $found );
-	
-	if( $found ) return $cache;
-	
-	
-	// get field group from ID or key
-	if( $k == 'ID' ) {
+	if( acf_isset_cache($cache_key) ) {
 		
-		$field_group = _acf_get_field_group_by_id( $v );
-		
-	} else {
-		
-		$field_group = _acf_get_field_group_by_key( $v );
+		return acf_get_cache($cache_key);
 		
 	}
 	
 	
+	// ID
+	if( $type == 'ID' ) {
+		
+		$field_group = _acf_get_field_group_by_id( $selector );
+	
+	// key	
+	} else {
+		
+		$field_group = _acf_get_field_group_by_key( $selector );
+	
+	}
+	
+	
+	// bail early if no field
+	if( !$field_group ) return false;
+	
+	
 	// filter for 3rd party customization
 	$field_group = apply_filters('acf/get_field_group', $field_group);
 	
 	
-	// set cache
-	wp_cache_set( $cache_key, $field_group, 'acf' );
+	// update cache
+	// - Use key instead of ID for best compatibility (not all field groups exist in the DB)
+	$cache_key = acf_set_cache("get_field_group/key={$field_group['key']}", $field_group);
+	
+	
+	// update cache reference
+	// - allow cache to return if using an ID selector
+	acf_set_cache_reference("get_field_group/ID={$field_group['ID']}", $cache_key);
 	
 	
 	// return
 	return $field_group;
+	
 }
 
 
@@ -487,6 +516,10 @@ function acf_update_field_group( $field_group = array() ) {
 	$field_group = wp_unslash( $field_group );
 	
 	
+	// parse types (converts string '0' to int 0)
+	$field_group = acf_parse_types( $field_group );
+	
+	
 	// locations may contain 'uniquid' array keys
 	$field_group['location'] = array_values( $field_group['location'] );
 	
@@ -551,9 +584,7 @@ function acf_update_field_group( $field_group = array() ) {
 	
 	
 	// clear cache
-	wp_cache_delete("get_field_group/ID={$field_group['ID']}", 'acf');
-	wp_cache_delete("get_field_group/key={$field_group['key']}", 'acf');
-	wp_cache_delete("get_field_groups", 'acf');
+	acf_delete_cache("get_field_group/key={$field_group['key']}");
 	
 	
     // return
@@ -589,8 +620,8 @@ function acf_update_field_group_wp_unique_post_slug( $slug, $post_ID, $post_stat
 
 function acf_duplicate_field_group( $selector = 0, $new_post_id = 0 ) {
 	
-	// disable JSON to avoid conflicts between DB and JSON
-	acf_disable_local();
+	// disable filters to ensure ACF loads raw data from DB
+	acf_disable_filters();
 	
 	
 	// load the origional field gorup
@@ -713,8 +744,8 @@ function acf_get_field_count( $field_group ) {
 
 function acf_delete_field_group( $selector = 0 ) {
 	
-	// disable JSON to avoid conflicts between DB and JSON
-	acf_disable_local();
+	// disable filters to ensure ACF loads raw data from DB
+	acf_disable_filters();
 	
 	
 	// load the origional field gorup
@@ -768,8 +799,8 @@ function acf_delete_field_group( $selector = 0 ) {
 
 function acf_trash_field_group( $selector = 0 ) {
 	
-	// disable JSON to avoid conflicts between DB and JSON
-	acf_disable_local();
+	// disable filters to ensure ACF loads raw data from DB
+	acf_disable_filters();
 	
 	
 	// load the origional field gorup
@@ -823,8 +854,8 @@ function acf_trash_field_group( $selector = 0 ) {
 
 function acf_untrash_field_group( $selector = 0 ) {
 	
-	// disable JSON to avoid conflicts between DB and JSON
-	acf_disable_local();
+	// disable filters to ensure ACF loads raw data from DB
+	acf_disable_filters();
 	
 	
 	// load the origional field gorup
@@ -987,6 +1018,10 @@ function acf_get_field_group_style( $field_group ) {
 
 function acf_import_field_group( $field_group ) {
 	
+	// disable filters to ensure ACF loads raw data from DB
+	acf_disable_filters();
+	
+	
 	// vars
 	$ref = array();
 	$order = array();
@@ -1003,10 +1038,6 @@ function acf_import_field_group( $field_group ) {
 	// remove old fields
 	if( $field_group['ID'] ) {
 		
-		// disable local - important as to avoid 'acf_get_fields_by_id' returning fields with ID = 0
-		acf_disable_local();
-	
-		
 		// load fields
 		$db_fields = acf_get_fields_by_id( $field_group['ID'] );
 		$db_fields = acf_prepare_fields_for_import( $db_fields );
@@ -1036,12 +1067,12 @@ function acf_import_field_group( $field_group ) {
 			
 		}
 		
-		
-		// enable local - important as to allow local to find new fields and save json file
-		acf_enable_local();
-		
 	}
 	
+	
+	// enable local filter for JSON to be created
+	acf_enable_filter('local');
+	
 			
 	// save field group
 	$field_group = acf_update_field_group( $field_group );
diff --git a/api/api-field.php b/api/api-field.php
index 59b0931..21598d1 100644
--- a/api/api-field.php
+++ b/api/api-field.php
@@ -147,7 +147,7 @@ function acf_get_valid_field( $field = false ) {
 	
 	
 	// defaults
-	$field = acf_parse_args($field, array(
+	$field = wp_parse_args($field, array(
 		'ID'				=> 0,
 		'key'				=> '',
 		'label'				=> '',
@@ -238,6 +238,37 @@ function acf_translate_field( $field ) {
 }
 
 
+/*
+*  acf_clone_field
+*
+*  This function will allow customization to a field when it is cloned
+*  Cloning a field is the act of mimicing another. Some settings may need to be altered
+*
+*  @type	function
+*  @date	8/03/2016
+*  @since	5.3.2
+*
+*  @param	$field (array)
+*  @return	$field
+*/
+
+function acf_clone_field( $field, $clone_field ) {
+	
+	// add reference
+	$field['_clone'] = $clone_field['key'];
+	
+	
+	// filters
+	$field = apply_filters( "acf/clone_field", $field, $clone_field );
+	$field = apply_filters( "acf/clone_field/type={$field['type']}", $field, $clone_field );
+	
+	
+	// return
+	return $field;
+	
+}
+
+
 /*
 *  acf_prepare_field
 *
@@ -407,10 +438,6 @@ function acf_render_fields( $post_id = 0, $fields, $el = 'div', $instruction = '
 		} 
 		
 		
-		// set prefix for correct post name (prefix + key)
-		$field['prefix'] = 'acf';
-		
-		
 		// render
 		acf_render_field_wrap( $field, $el, $instruction );
 		
@@ -582,13 +609,7 @@ function acf_render_field_wrap( $field, $el = 'div', $instruction = 'label' ) {
 	
 	
 	// vars
-	$show_label = true;
-	
-	if( $el == 'td' ) {
-		
-		$show_label = false;
-		
-	}
+	$show_label = ($el !== 'td') ? true : false;
 	
 	
 ?><<?php echo $el; ?> <?php echo acf_esc_attr($wrapper); ?>>
@@ -602,7 +623,6 @@ function acf_render_field_wrap( $field, $el = 'div', $instruction = 'label' ) {
 <?php endif; ?>
 	<<?php echo $elements[ $el ]; ?> class="acf-input">
 		<?php acf_render_field( $field ); ?>
-		
 <?php if( $instruction == 'field' && $field['instructions'] ): ?>
 		<p class="description"><?php echo $field['instructions']; ?></p>
 <?php endif; ?>
@@ -655,11 +675,20 @@ function acf_render_field_setting( $field, $setting, $global = false ) {
 		
 		$setting['value'] = $field[ $setting['name'] ];
 		
+	} elseif( isset($setting['default_value']) ) {
+		
+		// use the default value
+		$setting['value'] = $setting['default_value'];
+		
 	}
 	
 	
+	// vars
+	$instructions_placement = acf_extract_var( $setting, 'instructions_placement', 'label' );
+	
+	
 	// render
-	acf_render_field_wrap( $setting, 'tr', 'label' );
+	acf_render_field_wrap( $setting, 'tr', $instructions_placement );
 	
 }
 
@@ -707,8 +736,12 @@ function acf_get_fields( $parent = false ) {
 	}
 	
 	
+	// filter
+	$fields = apply_filters('acf/get_fields', $fields, $parent);
+	
+	
 	// return
-	return apply_filters('acf/get_fields', $fields, $parent);
+	return $fields;
 	
 }
 
@@ -726,53 +759,68 @@ function acf_get_fields( $parent = false ) {
 *  @return	$fields (array)
 */
 
-function acf_get_fields_by_id( $id = 0 ) {
+function acf_get_fields_by_id( $parent_id = 0 ) {
+	
+	// bail early if no ID
+	if( !$parent_id ) return false;
+	
 	
 	// vars
 	$fields = array();
+	$post_ids = array();
+	$cache_key = "get_fields/ID={$parent_id}";
 	
 	
-	// bail early if no ID
-	if( empty($id) ) return false;
-	
-	
-	// cache
-	$found = false;
-	$cache = wp_cache_get( 'get_fields/parent=' . $id, 'acf', false, $found );
-	
-	if( $found ) return $cache;
-	
-	
-	// args
-	$args = array(
-		'posts_per_page'			=> -1,
-		'post_type'					=> 'acf-field',
-		'orderby'					=> 'menu_order',
-		'order'						=> 'ASC',
-		'suppress_filters'			=> true, // DO NOT allow WPML to modify the query
-		'post_parent'				=> $id,
-		'post_status'				=> 'publish, trash', // 'any' won't get trashed fields
-		'update_post_meta_cache'	=> false
-	);
+	// check cache for child ids
+	if( acf_isset_cache($cache_key) ) {
 		
+		$post_ids = acf_get_cache($cache_key);
 	
-	// load fields
-	$posts = get_posts( $args );
-	
-	if( $posts ) {
+	// query DB for child ids
+	} else {
 		
-		foreach( $posts as $post ) {
-			
-			$fields[] = acf_get_field( $post->ID );
+		// query
+		$posts = get_posts(array(
+			'posts_per_page'			=> -1,
+			'post_type'					=> 'acf-field',
+			'orderby'					=> 'menu_order',
+			'order'						=> 'ASC',
+			'suppress_filters'			=> true, // DO NOT allow WPML to modify the query
+			'post_parent'				=> $parent_id,
+			'post_status'				=> 'publish, trash', // 'any' won't get trashed fields
+			'update_post_meta_cache'	=> false
+		));
+		
+		
+		// loop
+		if( $posts ) {
 			
+			foreach( $posts as $post ) {
+				
+				$post_ids[] = $post->ID;
+				
+			}
+				
 		}
-			
+		
+		
+		// update cache
+		acf_set_cache($cache_key, $post_ids);
+		
 	}
 	
 	
-	// set cache
-	wp_cache_set( 'get_fields/parent=' . $id, $fields, 'acf' );
+	// bail early if no children
+	if( empty($post_ids) ) return false;
+	
+	
+	// load fields
+	foreach( $post_ids as $post_id ) {
 		
+		$fields[] = acf_get_field( $post_id );
+		
+	}
+	
 	
 	// return
 	return $fields;
@@ -801,22 +849,22 @@ function acf_get_field( $selector = null, $db_only = false ) {
 	$type = 'ID';
 	
 	
-	// is $selector an ID
+	// ID
 	if( is_numeric($selector) ) {
 		
 		// do nothing
 	
-	// is $selector a string (name|key)	
-	} elseif( is_string($selector) ) {
-		
-		$type = acf_is_field_key($selector) ? 'key' : 'name';
-	
-	// is $selector an object
+	// object
 	} elseif( is_object($selector) ) {
 		
 		$selector = $selector->ID;
 	
-	// selector not valid
+	// string
+	} elseif( is_string($selector) ) {
+		
+		$type = acf_is_field_key($selector) ? 'key' : 'name';
+	
+	// other
 	} else {
 		
 		return false;
@@ -824,58 +872,65 @@ function acf_get_field( $selector = null, $db_only = false ) {
 	}
 	
 	
-	// get cache key
+	// return early if cache is found
 	$cache_key = "get_field/{$type}={$selector}";
 	
-	
-	// get cache
-	if( !$db_only ) {
+	if( !$db_only && acf_isset_cache($cache_key) ) {
 		
-		$found = false;
-		$cache = wp_cache_get( $cache_key, 'acf', false, $found );
-		
-		if( $found ) return $cache;
+		return acf_get_cache($cache_key);
 		
 	}
 	
 	
-	// get field group from ID or key
+	// ID
 	if( $type == 'ID' ) {
 		
 		$field = _acf_get_field_by_id( $selector, $db_only );
+	
+	// key	
+	} elseif( $type == 'key' ) {
 		
-	} elseif( $type == 'name' ) {
+		$field = _acf_get_field_by_key( $selector, $db_only );
+	
+	// name (rare case)
+	} else {
 		
 		$field = _acf_get_field_by_name( $selector, $db_only );
 		
-	} else {
-		
-		$field = _acf_get_field_by_key( $selector, $db_only );
-		
 	}
 	
 	
+	// bail early if no field
+	if( !$field ) return false;
+	
+	
+	// validate
+	$field = acf_get_valid_field( $field );
+	
+	
+	// set prefix (acf fields save with prefix 'acf')
+	$field['prefix'] = 'acf';
+	
+	
 	// bail early if db only value (no need to update cache)
-	if( $db_only ) {
-		
-		return $field;
-		
-	}
+	if( $db_only ) return $field;
 	
 	
 	// filter for 3rd party customization
-	if( $field ) {
-		
-		$field = apply_filters( "acf/load_field", $field);
-		$field = apply_filters( "acf/load_field/type={$field['type']}", $field );
-		$field = apply_filters( "acf/load_field/name={$field['name']}", $field );
-		$field = apply_filters( "acf/load_field/key={$field['key']}", $field );
-		
-	}
+	$field = apply_filters( "acf/load_field", $field);
+	$field = apply_filters( "acf/load_field/type={$field['type']}", $field );
+	$field = apply_filters( "acf/load_field/name={$field['name']}", $field );
+	$field = apply_filters( "acf/load_field/key={$field['key']}", $field );
 	
 	
-	// set cache
-	wp_cache_set( $cache_key, $field, 'acf' );
+	// update cache
+	// - Use key instead of ID for best compatibility (not all fields exist in the DB)
+	$cache_key = acf_set_cache("get_field/key={$field['key']}", $field);
+	
+	
+	// update cache reference
+	// - allow cache to return if using an ID selector
+	acf_set_cache_reference("get_field/ID={$field['ID']}", $cache_key);
 
 	
 	// return
@@ -904,11 +959,7 @@ function _acf_get_field_by_id( $post_id = 0, $db_only = false ) {
 	
 	
 	// bail early if no post, or is not a field
-	if( empty($post) || $post->post_type != 'acf-field' ) {
-	
-		return false;
-		
-	}
+	if( empty($post) || $post->post_type != 'acf-field' ) return false;
 	
 	
 	// unserialize
@@ -927,27 +978,21 @@ function _acf_get_field_by_id( $post_id = 0, $db_only = false ) {
 	// override with JSON
 	if( !$db_only && acf_is_local_field($field['key']) ) {
 		
-		// extract some args
-		$backup = acf_extract_vars($field, array(
-			'ID',
-			'parent'
-		));
-		
-
 		// load JSON field
-		$field = acf_get_local_field( $field['key'] );
+		$local = acf_get_local_field( $field['key'] );
 		
 		
-		// merge in backup
-		$field = array_merge($field, $backup);
+		// override IDs
+		$local['ID'] = $field['ID'];
+		$local['parent'] = $field['parent'];
+		
+		
+		// return
+		return $local;
 		
 	}
 	
 	
-	// validate
-	$field = acf_get_valid_field( $field );
-	
-	
 	// return
 	return $field;
 	
@@ -972,13 +1017,7 @@ function _acf_get_field_by_key( $key = '', $db_only = false ) {
 	// try JSON before DB to save query time
 	if( !$db_only && acf_is_local_field( $key ) ) {
 		
-		$field = acf_get_local_field( $key );
-		
-		// validate
-		$field = acf_get_valid_field( $field );
-	
-		// return
-		return $field;
+		return acf_get_local_field( $key );
 		
 	}
 	
@@ -1183,6 +1222,10 @@ function acf_update_field( $field = false, $specific = false ) {
 	$field = wp_unslash( $field );
 	
 	
+	// parse types (converts string '0' to int 0)
+	$field = acf_parse_types( $field );
+	
+	
 	// clean up conditional logic keys
 	if( !empty($field['conditional_logic']) ) {
 		
@@ -1210,15 +1253,11 @@ function acf_update_field( $field = false, $specific = false ) {
 	}
 	
 	
-	// find correct parent
+	// parent may be a field key
+	// - lookup parent ID
 	if( acf_is_field_key($field['parent']) ) {
 		
-		// get parent
-		$parent = acf_get_field( $field['parent'] );
-		
-
-		// update to ID
-		$field['parent'] = acf_maybe_get( $parent, 'ID', 0 );
+		$field['parent'] = acf_get_field_id( $field['parent'] );
 		
 	}
 	
@@ -1312,9 +1351,7 @@ function acf_update_field( $field = false, $specific = false ) {
 	
     
     // clear cache
-	wp_cache_delete( "get_field/ID={$field['ID']}", 'acf' );
-	wp_cache_delete( "get_field/key={$field['key']}", 'acf' );
-	wp_cache_delete( "get_fields/parent={$field['parent']}", 'acf' );
+    acf_delete_cache("get_field/key={$field['key']}");
 	
 	
     // return
@@ -1394,8 +1431,8 @@ function acf_duplicate_fields( $fields, $new_parent = 0 ) {
 
 function acf_duplicate_field( $selector = 0, $new_parent = 0 ){
 	
-	// disable JSON to avoid conflicts between DB and JSON
-	acf_disable_local();
+	// disable filters to ensure ACF loads raw data from DB
+	acf_disable_filters();
 	
 	
 	// load the origional field
@@ -1520,8 +1557,8 @@ function acf_duplicate_field( $selector = 0, $new_parent = 0 ){
 
 function acf_delete_field( $selector = 0 ) {
 	
-	// disable JSON to avoid conflicts between DB and JSON
-	acf_disable_local();
+	// disable filters to ensure ACF loads raw data from DB
+	acf_disable_filters();
 	
 	
 	// load the origional field gorup
@@ -1542,13 +1579,12 @@ function acf_delete_field( $selector = 0 ) {
 	
 	
 	// clear cache
-	wp_cache_delete( "get_field/ID={$field['ID']}", 'acf' );
-	wp_cache_delete( "get_field/key={$field['key']}", 'acf' );
-	wp_cache_delete( "get_fields/parent={$field['parent']}", 'acf' );
+	acf_delete_cache("get_field/key={$field['key']}");
 	
 	
 	// return
 	return true;
+	
 }
 
 
@@ -1567,8 +1603,8 @@ function acf_delete_field( $selector = 0 ) {
 
 function acf_trash_field( $selector = 0 ) {
 	
-	// disable JSON to avoid conflicts between DB and JSON
-	acf_disable_local();
+	// disable filters to ensure ACF loads raw data from DB
+	acf_disable_filters();
 	
 	
 	// load the origional field gorup
@@ -1589,6 +1625,7 @@ function acf_trash_field( $selector = 0 ) {
 	
 	// return
 	return true;
+	
 }
 
 
@@ -1607,8 +1644,8 @@ function acf_trash_field( $selector = 0 ) {
 
 function acf_untrash_field( $selector = 0 ) {
 	
-	// disable JSON to avoid conflicts between DB and JSON
-	acf_disable_local();
+	// disable filters to ensure ACF loads raw data from DB
+	acf_disable_filters();
 	
 	
 	// load the origional field gorup
@@ -1721,7 +1758,7 @@ function acf_prepare_field_for_export( $field ) {
 function acf_prepare_fields_for_import( $fields = false ) {
 	
 	// validate
-	if( empty($fields) ) return $fields;
+	if( empty($fields) ) return array();
 	
 	
 	// re-index array
diff --git a/api/api-helpers.php b/api/api-helpers.php
index 1d50174..61679fc 100644
--- a/api/api-helpers.php
+++ b/api/api-helpers.php
@@ -1,34 +1,120 @@
 <?php 
 
+/*
+*  acf_is_array
+*
+*  This function will return true for a non empty array
+*
+*  @type	function
+*  @date	6/07/2016
+*  @since	5.4.0
+*
+*  @param	$array (array)
+*  @return	(boolean)
+*/
+
+function acf_is_array( $array ) {
+	
+	return ( is_array($array) && !empty($array) );
+	
+}
+
+
+/*
+*  acf_is_empty
+*
+*  This function will return true for an empty var (allows 0 as true)
+*
+*  @type	function
+*  @date	6/07/2016
+*  @since	5.4.0
+*
+*  @param	$value (mixed)
+*  @return	(boolean)
+*/
+
+function acf_is_empty( $value ) {
+	
+	return ( empty($value) && !is_numeric($value) );
+	
+}
+
+
 /*
 *  acf_get_setting
 *
-*  This function will return a value from the settings array found in the acf object
+*  alias of acf()->get_setting()
 *
 *  @type	function
 *  @date	28/09/13
 *  @since	5.0.0
 *
-*  @param	$name (string) the setting name to return
-*  @return	(mixed)
+*  @param	n/a
+*  @return	n/a
 */
 
-function acf_get_setting( $name, $default = null ) {
+function acf_get_setting( $name, $value = null ) {
+	
+	return acf()->get_setting( $name, $value );
+	
+}
+
+
+/*
+*  acf_update_setting
+*
+*  alias of acf()->update_setting()
+*
+*  @type	function
+*  @date	28/09/13
+*  @since	5.0.0
+*
+*  @param	$name (string)
+*  @param	$value (mixed)
+*  @return	n/a
+*/
+
+function acf_update_setting( $name, $value ) {
+	
+	return acf()->update_setting( $name, $value );
+	
+}
+
+
+/*
+*  acf_append_setting
+*
+*  This function will add a value into the settings array found in the acf object
+*
+*  @type	function
+*  @date	28/09/13
+*  @since	5.0.0
+*
+*  @param	$name (string)
+*  @param	$value (mixed)
+*  @return	n/a
+*/
+
+function acf_append_setting( $name, $value ) {
 	
 	// vars
-	$settings = acf()->settings;
+	$setting = acf_get_setting( $name, array() );
 	
 	
-	// find setting
-	$setting = acf_maybe_get( $settings, $name, $default );
+	// bail ealry if not array
+	if( !is_array($setting) ) return false;
 	
 	
-	// filter for 3rd party customization
-	$setting = apply_filters( "acf/settings/{$name}", $setting );
+	// append
+	$setting[] = $value;
+	
+	
+	// update
+	acf_update_setting( $name, $setting );
 	
 	
 	// return
-	return $setting;
+	return true;
 	
 }
 
@@ -53,56 +139,6 @@ function acf_get_compatibility( $name ) {
 }
 
 
-/*
-*  acf_update_setting
-*
-*  This function will update a value into the settings array found in the acf object
-*
-*  @type	function
-*  @date	28/09/13
-*  @since	5.0.0
-*
-*  @param	$name (string)
-*  @param	$value (mixed)
-*  @return	n/a
-*/
-
-function acf_update_setting( $name, $value ) {
-	
-	acf()->settings[ $name ] = $value;
-	
-}
-
-
-/*
-*  acf_append_setting
-*
-*  This function will add a value into the settings array found in the acf object
-*
-*  @type	function
-*  @date	28/09/13
-*  @since	5.0.0
-*
-*  @param	$name (string)
-*  @param	$value (mixed)
-*  @return	n/a
-*/
-
-function acf_append_setting( $name, $value ) {
-	
-	// createa array if needed
-	if( !isset(acf()->settings[ $name ]) ) {
-		
-		acf()->settings[ $name ] = array();
-		
-	}
-	
-	
-	// append to array
-	acf()->settings[ $name ][] = $value;
-}
-
-
 /*
 *  acf_has_done
 *
@@ -119,7 +155,7 @@ function acf_append_setting( $name, $value ) {
 function acf_has_done( $name ) {
 	
 	// vars
-	$setting = 'has_done_' . $name;
+	$setting = "_has_done_{$name}";
 	
 	
 	// return true if already done
@@ -218,14 +254,6 @@ function acf_include( $file ) {
 
 function acf_parse_args( $args, $defaults = array() ) {
 	
-	// $args may not be na array!
-	if( !is_array($args) ) {
-		
-		$args = array();
-		
-	}
-	
-	
 	// parse args
 	$args = wp_parse_args( $args, $defaults );
 	
@@ -255,30 +283,9 @@ function acf_parse_args( $args, $defaults = array() ) {
 
 function acf_parse_types( $array ) {
 	
-	// some keys are restricted
-	$restricted = array(
-		'label',
-		'name',
-		'value',
-		'instructions',
-		'nonce'
-	);
-	
-	
-	// loop
-	foreach( array_keys($array) as $k ) {
-		
-		// parse type if not restricted
-		if( !in_array($k, $restricted, true) ) {
-			
-			$array[ $k ] = acf_parse_type( $array[ $k ] );
-			
-		}
-
-	}
-	
 	// return
-	return $array;
+	return array_map( 'acf_parse_type', $array );
+	
 }
 
 
@@ -296,27 +303,16 @@ function acf_parse_types( $array ) {
 */
 
 function acf_parse_type( $v ) {
-	
-	// test for array
-	if( is_array($v) ) {
 		
-		return acf_parse_types($v);
-	}
-	
-	
 	// bail early if not string
-	if( !is_string($v) ) {
-		
-		return $v;
-				
-	}
+	if( !is_string($v) ) return $v;
 	
 	
 	// trim
 	$v = trim($v);
 	
 	
-	// numbers
+	// convert int (string) to int
 	if( is_numeric($v) && strval((int)$v) === $v ) {
 		
 		$v = intval( $v );
@@ -680,16 +676,7 @@ function acf_get_pretty_post_types( $post_types = array() ) {
 	foreach( $post_types as $post_type ) {
 		
 		// vars
-		$label = $post_type;
-		
-		
-		// check that object exists (case exists when importing field group from another install and post type does not exist)
-		if( post_type_exists($post_type) ) {
-			
-			$obj = get_post_type_object($post_type);
-			$label = $obj->labels->singular_name;
-			
-		}
+		$label = acf_get_post_type_label($post_type);
 		
 		
 		// append to r
@@ -728,6 +715,42 @@ function acf_get_pretty_post_types( $post_types = array() ) {
 }
 
 
+
+/*
+*  acf_get_post_type_label
+*
+*  This function will return a pretty label for a specific post_type
+*
+*  @type	function
+*  @date	5/07/2016
+*  @since	5.4.0
+*
+*  @param	$post_type (string)
+*  @return	(string)
+*/
+
+function acf_get_post_type_label( $post_type ) {
+	
+	// vars
+	$label = $post_type;
+	
+		
+	// check that object exists
+	// - case exists when importing field group from another install and post type does not exist
+	if( post_type_exists($post_type) ) {
+		
+		$obj = get_post_type_object($post_type);
+		$label = $obj->labels->singular_name;
+		
+	}
+	
+	
+	// return
+	return $label;
+	
+}
+
+
 /*
 *  acf_verify_nonce
 *
@@ -747,12 +770,8 @@ function acf_verify_nonce( $value, $post_id = 0 ) {
 	$nonce = acf_maybe_get( $_POST, '_acfnonce' );
 	
 	
-	// bail early if no nonce or if nonce does not match (post|user|comment|term)
-	if( !$nonce || !wp_verify_nonce($nonce, $value) ) {
-		
-		return false;
-		
-	}
+	// bail early nonce does not match (post|user|comment|term)
+	if( !$nonce || !wp_verify_nonce($nonce, $value) ) return false;
 	
 	
 	// if saving specific post
@@ -773,12 +792,10 @@ function acf_verify_nonce( $value, $post_id = 0 ) {
 			
 			// do nothing (don't remove this if statement!)
 			
-		// 3. revision (this post is a revision of the post we were editing)
+		// 3. revision (this is an preview autosave)
 		} elseif( $post_parent === $form_post_id ) {
 			
-			// return true early and prevent $_POST['_acfnonce'] from being reset
-			// this will allow another save_post to save the real post
-			return true;
+			// do nothing (don't remove this if statement!)
 			
 		// 4. no match (this post is a custom created one during the save proccess via either WP or 3rd party)
 		} else {
@@ -1227,41 +1244,41 @@ function acf_get_term_title( $term ) {
 *  @return	(array)
 */
 
-function acf_decode_taxonomy_terms( $terms = false ) {
+function acf_decode_taxonomy_terms( $strings = false ) {
 	
-	// load all taxonomies if not specified in args
-	if( !$terms ) {
-		
-		$terms = acf_get_taxonomy_terms();
-		
-	}
+	// bail early if no terms
+	if( empty($strings) ) return false;
 	
 	
 	// vars
-	$r = array();
+	$terms = array();
 	
 	
-	foreach( $terms as $term ) {
+	// loop
+	foreach( $strings as $string ) {
 		
 		// vars
-		$data = acf_decode_taxonomy_term( $term );
+		$data = acf_decode_taxonomy_term( $string );
+		$taxonomy = $data['taxonomy'];
+		$term = $data['term'];
 		
 		
 		// create empty array
-		if( !array_key_exists($data['taxonomy'], $r) )
-		{
-			$r[ $data['taxonomy'] ] = array();
+		if( !isset($terms[ $taxonomy ]) ) {
+			
+			$terms[ $taxonomy ] = array();
+			
 		}
+				
 		
-		
-		// append to taxonomy
-		$r[ $data['taxonomy'] ][] = $data['term'];
+		// append
+		$terms[ $taxonomy ][] = $term;
 		
 	}
 	
 	
 	// return
-	return $r;
+	return $terms;
 	
 }
 
@@ -1311,51 +1328,6 @@ function acf_decode_taxonomy_term( $string ) {
 }
 
 
-/*
-*  acf_cache_get
-*
-*  This function is a wrapper for the wp_cache_get to allow for 3rd party customization
-*
-*  @type	function
-*  @date	4/12/2013
-*  @since	5.0.0
-*
-*  @param	$post_id (int)
-*  @return	$post_id (int)
-*/
-
-/*
-function acf_cache_get( $key, &$found ) {
-	
-	// vars
-	$group = 'acf';
-	$force = false;
-	
-	
-	// load from cache
-	$cache = wp_cache_get( $key, $group, $force, $found );
-	
-	
-	// allow 3rd party customization if cache was not found
-	if( !$found )
-	{
-		$custom = apply_filters("acf/get_cache/{$key}", $cache);
-		
-		if( $custom !== $cache )
-		{
-			$cache = $custom;
-			$found = true;
-		}
-	}
-	
-	
-	// return
-	return $cache;
-	
-}
-*/
-
-
 /*
 *  acf_get_array
 *
@@ -1398,7 +1370,49 @@ function acf_get_array( $var = false, $delimiter = ',' ) {
 	// place in array
 	return array( $var );
 	
-} 
+}
+
+
+/*
+*  acf_get_numeric
+*
+*  This function will return numeric values
+*
+*  @type	function
+*  @date	15/07/2016
+*  @since	5.4.0
+*
+*  @param	$value (mixed)
+*  @return	(mixed)
+*/
+
+function acf_get_numeric( $value = '' ) {
+	
+	// vars
+	$numbers = array();
+	$is_array = is_array($value);
+	
+	
+	// loop
+	foreach( (array) $value as $v ) {
+		
+		if( is_numeric($v) ) $numbers[] = (int) $v;
+		
+	}
+	
+	
+	// bail early if is empty
+	if( empty($numbers) ) return false;
+	
+	
+	// convert array
+	if( !$is_array ) $numbers = $numbers[0];
+	
+	
+	// return
+	return $numbers;
+	
+}
 
 
 /*
@@ -1422,7 +1436,7 @@ function acf_get_posts( $args = array() ) {
 	
 	// defaults
 	// leave suppress_filters as true becuase we don't want any plugins to modify the query as we know exactly what 
-	$args = acf_parse_args( $args, array(
+	$args = wp_parse_args( $args, array(
 		'posts_per_page'	=> -1,
 		'post_type'			=> '',
 		'post_status'		=> 'any'
@@ -1570,7 +1584,7 @@ function acf_get_grouped_posts( $args ) {
 	
 	
 	// defaults
-	$args = acf_parse_args( $args, array(
+	$args = wp_parse_args( $args, array(
 		'posts_per_page'			=> -1,
 		'paged'						=> 0,
 		'post_type'					=> 'post',
@@ -1764,33 +1778,45 @@ function acf_get_post_title( $post = 0, $is_search = false ) {
 	}
 	
 	
+	// status
+	if( get_post_status( $post->ID ) != "publish" ) {
+		
+		$append .= ' (' . get_post_status( $post->ID ) . ')';
+		
+	}
+	
+	
 	// ancestors
 	if( $post->post_type !== 'attachment' ) {
 		
 		// get ancestors
 		$ancestors = get_ancestors( $post->ID, $post->post_type );
-		$parent_id = acf_maybe_get( $ancestors, 0 );
-		$prepend = str_repeat('- ', count($ancestors));
+		$prepend .= str_repeat('- ', count($ancestors));
 		
 		
 		// add parent
-		if( $is_search && $parent_id ) {
+		if( $is_search && !empty($ancestors) ) {
 			
-			$append .= ' (Parent page: ' . get_the_title( $parent_id ) . ')';
+			// reverse
+			$ancestors = array_reverse($ancestors);
+			
+			
+			// convert id's into titles
+			foreach( $ancestors as $i => $id ) {
+				
+				$ancestors[ $i ] = get_the_title( $id );
+				
+			}
+			
+			
+			// append
+			$append .= ' | ' . __('Parent', 'acf') . ': ' . implode(' / ', $ancestors);
 			
 		}
 		
 	}
 	
 	
-	// status
-	if( get_post_status( $post->ID ) != "publish" ) {
-		
-		$append .= ' (' . get_post_status( $post->ID ) . ')';
-		
-	}
-	
-	
 	// merge
 	$title = $prepend . $title . $append;
 	
@@ -1801,77 +1827,6 @@ function acf_get_post_title( $post = 0, $is_search = false ) {
 }
 
 
-/*
-function acf_get_post_title( $post = 0, $is_search = false ) {
-	
-	// vars
-	$post = get_post($post);
-	$title = '';
-	$prepend = '';
-	$append = '';
-	
-    
-	// bail early if no post
-	if( !$post ) return '';
-	
-	
-	// title
-	$title = get_the_title( $post->ID );
-	
-	
-	// empty
-	if( $title === '' ) {
-		
-		$title = __('(no title)', 'acf');
-		
-	}
-	
-	
-	// ancestors
-	if( $post->post_type !== 'attachment' ) {
-		
-		// get ancestors
-		$ancestors = get_ancestors( $post->ID, $post->post_type );
-		$parent_id = acf_maybe_get( $ancestors, 0 );
-		
-		
-		// add parent
-		if( $is_search && !empty($ancestors) ) {
-			
-			foreach( $ancestors as $post_id ) {
-				
-				$prepend = get_the_title( $post_id ) . ' / ' . $prepend;
-				
-			}
-			
-		} else {
-			
-			$prepend = str_repeat('- ', count($ancestors));
-			
-		}	
-				
-	}
-	
-	
-	// status
-	if( get_post_status( $post->ID ) != "publish" ) {
-		
-		$append .= ' (' . get_post_status( $post->ID ) . ')';
-		
-	}
-	
-	
-	// merge
-	$title = $prepend . $title . $append;
-	
-	
-	// return
-	return $title;
-	
-}
-*/
-
-
 function acf_order_by_search( $array, $search ) {
 	
 	// vars
@@ -1997,7 +1952,7 @@ function acf_get_grouped_users( $args = array() ) {
 	
 	
 	// defaults
-	$args = acf_parse_args( $args, array(
+	$args = wp_parse_args( $args, array(
 		'users_per_page'			=> -1,
 		'paged'						=> 0,
 		'role'         				=> '',
@@ -2637,6 +2592,68 @@ acf_update_setting('php_to_js_time_formats', array(
 ));
 
 
+/*
+*  acf_split_date_time
+*
+*  This function will split a format string into seperate date and time
+*
+*  @type	function
+*  @date	26/05/2016
+*  @since	5.3.8
+*
+*  @param	$date_time (string)
+*  @return	$formats (array)
+*/
+
+function acf_split_date_time( $date_time = '' ) {
+	
+	// vars
+	$php_date = acf_get_setting('php_to_js_date_formats');
+	$php_time = acf_get_setting('php_to_js_time_formats');
+	$chars = str_split($date_time);
+	$type = 'date';
+	
+	
+	// default
+	$data = array(
+		'date' => '',
+		'time' => ''
+	);
+	
+	
+	// loop
+	foreach( $chars as $i => $c ) {
+		
+		// find type
+		// - allow misc characters to append to previous type
+		if( isset($php_date[ $c ]) ) {
+			
+			$type = 'date';
+			
+		} elseif( isset($php_time[ $c ]) ) {
+			
+			$type = 'time';
+			
+		}
+		
+		
+		// append char
+		$data[ $type ] .= $c;
+		
+	}
+	
+	
+	// trim
+	$data['date'] = trim($data['date']);
+	$data['time'] = trim($data['time']);
+	
+	
+	// return
+	return $data;	
+	
+}
+
+
 /*
 *  acf_convert_date_to_php
 *
@@ -2774,7 +2791,7 @@ function acf_update_user_setting( $name, $value ) {
 	
 	
 	// delete setting (allow 0 to save)
-	if( !$value && !is_numeric($value) ) {
+	if( acf_is_empty($value) ) {
 		
 		unset($settings[ $name ]);
 	
@@ -2789,7 +2806,6 @@ function acf_update_user_setting( $name, $value ) {
 	// update user data
 	return update_metadata('user', $user_id, 'acf_user_settings', $settings);
 	
-	
 }
 
 
@@ -2890,8 +2906,13 @@ function acf_get_valid_post_id( $post_id = 0 ) {
 	// $post_id may be an object
 	if( is_object($post_id) ) {
 		
+		// post
+		if( isset($post_id->post_type, $post_id->ID) ) {
+		
+			$post_id = $post_id->ID;
+			
 		// user
-		if( isset($post_id->roles, $post_id->ID) ) {
+		} elseif( isset($post_id->roles, $post_id->ID) ) {
 		
 			$post_id = 'user_' . $post_id->ID;
 		
@@ -2905,11 +2926,6 @@ function acf_get_valid_post_id( $post_id = 0 ) {
 		
 			$post_id = 'comment_' . $post_id->comment_ID;
 		
-		// post
-		} elseif( isset($post_id->ID) ) {
-		
-			$post_id = $post_id->ID;
-		
 		// default
 		} else {
 			
@@ -2973,6 +2989,110 @@ function acf_get_valid_post_id( $post_id = 0 ) {
 }
 
 
+
+/*
+*  acf_get_post_id_info
+*
+*  This function will return the type and id for a given $post_id string
+*
+*  @type	function
+*  @date	2/07/2016
+*  @since	5.4.0
+*
+*  @param	$post_id (mixed)
+*  @return	$info (array)
+*/
+
+function acf_get_post_id_info( $post_id = 0 ) {
+	
+	// vars
+	$info = array(
+		'type'	=> 'post',
+		'id'	=> 0
+	);
+	
+	// bail early if no $post_id
+	if( !$post_id ) return $info;
+	
+	
+	// check cache
+	// - this function will most likely be called multiple times (saving loading fields from post)
+	//$cache_key = "get_post_id_info/post_id={$post_id}";
+	
+	//if( acf_isset_cache($cache_key) ) return acf_get_cache($cache_key);
+	
+	
+	// numeric
+	if( is_numeric($post_id) ) {
+		
+		$info['id'] = (int) $post_id;
+	
+	// string
+	} elseif( is_string($post_id) ) {
+		
+		// vars
+		$glue = '_';
+		$type = explode($glue, $post_id);
+		$id = array_pop($type);
+		$type = implode($glue, $type);
+		$meta = array('post', 'user', 'comment'); // add in 'term'
+		
+				
+		// meta
+		if( is_numeric($id) && in_array($type, $meta) ) {
+			
+			$info['type'] = $type;
+			$info['id'] = (int) $id;
+		
+		// option	
+		} else {
+			
+			$info['type'] = 'option';
+			$info['id'] = $post_id;
+			
+		}
+		
+	}
+	
+	
+	// update cache
+	//acf_set_cache($cache_key, $info);
+	
+	
+	// return
+	return $info;
+	
+}
+
+/*
+echo '<pre>';
+	print_r( acf_get_post_id_info(4) );
+echo '</pre>';
+echo '<pre>';
+	print_r( acf_get_post_id_info('post_4') );
+echo '</pre>';
+echo '<pre>';
+	print_r( acf_get_post_id_info('user_123') );
+echo '</pre>';
+echo '<pre>';
+	print_r( acf_get_post_id_info('term_567') );
+echo '</pre>';
+echo '<pre>';
+	print_r( acf_get_post_id_info('comment_6') );
+echo '</pre>';
+echo '<pre>';
+	print_r( acf_get_post_id_info('options_lol!') );
+echo '</pre>';
+echo '<pre>';
+	print_r( acf_get_post_id_info('option') );
+echo '</pre>';
+echo '<pre>';
+	print_r( acf_get_post_id_info('options') );
+echo '</pre>';
+die;
+*/
+
+
 /*
 *  acf_upload_files
 *
@@ -3189,6 +3309,10 @@ function acf_update_nested_array( &$array, $ancestors, $value ) {
 
 function acf_is_screen( $id = '' ) {
 	
+	// bail early if not defined
+	if( !function_exists('get_current_screen') ) return false;
+	
+	
 	// vars
 	$current_screen = get_current_screen();
 	
@@ -4192,9 +4316,30 @@ function acf_get_browser() {
 *  @return	(boolean)
 */
 
-function acf_is_ajax() {
+function acf_is_ajax( $action = '' ) {
 	
-	return ( defined('DOING_AJAX') && DOING_AJAX );
+	// vars
+	$is_ajax = false;
+	
+	
+	// check if is doing ajax
+	if( defined('DOING_AJAX') && DOING_AJAX ) {
+		
+		$is_ajax = true;
+		
+	}
+	
+	
+	// check $action
+	if( $action && acf_maybe_get($_POST, 'action') !== $action ) {
+		
+		$is_ajax = false;
+		
+	}
+	
+	
+	// return
+	return $is_ajax;
 		
 }
 
@@ -4215,27 +4360,38 @@ function acf_is_ajax() {
 */
 
 function acf_format_date( $value, $format ) {
-
+	
 	// bail early if no value
-	if( empty($value) ) return $value;
+	if( !$value ) return $value;
 	
 	
 	// attempt strtotime for standard date value
 	$unixtimestamp = strtotime($value);
 	
 	
-	// allow for timestamp value
-	if( !$unixtimestamp && is_numeric($value) ) {
+	// check strtotime
+	if( !$unixtimestamp ) {
 		
-		$unixtimestamp = $value;
+		// $value may already be a timestamp 
+		if( is_numeric($value) ) {
 			
+			$unixtimestamp = $value;
+		
+		// $value may be Unix epoch (1970-01-01)
+		} elseif( $value === '1970-01-01' ) {
+			
+			$unixtimestamp = 0;
+			
+		// error	
+		} else {
+			
+			return $value;
+			
+		}
+		
 	}
 	
 	
-	// bail early if timestamp error
-	if( !$unixtimestamp ) return $value;
-	
-	
 	// translate
 	$value = date_i18n($format, $unixtimestamp);
 	
@@ -4246,6 +4402,364 @@ function acf_format_date( $value, $format ) {
 }
 
 
+/*
+*  acf_log
+*
+*  description
+*
+*  @type	function
+*  @date	24/06/2016
+*  @since	5.3.8
+*
+*  @param	$post_id (int)
+*  @return	$post_id (int)
+*/
+
+function acf_log() {
+	
+	// vars
+	$log = '';
+	$args = func_get_args();
+	
+	
+	// loop
+	foreach( $args as $i => $arg ) {
+		
+		if( is_array($arg) || is_object($arg) ) {
+			
+			$arg = print_r($arg, true);
+			
+		} elseif( is_bool($arg) ) {
+			
+			$arg = ( $arg ? 'true' : 'false' ) . ' (bool)';
+			
+		}
+		
+		
+		// update
+		$args[ $i ] = $arg;
+		
+	}
+	
+	
+	// log
+	error_log( implode(' ', $args) );
+	
+}
+
+
+/*
+*  acf_doing
+*
+*  This function will tell ACF what task it is doing
+*
+*  @type	function
+*  @date	28/06/2016
+*  @since	5.3.8
+*
+*  @param	$event (string)
+*  @param	context (string)
+*  @return	n/a
+*/
+
+function acf_doing( $event = '', $context = '' ) {
+	
+	acf_update_setting( 'doing', $event );
+	acf_update_setting( 'doing_context', $context );
+	
+}
+
+
+/*
+*  acf_is_doing
+*
+*  This function can be used to state what ACF is doing, or to check
+*
+*  @type	function
+*  @date	28/06/2016
+*  @since	5.3.8
+*
+*  @param	$event (string)
+*  @param	context (string)
+*  @return	(boolean)
+*/
+
+function acf_is_doing( $event = '', $context = '' ) {
+	
+	// vars
+	$doing = false;
+	
+	
+	// task
+	if( acf_get_setting('doing') === $event ) {
+		
+		$doing = true;
+		
+	}
+	
+	
+	// context
+	if( $context && acf_get_setting('doing_context') !== $context ) {
+		
+		$doing = false;
+		
+	}
+	
+	
+	// return
+	return $doing;
+		
+}
+
+
+/*
+*  acf_is_plugin_active
+*
+*  This function will return true if the ACF plugin is active
+*  - May be included within a theme or other plugin
+*
+*  @type	function
+*  @date	13/07/2016
+*  @since	5.4.0
+*
+*  @param	$basename (int)
+*  @return	$post_id (int)
+*/
+
+
+function acf_is_plugin_active() {
+	
+	// vars
+	$basename = acf_get_setting('basename');
+	
+	
+	// ensure is_plugin_active() exists (not on frontend)
+	if( !function_exists('is_plugin_active') ) {
+		
+		include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		
+	}
+	
+	
+	// return
+	return is_plugin_active($basename);
+	
+}
+
+
+/*
+*  acf_enable_filter
+*
+*  This function will enable a filter
+*
+*  @type	function
+*  @date	15/07/2016
+*  @since	5.4.0
+*
+*  @param	$post_id (int)
+*  @return	$post_id (int)
+*/
+
+function acf_enable_filter( $filter = '' ) {
+	
+	// get filters
+	$filters = acf_get_setting('_filters', array());
+	
+	
+	// append
+	$filters[ $filter ] = true;
+	
+	
+	// update
+	acf_update_setting('_filters', $filters);
+	
+}
+
+
+/*
+*  acf_disable_filter
+*
+*  This function will disable a filter
+*
+*  @type	function
+*  @date	15/07/2016
+*  @since	5.4.0
+*
+*  @param	$post_id (int)
+*  @return	$post_id (int)
+*/
+
+function acf_disable_filter( $filter = '' ) {
+	
+	// get filters
+	$filters = acf_get_setting('_filters', array());
+	
+	
+	// append
+	$filters[ $filter ] = false;
+	
+	
+	// update
+	acf_update_setting('_filters', $filters);
+	
+}
+
+
+/*
+*  acf_enable_filters
+*
+*  ACF uses filters to modify field group and field data
+*  This function will enable them allowing ACF to interact with all data
+*
+*  @type	function
+*  @date	14/07/2016
+*  @since	5.4.0
+*
+*  @param	$post_id (int)
+*  @return	$post_id (int)
+*/
+
+function acf_enable_filters() {
+	
+	// get filters
+	$filters = acf_get_setting('_filters', array());
+	
+	
+	// loop
+	foreach( array_keys($filters) as $k ) {
+		
+		$filters[ $k ] = true;
+		
+	}
+	
+	
+	// update
+	acf_update_setting('_filters', $filters);
+	
+}
+
+
+/*
+*  acf_disable_filters
+*
+*  ACF uses filters to modify field group and field data
+*  This function will disable them allowing ACF to interact only with raw DB data
+*
+*  @type	function
+*  @date	14/07/2016
+*  @since	5.4.0
+*
+*  @param	$post_id (int)
+*  @return	$post_id (int)
+*/
+
+function acf_disable_filters() {
+	
+	// get filters
+	$filters = acf_get_setting('_filters', array());
+	
+	
+	// loop
+	foreach( array_keys($filters) as $k ) {
+		
+		$filters[ $k ] = false;
+		
+	}
+	
+	
+	// update
+	acf_update_setting('_filters', $filters);
+	
+}
+
+
+/*
+*  acf_is_filter_enabled
+*
+*  ACF uses filters to modify field group and field data
+*  This function will return true if they are enabled
+*
+*  @type	function
+*  @date	14/07/2016
+*  @since	5.4.0
+*
+*  @param	$post_id (int)
+*  @return	$post_id (int)
+*/
+
+function acf_is_filter_enabled( $filter = '' ) {
+	
+	// get filters
+	$filters = acf_get_setting('_filters', array());
+	
+	
+	// bail early if not set
+	return empty( $filters[ $filter ] ) ? false : true;
+	
+}
+
+
+/*
+*  acf_send_ajax_results
+*
+*  This function will print JSON data for a Select2 AJAX query
+*
+*  @type	function
+*  @date	19/07/2016
+*  @since	5.4.0
+*
+*  @param	$response (array)
+*  @return	n/a
+*/
+
+function acf_send_ajax_results( $response ) {
+	
+	// validate
+	$response = wp_parse_args($response, array(
+		'results'	=> false,
+		'more'		=> false,
+		'limit'		=> 0
+	));
+	
+	
+	// limit
+	if( $response['limit'] && $response['results']) {
+		
+		// vars
+		$total = 0;
+		
+		foreach( $response['results'] as $result ) {
+			
+			// parent
+			$total++;
+			
+			
+			// children
+			if( !empty($result['children']) ) {
+				
+				$total += count( $result['children'] );
+				
+			}
+			
+		}
+		
+		
+		// calc
+		if( $total >= $response['limit'] ) {
+			
+			$response['more'] = true;
+			
+		}
+		
+	}
+	
+	
+	// return
+	wp_send_json( $response );
+	
+}		
+		
+
 add_filter("acf/settings/slug", '_acf_settings_slug');
 
 function _acf_settings_slug( $v ) {
diff --git a/api/api-template.php b/api/api-template.php
index a5bcb3f..dbb7bcb 100644
--- a/api/api-template.php
+++ b/api/api-template.php
@@ -243,29 +243,26 @@ function get_field_objects( $post_id = false, $format_value = true, $load_value
 	
 	// filter post_id
 	$post_id = acf_get_valid_post_id( $post_id );
-
-
+	$info = acf_get_post_id_info( $post_id );
+	
+	
 	// vars
 	$meta = array();
 	$fields = array();
 	
 				
 	// get field_names
-	if( is_numeric($post_id) ) {
+	if( $info['type'] == 'post' ) {
 		
-		$meta = get_post_meta( $post_id );
+		$meta = get_post_meta( $info['id'] );
 	
-	} elseif( strpos($post_id, 'user_') !== false ) {
+	} elseif( $info['type'] == 'user' ) {
 		
-		$user_id = (int) str_replace('user_', '', $post_id);
+		$meta = get_user_meta( $info['id'] );
 		
-		$meta = get_user_meta( $user_id );
+	} elseif( $info['type'] == 'comment' ) {
 		
-	} elseif( strpos($post_id, 'comment_') !== false ) {
-		
-		$comment_id = (int) str_replace('comment_', '', $post_id);
-		
-		$meta = get_comment_meta( $comment_id );
+		$meta = get_comment_meta( $info['id'] );
 		
 	} else {
 		
@@ -279,7 +276,24 @@ function get_field_objects( $post_id = false, $format_value = true, $load_value
 			
 			foreach( $rows as $row ) {
 				
-				$meta[ $row['option_name'] ][] = $row['option_value'];
+				// vars
+				$name = $row['option_name'];
+				$prefix = $post_id . '_';
+				$_prefix = '_' . $prefix;
+				
+				
+				// remove prefix from name
+				if( strpos($name, $prefix) === 0 ) {
+					
+					$name = substr($name, strlen($prefix));
+					
+				} elseif( strpos($name, $_prefix) === 0 ) {
+					
+					$name = '_' . substr($name, strlen($_prefix));
+					
+				}
+				
+				$meta[ $name ][] = $row['option_value'];
 				
 			}
 			
@@ -308,8 +322,9 @@ function get_field_objects( $post_id = false, $format_value = true, $load_value
 		$field = acf_get_field( $field_key );
 		
 		
-		// bail early if not a parent field
-		if( !$field || acf_is_sub_field($field) ) continue;
+		// bail early if no field, or if the field's name is different to $k
+		// - solves problem where sub fields (and clone fields) are incorrectly allowed
+		if( !$field || $field['name'] !== $k ) continue;
 		
 		
 		// load value
@@ -994,12 +1009,16 @@ add_shortcode( 'acf', 'acf_shortcode' );
 
 function acf_form_head() {
 	
+	// register local fields
+	_acf_form_register_fields();
+	
+	
 	// verify nonce
 	if( acf_verify_nonce('acf_form') ) {
 		
 		// add actions
-		add_action('acf/validate_save_post', '_validate_save_post');
-		add_filter('acf/pre_save_post', '_acf_pre_save_post', 5, 2);
+		add_action('acf/validate_save_post', '_acf_form_validate_save_post');
+		add_filter('acf/pre_save_post', '_acf_form_pre_save_post', 5, 2);
 		
 		
 		// validate data
@@ -1055,10 +1074,57 @@ function acf_form_head() {
 }
 
 
+/*
+*  _acf_form_register_fields
+*
+*  This function will register some local fields used by the acf_form function
+*
+*  @type	function
+*  @date	15/08/2016
+*  @since	5.4.0
+*
+*  @param	n/a
+*  @return	n/a
+*/
+
+function _acf_form_register_fields() {
+	
+	acf_add_local_field(array(
+		'prefix'	=> 'acf',
+		'name'		=> '_post_title',
+		'key'		=> '_post_title',
+		'label'		=> __('Title', 'acf'),
+		'type'		=> 'text',
+		'required'	=> true,
+	));
+	
+	acf_add_local_field(array(
+		'prefix'	=> 'acf',
+		'name'		=> '_post_content',
+		'key'		=> '_post_content',
+		'label'		=> __('Content', 'acf'),
+		'type'		=> 'wysiwyg',
+	));
+	
+	acf_add_local_field(array(
+		'prefix'	=> 'acf',
+		'name'		=> '_validate_email',
+		'key'		=> '_validate_email',
+		'label'		=> __('Validate Email', 'acf'),
+		'type'		=> 'text',
+		'value'		=> '',
+		'wrapper'	=> array(
+			'style'	=> 'display:none !important;'
+		)
+	));
+	
+}
+
+
 /*
 *  _validate_save_post
 *
-*  description
+*  This function will perfrom extra validation for acf_form
 *
 *  @type	function
 *  @date	16/06/2014
@@ -1068,25 +1134,7 @@ function acf_form_head() {
 *  @return	$post_id (int)
 */
 
-function _validate_save_post() {
-	
-	// save post_title
-	if( isset($_POST['acf']['_post_title']) ) {
-		
-		// get field
-		$field = acf_get_valid_field(array(
-			'name'		=> '_post_title',
-			'label'		=> __('Title', 'acf'),
-			'type'		=> 'text',
-			'required'	=> true
-		));
-		
-		
-		// validate
-		acf_validate_value( $_POST['acf']['_post_title'], $field, "acf[_post_title]" );
-	
-	}
-	
+function _acf_form_validate_save_post() {
 	
 	// honeypot
 	if( !empty($_POST['acf']['_validate_email']) ) {
@@ -1099,7 +1147,7 @@ function _validate_save_post() {
 
 
 /*
-*  _acf_pre_save_post
+*  _acf_form_pre_save_post
 *
 *  This filter will save post data for the acf_form function
 *
@@ -1111,7 +1159,7 @@ function _validate_save_post() {
 *  @return	$post_id (int)
 */
 
-function _acf_pre_save_post( $post_id, $form ) {
+function _acf_form_pre_save_post( $post_id, $form ) {
 	
 	// vars
 	$save = array(
@@ -1128,7 +1176,7 @@ function _acf_pre_save_post( $post_id, $form ) {
 	} elseif( $post_id == 'new_post' ) {
 		
 		// new post
-		$form['new_post'] = acf_parse_args( $form['new_post'], array(
+		$form['new_post'] = wp_parse_args( $form['new_post'], array(
 			'post_type' 	=> 'post',
 			'post_status'	=> 'draft',
 		));
@@ -1267,7 +1315,7 @@ function acf_form( $args = array() ) {
 		
 		
 		// new post defaults
-		$args['new_post'] = acf_parse_args( $args['new_post'], array(
+		$args['new_post'] = wp_parse_args( $args['new_post'], array(
 			'post_type' 	=> 'post',
 			'post_status'	=> 'draft',
 		));
@@ -1287,13 +1335,13 @@ function acf_form( $args = array() ) {
 	// post_title
 	if( $args['post_title'] ) {
 		
-		$fields[] = acf_get_valid_field(array(
-			'name'		=> '_post_title',
-			'label'		=> __('Title', 'acf'),
-			'type'		=> 'text',
-			'value'		=> $post_id ? get_post_field('post_title', $post_id) : '',
-			'required'	=> true
-		));
+		// load local field
+		$_post_title = acf_get_field('_post_title');
+		$_post_title['value'] = $post_id ? get_post_field('post_title', $post_id) : '';
+		
+		
+		// append
+		$fields[] = $_post_title;
 		
 	}
 	
@@ -1301,13 +1349,14 @@ function acf_form( $args = array() ) {
 	// post_content
 	if( $args['post_content'] ) {
 		
-		$fields[] = acf_get_valid_field(array(
-			'name'		=> '_post_content',
-			'label'		=> __('Content', 'acf'),
-			'type'		=> 'wysiwyg',
-			'value'		=> $post_id ? get_post_field('post_content', $post_id) : ''
-		));
+		// load local field
+		$_post_content = acf_get_field('_post_content');
+		$_post_content['value'] = $post_id ? get_post_field('post_content', $post_id) : '';
 		
+		
+		// append
+		$fields[] = $_post_content;
+				
 	}
 	
 	
@@ -1366,15 +1415,7 @@ function acf_form( $args = array() ) {
 	// honeypot
 	if( $args['honeypot'] ) {
 		
-		$fields[] = acf_get_valid_field(array(
-			'name'		=> '_validate_email',
-			'label'		=> __('Validate Email', 'acf'),
-			'type'		=> 'text',
-			'value'		=> '',
-			'wrapper'	=> array(
-				'style'	=> 'display:none;'
-			)
-		));
+		$fields[] = acf_get_field('_validate_email');
 		
 	}
 	
@@ -1824,20 +1865,24 @@ function delete_row( $selector, $row = 1, $post_id = false ) {
 	if( empty($rows) ) return false;
 	
 	
-	// deincrement
-	if( $row == count($rows) ) {
-		
-		acf_update_metadata( $post_id, $field['name'], $row-1 );
-		
-	}
+	// vars
+	$i = $row-1;
 	
 	
-	// update sub field values
-	foreach( $rows[0] as $k => $v ) {
-		
-		update_sub_field( array( $field['key'], $row, $k ), null, $post_id );
-		
-	}
+	// bail early if row doesn't exist
+	if( empty($rows[ $i ]) ) return false;
+	
+	
+	// unset
+	unset( $rows[ $i ] );
+	
+	
+	// reindex
+	$rows = array_values($rows);
+	
+	
+	// update
+	acf_update_value( $rows, $post_id, $field );
 	
 	
 	// return
diff --git a/api/api-value.php b/api/api-value.php
index 15ab665..a41c875 100644
--- a/api/api-value.php
+++ b/api/api-value.php
@@ -19,71 +19,37 @@ function acf_get_metadata( $post_id = 0, $name = '', $hidden = false ) {
 	
 	// vars
 	$value = null;
+	$prefix = $hidden ? '_' : '';
+	
+	
+	// get post_id info
+	$info = acf_get_post_id_info($post_id);
 	
 	
 	// bail early if no $post_id (acf_form - new_post)
-	if( !$post_id ) return $value;
+	if( !$info['id'] ) return $value;
 	
 	
-	// add prefix for hidden meta
-	if( $hidden ) {
+	// option
+	if( $info['type'] === 'option' ) {
 		
-		$name = '_' . $name;
+		$name = $prefix . $post_id . '_' . $name;
+		$value = get_option( $name, null );
 		
-	}
-	
-	
-	// post
-	if( is_numeric($post_id) ) {
-		
-		$meta = get_metadata( 'post', $post_id, $name, false );
-		
-		if( isset($meta[0]) ) {
-		
-		 	$value = $meta[0];
-		 	
-	 	}
-	
-	// user
-	} elseif( substr($post_id, 0, 5) == 'user_' ) {
-		
-		$user_id = (int) substr($post_id, 5);
-		
-		$meta = get_metadata( 'user', $user_id, $name, false );
-		
-		if( isset($meta[0]) ) {
-		
-		 	$value = $meta[0];
-		 	
-	 	}
-	
-	// comment
-	} elseif( substr($post_id, 0, 8) == 'comment_' ) {
-		
-		$comment_id = (int) substr($post_id, 8);
-		
-		$meta = get_metadata( 'comment', $comment_id, $name, false );
-		
-		if( isset($meta[0]) ) {
-		
-		 	$value = $meta[0];
-		 	
-	 	}
-	 	
+	// meta
 	} else {
 		
-		// modify prefix for hidden meta
-		if( $hidden ) {
-			
-			$post_id = '_' . $post_id;
-			$name = substr($name, 1);
-			
-		}
+		$name = $prefix . $name;
+		$meta = get_metadata( $info['type'], $info['id'], $name, false );
 		
-		$value = get_option( $post_id . '_' . $name, null );
+		if( isset($meta[0]) ) {
+		
+		 	$value = $meta[0];
+		 	
+	 	}
 		
 	}
-		
+	
 	
 	// return
 	return $value;
@@ -111,53 +77,34 @@ function acf_update_metadata( $post_id = 0, $name = '', $value = '', $hidden = f
 	
 	// vars
 	$return = false;
+	$prefix = $hidden ? '_' : '';
 	
 	
-	// add prefix for hidden meta
-	if( $hidden ) {
-		
-		$name = '_' . $name;
-		
-	}
+	// get post_id info
+	$info = acf_get_post_id_info($post_id);
 	
 	
-	// postmeta
-	if( is_numeric($post_id) ) {
-		
-		$return = update_metadata('post', $post_id, $name, $value );
+	// bail early if no $post_id (acf_form - new_post)
+	if( !$info['id'] ) return $return;
 	
-	// usermeta
-	} elseif( substr($post_id, 0, 5) == 'user_' ) {
-		
-		$user_id = (int) substr($post_id, 5);
-		
-		$return = update_metadata('user', $user_id, $name, $value);
-		
-	// commentmeta
-	} elseif( substr($post_id, 0, 8) == 'comment_' ) {
-		
-		$comment_id = (int) substr($post_id, 8);
-		
-		$return = update_metadata('comment', $comment_id, $name, $value);
 	
-	// options	
+	// option
+	if( $info['type'] === 'option' ) {
+		
+		$name = $prefix . $post_id . '_' . $name;
+		$return = acf_update_option( $name, $value );
+		
+	// meta
 	} else {
 		
-		// modify prefix for hidden meta
-		if( $hidden ) {
-			
-			$post_id = '_' . $post_id;
-			$name = substr($name, 1);
-			
-		}
-		
-		$return = acf_update_option( $post_id . '_' . $name, $value );
+		$name = $prefix . $name;
+		$return = update_metadata( $info['type'], $info['id'], $name, $value );
 		
 	}
 	
 	
 	// return
-	return (boolean) $return;
+	return $return;
 	
 }
 
@@ -181,47 +128,28 @@ function acf_delete_metadata( $post_id = 0, $name = '', $hidden = false ) {
 	
 	// vars
 	$return = false;
+	$prefix = $hidden ? '_' : '';
 	
 	
-	// add prefix for hidden meta
-	if( $hidden ) {
-		
-		$name = '_' . $name;
-		
-	}
+	// get post_id info
+	$info = acf_get_post_id_info($post_id);
 	
 	
-	// postmeta
-	if( is_numeric($post_id) ) {
-		
-		$return = delete_metadata('post', $post_id, $name );
+	// bail early if no $post_id (acf_form - new_post)
+	if( !$info['id'] ) return $return;
 	
-	// usermeta
-	} elseif( substr($post_id, 0, 5) == 'user_' ) {
-		
-		$user_id = (int) substr($post_id, 5);
-		
-		$return = delete_metadata('user', $user_id, $name);
-		
-	// commentmeta
-	} elseif( substr($post_id, 0, 8) == 'comment_' ) {
-		
-		$comment_id = (int) substr($post_id, 8);
-		
-		$return = delete_metadata('comment', $comment_id, $name);
 	
-	// options	
+	// option
+	if( $info['type'] === 'option' ) {
+		
+		$name = $prefix . $post_id . '_' . $name;
+		$return = delete_option( $name );
+		
+	// meta
 	} else {
 		
-		// modify prefix for hidden meta
-		if( $hidden ) {
-			
-			$post_id = '_' . $post_id;
-			$name = substr($name, 1);
-			
-		}
-		
-		$return = delete_option( $post_id . '_' . $name );
+		$name = $prefix . $name;
+		$return = delete_metadata( $info['type'], $info['id'], $name );
 		
 	}
 	
@@ -302,14 +230,16 @@ function acf_update_option( $option = '', $value = '', $autoload = null ) {
 
 function acf_get_value( $post_id = 0, $field ) {
 	
-	// cache
-	$found = false;
-	$cache_slug = "load_value/post_id={$post_id}/name={$field['name']}";
-	$cache = wp_cache_get($cache_slug, 'acf', false, $found);
+	// vars
+	$cache_key = "get_value/post_id={$post_id}/name={$field['name']}";
 	
 	
-	// return cache if found
-	if( $found ) return $cache;
+	// return early if cache is found
+	if( acf_isset_cache($cache_key) ) {
+		
+		return acf_get_cache($cache_key);
+		
+	}
 	
 	
 	// load value
@@ -336,7 +266,7 @@ function acf_get_value( $post_id = 0, $field ) {
 	
 	
 	// update cache
-	wp_cache_set($cache_slug, $value, 'acf');
+	acf_set_cache($cache_key, $value);
 
 	
 	// return
@@ -362,14 +292,16 @@ function acf_get_value( $post_id = 0, $field ) {
 
 function acf_format_value( $value, $post_id, $field ) {
 	
-	// try cache
-	$found = false;
-	$cache_slug = "format_value/post_id={$post_id}/name={$field['name']}";
-	$cache = wp_cache_get($cache_slug, 'acf', false, $found);
+	// vars
+	$cache_key = "format_value/post_id={$post_id}/name={$field['name']}";
 	
 	
-	// return cache if found
-	if( $found ) return $cache;
+	// return early if cache is found
+	if( acf_isset_cache($cache_key) ) {
+		
+		return acf_get_cache($cache_key);
+		
+	}
 	
 	
 	// apply filters
@@ -380,7 +312,7 @@ function acf_format_value( $value, $post_id, $field ) {
 	
 	
 	// update cache
-	wp_cache_set($cache_slug, $value, 'acf');
+	acf_set_cache($cache_key, $value);
 	
 	
 	// return
@@ -429,8 +361,8 @@ function acf_update_value( $value = null, $post_id = 0, $field ) {
 	
 	
 	// clear cache
-	wp_cache_delete( "load_value/post_id={$post_id}/name={$field['name']}", 'acf' );
-	wp_cache_delete( "format_value/post_id={$post_id}/name={$field['name']}", 'acf' );
+	acf_delete_cache("get_value/post_id={$post_id}/name={$field['name']}");
+	acf_delete_cache("format_value/post_id={$post_id}/name={$field['name']}");
 
 	
 	// return
@@ -471,8 +403,8 @@ function acf_delete_value( $post_id = 0, $field ) {
 	
 	
 	// clear cache
-	wp_cache_delete( "load_value/post_id={$post_id}/name={$field['name']}", 'acf' );
-	wp_cache_delete( "format_value/post_id={$post_id}/name={$field['name']}", 'acf' );
+	acf_delete_cache("get_value/post_id={$post_id}/name={$field['name']}");
+	acf_delete_cache("format_value/post_id={$post_id}/name={$field['name']}");
 	
 	
 	// return
@@ -480,4 +412,72 @@ function acf_delete_value( $post_id = 0, $field ) {
 	
 }
 
+
+/*
+*  acf_copy_postmeta
+*
+*  This function will copy postmeta from one post to another.
+*  Very useful for saving and restoring revisions
+*
+*  @type	function
+*  @date	25/06/2016
+*  @since	5.3.8
+*
+*  @param	$from_post_id (int)
+*  @param	$to_post_id (int)
+*  @return	n/a
+*/
+
+function acf_copy_postmeta( $from_post_id, $to_post_id ) {
+	
+	// get all postmeta
+	$meta = get_post_meta( $from_post_id );
+	
+	
+	// bail early if no meta
+	if( !$meta ) return;
+
+	
+	// loop
+	foreach( $meta as $name => $value ) {
+		
+		// attempt to find key value
+		$key = acf_maybe_get( $meta, '_'.$name );
+		
+		
+		// bail ealry if no key
+		if( !$key ) continue;
+		
+		
+		// update vars
+		$value = $value[0];
+		$key = $key[0];
+		
+		
+		// bail early if $key is a not a field_key
+		if( !acf_is_field_key($key) ) continue;
+		
+		
+		// get_post_meta will return array before running maybe_unserialize
+		$value = maybe_unserialize( $value );
+		
+		
+		// add in slashes
+		// - update_post_meta will unslash the value, so we must first slash it to avoid losing backslashes
+		// - https://codex.wordpress.org/Function_Reference/update_post_meta#Character_Escaping
+		if( is_string($value) ) {
+			
+			$value =  wp_slash($value);
+			
+		}
+		
+		
+		// update value
+		acf_update_metadata( $to_post_id, $name, $value );
+		acf_update_metadata( $to_post_id, $name, $key, true );
+					
+	}
+
+}
+
 ?>
diff --git a/assets/css/acf-input.css b/assets/css/acf-input.css
index 00835e1..a923c94 100644
--- a/assets/css/acf-input.css
+++ b/assets/css/acf-input.css
@@ -348,6 +348,16 @@ html[dir="rtl"] .acf-c0 {
 .acf-field textarea {
   resize: vertical;
 }
+/* disabled */
+.acf-field input:disabled,
+.acf-field select:disabled,
+.acf-field textarea:disabled {
+  background: #f8f8f8;
+}
+.acf-field input[readonly],
+.acf-field textarea[readonly] {
+  background: #f8f8f8;
+}
 /*---------------------------------------------------------------------------------------------
 *
 *  Text
@@ -458,6 +468,10 @@ html[dir="rtl"] input.acf-is-prepended.acf-is-appended {
 *  Select2 (v3)
 *
 *---------------------------------------------------------------------------------------------*/
+.select2-container.-acf {
+  /* open */
+  /* single open */
+}
 .select2-container.-acf .select2-choices {
   background: #fff;
   border-color: #ddd;
@@ -483,13 +497,6 @@ html[dir="rtl"] input.acf-is-prepended.acf-is-appended {
 .select2-container.-acf .select2-search-choice-close {
   margin-top: -1px;
 }
-/* open */
-.select2-container.-acf.select2-container-active .select2-choices,
-.select2-container.-acf.select2-dropdown-open .select2-choices {
-  border-color: #5B9DD9;
-  border-radius: 3px 3px 0 0;
-}
-/* single */
 .select2-container.-acf .select2-choice {
   border-color: #BBBBBB;
 }
@@ -498,11 +505,38 @@ html[dir="rtl"] input.acf-is-prepended.acf-is-appended {
   border-left-color: #DFDFDF;
   padding-left: 1px;
 }
-/* single open */
+.select2-container.-acf .select2-choice .select2-result-description {
+  display: none;
+}
+.select2-container.-acf.select2-container-active .select2-choices,
+.select2-container.-acf.select2-dropdown-open .select2-choices {
+  border-color: #5B9DD9;
+  border-radius: 3px 3px 0 0;
+}
 .select2-container.-acf.select2-dropdown-open .select2-choice {
   background: #fff;
   border-color: #5B9DD9;
 }
+/* description */
+.select2-drop {
+  /* search*/
+  /* result */
+}
+.select2-drop .select2-search {
+  padding: 4px 4px 0;
+}
+.select2-drop .select2-result {
+  /* hover*/
+}
+.select2-drop .select2-result .select2-result-description {
+  color: #999;
+  font-size: 12px;
+  margin-left: 5px;
+}
+.select2-drop .select2-result.select2-highlighted .select2-result-description {
+  color: #fff;
+  opacity: 0.75;
+}
 /*---------------------------------------------------------------------------------------------
 *
 *  Select2 (v4)
@@ -1425,6 +1459,14 @@ html[dir="rtl"] .acf-file-uploader .file-info ul {
 }
 /*---------------------------------------------------------------------------------------------
 *
+*	Clone field
+*
+*---------------------------------------------------------------------------------------------*/
+.acf-clone-fields {
+  border: #dfdfdf solid 1px;
+}
+/*---------------------------------------------------------------------------------------------
+*
 *	Taxonomy
 *
 *---------------------------------------------------------------------------------------------*/
diff --git a/assets/js/acf-field-group.js b/assets/js/acf-field-group.js
index 5b9d927..43c09a1 100644
--- a/assets/js/acf-field-group.js
+++ b/assets/js/acf-field-group.js
@@ -11,10 +11,6 @@
 			'ready': 'init'
 		},
 		
-		filters: {
-			'get_fields 99': 'get_fields'
-		},
-		
 		events: {
 			'submit #post':					'submit',
 			'click a[href="#"]':			'preventDefault',
@@ -101,27 +97,6 @@
 		},
 		
 		
-		/*
-		*  get_fields
-		*
-		*  This function will remove fields from the clone index
-		*  Without this, field JS such as Select2 may run on fields which are used as a template
-		*
-		*  @type	function
-		*  @date	15/08/2015
-		*  @since	5.2.3
-		*
-		*  @param	$fields (selection)
-		*  @return	$fields
-		*/
-		
-		get_fields: function( $fields ) {
-			 	
-			return $fields.not('.acf-field-object[data-id="acfcloneindex"] .acf-field');
-		
-		},
-		
-		
 		/*
 		*  preventDefault
 		*
@@ -165,7 +140,7 @@
 			$('.acf-field-list').each(function(){
 				
 				// vars
-				var $fields = $(this).children('.acf-field-object').not('[data-id="acfcloneindex"]');
+				var $fields = $(this).children('.acf-field-object');
 				
 				
 				// loop over fields
@@ -456,15 +431,6 @@
 					open = $(this).hasClass('open');
 				
 				
-				// clone
-				if( ID == 'acfcloneindex' ) {
-					
-					$(this).remove();
-					return;
-					
-				}
-				
-				
 				// close
 				if( open ) {
 					
@@ -745,8 +711,7 @@
 		add_field: function( $fields ){
 			
 			// clone tr
-			var $clone = $fields.children('.acf-field-object[data-id="acfcloneindex"]'),
-				$el = $clone.clone(),
+			var $el = $( $('#tmpl-acf-field').html() ),
 				$label = $el.find('.field-label:first'),
 				$name = $el.find('.field-name:first');
 			
@@ -756,7 +721,7 @@
 			
 			
 			// append to table
-			$clone.before( $el );
+			$fields.append( $el );
 			
 			
 			// clear name
@@ -926,7 +891,7 @@
 			} else {
 				
 				// Case: sub field's settings have changed
-				$field.find('.acf-field-object').not('[data-id="acfcloneindex"]').each(function(){
+				$field.find('.acf-field-object').each(function(){
 					
 					if( !self.get_field_meta( $(this), 'ID' ) ) {
 						
@@ -1069,14 +1034,6 @@
 			var id = this.get_field_meta($el, 'ID');
 			
 			
-			// bail early if cloneindex
-			if( id == 'acfcloneindex' ) {
-				
-				return;
-				
-			}
-			
-			
 			// add to remove list
 			if( id ) {
 			
@@ -1650,10 +1607,6 @@
 						
 						return;
 						
-					} else if( this_key == 'acfcloneindex' ) {
-						
-						return;
-						
 					} else if( this_key == key ) {
 						
 						return;
@@ -2519,15 +2472,19 @@
 		render: function( $el ){
 			
 			// bail early if not correct field type
-			if( $el.attr('data-type') != 'tab' ) {
-				
-				return;
-				
-			}
+			if( $el.attr('data-type') != 'tab' ) return;
+			
+			
+			// vars 
+			var id = $el.data('id');
 			
 			
 			// clear name
-			$el.find('.acf-field[data-name="name"] input').val('').trigger('change');
+			$('#acf_fields-' + id + '-name').val('').trigger('change');
+			
+			
+			// clear required
+			$('#acf_fields-' + id + '-required-0').trigger('click');
 			
 		}		
 		
@@ -2557,17 +2514,207 @@
 		render: function( $el ){
 			
 			// bail early if not correct field type
-			if( $el.attr('data-type') != 'message' ) {
+			if( $el.attr('data-type') != 'message' ) return;
+			
+			
+			// vars 
+			var id = $el.data('id');
+			
+			
+			// clear name
+			$('#acf_fields-' + id + '-name').val('').trigger('change');
+			
+			
+			// clear required
+			$('#acf_fields-' + id + '-required-0').trigger('click');
+			
+		}		
+		
+	});
+	
+	
+	/*
+	*  clone
+	*
+	*  This field type requires some extra logic for its settings
+	*
+	*  @type	function
+	*  @date	24/10/13
+	*  @since	5.0.0
+	*
+	*  @param	n/a
+	*  @return	n/a
+	*/
+	
+	var acf_settings_clone = acf.model.extend({
+		
+		actions: {
+			'open_field':			'render',
+			'change_field_type':	'render'
+		},
+		
+		filters: {
+			'select2_args':			'select2_args',
+			'select2_ajax_data':	'select2_ajax_data'
+		},
+		
+		events: {
+			'change .acf-field-object-clone .setting-display':				'render_display',
+			'change .acf-field-object-clone .setting-prefix-label input':	'render_prefix_label',
+			'change .acf-field-object-clone .setting-prefix-name input':	'render_prefix_name',
+		},
+		
+		event: function( e ){
+			
+			// override
+			return e.$el.closest('.acf-field-object');
+			
+		},
 				
-				return;
+		render: function( $el ){
+			
+			// bail early if not correct field type
+			if( $el.attr('data-type') != 'clone' ) return;
+			
+			
+			// render
+			this.render_display( $el );
+			this.render_prefix_label( $el );
+			this.render_prefix_name( $el );
+			
+		},
+		
+		render_display: function( $el ){
+			
+			// vars
+			var $layout = $el.find('.acf-field[data-name="layout"]'),
+				$display = $el.find('.acf-field[data-name="display"] select'),
+				$conditional = $el.find('.acf-field[data-name="conditional_logic"]'),
+				$wrapper = $el.find('.acf-field[data-name="wrapper"]');
+				
+			
+			// hide conditional logic
+			if( $display.val() == 'seamless' ) {
+				
+				$conditional.hide();
+				$wrapper.hide();
+				$layout.hide();
+				
+			} else {
+				
+				$conditional.show();
+				$wrapper.show();
+				$layout.show();
+				
+			}	
+			
+		},
+		
+		render_prefix_label: function( $el ){
+			
+			// vars
+			var $prefix_label = $el.find('.setting-prefix-label input:checked'),
+				$field_label = $el.find('.field-label'),
+				$code = $el.find('.prefix-label-code-1');
+			
+			
+			// html
+			var html = '%field_label%';
+			
+			if( $prefix_label.val() === '1' ) {
+				
+				html = $field_label.val() + ' ' + html;
 				
 			}
 			
 			
-			// clear name
-			$el.find('.acf-field[data-name="name"] input').val('').trigger('change');
+			// update code
+			$code.html( html );	
+			
+		},
+		
+		render_prefix_name: function( $el ){
+			
+			// vars
+			var $prefix_name = $el.find('.setting-prefix-name input:checked'),
+				$field_name = $el.find('.field-name'),
+				$code = $el.find('.prefix-name-code-1');
+			
+			
+			// html
+			var label = '%field_name%';
+			
+			if( $prefix_name.val() === '1' ) {
+				
+				label = $field_name.val() + '_' + label;
+				
+			}
+			
+			
+			// html
+			$code.html( label );
+			
+		},
+		
+		select2_args: function( select2_args, $select, args ){
+			
+			// bail early if not clone
+			if( args.ajax_action !== 'acf/fields/clone/query' ) return select2_args;
+			
+			
+			// remain open on select
+			select2_args.closeOnSelect = false;
+			
+			
+			// return
+			return select2_args;
+		},
+		
+		select2_ajax_data: function( data, args, params ){
+			
+			// bail early if not clone
+			if( args.ajax_action !== 'acf/fields/clone/query' ) return select2_args;
+			
+			
+			// find current fields
+			var fields = {};
+			
+			
+			// loop
+			$('.acf-field-object').each(function(){
+				
+				// vars
+				var $el = $(this),
+					key = $el.data('key'),
+					type = $el.data('type'),
+					label = $el.find('.field-label:first').val(),
+					$ancestors = $el.parents('.acf-field-object');
+				
+				
+				// label
+				fields[ key ] = {
+					'key': key,
+					'type': type,
+					'label': label,
+					'ancestors': $ancestors.length
+				};
+				
+			});
+			
+			
+			// append fields
+			data.fields = fields;
+			
+			
+			// append title
+			data.title = $('#title').val();
+			
+			
+			// return
+			return data;
+			
+		}
 			
-		}		
 		
 	});
 	
diff --git a/assets/js/acf-field-group.min.js b/assets/js/acf-field-group.min.js
index 6d6fed8..8ab4706 100644
--- a/assets/js/acf-field-group.min.js
+++ b/assets/js/acf-field-group.min.js
@@ -1 +1 @@
-!function($){acf.field_group=acf.model.extend({$fields:null,$locations:null,$options:null,actions:{ready:"init"},filters:{"get_fields 99":"get_fields"},events:{"submit #post":"submit",'click a[href="#"]':"preventDefault","click .submitdelete":"trash","mouseenter .acf-field-list":"sortable"},init:function(){this.$fields=$("#acf-field-group-fields"),this.$locations=$("#acf-field-group-locations"),this.$options=$("#acf-field-group-options"),acf.validation.active=0},sortable:function(e){if(!e.$el.hasClass("ui-sortable")){var a=this;e.$el.sortable({handle:".acf-sortable-handle",connectWith:".acf-field-list",update:function(e,i){var t=i.item;a.render_fields(),acf.do_action("sortstop",t)}})}},get_fields:function(e){return e.not('.acf-field-object[data-id="acfcloneindex"] .acf-field')},preventDefault:function(e){e.preventDefault()},render_fields:function(){var e=this;$(".acf-field-list").each(function(){var a=$(this).children(".acf-field-object").not('[data-id="acfcloneindex"]');a.each(function(a){e.update_field_meta($(this),"menu_order",a),$(this).children(".handle").find(".acf-icon").html(a+1)}),a.exists()?$(this).children(".no-fields-message").hide():$(this).children(".no-fields-message").show()})},get_field_meta:function(e,a){var i=e.find("> .meta > .input-"+a);return i.exists()?i.val():!1},update_field_meta:function(e,a,i){var t=e.find("> .meta > .input-"+a);if(!t.exists()){var n=e.find("> .meta > .input-ID").outerHTML();n=acf.str_replace("ID",a,n),t=$(n),t.val(i),e.children(".meta").append(t)}t.val()!=i&&(t.val(i),"save"!=a&&this.save_field(e,"meta"))},delete_field_meta:function(e,a){var i=e.find("> .meta > .input-"+a);i.exists()&&(i.remove(),this.save_field(e,"meta"))},save_field:function(e,a){a=a||"settings";var i=this.get_field_meta(e,"save");"settings"!=i&&i!=a&&(this.update_field_meta(e,"save",a),acf.do_action("save_field",e,a))},submit:function(e){var a=this,i=$("#titlewrap #title");i.val()||(e.preventDefault(),acf.validation.toggle(e.$el,"unlock"),alert(acf._e("title_is_required")),i.focus()),$(".acf-field-object").each(function(){var e=a.get_field_meta($(this),"save"),i=a.get_field_meta($(this),"ID"),t=$(this).hasClass("open");return"acfcloneindex"==i?void $(this).remove():(t&&a.close_field($(this)),void("settings"==e||("meta"==e?$(this).children(".settings").find('[name^="acf_fields['+i+']"]').remove():$(this).find('[name^="acf_fields['+i+']"]').remove())))})},trash:function(e){var a=confirm(acf._e("move_to_trash"));a||e.preventDefault()},render_field:function(e){var a=e.find(".field-label:first").val(),i=e.find(".field-name:first").val(),t=e.find(".field-type:first option:selected").text(),n=e.find(".field-required:first input:checked").val();e.find("> .handle .li-field-label strong a").text(a),e.find("> .handle .li-field-label .acf-required").remove(),"1"==n&&e.find("> .handle .li-field-label strong").append('<span class="acf-required">*</span>'),e.find("> .handle .li-field-name").text(i),e.find("> .handle .li-field-type").text(t)},edit_field:function(e){e.hasClass("open")?this.close_field(e):this.open_field(e)},open_field:function(e){return e.hasClass("open")?!1:(e.addClass("open"),acf.do_action("open_field",e),void e.children(".settings").animate({height:"toggle"},250))},close_field:function(e){return e.hasClass("open")?(e.removeClass("open"),acf.do_action("close_field",e),void e.children(".settings").animate({height:"toggle"},250)):!1},wipe_field:function(e){var a=e.attr("data-id"),i=e.attr("data-key"),t=acf.get_uniqid(),n="field_"+t;e.attr("data-id",t),e.attr("data-key",n),e.attr("data-orig",i),this.update_field_meta(e,"ID",""),this.update_field_meta(e,"key",n),e.find('[id*="'+a+'"]').each(function(){$(this).attr("id",$(this).attr("id").replace(a,t))}),e.find('[name*="'+a+'"]').each(function(){$(this).attr("name",$(this).attr("name").replace(a,t))}),e.find("> .handle .pre-field-key").text(n),e.find(".ui-sortable").removeClass("ui-sortable"),acf.do_action("wipe_field",e)},add_field:function(e){var a=e.children('.acf-field-object[data-id="acfcloneindex"]'),i=a.clone(),t=i.find(".field-label:first"),n=i.find(".field-name:first");this.wipe_field(i),a.before(i),t.val(""),n.val(""),setTimeout(function(){t.focus()},251),this.render_fields(),acf.do_action("append",i),this.edit_field(i),acf.do_action("add_field",i)},duplicate_field:function(e){acf.do_action("before_duplicate",e);var a=e.clone(),i=a.find(".field-label:first"),t=a.find(".field-name:first");return acf.do_action("remove",a),this.wipe_field(a),acf.do_action("after_duplicate",e,a),e.after(a),acf.do_action("append",a),setTimeout(function(){i.focus()},251),this.render_fields(),e.hasClass("open")?this.close_field(e):this.open_field(a),i.val(i.val()+" ("+acf._e("copy")+")"),t.val(t.val()+"_"+acf._e("copy")),this.save_field(a),this.render_field(a),acf.do_action("duplicate_field",a),a},move_field:function(e){var a=this,i=acf.prepare_for_ajax({action:"acf/field_group/move_field",field_id:this.get_field_meta(e,"ID")}),t=!1;return i.field_id?"settings"==this.get_field_meta(e,"save")?t=!0:e.find(".acf-field-object").not('[data-id="acfcloneindex"]').each(function(){return a.get_field_meta($(this),"ID")?void("settings"==a.get_field_meta($(this),"save")&&(t=!0)):(t=!0,!1)}):t=!0,t?void alert(acf._e("move_field_warning")):(acf.open_popup({title:acf._e("move_field"),loading:!0,height:145}),void $.ajax({url:acf.get("ajaxurl"),data:i,type:"post",dataType:"html",success:function(i){a.move_field_confirm(e,i)}}))},move_field_confirm:function(e,a){var i=this;acf.update_popup({content:a});var t={action:"acf/field_group/move_field",nonce:acf.get("nonce"),field_id:this.get_field_meta(e,"ID"),field_group_id:0};$("#acf-move-field-form").on("submit",function(){return t.field_group_id=$(this).find("select").val(),$.ajax({url:acf.get("ajaxurl"),data:t,type:"post",dataType:"html",success:function(a){acf.update_popup({content:a}),i.remove_field(e)}}),!1})},delete_field:function(e,a){a=a||!0;var i=this.get_field_meta(e,"ID");"acfcloneindex"!=i&&(i&&$("#input-delete-fields").val($("#input-delete-fields").val()+"|"+i),acf.do_action("delete_field",e),a&&this.remove_field(e))},remove_field:function(e){var a=this,i=e.closest(".acf-field-list");e.css({height:e.height(),width:e.width(),position:"absolute"}),e.wrap('<div class="temp-field-wrap" style="height:'+e.height()+'px"></div>'),e.animate({opacity:0},250);var t=0,n=!1;1==i.children(".acf-field-object").length&&(n=i.children(".no-fields-message"),t=n.outerHeight()),e.parent(".temp-field-wrap").animate({height:t},250,function(){n&&n.show(),acf.do_action("remove",$(this)),$(this).remove(),a.render_fields()})},change_field_type:function(e){var a=e.closest("tbody"),i=a.closest(".acf-field-object"),t=i.parent().closest(".acf-field-object"),n=i.attr("data-key"),d=i.attr("data-type"),l=e.val();i.removeClass("acf-field-object-"+d.replace("_","-")),i.addClass("acf-field-object-"+l.replace("_","-")),i.attr("data-type",l),i.data("xhr")&&i.data("xhr").abort();var f=a.children('.acf-field[data-setting="'+d+'"]'),c="";if(f.each(function(){c+=$(this).outerHTML()}),f.remove(),acf.update(n+"_settings_"+d,c),this.render_field(i),c=acf.get(n+"_settings_"+l))return a.children('.acf-field[data-name="conditional_logic"]').before(c),acf.update(n+"_settings_"+l,""),void acf.do_action("change_field_type",i);var r=$('<tr class="acf-field"><td class="acf-label"></td><td class="acf-input"><div class="acf-loading"></div></td></tr>');a.children('.acf-field[data-name="conditional_logic"]').before(r);var o={action:"acf/field_group/render_field_settings",nonce:acf.o.nonce,parent:acf.o.post_id,field_group:acf.o.post_id,prefix:e.attr("name").replace("[type]",""),type:l};t.exists()&&(o.parent=this.get_field_meta(t,"ID"));var s=$.ajax({url:acf.o.ajaxurl,data:o,type:"post",dataType:"html",success:function(e){if(e){var a=$(e);r.after(a),acf.do_action("append",a),acf.do_action("change_field_type",i)}},complete:function(){r.remove()}});i.data("xhr",s)},change_field_label:function(e){var a=e.find(".field-label:first"),i=e.find(".field-name:first"),t=e.attr("data-type");if(""==i.val()){var n=a.val();n=acf.str_sanitize(n),i.val(n).trigger("change")}this.render_field(e),acf.do_action("change_field_label",e)},change_field_name:function(e){var a=e.find(".field-name:first");"field_"===a.val().substr(0,6)&&(alert(acf._e("field_name_start")),setTimeout(function(){a.focus()},1))}}),acf.field_group.field=acf.model.extend({events:{"click .edit-field":"edit","click .duplicate-field":"duplicate","click .move-field":"move","click .delete-field":"delete","click .add-field":"add","change .field-type":"change_type","blur .field-label":"change_label","blur .field-name":"change_name","keyup .field-label":"render","keyup .field-name":"render","change .field-required input":"render","change .acf-field-object input":"save","change .acf-field-object textarea":"save","change .acf-field-object select":"save"},event:function(e){return e.$field=e.$el.closest(".acf-field-object"),e},edit:function(e){acf.field_group.edit_field(e.$field)},duplicate:function(e){acf.field_group.duplicate_field(e.$field)},move:function(e){acf.field_group.move_field(e.$field)},"delete":function(e){acf.field_group.delete_field(e.$field)},add:function(e){var a=e.$el.closest(".acf-field-list-wrap").children(".acf-field-list");acf.field_group.add_field(a)},change_type:function(e){acf.field_group.change_field_type(e.$el)},change_label:function(e){acf.field_group.change_field_label(e.$field)},change_name:function(e){acf.field_group.change_field_name(e.$field)},render:function(e){acf.field_group.render_field(e.$field)},save:function(e){acf.field_group.save_field(e.$field)}}),acf.field_group.conditional_logic=acf.model.extend({actions:{open_field:"render_field",change_field_label:"render_fields",change_field_type:"render_fields"},events:{"click .add-conditional-rule":"add_rule","click .add-conditional-group":"add_group","click .remove-conditional-rule":"remove_rule","change .conditional-toggle input":"change_toggle","change .conditional-rule-param":"change_param"},render_fields:function(){var e=this;$(".acf-field-object.open").each(function(){e.render_field($(this))})},render_field:function(e){var a=this,i=e.attr("data-key"),t=e.parents(".acf-field-list"),n=e.find('.acf-field[data-name="conditional_logic"]:last'),d=[];$.each(t,function(e){var a=0==e?acf._e("sibling_fields"):acf._e("parent_fields");$(this).children(".acf-field-object").each(function(){var e=$(this),t=e.attr("data-key"),n=e.attr("data-type"),l=e.find(".field-label:first").val();-1!==$.inArray(n,["select","checkbox","true_false","radio"])&&"acfcloneindex"!=t&&t!=i&&d.push({value:t,label:l,group:a})})}),d.length||d.push({value:"",label:acf._e("no_fields")}),n.find(".rule").each(function(){a.render_rule($(this),d)})},render_rule:function(e,a){var i=e.find(".conditional-rule-param"),t=e.find(".conditional-rule-value");a&&acf.render_select(i,a);var n=$('.acf-field-object[data-key="'+i.val()+'"]'),d=n.attr("data-type"),l=[];if("true_false"==d)l.push({value:1,label:acf._e("checked")});else if("select"==d||"checkbox"==d||"radio"==d){var f=n.find('.acf-field[data-name="choices"] textarea').val().split("\n");$.each(f,function(e,a){a=a.split(":"),a[1]=a[1]||a[0],l.push({value:$.trim(a[0]),label:$.trim(a[1])})});var c=n.find('.acf-field[data-name="allow_null"]');c.exists()&&"1"==c.find("input:checked").val()&&l.unshift({value:"",label:acf._e("null")})}acf.render_select(t,l)},change_toggle:function(e){var a=e.$el,i=a.val(),t=a.closest(".acf-input");"1"==i?(t.find(".rule-groups").show(),t.find(".rule-groups").find("[name]").removeAttr("disabled")):(t.find(".rule-groups").hide(),t.find(".rule-groups").find("[name]").attr("disabled","disabled"))},change_param:function(e){var a=e.$el.closest(".rule");this.render_rule(a)},add_rule:function(e){var a=e.$el.closest("tr");$tr2=acf.duplicate(a),$tr2.find("select:first").trigger("change")},remove_rule:function(e){var a=e.$el.closest("tr");a.find("select:first").trigger("change"),0==a.siblings("tr").length&&a.closest(".rule-group").remove(),a.remove()},add_group:function(e){var a=e.$el.closest(".rule-groups"),i=a.find(".rule-group:last");$group2=acf.duplicate(i),$group2.find("h4").text(acf._e("or")),$group2.find("tr:not(:first)").remove(),$group2.find("select:first").trigger("change")}}),acf.field_group.locations=acf.model.extend({events:{"click .add-location-rule":"add_rule","click .add-location-group":"add_group","click .remove-location-rule":"remove_rule","change .location-rule-param":"change_rule"},add_rule:function(e){var a=e.$el.closest("tr");$tr2=acf.duplicate(a)},remove_rule:function(e){var a=e.$el.closest("tr");a.find("select:first").trigger("change"),0==a.siblings("tr").length&&a.closest(".rule-group").remove(),a.remove()},add_group:function(e){var a=e.$el.closest(".rule-groups"),i=a.find(".rule-group:last");$group2=acf.duplicate(i),$group2.find("h4").text(acf._e("or")),$group2.find("tr:not(:first)").remove()},change_rule:function(e){var a=e.$el,i=a.closest("tr"),t=i.attr("data-id"),n=i.closest(".rule-group"),d=n.attr("data-id"),l=$('<div class="acf-loading"></div>');i.find("td.value").html(l),$.ajax({url:acf.get("ajaxurl"),data:acf.prepare_for_ajax({action:"acf/field_group/render_location_value",rule_id:t,group_id:d,param:a.val(),value:""}),type:"post",dataType:"html",success:function(e){l.replaceWith(e)}})}}),acf.add_action("open_field change_field_type",function(e){e.find(".acf-field[data-append]").each(function(){var e=$(this).data("append");if($sibling=$(this).siblings('[data-name="'+e+'"]'),$sibling.exists()){var a=$sibling.children(".acf-input"),i=a.children(".acf-hl");i.exists()||(a.wrapInner('<ul class="acf-hl"><li></li></ul>'),i=a.children(".acf-hl"));var t=$("<li></li>").append($(this).children(".acf-input").children());i.append(t),i.attr("data-cols",i.children().length),$(this).remove()}})});var e=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},events:{'change .acf-field[data-name="ui"] input':"render"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){if("select"==e.attr("data-type")){var a=e.find('.acf-field[data-name="ui"] input:checked').val();"1"==a?e.find('.acf-field[data-name="ajax"]').show():e.find('.acf-field[data-name="ajax"]').hide()}}}),a=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},events:{'change .acf-field[data-name="other_choice"] input':"render"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){if("radio"==e.attr("data-type")){var a=e.find('.acf-field[data-name="other_choice"] input:checked').val();"1"==a?e.find('.acf-field[data-name="save_other_choice"]').show():(e.find('.acf-field[data-name="save_other_choice"]').hide(),e.find('.acf-field[data-name="save_other_choice"] input').prop("checked",!1))}}}),i=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},events:{'change .acf-field[data-name="display_format"] input':"render",'change .acf-field[data-name="return_format"] input':"render"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){"date_picker"==e.attr("data-type")&&$.each(["display_format","return_format"],function(a,i){var t=e.find('.acf-field[data-name="'+i+'"] input[type="radio"]:checked'),n=e.find('.acf-field[data-name="'+i+'"] input[type="text"]');"other"!=t.val()&&n.val(t.val())})}}),t=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},events:{'change .acf-field-object-date-time-picker input[type="radio"]':"render"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){"date_time_picker"==e.attr("data-type")&&e.find('.acf-radio-list[data-other_choice="1"]').each(function(){var e=$(this),a=e.find('input[type="radio"]:checked'),i=e.find('input[type="text"]');"other"!=a.val()&&i.val(a.val())})}}),n=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},events:{'change .acf-field-object-time-picker input[type="radio"]':"render"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){"time_picker"==e.attr("data-type")&&e.find('.acf-radio-list[data-other_choice="1"]').each(function(){var e=$(this),a=e.find('input[type="radio"]:checked'),i=e.find('input[type="text"]');"other"!=a.val()&&i.val(a.val())})}}),d=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},render:function(e){"tab"==e.attr("data-type")&&e.find('.acf-field[data-name="name"] input').val("").trigger("change")}}),l=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},render:function(e){"message"==e.attr("data-type")&&e.find('.acf-field[data-name="name"] input').val("").trigger("change")}});acf.field_group.screen=acf.model.extend({actions:{ready:"ready"},events:{"click #acf-field-key-hide":"toggle"},ready:function(){var e=$("#adv-settings"),a=e.find("#acf-append-show-on-screen");e.find(".metabox-prefs").append(a.html()),e.find(".metabox-prefs br").remove(),a.remove(),this.render()},toggle:function(e){var a=e.$el.prop("checked")?1:0;acf.update_user_setting("show_field_keys",a),this.render()},render:function(){var e=acf.serialize_form($("#adv-settings"));e.show_field_keys=parseInt(e.show_field_keys);var a=acf.field_group.$fields;e.show_field_keys?a.addClass("show-field-keys"):a.removeClass("show-field-keys")}})}(jQuery);
+!function($){acf.field_group=acf.model.extend({$fields:null,$locations:null,$options:null,actions:{ready:"init"},events:{"submit #post":"submit",'click a[href="#"]':"preventDefault","click .submitdelete":"trash","mouseenter .acf-field-list":"sortable"},init:function(){this.$fields=$("#acf-field-group-fields"),this.$locations=$("#acf-field-group-locations"),this.$options=$("#acf-field-group-options"),acf.validation.active=0},sortable:function(e){if(!e.$el.hasClass("ui-sortable")){var a=this;e.$el.sortable({handle:".acf-sortable-handle",connectWith:".acf-field-list",update:function(e,i){var t=i.item;a.render_fields(),acf.do_action("sortstop",t)}})}},preventDefault:function(e){e.preventDefault()},render_fields:function(){var e=this;$(".acf-field-list").each(function(){var a=$(this).children(".acf-field-object");a.each(function(a){e.update_field_meta($(this),"menu_order",a),$(this).children(".handle").find(".acf-icon").html(a+1)}),a.exists()?$(this).children(".no-fields-message").hide():$(this).children(".no-fields-message").show()})},get_field_meta:function(e,a){var i=e.find("> .meta > .input-"+a);return i.exists()?i.val():!1},update_field_meta:function(e,a,i){var t=e.find("> .meta > .input-"+a);if(!t.exists()){var n=e.find("> .meta > .input-ID").outerHTML();n=acf.str_replace("ID",a,n),t=$(n),t.val(i),e.children(".meta").append(t)}t.val()!=i&&(t.val(i),"save"!=a&&this.save_field(e,"meta"))},delete_field_meta:function(e,a){var i=e.find("> .meta > .input-"+a);i.exists()&&(i.remove(),this.save_field(e,"meta"))},save_field:function(e,a){a=a||"settings";var i=this.get_field_meta(e,"save");"settings"!=i&&i!=a&&(this.update_field_meta(e,"save",a),acf.do_action("save_field",e,a))},submit:function(e){var a=this,i=$("#titlewrap #title");i.val()||(e.preventDefault(),acf.validation.toggle(e.$el,"unlock"),alert(acf._e("title_is_required")),i.focus()),$(".acf-field-object").each(function(){var e=a.get_field_meta($(this),"save"),i=a.get_field_meta($(this),"ID"),t=$(this).hasClass("open");t&&a.close_field($(this)),"settings"==e||("meta"==e?$(this).children(".settings").find('[name^="acf_fields['+i+']"]').remove():$(this).find('[name^="acf_fields['+i+']"]').remove())})},trash:function(e){var a=confirm(acf._e("move_to_trash"));a||e.preventDefault()},render_field:function(e){var a=e.find(".field-label:first").val(),i=e.find(".field-name:first").val(),t=e.find(".field-type:first option:selected").text(),n=e.find(".field-required:first input:checked").val();e.find("> .handle .li-field-label strong a").text(a),e.find("> .handle .li-field-label .acf-required").remove(),"1"==n&&e.find("> .handle .li-field-label strong").append('<span class="acf-required">*</span>'),e.find("> .handle .li-field-name").text(i),e.find("> .handle .li-field-type").text(t)},edit_field:function(e){e.hasClass("open")?this.close_field(e):this.open_field(e)},open_field:function(e){return e.hasClass("open")?!1:(e.addClass("open"),acf.do_action("open_field",e),void e.children(".settings").animate({height:"toggle"},250))},close_field:function(e){return e.hasClass("open")?(e.removeClass("open"),acf.do_action("close_field",e),void e.children(".settings").animate({height:"toggle"},250)):!1},wipe_field:function(e){var a=e.attr("data-id"),i=e.attr("data-key"),t=acf.get_uniqid(),n="field_"+t;e.attr("data-id",t),e.attr("data-key",n),e.attr("data-orig",i),this.update_field_meta(e,"ID",""),this.update_field_meta(e,"key",n),e.find('[id*="'+a+'"]').each(function(){$(this).attr("id",$(this).attr("id").replace(a,t))}),e.find('[name*="'+a+'"]').each(function(){$(this).attr("name",$(this).attr("name").replace(a,t))}),e.find("> .handle .pre-field-key").text(n),e.find(".ui-sortable").removeClass("ui-sortable"),acf.do_action("wipe_field",e)},add_field:function(e){var a=$($("#tmpl-acf-field").html()),i=a.find(".field-label:first"),t=a.find(".field-name:first");this.wipe_field(a),e.append(a),i.val(""),t.val(""),setTimeout(function(){i.focus()},251),this.render_fields(),acf.do_action("append",a),this.edit_field(a),acf.do_action("add_field",a)},duplicate_field:function(e){acf.do_action("before_duplicate",e);var a=e.clone(),i=a.find(".field-label:first"),t=a.find(".field-name:first");return acf.do_action("remove",a),this.wipe_field(a),acf.do_action("after_duplicate",e,a),e.after(a),acf.do_action("append",a),setTimeout(function(){i.focus()},251),this.render_fields(),e.hasClass("open")?this.close_field(e):this.open_field(a),i.val(i.val()+" ("+acf._e("copy")+")"),t.val(t.val()+"_"+acf._e("copy")),this.save_field(a),this.render_field(a),acf.do_action("duplicate_field",a),a},move_field:function(e){var a=this,i=acf.prepare_for_ajax({action:"acf/field_group/move_field",field_id:this.get_field_meta(e,"ID")}),t=!1;return i.field_id?"settings"==this.get_field_meta(e,"save")?t=!0:e.find(".acf-field-object").each(function(){return a.get_field_meta($(this),"ID")?void("settings"==a.get_field_meta($(this),"save")&&(t=!0)):(t=!0,!1)}):t=!0,t?void alert(acf._e("move_field_warning")):(acf.open_popup({title:acf._e("move_field"),loading:!0,height:145}),void $.ajax({url:acf.get("ajaxurl"),data:i,type:"post",dataType:"html",success:function(i){a.move_field_confirm(e,i)}}))},move_field_confirm:function(e,a){var i=this;acf.update_popup({content:a});var t={action:"acf/field_group/move_field",nonce:acf.get("nonce"),field_id:this.get_field_meta(e,"ID"),field_group_id:0};$("#acf-move-field-form").on("submit",function(){return t.field_group_id=$(this).find("select").val(),$.ajax({url:acf.get("ajaxurl"),data:t,type:"post",dataType:"html",success:function(a){acf.update_popup({content:a}),i.remove_field(e)}}),!1})},delete_field:function(e,a){a=a||!0;var i=this.get_field_meta(e,"ID");i&&$("#input-delete-fields").val($("#input-delete-fields").val()+"|"+i),acf.do_action("delete_field",e),a&&this.remove_field(e)},remove_field:function(e){var a=this,i=e.closest(".acf-field-list");e.css({height:e.height(),width:e.width(),position:"absolute"}),e.wrap('<div class="temp-field-wrap" style="height:'+e.height()+'px"></div>'),e.animate({opacity:0},250);var t=0,n=!1;1==i.children(".acf-field-object").length&&(n=i.children(".no-fields-message"),t=n.outerHeight()),e.parent(".temp-field-wrap").animate({height:t},250,function(){n&&n.show(),acf.do_action("remove",$(this)),$(this).remove(),a.render_fields()})},change_field_type:function(e){var a=e.closest("tbody"),i=a.closest(".acf-field-object"),t=i.parent().closest(".acf-field-object"),n=i.attr("data-key"),d=i.attr("data-type"),l=e.val();i.removeClass("acf-field-object-"+d.replace("_","-")),i.addClass("acf-field-object-"+l.replace("_","-")),i.attr("data-type",l),i.data("xhr")&&i.data("xhr").abort();var f=a.children('.acf-field[data-setting="'+d+'"]'),c="";if(f.each(function(){c+=$(this).outerHTML()}),f.remove(),acf.update(n+"_settings_"+d,c),this.render_field(i),c=acf.get(n+"_settings_"+l))return a.children('.acf-field[data-name="conditional_logic"]').before(c),acf.update(n+"_settings_"+l,""),void acf.do_action("change_field_type",i);var r=$('<tr class="acf-field"><td class="acf-label"></td><td class="acf-input"><div class="acf-loading"></div></td></tr>');a.children('.acf-field[data-name="conditional_logic"]').before(r);var o={action:"acf/field_group/render_field_settings",nonce:acf.o.nonce,parent:acf.o.post_id,field_group:acf.o.post_id,prefix:e.attr("name").replace("[type]",""),type:l};t.exists()&&(o.parent=this.get_field_meta(t,"ID"));var s=$.ajax({url:acf.o.ajaxurl,data:o,type:"post",dataType:"html",success:function(e){if(e){var a=$(e);r.after(a),acf.do_action("append",a),acf.do_action("change_field_type",i)}},complete:function(){r.remove()}});i.data("xhr",s)},change_field_label:function(e){var a=e.find(".field-label:first"),i=e.find(".field-name:first"),t=e.attr("data-type");if(""==i.val()){var n=a.val();n=acf.str_sanitize(n),i.val(n).trigger("change")}this.render_field(e),acf.do_action("change_field_label",e)},change_field_name:function(e){var a=e.find(".field-name:first");"field_"===a.val().substr(0,6)&&(alert(acf._e("field_name_start")),setTimeout(function(){a.focus()},1))}}),acf.field_group.field=acf.model.extend({events:{"click .edit-field":"edit","click .duplicate-field":"duplicate","click .move-field":"move","click .delete-field":"delete","click .add-field":"add","change .field-type":"change_type","blur .field-label":"change_label","blur .field-name":"change_name","keyup .field-label":"render","keyup .field-name":"render","change .field-required input":"render","change .acf-field-object input":"save","change .acf-field-object textarea":"save","change .acf-field-object select":"save"},event:function(e){return e.$field=e.$el.closest(".acf-field-object"),e},edit:function(e){acf.field_group.edit_field(e.$field)},duplicate:function(e){acf.field_group.duplicate_field(e.$field)},move:function(e){acf.field_group.move_field(e.$field)},"delete":function(e){acf.field_group.delete_field(e.$field)},add:function(e){var a=e.$el.closest(".acf-field-list-wrap").children(".acf-field-list");acf.field_group.add_field(a)},change_type:function(e){acf.field_group.change_field_type(e.$el)},change_label:function(e){acf.field_group.change_field_label(e.$field)},change_name:function(e){acf.field_group.change_field_name(e.$field)},render:function(e){acf.field_group.render_field(e.$field)},save:function(e){acf.field_group.save_field(e.$field)}}),acf.field_group.conditional_logic=acf.model.extend({actions:{open_field:"render_field",change_field_label:"render_fields",change_field_type:"render_fields"},events:{"click .add-conditional-rule":"add_rule","click .add-conditional-group":"add_group","click .remove-conditional-rule":"remove_rule","change .conditional-toggle input":"change_toggle","change .conditional-rule-param":"change_param"},render_fields:function(){var e=this;$(".acf-field-object.open").each(function(){e.render_field($(this))})},render_field:function(e){var a=this,i=e.attr("data-key"),t=e.parents(".acf-field-list"),n=e.find('.acf-field[data-name="conditional_logic"]:last'),d=[];$.each(t,function(e){var a=0==e?acf._e("sibling_fields"):acf._e("parent_fields");$(this).children(".acf-field-object").each(function(){var e=$(this),t=e.attr("data-key"),n=e.attr("data-type"),l=e.find(".field-label:first").val();-1!==$.inArray(n,["select","checkbox","true_false","radio"])&&t!=i&&d.push({value:t,label:l,group:a})})}),d.length||d.push({value:"",label:acf._e("no_fields")}),n.find(".rule").each(function(){a.render_rule($(this),d)})},render_rule:function(e,a){var i=e.find(".conditional-rule-param"),t=e.find(".conditional-rule-value");a&&acf.render_select(i,a);var n=$('.acf-field-object[data-key="'+i.val()+'"]'),d=n.attr("data-type"),l=[];if("true_false"==d)l.push({value:1,label:acf._e("checked")});else if("select"==d||"checkbox"==d||"radio"==d){var f=n.find('.acf-field[data-name="choices"] textarea').val().split("\n");$.each(f,function(e,a){a=a.split(":"),a[1]=a[1]||a[0],l.push({value:$.trim(a[0]),label:$.trim(a[1])})});var c=n.find('.acf-field[data-name="allow_null"]');c.exists()&&"1"==c.find("input:checked").val()&&l.unshift({value:"",label:acf._e("null")})}acf.render_select(t,l)},change_toggle:function(e){var a=e.$el,i=a.val(),t=a.closest(".acf-input");"1"==i?(t.find(".rule-groups").show(),t.find(".rule-groups").find("[name]").removeAttr("disabled")):(t.find(".rule-groups").hide(),t.find(".rule-groups").find("[name]").attr("disabled","disabled"))},change_param:function(e){var a=e.$el.closest(".rule");this.render_rule(a)},add_rule:function(e){var a=e.$el.closest("tr");$tr2=acf.duplicate(a),$tr2.find("select:first").trigger("change")},remove_rule:function(e){var a=e.$el.closest("tr");a.find("select:first").trigger("change"),0==a.siblings("tr").length&&a.closest(".rule-group").remove(),a.remove()},add_group:function(e){var a=e.$el.closest(".rule-groups"),i=a.find(".rule-group:last");$group2=acf.duplicate(i),$group2.find("h4").text(acf._e("or")),$group2.find("tr:not(:first)").remove(),$group2.find("select:first").trigger("change")}}),acf.field_group.locations=acf.model.extend({events:{"click .add-location-rule":"add_rule","click .add-location-group":"add_group","click .remove-location-rule":"remove_rule","change .location-rule-param":"change_rule"},add_rule:function(e){var a=e.$el.closest("tr");$tr2=acf.duplicate(a)},remove_rule:function(e){var a=e.$el.closest("tr");a.find("select:first").trigger("change"),0==a.siblings("tr").length&&a.closest(".rule-group").remove(),a.remove()},add_group:function(e){var a=e.$el.closest(".rule-groups"),i=a.find(".rule-group:last");$group2=acf.duplicate(i),$group2.find("h4").text(acf._e("or")),$group2.find("tr:not(:first)").remove()},change_rule:function(e){var a=e.$el,i=a.closest("tr"),t=i.attr("data-id"),n=i.closest(".rule-group"),d=n.attr("data-id"),l=$('<div class="acf-loading"></div>');i.find("td.value").html(l),$.ajax({url:acf.get("ajaxurl"),data:acf.prepare_for_ajax({action:"acf/field_group/render_location_value",rule_id:t,group_id:d,param:a.val(),value:""}),type:"post",dataType:"html",success:function(e){l.replaceWith(e)}})}}),acf.add_action("open_field change_field_type",function(e){e.find(".acf-field[data-append]").each(function(){var e=$(this).data("append");if($sibling=$(this).siblings('[data-name="'+e+'"]'),$sibling.exists()){var a=$sibling.children(".acf-input"),i=a.children(".acf-hl");i.exists()||(a.wrapInner('<ul class="acf-hl"><li></li></ul>'),i=a.children(".acf-hl"));var t=$("<li></li>").append($(this).children(".acf-input").children());i.append(t),i.attr("data-cols",i.children().length),$(this).remove()}})});var e=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},events:{'change .acf-field[data-name="ui"] input':"render"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){if("select"==e.attr("data-type")){var a=e.find('.acf-field[data-name="ui"] input:checked').val();"1"==a?e.find('.acf-field[data-name="ajax"]').show():e.find('.acf-field[data-name="ajax"]').hide()}}}),a=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},events:{'change .acf-field[data-name="other_choice"] input':"render"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){if("radio"==e.attr("data-type")){var a=e.find('.acf-field[data-name="other_choice"] input:checked').val();"1"==a?e.find('.acf-field[data-name="save_other_choice"]').show():(e.find('.acf-field[data-name="save_other_choice"]').hide(),e.find('.acf-field[data-name="save_other_choice"] input').prop("checked",!1))}}}),i=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},events:{'change .acf-field[data-name="display_format"] input':"render",'change .acf-field[data-name="return_format"] input':"render"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){"date_picker"==e.attr("data-type")&&$.each(["display_format","return_format"],function(a,i){var t=e.find('.acf-field[data-name="'+i+'"] input[type="radio"]:checked'),n=e.find('.acf-field[data-name="'+i+'"] input[type="text"]');"other"!=t.val()&&n.val(t.val())})}}),t=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},events:{'change .acf-field-object-date-time-picker input[type="radio"]':"render"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){"date_time_picker"==e.attr("data-type")&&e.find('.acf-radio-list[data-other_choice="1"]').each(function(){var e=$(this),a=e.find('input[type="radio"]:checked'),i=e.find('input[type="text"]');"other"!=a.val()&&i.val(a.val())})}}),n=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},events:{'change .acf-field-object-time-picker input[type="radio"]':"render"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){"time_picker"==e.attr("data-type")&&e.find('.acf-radio-list[data-other_choice="1"]').each(function(){var e=$(this),a=e.find('input[type="radio"]:checked'),i=e.find('input[type="text"]');"other"!=a.val()&&i.val(a.val())})}}),d=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},render:function(e){if("tab"==e.attr("data-type")){var a=e.data("id");$("#acf_fields-"+a+"-name").val("").trigger("change"),$("#acf_fields-"+a+"-required-0").trigger("click")}}}),l=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},render:function(e){if("message"==e.attr("data-type")){var a=e.data("id");$("#acf_fields-"+a+"-name").val("").trigger("change"),$("#acf_fields-"+a+"-required-0").trigger("click")}}}),f=acf.model.extend({actions:{open_field:"render",change_field_type:"render"},filters:{select2_args:"select2_args",select2_ajax_data:"select2_ajax_data"},events:{"change .acf-field-object-clone .setting-display":"render_display","change .acf-field-object-clone .setting-prefix-label input":"render_prefix_label","change .acf-field-object-clone .setting-prefix-name input":"render_prefix_name"},event:function(e){return e.$el.closest(".acf-field-object")},render:function(e){"clone"==e.attr("data-type")&&(this.render_display(e),this.render_prefix_label(e),this.render_prefix_name(e))},render_display:function(e){var a=e.find('.acf-field[data-name="layout"]'),i=e.find('.acf-field[data-name="display"] select'),t=e.find('.acf-field[data-name="conditional_logic"]'),n=e.find('.acf-field[data-name="wrapper"]');"seamless"==i.val()?(t.hide(),n.hide(),a.hide()):(t.show(),n.show(),a.show())},render_prefix_label:function(e){var a=e.find(".setting-prefix-label input:checked"),i=e.find(".field-label"),t=e.find(".prefix-label-code-1"),n="%field_label%";"1"===a.val()&&(n=i.val()+" "+n),t.html(n)},render_prefix_name:function(e){var a=e.find(".setting-prefix-name input:checked"),i=e.find(".field-name"),t=e.find(".prefix-name-code-1"),n="%field_name%";"1"===a.val()&&(n=i.val()+"_"+n),t.html(n)},select2_args:function(e,a,i){return"acf/fields/clone/query"!==i.ajax_action?e:(e.closeOnSelect=!1,e)},select2_ajax_data:function(e,a,i){if("acf/fields/clone/query"!==a.ajax_action)return select2_args;var t={};return $(".acf-field-object").each(function(){var e=$(this),a=e.data("key"),i=e.data("type"),n=e.find(".field-label:first").val(),d=e.parents(".acf-field-object");t[a]={key:a,type:i,label:n,ancestors:d.length}}),e.fields=t,e.title=$("#title").val(),e}});acf.field_group.screen=acf.model.extend({actions:{ready:"ready"},events:{"click #acf-field-key-hide":"toggle"},ready:function(){var e=$("#adv-settings"),a=e.find("#acf-append-show-on-screen");e.find(".metabox-prefs").append(a.html()),e.find(".metabox-prefs br").remove(),a.remove(),this.render()},toggle:function(e){var a=e.$el.prop("checked")?1:0;acf.update_user_setting("show_field_keys",a),this.render()},render:function(){var e=acf.serialize_form($("#adv-settings"));e.show_field_keys=parseInt(e.show_field_keys);var a=acf.field_group.$fields;e.show_field_keys?a.addClass("show-field-keys"):a.removeClass("show-field-keys")}})}(jQuery);
diff --git a/assets/js/acf-input.js b/assets/js/acf-input.js
index a166a9d..4bdd313 100644
--- a/assets/js/acf-input.js
+++ b/assets/js/acf-input.js
@@ -1926,6 +1926,63 @@ var acf;
 			
 			return $.extend({}, defaults, args);
 			
+		},
+		
+		
+		/*
+		*  enqueue_script
+		*
+		*  This function will append a script to the page
+		*
+		*  @source	https://www.nczonline.net/blog/2009/06/23/loading-javascript-without-blocking/
+		*  @type	function
+		*  @date	27/08/2016
+		*  @since	5.4.0
+		*
+		*  @param	url (string)
+		*  @param	callback (function)
+		*  @return	na
+		*/
+		
+		enqueue_script: function( url, callback ) {
+			
+			// vars
+		    var script = document.createElement('script');
+		    
+		    
+		    // atts
+		    script.type = "text/javascript";
+			script.src = url;
+		    script.async = true;
+			
+			
+			// ie
+		    if( script.readyState ) {
+			    
+		        script.onreadystatechange = function(){
+			        
+		            if( script.readyState == 'loaded' || script.readyState == 'complete' ){
+			            
+		                script.onreadystatechange = null;
+		                callback();
+		                
+		            }
+		            
+		        };
+		    
+		    // normal browsers
+		    } else {
+			    
+		        script.onload = function(){
+		            callback();
+		        };
+		        
+		    }
+		    
+		    
+		    // append
+		    document.body.appendChild(script);
+			
 		}
 		
 	};
@@ -2467,12 +2524,20 @@ var acf;
 		
 		refresh: function( $el ){
 			
-			//console.time('acf.width.render');
+			//console.log('acf.layout.refresh', $el);
 			
 			// defaults
 			$el = $el || false;
 			
 			
+			// if is '.acf-fields'
+			if( $el && $el.is('.acf-fields') ) {
+				
+				$el = $el.parent();
+				
+			}
+			
+			
 			// loop over visible fields
 			$('.acf-fields:visible', $el).each(function(){
 				
@@ -2962,44 +3027,49 @@ var acf;
 	
 	acf.add_action('before_duplicate', function( $orig ){
 		
-		// save select values
+		// add 'selected' class
 		$orig.find('select option:selected').addClass('selected');
 		
 	});
 	
 	acf.add_action('after_duplicate', function( $orig, $duplicate ){
 		
-		// restore select values
-		$orig.find('select option.selected').removeClass('selected');
-		
-		
 		// set select values
 		$duplicate.find('select').each(function(){
 			
+			// vars
+			var $select = $(this);
+			
+			
+			// bail early if is 'Stylized UI'
+			//if( $select.data('ui') ) return;
+
+
 			// vars
 			var val = [];
 			
 			
 			// loop
-			$(this).find('option.selected').each(function(){
+			$select.find('option.selected').each(function(){
 				
-				// append
 				val.push( $(this).val() );
 				
-				
-				// remove class
-				$(this).removeClass('selected');
-				
 		    });
 		    
 		    
 		    // set val
-			$(this).val( val );
+			$select.val( val );
 			
 		});
 		
+		
+		// remove 'selected' class
+		$orig.find('select option.selected').removeClass('selected');
+		$duplicate.find('select option.selected').removeClass('selected');
+		
 	});
 	
+	
 /*
 	
 	
@@ -4248,6 +4318,11 @@ var acf;
 			'ready 1': 'ready',
 		},
 		
+		filters: {
+			'date_time_picker_args':	'customize_onClose',
+			'time_picker_args':			'customize_onClose'
+		},
+		
 		ready: function(){
 			
 			// vars
@@ -4322,6 +4397,58 @@ var acf;
 			
 			// do nothing
 			
+		},
+		
+		
+		/*
+		*  customize_onClose
+		*
+		*  This function will add a custom onClose function to the datetime and time picker args
+		*
+		*  @type	function
+		*  @date	5/07/2016
+		*  @since	5.4.0
+		*
+		*  @param	$post_id (int)
+		*  @return	$post_id (int)
+		*/
+		
+		customize_onClose: function( args ){
+			
+			// change button text
+			args.closeText = acf._e('date_time_picker', 'selectText');
+			
+			
+			// add custom 'Close = Select' functionality
+			args.onClose = function( value, instance ){
+					
+				// vars
+				var $div = instance.dpDiv,
+					$close = $div.find('.ui-datepicker-close');
+				
+				
+				// if clicking close button
+				if( !value && $close.is(':hover') ) {
+					
+					// attempt to find new value
+					value = acf.maybe_get(instance, 'settings.timepicker.formattedTime');
+					
+					
+					// bail early if no value
+					if( !value ) return;
+					
+					
+					// update value
+					acf.val( instance.input, value );
+					
+				}
+									
+			}
+			
+			
+			// return
+			return args;
+			
 		}
 		
 	});
@@ -4375,6 +4502,7 @@ var acf;
 				firstDay:			this.o.first_day,
 				controlType: 		'select',
 				oneLine:			true,
+				
 			};
 			
 			
@@ -4793,10 +4921,7 @@ var acf;
 	acf.fields.google_map = acf.field.extend({
 		
 		type: 'google_map',
-		api: {
-			sensor:		false,
-			libraries:	'places'
-		},
+		url: '',
 		$el: null,
 		$search: null,
 		
@@ -4866,85 +4991,75 @@ var acf;
 			
 			
 			// ready
-			if( this.status == 'ready' ) {
+			if( this.status == 'ready' ) return true;
+			
+			
+			// loading
+			if( this.status == 'loading' ) return false;
+			
+			
+			// check exists (optimal)
+			if( acf.isset(window, 'google', 'maps', 'places') ) {
 				
+				this.status = 'ready';
 				return true;
 				
 			}
 			
 			
-			// loading
-			if( this.status == 'loading' ) {
+			// check exists (ok)
+			if( acf.isset(window, 'google', 'maps') ) {
 				
-				return false;
+				this.status = 'ready';
 				
 			}
 			
 			
-			// no google
-			if( !acf.isset(window, 'google', 'load') ) {
+			// attempt load google.maps.places
+			if( this.url ) {
 				
 				// set status
-				self.status = 'loading';
+				this.status = 'loading';
 				
 				
-				// load API
-				$.getScript('https://www.google.com/jsapi', function(){
+				// enqueue
+				acf.enqueue_script(this.url, function(){
 					
-					// load maps
-				    google.load('maps', '3', { other_params: $.param(self.api), callback: function(){
-				    	
-				    	// set status
-				    	self.status = 'ready';
-				    	
-				    	
-				    	// initialize pending
-				    	self.initialize_pending();
-				        
-				    }});
-				    
-				});
-				
-				return false;
-					
-			}
-			
-			
-			// no maps or places
-			if( !acf.isset(window, 'google', 'maps', 'places') ) {
-				
-				// set status
-				self.status = 'loading';
-				
-				
-				// load maps
-			    google.load('maps', '3', { other_params: $.param(self.api), callback: function(){
-			    	
-			    	// set status
+					// set status
 			    	self.status = 'ready';
 			    	
 			    	
 			    	// initialize pending
 			    	self.initialize_pending();
 			    	
-			    	
-			        
-			    }});
+				});
 				
-				return false;
-					
 			}
 			
 			
-			// google must exist already
-			this.status = 'ready';
+			// ready
+			if( this.status == 'ready' ) return true;
 			
 			
 			// return
-			return true;
+			return false;
 			
 		},
 		
+		
+		/*
+		*  initialize_pending
+		*
+		*  This function will initialize pending fields
+		*
+		*  @type	function
+		*  @date	27/08/2016
+		*  @since	5.4.0
+		*
+		*  @param	n/a
+		*  @return	n/a
+		*/
+		
 		initialize_pending: function(){
 			
 			// reference
@@ -4952,7 +5067,7 @@ var acf;
 			
 			this.$pending.each(function(){
 				
-				self.doFocus( $(this) ).initialize();
+				self.set('$field', $(this)).initialize();
 				
 			});
 			
@@ -5021,10 +5136,34 @@ var acf;
         	this.map = new google.maps.Map( this.$el.find('.canvas')[0], map_args);
 	        
 	        
-	        // add search
-			var autocomplete = new google.maps.places.Autocomplete( this.$search[0] );
-			autocomplete.bindTo('bounds', this.map);
-			this.map.autocomplete = autocomplete;
+	        // search
+	        if( acf.isset(window, 'google', 'maps', 'places', 'Autocomplete') ) {
+		        
+		        // vars
+		        var autocomplete = new google.maps.places.Autocomplete( this.$search[0] );
+				
+				
+				// bind
+				autocomplete.bindTo('bounds', this.map);
+				
+				
+				// event
+				google.maps.event.addListener(autocomplete, 'place_changed', function( e ) {
+				    
+				    // vars
+				    var place = this.getPlace();
+				    
+				    
+				    // search
+					self.search( place );
+				    
+				});
+				
+				
+				// append
+				this.map.autocomplete = autocomplete;
+				
+	        }
 			
 			
 			// marker
@@ -5058,18 +5197,6 @@ var acf;
 		    
 		    
 			// events
-			google.maps.event.addListener(autocomplete, 'place_changed', function( e ) {
-			    
-			    // vars
-			    var place = this.getPlace();
-			    
-			    
-			    // search
-				self.search( place );
-			    
-			});
-		    
-		    
 		    google.maps.event.addListener( this.map.marker, 'dragend', function(){
 		    	
 		    	// vars
@@ -7282,6 +7409,11 @@ var acf;
 		
 		$ul: null,
 		
+		actions: {
+			'ready':	'initialize',
+			'append':	'initialize'
+		},
+		
 		events: {
 			'click input[type="radio"]': 'click',
 		},
@@ -7297,6 +7429,30 @@ var acf;
 			
 		},
 		
+		
+		/*
+		*  initialize
+		*
+		*  This function will fix a bug found in Chrome.
+		*  A radio input (for a given name) may only have 1 selected value. When used within a fc layout 
+		*  multiple times (clone field), the selected value (default value) will not be checked. 
+		*  This simply re-checks it.
+		*
+		*  @type	function
+		*  @date	30/08/2016
+		*  @since	5.4.0
+		*
+		*  @param	$post_id (int)
+		*  @return	$post_id (int)
+		*/
+		
+		initialize: function(){
+			
+			// find selected input and check it
+			this.$ul.find('.selected input').prop('checked', true);	
+			
+		},
+		
 		click: function(e){
 			
 			// vars
@@ -7440,8 +7596,7 @@ var acf;
 					
 					
 					// fetch
-					self.doFocus($field);
-					self.fetch();
+					self.set('$field', $field).fetch();
 					
 				}
 				
@@ -7530,7 +7685,7 @@ var acf;
 			    self.doFocus($field);
 			    self.fetch();
 			    
-		    }, 400);
+		    }, 300);
 		    
 		    this.$el.data('timeout', timeout);
 		    
@@ -7580,20 +7735,15 @@ var acf;
 			
 			// get results
 		    var xhr = $.ajax({
-		    
 		    	url:		acf.get('ajaxurl'),
 				dataType:	'json',
 				type:		'post',
 				data:		ajax_data,
-				
-				success: function( json ){
+				success:	function( json ){
 					
-					// render
-					self.doFocus($field);
-					self.render(json);
+					self.set('$field', $field).render( json );
 					
 				}
-				
 			});
 			
 			
@@ -7613,7 +7763,7 @@ var acf;
 			
 			
 			// no results?
-			if( !json || !json.length ) {
+			if( !json || !json.results || !json.results.length ) {
 			
 				// add class
 				this.$el.addClass('is-empty');
@@ -7634,7 +7784,7 @@ var acf;
 			
 			
 			// get new results
-			var $new = $( this.walker(json) );
+			var $new = $( this.walker(json.results) );
 			
 				
 			// apply .disabled to left li's
@@ -8028,7 +8178,6 @@ var acf;
 				multiple:		false,
 				ajax:			false,
 				ajax_action:	'',
-				pagination:		false
 			}, args);
 			
 			
@@ -8197,6 +8346,94 @@ var acf;
 		},
 		
 		
+		/*
+		*  get_ajax_data
+		*
+		*  This function will return an array of data to send via AJAX
+		*
+		*  @type	function
+		*  @date	19/07/2016
+		*  @since	5.4.0
+		*
+		*  @param	$post_id (int)
+		*  @return	$post_id (int)
+		*/
+		
+		get_ajax_data: function( args, params ){
+			
+			// vars
+			var data = acf.prepare_for_ajax({
+				action: 	args.ajax_action,
+				field_key: 	args.key,
+				post_id: 	acf.get('post_id'),
+				s: 			params.term,
+				paged: 		params.page
+			});
+			
+			
+			// filter
+			data = acf.apply_filters( 'select2_ajax_data', data, args, params );
+			
+			
+			// return
+			return data;
+			
+		},
+		
+		
+		/*
+		*  get_ajax_results
+		*
+		*  This function will return a valid AJAX response
+		*
+		*  @type	function
+		*  @date	19/07/2016
+		*  @since	5.4.0
+		*
+		*  @param	$post_id (int)
+		*  @return	$post_id (int)
+		*/
+		
+		get_ajax_results: function( data, params ){
+			
+			// vars
+			var valid = {
+				results: []
+			};
+			
+			
+			// bail early if no data
+			if( !data ) {
+				
+				data = valid;
+				
+			}
+			
+			
+			// allow for an array of choices
+			if( typeof data.results == 'undefined' ) {
+				
+				valid.results = data;
+				
+				data = valid;
+				
+			}
+			
+			
+			// decode
+			data.results = this.decode_data(data.results);
+			
+			
+			// filter
+			data = acf.apply_filters( 'select2_ajax_results', data, params );
+			
+			
+			// return
+			return data;
+			
+		},
+		
+		
 		/*
 		*  get_value
 		*
@@ -8249,8 +8486,8 @@ var acf;
 			return val;
 			
 		},
-		
-		
+		    
+    
 		/*
 		*  init_v3
 		*
@@ -8283,7 +8520,25 @@ var acf;
 				multiple:			args.multiple,
 				separator:			'||',
 				data:				[],
-				escapeMarkup:		function( m ){ return m; }
+				escapeMarkup:		function( m ){ return m; },
+				formatResult:		function( result, container, query, escapeMarkup ){
+					
+					// run default formatResult
+					var text = $.fn.select2.defaults.formatResult( result, container, query, escapeMarkup );
+					
+										
+					// append description
+					if( result.description ) {
+						
+						text += ' <span class="select2-result-description">' + result.description + '</span>';
+						
+					}
+					
+					
+					// return
+					return text;
+					
+				}
 			};
 			
 			
@@ -8344,82 +8599,41 @@ var acf;
 			if( args.ajax ) {
 				
 				select2_args.ajax = {
-					url:		acf.get('ajaxurl'),
-					dataType: 	'json',
-					type: 		'post',
-					cache: 		false,
-					data: function (term, page) {
+					url:			acf.get('ajaxurl'),
+					dataType: 		'json',
+					type: 			'post',
+					cache: 			false,
+					quietMillis:	250,
+					data: function( term, page ) {
 						
 						// vars
-						var data = acf.prepare_for_ajax({
-							action: 	args.ajax_action,
-							field_key: 	args.key,
-							post_id: 	acf.get('post_id'),
-							s: 			term,
-							paged: 		page
-						});
-	
+						var params = { 'term': term, 'page': page };
+						
 						
 						// return
-						return data;
+						return acf.select2.get_ajax_data(args, params);
 						
 					},
-					results: function(data, page){
+					results: function( data, page ){
 						
-						return {
-							results: acf.select2.decode_data(data)
-						};
+						// vars
+						var params = { 'page': page };
+						
+						
+						// merge together groups
+						setTimeout(function(){
+							
+							acf.select2.merge_results_v3();
+							
+						}, 1);
+						
+						
+						// return
+						return acf.select2.get_ajax_results(data, params);
 						
 					}
 				};
 				
-				if( args.pagination ) {
-					
-					select2_args.ajax.results = function( data, page ) {
-						
-						return {
-							results:	acf.select2.decode_data(data),
-							more:		(acf.select2.count_data(data) >= 20)
-						};
-						
-					};
-					
-					
-					$input.on("select2-loaded", function(e) { 
-						
-						// merge together groups
-						var label = '',
-							$list = null;
-							
-						$('#select2-drop .select2-result-with-children').each(function(){
-							
-							// vars
-							var $label = $(this).children('.select2-result-label'),
-								$ul = $(this).children('.select2-result-sub');
-							
-							
-							// append group to previous
-							if( $label.text() == label ) {
-								
-								$list.append( $ul.children() );
-								
-								$(this).remove();
-								
-								return;
-								
-							}
-							
-							
-							// update vars
-							label = $label.text();
-							$list = $ul;
-							
-						});
-						
-					});
-					
-				}
-				
 			}
 			
 			
@@ -8429,6 +8643,10 @@ var acf;
 			};
 			
 			
+			// append args
+			select2_args.acf = args;
+			
+			
 			// filter for 3rd party customization
 			select2_args = acf.apply_filters( 'select2_args', select2_args, $select, args );
 			
@@ -8475,12 +8693,71 @@ var acf;
 			// the $select is disabled, so setting the value won't cause any issues (this is what select2 v4 does anyway).
 			$input.on('change', function(e) {
 				
+				// add new data
+				if( e.added ) {
+					
+					$select.append('<option value="' + e.added.id + '">' + e.added.text + '</option>');
+					
+				}
+				
+				
+				// update val
 				$select.val( e.val );
 				
 			});
 			
 		},
 		
+		
+		/*
+		*  merge_results_v3
+		*
+		*  description
+		*
+		*  @type	function
+		*  @date	20/07/2016
+		*  @since	5.4.0
+		*
+		*  @param	$post_id (int)
+		*  @return	$post_id (int)
+		*/
+		
+		merge_results_v3: function(){
+			
+			// vars
+			var label = '',
+				$list = null;
+			
+			
+			// loop
+			$('#select2-drop .select2-result-with-children').each(function(){
+				
+				// vars
+				var $label = $(this).children('.select2-result-label'),
+					$ul = $(this).children('.select2-result-sub');
+				
+				
+				// append group to previous
+				if( $label.text() == label ) {
+					
+					$list.append( $ul.children() );
+					
+					$(this).remove();
+					
+					return;
+					
+				}
+				
+				
+				// update vars
+				label = $label.text();
+				$list = $ul;
+				
+			});
+			
+		},
+		
+		
 		init_v4: function( $select, args ){
 					
 			// vars
@@ -8494,7 +8771,6 @@ var acf;
 			// select2 args
 			var select2_args = {
 				width:				'100%',
-				containerCssClass:	'-acf',
 				allowClear:			args.allow_null,
 				placeholder:		args.placeholder,
 				multiple:			args.multiple,
@@ -8550,11 +8826,13 @@ var acf;
 			
 		    
 		    // initial selection
+/*
 		    select2_args.initSelection = function( element, callback ) {
 				
 				callback( value );
 		        
 		    };
+*/
 		    
 		    
 		    // remove conflicting atts
@@ -8573,80 +8851,40 @@ var acf;
 					cache: 		false,
 					data: function( params ) {
 						
-						//console.log('ajax data %o', params);
-						
-						// vars
-						var data = acf.prepare_for_ajax({
-							action: 	args.ajax_action,
-							field_key: 	args.key,
-							post_id: 	acf.get('post_id'),
-							s: 			params.term,
-							paged: 		params.page
-						});
-	
-						
 						// return
-						return data;
+						return acf.select2.get_ajax_data(args, params);
 						
 					},
-					processResults: function(data, params){ //console.log('processResults %o', data);
+					processResults: function( data, params ){
 						
-						return {
-							results: acf.select2.decode_data(data)
-						};
+						// vars
+						var results = acf.select2.get_ajax_results(data, params);
 						
-					}
-				};
-				
-				if( args.pagination ) {
-					
-					select2_args.ajax.processResults = function(data, params){ //console.log('processResults %o %o', data, params);
 						
+						// change to more
+						if( results.more ) {
+							
+							results.pagination = { more: true };
+							
+						}
+						
+						
+						// merge together groups
 						setTimeout(function(){
 							
-							// merge together groups
-							var $prev_options = null,
-								$prev_group = null;
-								
-							$('.select2-results__option[role="group"]').each(function(){
-								
-								// vars
-								var $options = $(this).children('ul'),
-									$group = $(this).children('strong');
-								
-								
-								// compare to previous
-								if( $prev_group !== null && $group.text() == $prev_group.text() ) {
-									
-									$prev_options.append( $options.children() );
-									
-									$(this).remove();
-									
-									return;
-									
-								}
-								
-								
-								// update vars
-								$prev_options = $options;
-								$prev_group = $group;
-								
-							});
+							acf.select2.merge_results_v4();
 							
 						}, 1);
 						
-						return {
-							results:	acf.select2.decode_data(data),
-							pagination: {
-								more: (acf.select2.count_data(data) >= 20)
-							}
-							
-						};
 						
-					};
+						// return
+						return results
+						
+					}
 					
-					
-				}
+				};
+				
+				
 				
 			}
 		    
@@ -8676,11 +8914,6 @@ var acf;
 */
 			
 
-			// attachment z-index fix
-			select2_args.dropdownCss = {
-				'z-index' : '999999999'
-			};
-			
 			
 			// reorder DOM
 			// - no need to reorder, the select field is needed to $_POST values
@@ -8692,7 +8925,60 @@ var acf;
 			
 			// add select2
 			//console.log( '%o %o ', $select, select2_args );
-			var container = $select.select2( select2_args );
+			var $container = $select.select2( select2_args );
+			
+			
+			// add class
+			$container.addClass('-acf');
+			
+		},
+		
+		
+		/*
+		*  merge_results_v4
+		*
+		*  description
+		*
+		*  @type	function
+		*  @date	20/07/2016
+		*  @since	5.4.0
+		*
+		*  @param	$post_id (int)
+		*  @return	$post_id (int)
+		*/
+		
+		merge_results_v4: function(){
+			
+			// vars
+			var $prev_options = null,
+				$prev_group = null;
+			
+			
+			// loop
+			$('.select2-results__option[role="group"]').each(function(){
+				
+				// vars
+				var $options = $(this).children('ul'),
+					$group = $(this).children('strong');
+				
+				
+				// compare to previous
+				if( $prev_group !== null && $group.text() == $prev_group.text() ) {
+					
+					$prev_options.append( $options.children() );
+					
+					$(this).remove();
+					
+					return;
+					
+				}
+				
+				
+				// update vars
+				$prev_options = $options;
+				$prev_group = $group;
+				
+			});
 			
 		},
 		
@@ -8758,7 +9044,6 @@ var acf;
 	acf.fields.select = acf.field.extend({
 		
 		type: 'select',
-		pagination: false,
 		
 		$select: null,
 		
@@ -8784,7 +9069,6 @@ var acf;
 			
 			// customize o
 			this.o = acf.parse_args(this.o, {
-				'pagination':	this.pagination,
 				'ajax_action':	'acf/fields/'+this.type+'/query',
 				'key':			this.$field.data('key')
 			});
@@ -8827,7 +9111,6 @@ var acf;
 	acf.fields.user = acf.fields.select.extend({
 		
 		type: 'user',
-		pagination: true
 		
 	});	
 	
@@ -8836,7 +9119,6 @@ var acf;
 	acf.fields.post_object = acf.fields.select.extend({
 		
 		type: 'post_object',
-		pagination: true
 		
 	});
 	
@@ -8845,7 +9127,6 @@ var acf;
 	acf.fields.page_link = acf.fields.select.extend({
 		
 		type: 'page_link',
-		pagination: true
 		
 	});
 	
@@ -9941,26 +10222,34 @@ var acf;
 			
 			
 			// populate inputs
-			for( i in json.errors ) {
+			if( json.errors.length ) {
+				
+				for( i in json.errors ) {
+					
+					inputs.push( json.errors[ i ].input );
+									
+				}
 				
-				inputs.push( json.errors[ i ].input );
-								
 			}
 			
 			
 			// append
-			for( i in this.errors ) {
+			if( this.errors.length ) {
 				
-				// vars
-				var error = this.errors[ i ];
-				
-				
-				// bail ealry if alreay exists
-				if( $.inArray(error.input, inputs) !== false ) continue;
-				
-				
-				// append
-				json.errors.push( error );
+				for( i in this.errors ) {
+					
+					// vars
+					var error = this.errors[ i ];
+					
+					
+					// bail ealry if alreay exists
+					if( $.inArray(error.input, inputs) !== -1 ) continue;
+					
+					
+					// append
+					json.errors.push( error );
+					
+				}
 				
 			}
 			
@@ -10780,12 +11069,8 @@ var acf;
 		
 		initialize: function(){
 			
-			// bail early if no tinymce
-			if( typeof tinyMCEPreInit === 'undefined' || typeof tinymce === 'undefined' ) {
-				
-				return false;
-				
-			}
+			// bail early if no tinyMCEPreInit (needed by both tinymce and quicktags)
+			if( typeof tinyMCEPreInit === 'undefined' ) return;
 			
 			
 			// generate new id
@@ -10806,29 +11091,54 @@ var acf;
 			this.o.id = new_id
 			
 			
-			// vars
-			var mceInit = this.get_mceInit(),
-				qtInit = this.get_qtInit();
+			// initialize
+			this.initialize_tinymce();
+			this.initialize_quicktags();
 			
-				
-			// append settings
+		},
+		
+		initialize_tinymce: function(){
+			
+			// bail early if no tinymce
+			if( typeof tinymce === 'undefined' ) return;
+			
+			
+			// vars
+			var mceInit = this.get_mceInit();
+			
+			
+			// append
 			tinyMCEPreInit.mceInit[ mceInit.id ] = mceInit;
+			
+			
+			// bail early if not visual active
+			if( !this.$el.hasClass('tmce-active') ) return;
+			
+			
+			// initialize
+			try {
+				
+				tinymce.init( mceInit );
+				
+			} catch(e){}
+			
+		},
+		
+		initialize_quicktags: function(){
+			
+			// bail early if no quicktags
+			if( typeof quicktags === 'undefined' ) return;
+			
+			
+			// vars
+			var qtInit = this.get_qtInit();
+			
+			
+			// append
 			tinyMCEPreInit.qtInit[ qtInit.id ] = qtInit;
 			
 			
-			// initialize mceInit
-			if( this.$el.hasClass('tmce-active') ) {
-				
-				try {
-					
-					tinymce.init( mceInit );
-					
-				} catch(e){}
-				
-			}
-			
-
-			// initialize qtInit
+			// initialize
 			try {
 			
 				var qtag = quicktags( qtInit );
@@ -11111,19 +11421,71 @@ ed.on('ResizeEditor', function(e) {
 		
 	});
 	
-
-	$(document).ready(function(){
+	
+	/*
+	*  wysiwyg_manager
+	*
+	*  This model will handle validation of fields within a tab group
+	*
+	*  @type	function
+	*  @date	25/11/2015
+	*  @since	5.3.2
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	var acf_content = acf.model.extend({
 		
-		// move acf_content wysiwyg
-		if( $('#wp-acf_content-wrap').exists() ) {
+		$div: null,
+		
+		actions: {
+			'ready': 'ready'
+		},
+		
+		ready: function(){
 			
-			$('#wp-acf_content-wrap').parent().appendTo('body');
+			// vars
+			this.$div = $('#acf-hidden-wp-editor');
+			
+			
+			// bail early if doesn't exist
+			if( !this.$div.exists() ) return;
+			
+			
+			// move to footer
+			this.$div.appendTo('body');
+			
+			
+			// bail early if no tinymce
+			if( typeof tinymce === 'undefined' ) return;
+			
+			
+			// restore default activeEditor
+			tinymce.on('AddEditor', function( data ){
+				
+				// vars
+				var editor = data.editor;
+				
+				
+				// update WP var to match tinymce
+				wpActiveEditor = editor.id;
+				
+				
+				// bail early if not acf_content
+				if( editor.id !== 'acf_content' ) return;
+				
+				
+				// update global vars
+				tinymce.activeEditor = tinymce.editors.content || null;
+				wpActiveEditor = tinymce.editors.content ? 'content' : null;
+				
+			});
 			
 		}
 		
 	});
 
-
 })(jQuery);
 
 // @codekit-prepend "../js/event-manager.js";
diff --git a/assets/js/acf-input.min.js b/assets/js/acf-input.min.js
index f1a7c18..d15cdb7 100644
--- a/assets/js/acf-input.min.js
+++ b/assets/js/acf-input.min.js
@@ -1,3 +1,3 @@
-!function(e,t){"use strict";var i=function(){function e(){return u}function t(e,t,i,a){return"string"==typeof e&&"function"==typeof t&&(i=parseInt(i||10,10),l("actions",e,t,i,a)),f}function i(){var e=Array.prototype.slice.call(arguments),t=e.shift();return"string"==typeof t&&d("actions",t,e),f}function a(e,t){return"string"==typeof e&&r("actions",e,t),f}function n(e,t,i,a){return"string"==typeof e&&"function"==typeof t&&(i=parseInt(i||10,10),l("filters",e,t,i,a)),f}function s(){var e=Array.prototype.slice.call(arguments),t=e.shift();return"string"==typeof t?d("filters",t,e):f}function o(e,t){return"string"==typeof e&&r("filters",e,t),f}function r(e,t,i,a){if(u[e][t])if(i){var n=u[e][t],s;if(a)for(s=n.length;s--;){var o=n[s];o.callback===i&&o.context===a&&n.splice(s,1)}else for(s=n.length;s--;)n[s].callback===i&&n.splice(s,1)}else u[e][t]=[]}function l(e,t,i,a,n){var s={callback:i,priority:a,context:n},o=u[e][t];o?(o.push(s),o=c(o)):o=[s],u[e][t]=o}function c(e){for(var t,i,a,n=1,s=e.length;s>n;n++){for(t=e[n],i=n;(a=e[i-1])&&a.priority>t.priority;)e[i]=e[i-1],--i;e[i]=t}return e}function d(e,t,i){var a=u[e][t];if(!a)return"filters"===e?i[0]:!1;var n=0,s=a.length;if("filters"===e)for(;s>n;n++)i[0]=a[n].callback.apply(a[n].context,i);else for(;s>n;n++)a[n].callback.apply(a[n].context,i);return"filters"===e?i[0]:!0}var f={removeFilter:o,applyFilters:s,addFilter:n,removeAction:a,doAction:i,addAction:t,storage:e},u={actions:{},filters:{}};return f};e.wp=e.wp||{},e.wp.hooks=new i}(window);var acf;!function($){$.fn.exists=function(){return $(this).length>0},$.fn.outerHTML=function(){return $(this).get(0).outerHTML},acf={l10n:{},o:{},update:function(e,t){this.o[e]=t},get:function(e){return"undefined"!=typeof this.o[e]?this.o[e]:null},_e:function(e,t){t=t||!1;var i=this.l10n[e]||"";return t&&(i=i[t]||""),i},add_action:function(){for(var e=arguments[0].split(" "),t=e.length,i=0;t>i;i++)arguments[0]="acf/"+e[i],wp.hooks.addAction.apply(this,arguments);return this},remove_action:function(){return arguments[0]="acf/"+arguments[0],wp.hooks.removeAction.apply(this,arguments),this},do_action:function(){return arguments[0]="acf/"+arguments[0],wp.hooks.doAction.apply(this,arguments),this},add_filter:function(){return arguments[0]="acf/"+arguments[0],wp.hooks.addFilter.apply(this,arguments),this},remove_filter:function(){return arguments[0]="acf/"+arguments[0],wp.hooks.removeFilter.apply(this,arguments),this},apply_filters:function(){return arguments[0]="acf/"+arguments[0],wp.hooks.applyFilters.apply(this,arguments)},get_selector:function(e){e=e||"";var t=".acf-field";if($.isPlainObject(e))if($.isEmptyObject(e))e="";else for(k in e){e=e[k];break}return e&&(t+="-"+e,t=t.split("_").join("-"),t=t.split("field-field-").join("field-")),t},get_fields:function(e,t,i){e=e||"",t=t||!1,i=i||!1;var a=this.get_selector(e),n=$(a,t);return t!==!1&&t.each(function(){$(this).is(a)&&(n=n.add($(this)))}),i||(n=acf.apply_filters("get_fields",n)),n},get_field:function(e,t){e=e||"",t=t||!1;var i=this.get_fields(e,t,!0);return i.exists()?i.first():!1},get_closest_field:function(e,t){return t=t||"",e.closest(this.get_selector(t))},get_field_wrap:function(e){return e.closest(this.get_selector())},get_field_key:function(e){return e.data("key")},get_field_type:function(e){return e.data("type")},get_data:function(e,t){return"undefined"==typeof t?e.data():e.data(t)},get_uniqid:function(e,t){"undefined"==typeof e&&(e="");var i,a=function(e,t){return e=parseInt(e,10).toString(16),t<e.length?e.slice(e.length-t):t>e.length?Array(1+(t-e.length)).join("0")+e:e};return this.php_js||(this.php_js={}),this.php_js.uniqidSeed||(this.php_js.uniqidSeed=Math.floor(123456789*Math.random())),this.php_js.uniqidSeed++,i=e,i+=a(parseInt((new Date).getTime()/1e3,10),8),i+=a(this.php_js.uniqidSeed,5),t&&(i+=(10*Math.random()).toFixed(8).toString()),i},serialize_form:function(e){var t={},i={};return $selector=e.find("select, textarea, input"),$.each($selector.serializeArray(),function(e,a){"[]"===a.name.slice(-2)&&(a.name=a.name.replace("[]",""),"undefined"==typeof i[a.name]&&(i[a.name]=-1),i[a.name]++,a.name+="["+i[a.name]+"]"),t[a.name]=a.value}),t},serialize:function(e){return this.serialize_form(e)},remove_tr:function(e,t){var i=e.height(),a=e.children().length;e.addClass("acf-remove-element"),setTimeout(function(){e.removeClass("acf-remove-element"),e.html('<td style="padding:0; height:'+i+'px" colspan="'+a+'"></td>'),e.children("td").animate({height:0},250,function(){e.remove(),"function"==typeof t&&t()})},250)},remove_el:function(e,t,i){i=i||0,e.css({height:e.height(),width:e.width(),position:"absolute"}),e.wrap('<div class="acf-temp-wrap" style="height:'+e.outerHeight(!0)+'px"></div>'),e.animate({opacity:0},250),e.parent(".acf-temp-wrap").animate({height:i},250,function(){$(this).remove(),"function"==typeof t&&t()})},isset:function(){var e=arguments,t=e.length,a=null,n;if(0===t)throw new Error("Empty isset");for(a=e[0],i=1;i<t;i++){if(e[i]===n||a[e[i]]===n)return!1;a=a[e[i]]}return!0},maybe_get:function(e,t,i){"undefined"==typeof i&&(i=null),keys=String(t).split(".");for(var a in keys){var t=keys[a];if("undefined"==typeof e[t])return i;e=e[t]}return e},open_popup:function(e){if($popup=$("body > #acf-popup"),$popup.exists())return update_popup(e);var t=['<div id="acf-popup">','<div class="acf-popup-box acf-box">','<div class="title"><h3></h3><a href="#" class="acf-icon -cancel grey acf-close-popup"></a></div>','<div class="inner"></div>','<div class="loading"><i class="acf-loading"></i></div>',"</div>",'<div class="bg"></div>',"</div>"].join("");return $("body").append(t),$("#acf-popup").on("click",".bg, .acf-close-popup",function(e){e.preventDefault(),acf.close_popup()}),this.update_popup(e)},update_popup:function(e){return $popup=$("#acf-popup"),$popup.exists()?(e=$.extend({},{title:"",content:"",width:0,height:0,loading:!1},e),e.title&&$popup.find(".title h3").html(e.title),e.content&&($inner=$popup.find(".inner:first"),$inner.html(e.content),acf.do_action("append",$inner),$inner.attr("style","position: relative;"),e.height=$inner.outerHeight(),$inner.removeAttr("style")),e.width&&$popup.find(".acf-popup-box").css({width:e.width,"margin-left":0-e.width/2}),e.height&&(e.height+=44,$popup.find(".acf-popup-box").css({height:e.height,"margin-top":0-e.height/2})),e.loading?$popup.find(".loading").show():$popup.find(".loading").hide(),$popup):!1},close_popup:function(){$popup=$("#acf-popup"),$popup.exists()&&$popup.remove()},update_user_setting:function(e,t){$.ajax({url:acf.get("ajaxurl"),dataType:"html",type:"post",data:acf.prepare_for_ajax({action:"acf/update_user_setting",name:e,value:t})})},prepare_for_ajax:function(e){return e.nonce=acf.get("nonce"),e=acf.apply_filters("prepare_for_ajax",e)},is_ajax_success:function(e){return!(!e||!e.success)},get_ajax_message:function(e){var t={text:"",type:"error"};return e?(e.success&&(t.type="success"),e.data&&e.data.message&&(t.text=e.data.message),e.data&&e.data.error&&(t.text=e.data.error),t):t},is_in_view:function(e){var t=e.offset().top,i=t+e.height();if(t===i)return!1;var a=$(window).scrollTop(),n=a+$(window).height();return n>=i&&t>=a},val:function(e,t){var i=e.val();e.val(t),t!=i&&e.trigger("change")},str_replace:function(e,t,i){return i.split(e).join(t)},str_sanitize:function(e){var t="",a={"æ":"a","å":"a","á":"a","ä":"a","č":"c","ď":"d","è":"e","é":"e","ě":"e","ë":"e","í":"i","ĺ":"l","ľ":"l","ň":"n","ø":"o","ó":"o","ô":"o","ő":"o","ö":"o","ŕ":"r","š":"s","ť":"t","ú":"u","ů":"u","ű":"u","ü":"u","ý":"y","ř":"r","ž":"z"," ":"_","'":"","?":"","/":"","\\":"",".":"",",":"",">":"","<":"",'"':"","[":"","]":"","|":"","{":"","}":"","(":"",")":""};for(e=e.toLowerCase(),i=0;i<e.length;i++){var n=e.charAt(i);"undefined"!=typeof a[n]&&(n=a[n]),t+=n}return t},render_select:function(e,t){var i=e.val();e.html(""),t&&$.each(t,function(t,a){var n=e;a.group&&(n=e.find('optgroup[label="'+a.group+'"]'),n.exists()||(n=$('<optgroup label="'+a.group+'"></optgroup>'),e.append(n))),n.append('<option value="'+a.value+'">'+a.label+"</option>"),i==a.value&&e.prop("selectedIndex",t)})},duplicate:function(e,t){t=t||"data-id",find=e.attr(t),replace=acf.get_uniqid(),acf.do_action("before_duplicate",e);var i=e.clone();return i.removeClass("acf-clone"),acf.do_action("remove",i),"undefined"!=typeof find&&(i.attr(t,replace),i.find('[id*="'+find+'"]').each(function(){$(this).attr("id",$(this).attr("id").replace(find,replace))}),i.find('[name*="'+find+'"]').each(function(){$(this).attr("name",$(this).attr("name").replace(find,replace))}),i.find('label[for*="'+find+'"]').each(function(){$(this).attr("for",$(this).attr("for").replace(find,replace))})),i.find(".ui-sortable").removeClass("ui-sortable"),acf.do_action("after_duplicate",e,i),e.after(i),setTimeout(function(){acf.do_action("append",i)},1),i},decode:function(e){return $("<div/>").html(e).text()},parse_args:function(e,t){return $.extend({},t,e)}},acf.model={actions:{},filters:{},events:{},extend:function(e){var t=$.extend({},this,e);return $.each(t.actions,function(e,i){t._add_action(e,i)}),$.each(t.filters,function(e,i){t._add_filter(e,i)}),$.each(t.events,function(e,i){t._add_event(e,i)}),t},_add_action:function(e,t){var i=this,a=e.split(" "),e=a[0]||"",n=a[1]||10;acf.add_action(e,i[t],n,i)},_add_filter:function(e,t){var i=this,a=e.split(" "),e=a[0]||"",n=a[1]||10;acf.add_filter(e,i[t],n,i)},_add_event:function(e,t){var i=this,a=e.substr(0,e.indexOf(" ")),n=e.substr(e.indexOf(" ")+1);$(document).on(a,n,function(e){e.$el=$(this),"function"==typeof i.event&&(e=i.event(e)),i[t].apply(i,[e])})},get:function(e,t){return t=t||null,"undefined"!=typeof this[e]&&(t=this[e]),t},set:function(e,t){return this[e]=t,"function"==typeof this["_set_"+e]&&this["_set_"+e].apply(this),this}},acf.field=acf.model.extend({type:"",o:{},$field:null,_add_action:function(e,t){var i=this;e=e+"_field/type="+i.type,acf.add_action(e,function(e){i.set("$field",e),i[t].apply(i,arguments)})},_add_filter:function(e,t){var i=this;e=e+"_field/type="+i.type,acf.add_filter(e,function(e){i.set("$field",e),i[t].apply(i,arguments)})},_add_event:function(e,t){var i=this,a=e.substr(0,e.indexOf(" ")),n=e.substr(e.indexOf(" ")+1),s=acf.get_selector(i.type);$(document).on(a,s+" "+n,function(e){e.$el=$(this),e.$field=acf.get_closest_field(e.$el,i.type),i.set("$field",e.$field),i[t].apply(i,[e])})},_set_$field:function(){"function"==typeof this.focus&&this.focus()},doFocus:function(e){return this.set("$field",e)}}),acf.fields=acf.model.extend({actions:{prepare:"_prepare",prepare_field:"_prepare_field",ready:"_ready",ready_field:"_ready_field",append:"_append",append_field:"_append_field",load:"_load",load_field:"_load_field",remove:"_remove",remove_field:"_remove_field",sortstart:"_sortstart",sortstart_field:"_sortstart_field",sortstop:"_sortstop",sortstop_field:"_sortstop_field",show:"_show",show_field:"_show_field",hide:"_hide",hide_field:"_hide_field"},_prepare:function(e){acf.get_fields("",e).each(function(){acf.do_action("prepare_field",$(this))})},_prepare_field:function(e){acf.do_action("prepare_field/type="+e.data("type"),e)},_ready:function(e){acf.get_fields("",e).each(function(){acf.do_action("ready_field",$(this))})},_ready_field:function(e){acf.do_action("ready_field/type="+e.data("type"),e)},_append:function(e){acf.get_fields("",e).each(function(){acf.do_action("append_field",$(this))})},_append_field:function(e){acf.do_action("append_field/type="+e.data("type"),e)},_load:function(e){acf.get_fields("",e).each(function(){acf.do_action("load_field",$(this))})},_load_field:function(e){acf.do_action("load_field/type="+e.data("type"),e)},_remove:function(e){acf.get_fields("",e).each(function(){acf.do_action("remove_field",$(this))})},_remove_field:function(e){acf.do_action("remove_field/type="+e.data("type"),e)},_sortstart:function(e,t){acf.get_fields("",e).each(function(){acf.do_action("sortstart_field",$(this),t)})},_sortstart_field:function(e,t){acf.do_action("sortstart_field/type="+e.data("type"),e,t)},_sortstop:function(e,t){acf.get_fields("",e).each(function(){acf.do_action("sortstop_field",$(this),t)})},_sortstop_field:function(e,t){acf.do_action("sortstop_field/type="+e.data("type"),e,t)},_hide:function(e,t){acf.get_fields("",e).each(function(){acf.do_action("hide_field",$(this),t)})},_hide_field:function(e,t){acf.do_action("hide_field/type="+e.data("type"),e,t)},_show:function(e,t){acf.get_fields("",e).each(function(){acf.do_action("show_field",$(this),t)})},_show_field:function(e,t){acf.do_action("show_field/type="+e.data("type"),e,t)}}),$(document).ready(function(){acf.do_action("ready",$("body"))}),$(window).on("load",function(){acf.do_action("load",$("body"))}),acf.layout=acf.model.extend({active:0,actions:{refresh:"refresh"},refresh:function(e){e=e||!1,$(".acf-fields:visible",e).each(function(){var e=$(),t=0,i=0,a=-1,n=$(this).children(".acf-field[data-width]:visible");n.exists()&&(n.removeClass("acf-r0 acf-c0").css({"min-height":0}),n.each(function(n){var s=$(this),o=s.position().top;0==n&&(t=o),o!=t&&(e.css({"min-height":i+1+"px"}),e=$(),t=s.position().top,i=0,a=-1),a++,i=s.outerHeight()>i?s.outerHeight():i,e=e.add(s),0==o?s.addClass("acf-r0"):0==a&&s.addClass("acf-c0")}),e.exists()&&e.css({"min-height":i+1+"px"}))})}}),$(document).on("change",".acf-field input, .acf-field textarea, .acf-field select",function(){$('#acf-form-data input[name="_acfchanged"]').exists()&&$('#acf-form-data input[name="_acfchanged"]').val(1),acf.do_action("change",$(this))}),$(document).on("click",'.acf-field a[href="#"]',function(e){e.preventDefault()}),acf.unload=acf.model.extend({active:1,changed:0,filters:{validation_complete:"validation_complete"},actions:{change:"on",submit:"off"},events:{"submit form":"off"},validation_complete:function(e,t){return e&&e.errors&&this.on(),e},on:function(){!this.changed&&this.active&&(this.changed=1,$(window).on("beforeunload",this.unload))},off:function(){this.changed=0,$(window).off("beforeunload",this.unload)},unload:function(){return acf._e("unload")}}),acf.tooltip=acf.model.extend({$el:null,events:{"mouseenter .acf-js-tooltip":"on","mouseleave .acf-js-tooltip":"off"},on:function(e){var t=e.$el.attr("title");if(t){this.$el=$('<div class="acf-tooltip">'+t+"</div>"),$("body").append(this.$el);var i=10;target_w=e.$el.outerWidth(),target_h=e.$el.outerHeight(),target_t=e.$el.offset().top,target_l=e.$el.offset().left,tooltip_w=this.$el.outerWidth(),tooltip_h=this.$el.outerHeight();var a=target_t-tooltip_h,n=target_l+target_w/2-tooltip_w/2;i>n?(this.$el.addClass("right"),n=target_l+target_w,a=target_t+target_h/2-tooltip_h/2):n+tooltip_w+i>$(window).width()?(this.$el.addClass("left"),n=target_l-tooltip_w,a=target_t+target_h/2-tooltip_h/2):a-$(window).scrollTop()<i?(this.$el.addClass("bottom"),a=target_t+target_h):this.$el.addClass("top"),this.$el.css({top:a,left:n}),e.$el.data("title",t),e.$el.attr("title","")}},off:function(e){this.$el&&(e.$el.attr("title",e.$el.data("title")),this.$el.remove())}}),acf.postbox=acf.model.extend({events:{"mouseenter .acf-postbox .handlediv":"on","mouseleave .acf-postbox .handlediv":"off"},on:function(e){e.$el.siblings(".hndle").addClass("hover")},off:function(e){e.$el.siblings(".hndle").removeClass("hover")},render:function(e){e=$.extend({},{id:"",key:"",style:"default",label:"top",edit_url:"",edit_title:"",visibility:!0},e);var t=$("#"+e.id),i=$("#"+e.id+"-hide"),a=i.parent();t.addClass("acf-postbox"),a.addClass("acf-postbox-toggle"),t.removeClass("hide-if-js"),a.removeClass("hide-if-js"),"default"!==e.style&&t.addClass(e.style),t.children(".inside").addClass("acf-fields").addClass("-"+e.label),e.visibility?i.prop("checked",!0):(t.addClass("acf-hidden"),a.addClass("acf-hidden")),e.edit_url&&t.children(".hndle").append('<a href="'+e.edit_url+'" class="dashicons dashicons-admin-generic acf-hndle-cog acf-js-tooltip" title="'+e.edit_title+'"></a>')}}),acf.add_action("sortstart",function(e,t){e.is("tr")&&(e.css("position","relative"),e.children().each(function(){$(this).width($(this).width())}),e.css("position","absolute"),t.html('<td style="height:'+e.height()+'px; padding:0;" colspan="'+e.children("td").length+'"></td>'))}),acf.add_action("before_duplicate",function(e){e.find("select option:selected").addClass("selected")}),acf.add_action("after_duplicate",function(e,t){e.find("select option.selected").removeClass("selected"),t.find("select").each(function(){var e=[];$(this).find("option.selected").each(function(){e.push($(this).val()),$(this).removeClass("selected")}),$(this).val(e)})})}(jQuery),function($){acf.ajax=acf.model.extend({actions:{ready:"ready"},events:{"change #page_template":"_change_template","change #parent_id":"_change_parent","change #post-formats-select input":"_change_format","change .categorychecklist input":"_change_term",'change .acf-taxonomy-field[data-save="1"] input':"_change_term",'change .acf-taxonomy-field[data-save="1"] select':"_change_term"},o:{},xhr:null,update:function(e,t){return this.o[e]=t,this},get:function(e){return this.o[e]||null},ready:function(){this.update("post_id",acf.get("post_id"))},fetch:function(){if(acf.get("ajax")){this.xhr&&this.xhr.abort();var e=this,t=this.o;t.action="acf/post/get_field_groups",t.exists=[],$(".acf-postbox").not(".acf-hidden").each(function(){t.exists.push($(this).attr("id").substr(4))}),this.xhr=$.ajax({url:acf.get("ajaxurl"),data:acf.prepare_for_ajax(t),type:"post",dataType:"json",success:function(t){acf.is_ajax_success(t)&&e.render(t.data)}})}},render:function(e){$(".acf-postbox").addClass("acf-hidden"),$(".acf-postbox-toggle").addClass("acf-hidden"),$("#acf-style").html(""),$.each(e,function(e,t){var i=$("#acf-"+t.key),a=$("#acf-"+t.key+"-hide"),n=a.parent();i.removeClass("acf-hidden hide-if-js").show(),n.removeClass("acf-hidden hide-if-js").show(),a.prop("checked",!0);var s=i.find(".acf-replace-with-fields");s.exists()&&(s.replaceWith(t.html),acf.do_action("append",i)),0===e&&$("#acf-style").html(t.style),i.find(".acf-hidden-by-postbox").prop("disabled",!1)}),$(".acf-postbox.acf-hidden").find("select, textarea, input").not(":disabled").each(function(){$(this).addClass("acf-hidden-by-postbox").prop("disabled",!0)})},sync_taxonomy_terms:function(){var e=[""];$(".categorychecklist, .acf-taxonomy-field").each(function(){var t=$(this),i=t.find('input[type="checkbox"]').not(":disabled"),a=t.find('input[type="radio"]').not(":disabled"),n=t.find("select").not(":disabled"),s=t.find('input[type="hidden"]').not(":disabled");t.is(".acf-taxonomy-field")&&"1"!=t.attr("data-save")||t.closest(".media-frame").exists()||(i.exists()?i.filter(":checked").each(function(){e.push($(this).val())}):a.exists()?a.filter(":checked").each(function(){e.push($(this).val())}):n.exists()?n.find("option:selected").each(function(){e.push($(this).val())}):s.exists()&&s.each(function(){$(this).val()&&e.push($(this).val())}))}),e=e.filter(function(e,t,i){return i.indexOf(e)==t}),this.update("post_taxonomy",e).fetch()},_change_template:function(e){var t=e.$el.val();this.update("page_template",t).fetch()},_change_parent:function(e){var t="parent",i=0;""!=e.$el.val()&&(t="child",i=e.$el.val()),this.update("page_type",t).update("page_parent",i).fetch()},_change_format:function(e){var t=e.$el.val();"0"==t&&(t="standard"),this.update("post_format",t).fetch()},_change_term:function(e){var t=this;e.$el.closest(".media-frame").exists()||setTimeout(function(){t.sync_taxonomy_terms()},1)}})}(jQuery),function($){acf.fields.checkbox=acf.field.extend({type:"checkbox",events:{"change input":"change"},change:function(e){var t=e.$el.closest("ul"),i=t.find("input[name]"),a=e.$el.is(":checked");if(e.$el.hasClass("acf-checkbox-toggle"))return void i.prop("checked",a);if(t.find(".acf-checkbox-toggle").exists()){var a=0==i.not(":checked").length;t.find(".acf-checkbox-toggle").prop("checked",a)}}})}(jQuery),function($){acf.fields.color_picker=acf.field.extend({type:"color_picker",$input:null,$hidden:null,actions:{ready:"initialize",append:"initialize"},focus:function(){this.$input=this.$field.find('input[type="text"]'),this.$hidden=this.$field.find('input[type="hidden"]')},initialize:function(){var e=this.$input,t=this.$hidden,i=function(){setTimeout(function(){acf.val(t,e.val())},1)},a={defaultColor:!1,palettes:!0,hide:!0,change:i,clear:i},a=acf.apply_filters("color_picker_args",a,this.$field);this.$input.wpColorPicker(a)}})}(jQuery),function($){acf.conditional_logic=acf.model.extend({actions:{"prepare 20":"render","append 20":"render"},events:{"change .acf-field input":"change","change .acf-field textarea":"change","change .acf-field select":"change"},items:{},triggers:{},add:function(e,t){for(var i in t){var a=t[i];for(var n in a){var s=a[n],o=s.field,r=this.triggers[o]||{};r[e]=e,this.triggers[o]=r}}this.items[e]=t},render:function(e){e=e||!1;var t=acf.get_fields("",e,!0);this.render_fields(t),acf.do_action("refresh",e)},change:function(e){var t=e.$el,i=acf.get_field_wrap(t),a=i.data("key");if("undefined"==typeof this.triggers[a])return!1;$parent=i.parent();for(var n in this.triggers[a]){var s=this.triggers[a][n],o=acf.get_fields(s,$parent,!0);this.render_fields(o)}acf.do_action("refresh",$parent)},render_fields:function(e){var t=this;e.each(function(){t.render_field($(this))})},render_field:function(e){var t=e.data("key");if("undefined"==typeof this.items[t])return!1;var i=!1,a=this.items[t];for(var n in a){var s=a[n],o=!0;for(var r in s){var l=s[r],c=this.get_trigger(e,l.field);if(!this.calculate(l,c,e)){o=!1;break}}if(o){i=!0;break}}i?this.show_field(e):this.hide_field(e)},show_field:function(e){e.removeClass("hidden-by-conditional-logic"),e.find(".acf-clhi").not(".hidden-by-conditional-logic .acf-clhi").removeClass("acf-clhi").prop("disabled",!1),acf.do_action("show_field",e,"conditional_logic")},hide_field:function(e){e.addClass("hidden-by-conditional-logic"),e.find("input, textarea, select").not(".acf-disabled").addClass("acf-clhi").prop("disabled",!0),acf.do_action("hide_field",e,"conditional_logic")},get_trigger:function(e,t){var i=acf.get_selector(t),a=e.siblings(i);if(!a.exists()){var n=acf.get_selector();e.parents(n).each(function(){return a=$(this).siblings(i),a.exists()?!1:void 0})}return a.exists()?a:!1},calculate:function(e,t,i){if(!t||!i)return!1;var a=!1,n=t.data("type");return"true_false"==n||"checkbox"==n||"radio"==n?a=this.calculate_checkbox(e,t):"select"==n&&(a=this.calculate_select(e,t)),"!="===e.operator&&(a=!a),a},calculate_checkbox:function(e,t){var i=t.find('input[value="'+e.value+'"]:checked').exists();return""!==e.value||t.find("input:checked").exists()||(i=!0),i},calculate_select:function(e,t){var i=t.find("select"),a=i.val();return a||$.isNumeric(a)||(a=""),$.isArray(a)||(a=[a]),match=$.inArray(e.value,a)>-1,match}})}(jQuery),function($){acf.datepicker=acf.model.extend({actions:{"ready 1":"ready"},ready:function(){var e=acf.get("locale"),t=acf.get("rtl");l10n=acf._e("date_picker"),l10n&&(l10n.isRTL=t,$.datepicker.regional[e]=l10n,$.datepicker.setDefaults(l10n))},init:function(e,t){t=t||{},e.datepicker(t),$("body > #ui-datepicker-div").exists()&&$("body > #ui-datepicker-div").wrap('<div class="acf-ui-datepicker" />')},destroy:function(e){}}),acf.fields.date_picker=acf.field.extend({type:"date_picker",$el:null,$input:null,$hidden:null,o:{},actions:{ready:"initialize",append:"initialize"},events:{'blur input[type="text"]':"blur"},focus:function(){this.$el=this.$field.find(".acf-date-picker"),this.$input=this.$el.find('input[type="text"]'),this.$hidden=this.$el.find('input[type="hidden"]'),this.o=acf.get_data(this.$el)},initialize:function(){var e={dateFormat:this.o.date_format,altField:this.$hidden,altFormat:"yymmdd",changeYear:!0,yearRange:"-100:+100",changeMonth:!0,showButtonPanel:!0,firstDay:this.o.first_day};e=acf.apply_filters("date_picker_args",e,this.$field),acf.datepicker.init(this.$input,e)},blur:function(){this.$input.val()||this.$hidden.val("")}})}(jQuery),function($){acf.datetimepicker=acf.model.extend({actions:{"ready 1":"ready"},ready:function(){var e=acf.get("locale"),t=acf.get("rtl");l10n=acf._e("date_time_picker"),l10n&&(l10n.isRTL=t,$.timepicker.regional[e]=l10n,$.timepicker.setDefaults(l10n))},init:function(e,t){t=t||{},e.datetimepicker(t),$("body > #ui-datepicker-div").exists()&&$("body > #ui-datepicker-div").wrap('<div class="acf-ui-datepicker" />')},destroy:function(e){}}),acf.fields.date_time_picker=acf.field.extend({type:"date_time_picker",$el:null,$input:null,$hidden:null,o:{},actions:{ready:"initialize",append:"initialize"},events:{'blur input[type="text"]':"blur"},focus:function(){this.$el=this.$field.find(".acf-date-time-picker"),this.$input=this.$el.find('input[type="text"]'),this.$hidden=this.$el.find('input[type="hidden"]'),this.o=acf.get_data(this.$el)},initialize:function(){var e={dateFormat:this.o.date_format,timeFormat:this.o.time_format,altField:this.$hidden,altFieldTimeOnly:!1,altFormat:"yy-mm-dd",altTimeFormat:"HH:mm:ss",changeYear:!0,yearRange:"-100:+100",changeMonth:!0,showButtonPanel:!0,firstDay:this.o.first_day,controlType:"select",oneLine:!0};e=acf.apply_filters("date_time_picker_args",e,this.$field),acf.datetimepicker.init(this.$input,e)},blur:function(){this.$input.val()||this.$hidden.val("")}})}(jQuery),function($){acf.fields.file=acf.field.extend({type:"file",$el:null,$input:null,actions:{ready:"initialize",append:"initialize"},events:{'click a[data-name="add"]':"add",'click a[data-name="edit"]':"edit",'click a[data-name="remove"]':"remove",'change input[type="file"]':"change"},focus:function(){this.$el=this.$field.find(".acf-file-uploader"),this.$input=this.$el.find('input[type="hidden"]'),this.o=acf.get_data(this.$el)},initialize:function(){"basic"==this.o.uploader&&this.$el.closest("form").attr("enctype","multipart/form-data")},prepare:function(e){if(e=e||{},e._valid)return e;var t={url:"",alt:"",title:"",filename:"",filesize:"",icon:"/wp-includes/images/media/default.png"};return e.id&&(t=e.attributes),t._valid=!0,t},render:function(e){e=this.prepare(e),this.$el.find("img").attr({src:e.icon,alt:e.alt,title:e.title}),this.$el.find('[data-name="title"]').text(e.title),this.$el.find('[data-name="filename"]').text(e.filename).attr("href",e.url),this.$el.find('[data-name="filesize"]').text(e.filesize);var t="";e.id&&(t=e.id),acf.val(this.$input,t),t?this.$el.addClass("has-value"):this.$el.removeClass("has-value")},add:function(){var e=this,t=this.$field,i=acf.get_closest_field(t,"repeater"),a=acf.media.popup({title:acf._e("file","select"),mode:"select",type:"",field:t.data("key"),multiple:i.exists(),library:this.o.library,mime_types:this.o.mime_types,select:function(a,n){if(n>0){var s=t.data("key"),o=t.closest(".acf-row");if(t=!1,o.nextAll(".acf-row:visible").each(function(){return(t=acf.get_field(s,$(this)))?t.find(".acf-file-uploader.has-value").exists()?void(t=!1):!1:void 0}),!t){if(o=acf.fields.repeater.doFocus(i).add(),!o)return!1;t=acf.get_field(s,o)}}e.set("$field",t).render(a)}})},edit:function(){var e=this,t=this.$field,i=this.$input.val();if(i)var a=acf.media.popup({title:acf._e("file","edit"),button:acf._e("file","update"),mode:"edit",attachment:i,select:function(i,a){e.set("$field",t).render(i)}})},remove:function(){var e={};this.render(e)},change:function(e){this.$input.val(e.$el.val())}})}(jQuery),function($){acf.fields.google_map=acf.field.extend({type:"google_map",api:{sensor:!1,libraries:"places"},$el:null,$search:null,timeout:null,status:"",geocoder:!1,map:!1,maps:{},$pending:$(),actions:{ready:"initialize",append:"initialize",show:"show"},events:{'click a[data-name="clear"]':"_clear",'click a[data-name="locate"]':"_locate",'click a[data-name="search"]':"_search","keydown .search":"_keydown","keyup .search":"_keyup","focus .search":"_focus","blur .search":"_blur","mousedown .acf-google-map":"_mousedown"},focus:function(){this.$el=this.$field.find(".acf-google-map"),this.$search=this.$el.find(".search"),this.o=acf.get_data(this.$el),this.maps[this.o.id]&&(this.map=this.maps[this.o.id])},is_ready:function(){var e=this;return"ready"==this.status?!0:"loading"==this.status?!1:acf.isset(window,"google","load")?acf.isset(window,"google","maps","places")?(this.status="ready",!0):(e.status="loading",google.load("maps","3",{other_params:$.param(e.api),callback:function(){e.status="ready",e.initialize_pending()}}),!1):(e.status="loading",$.getScript("https://www.google.com/jsapi",function(){google.load("maps","3",{other_params:$.param(e.api),callback:function(){e.status="ready",e.initialize_pending()}})}),!1)},initialize_pending:function(){var e=this;this.$pending.each(function(){e.doFocus($(this)).initialize()}),this.$pending=$()},initialize:function(){if(!this.is_ready())return this.$pending=this.$pending.add(this.$field),!1;this.geocoder||(this.geocoder=new google.maps.Geocoder);var e=this,t=this.$field,i=this.$el,a=this.$search;a.val(this.$el.find(".input-address").val());var n=acf.apply_filters("google_map_args",{zoom:parseInt(this.o.zoom),center:new google.maps.LatLng(this.o.lat,this.o.lng),mapTypeId:google.maps.MapTypeId.ROADMAP},this.$field);this.map=new google.maps.Map(this.$el.find(".canvas")[0],n);var s=new google.maps.places.Autocomplete(this.$search[0]);s.bindTo("bounds",this.map),this.map.autocomplete=s;var o=acf.apply_filters("google_map_marker_args",{draggable:!0,raiseOnDrag:!0,map:this.map},this.$field);this.map.marker=new google.maps.Marker(o),this.map.$el=i,this.map.$field=t;var r=i.find(".input-lat").val(),l=i.find(".input-lng").val();r&&l&&this.update(r,l).center(),google.maps.event.addListener(s,"place_changed",function(t){var i=this.getPlace();e.search(i)}),google.maps.event.addListener(this.map.marker,"dragend",function(){var t=this.map.marker.getPosition(),i=t.lat(),a=t.lng();e.update(i,a).sync()}),google.maps.event.addListener(this.map,"click",function(t){var i=t.latLng.lat(),a=t.latLng.lng();e.update(i,a).sync()}),this.maps[this.o.id]=this.map},search:function(e){var t=this,i=this.$search.val();if(!i)return!1;this.$el.find(".input-address").val(i);var a=i.split(",");if(2==a.length){var n=a[0],s=a[1];if($.isNumeric(n)&&$.isNumeric(s))return n=parseFloat(n),s=parseFloat(s),void t.update(n,s).center()}if(e&&e.geometry){var n=e.geometry.location.lat(),s=e.geometry.location.lng();return void t.update(n,s).center()}this.$el.addClass("-loading"),t.geocoder.geocode({address:i},function(i,a){if(t.$el.removeClass("-loading"),a!=google.maps.GeocoderStatus.OK)return void console.log("Geocoder failed due to: "+a);if(!i[0])return void console.log("No results found");e=i[0];var n=e.geometry.location.lat(),s=e.geometry.location.lng();t.update(n,s).center()})},update:function(e,t){var i=new google.maps.LatLng(e,t);return acf.val(this.$el.find(".input-lat"),e),acf.val(this.$el.find(".input-lng"),t),this.map.marker.setPosition(i),this.map.marker.setVisible(!0),this.$el.addClass("-value"),this.$field.removeClass("error"),acf.do_action("google_map_change",i,this.map,this.$field),this.$search.blur(),this},center:function(){var e=this.map.marker.getPosition(),t=this.o.lat,i=this.o.lng;e&&(t=e.lat(),i=e.lng());var a=new google.maps.LatLng(t,i);this.map.setCenter(a)},sync:function(){var e=this,t=this.map.marker.getPosition(),i=new google.maps.LatLng(t.lat(),t.lng());return this.$el.addClass("-loading"),this.geocoder.geocode({latLng:i},function(t,i){if(e.$el.removeClass("-loading"),i!=google.maps.GeocoderStatus.OK)return void console.log("Geocoder failed due to: "+i);if(!t[0])return void console.log("No results found");var a=t[0];e.$search.val(a.formatted_address),acf.val(e.$el.find(".input-address"),a.formatted_address)}),this},refresh:function(){return this.is_ready()?(google.maps.event.trigger(this.map,"resize"),void this.center()):!1},show:function(){var e=this,t=this.$field;setTimeout(function(){e.set("$field",t).refresh()},10)},_clear:function(e){this.$el.removeClass("-value -loading -search"),this.$search.val(""),acf.val(this.$el.find(".input-address"),""),acf.val(this.$el.find(".input-lat"),""),acf.val(this.$el.find(".input-lng"),""),this.map.marker.setVisible(!1);
-},_locate:function(e){var t=this;return navigator.geolocation?(this.$el.addClass("-loading"),void navigator.geolocation.getCurrentPosition(function(e){t.$el.removeClass("-loading");var i=e.coords.latitude,a=e.coords.longitude;t.update(i,a).sync().center()})):(alert(acf._e("google_map","browser_support")),this)},_search:function(e){this.search()},_focus:function(e){this.$el.removeClass("-value"),this._keyup()},_blur:function(e){var t=this,i=this.$el.find(".input-address").val();i&&(this.timeout=setTimeout(function(){t.$el.addClass("-value"),t.$search.val(i)},100))},_keydown:function(e){13==e.which&&e.preventDefault()},_keyup:function(e){var t=this.$search.val();t?this.$el.addClass("-search"):this.$el.removeClass("-search")},_mousedown:function(e){var t=this;setTimeout(function(){clearTimeout(t.timeout)},1)}})}(jQuery),function($){acf.fields.image=acf.field.extend({type:"image",$el:null,$input:null,$img:null,actions:{ready:"initialize",append:"initialize"},events:{'click a[data-name="add"]':"add",'click a[data-name="edit"]':"edit",'click a[data-name="remove"]':"remove",'change input[type="file"]':"change"},focus:function(){this.$el=this.$field.find(".acf-image-uploader"),this.$input=this.$el.find('input[type="hidden"]'),this.$img=this.$el.find("img"),this.o=acf.get_data(this.$el)},initialize:function(){"basic"==this.o.uploader&&this.$el.closest("form").attr("enctype","multipart/form-data")},prepare:function(e){if(e=e||{},e._valid)return e;var t={url:"",alt:"",title:"",caption:"",description:"",width:0,height:0};return e.id&&(t=e.attributes,t.url=acf.maybe_get(t,"sizes."+this.o.preview_size+".url",t.url)),t._valid=!0,t},render:function(e){e=this.prepare(e),this.$img.attr({src:e.url,alt:e.alt,title:e.title});var t="";e.id&&(t=e.id),acf.val(this.$input,t),t?this.$el.addClass("has-value"):this.$el.removeClass("has-value")},add:function(){var e=this,t=this.$field,i=acf.get_closest_field(this.$field,"repeater"),a=acf.media.popup({title:acf._e("image","select"),mode:"select",type:"image",field:t.data("key"),multiple:i.exists(),library:this.o.library,mime_types:this.o.mime_types,select:function(a,n){if(n>0){var s=t.data("key"),o=t.closest(".acf-row");if(t=!1,o.nextAll(".acf-row:visible").each(function(){return(t=acf.get_field(s,$(this)))?t.find(".acf-image-uploader.has-value").exists()?void(t=!1):!1:void 0}),!t){if(o=acf.fields.repeater.doFocus(i).add(),!o)return!1;t=acf.get_field(s,o)}}e.set("$field",t).render(a)}})},edit:function(){var e=this,t=this.$field,i=this.$input.val();if(i)var a=acf.media.popup({title:acf._e("image","edit"),button:acf._e("image","update"),mode:"edit",attachment:i,select:function(i,a){e.set("$field",t).render(i)}})},remove:function(){var e={};this.render(e)},change:function(e){this.$input.val(e.$el.val())}})}(jQuery),function($){acf.media=acf.model.extend({frames:[],mime_types:{},actions:{ready:"ready"},frame:function(){var e=this.frames.length-1;return 0>e?!1:this.frames[e]},destroy:function(e){e.detach(),e.dispose(),e=null,this.frames.pop()},popup:function(e){var t=acf.get("post_id"),i=!1;$.isNumeric(t)||(t=0);var a=acf.parse_args(e,{mode:"select",title:"",button:"",type:"",field:"",mime_types:"",library:"all",multiple:!1,attachment:0,post_id:t,select:function(){}});a.id&&(a.attachment=a.id);var i=this.new_media_frame(a);return this.frames.push(i),setTimeout(function(){i.open()},1),i},_get_media_frame_settings:function(e,t){return"select"===t.mode?e=this._get_select_frame_settings(e,t):"edit"===t.mode&&(e=this._get_edit_frame_settings(e,t)),e},_get_select_frame_settings:function(e,t){return t.type&&(e.library.type=t.type),"uploadedTo"===t.library&&(e.library.uploadedTo=t.post_id),e._button=acf._e("media","select"),e},_get_edit_frame_settings:function(e,t){return e.library.post__in=[t.attachment],e._button=acf._e("media","update"),e},_add_media_frame_events:function(e,t){return e.on("open",function(){this.$el.closest(".media-modal").addClass("acf-media-modal -"+t.mode)},e),e.on("content:render:edit-image",function(){var e=this.state().get("image"),t=new wp.media.view.EditImage({model:e,controller:this}).render();this.content.set(t),t.loadEditor()},e),e.on("toolbar:create:select",function(t){t.view=new wp.media.view.Toolbar.Select({text:e.options._button,controller:this})},e),e.on("select",function(){var i=e.state(),a=i.get("image"),n=i.get("selection");if(a)return void t.select.apply(e,[a,0]);if(n){var s=0;return void n.each(function(i){t.select.apply(e,[i,s]),s++})}}),e.on("close",function(){setTimeout(function(){acf.media.destroy(e)},500)}),"select"===t.mode?e=this._add_select_frame_events(e,t):"edit"===t.mode&&(e=this._add_edit_frame_events(e,t)),e},_add_select_frame_events:function(e,t){var i=this;return acf.isset(_wpPluploadSettings,"defaults","multipart_params")&&(_wpPluploadSettings.defaults.multipart_params._acfuploader=t.field,e.on("open",function(){delete _wpPluploadSettings.defaults.multipart_params._acfuploader})),e.on("content:activate:browse",function(){try{var a=e.content.get().toolbar,n=a.get("filters"),s=a.get("search")}catch(o){return}if("image"==t.type&&(n.filters.all.text=acf._e("image","all"),delete n.filters.audio,delete n.filters.video,$.each(n.filters,function(e,t){null===t.props.type&&(t.props.type="image")})),t.mime_types){var r=t.mime_types.split(" ").join("").split(".").join("").split(",");$.each(r,function(e,t){$.each(i.mime_types,function(e,i){if(-1!==e.indexOf(t)){var a={text:t,props:{status:null,type:i,uploadedTo:null,orderby:"date",order:"DESC"},priority:20};n.filters[i]=a}})})}"uploadedTo"==t.library&&(delete n.filters.unattached,delete n.filters.uploaded,n.$el.parent().append('<span class="acf-uploadedTo">'+acf._e("image","uploadedTo")+"</span>"),$.each(n.filters,function(e,i){i.props.uploadedTo=t.post_id})),$.each(n.filters,function(e,i){i.props._acfuploader=t.field}),s.model.attributes._acfuploader=t.field,"function"==typeof n.refresh&&n.refresh()}),e},_add_edit_frame_events:function(e,t){return e.on("open",function(){this.$el.closest(".media-modal").addClass("acf-expanded"),"browse"!=this.content.mode()&&this.content.mode("browse");var e=this.state(),i=e.get("selection"),a=wp.media.attachment(t.attachment);i.add(a)},e),e},new_media_frame:function(e){var t={title:e.title,multiple:e.multiple,library:{},states:[]};t=this._get_media_frame_settings(t,e);var i=wp.media.query(t.library);acf.isset(i,"mirroring","args")&&(i.mirroring.args._acfuploader=e.field),t.states=[new wp.media.controller.Library({library:i,multiple:t.multiple,title:t.title,priority:20,filterable:"all",editable:!0,allowLocalEdits:!0})],acf.isset(wp,"media","controller","EditImage")&&t.states.push(new wp.media.controller.EditImage);var a=wp.media(t);return a.acf=e,a=this._add_media_frame_events(a,e)},ready:function(){var e=acf.get("wp_version"),t=acf.get("browser"),i=acf.get("post_id");acf.isset(window,"wp","media","view","settings","post")&&$.isNumeric(i)&&(wp.media.view.settings.post.id=i),t&&$("body").addClass("browser-"+t),e&&(e+="",major=e.substr(0,1),$("body").addClass("major-"+major)),acf.isset(window,"wp","media","view")&&(this.customize_Attachment(),this.customize_AttachmentFiltersAll(),this.customize_AttachmentCompat())},customize_Attachment:function(){var e=wp.media.view.Attachment.Library;wp.media.view.Attachment.Library=e.extend({render:function(){var t=acf.media.frame(),i=acf.maybe_get(this,"model.attributes.acf_errors");return t&&i&&this.$el.addClass("acf-disabled"),e.prototype.render.apply(this,arguments)},toggleSelection:function(t){var i=acf.media.frame(),a=acf.maybe_get(this,"model.attributes.acf_errors"),n=this.controller.$el.find(".media-frame-content .media-sidebar");if(n.children(".acf-selection-error").remove(),n.children().removeClass("acf-hidden"),i&&a){var s=acf.maybe_get(this,"model.attributes.filename","");n.children().addClass("acf-hidden"),n.prepend(['<div class="acf-selection-error">','<span class="selection-error-label">'+acf._e("restricted")+"</span>",'<span class="selection-error-filename">'+s+"</span>",'<span class="selection-error-message">'+a+"</span>","</div>"].join(""))}e.prototype.toggleSelection.apply(this,arguments)},select:function(t,i){var a=acf.media.frame(),n=this.controller.state(),s=n.get("selection"),o=acf.maybe_get(this,"model.attributes.acf_errors");return a&&o?s.remove(t):e.prototype.select.apply(this,arguments)}})},customize_AttachmentFiltersAll:function(){wp.media.view.AttachmentFilters.All.prototype.refresh=function(){this.$el.html(_.chain(this.filters).map(function(e,t){return{el:$("<option></option>").val(t).html(e.text)[0],priority:e.priority||50}},this).sortBy("priority").pluck("el").value())}},customize_AttachmentCompat:function(){var e=wp.media.view.AttachmentCompat;wp.media.view.AttachmentCompat=e.extend({render:function(){var t=this;return this.ignore_render?this:(setTimeout(function(){var e=t.$el.closest(".media-modal");if(!e.find(".media-frame-router .acf-expand-details").exists()){var i=$(['<a href="#" class="acf-expand-details">','<span class="is-closed"><span class="acf-icon -left small grey"></span>'+acf._e("expand_details")+"</span>",'<span class="is-open"><span class="acf-icon -right small grey"></span>'+acf._e("collapse_details")+"</span>","</a>"].join(""));i.on("click",function(t){t.preventDefault(),e.hasClass("acf-expanded")?e.removeClass("acf-expanded"):e.addClass("acf-expanded")}),e.find(".media-frame-router").append(i)}},0),clearTimeout(acf.media.render_timout),acf.media.render_timout=setTimeout(function(){acf.do_action("append",t.$el)},50),e.prototype.render.apply(this,arguments))},dispose:function(){return acf.do_action("remove",this.$el),e.prototype.dispose.apply(this,arguments)},save:function(e){e&&e.preventDefault();var t=acf.serialize_form(this.$el);this.ignore_render=!0,this.model.saveCompat(t)}})}})}(jQuery),function($){acf.fields.oembed={search:function(e){var t=e.find('[data-name="search-input"]').val();"http"!=t.substr(0,4)&&(t="http://"+t,e.find('[data-name="search-input"]').val(t)),e.addClass("is-loading");var i={action:"acf/fields/oembed/search",nonce:acf.get("nonce"),s:t,width:acf.get_data(e,"width"),height:acf.get_data(e,"height")};e.data("xhr")&&e.data("xhr").abort();var a=$.ajax({url:acf.get("ajaxurl"),data:i,type:"post",dataType:"html",success:function(i){e.removeClass("is-loading"),acf.fields.oembed.search_success(e,t,i),i||acf.fields.oembed.search_error(e)}});e.data("xhr",a)},search_success:function(e,t,i){e.removeClass("has-error").addClass("has-value"),e.find('[data-name="value-input"]').val(t),e.find('[data-name="value-title"]').html(t),e.find('[data-name="value-embed"]').html(i)},search_error:function(e){e.removeClass("has-value").addClass("has-error")},clear:function(e){e.removeClass("has-error has-value"),e.find('[data-name="search-input"]').val(""),e.find('[data-name="value-input"]').val(""),e.find('[data-name="value-title"]').html(""),e.find('[data-name="value-embed"]').html("")},edit:function(e){e.addClass("is-editing");var t=e.find('[data-name="value-title"]').text();e.find('[data-name="search-input"]').val(t).focus()},blur:function(e){e.removeClass("is-editing");var t=e.find('[data-name="value-title"]').text(),i=e.find('[data-name="search-input"]').val(),a=e.find('[data-name="value-embed"]').html();return i?void(i!=t&&this.search(e)):void this.clear(e)}},$(document).on("click",'.acf-oembed [data-name="search-button"]',function(e){e.preventDefault(),acf.fields.oembed.search($(this).closest(".acf-oembed")),$(this).blur()}),$(document).on("click",'.acf-oembed [data-name="clear-button"]',function(e){e.preventDefault(),acf.fields.oembed.clear($(this).closest(".acf-oembed")),$(this).blur()}),$(document).on("click",'.acf-oembed [data-name="value-title"]',function(e){e.preventDefault(),acf.fields.oembed.edit($(this).closest(".acf-oembed"))}),$(document).on("keypress",'.acf-oembed [data-name="search-input"]',function(e){13==e.which&&e.preventDefault()}),$(document).on("keyup",'.acf-oembed [data-name="search-input"]',function(e){$(this).val()&&e.which&&acf.fields.oembed.search($(this).closest(".acf-oembed"))}),$(document).on("blur",'.acf-oembed [data-name="search-input"]',function(e){acf.fields.oembed.blur($(this).closest(".acf-oembed"))})}(jQuery),function($){acf.fields.radio=acf.field.extend({type:"radio",$ul:null,events:{'click input[type="radio"]':"click"},focus:function(){this.$ul=this.$field.find(".acf-radio-list"),this.o=acf.get_data(this.$ul)},click:function(e){var t=e.$el,i=t.parent("label"),a=i.hasClass("selected"),n=t.val();if(this.$ul.find(".selected").removeClass("selected"),i.addClass("selected"),this.o.allow_null&&a&&(e.$el.prop("checked",!1),i.removeClass("selected"),n=!1,e.$el.trigger("change")),this.o.other_choice){var s=this.$ul.find('input[type="text"]');"other"===n?s.prop("disabled",!1).attr("name",t.attr("name")):s.prop("disabled",!0).attr("name","")}}})}(jQuery),function($){acf.fields.relationship=acf.field.extend({type:"relationship",$el:null,$input:null,$filters:null,$choices:null,$values:null,actions:{ready:"initialize",append:"initialize"},events:{"keypress [data-filter]":"submit_filter","change [data-filter]":"change_filter","keyup [data-filter]":"change_filter","click .choices .acf-rel-item":"add_item",'click [data-name="remove_item"]':"remove_item"},focus:function(){this.$el=this.$field.find(".acf-relationship"),this.$input=this.$el.find(".acf-hidden input"),this.$choices=this.$el.find(".choices"),this.$values=this.$el.find(".values"),this.o=acf.get_data(this.$el)},initialize:function(){var e=this,t=this.$field,i=this.$el,a=this.$input;this.$values.children(".list").sortable({items:"li",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,update:function(){a.trigger("change")}}),this.$choices.children(".list").scrollTop(0).on("scroll",function(a){if(!i.hasClass("is-loading")&&!i.hasClass("is-empty")&&Math.ceil($(this).scrollTop())+$(this).innerHeight()>=$(this).get(0).scrollHeight){var n=i.data("paged")||1;i.data("paged",n+1),e.doFocus(t),e.fetch()}}),this.fetch()},maybe_fetch:function(){var e=this,t=this.$field;this.o.timeout&&clearTimeout(this.o.timeout);var i=setTimeout(function(){e.doFocus(t),e.fetch()},400);this.$el.data("timeout",i)},fetch:function(){var e=this,t=this.$field;this.$el.addClass("is-loading"),this.o.xhr&&(this.o.xhr.abort(),this.o.xhr=!1),this.o.action="acf/fields/relationship/query",this.o.field_key=t.data("key"),this.o.post_id=acf.get("post_id");var i=acf.prepare_for_ajax(this.o);1==i.paged&&this.$choices.children(".list").html(""),this.$choices.find("ul:last").append('<p><i class="acf-loading"></i> '+acf._e("relationship","loading")+"</p>");var a=$.ajax({url:acf.get("ajaxurl"),dataType:"json",type:"post",data:i,success:function(i){e.doFocus(t),e.render(i)}});this.$el.data("xhr",a)},render:function(e){if(this.$el.removeClass("is-loading is-empty"),this.$choices.find("p").remove(),!e||!e.length)return this.$el.addClass("is-empty"),void(1==this.o.paged&&this.$choices.children(".list").append("<p>"+acf._e("relationship","empty")+"</p>"));var t=$(this.walker(e));if(this.$values.find(".acf-rel-item").each(function(){t.find('.acf-rel-item[data-id="'+$(this).data("id")+'"]').addClass("disabled")}),this.o.s){var i=this.o.s;t.find(".acf-rel-item").each(function(){var e=$(this).text(),t=e.replace(new RegExp("("+i+")","gi"),"<b>$1</b>");$(this).html($(this).html().replace(e,t))})}this.$choices.children(".list").append(t);var a="",n=null;this.$choices.find(".acf-rel-label").each(function(){return $(this).text()==a?(n.append($(this).siblings("ul").html()),void $(this).parent().remove()):(a=$(this).text(),void(n=$(this).siblings("ul")))})},walker:function(e){var t="";if($.isArray(e))for(var i in e)t+=this.walker(e[i]);else $.isPlainObject(e)&&(void 0!==e.children?(t+='<li><span class="acf-rel-label">'+e.text+'</span><ul class="acf-bl">',t+=this.walker(e.children),t+="</ul></li>"):t+='<li><span class="acf-rel-item" data-id="'+e.id+'">'+e.text+"</span></li>");return t},submit_filter:function(e){13==e.which&&e.preventDefault()},change_filter:function(e){var t=e.$el.val(),i=e.$el.data("filter");this.$el.data(i)!=t&&(this.$el.data(i,t),this.$el.data("paged",1),e.$el.is("select")?this.fetch():this.maybe_fetch())},add_item:function(e){if(this.o.max>0&&this.$values.find(".acf-rel-item").length>=this.o.max)return void alert(acf._e("relationship","max").replace("{max}",this.o.max));if(e.$el.hasClass("disabled"))return!1;e.$el.addClass("disabled");var t=["<li>",'<input type="hidden" name="'+this.$input.attr("name")+'[]" value="'+e.$el.data("id")+'" />','<span data-id="'+e.$el.data("id")+'" class="acf-rel-item">'+e.$el.html(),'<a href="#" class="acf-icon -minus small dark" data-name="remove_item"></a>',"</span>","</li>"].join("");this.$values.children(".list").append(t),this.$input.trigger("change"),acf.validation.remove_error(this.$field)},remove_item:function(e){var t=e.$el.parent(),i=t.data("id");t.parent("li").remove(),this.$choices.find('.acf-rel-item[data-id="'+i+'"]').removeClass("disabled"),this.$input.trigger("change")}})}(jQuery),function($){acf.select2=acf.model.extend({version:0,actions:{"ready 1":"ready"},ready:function(){acf.maybe_get(window,"Select2")?(this.version=3,this.l10n_v3()):acf.maybe_get(window,"jQuery.fn.select2.amd")&&(this.version=4)},l10n_v3:function(){var e=acf.get("locale"),t=acf.get("rtl");if(l10n=acf._e("select"),l10n){var i={formatMatches:function(e){return 1===e?l10n.matches_1:l10n.matches_n.replace("%d",e)},formatNoMatches:function(){return l10n.matches_0},formatAjaxError:function(){return l10n.load_fail},formatInputTooShort:function(e,t){var i=t-e.length;return 1===i?l10n.input_too_short_1:l10n.input_too_short_n.replace("%d",i)},formatInputTooLong:function(e,t){var i=e.length-t;return 1===i?l10n.input_too_long_1:l10n.input_too_long_n.replace("%d",i)},formatSelectionTooBig:function(e){return 1===e?l10n.selection_too_long_1:l10n.selection_too_long_n.replace("%d",e)},formatLoadMore:function(){return l10n.load_more},formatSearching:function(){return l10n.searching}};$.fn.select2.locales=acf.maybe_get(window,"jQuery.fn.select2.locales",{}),$.fn.select2.locales[e]=i,$.extend($.fn.select2.defaults,i)}},init:function(e,t){return this.version?(t=$.extend({allow_null:!1,placeholder:"",multiple:!1,ajax:!1,ajax_action:"",pagination:!1},t),3==this.version?this.init_v3(e,t):4==this.version?this.init_v4(e,t):!1):void 0},get_data:function(e,t){var i=this;return t=t||[],e.children().each(function(){var e=$(this);e.is("optgroup")?t.push({text:e.attr("label"),children:i.get_data(e)}):t.push({id:e.attr("value"),text:e.text()})}),t},decode_data:function(e){return e?($.each(e,function(t,i){e[t].text=acf.decode(i.text),"undefined"!=typeof i.children&&(e[t].children=acf.select2.decode_data(i.children))}),e):[]},count_data:function(e){var t=0;return e?($.each(e,function(e,i){t++,"undefined"!=typeof i.children&&(t+=i.children.length)}),t):t},get_value:function(e){var t=[],i=e.find("option:selected");return i.exists()?(i=i.sort(function(e,t){return+e.getAttribute("data-i")-+t.getAttribute("data-i")}),i.each(function(){var e=$(this);t.push({id:e.attr("value"),text:e.text()})}),t):t},init_v3:function(e,t){var i=e.siblings("input");if(i.exists()){var a={width:"100%",containerCssClass:"-acf",allowClear:t.allow_null,placeholder:t.placeholder,multiple:t.multiple,separator:"||",data:[],escapeMarkup:function(e){return e}},n=this.get_value(e);if(t.multiple){var s=e.attr("name");a.formatSelection=function(e,t){return t.parent().append('<input type="hidden" class="select2-search-choice-hidden" name="'+s+'" value="'+e.id+'" />'),e.text}}else n=acf.maybe_get(n,0,"");t.allow_null&&e.find('option[value=""]').remove(),a.data=this.get_data(e),a.initSelection=function(e,t){t(n)},t.ajax&&(a.ajax={url:acf.get("ajaxurl"),dataType:"json",type:"post",cache:!1,data:function(e,i){var a=acf.prepare_for_ajax({action:t.ajax_action,field_key:t.key,post_id:acf.get("post_id"),s:e,paged:i});return a},results:function(e,t){return{results:acf.select2.decode_data(e)}}},t.pagination&&(a.ajax.results=function(e,t){return{results:acf.select2.decode_data(e),more:acf.select2.count_data(e)>=20}},i.on("select2-loaded",function(e){var t="",i=null;$("#select2-drop .select2-result-with-children").each(function(){var e=$(this).children(".select2-result-label"),a=$(this).children(".select2-result-sub");return e.text()==t?(i.append(a.children()),void $(this).remove()):(t=e.text(),void(i=a))})}))),a.dropdownCss={"z-index":"999999999"},a=acf.apply_filters("select2_args",a,e,t),i.select2(a);var o=i.select2("container");o.before(e),o.before(i),t.multiple&&o.find("ul.select2-choices").sortable({start:function(){i.select2("onSortStart")},stop:function(){i.select2("onSortEnd")}}),e.prop("disabled",!0).addClass("acf-disabled acf-hidden"),i.on("change",function(t){e.val(t.val)})}},init_v4:function(e,t){var i=e.siblings("input");if(i.exists()){var a={width:"100%",containerCssClass:"-acf",allowClear:t.allow_null,placeholder:t.placeholder,multiple:t.multiple,separator:"||",data:[],escapeMarkup:function(e){return e}},n=this.get_value(e);t.multiple||(n=acf.maybe_get(n,0,"")),t.allow_null&&e.find('option[value=""]').remove(),a.data=this.get_data(e),a.initSelection=function(e,t){t(n)},t.ajax?(a.ajax={url:acf.get("ajaxurl"),delay:250,dataType:"json",type:"post",cache:!1,data:function(e){var i=acf.prepare_for_ajax({action:t.ajax_action,field_key:t.key,post_id:acf.get("post_id"),s:e.term,paged:e.page});return i},processResults:function(e,t){return{results:acf.select2.decode_data(e)}}},t.pagination&&(a.ajax.processResults=function(e,t){return setTimeout(function(){var e=null,t=null;$('.select2-results__option[role="group"]').each(function(){var i=$(this).children("ul"),a=$(this).children("strong");return null!==t&&a.text()==t.text()?(e.append(i.children()),void $(this).remove()):(e=i,void(t=a))})},1),{results:acf.select2.decode_data(e),pagination:{more:acf.select2.count_data(e)>=20}}})):(e.removeData("ajax"),e.removeAttr("data-ajax")),a.dropdownCss={"z-index":"999999999"},a=acf.apply_filters("select2_args",a,e,t);var s=e.select2(a)}},destroy:function(e){e.siblings(".select2-container").remove(),e.siblings("input").show(),e.prop("disabled",!1).removeClass("acf-disabled acf-hidden")}}),acf.add_select2=function(e,t){acf.select2.init(e,t)},acf.remove_select2=function(e){acf.select2.destroy(e)},acf.fields.select=acf.field.extend({type:"select",pagination:!1,$select:null,actions:{ready:"render",append:"render",remove:"remove"},focus:function(){this.$select=this.$field.find("select"),this.$select.exists()&&(this.o=acf.get_data(this.$select),this.o=acf.parse_args(this.o,{pagination:this.pagination,ajax_action:"acf/fields/"+this.type+"/query",key:this.$field.data("key")}))},render:function(){return this.$select.exists()&&this.o.ui?void acf.select2.init(this.$select,this.o):!1},remove:function(){return this.$select.exists()&&this.o.ui?void acf.select2.destroy(this.$select):!1}}),acf.fields.user=acf.fields.select.extend({type:"user",pagination:!0}),acf.fields.post_object=acf.fields.select.extend({type:"post_object",pagination:!0}),acf.fields.page_link=acf.fields.select.extend({type:"page_link",pagination:!0})}(jQuery),function($){acf.fields.tab=acf.field.extend({type:"tab",$el:null,$wrap:null,actions:{prepare:"initialize",append:"initialize",hide:"hide",show:"show"},focus:function(){this.$el=this.$field.find(".acf-tab"),this.o=this.$el.data(),this.o.key=this.$field.data("key"),this.o.text=this.$el.text()},initialize:function(){this.$field.is("td")||e.add_tab(this.$field,this.o)},hide:function(e,t){if("conditional_logic"==t){var i=e.data("key"),a=e.prevAll(".acf-tab-wrap"),n=a.find('a[data-key="'+i+'"]'),s=n.parent();a.exists()&&(s.addClass("hidden-by-conditional-logic"),setTimeout(function(){e.nextUntil(".acf-field-tab",".acf-field").each(function(){$(this).hasClass("hidden-by-conditional-logic")||(acf.conditional_logic.hide_field($(this)),$(this).addClass("-hbcl-"+i))}),s.hasClass("active")&&a.find("li:not(.hidden-by-conditional-logic):first a").trigger("click")},0))}},show:function(e,t){if("conditional_logic"==t){var i=e.data("key"),a=e.prevAll(".acf-tab-wrap"),n=a.find('a[data-key="'+i+'"]'),s=n.parent();a.exists()&&(s.removeClass("hidden-by-conditional-logic"),setTimeout(function(){e.siblings(".acf-field.-hbcl-"+i).each(function(){acf.conditional_logic.show_field($(this)),$(this).removeClass("-hbcl-"+i)});var t=s.siblings(".active");t.exists()&&!t.hasClass("hidden-by-conditional-logic")||n.trigger("click")},0))}}});var e=acf.model.extend({actions:{"prepare 15":"render","append 15":"render","refresh 15":"render"},events:{"click .acf-tab-button":"_click"},render:function(e){$(".acf-tab-wrap",e).each(function(){var e=$(this),t=e.parent();if(e.find("li.active").exists()||e.find("li:not(.hidden-by-conditional-logic):first a").trigger("click"),t.hasClass("-sidebar")){var i=t.is("td")?"height":"min-height",a=e.position().top+e.children("ul").outerHeight(!0)-1;t.css(i,a)}})},add_group:function(e,t){var i=e.parent(),a="";return i.hasClass("acf-fields")&&"left"==t.placement?i.addClass("-sidebar"):t.placement="top",a=i.is("tbody")?'<tr class="acf-tab-wrap"><td colspan="2"><ul class="acf-hl acf-tab-group"></ul></td></tr>':'<div class="acf-tab-wrap -'+t.placement+'"><ul class="acf-hl acf-tab-group"></ul></div>',$group=$(a),e.before($group),$group},add_tab:function(e,t){var i=e.siblings(".acf-tab-wrap").last();i.exists()?t.endpoint&&(i=this.add_group(e,t)):i=this.add_group(e,t);var a=$('<li><a class="acf-tab-button" href="#" data-key="'+t.key+'">'+t.text+"</a></li>");""===t.text&&a.hide(),i.find("ul").append(a),e.hasClass("hidden-by-conditional-logic")&&a.addClass("hidden-by-conditional-logic")},_click:function(e){e.preventDefault();var t=this,i=e.$el,a=i.closest(".acf-tab-wrap"),n=i.data("key"),s="";i.parent().addClass("active").siblings().removeClass("active"),a.nextUntil(".acf-tab-wrap",".acf-field").each(function(){var e=$(this);return"tab"==e.data("type")&&(s=e.data("key"),e.hasClass("endpoint"))?!1:void(s===n?e.hasClass("hidden-by-tab")&&(e.removeClass("hidden-by-tab"),acf.do_action("show_field",$(this),"tab")):e.hasClass("hidden-by-tab")||(e.addClass("hidden-by-tab"),acf.do_action("hide_field",$(this),"tab")))}),acf.do_action("refresh",a.parent()),i.trigger("blur")}}),t=acf.model.extend({active:1,actions:{add_field_error:"add_field_error"},add_field_error:function(e){if(this.active&&e.hasClass("hidden-by-tab")){var t=this,i=e.prevAll(".acf-field-tab:first"),a=e.prevAll(".acf-tab-wrap:first");a.find('a[data-key="'+i.data("key")+'"]').trigger("click"),this.active=0,setTimeout(function(){t.active=1},1e3)}}})}(jQuery),function($){acf.fields.time_picker=acf.field.extend({type:"time_picker",$el:null,$input:null,$hidden:null,o:{},actions:{ready:"initialize",append:"initialize"},events:{'blur input[type="text"]':"blur"},focus:function(){this.$el=this.$field.find(".acf-time-picker"),this.$input=this.$el.find('input[type="text"]'),this.$hidden=this.$el.find('input[type="hidden"]'),this.o=acf.get_data(this.$el)},initialize:function(){var e={timeFormat:this.o.time_format,altField:this.$hidden,altFieldTimeOnly:!1,altTimeFormat:"HH:mm:ss",showButtonPanel:!0,controlType:"select",oneLine:!0};e=acf.apply_filters("time_picker_args",e,this.$field),this.$input.addClass("active").timepicker(e),$("body > #ui-datepicker-div").exists()&&$("body > #ui-datepicker-div").wrap('<div class="acf-ui-datepicker" />')},blur:function(){this.$input.val()||this.$hidden.val("")}})}(jQuery),function($){acf.fields.taxonomy=acf.field.extend({type:"taxonomy",$el:null,actions:{ready:"render",append:"render",remove:"remove"},events:{'click a[data-name="add"]':"add_term"},focus:function(){this.$el=this.$field.find(".acf-taxonomy-field"),this.o=acf.get_data(this.$el),this.o.key=this.$field.data("key")},render:function(){var e=this.$field.find("select");if(e.exists()){var t=acf.get_data(e);t=acf.parse_args(t,{pagination:!0,ajax_action:"acf/fields/taxonomy/query",key:this.o.key}),acf.select2.init(e,t)}},remove:function(){var e=this.$field.find("select");return e.exists()?void acf.select2.destroy(e):!1},add_term:function(e){var t=this;acf.open_popup({title:e.$el.attr("title")||e.$el.data("title"),loading:!0,height:220});var i=acf.prepare_for_ajax({action:"acf/fields/taxonomy/add_term",field_key:this.o.key});$.ajax({url:acf.get("ajaxurl"),data:i,type:"post",dataType:"html",success:function(e){t.add_term_confirm(e)}})},add_term_confirm:function(e){var t=this;acf.update_popup({content:e}),$('#acf-popup input[name="term_name"]').focus(),$("#acf-popup form").on("submit",function(e){e.preventDefault(),t.add_term_submit($(this))})},add_term_submit:function(e){var t=this,i=e.find(".acf-submit"),a=e.find('input[name="term_name"]'),n=e.find('select[name="term_parent"]');if(""===a.val())return a.focus(),!1;i.find("button").attr("disabled","disabled"),i.find(".acf-spinner").addClass("is-active");var s=acf.prepare_for_ajax({action:"acf/fields/taxonomy/add_term",field_key:this.o.key,term_name:a.val(),term_parent:n.exists()?n.val():0});$.ajax({url:acf.get("ajaxurl"),data:s,type:"post",dataType:"json",success:function(e){var n=acf.get_ajax_message(e);acf.is_ajax_success(e)&&(a.val(""),t.append_new_term(e.data)),n.text&&i.find("span").html(n.text)},complete:function(){i.find("button").removeAttr("disabled"),i.find(".acf-spinner").removeClass("is-active"),i.find("span").delay(1500).fadeOut(250,function(){$(this).html(""),$(this).show()}),a.focus()}})},append_new_term:function(e){var t={id:e.term_id,text:e.term_label};switch($('.acf-taxonomy-field[data-taxonomy="'+this.o.taxonomy+'"]').each(function(){var t=$(this).data("type");if("radio"==t||"checkbox"==t){var i=$(this).children('input[type="hidden"]'),a=$(this).find("ul:first"),n=i.attr("name");"checkbox"==t&&(n+="[]");var s=$(['<li data-id="'+e.term_id+'">',"<label>",'<input type="'+t+'" value="'+e.term_id+'" name="'+n+'" /> ',"<span>"+e.term_label+"</span>","</label>","</li>"].join(""));if(e.term_parent){var o=a.find('li[data-id="'+e.term_parent+'"]');a=o.children("ul"),a.exists()||(a=$('<ul class="children acf-bl"></ul>'),o.append(a))}a.append(s)}}),$("#acf-popup #term_parent").each(function(){var t=$('<option value="'+e.term_id+'">'+e.term_label+"</option>");e.term_parent?$(this).children('option[value="'+e.term_parent+'"]').after(t):$(this).append(t)}),this.o.type){case"select":this.$el.children("input").select2("data",t);break;case"multi_select":var i=this.$el.children("input"),a=i.select2("data")||[];a.push(t),i.select2("data",a);break;case"checkbox":case"radio":var n=this.$el.find(".categorychecklist-holder"),s=n.find('li[data-id="'+e.term_id+'"]'),o=n.get(0).scrollTop+(s.offset().top-n.offset().top);s.find("input").prop("checked",!0),n.animate({scrollTop:o},"250")}}})}(jQuery),function($){acf.fields.url=acf.field.extend({type:"url",$input:null,actions:{ready:"render",append:"render"},events:{'keyup input[type="url"]':"render"},focus:function(){this.$input=this.$field.find('input[type="url"]')},is_valid:function(){var e=this.$input.val();if(-1!==e.indexOf("://"));else if(0!==e.indexOf("//"))return!1;return!0},render:function(){this.is_valid()?this.$input.parent().addClass("valid"):this.$input.parent().removeClass("valid")}})}(jQuery),function($){acf.validation=acf.model.extend({actions:{ready:"ready",append:"ready"},filters:{validation_complete:"validation_complete"},events:{"click #save-post":"click_ignore",'click [type="submit"]':"click_publish","submit form":"submit_form","click .acf-error-message a":"click_message"},active:1,ignore:0,busy:0,valid:!0,errors:[],error_class:"acf-error",message_class:"acf-error-message",$trigger:null,ready:function(e){e.find(".acf-field input").filter('[type="number"], [type="email"], [type="url"]').on("invalid",function(e){e.preventDefault(),acf.validation.errors.push({input:$(this).attr("name"),message:e.target.validationMessage}),acf.validation.fetch($(this).closest("form"))})},validation_complete:function(e,t){if(!this.errors.length)return e;e.valid=0,e.errors=e.errors||[];var a=[];
-for(i in e.errors)a.push(e.errors[i].input);for(i in this.errors){var n=this.errors[i];$.inArray(n.input,a)===!1&&e.errors.push(n)}return this.errors=[],e},click_message:function(e){e.preventDefault(),acf.remove_el(e.$el.parent())},click_ignore:function(e){this.ignore=1,this.$trigger=e.$el},click_publish:function(e){this.$trigger=e.$el},submit_form:function(e){if(!this.active)return!0;if(this.ignore)return this.ignore=0,!0;if(!e.$el.find("#acf-form-data").exists())return!0;var t=e.$el.find("#wp-preview");return t.exists()&&t.val()?(this.toggle(e.$el,"unlock"),!0):(e.preventDefault(),void this.fetch(e.$el))},toggle:function(e,t){t=t||"unlock";var i=null,a=null,n=$("#submitdiv");n.exists()||(n=$("#submitpost")),n.exists()||(n=e.find("p.submit").last()),n.exists()||(n=e.find(".acf-form-submit")),n.exists()||(n=e),i=n.find('input[type="submit"], .button'),a=n.find(".spinner, .acf-spinner"),this.hide_spinner(a),"unlock"==t?this.enable_submit(i):"lock"==t&&(this.disable_submit(i),this.show_spinner(a.last()))},fetch:function(e){if(this.busy)return!1;var t=this,i=acf.serialize_form(e);i.action="acf/validate_save_post",this.busy=1,this.toggle(e,"lock"),$.ajax({url:acf.get("ajaxurl"),data:i,type:"post",dataType:"json",success:function(i){acf.is_ajax_success(i)&&t.fetch_success(e,i.data)},complete:function(){t.fetch_complete(e)}})},fetch_complete:function(e){if(this.busy=0,this.toggle(e,"unlock"),this.valid){this.ignore=1;var t=e.children(".acf-error-message");t.exists()&&(t.addClass("-success"),t.children("p").html(acf._e("validation_successful")),setTimeout(function(){acf.remove_el(t)},2e3)),e.find(".acf-postbox.acf-hidden").remove(),acf.do_action("submit",e),this.$trigger?this.$trigger.click():e.submit(),this.toggle(e,"lock")}},fetch_success:function(e,t){if(t=acf.apply_filters("validation_complete",t,e),!t||t.valid||!t.errors)return void(this.valid=!0);this.valid=!1,this.$trigger=null;var i=null,a=0,n=acf._e("validation_failed");if(t.errors&&t.errors.length>0){for(var s in t.errors){var o=t.errors[s];if(o.input){var r=e.find('[name="'+o.input+'"]').first();if(r.exists()||(r=e.find('[name^="'+o.input+'"]').first()),r.exists()){a++;var l=acf.get_field_wrap(r);this.add_error(l,o.message),null===i&&(i=l)}}else n+=". "+o.message}1==a?n+=". "+acf._e("validation_failed_1"):a>1&&(n+=". "+acf._e("validation_failed_2").replace("%d",a))}var c=e.children(".acf-error-message");c.exists()||(c=$('<div class="acf-error-message"><p></p><a href="#" class="acf-icon -cancel small"></a></div>'),e.prepend(c)),c.children("p").html(n),null===i&&(i=c),setTimeout(function(){$("html, body").animate({scrollTop:i.offset().top-$(window).height()/2},500)},1)},add_error:function(e,t){var i=this;e.addClass(this.error_class),void 0!==t&&(e.children(".acf-input").children("."+this.message_class).remove(),e.children(".acf-input").prepend('<div class="'+this.message_class+'"><p>'+t+"</p></div>"));var a=function(){i.remove_error(e),e.off("focus change","input, textarea, select",a)};e.on("focus change","input, textarea, select",a),acf.do_action("add_field_error",e)},remove_error:function(e){$message=e.children(".acf-input").children("."+this.message_class),e.removeClass(this.error_class),setTimeout(function(){acf.remove_el($message)},250),acf.do_action("remove_field_error",e)},add_warning:function(e,t){this.add_error(e,t),setTimeout(function(){acf.validation.remove_error(e)},1e3)},show_spinner:function(e){if(e.exists()){var t=acf.get("wp_version");parseFloat(t)>=4.2?e.addClass("is-active"):e.css("display","inline-block")}},hide_spinner:function(e){if(e.exists()){var t=acf.get("wp_version");parseFloat(t)>=4.2?e.removeClass("is-active"):e.css("display","none")}},disable_submit:function(e){e.exists()&&e.addClass("disabled button-disabled button-primary-disabled")},enable_submit:function(e){e.exists()&&e.removeClass("disabled button-disabled button-primary-disabled")}})}(jQuery),function($){acf.fields.wysiwyg=acf.field.extend({type:"wysiwyg",$el:null,$textarea:null,toolbars:{},actions:{load:"initialize",append:"initialize",remove:"disable",sortstart:"disable",sortstop:"enable"},focus:function(){this.$el=this.$field.find(".wp-editor-wrap").last(),this.$textarea=this.$el.find("textarea"),this.o=acf.get_data(this.$el),this.o.id=this.$textarea.attr("id")},initialize:function(){if("undefined"==typeof tinyMCEPreInit||"undefined"==typeof tinymce)return!1;var e=this.o.id,t=acf.get_uniqid("acf-editor-"),i=this.$el.outerHTML();i=acf.str_replace(e,t,i),this.$el.replaceWith(i),this.o.id=t;var a=this.get_mceInit(),n=this.get_qtInit();if(tinyMCEPreInit.mceInit[a.id]=a,tinyMCEPreInit.qtInit[n.id]=n,this.$el.hasClass("tmce-active"))try{tinymce.init(a)}catch(s){}try{var o=quicktags(n);this._buttonsInit(o)}catch(s){}},get_mceInit:function(){var e=this.$field,t=this.get_toolbar(this.o.toolbar),i=$.extend({},tinyMCEPreInit.mceInit.acf_content);if(i.selector="#"+this.o.id,i.id=this.o.id,i.elements=this.o.id,t)for(var a=tinymce.majorVersion<4?"theme_advanced_buttons":"toolbar",n=1;5>n;n++)i[a+n]=acf.isset(t,n)?t[n]:"";return tinymce.majorVersion<4?i.setup=function(t){t.onInit.add(function(t,i){$(t.getBody()).on("focus",function(){acf.validation.remove_error(e)}),$(t.getBody()).on("blur",function(){t.save(),e.find("textarea").trigger("change")})})}:i.setup=function(t){t.on("focus",function(t){acf.validation.remove_error(e)}),t.on("change",function(i){t.save(),e.find("textarea").trigger("change")})},i.wp_autoresize_on=!1,i=acf.apply_filters("wysiwyg_tinymce_settings",i,i.id)},get_qtInit:function(){var e=$.extend({},tinyMCEPreInit.qtInit.acf_content);return e.id=this.o.id,e=acf.apply_filters("wysiwyg_quicktags_settings",e,e.id)},disable:function(){try{var e=tinyMCE.get(this.o.id);e.save(),e.destroy()}catch(t){}},enable:function(){this.$el.hasClass("tmce-active")&&acf.isset(window,"switchEditors")&&switchEditors.go(this.o.id,"tmce")},get_toolbar:function(e){return"undefined"!=typeof this.toolbars[e]?this.toolbars[e]:!1},_buttonsInit:function(e){var t=",strong,em,link,block,del,ins,img,ul,ol,li,code,more,close,";canvas=e.canvas,name=e.name,settings=e.settings,html="",theButtons={},use="",settings.buttons&&(use=","+settings.buttons+",");for(i in edButtons)edButtons[i]&&(id=edButtons[i].id,use&&-1!==t.indexOf(","+id+",")&&-1===use.indexOf(","+id+",")||edButtons[i].instance&&edButtons[i].instance!==inst||(theButtons[id]=edButtons[i],edButtons[i].html&&(html+=edButtons[i].html(name+"_"))));use&&-1!==use.indexOf(",fullscreen,")&&(theButtons.fullscreen=new qt.FullscreenButton,html+=theButtons.fullscreen.html(name+"_")),"rtl"===document.getElementsByTagName("html")[0].dir&&(theButtons.textdirection=new qt.TextDirectionButton,html+=theButtons.textdirection.html(name+"_")),e.toolbar.innerHTML=html,e.theButtons=theButtons}}),$(document).ready(function(){$("#wp-acf_content-wrap").exists()&&$("#wp-acf_content-wrap").parent().appendTo("body")})}(jQuery);
+!function(e,t){"use strict";var i=function(){function e(){return u}function t(e,t,i,a){return"string"==typeof e&&"function"==typeof t&&(i=parseInt(i||10,10),l("actions",e,t,i,a)),f}function i(){var e=Array.prototype.slice.call(arguments),t=e.shift();return"string"==typeof t&&d("actions",t,e),f}function a(e,t){return"string"==typeof e&&r("actions",e,t),f}function n(e,t,i,a){return"string"==typeof e&&"function"==typeof t&&(i=parseInt(i||10,10),l("filters",e,t,i,a)),f}function s(){var e=Array.prototype.slice.call(arguments),t=e.shift();return"string"==typeof t?d("filters",t,e):f}function o(e,t){return"string"==typeof e&&r("filters",e,t),f}function r(e,t,i,a){if(u[e][t])if(i){var n=u[e][t],s;if(a)for(s=n.length;s--;){var o=n[s];o.callback===i&&o.context===a&&n.splice(s,1)}else for(s=n.length;s--;)n[s].callback===i&&n.splice(s,1)}else u[e][t]=[]}function l(e,t,i,a,n){var s={callback:i,priority:a,context:n},o=u[e][t];o?(o.push(s),o=c(o)):o=[s],u[e][t]=o}function c(e){for(var t,i,a,n=1,s=e.length;s>n;n++){for(t=e[n],i=n;(a=e[i-1])&&a.priority>t.priority;)e[i]=e[i-1],--i;e[i]=t}return e}function d(e,t,i){var a=u[e][t];if(!a)return"filters"===e?i[0]:!1;var n=0,s=a.length;if("filters"===e)for(;s>n;n++)i[0]=a[n].callback.apply(a[n].context,i);else for(;s>n;n++)a[n].callback.apply(a[n].context,i);return"filters"===e?i[0]:!0}var f={removeFilter:o,applyFilters:s,addFilter:n,removeAction:a,doAction:i,addAction:t,storage:e},u={actions:{},filters:{}};return f};e.wp=e.wp||{},e.wp.hooks=new i}(window);var acf;!function($){$.fn.exists=function(){return $(this).length>0},$.fn.outerHTML=function(){return $(this).get(0).outerHTML},acf={l10n:{},o:{},update:function(e,t){this.o[e]=t},get:function(e){return"undefined"!=typeof this.o[e]?this.o[e]:null},_e:function(e,t){t=t||!1;var i=this.l10n[e]||"";return t&&(i=i[t]||""),i},add_action:function(){for(var e=arguments[0].split(" "),t=e.length,i=0;t>i;i++)arguments[0]="acf/"+e[i],wp.hooks.addAction.apply(this,arguments);return this},remove_action:function(){return arguments[0]="acf/"+arguments[0],wp.hooks.removeAction.apply(this,arguments),this},do_action:function(){return arguments[0]="acf/"+arguments[0],wp.hooks.doAction.apply(this,arguments),this},add_filter:function(){return arguments[0]="acf/"+arguments[0],wp.hooks.addFilter.apply(this,arguments),this},remove_filter:function(){return arguments[0]="acf/"+arguments[0],wp.hooks.removeFilter.apply(this,arguments),this},apply_filters:function(){return arguments[0]="acf/"+arguments[0],wp.hooks.applyFilters.apply(this,arguments)},get_selector:function(e){e=e||"";var t=".acf-field";if($.isPlainObject(e))if($.isEmptyObject(e))e="";else for(k in e){e=e[k];break}return e&&(t+="-"+e,t=t.split("_").join("-"),t=t.split("field-field-").join("field-")),t},get_fields:function(e,t,i){e=e||"",t=t||!1,i=i||!1;var a=this.get_selector(e),n=$(a,t);return t!==!1&&t.each(function(){$(this).is(a)&&(n=n.add($(this)))}),i||(n=acf.apply_filters("get_fields",n)),n},get_field:function(e,t){e=e||"",t=t||!1;var i=this.get_fields(e,t,!0);return i.exists()?i.first():!1},get_closest_field:function(e,t){return t=t||"",e.closest(this.get_selector(t))},get_field_wrap:function(e){return e.closest(this.get_selector())},get_field_key:function(e){return e.data("key")},get_field_type:function(e){return e.data("type")},get_data:function(e,t){return"undefined"==typeof t?e.data():e.data(t)},get_uniqid:function(e,t){"undefined"==typeof e&&(e="");var i,a=function(e,t){return e=parseInt(e,10).toString(16),t<e.length?e.slice(e.length-t):t>e.length?Array(1+(t-e.length)).join("0")+e:e};return this.php_js||(this.php_js={}),this.php_js.uniqidSeed||(this.php_js.uniqidSeed=Math.floor(123456789*Math.random())),this.php_js.uniqidSeed++,i=e,i+=a(parseInt((new Date).getTime()/1e3,10),8),i+=a(this.php_js.uniqidSeed,5),t&&(i+=(10*Math.random()).toFixed(8).toString()),i},serialize_form:function(e){var t={},i={};return $selector=e.find("select, textarea, input"),$.each($selector.serializeArray(),function(e,a){"[]"===a.name.slice(-2)&&(a.name=a.name.replace("[]",""),"undefined"==typeof i[a.name]&&(i[a.name]=-1),i[a.name]++,a.name+="["+i[a.name]+"]"),t[a.name]=a.value}),t},serialize:function(e){return this.serialize_form(e)},remove_tr:function(e,t){var i=e.height(),a=e.children().length;e.addClass("acf-remove-element"),setTimeout(function(){e.removeClass("acf-remove-element"),e.html('<td style="padding:0; height:'+i+'px" colspan="'+a+'"></td>'),e.children("td").animate({height:0},250,function(){e.remove(),"function"==typeof t&&t()})},250)},remove_el:function(e,t,i){i=i||0,e.css({height:e.height(),width:e.width(),position:"absolute"}),e.wrap('<div class="acf-temp-wrap" style="height:'+e.outerHeight(!0)+'px"></div>'),e.animate({opacity:0},250),e.parent(".acf-temp-wrap").animate({height:i},250,function(){$(this).remove(),"function"==typeof t&&t()})},isset:function(){var e=arguments,t=e.length,a=null,n;if(0===t)throw new Error("Empty isset");for(a=e[0],i=1;i<t;i++){if(e[i]===n||a[e[i]]===n)return!1;a=a[e[i]]}return!0},maybe_get:function(e,t,i){"undefined"==typeof i&&(i=null),keys=String(t).split(".");for(var a in keys){var t=keys[a];if("undefined"==typeof e[t])return i;e=e[t]}return e},open_popup:function(e){if($popup=$("body > #acf-popup"),$popup.exists())return update_popup(e);var t=['<div id="acf-popup">','<div class="acf-popup-box acf-box">','<div class="title"><h3></h3><a href="#" class="acf-icon -cancel grey acf-close-popup"></a></div>','<div class="inner"></div>','<div class="loading"><i class="acf-loading"></i></div>',"</div>",'<div class="bg"></div>',"</div>"].join("");return $("body").append(t),$("#acf-popup").on("click",".bg, .acf-close-popup",function(e){e.preventDefault(),acf.close_popup()}),this.update_popup(e)},update_popup:function(e){return $popup=$("#acf-popup"),$popup.exists()?(e=$.extend({},{title:"",content:"",width:0,height:0,loading:!1},e),e.title&&$popup.find(".title h3").html(e.title),e.content&&($inner=$popup.find(".inner:first"),$inner.html(e.content),acf.do_action("append",$inner),$inner.attr("style","position: relative;"),e.height=$inner.outerHeight(),$inner.removeAttr("style")),e.width&&$popup.find(".acf-popup-box").css({width:e.width,"margin-left":0-e.width/2}),e.height&&(e.height+=44,$popup.find(".acf-popup-box").css({height:e.height,"margin-top":0-e.height/2})),e.loading?$popup.find(".loading").show():$popup.find(".loading").hide(),$popup):!1},close_popup:function(){$popup=$("#acf-popup"),$popup.exists()&&$popup.remove()},update_user_setting:function(e,t){$.ajax({url:acf.get("ajaxurl"),dataType:"html",type:"post",data:acf.prepare_for_ajax({action:"acf/update_user_setting",name:e,value:t})})},prepare_for_ajax:function(e){return e.nonce=acf.get("nonce"),e=acf.apply_filters("prepare_for_ajax",e)},is_ajax_success:function(e){return!(!e||!e.success)},get_ajax_message:function(e){var t={text:"",type:"error"};return e?(e.success&&(t.type="success"),e.data&&e.data.message&&(t.text=e.data.message),e.data&&e.data.error&&(t.text=e.data.error),t):t},is_in_view:function(e){var t=e.offset().top,i=t+e.height();if(t===i)return!1;var a=$(window).scrollTop(),n=a+$(window).height();return n>=i&&t>=a},val:function(e,t){var i=e.val();e.val(t),t!=i&&e.trigger("change")},str_replace:function(e,t,i){return i.split(e).join(t)},str_sanitize:function(e){var t="",a={"æ":"a","å":"a","á":"a","ä":"a","č":"c","ď":"d","è":"e","é":"e","ě":"e","ë":"e","í":"i","ĺ":"l","ľ":"l","ň":"n","ø":"o","ó":"o","ô":"o","ő":"o","ö":"o","ŕ":"r","š":"s","ť":"t","ú":"u","ů":"u","ű":"u","ü":"u","ý":"y","ř":"r","ž":"z"," ":"_","'":"","?":"","/":"","\\":"",".":"",",":"",">":"","<":"",'"':"","[":"","]":"","|":"","{":"","}":"","(":"",")":""};for(e=e.toLowerCase(),i=0;i<e.length;i++){var n=e.charAt(i);"undefined"!=typeof a[n]&&(n=a[n]),t+=n}return t},render_select:function(e,t){var i=e.val();e.html(""),t&&$.each(t,function(t,a){var n=e;a.group&&(n=e.find('optgroup[label="'+a.group+'"]'),n.exists()||(n=$('<optgroup label="'+a.group+'"></optgroup>'),e.append(n))),n.append('<option value="'+a.value+'">'+a.label+"</option>"),i==a.value&&e.prop("selectedIndex",t)})},duplicate:function(e,t){t=t||"data-id",find=e.attr(t),replace=acf.get_uniqid(),acf.do_action("before_duplicate",e);var i=e.clone();return i.removeClass("acf-clone"),acf.do_action("remove",i),"undefined"!=typeof find&&(i.attr(t,replace),i.find('[id*="'+find+'"]').each(function(){$(this).attr("id",$(this).attr("id").replace(find,replace))}),i.find('[name*="'+find+'"]').each(function(){$(this).attr("name",$(this).attr("name").replace(find,replace))}),i.find('label[for*="'+find+'"]').each(function(){$(this).attr("for",$(this).attr("for").replace(find,replace))})),i.find(".ui-sortable").removeClass("ui-sortable"),acf.do_action("after_duplicate",e,i),e.after(i),setTimeout(function(){acf.do_action("append",i)},1),i},decode:function(e){return $("<div/>").html(e).text()},parse_args:function(e,t){return $.extend({},t,e)},enqueue_script:function(e,t){var i=document.createElement("script");i.type="text/javascript",i.src=e,i.async=!0,i.readyState?i.onreadystatechange=function(){"loaded"!=i.readyState&&"complete"!=i.readyState||(i.onreadystatechange=null,t())}:i.onload=function(){t()},document.body.appendChild(i)}},acf.model={actions:{},filters:{},events:{},extend:function(e){var t=$.extend({},this,e);return $.each(t.actions,function(e,i){t._add_action(e,i)}),$.each(t.filters,function(e,i){t._add_filter(e,i)}),$.each(t.events,function(e,i){t._add_event(e,i)}),t},_add_action:function(e,t){var i=this,a=e.split(" "),e=a[0]||"",n=a[1]||10;acf.add_action(e,i[t],n,i)},_add_filter:function(e,t){var i=this,a=e.split(" "),e=a[0]||"",n=a[1]||10;acf.add_filter(e,i[t],n,i)},_add_event:function(e,t){var i=this,a=e.substr(0,e.indexOf(" ")),n=e.substr(e.indexOf(" ")+1);$(document).on(a,n,function(e){e.$el=$(this),"function"==typeof i.event&&(e=i.event(e)),i[t].apply(i,[e])})},get:function(e,t){return t=t||null,"undefined"!=typeof this[e]&&(t=this[e]),t},set:function(e,t){return this[e]=t,"function"==typeof this["_set_"+e]&&this["_set_"+e].apply(this),this}},acf.field=acf.model.extend({type:"",o:{},$field:null,_add_action:function(e,t){var i=this;e=e+"_field/type="+i.type,acf.add_action(e,function(e){i.set("$field",e),i[t].apply(i,arguments)})},_add_filter:function(e,t){var i=this;e=e+"_field/type="+i.type,acf.add_filter(e,function(e){i.set("$field",e),i[t].apply(i,arguments)})},_add_event:function(e,t){var i=this,a=e.substr(0,e.indexOf(" ")),n=e.substr(e.indexOf(" ")+1),s=acf.get_selector(i.type);$(document).on(a,s+" "+n,function(e){e.$el=$(this),e.$field=acf.get_closest_field(e.$el,i.type),i.set("$field",e.$field),i[t].apply(i,[e])})},_set_$field:function(){"function"==typeof this.focus&&this.focus()},doFocus:function(e){return this.set("$field",e)}}),acf.fields=acf.model.extend({actions:{prepare:"_prepare",prepare_field:"_prepare_field",ready:"_ready",ready_field:"_ready_field",append:"_append",append_field:"_append_field",load:"_load",load_field:"_load_field",remove:"_remove",remove_field:"_remove_field",sortstart:"_sortstart",sortstart_field:"_sortstart_field",sortstop:"_sortstop",sortstop_field:"_sortstop_field",show:"_show",show_field:"_show_field",hide:"_hide",hide_field:"_hide_field"},_prepare:function(e){acf.get_fields("",e).each(function(){acf.do_action("prepare_field",$(this))})},_prepare_field:function(e){acf.do_action("prepare_field/type="+e.data("type"),e)},_ready:function(e){acf.get_fields("",e).each(function(){acf.do_action("ready_field",$(this))})},_ready_field:function(e){acf.do_action("ready_field/type="+e.data("type"),e)},_append:function(e){acf.get_fields("",e).each(function(){acf.do_action("append_field",$(this))})},_append_field:function(e){acf.do_action("append_field/type="+e.data("type"),e)},_load:function(e){acf.get_fields("",e).each(function(){acf.do_action("load_field",$(this))})},_load_field:function(e){acf.do_action("load_field/type="+e.data("type"),e)},_remove:function(e){acf.get_fields("",e).each(function(){acf.do_action("remove_field",$(this))})},_remove_field:function(e){acf.do_action("remove_field/type="+e.data("type"),e)},_sortstart:function(e,t){acf.get_fields("",e).each(function(){acf.do_action("sortstart_field",$(this),t)})},_sortstart_field:function(e,t){acf.do_action("sortstart_field/type="+e.data("type"),e,t)},_sortstop:function(e,t){acf.get_fields("",e).each(function(){acf.do_action("sortstop_field",$(this),t)})},_sortstop_field:function(e,t){acf.do_action("sortstop_field/type="+e.data("type"),e,t)},_hide:function(e,t){acf.get_fields("",e).each(function(){acf.do_action("hide_field",$(this),t)})},_hide_field:function(e,t){acf.do_action("hide_field/type="+e.data("type"),e,t)},_show:function(e,t){acf.get_fields("",e).each(function(){acf.do_action("show_field",$(this),t)})},_show_field:function(e,t){acf.do_action("show_field/type="+e.data("type"),e,t)}}),$(document).ready(function(){acf.do_action("ready",$("body"))}),$(window).on("load",function(){acf.do_action("load",$("body"))}),acf.layout=acf.model.extend({active:0,actions:{refresh:"refresh"},refresh:function(e){e=e||!1,e&&e.is(".acf-fields")&&(e=e.parent()),$(".acf-fields:visible",e).each(function(){var e=$(),t=0,i=0,a=-1,n=$(this).children(".acf-field[data-width]:visible");n.exists()&&(n.removeClass("acf-r0 acf-c0").css({"min-height":0}),n.each(function(n){var s=$(this),o=s.position().top;0==n&&(t=o),o!=t&&(e.css({"min-height":i+1+"px"}),e=$(),t=s.position().top,i=0,a=-1),a++,i=s.outerHeight()>i?s.outerHeight():i,e=e.add(s),0==o?s.addClass("acf-r0"):0==a&&s.addClass("acf-c0")}),e.exists()&&e.css({"min-height":i+1+"px"}))})}}),$(document).on("change",".acf-field input, .acf-field textarea, .acf-field select",function(){$('#acf-form-data input[name="_acfchanged"]').exists()&&$('#acf-form-data input[name="_acfchanged"]').val(1),acf.do_action("change",$(this))}),$(document).on("click",'.acf-field a[href="#"]',function(e){e.preventDefault()}),acf.unload=acf.model.extend({active:1,changed:0,filters:{validation_complete:"validation_complete"},actions:{change:"on",submit:"off"},events:{"submit form":"off"},validation_complete:function(e,t){return e&&e.errors&&this.on(),e},on:function(){!this.changed&&this.active&&(this.changed=1,$(window).on("beforeunload",this.unload))},off:function(){this.changed=0,$(window).off("beforeunload",this.unload)},unload:function(){return acf._e("unload")}}),acf.tooltip=acf.model.extend({$el:null,events:{"mouseenter .acf-js-tooltip":"on","mouseleave .acf-js-tooltip":"off"},on:function(e){var t=e.$el.attr("title");if(t){this.$el=$('<div class="acf-tooltip">'+t+"</div>"),$("body").append(this.$el);var i=10;target_w=e.$el.outerWidth(),target_h=e.$el.outerHeight(),target_t=e.$el.offset().top,target_l=e.$el.offset().left,tooltip_w=this.$el.outerWidth(),tooltip_h=this.$el.outerHeight();var a=target_t-tooltip_h,n=target_l+target_w/2-tooltip_w/2;i>n?(this.$el.addClass("right"),n=target_l+target_w,a=target_t+target_h/2-tooltip_h/2):n+tooltip_w+i>$(window).width()?(this.$el.addClass("left"),n=target_l-tooltip_w,a=target_t+target_h/2-tooltip_h/2):a-$(window).scrollTop()<i?(this.$el.addClass("bottom"),a=target_t+target_h):this.$el.addClass("top"),this.$el.css({top:a,left:n}),e.$el.data("title",t),e.$el.attr("title","")}},off:function(e){this.$el&&(e.$el.attr("title",e.$el.data("title")),this.$el.remove())}}),acf.postbox=acf.model.extend({events:{"mouseenter .acf-postbox .handlediv":"on","mouseleave .acf-postbox .handlediv":"off"},on:function(e){e.$el.siblings(".hndle").addClass("hover")},off:function(e){e.$el.siblings(".hndle").removeClass("hover")},render:function(e){e=$.extend({},{id:"",key:"",style:"default",label:"top",edit_url:"",edit_title:"",visibility:!0},e);var t=$("#"+e.id),i=$("#"+e.id+"-hide"),a=i.parent();t.addClass("acf-postbox"),a.addClass("acf-postbox-toggle"),t.removeClass("hide-if-js"),a.removeClass("hide-if-js"),"default"!==e.style&&t.addClass(e.style),t.children(".inside").addClass("acf-fields").addClass("-"+e.label),e.visibility?i.prop("checked",!0):(t.addClass("acf-hidden"),a.addClass("acf-hidden")),e.edit_url&&t.children(".hndle").append('<a href="'+e.edit_url+'" class="dashicons dashicons-admin-generic acf-hndle-cog acf-js-tooltip" title="'+e.edit_title+'"></a>')}}),acf.add_action("sortstart",function(e,t){e.is("tr")&&(e.css("position","relative"),e.children().each(function(){$(this).width($(this).width())}),e.css("position","absolute"),t.html('<td style="height:'+e.height()+'px; padding:0;" colspan="'+e.children("td").length+'"></td>'))}),acf.add_action("before_duplicate",function(e){e.find("select option:selected").addClass("selected")}),acf.add_action("after_duplicate",function(e,t){t.find("select").each(function(){var e=$(this),t=[];e.find("option.selected").each(function(){t.push($(this).val())}),e.val(t)}),e.find("select option.selected").removeClass("selected"),t.find("select option.selected").removeClass("selected")})}(jQuery),function($){acf.ajax=acf.model.extend({actions:{ready:"ready"},events:{"change #page_template":"_change_template","change #parent_id":"_change_parent","change #post-formats-select input":"_change_format","change .categorychecklist input":"_change_term",'change .acf-taxonomy-field[data-save="1"] input':"_change_term",'change .acf-taxonomy-field[data-save="1"] select':"_change_term"},o:{},xhr:null,update:function(e,t){return this.o[e]=t,this},get:function(e){return this.o[e]||null},ready:function(){this.update("post_id",acf.get("post_id"))},fetch:function(){if(acf.get("ajax")){this.xhr&&this.xhr.abort();var e=this,t=this.o;t.action="acf/post/get_field_groups",t.exists=[],$(".acf-postbox").not(".acf-hidden").each(function(){t.exists.push($(this).attr("id").substr(4))}),this.xhr=$.ajax({url:acf.get("ajaxurl"),data:acf.prepare_for_ajax(t),type:"post",dataType:"json",success:function(t){acf.is_ajax_success(t)&&e.render(t.data)}})}},render:function(e){$(".acf-postbox").addClass("acf-hidden"),$(".acf-postbox-toggle").addClass("acf-hidden"),$("#acf-style").html(""),$.each(e,function(e,t){var i=$("#acf-"+t.key),a=$("#acf-"+t.key+"-hide"),n=a.parent();i.removeClass("acf-hidden hide-if-js").show(),n.removeClass("acf-hidden hide-if-js").show(),a.prop("checked",!0);var s=i.find(".acf-replace-with-fields");s.exists()&&(s.replaceWith(t.html),acf.do_action("append",i)),0===e&&$("#acf-style").html(t.style),i.find(".acf-hidden-by-postbox").prop("disabled",!1)}),$(".acf-postbox.acf-hidden").find("select, textarea, input").not(":disabled").each(function(){$(this).addClass("acf-hidden-by-postbox").prop("disabled",!0)})},sync_taxonomy_terms:function(){var e=[""];$(".categorychecklist, .acf-taxonomy-field").each(function(){var t=$(this),i=t.find('input[type="checkbox"]').not(":disabled"),a=t.find('input[type="radio"]').not(":disabled"),n=t.find("select").not(":disabled"),s=t.find('input[type="hidden"]').not(":disabled");t.is(".acf-taxonomy-field")&&"1"!=t.attr("data-save")||t.closest(".media-frame").exists()||(i.exists()?i.filter(":checked").each(function(){e.push($(this).val())}):a.exists()?a.filter(":checked").each(function(){e.push($(this).val())}):n.exists()?n.find("option:selected").each(function(){e.push($(this).val())}):s.exists()&&s.each(function(){$(this).val()&&e.push($(this).val())}))}),e=e.filter(function(e,t,i){return i.indexOf(e)==t}),this.update("post_taxonomy",e).fetch()},_change_template:function(e){var t=e.$el.val();this.update("page_template",t).fetch()},_change_parent:function(e){var t="parent",i=0;""!=e.$el.val()&&(t="child",i=e.$el.val()),this.update("page_type",t).update("page_parent",i).fetch()},_change_format:function(e){var t=e.$el.val();"0"==t&&(t="standard"),this.update("post_format",t).fetch()},_change_term:function(e){var t=this;e.$el.closest(".media-frame").exists()||setTimeout(function(){t.sync_taxonomy_terms()},1)}})}(jQuery),function($){acf.fields.checkbox=acf.field.extend({type:"checkbox",events:{"change input":"change"},change:function(e){var t=e.$el.closest("ul"),i=t.find("input[name]"),a=e.$el.is(":checked");if(e.$el.hasClass("acf-checkbox-toggle"))return void i.prop("checked",a);if(t.find(".acf-checkbox-toggle").exists()){var a=0==i.not(":checked").length;t.find(".acf-checkbox-toggle").prop("checked",a)}}})}(jQuery),function($){acf.fields.color_picker=acf.field.extend({type:"color_picker",$input:null,$hidden:null,actions:{ready:"initialize",append:"initialize"},focus:function(){this.$input=this.$field.find('input[type="text"]'),this.$hidden=this.$field.find('input[type="hidden"]')},initialize:function(){var e=this.$input,t=this.$hidden,i=function(){setTimeout(function(){acf.val(t,e.val())},1)},a={defaultColor:!1,palettes:!0,hide:!0,change:i,clear:i},a=acf.apply_filters("color_picker_args",a,this.$field);this.$input.wpColorPicker(a)}})}(jQuery),function($){acf.conditional_logic=acf.model.extend({actions:{"prepare 20":"render","append 20":"render"},events:{"change .acf-field input":"change","change .acf-field textarea":"change","change .acf-field select":"change"},items:{},triggers:{},add:function(e,t){for(var i in t){var a=t[i];for(var n in a){var s=a[n],o=s.field,r=this.triggers[o]||{};r[e]=e,this.triggers[o]=r}}this.items[e]=t},render:function(e){e=e||!1;var t=acf.get_fields("",e,!0);this.render_fields(t),acf.do_action("refresh",e)},change:function(e){var t=e.$el,i=acf.get_field_wrap(t),a=i.data("key");if("undefined"==typeof this.triggers[a])return!1;$parent=i.parent();for(var n in this.triggers[a]){var s=this.triggers[a][n],o=acf.get_fields(s,$parent,!0);this.render_fields(o)}acf.do_action("refresh",$parent)},render_fields:function(e){var t=this;e.each(function(){t.render_field($(this))})},render_field:function(e){var t=e.data("key");if("undefined"==typeof this.items[t])return!1;var i=!1,a=this.items[t];for(var n in a){var s=a[n],o=!0;for(var r in s){var l=s[r],c=this.get_trigger(e,l.field);if(!this.calculate(l,c,e)){o=!1;break}}if(o){i=!0;break}}i?this.show_field(e):this.hide_field(e)},show_field:function(e){e.removeClass("hidden-by-conditional-logic"),e.find(".acf-clhi").not(".hidden-by-conditional-logic .acf-clhi").removeClass("acf-clhi").prop("disabled",!1),acf.do_action("show_field",e,"conditional_logic")},hide_field:function(e){e.addClass("hidden-by-conditional-logic"),e.find("input, textarea, select").not(".acf-disabled").addClass("acf-clhi").prop("disabled",!0),acf.do_action("hide_field",e,"conditional_logic")},get_trigger:function(e,t){var i=acf.get_selector(t),a=e.siblings(i);if(!a.exists()){var n=acf.get_selector();e.parents(n).each(function(){return a=$(this).siblings(i),a.exists()?!1:void 0})}return a.exists()?a:!1},calculate:function(e,t,i){if(!t||!i)return!1;var a=!1,n=t.data("type");return"true_false"==n||"checkbox"==n||"radio"==n?a=this.calculate_checkbox(e,t):"select"==n&&(a=this.calculate_select(e,t)),"!="===e.operator&&(a=!a),a},calculate_checkbox:function(e,t){var i=t.find('input[value="'+e.value+'"]:checked').exists();return""!==e.value||t.find("input:checked").exists()||(i=!0),i},calculate_select:function(e,t){var i=t.find("select"),a=i.val();return a||$.isNumeric(a)||(a=""),$.isArray(a)||(a=[a]),match=$.inArray(e.value,a)>-1,match}})}(jQuery),function($){acf.datepicker=acf.model.extend({actions:{"ready 1":"ready"},ready:function(){var e=acf.get("locale"),t=acf.get("rtl");l10n=acf._e("date_picker"),l10n&&(l10n.isRTL=t,$.datepicker.regional[e]=l10n,$.datepicker.setDefaults(l10n))},init:function(e,t){t=t||{},e.datepicker(t),$("body > #ui-datepicker-div").exists()&&$("body > #ui-datepicker-div").wrap('<div class="acf-ui-datepicker" />')},destroy:function(e){}}),acf.fields.date_picker=acf.field.extend({type:"date_picker",$el:null,$input:null,$hidden:null,o:{},actions:{ready:"initialize",append:"initialize"},events:{'blur input[type="text"]':"blur"},focus:function(){this.$el=this.$field.find(".acf-date-picker"),this.$input=this.$el.find('input[type="text"]'),this.$hidden=this.$el.find('input[type="hidden"]'),this.o=acf.get_data(this.$el)},initialize:function(){var e={dateFormat:this.o.date_format,altField:this.$hidden,altFormat:"yymmdd",changeYear:!0,yearRange:"-100:+100",changeMonth:!0,showButtonPanel:!0,firstDay:this.o.first_day};e=acf.apply_filters("date_picker_args",e,this.$field),acf.datepicker.init(this.$input,e)},blur:function(){this.$input.val()||this.$hidden.val("")}})}(jQuery),function($){acf.datetimepicker=acf.model.extend({actions:{"ready 1":"ready"},filters:{date_time_picker_args:"customize_onClose",time_picker_args:"customize_onClose"},ready:function(){var e=acf.get("locale"),t=acf.get("rtl");l10n=acf._e("date_time_picker"),l10n&&(l10n.isRTL=t,$.timepicker.regional[e]=l10n,$.timepicker.setDefaults(l10n))},init:function(e,t){t=t||{},e.datetimepicker(t),$("body > #ui-datepicker-div").exists()&&$("body > #ui-datepicker-div").wrap('<div class="acf-ui-datepicker" />')},destroy:function(e){},customize_onClose:function(e){return e.closeText=acf._e("date_time_picker","selectText"),e.onClose=function(e,t){var i=t.dpDiv,a=i.find(".ui-datepicker-close");if(!e&&a.is(":hover")){if(e=acf.maybe_get(t,"settings.timepicker.formattedTime"),!e)return;acf.val(t.input,e)}},e}}),acf.fields.date_time_picker=acf.field.extend({type:"date_time_picker",$el:null,$input:null,$hidden:null,o:{},actions:{ready:"initialize",append:"initialize"},events:{'blur input[type="text"]':"blur"},focus:function(){this.$el=this.$field.find(".acf-date-time-picker"),this.$input=this.$el.find('input[type="text"]'),this.$hidden=this.$el.find('input[type="hidden"]'),this.o=acf.get_data(this.$el)},initialize:function(){var e={dateFormat:this.o.date_format,timeFormat:this.o.time_format,altField:this.$hidden,altFieldTimeOnly:!1,altFormat:"yy-mm-dd",altTimeFormat:"HH:mm:ss",changeYear:!0,yearRange:"-100:+100",changeMonth:!0,showButtonPanel:!0,firstDay:this.o.first_day,controlType:"select",oneLine:!0};e=acf.apply_filters("date_time_picker_args",e,this.$field),acf.datetimepicker.init(this.$input,e)},blur:function(){this.$input.val()||this.$hidden.val("")}})}(jQuery),function($){acf.fields.file=acf.field.extend({type:"file",$el:null,$input:null,actions:{ready:"initialize",append:"initialize"},events:{'click a[data-name="add"]':"add",'click a[data-name="edit"]':"edit",'click a[data-name="remove"]':"remove",'change input[type="file"]':"change"},focus:function(){this.$el=this.$field.find(".acf-file-uploader"),this.$input=this.$el.find('input[type="hidden"]'),this.o=acf.get_data(this.$el)},initialize:function(){"basic"==this.o.uploader&&this.$el.closest("form").attr("enctype","multipart/form-data")},prepare:function(e){if(e=e||{},e._valid)return e;var t={url:"",alt:"",title:"",filename:"",filesize:"",icon:"/wp-includes/images/media/default.png"};return e.id&&(t=e.attributes),t._valid=!0,t},render:function(e){e=this.prepare(e),this.$el.find("img").attr({src:e.icon,alt:e.alt,title:e.title}),this.$el.find('[data-name="title"]').text(e.title),this.$el.find('[data-name="filename"]').text(e.filename).attr("href",e.url),this.$el.find('[data-name="filesize"]').text(e.filesize);var t="";e.id&&(t=e.id),acf.val(this.$input,t),t?this.$el.addClass("has-value"):this.$el.removeClass("has-value")},add:function(){var e=this,t=this.$field,i=acf.get_closest_field(t,"repeater"),a=acf.media.popup({title:acf._e("file","select"),mode:"select",type:"",field:t.data("key"),multiple:i.exists(),library:this.o.library,mime_types:this.o.mime_types,select:function(a,n){if(n>0){var s=t.data("key"),o=t.closest(".acf-row");if(t=!1,o.nextAll(".acf-row:visible").each(function(){return(t=acf.get_field(s,$(this)))?t.find(".acf-file-uploader.has-value").exists()?void(t=!1):!1:void 0}),!t){if(o=acf.fields.repeater.doFocus(i).add(),!o)return!1;t=acf.get_field(s,o)}}e.set("$field",t).render(a)}})},edit:function(){var e=this,t=this.$field,i=this.$input.val();if(i)var a=acf.media.popup({title:acf._e("file","edit"),button:acf._e("file","update"),mode:"edit",attachment:i,select:function(i,a){e.set("$field",t).render(i)}})},remove:function(){var e={};this.render(e)},change:function(e){this.$input.val(e.$el.val())}})}(jQuery),function($){acf.fields.google_map=acf.field.extend({type:"google_map",url:"",$el:null,$search:null,timeout:null,status:"",geocoder:!1,map:!1,maps:{},$pending:$(),actions:{ready:"initialize",append:"initialize",show:"show"},events:{'click a[data-name="clear"]':"_clear",'click a[data-name="locate"]':"_locate",'click a[data-name="search"]':"_search","keydown .search":"_keydown","keyup .search":"_keyup","focus .search":"_focus","blur .search":"_blur","mousedown .acf-google-map":"_mousedown"},focus:function(){this.$el=this.$field.find(".acf-google-map"),this.$search=this.$el.find(".search"),this.o=acf.get_data(this.$el),this.maps[this.o.id]&&(this.map=this.maps[this.o.id])},is_ready:function(){var e=this;return"ready"==this.status?!0:"loading"==this.status?!1:acf.isset(window,"google","maps","places")?(this.status="ready",!0):(acf.isset(window,"google","maps")&&(this.status="ready"),this.url&&(this.status="loading",acf.enqueue_script(this.url,function(){e.status="ready",e.initialize_pending()})),"ready"==this.status)},initialize_pending:function(){var e=this;this.$pending.each(function(){e.set("$field",$(this)).initialize()}),this.$pending=$()},initialize:function(){if(!this.is_ready())return this.$pending=this.$pending.add(this.$field),!1;this.geocoder||(this.geocoder=new google.maps.Geocoder);var e=this,t=this.$field,i=this.$el,a=this.$search;a.val(this.$el.find(".input-address").val());var n=acf.apply_filters("google_map_args",{zoom:parseInt(this.o.zoom),center:new google.maps.LatLng(this.o.lat,this.o.lng),mapTypeId:google.maps.MapTypeId.ROADMAP},this.$field);if(this.map=new google.maps.Map(this.$el.find(".canvas")[0],n),acf.isset(window,"google","maps","places","Autocomplete")){var s=new google.maps.places.Autocomplete(this.$search[0]);s.bindTo("bounds",this.map),google.maps.event.addListener(s,"place_changed",function(t){var i=this.getPlace();e.search(i)}),this.map.autocomplete=s}var o=acf.apply_filters("google_map_marker_args",{draggable:!0,raiseOnDrag:!0,map:this.map},this.$field);this.map.marker=new google.maps.Marker(o),this.map.$el=i,this.map.$field=t;var r=i.find(".input-lat").val(),l=i.find(".input-lng").val();r&&l&&this.update(r,l).center(),google.maps.event.addListener(this.map.marker,"dragend",function(){var t=this.map.marker.getPosition(),i=t.lat(),a=t.lng();e.update(i,a).sync()}),google.maps.event.addListener(this.map,"click",function(t){var i=t.latLng.lat(),a=t.latLng.lng();e.update(i,a).sync()}),this.maps[this.o.id]=this.map},search:function(e){var t=this,i=this.$search.val();if(!i)return!1;this.$el.find(".input-address").val(i);var a=i.split(",");if(2==a.length){var n=a[0],s=a[1];if($.isNumeric(n)&&$.isNumeric(s))return n=parseFloat(n),s=parseFloat(s),void t.update(n,s).center()}if(e&&e.geometry){var n=e.geometry.location.lat(),s=e.geometry.location.lng();return void t.update(n,s).center()}this.$el.addClass("-loading"),t.geocoder.geocode({address:i},function(i,a){if(t.$el.removeClass("-loading"),a!=google.maps.GeocoderStatus.OK)return void console.log("Geocoder failed due to: "+a);if(!i[0])return void console.log("No results found");e=i[0];var n=e.geometry.location.lat(),s=e.geometry.location.lng();t.update(n,s).center()})},update:function(e,t){var i=new google.maps.LatLng(e,t);return acf.val(this.$el.find(".input-lat"),e),acf.val(this.$el.find(".input-lng"),t),this.map.marker.setPosition(i),this.map.marker.setVisible(!0),this.$el.addClass("-value"),this.$field.removeClass("error"),acf.do_action("google_map_change",i,this.map,this.$field),this.$search.blur(),this},center:function(){var e=this.map.marker.getPosition(),t=this.o.lat,i=this.o.lng;e&&(t=e.lat(),i=e.lng());var a=new google.maps.LatLng(t,i);this.map.setCenter(a)},sync:function(){var e=this,t=this.map.marker.getPosition(),i=new google.maps.LatLng(t.lat(),t.lng());return this.$el.addClass("-loading"),this.geocoder.geocode({latLng:i},function(t,i){if(e.$el.removeClass("-loading"),i!=google.maps.GeocoderStatus.OK)return void console.log("Geocoder failed due to: "+i);if(!t[0])return void console.log("No results found");
+var a=t[0];e.$search.val(a.formatted_address),acf.val(e.$el.find(".input-address"),a.formatted_address)}),this},refresh:function(){return this.is_ready()?(google.maps.event.trigger(this.map,"resize"),void this.center()):!1},show:function(){var e=this,t=this.$field;setTimeout(function(){e.set("$field",t).refresh()},10)},_clear:function(e){this.$el.removeClass("-value -loading -search"),this.$search.val(""),acf.val(this.$el.find(".input-address"),""),acf.val(this.$el.find(".input-lat"),""),acf.val(this.$el.find(".input-lng"),""),this.map.marker.setVisible(!1)},_locate:function(e){var t=this;return navigator.geolocation?(this.$el.addClass("-loading"),void navigator.geolocation.getCurrentPosition(function(e){t.$el.removeClass("-loading");var i=e.coords.latitude,a=e.coords.longitude;t.update(i,a).sync().center()})):(alert(acf._e("google_map","browser_support")),this)},_search:function(e){this.search()},_focus:function(e){this.$el.removeClass("-value"),this._keyup()},_blur:function(e){var t=this,i=this.$el.find(".input-address").val();i&&(this.timeout=setTimeout(function(){t.$el.addClass("-value"),t.$search.val(i)},100))},_keydown:function(e){13==e.which&&e.preventDefault()},_keyup:function(e){var t=this.$search.val();t?this.$el.addClass("-search"):this.$el.removeClass("-search")},_mousedown:function(e){var t=this;setTimeout(function(){clearTimeout(t.timeout)},1)}})}(jQuery),function($){acf.fields.image=acf.field.extend({type:"image",$el:null,$input:null,$img:null,actions:{ready:"initialize",append:"initialize"},events:{'click a[data-name="add"]':"add",'click a[data-name="edit"]':"edit",'click a[data-name="remove"]':"remove",'change input[type="file"]':"change"},focus:function(){this.$el=this.$field.find(".acf-image-uploader"),this.$input=this.$el.find('input[type="hidden"]'),this.$img=this.$el.find("img"),this.o=acf.get_data(this.$el)},initialize:function(){"basic"==this.o.uploader&&this.$el.closest("form").attr("enctype","multipart/form-data")},prepare:function(e){if(e=e||{},e._valid)return e;var t={url:"",alt:"",title:"",caption:"",description:"",width:0,height:0};return e.id&&(t=e.attributes,t.url=acf.maybe_get(t,"sizes."+this.o.preview_size+".url",t.url)),t._valid=!0,t},render:function(e){e=this.prepare(e),this.$img.attr({src:e.url,alt:e.alt,title:e.title});var t="";e.id&&(t=e.id),acf.val(this.$input,t),t?this.$el.addClass("has-value"):this.$el.removeClass("has-value")},add:function(){var e=this,t=this.$field,i=acf.get_closest_field(this.$field,"repeater"),a=acf.media.popup({title:acf._e("image","select"),mode:"select",type:"image",field:t.data("key"),multiple:i.exists(),library:this.o.library,mime_types:this.o.mime_types,select:function(a,n){if(n>0){var s=t.data("key"),o=t.closest(".acf-row");if(t=!1,o.nextAll(".acf-row:visible").each(function(){return(t=acf.get_field(s,$(this)))?t.find(".acf-image-uploader.has-value").exists()?void(t=!1):!1:void 0}),!t){if(o=acf.fields.repeater.doFocus(i).add(),!o)return!1;t=acf.get_field(s,o)}}e.set("$field",t).render(a)}})},edit:function(){var e=this,t=this.$field,i=this.$input.val();if(i)var a=acf.media.popup({title:acf._e("image","edit"),button:acf._e("image","update"),mode:"edit",attachment:i,select:function(i,a){e.set("$field",t).render(i)}})},remove:function(){var e={};this.render(e)},change:function(e){this.$input.val(e.$el.val())}})}(jQuery),function($){acf.media=acf.model.extend({frames:[],mime_types:{},actions:{ready:"ready"},frame:function(){var e=this.frames.length-1;return 0>e?!1:this.frames[e]},destroy:function(e){e.detach(),e.dispose(),e=null,this.frames.pop()},popup:function(e){var t=acf.get("post_id"),i=!1;$.isNumeric(t)||(t=0);var a=acf.parse_args(e,{mode:"select",title:"",button:"",type:"",field:"",mime_types:"",library:"all",multiple:!1,attachment:0,post_id:t,select:function(){}});a.id&&(a.attachment=a.id);var i=this.new_media_frame(a);return this.frames.push(i),setTimeout(function(){i.open()},1),i},_get_media_frame_settings:function(e,t){return"select"===t.mode?e=this._get_select_frame_settings(e,t):"edit"===t.mode&&(e=this._get_edit_frame_settings(e,t)),e},_get_select_frame_settings:function(e,t){return t.type&&(e.library.type=t.type),"uploadedTo"===t.library&&(e.library.uploadedTo=t.post_id),e._button=acf._e("media","select"),e},_get_edit_frame_settings:function(e,t){return e.library.post__in=[t.attachment],e._button=acf._e("media","update"),e},_add_media_frame_events:function(e,t){return e.on("open",function(){this.$el.closest(".media-modal").addClass("acf-media-modal -"+t.mode)},e),e.on("content:render:edit-image",function(){var e=this.state().get("image"),t=new wp.media.view.EditImage({model:e,controller:this}).render();this.content.set(t),t.loadEditor()},e),e.on("toolbar:create:select",function(t){t.view=new wp.media.view.Toolbar.Select({text:e.options._button,controller:this})},e),e.on("select",function(){var i=e.state(),a=i.get("image"),n=i.get("selection");if(a)return void t.select.apply(e,[a,0]);if(n){var s=0;return void n.each(function(i){t.select.apply(e,[i,s]),s++})}}),e.on("close",function(){setTimeout(function(){acf.media.destroy(e)},500)}),"select"===t.mode?e=this._add_select_frame_events(e,t):"edit"===t.mode&&(e=this._add_edit_frame_events(e,t)),e},_add_select_frame_events:function(e,t){var i=this;return acf.isset(_wpPluploadSettings,"defaults","multipart_params")&&(_wpPluploadSettings.defaults.multipart_params._acfuploader=t.field,e.on("open",function(){delete _wpPluploadSettings.defaults.multipart_params._acfuploader})),e.on("content:activate:browse",function(){try{var a=e.content.get().toolbar,n=a.get("filters"),s=a.get("search")}catch(o){return}if("image"==t.type&&(n.filters.all.text=acf._e("image","all"),delete n.filters.audio,delete n.filters.video,$.each(n.filters,function(e,t){null===t.props.type&&(t.props.type="image")})),t.mime_types){var r=t.mime_types.split(" ").join("").split(".").join("").split(",");$.each(r,function(e,t){$.each(i.mime_types,function(e,i){if(-1!==e.indexOf(t)){var a={text:t,props:{status:null,type:i,uploadedTo:null,orderby:"date",order:"DESC"},priority:20};n.filters[i]=a}})})}"uploadedTo"==t.library&&(delete n.filters.unattached,delete n.filters.uploaded,n.$el.parent().append('<span class="acf-uploadedTo">'+acf._e("image","uploadedTo")+"</span>"),$.each(n.filters,function(e,i){i.props.uploadedTo=t.post_id})),$.each(n.filters,function(e,i){i.props._acfuploader=t.field}),s.model.attributes._acfuploader=t.field,"function"==typeof n.refresh&&n.refresh()}),e},_add_edit_frame_events:function(e,t){return e.on("open",function(){this.$el.closest(".media-modal").addClass("acf-expanded"),"browse"!=this.content.mode()&&this.content.mode("browse");var e=this.state(),i=e.get("selection"),a=wp.media.attachment(t.attachment);i.add(a)},e),e},new_media_frame:function(e){var t={title:e.title,multiple:e.multiple,library:{},states:[]};t=this._get_media_frame_settings(t,e);var i=wp.media.query(t.library);acf.isset(i,"mirroring","args")&&(i.mirroring.args._acfuploader=e.field),t.states=[new wp.media.controller.Library({library:i,multiple:t.multiple,title:t.title,priority:20,filterable:"all",editable:!0,allowLocalEdits:!0})],acf.isset(wp,"media","controller","EditImage")&&t.states.push(new wp.media.controller.EditImage);var a=wp.media(t);return a.acf=e,a=this._add_media_frame_events(a,e)},ready:function(){var e=acf.get("wp_version"),t=acf.get("browser"),i=acf.get("post_id");acf.isset(window,"wp","media","view","settings","post")&&$.isNumeric(i)&&(wp.media.view.settings.post.id=i),t&&$("body").addClass("browser-"+t),e&&(e+="",major=e.substr(0,1),$("body").addClass("major-"+major)),acf.isset(window,"wp","media","view")&&(this.customize_Attachment(),this.customize_AttachmentFiltersAll(),this.customize_AttachmentCompat())},customize_Attachment:function(){var e=wp.media.view.Attachment.Library;wp.media.view.Attachment.Library=e.extend({render:function(){var t=acf.media.frame(),i=acf.maybe_get(this,"model.attributes.acf_errors");return t&&i&&this.$el.addClass("acf-disabled"),e.prototype.render.apply(this,arguments)},toggleSelection:function(t){var i=acf.media.frame(),a=acf.maybe_get(this,"model.attributes.acf_errors"),n=this.controller.$el.find(".media-frame-content .media-sidebar");if(n.children(".acf-selection-error").remove(),n.children().removeClass("acf-hidden"),i&&a){var s=acf.maybe_get(this,"model.attributes.filename","");n.children().addClass("acf-hidden"),n.prepend(['<div class="acf-selection-error">','<span class="selection-error-label">'+acf._e("restricted")+"</span>",'<span class="selection-error-filename">'+s+"</span>",'<span class="selection-error-message">'+a+"</span>","</div>"].join(""))}e.prototype.toggleSelection.apply(this,arguments)},select:function(t,i){var a=acf.media.frame(),n=this.controller.state(),s=n.get("selection"),o=acf.maybe_get(this,"model.attributes.acf_errors");return a&&o?s.remove(t):e.prototype.select.apply(this,arguments)}})},customize_AttachmentFiltersAll:function(){wp.media.view.AttachmentFilters.All.prototype.refresh=function(){this.$el.html(_.chain(this.filters).map(function(e,t){return{el:$("<option></option>").val(t).html(e.text)[0],priority:e.priority||50}},this).sortBy("priority").pluck("el").value())}},customize_AttachmentCompat:function(){var e=wp.media.view.AttachmentCompat;wp.media.view.AttachmentCompat=e.extend({render:function(){var t=this;return this.ignore_render?this:(setTimeout(function(){var e=t.$el.closest(".media-modal");if(!e.find(".media-frame-router .acf-expand-details").exists()){var i=$(['<a href="#" class="acf-expand-details">','<span class="is-closed"><span class="acf-icon -left small grey"></span>'+acf._e("expand_details")+"</span>",'<span class="is-open"><span class="acf-icon -right small grey"></span>'+acf._e("collapse_details")+"</span>","</a>"].join(""));i.on("click",function(t){t.preventDefault(),e.hasClass("acf-expanded")?e.removeClass("acf-expanded"):e.addClass("acf-expanded")}),e.find(".media-frame-router").append(i)}},0),clearTimeout(acf.media.render_timout),acf.media.render_timout=setTimeout(function(){acf.do_action("append",t.$el)},50),e.prototype.render.apply(this,arguments))},dispose:function(){return acf.do_action("remove",this.$el),e.prototype.dispose.apply(this,arguments)},save:function(e){e&&e.preventDefault();var t=acf.serialize_form(this.$el);this.ignore_render=!0,this.model.saveCompat(t)}})}})}(jQuery),function($){acf.fields.oembed={search:function(e){var t=e.find('[data-name="search-input"]').val();"http"!=t.substr(0,4)&&(t="http://"+t,e.find('[data-name="search-input"]').val(t)),e.addClass("is-loading");var i={action:"acf/fields/oembed/search",nonce:acf.get("nonce"),s:t,width:acf.get_data(e,"width"),height:acf.get_data(e,"height")};e.data("xhr")&&e.data("xhr").abort();var a=$.ajax({url:acf.get("ajaxurl"),data:i,type:"post",dataType:"html",success:function(i){e.removeClass("is-loading"),acf.fields.oembed.search_success(e,t,i),i||acf.fields.oembed.search_error(e)}});e.data("xhr",a)},search_success:function(e,t,i){e.removeClass("has-error").addClass("has-value"),e.find('[data-name="value-input"]').val(t),e.find('[data-name="value-title"]').html(t),e.find('[data-name="value-embed"]').html(i)},search_error:function(e){e.removeClass("has-value").addClass("has-error")},clear:function(e){e.removeClass("has-error has-value"),e.find('[data-name="search-input"]').val(""),e.find('[data-name="value-input"]').val(""),e.find('[data-name="value-title"]').html(""),e.find('[data-name="value-embed"]').html("")},edit:function(e){e.addClass("is-editing");var t=e.find('[data-name="value-title"]').text();e.find('[data-name="search-input"]').val(t).focus()},blur:function(e){e.removeClass("is-editing");var t=e.find('[data-name="value-title"]').text(),i=e.find('[data-name="search-input"]').val(),a=e.find('[data-name="value-embed"]').html();return i?void(i!=t&&this.search(e)):void this.clear(e)}},$(document).on("click",'.acf-oembed [data-name="search-button"]',function(e){e.preventDefault(),acf.fields.oembed.search($(this).closest(".acf-oembed")),$(this).blur()}),$(document).on("click",'.acf-oembed [data-name="clear-button"]',function(e){e.preventDefault(),acf.fields.oembed.clear($(this).closest(".acf-oembed")),$(this).blur()}),$(document).on("click",'.acf-oembed [data-name="value-title"]',function(e){e.preventDefault(),acf.fields.oembed.edit($(this).closest(".acf-oembed"))}),$(document).on("keypress",'.acf-oembed [data-name="search-input"]',function(e){13==e.which&&e.preventDefault()}),$(document).on("keyup",'.acf-oembed [data-name="search-input"]',function(e){$(this).val()&&e.which&&acf.fields.oembed.search($(this).closest(".acf-oembed"))}),$(document).on("blur",'.acf-oembed [data-name="search-input"]',function(e){acf.fields.oembed.blur($(this).closest(".acf-oembed"))})}(jQuery),function($){acf.fields.radio=acf.field.extend({type:"radio",$ul:null,actions:{ready:"initialize",append:"initialize"},events:{'click input[type="radio"]':"click"},focus:function(){this.$ul=this.$field.find(".acf-radio-list"),this.o=acf.get_data(this.$ul)},initialize:function(){this.$ul.find(".selected input").prop("checked",!0)},click:function(e){var t=e.$el,i=t.parent("label"),a=i.hasClass("selected"),n=t.val();if(this.$ul.find(".selected").removeClass("selected"),i.addClass("selected"),this.o.allow_null&&a&&(e.$el.prop("checked",!1),i.removeClass("selected"),n=!1,e.$el.trigger("change")),this.o.other_choice){var s=this.$ul.find('input[type="text"]');"other"===n?s.prop("disabled",!1).attr("name",t.attr("name")):s.prop("disabled",!0).attr("name","")}}})}(jQuery),function($){acf.fields.relationship=acf.field.extend({type:"relationship",$el:null,$input:null,$filters:null,$choices:null,$values:null,actions:{ready:"initialize",append:"initialize"},events:{"keypress [data-filter]":"submit_filter","change [data-filter]":"change_filter","keyup [data-filter]":"change_filter","click .choices .acf-rel-item":"add_item",'click [data-name="remove_item"]':"remove_item"},focus:function(){this.$el=this.$field.find(".acf-relationship"),this.$input=this.$el.find(".acf-hidden input"),this.$choices=this.$el.find(".choices"),this.$values=this.$el.find(".values"),this.o=acf.get_data(this.$el)},initialize:function(){var e=this,t=this.$field,i=this.$el,a=this.$input;this.$values.children(".list").sortable({items:"li",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,update:function(){a.trigger("change")}}),this.$choices.children(".list").scrollTop(0).on("scroll",function(a){if(!i.hasClass("is-loading")&&!i.hasClass("is-empty")&&Math.ceil($(this).scrollTop())+$(this).innerHeight()>=$(this).get(0).scrollHeight){var n=i.data("paged")||1;i.data("paged",n+1),e.set("$field",t).fetch()}}),this.fetch()},maybe_fetch:function(){var e=this,t=this.$field;this.o.timeout&&clearTimeout(this.o.timeout);var i=setTimeout(function(){e.doFocus(t),e.fetch()},300);this.$el.data("timeout",i)},fetch:function(){var e=this,t=this.$field;this.$el.addClass("is-loading"),this.o.xhr&&(this.o.xhr.abort(),this.o.xhr=!1),this.o.action="acf/fields/relationship/query",this.o.field_key=t.data("key"),this.o.post_id=acf.get("post_id");var i=acf.prepare_for_ajax(this.o);1==i.paged&&this.$choices.children(".list").html(""),this.$choices.find("ul:last").append('<p><i class="acf-loading"></i> '+acf._e("relationship","loading")+"</p>");var a=$.ajax({url:acf.get("ajaxurl"),dataType:"json",type:"post",data:i,success:function(i){e.set("$field",t).render(i)}});this.$el.data("xhr",a)},render:function(e){if(this.$el.removeClass("is-loading is-empty"),this.$choices.find("p").remove(),!e||!e.results||!e.results.length)return this.$el.addClass("is-empty"),void(1==this.o.paged&&this.$choices.children(".list").append("<p>"+acf._e("relationship","empty")+"</p>"));var t=$(this.walker(e.results));if(this.$values.find(".acf-rel-item").each(function(){t.find('.acf-rel-item[data-id="'+$(this).data("id")+'"]').addClass("disabled")}),this.o.s){var i=this.o.s;t.find(".acf-rel-item").each(function(){var e=$(this).text(),t=e.replace(new RegExp("("+i+")","gi"),"<b>$1</b>");$(this).html($(this).html().replace(e,t))})}this.$choices.children(".list").append(t);var a="",n=null;this.$choices.find(".acf-rel-label").each(function(){return $(this).text()==a?(n.append($(this).siblings("ul").html()),void $(this).parent().remove()):(a=$(this).text(),void(n=$(this).siblings("ul")))})},walker:function(e){var t="";if($.isArray(e))for(var i in e)t+=this.walker(e[i]);else $.isPlainObject(e)&&(void 0!==e.children?(t+='<li><span class="acf-rel-label">'+e.text+'</span><ul class="acf-bl">',t+=this.walker(e.children),t+="</ul></li>"):t+='<li><span class="acf-rel-item" data-id="'+e.id+'">'+e.text+"</span></li>");return t},submit_filter:function(e){13==e.which&&e.preventDefault()},change_filter:function(e){var t=e.$el.val(),i=e.$el.data("filter");this.$el.data(i)!=t&&(this.$el.data(i,t),this.$el.data("paged",1),e.$el.is("select")?this.fetch():this.maybe_fetch())},add_item:function(e){if(this.o.max>0&&this.$values.find(".acf-rel-item").length>=this.o.max)return void alert(acf._e("relationship","max").replace("{max}",this.o.max));if(e.$el.hasClass("disabled"))return!1;e.$el.addClass("disabled");var t=["<li>",'<input type="hidden" name="'+this.$input.attr("name")+'[]" value="'+e.$el.data("id")+'" />','<span data-id="'+e.$el.data("id")+'" class="acf-rel-item">'+e.$el.html(),'<a href="#" class="acf-icon -minus small dark" data-name="remove_item"></a>',"</span>","</li>"].join("");this.$values.children(".list").append(t),this.$input.trigger("change"),acf.validation.remove_error(this.$field)},remove_item:function(e){var t=e.$el.parent(),i=t.data("id");t.parent("li").remove(),this.$choices.find('.acf-rel-item[data-id="'+i+'"]').removeClass("disabled"),this.$input.trigger("change")}})}(jQuery),function($){acf.select2=acf.model.extend({version:0,actions:{"ready 1":"ready"},ready:function(){acf.maybe_get(window,"Select2")?(this.version=3,this.l10n_v3()):acf.maybe_get(window,"jQuery.fn.select2.amd")&&(this.version=4)},l10n_v3:function(){var e=acf.get("locale"),t=acf.get("rtl");if(l10n=acf._e("select"),l10n){var i={formatMatches:function(e){return 1===e?l10n.matches_1:l10n.matches_n.replace("%d",e)},formatNoMatches:function(){return l10n.matches_0},formatAjaxError:function(){return l10n.load_fail},formatInputTooShort:function(e,t){var i=t-e.length;return 1===i?l10n.input_too_short_1:l10n.input_too_short_n.replace("%d",i)},formatInputTooLong:function(e,t){var i=e.length-t;return 1===i?l10n.input_too_long_1:l10n.input_too_long_n.replace("%d",i)},formatSelectionTooBig:function(e){return 1===e?l10n.selection_too_long_1:l10n.selection_too_long_n.replace("%d",e)},formatLoadMore:function(){return l10n.load_more},formatSearching:function(){return l10n.searching}};$.fn.select2.locales=acf.maybe_get(window,"jQuery.fn.select2.locales",{}),$.fn.select2.locales[e]=i,$.extend($.fn.select2.defaults,i)}},init:function(e,t){return this.version?(t=$.extend({allow_null:!1,placeholder:"",multiple:!1,ajax:!1,ajax_action:""},t),3==this.version?this.init_v3(e,t):4==this.version?this.init_v4(e,t):!1):void 0},get_data:function(e,t){var i=this;return t=t||[],e.children().each(function(){var e=$(this);e.is("optgroup")?t.push({text:e.attr("label"),children:i.get_data(e)}):t.push({id:e.attr("value"),text:e.text()})}),t},decode_data:function(e){return e?($.each(e,function(t,i){e[t].text=acf.decode(i.text),"undefined"!=typeof i.children&&(e[t].children=acf.select2.decode_data(i.children))}),e):[]},count_data:function(e){var t=0;return e?($.each(e,function(e,i){t++,"undefined"!=typeof i.children&&(t+=i.children.length)}),t):t},get_ajax_data:function(e,t){var i=acf.prepare_for_ajax({action:e.ajax_action,field_key:e.key,post_id:acf.get("post_id"),s:t.term,paged:t.page});return i=acf.apply_filters("select2_ajax_data",i,e,t)},get_ajax_results:function(e,t){var i={results:[]};return e||(e=i),"undefined"==typeof e.results&&(i.results=e,e=i),e.results=this.decode_data(e.results),e=acf.apply_filters("select2_ajax_results",e,t)},get_value:function(e){var t=[],i=e.find("option:selected");return i.exists()?(i=i.sort(function(e,t){return+e.getAttribute("data-i")-+t.getAttribute("data-i")}),i.each(function(){var e=$(this);t.push({id:e.attr("value"),text:e.text()})}),t):t},init_v3:function(e,t){var i=e.siblings("input");if(i.exists()){var a={width:"100%",containerCssClass:"-acf",allowClear:t.allow_null,placeholder:t.placeholder,multiple:t.multiple,separator:"||",data:[],escapeMarkup:function(e){return e},formatResult:function(e,t,i,a){var n=$.fn.select2.defaults.formatResult(e,t,i,a);return e.description&&(n+=' <span class="select2-result-description">'+e.description+"</span>"),n}},n=this.get_value(e);if(t.multiple){var s=e.attr("name");a.formatSelection=function(e,t){return t.parent().append('<input type="hidden" class="select2-search-choice-hidden" name="'+s+'" value="'+e.id+'" />'),e.text}}else n=acf.maybe_get(n,0,"");t.allow_null&&e.find('option[value=""]').remove(),a.data=this.get_data(e),a.initSelection=function(e,t){t(n)},t.ajax&&(a.ajax={url:acf.get("ajaxurl"),dataType:"json",type:"post",cache:!1,quietMillis:250,data:function(e,i){var a={term:e,page:i};return acf.select2.get_ajax_data(t,a)},results:function(e,t){var i={page:t};return setTimeout(function(){acf.select2.merge_results_v3()},1),acf.select2.get_ajax_results(e,i)}}),a.dropdownCss={"z-index":"999999999"},a.acf=t,a=acf.apply_filters("select2_args",a,e,t),i.select2(a);var o=i.select2("container");o.before(e),o.before(i),t.multiple&&o.find("ul.select2-choices").sortable({start:function(){i.select2("onSortStart")},stop:function(){i.select2("onSortEnd")}}),e.prop("disabled",!0).addClass("acf-disabled acf-hidden"),i.on("change",function(t){t.added&&e.append('<option value="'+t.added.id+'">'+t.added.text+"</option>"),e.val(t.val)})}},merge_results_v3:function(){var e="",t=null;$("#select2-drop .select2-result-with-children").each(function(){var i=$(this).children(".select2-result-label"),a=$(this).children(".select2-result-sub");return i.text()==e?(t.append(a.children()),void $(this).remove()):(e=i.text(),void(t=a))})},init_v4:function(e,t){var i=e.siblings("input");if(i.exists()){var a={width:"100%",allowClear:t.allow_null,placeholder:t.placeholder,multiple:t.multiple,separator:"||",data:[],escapeMarkup:function(e){return e}},n=this.get_value(e);t.multiple||(n=acf.maybe_get(n,0,"")),t.allow_null&&e.find('option[value=""]').remove(),a.data=this.get_data(e),t.ajax?a.ajax={url:acf.get("ajaxurl"),delay:250,dataType:"json",type:"post",cache:!1,data:function(e){return acf.select2.get_ajax_data(t,e)},processResults:function(e,t){var i=acf.select2.get_ajax_results(e,t);return i.more&&(i.pagination={more:!0}),setTimeout(function(){acf.select2.merge_results_v4()},1),i}}:(e.removeData("ajax"),e.removeAttr("data-ajax")),a=acf.apply_filters("select2_args",a,e,t);var s=e.select2(a);s.addClass("-acf")}},merge_results_v4:function(){var e=null,t=null;$('.select2-results__option[role="group"]').each(function(){var i=$(this).children("ul"),a=$(this).children("strong");return null!==t&&a.text()==t.text()?(e.append(i.children()),void $(this).remove()):(e=i,void(t=a))})},destroy:function(e){e.siblings(".select2-container").remove(),e.siblings("input").show(),e.prop("disabled",!1).removeClass("acf-disabled acf-hidden")}}),acf.add_select2=function(e,t){acf.select2.init(e,t)},acf.remove_select2=function(e){acf.select2.destroy(e)},acf.fields.select=acf.field.extend({type:"select",$select:null,actions:{ready:"render",append:"render",remove:"remove"},focus:function(){this.$select=this.$field.find("select"),this.$select.exists()&&(this.o=acf.get_data(this.$select),this.o=acf.parse_args(this.o,{ajax_action:"acf/fields/"+this.type+"/query",key:this.$field.data("key")}))},render:function(){return this.$select.exists()&&this.o.ui?void acf.select2.init(this.$select,this.o):!1},remove:function(){return this.$select.exists()&&this.o.ui?void acf.select2.destroy(this.$select):!1}}),acf.fields.user=acf.fields.select.extend({type:"user"}),acf.fields.post_object=acf.fields.select.extend({type:"post_object"}),acf.fields.page_link=acf.fields.select.extend({type:"page_link"})}(jQuery),function($){acf.fields.tab=acf.field.extend({type:"tab",$el:null,$wrap:null,actions:{prepare:"initialize",append:"initialize",hide:"hide",show:"show"},focus:function(){this.$el=this.$field.find(".acf-tab"),this.o=this.$el.data(),this.o.key=this.$field.data("key"),this.o.text=this.$el.text()},initialize:function(){this.$field.is("td")||e.add_tab(this.$field,this.o)},hide:function(e,t){if("conditional_logic"==t){var i=e.data("key"),a=e.prevAll(".acf-tab-wrap"),n=a.find('a[data-key="'+i+'"]'),s=n.parent();a.exists()&&(s.addClass("hidden-by-conditional-logic"),setTimeout(function(){e.nextUntil(".acf-field-tab",".acf-field").each(function(){$(this).hasClass("hidden-by-conditional-logic")||(acf.conditional_logic.hide_field($(this)),$(this).addClass("-hbcl-"+i))}),s.hasClass("active")&&a.find("li:not(.hidden-by-conditional-logic):first a").trigger("click")},0))}},show:function(e,t){if("conditional_logic"==t){var i=e.data("key"),a=e.prevAll(".acf-tab-wrap"),n=a.find('a[data-key="'+i+'"]'),s=n.parent();a.exists()&&(s.removeClass("hidden-by-conditional-logic"),setTimeout(function(){e.siblings(".acf-field.-hbcl-"+i).each(function(){acf.conditional_logic.show_field($(this)),$(this).removeClass("-hbcl-"+i)});var t=s.siblings(".active");t.exists()&&!t.hasClass("hidden-by-conditional-logic")||n.trigger("click")},0))}}});var e=acf.model.extend({actions:{"prepare 15":"render","append 15":"render","refresh 15":"render"},events:{"click .acf-tab-button":"_click"},render:function(e){$(".acf-tab-wrap",e).each(function(){var e=$(this),t=e.parent();if(e.find("li.active").exists()||e.find("li:not(.hidden-by-conditional-logic):first a").trigger("click"),t.hasClass("-sidebar")){var i=t.is("td")?"height":"min-height",a=e.position().top+e.children("ul").outerHeight(!0)-1;t.css(i,a)}})},add_group:function(e,t){var i=e.parent(),a="";return i.hasClass("acf-fields")&&"left"==t.placement?i.addClass("-sidebar"):t.placement="top",a=i.is("tbody")?'<tr class="acf-tab-wrap"><td colspan="2"><ul class="acf-hl acf-tab-group"></ul></td></tr>':'<div class="acf-tab-wrap -'+t.placement+'"><ul class="acf-hl acf-tab-group"></ul></div>',$group=$(a),e.before($group),$group},add_tab:function(e,t){var i=e.siblings(".acf-tab-wrap").last();i.exists()?t.endpoint&&(i=this.add_group(e,t)):i=this.add_group(e,t);var a=$('<li><a class="acf-tab-button" href="#" data-key="'+t.key+'">'+t.text+"</a></li>");""===t.text&&a.hide(),i.find("ul").append(a),e.hasClass("hidden-by-conditional-logic")&&a.addClass("hidden-by-conditional-logic")},_click:function(e){e.preventDefault();var t=this,i=e.$el,a=i.closest(".acf-tab-wrap"),n=i.data("key"),s="";i.parent().addClass("active").siblings().removeClass("active"),a.nextUntil(".acf-tab-wrap",".acf-field").each(function(){var e=$(this);return"tab"==e.data("type")&&(s=e.data("key"),e.hasClass("endpoint"))?!1:void(s===n?e.hasClass("hidden-by-tab")&&(e.removeClass("hidden-by-tab"),acf.do_action("show_field",$(this),"tab")):e.hasClass("hidden-by-tab")||(e.addClass("hidden-by-tab"),acf.do_action("hide_field",$(this),"tab")))}),acf.do_action("refresh",a.parent()),i.trigger("blur")}}),t=acf.model.extend({active:1,actions:{add_field_error:"add_field_error"},add_field_error:function(e){if(this.active&&e.hasClass("hidden-by-tab")){var t=this,i=e.prevAll(".acf-field-tab:first"),a=e.prevAll(".acf-tab-wrap:first");a.find('a[data-key="'+i.data("key")+'"]').trigger("click"),this.active=0,setTimeout(function(){t.active=1},1e3)}}})}(jQuery),function($){acf.fields.time_picker=acf.field.extend({type:"time_picker",$el:null,$input:null,$hidden:null,o:{},actions:{ready:"initialize",append:"initialize"},events:{'blur input[type="text"]':"blur"},focus:function(){this.$el=this.$field.find(".acf-time-picker"),this.$input=this.$el.find('input[type="text"]'),this.$hidden=this.$el.find('input[type="hidden"]'),this.o=acf.get_data(this.$el)},initialize:function(){var e={timeFormat:this.o.time_format,altField:this.$hidden,altFieldTimeOnly:!1,altTimeFormat:"HH:mm:ss",showButtonPanel:!0,controlType:"select",oneLine:!0};e=acf.apply_filters("time_picker_args",e,this.$field),this.$input.addClass("active").timepicker(e),$("body > #ui-datepicker-div").exists()&&$("body > #ui-datepicker-div").wrap('<div class="acf-ui-datepicker" />')},blur:function(){this.$input.val()||this.$hidden.val("")}})}(jQuery),function($){acf.fields.taxonomy=acf.field.extend({type:"taxonomy",$el:null,actions:{ready:"render",append:"render",remove:"remove"},events:{'click a[data-name="add"]':"add_term"},focus:function(){this.$el=this.$field.find(".acf-taxonomy-field"),this.o=acf.get_data(this.$el),this.o.key=this.$field.data("key")},render:function(){var e=this.$field.find("select");if(e.exists()){var t=acf.get_data(e);t=acf.parse_args(t,{pagination:!0,ajax_action:"acf/fields/taxonomy/query",key:this.o.key}),acf.select2.init(e,t)}},remove:function(){var e=this.$field.find("select");return e.exists()?void acf.select2.destroy(e):!1},add_term:function(e){var t=this;acf.open_popup({title:e.$el.attr("title")||e.$el.data("title"),loading:!0,height:220});var i=acf.prepare_for_ajax({action:"acf/fields/taxonomy/add_term",field_key:this.o.key});$.ajax({url:acf.get("ajaxurl"),data:i,type:"post",dataType:"html",success:function(e){t.add_term_confirm(e)}})},add_term_confirm:function(e){var t=this;acf.update_popup({content:e}),$('#acf-popup input[name="term_name"]').focus(),$("#acf-popup form").on("submit",function(e){e.preventDefault(),t.add_term_submit($(this))})},add_term_submit:function(e){var t=this,i=e.find(".acf-submit"),a=e.find('input[name="term_name"]'),n=e.find('select[name="term_parent"]');if(""===a.val())return a.focus(),!1;i.find("button").attr("disabled","disabled"),i.find(".acf-spinner").addClass("is-active");var s=acf.prepare_for_ajax({action:"acf/fields/taxonomy/add_term",field_key:this.o.key,term_name:a.val(),term_parent:n.exists()?n.val():0});$.ajax({url:acf.get("ajaxurl"),data:s,type:"post",dataType:"json",success:function(e){var n=acf.get_ajax_message(e);acf.is_ajax_success(e)&&(a.val(""),t.append_new_term(e.data)),n.text&&i.find("span").html(n.text)},complete:function(){i.find("button").removeAttr("disabled"),i.find(".acf-spinner").removeClass("is-active"),i.find("span").delay(1500).fadeOut(250,function(){$(this).html(""),$(this).show()}),a.focus()}})},append_new_term:function(e){var t={id:e.term_id,text:e.term_label};switch($('.acf-taxonomy-field[data-taxonomy="'+this.o.taxonomy+'"]').each(function(){var t=$(this).data("type");if("radio"==t||"checkbox"==t){var i=$(this).children('input[type="hidden"]'),a=$(this).find("ul:first"),n=i.attr("name");"checkbox"==t&&(n+="[]");var s=$(['<li data-id="'+e.term_id+'">',"<label>",'<input type="'+t+'" value="'+e.term_id+'" name="'+n+'" /> ',"<span>"+e.term_label+"</span>","</label>","</li>"].join(""));if(e.term_parent){var o=a.find('li[data-id="'+e.term_parent+'"]');a=o.children("ul"),a.exists()||(a=$('<ul class="children acf-bl"></ul>'),o.append(a))}a.append(s)}}),$("#acf-popup #term_parent").each(function(){var t=$('<option value="'+e.term_id+'">'+e.term_label+"</option>");e.term_parent?$(this).children('option[value="'+e.term_parent+'"]').after(t):$(this).append(t)}),this.o.type){case"select":this.$el.children("input").select2("data",t);break;case"multi_select":var i=this.$el.children("input"),a=i.select2("data")||[];a.push(t),i.select2("data",a);break;case"checkbox":case"radio":var n=this.$el.find(".categorychecklist-holder"),s=n.find('li[data-id="'+e.term_id+'"]'),o=n.get(0).scrollTop+(s.offset().top-n.offset().top);s.find("input").prop("checked",!0),n.animate({scrollTop:o},"250")}}})}(jQuery),function($){acf.fields.url=acf.field.extend({type:"url",$input:null,actions:{ready:"render",append:"render"},events:{'keyup input[type="url"]':"render"},focus:function(){this.$input=this.$field.find('input[type="url"]')},is_valid:function(){var e=this.$input.val();if(-1!==e.indexOf("://"));else if(0!==e.indexOf("//"))return!1;
+return!0},render:function(){this.is_valid()?this.$input.parent().addClass("valid"):this.$input.parent().removeClass("valid")}})}(jQuery),function($){acf.validation=acf.model.extend({actions:{ready:"ready",append:"ready"},filters:{validation_complete:"validation_complete"},events:{"click #save-post":"click_ignore",'click [type="submit"]':"click_publish","submit form":"submit_form","click .acf-error-message a":"click_message"},active:1,ignore:0,busy:0,valid:!0,errors:[],error_class:"acf-error",message_class:"acf-error-message",$trigger:null,ready:function(e){e.find(".acf-field input").filter('[type="number"], [type="email"], [type="url"]').on("invalid",function(e){e.preventDefault(),acf.validation.errors.push({input:$(this).attr("name"),message:e.target.validationMessage}),acf.validation.fetch($(this).closest("form"))})},validation_complete:function(e,t){if(!this.errors.length)return e;e.valid=0,e.errors=e.errors||[];var a=[];if(e.errors.length)for(i in e.errors)a.push(e.errors[i].input);if(this.errors.length)for(i in this.errors){var n=this.errors[i];-1===$.inArray(n.input,a)&&e.errors.push(n)}return this.errors=[],e},click_message:function(e){e.preventDefault(),acf.remove_el(e.$el.parent())},click_ignore:function(e){this.ignore=1,this.$trigger=e.$el},click_publish:function(e){this.$trigger=e.$el},submit_form:function(e){if(!this.active)return!0;if(this.ignore)return this.ignore=0,!0;if(!e.$el.find("#acf-form-data").exists())return!0;var t=e.$el.find("#wp-preview");return t.exists()&&t.val()?(this.toggle(e.$el,"unlock"),!0):(e.preventDefault(),void this.fetch(e.$el))},toggle:function(e,t){t=t||"unlock";var i=null,a=null,n=$("#submitdiv");n.exists()||(n=$("#submitpost")),n.exists()||(n=e.find("p.submit").last()),n.exists()||(n=e.find(".acf-form-submit")),n.exists()||(n=e),i=n.find('input[type="submit"], .button'),a=n.find(".spinner, .acf-spinner"),this.hide_spinner(a),"unlock"==t?this.enable_submit(i):"lock"==t&&(this.disable_submit(i),this.show_spinner(a.last()))},fetch:function(e){if(this.busy)return!1;var t=this,i=acf.serialize_form(e);i.action="acf/validate_save_post",this.busy=1,this.toggle(e,"lock"),$.ajax({url:acf.get("ajaxurl"),data:i,type:"post",dataType:"json",success:function(i){acf.is_ajax_success(i)&&t.fetch_success(e,i.data)},complete:function(){t.fetch_complete(e)}})},fetch_complete:function(e){if(this.busy=0,this.toggle(e,"unlock"),this.valid){this.ignore=1;var t=e.children(".acf-error-message");t.exists()&&(t.addClass("-success"),t.children("p").html(acf._e("validation_successful")),setTimeout(function(){acf.remove_el(t)},2e3)),e.find(".acf-postbox.acf-hidden").remove(),acf.do_action("submit",e),this.$trigger?this.$trigger.click():e.submit(),this.toggle(e,"lock")}},fetch_success:function(e,t){if(t=acf.apply_filters("validation_complete",t,e),!t||t.valid||!t.errors)return void(this.valid=!0);this.valid=!1,this.$trigger=null;var i=null,a=0,n=acf._e("validation_failed");if(t.errors&&t.errors.length>0){for(var s in t.errors){var o=t.errors[s];if(o.input){var r=e.find('[name="'+o.input+'"]').first();if(r.exists()||(r=e.find('[name^="'+o.input+'"]').first()),r.exists()){a++;var l=acf.get_field_wrap(r);this.add_error(l,o.message),null===i&&(i=l)}}else n+=". "+o.message}1==a?n+=". "+acf._e("validation_failed_1"):a>1&&(n+=". "+acf._e("validation_failed_2").replace("%d",a))}var c=e.children(".acf-error-message");c.exists()||(c=$('<div class="acf-error-message"><p></p><a href="#" class="acf-icon -cancel small"></a></div>'),e.prepend(c)),c.children("p").html(n),null===i&&(i=c),setTimeout(function(){$("html, body").animate({scrollTop:i.offset().top-$(window).height()/2},500)},1)},add_error:function(e,t){var i=this;e.addClass(this.error_class),void 0!==t&&(e.children(".acf-input").children("."+this.message_class).remove(),e.children(".acf-input").prepend('<div class="'+this.message_class+'"><p>'+t+"</p></div>"));var a=function(){i.remove_error(e),e.off("focus change","input, textarea, select",a)};e.on("focus change","input, textarea, select",a),acf.do_action("add_field_error",e)},remove_error:function(e){$message=e.children(".acf-input").children("."+this.message_class),e.removeClass(this.error_class),setTimeout(function(){acf.remove_el($message)},250),acf.do_action("remove_field_error",e)},add_warning:function(e,t){this.add_error(e,t),setTimeout(function(){acf.validation.remove_error(e)},1e3)},show_spinner:function(e){if(e.exists()){var t=acf.get("wp_version");parseFloat(t)>=4.2?e.addClass("is-active"):e.css("display","inline-block")}},hide_spinner:function(e){if(e.exists()){var t=acf.get("wp_version");parseFloat(t)>=4.2?e.removeClass("is-active"):e.css("display","none")}},disable_submit:function(e){e.exists()&&e.addClass("disabled button-disabled button-primary-disabled")},enable_submit:function(e){e.exists()&&e.removeClass("disabled button-disabled button-primary-disabled")}})}(jQuery),function($){acf.fields.wysiwyg=acf.field.extend({type:"wysiwyg",$el:null,$textarea:null,toolbars:{},actions:{load:"initialize",append:"initialize",remove:"disable",sortstart:"disable",sortstop:"enable"},focus:function(){this.$el=this.$field.find(".wp-editor-wrap").last(),this.$textarea=this.$el.find("textarea"),this.o=acf.get_data(this.$el),this.o.id=this.$textarea.attr("id")},initialize:function(){if("undefined"!=typeof tinyMCEPreInit){var e=this.o.id,t=acf.get_uniqid("acf-editor-"),i=this.$el.outerHTML();i=acf.str_replace(e,t,i),this.$el.replaceWith(i),this.o.id=t,this.initialize_tinymce(),this.initialize_quicktags()}},initialize_tinymce:function(){if("undefined"!=typeof tinymce){var e=this.get_mceInit();if(tinyMCEPreInit.mceInit[e.id]=e,this.$el.hasClass("tmce-active"))try{tinymce.init(e)}catch(t){}}},initialize_quicktags:function(){if("undefined"!=typeof quicktags){var e=this.get_qtInit();tinyMCEPreInit.qtInit[e.id]=e;try{var t=quicktags(e);this._buttonsInit(t)}catch(i){}}},get_mceInit:function(){var e=this.$field,t=this.get_toolbar(this.o.toolbar),i=$.extend({},tinyMCEPreInit.mceInit.acf_content);if(i.selector="#"+this.o.id,i.id=this.o.id,i.elements=this.o.id,t)for(var a=tinymce.majorVersion<4?"theme_advanced_buttons":"toolbar",n=1;5>n;n++)i[a+n]=acf.isset(t,n)?t[n]:"";return tinymce.majorVersion<4?i.setup=function(t){t.onInit.add(function(t,i){$(t.getBody()).on("focus",function(){acf.validation.remove_error(e)}),$(t.getBody()).on("blur",function(){t.save(),e.find("textarea").trigger("change")})})}:i.setup=function(t){t.on("focus",function(t){acf.validation.remove_error(e)}),t.on("change",function(i){t.save(),e.find("textarea").trigger("change")})},i.wp_autoresize_on=!1,i=acf.apply_filters("wysiwyg_tinymce_settings",i,i.id)},get_qtInit:function(){var e=$.extend({},tinyMCEPreInit.qtInit.acf_content);return e.id=this.o.id,e=acf.apply_filters("wysiwyg_quicktags_settings",e,e.id)},disable:function(){try{var e=tinyMCE.get(this.o.id);e.save(),e.destroy()}catch(t){}},enable:function(){this.$el.hasClass("tmce-active")&&acf.isset(window,"switchEditors")&&switchEditors.go(this.o.id,"tmce")},get_toolbar:function(e){return"undefined"!=typeof this.toolbars[e]?this.toolbars[e]:!1},_buttonsInit:function(e){var t=",strong,em,link,block,del,ins,img,ul,ol,li,code,more,close,";canvas=e.canvas,name=e.name,settings=e.settings,html="",theButtons={},use="",settings.buttons&&(use=","+settings.buttons+",");for(i in edButtons)edButtons[i]&&(id=edButtons[i].id,use&&-1!==t.indexOf(","+id+",")&&-1===use.indexOf(","+id+",")||edButtons[i].instance&&edButtons[i].instance!==inst||(theButtons[id]=edButtons[i],edButtons[i].html&&(html+=edButtons[i].html(name+"_"))));use&&-1!==use.indexOf(",fullscreen,")&&(theButtons.fullscreen=new qt.FullscreenButton,html+=theButtons.fullscreen.html(name+"_")),"rtl"===document.getElementsByTagName("html")[0].dir&&(theButtons.textdirection=new qt.TextDirectionButton,html+=theButtons.textdirection.html(name+"_")),e.toolbar.innerHTML=html,e.theButtons=theButtons}});var e=acf.model.extend({$div:null,actions:{ready:"ready"},ready:function(){this.$div=$("#acf-hidden-wp-editor"),this.$div.exists()&&(this.$div.appendTo("body"),"undefined"!=typeof tinymce&&tinymce.on("AddEditor",function(e){var t=e.editor;wpActiveEditor=t.id,"acf_content"===t.id&&(tinymce.activeEditor=tinymce.editors.content||null,wpActiveEditor=tinymce.editors.content?"content":null)}))}})}(jQuery);
diff --git a/core/ajax.php b/core/ajax.php
index 9d51b3a..2f7e4c9 100644
--- a/core/ajax.php
+++ b/core/ajax.php
@@ -53,7 +53,7 @@ class acf_ajax {
 	function update_user_setting() {
 		
 		// options
-		$options = acf_parse_args( $_POST, array(
+		$options = wp_parse_args( $_POST, array(
 			'name'		=> '',
 			'value'		=> '',
 			'nonce'		=> '',
diff --git a/core/cache.php b/core/cache.php
new file mode 100644
index 0000000..84e4e30
--- /dev/null
+++ b/core/cache.php
@@ -0,0 +1,300 @@
+<?php 
+
+if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+
+if( ! class_exists('acf_cache') ) :
+
+class acf_cache {
+	
+	
+	/*
+	*  __construct
+	*
+	*  This function will setup the class functionality
+	*
+	*  @type	function
+	*  @date	5/03/2014
+	*  @since	5.4.0
+	*
+	*  @param	n/a
+	*  @return	n/a
+	*/
+	
+	function __construct() {
+		
+		// vars
+		$this->cache = array();
+		$this->reference = array();
+		
+		
+		// prevent ACF from persistent cache
+		wp_cache_add_non_persistent_groups('acf');
+		
+	}
+	
+	
+	/*
+	*  get_key
+	*
+	*  This function will check for references and modify the key
+	*
+	*  @type	function
+	*  @date	30/06/2016
+	*  @since	5.4.0
+	*
+	*  @param	$key (string)
+	*  @return	$key
+	*/
+	
+	function get_key( $key = '' ) {
+		
+		// check for reference
+		if( isset($this->reference[ $key ]) ) {
+			
+			$key = $this->reference[ $key ];
+				
+		}
+		
+		
+		// return
+		return $key;
+		
+	}
+	
+	
+	
+	/*
+	*  isset_cache
+	*
+	*  This function will return true if a cached data exists for the given key
+	*
+	*  @type	function
+	*  @date	30/06/2016
+	*  @since	5.4.0
+	*
+	*  @param	$key (string)
+	*  @return	(boolean)
+	*/
+	
+	function isset_cache( $key = '' ) {
+		
+		// vars
+		$key = $this->get_key($key);
+		$found = false;
+		
+		
+		// get cache
+		$cache = wp_cache_get($key, 'acf', false, $found);
+		
+		
+		// return
+		return $found;
+		
+	}
+	
+	
+	/*
+	*  get_cache
+	*
+	*  This function will return cached data for a given key
+	*
+	*  @type	function
+	*  @date	30/06/2016
+	*  @since	5.4.0
+	*
+	*  @param	$key (string)
+	*  @return	(mixed)
+	*/
+	
+	function get_cache( $key = '' ) {
+		
+		// vars
+		$key = $this->get_key($key);
+		$found = false;
+		
+		
+		// get cache
+		$cache = wp_cache_get($key, 'acf', false, $found);
+		
+		
+		// return
+		return $cache;
+		
+	}
+	
+	
+	/*
+	*  set_cache
+	*
+	*  This function will set cached data for a given key
+	*
+	*  @type	function
+	*  @date	30/06/2016
+	*  @since	5.4.0
+	*
+	*  @param	$key (string)
+	*  @param	$data (mixed)
+	*  @return	n/a
+	*/
+	
+	function set_cache( $key = '', $data = '' ) {
+		
+		wp_cache_set($key, $data, 'acf');
+		
+		return $key;
+		
+	}
+	
+	
+	/*
+	*  set_cache_reference
+	*
+	*  This function will set a reference to cached data for a given key
+	*
+	*  @type	function
+	*  @date	30/06/2016
+	*  @since	5.4.0
+	*
+	*  @param	$key (string)
+	*  @param	$reference (string)
+	*  @return	n/a
+	*/
+	
+	function set_cache_reference( $key = '', $reference = '' ) {
+		
+		$this->reference[ $key ] = $reference;	
+		
+		return $key;
+		
+	}
+	
+	
+	/*
+	*  delete_cache
+	*
+	*  This function will delete cached data for a given key
+	*
+	*  @type	function
+	*  @date	30/06/2016
+	*  @since	5.4.0
+	*
+	*  @param	$key (string)
+	*  @return	n/a
+	*/
+	
+	function delete_cache( $key = '' ) {
+		
+		return wp_cache_delete( $key, 'acf' );
+		
+	}
+	
+}
+
+
+// initialize
+acf()->cache = new acf_cache();
+
+endif; // class_exists check
+
+
+
+/*
+*  acf_isset_cache
+*
+*  alias of acf()->cache->isset_cache()
+*
+*  @type	function
+*  @date	30/06/2016
+*  @since	5.4.0
+*
+*  @param	n/a
+*  @return	n/a
+*/
+
+function acf_isset_cache( $key = '' ) {
+	
+	return acf()->cache->isset_cache( $key );
+	
+}
+
+
+/*
+*  acf_get_cache
+*
+*  alias of acf()->cache->get_cache()
+*
+*  @type	function
+*  @date	30/06/2016
+*  @since	5.4.0
+*
+*  @param	n/a
+*  @return	n/a
+*/
+
+function acf_get_cache( $key = '' ) {
+	
+	return acf()->cache->get_cache( $key );
+	
+}
+
+
+/*
+*  acf_set_cache
+*
+*  alias of acf()->cache->set_cache()
+*
+*  @type	function
+*  @date	30/06/2016
+*  @since	5.4.0
+*
+*  @param	n/a
+*  @return	n/a
+*/
+
+function acf_set_cache( $key = '', $data ) {
+	
+	return acf()->cache->set_cache( $key, $data );
+	
+}
+
+
+/*
+*  acf_set_cache_reference
+*
+*  alias of acf()->cache->set_cache_reference()
+*
+*  @type	function
+*  @date	30/06/2016
+*  @since	5.4.0
+*
+*  @param	n/a
+*  @return	n/a
+*/
+
+function acf_set_cache_reference( $key = '', $reference = '' ) {
+	
+	return acf()->cache->set_cache_reference( $key, $reference );
+	
+}
+
+
+/*
+*  acf_delete_cache
+*
+*  alias of acf()->cache->delete_cache()
+*
+*  @type	function
+*  @date	30/06/2016
+*  @since	5.4.0
+*
+*  @param	n/a
+*  @return	n/a
+*/
+
+function acf_delete_cache( $key = '' ) {
+	
+	return acf()->cache->delete_cache( $key );
+	
+}
+
+?>
diff --git a/core/fields.php b/core/fields.php
new file mode 100644
index 0000000..93dbef8
--- /dev/null
+++ b/core/fields.php
@@ -0,0 +1,138 @@
+<?php 
+
+if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+
+if( ! class_exists('acf_fields') ) :
+
+class acf_fields {
+	
+	
+	/*
+	*  __construct
+	*
+	*  This function will setup the class functionality
+	*
+	*  @type	function
+	*  @date	5/03/2014
+	*  @since	5.4.0
+	*
+	*  @param	n/a
+	*  @return	n/a
+	*/
+	
+	function __construct() {
+		
+		// vars
+		$this->types = array();
+		
+	}
+	
+	
+	/*
+	*  register_field_type
+	*
+	*  This function will store a field type class
+	*
+	*  @type	function
+	*  @date	6/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$instance (object)
+	*  @return	n/a
+	*/
+	
+	function register_field_type( $instance ) {
+		
+		// bail ealry if no field name
+		if( !$instance->name ) return false;
+		
+		
+		// bail ealry if already exists
+		if( isset($this->types[ $instance->name ]) ) return false;
+		
+		
+		// append
+		$this->types[ $instance->name ] = $instance;
+		
+		
+		// return
+		return true;
+		
+	}
+	
+	
+	/*
+	*  get_field_type
+	*
+	*  This function will return a field type class
+	*
+	*  @type	function
+	*  @date	6/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$name (string)
+	*  @return	(mixed)
+	*/
+	
+	function get_field_type( $name ) {
+		
+		// bail ealry if doesn't exist
+		if( !isset($this->types[ $name ]) ) return false;
+		
+		
+		// return
+		return $this->types[ $name ];
+		
+	}
+	
+		
+}
+
+
+// initialize
+acf()->fields = new acf_fields();
+
+endif; // class_exists check
+
+
+
+/*
+*  acf_register_field_type
+*
+*  alias of acf()->fields->register_field_type()
+*
+*  @type	function
+*  @date	6/10/13
+*  @since	5.0.0
+*
+*  @param	n/a
+*  @return	n/a
+*/
+
+function acf_register_field_type( $instance ) {
+	
+	return acf()->fields->register_field_type( $instance );
+	
+}
+
+
+/*
+*  acf_get_field_type
+*
+*  alias of acf()->fields->get_field_type()
+*
+*  @type	function
+*  @date	6/10/13
+*  @since	5.0.0
+*
+*  @param	n/a
+*  @return	n/a
+*/
+
+function acf_get_field_type( $name ) {
+	
+	return acf()->fields->get_field_type( $name );
+	
+}
+
+?>
diff --git a/core/input.php b/core/input.php
index d301cc3..1490990 100644
--- a/core/input.php
+++ b/core/input.php
@@ -426,7 +426,7 @@ function acf_enqueue_uploader() {
 	
 	
 	// create dummy editor
-	?><div class="acf-hidden"><?php wp_editor( '', 'acf_content' ); ?></div><?php
+	?><div id="acf-hidden-wp-editor" class="acf-hidden"><?php wp_editor( '', 'acf_content' ); ?></div><?php
 	
 }
 
diff --git a/core/json.php b/core/json.php
index fb11a79..4f23417 100644
--- a/core/json.php
+++ b/core/json.php
@@ -36,11 +36,7 @@ class acf_json {
 	function update_field_group( $field_group ) {
 		
 		// validate
-		if( !acf_get_setting('json') ) {
-		
-			return;
-			
-		}
+		if( !acf_get_setting('json') ) return;
 		
 		
 		// get fields
diff --git a/core/local.php b/core/local.php
index a6172e8..5a3246d 100644
--- a/core/local.php
+++ b/core/local.php
@@ -1,123 +1,271 @@
 <?php 
 
+if( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+
+if( ! class_exists('acf_local') ) :
+
 class acf_local {
 	
 	// vars
-	var $enabled	= true,
-		$groups 	= array(),
-		$fields 	= array(),
-		$parents 	= array();
+	var $groups = array(),
+		$fields = array(),
+		$parents = array();
 		
 		
+	/*
+	*  __construct
+	*
+	*  This function will setup the class functionality
+	*
+	*  @type	function
+	*  @date	5/03/2014
+	*  @since	5.4.0
+	*
+	*  @param	n/a
+	*  @return	n/a
+	*/
+	
 	function __construct() {
 		
-		add_filter('acf/get_field_groups', array($this, 'get_field_groups'), 10, 1);
-		add_action('acf/delete_field', 	array($this, 'delete_field'), 10, 1);
+		// register filter
+		acf_enable_filter('local');
+		
+		
+		// actions
+		add_action('acf/delete_field',		array($this, 'acf_delete_field'), 20, 1);
+		
+		
+		// filters
+		add_filter('acf/get_field_groups',	array($this, 'acf_get_field_groups'), 20, 1);
 		
 	}
 	
 	
 	/*
-	*  get_field_groups
+	*  reset
 	*
-	*  This function will override and add field groups to the `acf_get_field_groups()` results
+	*  This function will remove (reset) all field group and fields
 	*
-	*  @type	filter (acf/get_field_groups)
-	*  @date	5/12/2013
-	*  @since	5.0.0
+	*  @type	function
+	*  @date	2/06/2016
+	*  @since	5.3.8
 	*
-	*  @param	$field_groups (array)
-	*  @return	$field_groups
+	*  @param	n/a
+	*  @return	n/a
 	*/
 	
-	function get_field_groups( $field_groups ) {
-		
-		// validate
-		if( !acf_have_local_field_groups() ) {
-			
-			return $field_groups;
-			
-		}
-		
+	function reset() {
 		
 		// vars
-		$ignore = array();
-		$added = false;
+		$this->groups = array();
+		$this->fields = array();
+		$this->parents = array();
 		
+	}
+	
+	
+	/*
+	*  is_enabled
+	*
+	*  This function will return true if acf_local functionality is enabled
+	*
+	*  @type	function
+	*  @date	14/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	n/a
+	*  @return	n/a
+	*/
+	
+	function is_enabled() {
 		
-		// populate ignore list
-		if( !empty($field_groups) ) {
-			
-			foreach( $field_groups as $k => $group ) {
-
-				$ignore[] = $group['key'];
-				
-			}
-			
-		}
-		
-		
-		// append field groups
-		$groups = acf_get_local_field_groups();
-		
-		foreach( $groups as $group ) {
-			
-			// is ignore
-			if( in_array($group['key'], $ignore) ) {
-				
-				continue;
-					
-			}
-			
-			
-			// append
-			$field_groups[] = $group;
-			$added = true;
-			
-		}
-		
-		
-		// order field groups based on menu_order, title
-		if( $added ) {
-			
-			$menu_order = array();
-			$title = array();
-			
-			foreach( $field_groups as $key => $row ) {
-				
-			    $menu_order[ $key ] = $row['menu_order'];
-			    $title[ $key ] = $row['title'];
-			}
-			
-			
-			// sort the array with menu_order ascending
-			array_multisort( $menu_order, SORT_ASC, $title, SORT_ASC, $field_groups );
-				
-		}
+		// bail early if no local allowed
+		if( !acf_get_setting('local') ) return false;
 		
 		
 		// return
-		return $field_groups;
+		return acf_is_filter_enabled('local');
 		
 	}
 	
 	
 	/*
-	*  delete_field
+	*  add_parent_reference
 	*
-	*  description
+	*  This function will add a child reference for a given parent
 	*
 	*  @type	function
-	*  @date	10/12/2014
-	*  @since	5.1.5
+	*  @date	14/07/2016
+	*  @since	5.4.0
 	*
-	*  @param	$post_id (int)
-	*  @return	$post_id (int)
+	*  @param	$parent_key (string)
+	*  @param	$field_key (string)
+	*  @return	(mixed)
 	*/
 	
-	function delete_field( $field ) {
+	function add_parent_reference( $parent_key = '', $field_key = '' ) {
 		
-		$this->remove_field( $field['key'] );
+		// create array if doesn't exist
+		if( empty($this->parents[ $parent_key ]) ) {
+			
+			$this->parents[ $parent_key ] = array();
+			
+		} 
+		
+		
+		// append
+		$this->parents[ $parent_key ][ $field_key ] = $field_key;
+		
+	}
+	
+	
+	/*
+	*  remove_parent_reference
+	*
+	*  This function will remove a child reference for a given parent
+	*
+	*  @type	function
+	*  @date	14/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$parent_key (string)
+	*  @param	$field_key (string)
+	*  @return	(mixed)
+	*/
+	
+	function remove_parent_reference( $parent_key = '', $field_key = '' ) {
+		
+		// bail early if no parent
+		if( empty($this->parents[ $parent_key ]) ) return false;
+		
+		
+		// remove
+		unset( $this->parents[ $parent_key ][ $field_key ] );
+		
+	}
+	
+	
+	/*
+	*  add_field
+	*
+	*  This function will add a $field
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$field (array)
+	*  @return	n/a
+	*/
+	
+	function add_field( $field ) {
+		
+		// vars
+		$key = acf_maybe_get($field, 'key', '');
+		$parent = acf_maybe_get($field, 'parent', '');
+		
+		
+		// add parent reference
+		$this->add_parent_reference( $parent, $key );
+		
+		
+		// add in menu order
+		$field['menu_order'] = count( $this->parents[ $parent ] ) - 1;
+		
+		
+		// add field
+		$this->fields[ $key ] = $field;
+		
+	}
+	
+	
+	/*
+	*  is_field
+	*
+	*  This function will return true if a field exists for a given key
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$key (string)
+	*  @return	(bolean)
+	*/
+	
+	function is_field( $key = '' ) {
+		
+		// bail early if not enabled
+		if( !$this->is_enabled() ) return false;
+		
+		
+		// return
+		return isset( $this->fields[ $key ] );
+				
+	}
+	
+	
+	/*
+	*  get_field
+	*
+	*  This function will return a local field for a given key
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$key (string)
+	*  @return	(bolean)
+	*/
+	
+	function get_field( $key = '' ) {
+		
+		// bail early if no group
+		if( !$this->is_field($key) ) return false;
+		
+		
+		// return
+		return $this->fields[ $key ];
+		
+	}
+	
+	
+	/*
+	*  remove_field
+	*
+	*  This function will remove a $field
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$key (string)
+	*  @return	n/a
+	*/
+	
+	function remove_field( $key = '' ) {
+		
+		// get field
+		$field = $this->get_field( $key );
+		
+		
+		// bail early if no field
+		if( !$field ) return false;
+		
+		
+		// remove parent reference
+		$this->remove_parent_reference( $field['parent'], $field['key'] );
+		
+		
+		// remove field
+		unset( $this->fields[ $key ] );
+		
+		
+		// remove children
+		if( acf_have_local_fields( $key) ) {
+			
+			acf_remove_local_fields( $key );
+			
+		}
 		
 	}
 	
@@ -142,11 +290,7 @@ class acf_local {
 		
 		
 		// don't allow overrides
-		if( acf_is_local_field_group($field_group['key']) ) {
-			
-			return;	
-			
-		}
+		if( $this->is_field_group($field_group['key']) ) return;
 		
 		
 		// add local
@@ -189,715 +333,486 @@ class acf_local {
 	
 	
 	/*
-	*  add_field
+	*  is_field_group
 	*
-	*  This function will add a $field to the local placeholder
-	*
-	*  @type	function
-	*  @date	10/03/2014
-	*  @since	5.0.0
-	*
-	*  @param	$field (array)
-	*  @return	n/a
-	*/
-	
-	function add_field( $field ) {
-		
-		// vars
-		// - allow for the very unexpected case where no key or parent exist
-		$key = acf_maybe_get($field, 'key', '');
-		$parent = acf_maybe_get($field, 'parent', '');
-		
-		
-		// add parent reference
-		$this->add_parent_reference( $parent, $key );
-		
-		
-		// add in menu order
-		$field['menu_order'] = count( $this->parents[ $parent ] ) - 1;
-		
-		
-		// add field
-		$this->fields[ $key ] = $field;
-		
-		
-		// clear cache
-		// - delete cache was origional added to ensure changes to JSON / PHP would appear in WP when using memcache
-		// - the downside is that wp_cache_delet is taxing on the system so has been commented out
-		//wp_cache_delete( "get_field/key={$key}", 'acf' );
-		//wp_cache_delete( "get_fields/parent={$parent}", 'acf' );
-		
-	}
-	
-	
-	/*
-	*  remove_field
-	*
-	*  This function will remove a $field to the local placeholder
+	*  This function will return true if a field group exists for a given key
 	*
 	*  @type	function
 	*  @date	10/03/2014
 	*  @since	5.0.0
 	*
 	*  @param	$key (string)
-	*  @return	n/a
+	*  @return	(bolean)
 	*/
 	
-	function remove_field( $key ) {
+	function is_field_group( $key = '' ) {
 		
-		// get field
-		$field = acf_get_field( $key );
+		// bail early if not enabled
+		if( !$this->is_enabled() ) return false;
 		
 		
-		// remove parent reference
-		$this->remove_parent_reference( $field['parent'], $field['key'] );
+		// return
+		return isset( $this->groups[ $key ] );
+				
+	}
+	
+	
+	/*
+	*  get_field_group
+	*
+	*  This function will return a local field group for a given key
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$key (string)
+	*  @return	(bolean)
+	*/
+	
+	function get_field_group( $key = '' ) {
+		
+		// bail early if no group
+		if( !$this->is_field_group($key) ) return false;
 		
 		
-		// remove field
-		unset( $this->fields[ $key ] );
-		
-		
-		// remove children
-		if( acf_have_local_fields( $key) ) {
-			
-			acf_remove_local_fields( $key );
-			
-		}
+		// return
+		return $this->groups[ $key ];
 		
 	}
 	
 	
-	function add_parent_reference( $parent_key, $field_key ) {
+	/*
+	*  count_field_groups
+	*
+	*  This function will return the number of field groups
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$key (string)
+	*  @return	(bolean)
+	*/
+	
+	
+	function count_field_groups() {
 		
-		// create array
-		if( !isset($this->parents[ $parent_key ]) ) {
+		// return
+		return count( $this->groups );
+		
+	}
+	
+	
+	/*
+	*  have_field_groups
+	*
+	*  This function will true if local field groups exist
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	n/a
+	*  @return	(int)
+	*/
+	
+	function have_field_groups() {
+		
+		// bail early if not enabled
+		if( !$this->is_enabled() ) return 0;
+		
+		
+		// return
+		return $this->count_field_groups();
+		
+	}
+	
+	
+	/*
+	*  get_field_groups
+	*
+	*  This function will return an array of field groups
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$key (string)
+	*  @return	(bolean)
+	*/
+	
+	function get_field_groups() {
+		
+		return array_values($this->groups);
+		
+	}
+	
+	
+	
+	/*
+	*  count_fields
+	*
+	*  This function will return the number of fields for a given parent
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$key (string)
+	*  @return	(bolean)
+	*/
+	
+	
+	function count_fields( $parent_key = '' ) {
+		
+		// check
+		if( isset($this->parents[ $parent_key ]) ) {
 			
-			$this->parents[ $parent_key ] = array();
+			return count($this->parents[ $parent_key ]);
 			
-		} elseif( in_array($field_key, $this->parents[ $parent_key ]) ) {
-			
-			// bail early if already in array
-			return false;
-			
-		}
+		} 
+		
+		
+		// return
+		return 0;
+		
+	}
+	
+	
+	/*
+	*  have_fields
+	*
+	*  This function will true if local fields exist
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	n/a
+	*  @return	(int)
+	*/
+	
+	function have_fields( $parent_key = '' ) {
+	
+		// bail early if not enabled
+		if( !$this->is_enabled() ) return 0;
+		
+		
+		// return
+		return $this->count_fields( $parent_key );
+		
+	}
+	
+	
+	/*
+	*  get_fields
+	*
+	*  This function will return an array of fields for a given 'parent' key (field group key or field key)
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$key (string)
+	*  @return	(bolean)
+	*/
+	
+	function get_fields( $parent_key = '' ) {
+		
+		// bail early if no parent
+		if( !$this->have_fields($parent_key) ) return false;
+		
+		
+		// vars
+		$fields = array();
 		
 		
 		// append
-		$this->parents[ $parent_key ][] = $field_key;
-		
-		
-		// return
-		return true;
-		
-	}
-	
-	
-	function remove_parent_reference( $parent_key, $field_key ) {
-		
-		// bail early if no parent
-		if( !isset($this->parents[ $parent_key ]) ) {
+		foreach( $this->parents[ $parent_key ] as $field_key ) {
 			
-			return false;
+			$fields[] = acf_get_field( $field_key );
 			
 		}
 		
 		
-		// remove
-		$this->parents[ $parent_key ] = array_diff($this->parents[ $parent_key ], array($field_key));
+		// return
+		return $fields;
+		
+	}
+	
+	
+	/*
+	*  remove_fields
+	*
+	*  This function will remove the field reference for a field group
+	*
+	*  @type	function
+	*  @date	10/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	$key (string)
+	*  @return	(bolean)
+	*/
+	
+	function remove_fields( $parent_key = '' ) {
+		
+		// bail early if no parent
+		if( !$this->have_fields($parent_key) ) return false;
+		
+		
+		// loop
+		foreach( $this->parents[ $parent_key ] as $field_key ) {
+			
+			$this->remove_field( $field_key );
+		
+		}
 		
 		
 		// return
 		return true;
 	}
+	
+	
+	/*
+	*  acf_get_field_groups
+	*
+	*  This function will override and add field groups to the `acf_get_field_groups()` results
+	*
+	*  @type	filter (acf/get_field_groups)
+	*  @date	5/12/2013
+	*  @since	5.0.0
+	*
+	*  @param	$field_groups (array)
+	*  @return	$field_groups
+	*/
+	
+	function acf_get_field_groups( $field_groups ) {
+		
+		// bail early if no local field groups
+		if( !$this->have_field_groups() ) return $field_groups;
+		
+		
+		// vars
+		$ignore = array();
+		$added = false;
+		
+		
+		// populate ignore list
+		if( !empty($field_groups) ) {
+			
+			foreach( $field_groups as $k => $group ) {
 
+				$ignore[] = $group['key'];
+				
+			}
+			
+		}
+		
+		
+		// append field groups
+		$groups = $this->get_field_groups();
+		
+		foreach( $groups as $group ) {
+			
+			// is ignore
+			if( in_array($group['key'], $ignore) ) continue;
+			
+			
+			// append
+			$field_groups[] = $group;
+			$added = true;
+			
+		}
+		
+		
+		// order field groups based on menu_order, title
+		if( $added ) {
+			
+			$menu_order = array();
+			$title = array();
+			
+			foreach( $field_groups as $key => $row ) {
+				
+			    $menu_order[ $key ] = $row['menu_order'];
+			    $title[ $key ] = $row['title'];
+			}
+			
+			
+			// sort the array with menu_order ascending
+			array_multisort( $menu_order, SORT_ASC, $title, SORT_ASC, $field_groups );
+				
+		}
+		
+		
+		// return
+		return $field_groups;
+		
+	}
+	
+	
+	/*
+	*  acf_delete_field
+	*
+	*  description
+	*
+	*  @type	function
+	*  @date	10/12/2014
+	*  @since	5.1.5
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function acf_delete_field( $field ) {
+		
+		$this->remove_field( $field['key'] );
+		
+	}
 	
 }
 
 
+// initialize
+acf()->local = new acf_local();
+
+endif; // class_exists check
+
+
 /*
-*  acf_local
+*  Helpers
 *
-*  This function will return the one true acf_local
+*  alias of acf()->local->functions
 *
 *  @type	function
-*  @date	10/03/2014
+*  @date	11/06/2014
 *  @since	5.0.0
 *
 *  @param	n/a
-*  @return	acf_local (object)
+*  @return	n/a
 */
 
 function acf_local() {
 	
-	// globals
-	global $acf_local;
+	return acf()->local;
 	
-	
-	// instantiate
-	if( !isset($acf_local) )
-	{
-		$acf_local = new acf_local();
-	}
-	
-	
-	// return
-	return $acf_local;
 }
 
-
-/*
-*  acf_disable_local
-*
-*  This function will disable the local functionality for DB only interaction
-*
-*  @type	function
-*  @date	11/06/2014
-*  @since	5.0.0
-*
-*  @param	n/a
-*  @return	n/a
-*/
-
 function acf_disable_local() {
 	
-	acf_local()->enabled = false;
+	acf_disable_filter('local');
 	
 }
 
-
-/*
-*  acf_enable_local
-*
-*  This function will enable the local functionality
-*
-*  @type	function
-*  @date	11/06/2014
-*  @since	5.0.0
-*
-*  @param	n/a
-*  @return	n/a
-*/
-
 function acf_enable_local() {
 	
-	acf_local()->enabled = true;
+	acf_enable_filter('local');
 	
 }
 
-
-/*
-*  acf_reset_local
-*
-*  This function will remove (reset) all field group and fields
-*
-*  @type	function
-*  @date	2/06/2016
-*  @since	5.3.8
-*
-*  @param	$post_id (int)
-*  @return	$post_id (int)
-*/
-
 function acf_reset_local() {
 	
-	// vars
-	acf_local()->groups = array();
-	acf_local()->fields = array();
-	acf_local()->parents = array();
+	return acf_local()->reset();
 	
 }
 
 
-/*
-*  acf_is_local_enabled
-*
-*  This function will return true|false if the local functionality is enabled
-*
-*  @type	function
-*  @date	11/06/2014
-*  @since	5.0.0
-*
-*  @param	n/a
-*  @return	n/a
-*/
+// field group
+function acf_add_local_field_group( $field_group ) {
+	
+	return acf_local()->add_field_group( $field_group );
+	
+}
 
-function acf_is_local_enabled() {
+function acf_remove_local_field_group( $key = '' ) {
 	
-	// validate
-	if( !acf_get_setting('local') ) {
-		
-		return false;
-		
-	}
+	// missing
 	
+}
+
+function acf_is_local_field_group( $key = '' ) {
 	
-	if( !acf_local()->enabled ) {
-		
-		return false;
-		
-	}
+	return acf_local()->is_field_group( $key );
 	
+}
+
+function acf_get_local_field_group( $key = '' ) {
 	
-	// return
-	return true;
+	return acf_local()->get_field_group( $key );
 	
 }
 
 
-/*
-*  acf_count_local_field_groups
-*
-*  This function will return the number of local field groups
-*
-*  @type	function
-*  @date	3/12/2014
-*  @since	5.1.5
-*
-*  @param	$type (string) specify the type. eg. 'json'
-*  @return	(int)
-*/
-
-function acf_count_local_field_groups( $type = '' ) {
+// field groups
+function acf_count_local_field_groups() {
 	
-	// vars
-	$count = 0;
-	
-	
-	// check for groups
-	if( !empty(acf_local()->groups) ) {
-		
-		// acf_local
-		foreach( acf_local()->groups as $group ) {
-			
-			// ignore if not specific type
-			if( $type && $group['local'] != $type ) {
-				
-				continue;
-				
-			}
-			
-			$count++;
-			
-		}
-		
-	}
-	
-	
-	// return
-	return $count;
+	return acf_local()->count_field_groups();
 	
 }
 
-
-/*
-*  acf_have_local_field_groups
-*
-*  This function will return true if fields exist for a given 'parent' key (field group key or field key)
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	n/a
-*  @return	(bolean)
-*/
-
 function acf_have_local_field_groups() {
 	
-	// validate
-	if( !acf_is_local_enabled() ) {
-		
-		return false;
-		
-	}
-	
-	
-	// check for groups
-	if( !empty(acf_local()->groups) ) {
-		
-		return true;
-		
-	}
-	
-	
-	// return
-	return false;
+	return acf_local()->have_field_groups();
 	
 }
 
-
-/*
-*  acf_get_local_field_groups
-*
-*  This function will return an array of fields for a given 'parent' key (field group key or field key)
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$key (string)
-*  @return	(bolean)
-*/
-
 function acf_get_local_field_groups() {
 	
-	// bail early if no groups
-	if( !acf_have_local_field_groups() ) {
-		
-		return false;
-		
-	}
-	
-	
-	// vars
-	$groups = array();
-	
-	
-	// acf_local
-	foreach( acf_local()->groups as $group ) {
-		
-		$groups[] = $group;
-		
-	}
-	
-	
-	// return
-	return $groups;
+	return acf_local()->get_field_groups();
 	
 }
 
 
-/*
-*  acf_add_local_field_group
-*
-*  This function will add a $field group to the local placeholder
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$post_id (int)
-*  @return	$post_id (int)
-*/
-
-function acf_add_local_field_group( $field_group ) {
-	
-	acf_local()->add_field_group( $field_group );
-	
-}
-
-
-/*
-*  acf_is_local_field_group
-*
-*  This function will return true if the field group has been added as local
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$key (string)
-*  @return	(bolean)
-*/
-
-function acf_is_local_field_group( $key ) {
-	
-	// validate
-	if( !acf_is_local_enabled() ) {
-		
-		return false;
-		
-	}
-	
-	
-	// check groups
-	if( isset( acf_local()->groups[ $key ] ) ) {
-		
-		return true;
-		
-	}
-	
-	
-	// return
-	return false;
-	
-}
-
-
-/*
-*  acf_get_local_field_group
-*
-*  This function will return a local field group for a given key
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$key (string)
-*  @return	(bolean)
-*/
-
-function acf_get_local_field_group( $key ) {
-	
-	// bail early if no group
-	if( !acf_is_local_field_group($key) ) {
-		
-		return false;
-		
-	}
-	
-	
-	// return
-	return acf_local()->groups[ $key ];
-	
-}
-
-
-/*
-*  acf_add_local_field
-*
-*  This function will add a $field to the local placeholder
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$post_id (int)
-*  @return	$post_id (int)
-*/
-
+// field
 function acf_add_local_field( $field ) {
 	
-	acf_local()->add_field( $field );
+	return acf_local()->add_field( $field );
+	
+}
+
+function acf_remove_local_field( $key = '' ) {
+	
+	return acf_local()->remove_field( $key );
+	
+}
+
+function acf_is_local_field( $key = '' ) {
+	
+	return acf_local()->is_field( $key );
+	
+}
+
+function acf_get_local_field( $key = '' ) {
+	
+	return acf_local()->get_field( $key );
 	
 }
 
 
-/*
-*  acf_remove_local_field
-*
-*  This function will remove a $field to the local placeholder
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$post_id (int)
-*  @return	$post_id (int)
-*/
-
-function acf_remove_local_field( $key ) {
+// fields
+function acf_count_local_fields( $key = '' ) {
 	
-	acf_local()->remove_field( $key );
+	return acf_local()->count_fields( $key );
 	
 }
 
-
-/*
-*  acf_is_local_field
-*
-*  This function will return true if the field has been added as local
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$key (string)
-*  @return	(bolean)
-*/
-
-function acf_is_local_field( $key ) {
+function acf_have_local_fields( $key = '' ) {
 	
-	// validate
-	if( !acf_is_local_enabled() ) {
-		
-		return false;
-		
-	}
-	
-	
-	// check fields
-	if( isset( acf_local()->fields[ $key ] ) ) {
-		
-		return true;
-		
-	}
-	
-	
-	// return
-	return false;
+	return acf_local()->have_fields( $key );
 	
 }
 
-
-/*
-*  acf_get_local_field_group
-*
-*  This function will return a local field for a given key
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$key (string)
-*  @return	(bolean)
-*/
-
-function acf_get_local_field( $key ) {
+function acf_get_local_fields( $key = '' ) {
 	
-	// bail early if no field
-	if( !acf_is_local_field($key) ) {
-		
-		return false;
-		
-	}
-	
-	
-	// return
-	return acf_local()->fields[ $key ];
+	return acf_local()->get_fields( $key );
 	
 }
 
-
-/*
-*  acf_count_local_fields
-*
-*  This function will return the number of local fields for a parent
-*
-*  @type	function
-*  @date	3/12/2014
-*  @since	5.1.5
-*
-*  @param	n/a
-*  @return	(int)
-*/
-
-function acf_count_local_fields( $key ) {
+function acf_remove_local_fields( $key = '' ) {
 	
-	// check for fields
-	if( !empty(acf_local()->parents[ $key ]) ) {
-		
-		return count( acf_local()->parents[ $key ] );
-		
-	}
-	
-	
-	// return
-	return 0;
+	return acf_local()->remove_fields( $key );
 	
 }
 
 
-/*
-*  acf_have_local_fields
-*
-*  This function will return true if fields exist for a given 'parent' key (field group key or field key)
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$key (string)
-*  @return	(bolean)
-*/
-
-function acf_have_local_fields( $key ) {
-
-	// validate
-	if( !acf_is_local_enabled() ) {
-		
-		return false;
-		
-	}
-	
-	
-	// check parents
-	if( isset( acf_local()->parents[ $key ] ) ) {
-		
-		return true;
-		
-	}
-	
-	
-	// return
-	return false;
-	
-}
-
-
-/*
-*  acf_get_local_fields
-*
-*  This function will return an array of fields for a given 'parent' key (field group key or field key)
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$key (string)
-*  @return	(bolean)
-*/
-
-function acf_get_local_fields( $parent ) {
-	
-	// bail early if no parent
-	if( !acf_have_local_fields($parent) ) {
-		
-		return false;
-		
-	}
-	
-	
-	// vars
-	$fields = array();
-	
-	
-	// append
-	foreach( acf_local()->parents[ $parent ] as $key ) {
-		
-		$fields[] = acf_get_field( $key );
-		
-	}
-	
-	
-	// return
-	return $fields;
-	
-}
-
-
-/*
-*  acf_remove_local_fields
-*
-*  This function will remove the field reference for a field group
-*
-*  @type	function
-*  @date	10/03/2014
-*  @since	5.0.0
-*
-*  @param	$key (string)
-*  @return	(bolean)
-*/
-
-function acf_remove_local_fields( $parent ) {
-	
-	// bail early if no reference
-	if( empty( acf_local()->parents[ $parent ] ) ) {
-		
-		return false;
-		
-	}
-	
-	
-	foreach( acf_local()->parents[ $parent ] as $key ) {
-		
-		acf_remove_local_field( $key );
-	
-	}
-	
-	
-	// return
-	return true;
-}
-
 ?>
diff --git a/core/location.php b/core/location.php
index 538c24f..bfa5f41 100644
--- a/core/location.php
+++ b/core/location.php
@@ -1137,7 +1137,12 @@ new acf_location();
 
 function acf_get_field_group_visibility( $field_group, $args = array() ) {
 	
+	// bail early if not active
+	if( !$field_group['active'] ) return false;
+	
+	
 	// vars
+	$visibility = false;
 	$args = acf_parse_args($args, array(
 		'post_id'		=> 0,
 		'post_type'		=> 0,
@@ -1163,14 +1168,6 @@ function acf_get_field_group_visibility( $field_group, $args = array() ) {
 	$args = apply_filters('acf/location/screen', $args, $field_group);
 	
 	
-	// bail early if not active
-	if( !$field_group['active'] ) return false;
-	
-	
-	// vars
-	$visibility = false;
-	
-	
 	// loop through location rules
 	foreach( $field_group['location'] as $group_id => $group ) {
 		
diff --git a/core/media.php b/core/media.php
index 2c92c0e..9207232 100644
--- a/core/media.php
+++ b/core/media.php
@@ -51,9 +51,9 @@ class acf_media {
 		
 		// append
 		$l10n['media'] = array(
-			'select'		=> __("Select",'acf'),
-			'edit'			=> __("Edit",'acf'),
-			'update'		=> __("Update",'acf'),
+			'select'		=> _x('Select', 'verb', 'acf'),
+			'edit'			=> _x('Edit', 'verb', 'acf'),
+			'update'		=> _x('Update', 'verb', 'acf'),
 			'uploadedTo'	=> __("Uploaded to this post",'acf'),
 			'default_icon'	=> wp_mime_type_icon()
 		);
diff --git a/core/revisions.php b/core/revisions.php
index 0cc14ac..a60d78b 100644
--- a/core/revisions.php
+++ b/core/revisions.php
@@ -14,16 +14,80 @@ class acf_revisions {
 	*  @return	N/A
 	*/
 	
-	function __construct()
-	{
-		// actions		
+	function __construct() {
+		
+		// actions	
+		add_action('save_post', array($this, 'save_post'), 99, 3);
 		add_action('wp_restore_post_revision', array($this, 'wp_restore_post_revision'), 10, 2 );
 		
 		
 		// filters
-		add_filter('_wp_post_revision_fields', array($this, 'wp_preview_post_fields') );
-		add_filter('_wp_post_revision_fields', array($this, 'wp_post_revision_fields') );
-		add_filter('wp_save_post_revision_check_for_changes', array($this, 'force_save_revision'), 10, 3);
+		add_filter('wp_save_post_revision_check_for_changes', array($this, 'wp_save_post_revision_check_for_changes'), 10, 3);
+		add_filter('_wp_post_revision_fields', array($this, 'wp_preview_post_fields'), 10, 2 );
+		add_filter('_wp_post_revision_fields', array($this, 'wp_post_revision_fields'), 10, 2 );
+		
+	}
+	
+	
+	/*
+	*  get_post_latest_revision
+	*
+	*  This function will return the latest revision for a given post
+	*
+	*  @type	function
+	*  @date	25/06/2016
+	*  @since	5.3.8
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function get_post_latest_revision( $post_id ) {
+		
+		// vars
+		$revisions = wp_get_post_revisions( $post_id );
+		
+		
+		// shift off and return first revision (will return null if no revisions)
+		$revision = array_shift($revisions);
+		
+		
+		// return
+		return $revision;		
+		
+	}
+	
+	
+	/*
+	*  save_post
+	*
+	*  description
+	*
+	*  @type	function
+	*  @date	25/06/2016
+	*  @since	5.3.8
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function save_post( $post_id, $post, $update ) {
+		
+		// bail ealry if post type does not support revision
+		if( !post_type_supports($post->post_type, 'revisions') ) return $post_id;
+		
+		
+		// get latest revision
+		$revision = $this->get_post_latest_revision( $post_id );
+		
+		
+		// save
+		if( $revision ) {
+			
+			acf_copy_postmeta( $post_id, $revision->ID );
+			
+		}
+		
 	}
 	
 	
@@ -44,12 +108,12 @@ class acf_revisions {
 	
 	function wp_preview_post_fields( $fields ) {
 		
+		// vars
+		$wp_preview = acf_maybe_get($_POST, 'wp-preview');
+		
+		
 		// bail early if not previewing a post
-		if( empty($_POST['wp-preview']) || $_POST['wp-preview'] != 'dopreview') {
-			
-			return $fields;
-			
-		}
+		if( $wp_preview !== 'dopreview' ) return $fields;
 		
 		
 		// add to fields if ACF has changed
@@ -67,7 +131,7 @@ class acf_revisions {
 	
 	
 	/*
-	*  force_save_revision
+	*  wp_save_post_revision_check_for_changes
 	*
 	*  This filter will return false and force WP to save a revision. This is required due to
 	*  WP checking only post_title, post_excerpt and post_content values, not custom fields.
@@ -81,17 +145,20 @@ class acf_revisions {
 	*  @return	$return (boolean)
 	*/
 	
-	function force_save_revision( $return, $last_revision, $post )
-	{
-		// preview hack
-		if( isset($_POST['_acfchanged']) && $_POST['_acfchanged'] == '1' )
-		{
+	function wp_save_post_revision_check_for_changes( $return, $last_revision, $post ) {
+		
+		
+		// look for _acfchanged
+		if( acf_maybe_get($_POST, '_acfchanged') === '1' ) {
+			
 			$return = false;
+			
 		}
 		
 		
 		// return
 		return $return;
+		
 	}
 	
 	
@@ -109,112 +176,112 @@ class acf_revisions {
 	*  @return	$post_id (int)
 	*/
 		
-	function wp_post_revision_fields( $return ) {
+	function wp_post_revision_fields( $fields, $post = null ) {
 		
-		
-		//globals
-		global $post, $pagenow;
-		
-
-		// validate
-		$allowed = false;
-		
-		
-		// Normal revisions page
-		if( $pagenow == 'revision.php' )
-		{
-			$allowed = true;
-		}
-		
-		
-		// WP 3.6 AJAX revision
-		if( $pagenow == 'admin-ajax.php' && isset($_POST['action']) && $_POST['action'] == 'get-revision-diffs' )
-		{
-			$allowed = true;
-		}
-		
-		
-		// bail
-		if( !$allowed ) 
-		{
-			return $return;
+		// validate page
+		if( acf_is_screen('revision') || acf_is_ajax('get-revision-diffs') ) {
+			
+			// allow
+			
+		} else {
+			
+			// bail early (most likely saving a post)
+			return $fields;
+			
 		}
 		
 		
 		// vars
-		$post_id = 0;
+		$append = array();
+		$order = array();
+		$post_id = acf_maybe_get($post, 'ID');
 		
 		
-		// determine $post_id
-		if( isset($_POST['post_id']) )
-		{
-			$post_id = $_POST['post_id'];
-		}
-		elseif( isset($post->ID) )
-		{
+		// compatibility with WP < 4.5 (test)
+		if( !$post_id ) {
+			
+			global $post;
 			$post_id = $post->ID;
-		}
-		else
-		{
-			return $return;
+			
 		}
 		
 		
-		// setup global array
-		$GLOBALS['acf_revisions_fields'] = array();
+		// get all postmeta
+		$meta = get_post_meta( $post_id );
 		
 		
-		// get field objects
-		$custom_fields = get_post_custom( $post_id );
+		// bail early if no meta
+		if( !$meta ) return $fields;
 		
 		
-		// populate vars
-		if( !empty($custom_fields) )
-		{
-			foreach( $custom_fields as $k => $v )
-			{
-				// value is always an array
-				$v = $v[0];
-				
-				
-				// bail early if $value is not is a field_key
-				if( !acf_is_field_key($v) )
-				{
-					continue;
-				}
-				
-				
-				// remove prefix '_' field from reference
-				$field_name = substr($k, 1);
-				
-				
-				// get field
-				//$field = acf_get_field($v);
-				
-				
-				// append to return
-				$return[ $field_name ] = $field_name;
-				
-				
-				// load value
-				add_filter("_wp_post_revision_field_{$field_name}", array($this, 'wp_post_revision_field'), 10, 4);
-				
-				
-				// WP 3.5: left vs right
-				// Add a value of the revision ID (as there is no way to determine this within the '_wp_post_revision_field_' filter!)
-				if( isset($_GET['action'], $_GET['left'], $_GET['right']) && $_GET['action'] == 'diff' )
-				{
-					global $left_revision, $right_revision;
+		// loop
+		foreach( $meta as $name => $value ) {
+			
+			// attempt to find key value
+			$key = acf_maybe_get( $meta, '_'.$name );
+			
+			
+			// bail ealry if no key
+			if( !$key ) continue;
+			
+			
+			// update vars
+			$value = $value[0];
+			$key = $key[0];
+			
 					
-					$left_revision->$field_name = 'revision_id=' . $_GET['left'];
-					$right_revision->$field_name = 'revision_id=' . $_GET['right'];
-				}
+			// bail early if $key is a not a field_key
+			if( !acf_is_field_key($key) ) continue;
+			
+			
+			// get field
+			$field = acf_get_field( $key );
+			$field_title = $field['label'] . ' (' . $name . ')';
+			$field_order = $field['menu_order'];
+			$ancestors = acf_get_field_ancestors( $field );
+			
+			
+			// ancestors
+			if( !empty($ancestors) ) {
+				
+				// vars
+				$count = count($ancestors);
+				$oldest = acf_get_field( $ancestors[$count-1] );
+				
+				
+				// update vars
+				$field_title = str_repeat('- ', $count) . $field_title;
+				$field_order = $oldest['menu_order'] . '.1';
 				
 			}
+			
+			
+			// append
+			$append[ $name ] = $field_title;
+			$order[ $name ] = $field_order;
+			
+			
+			// hook into specific revision field filter and return local value
+			add_filter("_wp_post_revision_field_{$name}", array($this, 'wp_post_revision_field'), 10, 4);
+			
 		}
-				
 		
-		return $return;
+		
+		// append 
+		if( !empty($append) ) {
+			
+			// sort by name (orders sub field values correctly)
+			array_multisort($order, $append);
+			
+			
+			// append
+			$fields = array_merge($fields, $append);
+			
+		}
+		
+		
+		// return
+		return $fields;
 	
 	}
 	
@@ -234,60 +301,48 @@ class acf_revisions {
 	*  @return	$value (string)
 	*/
 	
-	function wp_post_revision_field( $value, $field_name, $post = null, $direction = false)
-	{
+	function wp_post_revision_field( $value, $field_name, $post = null, $direction = false) {
+		
+		// bail ealry if is empty
+		if( empty($value) ) return $value;
+		
+		
+		// value has not yet been 'maybe_unserialize'
+		$value = maybe_unserialize( $value );
+		
+		
 		// vars
-		$post_id = 0;
-		
-		
-		// determine $post_id
-		if( isset($post->ID) )
-		{
-			// WP 3.6
-			$post_id = $post->ID;
-		}
-		elseif( isset($_GET['revision']) )
-		{
-			// WP 3.5
-			$post_id = (int) $_GET['revision'];
-		}
-		elseif( strpos($value, 'revision_id=') !== false )
-		{
-			// WP 3.5 (left vs right)
-			$post_id = (int) str_replace('revision_id=', '', $value);
-		}
+		$post_id = $post->ID;
 		
 		
 		// load field
 		$field = acf_maybe_get_field( $field_name, $post_id );
 		
 		
-		// update value
-		//$value = $field['value'];
-		
-		
 		// default formatting
 		if( is_array($value) ) {
 			
 			$value = implode(', ', $value);
 			
+		} elseif( is_object($value) ) {
+			
+			$value = serialize($value);
+			
 		}
 		
 		
-		// format
-		if( !empty($value) )
-		{
-			// image || file?
-			if( $field['type'] == 'image' || $field['type'] == 'file' )
-			{
-				$url = wp_get_attachment_url($value);
-				$value = $value . ' (' . $url . ')';
-			}
+		// image
+		if( $field['type'] == 'image' || $field['type'] == 'file' ) {
+			
+			$url = wp_get_attachment_url($value);
+			$value = $value . ' (' . $url . ')';
+			
 		}
 		
 		
 		// return
 		return $value;
+		
 	}
 	
 	
@@ -304,49 +359,23 @@ class acf_revisions {
 	*/
 	
 	function wp_restore_post_revision( $post_id, $revision_id ) {
-	
-		// global
-		global $wpdb;
+		
+		// copy postmeta from revision to post (restore from revision)
+		acf_copy_postmeta( $revision_id, $post_id );
 		
 		
-		// get field objects
-		$custom_fields = get_post_custom( $revision_id );
+		// Make sure the latest revision is also updated to match the new $post data
+		// get latest revision
+		$revision = $this->get_post_latest_revision( $post_id );
 		
 		
-		// populate vars
-		if( !empty($custom_fields) )
-		{
-			foreach( $custom_fields as $k => $v )
-			{
-				// value is always an array
-				$v = $v[0];
-				
-				
-				// bail early if $value is not is a field_key
-				if( !acf_is_field_key($v) )
-				{
-					continue;
-				}
-				
-				
-				// remove prefix '_' field from reference
-				$field_name = substr($k, 1);
-				
-				
-				// bail early if value could not be found
-				if( !isset($custom_fields[ $field_name ][0]) )
-				{
-					continue;
-				}
-				
-				
-				update_post_meta( $post_id, $field_name, $custom_fields[ $field_name ][0] );
-				
-				
-			}
+		// save
+		if( $revision ) {
+			
+			// copy postmeta from revision to latest revision (potentialy may be the same, but most likely are different)
+			acf_copy_postmeta( $revision_id, $revision->ID );
+			
 		}
-		
-		
 			
 	}
 	
diff --git a/core/updates.php b/core/updates.php
index 06d7244..4c3c7cc 100644
--- a/core/updates.php
+++ b/core/updates.php
@@ -59,7 +59,7 @@ class acf_updates {
         
 		
 		// validate
-    	if( isset($args->slug) && $args->slug == $slug ) {
+    	if( isset($args->slug) && $args->slug === $slug && acf_is_plugin_active() ) {
 	    	
 	    	// filter
 	    	$result = apply_filters('acf/updates/plugin_details', $result, $action, $args);
@@ -89,7 +89,7 @@ class acf_updates {
 	function modify_plugin_update( $transient ) {
 		
 		// bail early if no response (dashboard showed an error)
-		if( empty($transient->response) ) return $transient;
+		if( !isset($transient->response) ) return $transient;
 		
 		
 		// vars
@@ -97,16 +97,8 @@ class acf_updates {
 		$show_updates = acf_get_setting('show_updates');
 		
 		
-		// ensure is_plugin_active() exists (not on frontend)
-		if( !function_exists('is_plugin_active') ) {
-			
-			include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-			
-		}
-		
-		
 		// bail early if not a plugin (included in theme)
-		if( !is_plugin_active($basename) ) $show_updates = false;
+		if( !acf_is_plugin_active() ) $show_updates = false;
 		
 		
 		// bail early if no show_updates
@@ -381,4 +373,38 @@ function acf_get_wporg_remote_plugin_info() {
 	
 }
 
+
+/*
+*  acf_refresh_plugin_updates_transient
+*
+*  This function will refresh teh WP transient containing plugin update data
+*
+*  @type	function
+*  @date	11/08/2016
+*  @since	5.4.0
+*
+*  @param	$post_id (int)
+*  @return	$post_id (int)
+*/
+
+function acf_refresh_plugin_updates_transient() {
+	
+	// vars
+	$transient = get_site_transient('update_plugins');
+	
+	
+	// bail early if no transient
+	if( empty($transient) ) return;
+	
+	
+	// update transient
+	$transient = acf()->updates->modify_plugin_update( $transient );
+	
+	
+	// update
+	set_site_transient( 'update_plugins', $transient );
+		
+}
+
+
 ?>
diff --git a/fields/checkbox.php b/fields/checkbox.php
index 7a00526..85ac36a 100644
--- a/fields/checkbox.php
+++ b/fields/checkbox.php
@@ -36,10 +36,11 @@ class acf_field_checkbox extends acf_field {
 		$this->label = __("Checkbox",'acf');
 		$this->category = 'choice';
 		$this->defaults = array(
-			'layout'		=> 'vertical',
-			'choices'		=> array(),
-			'default_value'	=> '',
-			'toggle'		=> 0
+			'layout'			=> 'vertical',
+			'choices'			=> array(),
+			'default_value'		=> '',
+			'toggle'			=> 0,
+			'return_format'		=> 'value'
 		);
 		
 		
@@ -246,6 +247,20 @@ class acf_field_checkbox extends acf_field {
 		));
 		
 		
+		// return_format
+		acf_render_field_setting( $field, array(
+			'label'			=> __('Return Value','acf'),
+			'instructions'	=> __('Specify the returned value on front end','acf'),
+			'type'			=> 'radio',
+			'name'			=> 'return_format',
+			'layout'		=> 'horizontal',
+			'choices'		=> array(
+				'value'			=> __('Value','acf'),
+				'label'			=> __('Label','acf'),
+				'array'			=> __('Both (Array)','acf')
+			)
+		));		
+		
 	}
 	
 	
@@ -266,13 +281,8 @@ class acf_field_checkbox extends acf_field {
 
 	function update_field( $field ) {
 		
-		// decode choices (convert to array)
-		$field['choices'] = acf_decode_choices($field['choices']);
-		$field['default_value'] = acf_decode_choices($field['default_value'], true);
+		return acf_get_field_type('select')->update_field( $field );
 		
-		
-		// return
-		return $field;
 	}
 	
 	
@@ -294,25 +304,7 @@ class acf_field_checkbox extends acf_field {
 	
 	function update_value( $value, $post_id, $field ) {
 		
-		// validate
-		if( empty($value) ) {
-		
-			return $value;
-			
-		}
-		
-		
-		// array
-		if( is_array($value) ) {
-			
-			// save value as strings, so we can clearly search for them in SQL LIKE statements
-			$value = array_map('strval', $value);
-			
-		}
-		
-		
-		// return
-		return $value;
+		return acf_get_field_type('select')->update_value( $value, $post_id, $field );
 	}
 	
 	
@@ -331,12 +323,30 @@ class acf_field_checkbox extends acf_field {
 	
 	function translate_field( $field ) {
 		
-		// translate
-		$field['choices'] = acf_translate( $field['choices'] );
+		return acf_get_field_type('select')->translate_field( $field );
 		
+	}
+	
+	
+	/*
+	*  format_value()
+	*
+	*  This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$value (mixed) the value which was loaded from the database
+	*  @param	$post_id (mixed) the $post_id from which the value was loaded
+	*  @param	$field (array) the field array holding all the field options
+	*
+	*  @return	$value (mixed) the modified value
+	*/
+	
+	function format_value( $value, $post_id, $field ) {
 		
-		// return
-		return $field;
+		return acf_get_field_type('select')->format_value( $value, $post_id, $field );
 		
 	}
 	
diff --git a/fields/color_picker.php b/fields/color_picker.php
index 5e40828..f631108 100644
--- a/fields/color_picker.php
+++ b/fields/color_picker.php
@@ -155,8 +155,10 @@ class acf_field_color_picker extends acf_field {
 	
 }
 
-new acf_field_color_picker();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_color_picker() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/date_picker.php b/fields/date_picker.php
index c6314d8..eeb0f61 100644
--- a/fields/date_picker.php
+++ b/fields/date_picker.php
@@ -233,6 +233,41 @@ class acf_field_date_picker extends acf_field {
 	}
 	
 	
+	/*
+	*  load_value()
+	*
+	*  This filter is applied to the $value after it is loaded from the db
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$value (mixed) the value found in the database
+	*  @param	$post_id (mixed) the $post_id from which the value was loaded
+	*  @param	$field (array) the field array holding all the field options
+	*  @return	$value
+	*/
+	
+	function load_value( $value, $post_id, $field ) {
+		
+		// bail ealry if no $value
+		if( !$value ) return $value;
+		
+		
+		// date field is currently saved as Ymd (not Y-m-d). Convert it
+		if( strlen($value) == 8 ) {
+			
+			$value = substr($value, 0, 4) . '-' . substr($value, 4, 2) . '-' . substr($value, 6, 2);
+			
+		}
+		
+		
+		// return
+		return $value;
+		
+	}
+	
+	
 	/*
 	*  format_value()
 	*
@@ -255,10 +290,44 @@ class acf_field_date_picker extends acf_field {
 		
 	}
 	
+	
+	/*
+	*  update_value()
+	*
+	*  This filter is appied to the $value before it is updated in the db
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$value - the value which will be saved in the database
+	*  @param	$post_id - the $post_id of which the value will be saved
+	*  @param	$field - the field array holding all the field options
+	*
+	*  @return	$value - the modified value
+	*/
+	
+	function update_value( $value, $post_id, $field ) {
+	
+		// bail ealry if no $value
+		if( !$value ) return $value;
+		
+		
+		// remove '-'
+		$value = str_replace('-', '', $value);
+		
+		
+		// return
+		return $value;
+		
+	}
+	
 }
 
-new acf_field_date_picker();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_date_picker() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/date_time_picker.php b/fields/date_time_picker.php
index 923f37b..75f841e 100644
--- a/fields/date_time_picker.php
+++ b/fields/date_time_picker.php
@@ -51,6 +51,7 @@ class acf_field_date_and_time_picker extends acf_field {
 	        'timezoneText'		=> _x('Time Zone',		'Date Time Picker JS timezoneText', 	'acf'),
 	        'currentText'		=> _x('Now',			'Date Time Picker JS currentText', 		'acf'),
 	        'closeText'			=> _x('Done',			'Date Time Picker JS closeText', 		'acf'),
+	        'selectText'		=> _x('Select',			'Date Time Picker JS selectText', 		'acf'),
 	        'amNames'			=> array(
 		        					_x('AM',			'Date Time Picker JS amText', 			'acf'),
 									_x('A',				'Date Time Picker JS amTextShort', 		'acf'),
@@ -96,63 +97,6 @@ class acf_field_date_and_time_picker extends acf_field {
 	}
 	
 	
-	/*
-	*  _split_date_time
-	*
-	*  This function will split a format string into seperate date and time
-	*
-	*  @type	function
-	*  @date	26/05/2016
-	*  @since	5.3.8
-	*
-	*  @param	$format (string)
-	*  @return	$formats (array)
-	*/
-	
-	function _split_date_time( $date_time = '' ) {
-		
-		// vars
-		$time = array( 'a', 'A', 'h', 'g', 'H', 'G', 'i', 's' );
-		$chars = str_split($date_time);
-		$index = false;
-		
-		
-		// default
-		$data = array(
-			'date' => $date_time,
-			'time' => ''
-		);
-		
-		
-		// loop
-		foreach( $chars as $i => $c ) {
-			
-			// i is set, break loop
-			if( in_array($c, $time) ) {
-				
-				$index = $i;
-				break;
-				
-			}
-			
-		}
-		
-		
-		// if index found
-		if( $index !== false ) {
-			
-			$data['date'] = trim(substr($date_time, 0, $i));
-			$data['time'] = trim(substr($date_time, $i));
-			
-		}
-	
-		
-		// return
-		return $data;	
-		
-	}
-	
-	
 	/*
 	*  render_field()
 	*
@@ -179,7 +123,7 @@ class acf_field_date_and_time_picker extends acf_field {
 		
 		// convert display_format to date and time
 		// the letter 'm' is used for date and minute in JS, so this must be done here in PHP
-		$formats = $this->_split_date_time($field['display_format']);
+		$formats = acf_split_date_time($field['display_format']);
 		
 		
 		// vars
@@ -303,8 +247,10 @@ class acf_field_date_and_time_picker extends acf_field {
 	
 }
 
-new acf_field_date_and_time_picker();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_date_and_time_picker() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/email.php b/fields/email.php
index 83ac5d7..7e1f1b8 100644
--- a/fields/email.php
+++ b/fields/email.php
@@ -62,7 +62,9 @@ class acf_field_email extends acf_field {
 	function render_field( $field ) {
 		
 		// vars
+		$atts = array();
 		$o = array( 'type', 'id', 'class', 'name', 'value', 'placeholder' );
+		$s = array( 'readonly', 'disabled' );
 		$e = '';
 		
 		
@@ -84,8 +86,7 @@ class acf_field_email extends acf_field {
 		}
 		
 		
-		// populate atts
-		$atts = array();
+		// append atts
 		foreach( $o as $k ) {
 		
 			$atts[ $k ] = $field[ $k ];	
@@ -93,6 +94,14 @@ class acf_field_email extends acf_field {
 		}
 		
 		
+		// append special atts
+		foreach( $s as $k ) {
+		
+			if( !empty($field[ $k ]) ) $atts[ $k ] = $k;
+			
+		}
+		
+		
 		// render
 		$e .= '<div class="acf-input-wrap">';
 		$e .= '<input ' . acf_esc_attr( $atts ) . ' />';
@@ -158,8 +167,10 @@ class acf_field_email extends acf_field {
 	
 }
 
-new acf_field_email();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_email() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/file.php b/fields/file.php
index 9d254ed..eb74d86 100644
--- a/fields/file.php
+++ b/fields/file.php
@@ -417,8 +417,10 @@ class acf_field_file extends acf_field {
 	
 }
 
-new acf_field_file();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_file() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/google-map.php b/fields/google-map.php
index 7f45b3b..f3ec14b 100644
--- a/fields/google-map.php
+++ b/fields/google-map.php
@@ -81,7 +81,7 @@ class acf_field_google_map extends acf_field {
 		
 		
 		// value
-		$field['value'] = acf_parse_args($field['value'], array(
+		$field['value'] = wp_parse_args($field['value'], array(
 			'address'	=> '',
 			'lat'		=> '',
 			'lng'		=> ''
@@ -292,11 +292,17 @@ class acf_field_google_map extends acf_field {
    	
    	function input_admin_footer() {
 	   	
+	   	// bail ealry if no qneueu
+	   	if( !acf_get_setting('enqueue_google_maps') ) return;
+	   	
+	   	
 	   	// vars
 	   	$api = array(
-			'libraries'		=> 'places',
-			'key'			=> acf_get_setting('google_api_key'),
-			'client'		=> acf_get_setting('google_api_client')
+			'key'		=> acf_get_setting('google_api_key'),
+			'client'	=> acf_get_setting('google_api_client'),
+			'libraries'	=> 'places',
+			'ver'		=> 3,
+			'callback'	=> ''
 	   	);
 	   	
 	   	
@@ -309,17 +315,23 @@ class acf_field_google_map extends acf_field {
 	   	if( empty($api['client']) ) unset($api['client']);
 	   	
 	   	
+	   	// construct url
+	   	$url = add_query_arg($api, 'https://maps.googleapis.com/maps/api/js');
+	   	
 ?>
 <script type="text/javascript">
-acf.fields.google_map.api = <?php echo json_encode($api); ?>;
+acf.fields.google_map.url = '<?php echo $url; ?>';
 </script>
 <?php
 	
    	}
+   	
 }
 
-new acf_field_google_map();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_google_map() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/image.php b/fields/image.php
index 896bf1d..231fba0 100644
--- a/fields/image.php
+++ b/fields/image.php
@@ -482,8 +482,10 @@ class acf_field_image extends acf_field {
 	
 }
 
-new acf_field_image();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_image() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/message.php b/fields/message.php
index f189762..c920ed1 100644
--- a/fields/message.php
+++ b/fields/message.php
@@ -36,7 +36,7 @@ class acf_field_message extends acf_field {
 		$this->label = __("Message",'acf');
 		$this->category = 'layout';
 		$this->defaults = array(
-			'value'			=> false, // prevents acf_render_fields() from attempting to load value
+			'value'			=> false, // prevents ACF from attempting to load value
 			'message'		=> '',
 			'esc_html'		=> 0,
 			'new_lines'		=> 'wpautop',
@@ -150,6 +150,33 @@ class acf_field_message extends acf_field {
 	}
 	
 	
+	/*
+	*  update_field()
+	*
+	*  This filter is appied to the $field before it is saved to the database
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$field - the field array holding all the field options
+	*  @param	$post_id - the field group ID (post_type = acf)
+	*
+	*  @return	$field - the modified field
+	*/
+
+	function update_field( $field ) {
+		
+		// remove name
+		$field['name'] = '';
+		$field['required'] = 0;
+		
+		
+		// return
+		return $field;
+	}
+	
+	
 	/*
 	*  translate_field
 	*
@@ -176,8 +203,10 @@ class acf_field_message extends acf_field {
 	
 }
 
-new acf_field_message();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_message() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/number.php b/fields/number.php
index 3d29be6..b81fc07 100644
--- a/fields/number.php
+++ b/fields/number.php
@@ -41,9 +41,7 @@ class acf_field_number extends acf_field {
 			'step'			=> '',
 			'placeholder'	=> '',
 			'prepend'		=> '',
-			'append'		=> '',
-			'readonly'		=> 0,
-			'disabled'		=> 0,
+			'append'		=> ''
 		);
 		
 		
@@ -67,7 +65,9 @@ class acf_field_number extends acf_field {
 	function render_field( $field ) {
 		
 		// vars
+		$atts = array();
 		$o = array( 'type', 'id', 'class', 'min', 'max', 'step', 'name', 'value', 'placeholder' );
+		$s = array( 'readonly', 'disabled' );
 		$e = '';
 		
 		
@@ -80,7 +80,7 @@ class acf_field_number extends acf_field {
 		
 		
 		// prepend
-		if( $field['prepend'] !== "" ) {
+		if( $field['prepend'] !== '' ) {
 		
 			$field['class'] .= ' acf-is-prepended';
 			$e .= '<div class="acf-input-prepend">' . $field['prepend'] . '</div>';
@@ -89,7 +89,7 @@ class acf_field_number extends acf_field {
 		
 		
 		// append
-		if( $field['append'] !== "" ) {
+		if( $field['append'] !== '' ) {
 		
 			$field['class'] .= ' acf-is-appended';
 			$e .= '<div class="acf-input-append">' . $field['append'] . '</div>';
@@ -97,8 +97,7 @@ class acf_field_number extends acf_field {
 		}
 		
 		
-		// populate atts
-		$atts = array();
+		// append atts
 		foreach( $o as $k ) {
 		
 			$atts[ $k ] = $field[ $k ];	
@@ -106,14 +105,10 @@ class acf_field_number extends acf_field {
 		}
 		
 		
-		// special atts
-		foreach( array( 'readonly', 'disabled' ) as $k ) {
+		// append special atts
+		foreach( $s as $k ) {
 		
-			if( $field[ $k ] ) {
-			
-				$atts[ $k ] = $k;
-				
-			}
+			if( !empty($field[ $k ]) ) $atts[ $k ] = $k;
 			
 		}
 		
@@ -317,8 +312,10 @@ class acf_field_number extends acf_field {
 	
 }
 
-new acf_field_number();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_number() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/oembed.php b/fields/oembed.php
index 16bf831..d85f5fa 100644
--- a/fields/oembed.php
+++ b/fields/oembed.php
@@ -320,8 +320,10 @@ class acf_field_oembed extends acf_field {
 	
 }
 
-new acf_field_oembed();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_oembed() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/page_link.php b/fields/page_link.php
index c30e9f9..4c538f6 100644
--- a/fields/page_link.php
+++ b/fields/page_link.php
@@ -36,10 +36,11 @@ class acf_field_page_link extends acf_field {
 		$this->label = __("Page Link",'acf');
 		$this->category = 'relational';
 		$this->defaults = array(
-			'post_type'		=> array(),
-			'taxonomy'		=> array(),
-			'allow_null' 	=> 0,
-			'multiple'		=> 0,
+			'post_type'			=> array(),
+			'taxonomy'			=> array(),
+			'allow_null' 		=> 0,
+			'multiple'			=> 0,
+			'allow_archives'	=> 1
 		);
 		
 		
@@ -55,33 +56,38 @@ class acf_field_page_link extends acf_field {
 	
 	
 	/*
-	*  get_choices
+	*  ajax_query
 	*
-	*  This function will return an array of data formatted for use in a select2 AJAX response
+	*  description
 	*
 	*  @type	function
-	*  @date	15/10/2014
-	*  @since	5.0.9
+	*  @date	24/10/13
+	*  @since	5.0.0
 	*
-	*  @param	$options (array)
-	*  @return	(array)
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
 	*/
 	
-	function get_choices( $options = array() ) {
+	function ajax_query() {
+		
+		// validate
+		if( !acf_verify_ajax() ) die();
+		
 		
 		// defaults
-   		$options = acf_parse_args($options, array(
+   		$options = acf_parse_args($_POST, array(
 			'post_id'		=> 0,
 			's'				=> '',
-			'lang'			=> false,
 			'field_key'		=> '',
 			'paged'			=> 1
 		));
 		
 		
    		// vars
-   		$r = array();
+   		$results = array();
    		$args = array();
+   		$s = false;
+   		$is_search = false;
    		
 		
 		// paged
@@ -89,10 +95,23 @@ class acf_field_page_link extends acf_field {
    		$args['paged'] = $options['paged'];
    		
    		
+   		// search
+		if( $options['s'] !== '' ) {
+			
+			// strip slashes (search may be integer)
+			$s = wp_unslash( strval($options['s']) );
+			
+			
+			// update vars
+			$args['s'] = $s;
+			$is_search = true;
+			
+		}
+		
+		
 		// load field
 		$field = acf_get_field( $options['field_key'] );
-		
-		if( !$field ) return false;
+		if( !$field ) die();
 		
 		
 		// update $args
@@ -129,14 +148,6 @@ class acf_field_page_link extends acf_field {
 			}
 		}
 		
-				
-		// search
-		if( $options['s'] ) {
-		
-			$args['s'] = $options['s'];
-			
-		}
-		
 		
 		// filters
 		$args = apply_filters('acf/fields/page_link/query', $args, $field, $options['post_id']);
@@ -144,12 +155,8 @@ class acf_field_page_link extends acf_field {
 		$args = apply_filters('acf/fields/page_link/query/key=' . $field['key'], $args, $field, $options['post_id'] );
 		
 		
-		// is search
-		$is_search = !empty( $args['s'] );
-		
-		
-		// add archives to $r
-		if( $args['paged'] == 1 ) {
+		// add archives to $results
+		if( $field['allow_archives'] && $args['paged'] == 1 ) {
 			
 			$archives = array();
 			$archives[] = array(
@@ -159,60 +166,47 @@ class acf_field_page_link extends acf_field {
 			
 			foreach( $args['post_type'] as $post_type ) {
 				
+				// vars
 				$archive_link = get_post_type_archive_link( $post_type );
 				
-				if( $archive_link ) {
 				
-					$archives[] = array(
-						'id'	=> $archive_link,
-						'text'	=> $archive_link
-					);
-					
-				}
+				// bail ealry if no link
+				if( !$archive_link ) continue;
 				
-			}
-			
-			
-			// search
-			if( $is_search ) {
 				
-				foreach( array_keys($archives) as $i ) {
-					
-					if( strpos( $archives[$i]['text'], $args['s'] ) === false ) {
-						
-						unset($archives[$i]);
-						
-					}
-					
-				}
+				// bail early if no search match
+				if( $is_search && stripos($archive_link, $s) === false ) continue;
 				
-				$archives = array_values($archives);
 				
-			}
-			
-			
-			if( !empty($archives) ) {
-				
-				$r[] = array(
-					'text'		=> __('Archives', 'acf'),
-					'children'	=> $archives
+				// append
+				$archives[] = array(
+					'id'	=> $archive_link,
+					'text'	=> $archive_link
 				);
 				
 			}
 			
+			
+			// append
+			$results[] = array(
+				'text'		=> __('Archives', 'acf'),
+				'children'	=> $archives
+			);
+			
 		}
 		
 		
 		// get posts grouped by post type
 		$groups = acf_get_grouped_posts( $args );
 		
+		
+		// loop
 		if( !empty($groups) ) {
 			
 			foreach( array_keys($groups) as $group_title ) {
 				
 				// vars
 				$posts = acf_extract_var( $groups, $group_title );
-				$titles = array();
 				
 				
 				// data
@@ -222,16 +216,16 @@ class acf_field_page_link extends acf_field {
 				);
 				
 				
+				// convert post objects to post titles
 				foreach( array_keys($posts) as $post_id ) {
 					
-					// override data
-					$posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
+					$posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'], $is_search );
 					
-				};
+				}
 				
 				
-				// order by search
-				if( $is_search ) {
+				// order posts by search
+				if( $is_search && empty($args['orderby']) ) {
 					
 					$posts = acf_order_by_search( $posts, $args['s'] );
 					
@@ -241,66 +235,65 @@ class acf_field_page_link extends acf_field {
 				// append to $data
 				foreach( array_keys($posts) as $post_id ) {
 					
-					$data['children'][] = array(
-						'id'	=> $post_id,
-						'text'	=> $posts[ $post_id ]
-					);
+					$data['children'][] = $this->get_post_result( $post_id, $posts[ $post_id ]);
 					
 				}
 				
 				
-				// append to $r
-				$r[] = $data;
+				// append to $results
+				$results[] = $data;
 				
 			}
 			
 		}
-				
+		
 		
 		// return
-		return $r;
-			
+		acf_send_ajax_results(array(
+			'results'	=> $results,
+			'limit'		=> $args['posts_per_page']
+		));
+		
 	}
 	
 	
 	/*
-	*  ajax_query
+	*  get_post_result
 	*
-	*  description
+	*  This function will return an array containing id, text and maybe description data
 	*
 	*  @type	function
-	*  @date	24/10/13
-	*  @since	5.0.0
+	*  @date	7/07/2016
+	*  @since	5.4.0
 	*
-	*  @param	$post_id (int)
-	*  @return	$post_id (int)
+	*  @param	$id (mixed)
+	*  @param	$text (string)
+	*  @return	(array)
 	*/
 	
-	function ajax_query() {
+	function get_post_result( $id, $text ) {
 		
-		// validate
-		if( !acf_verify_ajax() ) {
+		// vars
+		$result = array(
+			'id'	=> $id,
+			'text'	=> $text
+		);
 		
-			die();
+		
+		// look for parent
+		$search = '| ' . __('Parent', 'acf') . ':';
+		$pos = strpos($text, $search);
+		
+		if( $pos !== false ) {
+			
+			$result['description'] = substr($text, $pos+2);
+			$result['text'] = substr($text, 0, $pos);
 			
 		}
 		
 		
-		// get choices
-		$choices = $this->get_choices( $_POST );
-		
-		
-		// validate
-		if( !$choices ) {
-			
-			die();
-			
-		}
-		
-		
-		// return JSON
-		echo json_encode( $choices );
-		die();
+		// return
+		return $result;
 			
 	}
 	
@@ -338,6 +331,7 @@ class acf_field_page_link extends acf_field {
 		
 		// return
 		return $title;
+		
 	}
 	
 	
@@ -543,6 +537,20 @@ class acf_field_page_link extends acf_field {
 		));
 		
 		
+		// allow_archives
+		acf_render_field_setting( $field, array(
+			'label'			=> __('Allow Archives URLs','acf'),
+			'instructions'	=> '',
+			'type'			=> 'radio',
+			'name'			=> 'allow_archives',
+			'choices'		=> array(
+				1				=> __("Yes",'acf'),
+				0				=> __("No",'acf'),
+			),
+			'layout'	=>	'horizontal',
+		));
+		
+		
 		// multiple
 		acf_render_field_setting( $field, array(
 			'label'			=> __('Select multiple values?','acf'),
@@ -690,8 +698,10 @@ class acf_field_page_link extends acf_field {
 	
 }
 
-new acf_field_page_link();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_page_link() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/password.php b/fields/password.php
index 745919d..ef10e4b 100644
--- a/fields/password.php
+++ b/fields/password.php
@@ -63,12 +63,14 @@ class acf_field_password extends acf_field {
 	function render_field( $field ) {
 		
 		// vars
+		$atts = array();
 		$o = array( 'type', 'id', 'class', 'name', 'value', 'placeholder' );
+		$s = array( 'readonly', 'disabled' );
 		$e = '';
 		
 		
 		// prepend
-		if( $field['prepend'] !== "" ) {
+		if( $field['prepend'] !== '' ) {
 		
 			$field['class'] .= ' acf-is-prepended';
 			$e .= '<div class="acf-input-prepend">' . $field['prepend'] . '</div>';
@@ -77,7 +79,7 @@ class acf_field_password extends acf_field {
 		
 		
 		// append
-		if( $field['append'] !== "" ) {
+		if( $field['append'] !== '' ) {
 		
 			$field['class'] .= ' acf-is-appended';
 			$e .= '<div class="acf-input-append">' . $field['append'] . '</div>';
@@ -85,8 +87,7 @@ class acf_field_password extends acf_field {
 		}
 		
 		
-		// populate atts
-		$atts = array();
+		// append atts
 		foreach( $o as $k ) {
 		
 			$atts[ $k ] = $field[ $k ];	
@@ -94,14 +95,10 @@ class acf_field_password extends acf_field {
 		}
 		
 		
-		// special atts
-		foreach( array( 'readonly', 'disabled' ) as $k ) {
+		// append special atts
+		foreach( $s as $k ) {
 		
-			if( $field[ $k ] ) {
-			
-				$atts[ $k ] = $k;
-				
-			}
+			if( !empty($field[ $k ]) ) $atts[ $k ] = $k;
 			
 		}
 		
@@ -161,8 +158,10 @@ class acf_field_password extends acf_field {
 	
 }
 
-new acf_field_password();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_password() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/post_object.php b/fields/post_object.php
index 2ed0eb3..98eec74 100644
--- a/fields/post_object.php
+++ b/fields/post_object.php
@@ -56,173 +56,6 @@ class acf_field_post_object extends acf_field {
 	}
 	
 	
-	/*
-	*  get_choices
-	*
-	*  This function will return an array of data formatted for use in a select2 AJAX response
-	*
-	*  @type	function
-	*  @date	15/10/2014
-	*  @since	5.0.9
-	*
-	*  @param	$options (array)
-	*  @return	(array)
-	*/
-	
-	function get_choices( $options = array() ) {
-		
-		// defaults
-   		$options = acf_parse_args($options, array(
-			'post_id'		=> 0,
-			's'				=> '',
-			'field_key'		=> '',
-			'paged'			=> 1
-		));
-		
-		
-		// vars
-   		$r = array();
-   		$args = array();
-   		
-		
-		// paged
-   		$args['posts_per_page'] = 20;
-   		$args['paged'] = $options['paged'];
-   		
-   		
-		// load field
-		$field = acf_get_field( $options['field_key'] );
-		
-		
-		// bail early if no field
-		if( !$field ) return false;
-		
-		
-		// update $args
-		if( !empty($field['post_type']) ) {
-		
-			$args['post_type'] = acf_get_array( $field['post_type'] );
-			
-		} else {
-			
-			$args['post_type'] = acf_get_post_types();
-			
-		}
-
-		
-		// create tax queries
-		if( !empty($field['taxonomy']) ) {
-			
-			// append to $args
-			$args['tax_query'] = array();
-			
-			
-			// decode terms
-			$taxonomies = acf_decode_taxonomy_terms( $field['taxonomy'] );
-			
-			
-			// now create the tax queries
-			foreach( $taxonomies as $taxonomy => $terms ) {
-			
-				$args['tax_query'][] = array(
-					'taxonomy'	=> $taxonomy,
-					'field'		=> 'slug',
-					'terms'		=> $terms,
-				);
-				
-			}
-			
-		}
-		
-		
-		// search
-		if( $options['s'] ) {
-		
-			$args['s'] = $options['s'];
-			
-		}
-		
-		
-		// filters
-		$args = apply_filters('acf/fields/post_object/query', $args, $field, $options['post_id']);
-		$args = apply_filters('acf/fields/post_object/query/name=' . $field['name'], $args, $field, $options['post_id'] );
-		$args = apply_filters('acf/fields/post_object/query/key=' . $field['key'], $args, $field, $options['post_id'] );
-		
-		
-		// is search
-		$is_search = !empty( $args['s'] );
-		
-		
-		// get posts grouped by post type
-		$groups = acf_get_grouped_posts( $args );
-		
-		
-		// bail early if no posts
-		if( empty($groups) ) return false;
-		
-		
-		// loop
-		foreach( array_keys($groups) as $group_title ) {
-			
-			// vars
-			$posts = acf_extract_var( $groups, $group_title );
-			$titles = array();
-			
-			
-			// data
-			$data = array(
-				'text'		=> $group_title,
-				'children'	=> array()
-			);
-			
-			
-			foreach( array_keys($posts) as $post_id ) {
-				
-				// override data
-				$posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
-				
-			};
-			
-			
-			// order by search
-			if( $is_search ) {
-				
-				$posts = acf_order_by_search( $posts, $args['s'] );
-				
-			}
-			
-			
-			// append to $data
-			foreach( array_keys($posts) as $post_id ) {
-				
-				$data['children'][] = array(
-					'id'	=> $post_id,
-					'text'	=> $posts[ $post_id ]
-				);
-				
-			}
-			
-			
-			// append to $r
-			$r[] = $data;
-			
-		}
-		
-		
-		// optgroup or single
-		if( count($args['post_type']) == 1 ) {
-			
-			$r = $r[0]['children'];
-			
-		}
-		
-		
-		// return
-		return $r;
-		
-	}
-	
-	
 	/*
 	*  ajax_query
 	*
@@ -239,28 +72,227 @@ class acf_field_post_object extends acf_field {
 	function ajax_query() {
 		
 		// validate
-		if( !acf_verify_ajax() ) {
-		
-			die();
-			
-		}
+		if( !acf_verify_ajax() ) die();
 		
 		
 		// get choices
-		$choices = $this->get_choices( $_POST );
+		$response = $this->get_ajax_query( $_POST );
 		
 		
-		// validate
-		if( !$choices ) {
+		// return
+		acf_send_ajax_results($response);
 			
-			die();
+	}
+	
+	
+	/*
+	*  get_ajax_query
+	*
+	*  This function will return an array of data formatted for use in a select2 AJAX response
+	*
+	*  @type	function
+	*  @date	15/10/2014
+	*  @since	5.0.9
+	*
+	*  @param	$options (array)
+	*  @return	(array)
+	*/
+	
+	function get_ajax_query( $options = array() ) {
+		
+   		// defaults
+   		$options = acf_parse_args($options, array(
+			'post_id'		=> 0,
+			's'				=> '',
+			'field_key'		=> '',
+			'paged'			=> 1
+		));
+		
+		
+		// load field
+		$field = acf_get_field( $options['field_key'] );
+		if( !$field ) return false;
+		
+		
+		// vars
+   		$results = array();
+		$args = array();
+		$s = false;
+		$is_search = false;
+		
+		
+   		// paged
+   		$args['posts_per_page'] = 20;
+   		$args['paged'] = $options['paged'];
+   		
+   		
+   		// search
+		if( $options['s'] !== '' ) {
+			
+			// strip slashes (search may be integer)
+			$s = wp_unslash( strval($options['s']) );
+			
+			
+			// update vars
+			$args['s'] = $s;
+			$is_search = true;
+			
+		}
+		
+				
+		// post_type
+		if( !empty($field['post_type']) ) {
+		
+			$args['post_type'] = acf_get_array( $field['post_type'] );
+			
+		} else {
+			
+			$args['post_type'] = acf_get_post_types();
 			
 		}
 		
 		
-		// return JSON
-		echo json_encode( $choices );
-		die();
+		// taxonomy
+		if( !empty($field['taxonomy']) ) {
+			
+			// vars
+			$terms = acf_decode_taxonomy_terms( $field['taxonomy'] );
+			
+			
+			// append to $args
+			$args['tax_query'] = array();
+			
+			
+			// now create the tax queries
+			foreach( $terms as $k => $v ) {
+			
+				$args['tax_query'][] = array(
+					'taxonomy'	=> $k,
+					'field'		=> 'slug',
+					'terms'		=> $v,
+				);
+				
+			}
+			
+		}
+		
+		
+		// filters
+		$args = apply_filters('acf/fields/post_object/query', $args, $field, $options['post_id']);
+		$args = apply_filters('acf/fields/post_object/query/name=' . $field['name'], $args, $field, $options['post_id'] );
+		$args = apply_filters('acf/fields/post_object/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+		
+		
+		// get posts grouped by post type
+		$groups = acf_get_grouped_posts( $args );
+		
+		
+		// bail early if no posts
+		if( empty($groups) ) return false;
+		
+		
+		// loop
+		foreach( array_keys($groups) as $group_title ) {
+			
+			// vars
+			$posts = acf_extract_var( $groups, $group_title );
+			
+			
+			// data
+			$data = array(
+				'text'		=> $group_title,
+				'children'	=> array()
+			);
+			
+			
+			// convert post objects to post titles
+			foreach( array_keys($posts) as $post_id ) {
+				
+				$posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'], $is_search );
+				
+			}
+			
+			
+			// order posts by search
+			if( $is_search && empty($args['orderby']) ) {
+				
+				$posts = acf_order_by_search( $posts, $args['s'] );
+				
+			}
+			
+			
+			// append to $data
+			foreach( array_keys($posts) as $post_id ) {
+				
+				$data['children'][] = $this->get_post_result( $post_id, $posts[ $post_id ]);
+				
+			}
+			
+			
+			// append to $results
+			$results[] = $data;
+			
+		}
+		
+		
+		// optgroup or single
+		if( count($args['post_type']) == 1 ) {
+			
+			$results = $results[0]['children'];
+			
+		}
+		
+		
+		// vars
+		$response = array(
+			'results'	=> $results,
+			'limit'		=> $args['posts_per_page']
+		);
+		
+		
+		// return
+		return $response;
+			
+	}
+	
+	
+	/*
+	*  get_post_result
+	*
+	*  This function will return an array containing id, text and maybe description data
+	*
+	*  @type	function
+	*  @date	7/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$id (mixed)
+	*  @param	$text (string)
+	*  @return	(array)
+	*/
+	
+	function get_post_result( $id, $text ) {
+		
+		// vars
+		$result = array(
+			'id'	=> $id,
+			'text'	=> $text
+		);
+		
+		
+		// look for parent
+		$search = '| ' . __('Parent', 'acf') . ':';
+		$pos = strpos($text, $search);
+		
+		if( $pos !== false ) {
+			
+			$result['description'] = substr($text, $pos+2);
+			$result['text'] = substr($text, 0, $pos);
+			
+		}
+		
+		
+		// return
+		return $result;
 			
 	}
 	
@@ -322,29 +354,19 @@ class acf_field_post_object extends acf_field {
 		$field['choices'] = array();
 		
 		
-		// populate choices if value exists
-		if( !empty($field['value']) ) {
-			
-			// get posts
-			$posts = acf_get_posts(array(
-				'post__in' => $field['value'],
-				'post_type'	=> $field['post_type']
-			));
-			
-			
-			// set choices
-			if( !empty($posts) ) {
+		// load posts
+		$posts = $this->get_posts( $field['value'], $field );
+		
+		if( $posts ) {
 				
-				foreach( array_keys($posts) as $i ) {
-					
-					// vars
-					$post = acf_extract_var( $posts, $i );
-					
-					
-					// append to choices
-					$field['choices'][ $post->ID ] = $this->get_post_title( $post, $field );
-					
-				}
+			foreach( array_keys($posts) as $i ) {
+				
+				// vars
+				$post = acf_extract_var( $posts, $i );
+				
+				
+				// append to choices
+				$field['choices'][ $post->ID ] = $this->get_post_title( $post, $field );
 				
 			}
 			
@@ -353,6 +375,7 @@ class acf_field_post_object extends acf_field {
 		
 		// render
 		acf_render_field( $field );
+		
 	}
 	
 	
@@ -461,15 +484,12 @@ class acf_field_post_object extends acf_field {
 	function load_value( $value, $post_id, $field ) {
 		
 		// ACF4 null
-		if( $value === 'null' ) {
-		
-			return false;
-			
-		}
+		if( $value === 'null' ) return false;
 		
 		
 		// return
 		return $value;
+		
 	}
 	
 	
@@ -491,38 +511,26 @@ class acf_field_post_object extends acf_field {
 	
 	function format_value( $value, $post_id, $field ) {
 		
+		// numeric
+		$value = acf_get_numeric($value);
+		
+		
 		// bail early if no value
-		if( empty($value) ) {
-			
-			return $value;
-		
-		}
-		
-		
-		// force value to array
-		$value = acf_get_array( $value );
-		
-		
-		// convert values to int
-		$value = array_map('intval', $value);
+		if( empty($value) ) return false;
 		
 		
 		// load posts if needed
 		if( $field['return_format'] == 'object' ) {
 			
-			// get posts
-			$value = acf_get_posts(array(
-				'post__in' => $value,
-				'post_type'	=> $field['post_type']
-			));
-		
+			$value = $this->get_posts( $value, $field );
+			
 		}
 		
 		
 		// convert back from array if neccessary
-		if( !$field['multiple'] ) {
+		if( !$field['multiple'] && acf_is_array($value) ) {
 		
-			$value = array_shift($value);
+			$value = current($value);
 			
 		}
 		
@@ -591,10 +599,48 @@ class acf_field_post_object extends acf_field {
 		
 	}
 	
+	
+	/*
+	*  get_posts
+	*
+	*  This function will return an array of posts for a given field value
+	*
+	*  @type	function
+	*  @date	13/06/2014
+	*  @since	5.0.0
+	*
+	*  @param	$value (array)
+	*  @return	$value
+	*/
+	
+	function get_posts( $value, $field ) {
+		
+		// numeric
+		$value = acf_get_numeric($value);
+		
+		
+		// bail early if no value
+		if( empty($value) ) return false;
+		
+		
+		// get posts
+		$posts = acf_get_posts(array(
+			'post__in'	=> $value,
+			'post_type'	=> $field['post_type']
+		));
+		
+		
+		// return
+		return $posts;
+		
+	}
+	
 }
 
-new acf_field_post_object();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_post_object() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/radio.php b/fields/radio.php
index 6402363..52244d7 100644
--- a/fields/radio.php
+++ b/fields/radio.php
@@ -41,7 +41,8 @@ class acf_field_radio extends acf_field {
 			'default_value'		=> '',
 			'other_choice'		=> 0,
 			'save_other_choice'	=> 0,
-			'allow_null' 		=> 0
+			'allow_null' 		=> 0,
+			'return_format'		=> 'value'
 		);
 		
 		
@@ -301,6 +302,20 @@ class acf_field_radio extends acf_field {
 		));
 		
 		
+		// return_format
+		acf_render_field_setting( $field, array(
+			'label'			=> __('Return Value','acf'),
+			'instructions'	=> __('Specify the returned value on front end','acf'),
+			'type'			=> 'radio',
+			'name'			=> 'return_format',
+			'layout'		=> 'horizontal',
+			'choices'		=> array(
+				'value'			=> __('Value','acf'),
+				'label'			=> __('Label','acf'),
+				'array'			=> __('Both (Array)','acf')
+			)
+		));
+		
 	}
 	
 	
@@ -433,19 +448,39 @@ class acf_field_radio extends acf_field {
 	
 	function translate_field( $field ) {
 		
-		// translate
-		$field['choices'] = acf_translate( $field['choices'] );
+		return acf_get_field_type('select')->translate_field( $field );
 		
+	}
+	
+	
+	/*
+	*  format_value()
+	*
+	*  This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$value (mixed) the value which was loaded from the database
+	*  @param	$post_id (mixed) the $post_id from which the value was loaded
+	*  @param	$field (array) the field array holding all the field options
+	*
+	*  @return	$value (mixed) the modified value
+	*/
+	
+	function format_value( $value, $post_id, $field ) {
 		
-		// return
-		return $field;
+		return acf_get_field_type('select')->format_value( $value, $post_id, $field );
 		
 	}
 	
 }
 
-new acf_field_radio();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_radio() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/relationship.php b/fields/relationship.php
index d8a273e..a8b441f 100644
--- a/fields/relationship.php
+++ b/fields/relationship.php
@@ -63,195 +63,6 @@ class acf_field_relationship extends acf_field {
 	}
 	
 	
-	/*
-	*  get_choices
-	*
-	*  This function will return an array of data formatted for use in a select2 AJAX response
-	*
-	*  @type	function
-	*  @date	15/10/2014
-	*  @since	5.0.9
-	*
-	*  @param	$options (array)
-	*  @return	(array)
-	*/
-	
-	function get_choices( $options = array() ) {
-		
-   		// defaults
-   		$options = acf_parse_args($options, array(
-			'post_id'			=> 0,
-			's'					=> '',
-			'post_type'			=> '',
-			'taxonomy'			=> '',
-			'lang'				=> false,
-			'field_key'			=> '',
-			'paged'				=> 1
-		));
-		
-		
-		// vars
-   		$r = array();
-   		$args = array();
-   		
-   		
-   		// paged
-   		$args['posts_per_page'] = 20;
-   		$args['paged'] = $options['paged'];
-   		
-		
-		// load field
-		$field = acf_get_field( $options['field_key'] );
-		
-		if( !$field ) return false;
-		
-		
-		// update $args
-		if( !empty($options['post_type']) ) {
-			
-			$args['post_type'] = acf_get_array( $options['post_type'] );
-		
-		} elseif( !empty($field['post_type']) ) {
-		
-			$args['post_type'] = acf_get_array( $field['post_type'] );
-			
-		} else {
-			
-			$args['post_type'] = acf_get_post_types();
-		}
-		
-		
-		// update taxonomy
-		$taxonomies = array();
-		
-		if( !empty($options['taxonomy']) ) {
-			
-			$term = acf_decode_taxonomy_term($options['taxonomy']);
-			
-			// append to $args
-			$args['tax_query'] = array(
-				
-				array(
-					'taxonomy'	=> $term['taxonomy'],
-					'field'		=> 'slug',
-					'terms'		=> $term['term'],
-				)
-				
-			);
-			
-			
-		} elseif( !empty($field['taxonomy']) ) {
-			
-			$taxonomies = acf_decode_taxonomy_terms( $field['taxonomy'] );
-			
-			// append to $args
-			$args['tax_query'] = array();
-			
-			
-			// now create the tax queries
-			foreach( $taxonomies as $taxonomy => $terms ) {
-			
-				$args['tax_query'][] = array(
-					'taxonomy'	=> $taxonomy,
-					'field'		=> 'slug',
-					'terms'		=> $terms,
-				);
-				
-			}
-			
-		}	
-		
-		
-		// search
-		if( $options['s'] ) {
-		
-			$args['s'] = $options['s'];
-			
-		}
-		
-		
-		// filters
-		$args = apply_filters('acf/fields/relationship/query', $args, $field, $options['post_id']);
-		$args = apply_filters('acf/fields/relationship/query/name=' . $field['name'], $args, $field, $options['post_id'] );
-		$args = apply_filters('acf/fields/relationship/query/key=' . $field['key'], $args, $field, $options['post_id'] );
-		
-		
-		// is search
-		$is_search = !empty( $args['s'] );
-		
-		
-		// get posts grouped by post type
-		$groups = acf_get_grouped_posts( $args );
-		
-		
-		// bail early if no posts
-		if( empty($groups) ) return false;
-		
-		
-		// loop
-		foreach( array_keys($groups) as $group_title ) {
-			
-			// vars
-			$posts = acf_extract_var( $groups, $group_title );
-			$titles = array();
-			
-			
-			// data
-			$data = array(
-				'text'		=> $group_title,
-				'children'	=> array()
-			);
-			
-			
-			foreach( array_keys($posts) as $post_id ) {
-				
-				// override data
-				$posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
-				
-			};
-			
-			
-			// order by search
-			if( $is_search ) {
-				
-				$posts = acf_order_by_search( $posts, $args['s'] );
-				
-			}
-			
-			
-			// append to $data
-			foreach( array_keys($posts) as $post_id ) {
-				
-				$data['children'][] = array(
-					'id'	=> $post_id,
-					'text'	=> $posts[ $post_id ]
-				);
-				
-			}
-			
-			
-			// append to $r
-			$r[] = $data;
-			
-		}
-		
-		
-		// add as optgroup or results
-		if( count($args['post_type']) == 1 ) {
-			
-			$r = $r[0]['children'];
-			
-		}
-			
-		
-		
-		
-		// return
-		return $r;
-			
-	}
-	
-	
 	/*
 	*  ajax_query
 	*
@@ -268,28 +79,239 @@ class acf_field_relationship extends acf_field {
 	function ajax_query() {
 		
 		// validate
-		if( !acf_verify_ajax() ) {
+		if( !acf_verify_ajax() ) die();
 		
-			die();
+		
+		// get choices
+		$response = $this->get_ajax_query( $_POST );
+		
+		
+		// return
+		acf_send_ajax_results($response);
+			
+	}
+	
+	
+	/*
+	*  get_ajax_query
+	*
+	*  This function will return an array of data formatted for use in a select2 AJAX response
+	*
+	*  @type	function
+	*  @date	15/10/2014
+	*  @since	5.0.9
+	*
+	*  @param	$options (array)
+	*  @return	(array)
+	*/
+	
+	function get_ajax_query( $options = array() ) {
+		
+   		// defaults
+   		$options = acf_parse_args($options, array(
+			'post_id'		=> 0,
+			's'				=> '',
+			'field_key'		=> '',
+			'paged'			=> 1,
+			'post_type'		=> '',
+			'taxonomy'		=> ''
+		));
+		
+		
+		// load field
+		$field = acf_get_field( $options['field_key'] );
+		if( !$field ) return false;
+		
+		
+		// vars
+   		$results = array();
+		$args = array();
+		$s = false;
+		$is_search = false;
+		
+		
+   		// paged
+   		$args['posts_per_page'] = 20;
+   		$args['paged'] = $options['paged'];
+   		
+   		
+   		// search
+		if( $options['s'] !== '' ) {
+			
+			// strip slashes (search may be integer)
+			$s = wp_unslash( strval($options['s']) );
+			
+			
+			// update vars
+			$args['s'] = $s;
+			$is_search = true;
 			
 		}
 		
 		
-		// get posts
-		$posts = $this->get_choices( $_POST );
-		
-		
-		// validate
-		if( !$posts ) {
+		// post_type
+		if( !empty($options['post_type']) ) {
 			
-			die();
+			$args['post_type'] = acf_get_array( $options['post_type'] );
+		
+		} elseif( !empty($field['post_type']) ) {
+		
+			$args['post_type'] = acf_get_array( $field['post_type'] );
+			
+		} else {
+			
+			$args['post_type'] = acf_get_post_types();
 			
 		}
 		
 		
-		// return JSON
-		echo json_encode( $posts );
-		die();
+		// taxonomy
+		if( !empty($options['taxonomy']) ) {
+			
+			// vars
+			$term = acf_decode_taxonomy_term($options['taxonomy']);
+			
+			
+			// tax query
+			$args['tax_query'] = array();
+			
+			
+			// append
+			$args['tax_query'][] = array(
+				'taxonomy'	=> $term['taxonomy'],
+				'field'		=> 'slug',
+				'terms'		=> $term['term'],
+			);
+			
+			
+		} elseif( !empty($field['taxonomy']) ) {
+			
+			// vars
+			$terms = acf_decode_taxonomy_terms( $field['taxonomy'] );
+			
+			
+			// append to $args
+			$args['tax_query'] = array();
+			
+			
+			// now create the tax queries
+			foreach( $terms as $k => $v ) {
+			
+				$args['tax_query'][] = array(
+					'taxonomy'	=> $k,
+					'field'		=> 'slug',
+					'terms'		=> $v,
+				);
+				
+			}
+			
+		}	
+		
+		
+		// filters
+		$args = apply_filters('acf/fields/relationship/query', $args, $field, $options['post_id']);
+		$args = apply_filters('acf/fields/relationship/query/name=' . $field['name'], $args, $field, $options['post_id'] );
+		$args = apply_filters('acf/fields/relationship/query/key=' . $field['key'], $args, $field, $options['post_id'] );
+		
+		
+		// get posts grouped by post type
+		$groups = acf_get_grouped_posts( $args );
+		
+		
+		// bail early if no posts
+		if( empty($groups) ) return false;
+		
+		
+		// loop
+		foreach( array_keys($groups) as $group_title ) {
+			
+			// vars
+			$posts = acf_extract_var( $groups, $group_title );
+			
+			
+			// data
+			$data = array(
+				'text'		=> $group_title,
+				'children'	=> array()
+			);
+			
+			
+			// convert post objects to post titles
+			foreach( array_keys($posts) as $post_id ) {
+				
+				$posts[ $post_id ] = $this->get_post_title( $posts[ $post_id ], $field, $options['post_id'] );
+				
+			}
+			
+			
+			// order posts by search
+			if( $is_search && empty($args['orderby']) ) {
+				
+				$posts = acf_order_by_search( $posts, $args['s'] );
+				
+			}
+			
+			
+			// append to $data
+			foreach( array_keys($posts) as $post_id ) {
+				
+				$data['children'][] = $this->get_post_result( $post_id, $posts[ $post_id ]);
+				
+			}
+			
+			
+			// append to $results
+			$results[] = $data;
+			
+		}
+		
+		
+		// add as optgroup or results
+		if( count($args['post_type']) == 1 ) {
+			
+			$results = $results[0]['children'];
+			
+		}
+		
+		
+		// vars
+		$response = array(
+			'results'	=> $results,
+			'limit'		=> $args['posts_per_page']
+		);
+		
+		
+		// return
+		return $response;
+			
+	}
+	
+	
+	/*
+	*  get_post_result
+	*
+	*  This function will return an array containing id, text and maybe description data
+	*
+	*  @type	function
+	*  @date	7/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$id (mixed)
+	*  @param	$text (string)
+	*  @return	(array)
+	*/
+	
+	function get_post_result( $id, $text ) {
+		
+		// vars
+		$result = array(
+			'id'	=> $id,
+			'text'	=> $text
+		);
+		
+		
+		// return
+		return $result;
 			
 	}
 	
@@ -917,8 +939,10 @@ class acf_field_relationship extends acf_field {
 		
 }
 
-new acf_field_relationship();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_relationship() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/select.php b/fields/select.php
index d53a337..bc2d87f 100644
--- a/fields/select.php
+++ b/fields/select.php
@@ -33,7 +33,7 @@ class acf_field_select extends acf_field {
 		
 		// vars
 		$this->name = 'select';
-		$this->label = __("Select",'acf');
+		$this->label = _x('Select', 'noun', 'acf');
 		$this->category = 'choice';
 		$this->defaults = array(
 			'multiple' 		=> 0,
@@ -43,8 +43,7 @@ class acf_field_select extends acf_field {
 			'ui'			=> 0,
 			'ajax'			=> 0,
 			'placeholder'	=> '',
-			'disabled'		=> 0,
-			'readonly'		=> 0,
+			'return_format'	=> 'value'
 		);
 		$this->l10n = array(
 			'matches_1'				=> _x('One result is available, press enter to select it.',	'Select2 JS matches_1',	'acf'),
@@ -113,7 +112,7 @@ class acf_field_select extends acf_field {
 	
 	
 	/*
-	*  query_posts
+	*  ajax_query
 	*
 	*  description
 	*
@@ -121,76 +120,106 @@ class acf_field_select extends acf_field {
 	*  @date	24/10/13
 	*  @since	5.0.0
 	*
-	*  @param	n/a
-	*  @return	n/a
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
 	*/
 	
 	function ajax_query() {
 		
-   		// options
-   		$options = acf_parse_args( $_POST, array(
-			'post_id'					=>	0,
-			's'							=>	'',
-			'field_key'					=>	'',
-			'nonce'						=>	'',
+		// validate
+		if( !acf_verify_ajax() ) die();
+		
+		
+		// get choices
+		$response = $this->get_ajax_query( $_POST );
+		
+		
+		// return
+		acf_send_ajax_results($response);
+			
+	}
+	
+	
+	/*
+	*  get_ajax_query
+	*
+	*  This function will return an array of data formatted for use in a select2 AJAX response
+	*
+	*  @type	function
+	*  @date	15/10/2014
+	*  @since	5.0.9
+	*
+	*  @param	$options (array)
+	*  @return	(array)
+	*/
+	
+	function get_ajax_query( $options = array() ) {
+		
+   		// defaults
+   		$options = acf_parse_args($options, array(
+			'post_id'		=> 0,
+			's'				=> '',
+			'field_key'		=> '',
+			'paged'			=> 1
 		));
 		
 		
 		// load field
 		$field = acf_get_field( $options['field_key'] );
+		if( !$field ) return false;
 		
-		if( !$field ) {
 		
-			die();
+		// vars
+   		$results = array();
+   		$s = false;
+   		$is_search = false;
+   		
+   		
+   		// search
+		if( $options['s'] !== '' ) {
+			
+			// strip slashes (search may be integer)
+			$s = wp_unslash( strval($options['s']) );
+			
+			
+			// update vars
+			$is_search = true;
+			
+		}
+		
+		
+		// bail ealry if no choices
+		if( empty($field['choices']) ) return false;
+		
+		
+		// loop 
+		foreach( $field['choices'] as $k => $v ) {
+			
+			// ensure $v is a string
+			$v = strval( $v );
+			
+			
+			// if searching, but doesn't exist
+			if( $is_search && stripos($v, $s) === false ) continue;
+			
+			
+			// append
+			$results[] = array(
+				'id'	=> $k,
+				'text'	=> $v
+			);
 			
 		}
 		
 		
 		// vars
-		$r = array();
-		$s = false;
+		$response = array(
+			'results'	=> $results
+		);
 		
 		
-		// search
-		if( $options['s'] !== '' ) {
-			
-			// search may be integer
-			$s = strval($options['s']);
-			
-			
-			// strip slashes
-			$s = wp_unslash($s);
-			
-		}		
-		
-		
-		// loop through choices
-		if( !empty($field['choices']) ) {
-		
-			foreach( $field['choices'] as $k => $v ) {
-				
-				// if searching, but doesn't exist
-				if( $s !== false && stripos($v, $s) === false ) {
-				
-					continue;
-					
-				}
-				
-				
-				// append
-				$r[] = array(
-					'id'	=> $k,
-					'text'	=> strval( $v )
-				);
-				
-			}
-			
-		}
-		
-		
-		// return JSON
-		echo json_encode( $r );
-		die();
+		// return
+		return $response;
 			
 	}
 	
@@ -217,7 +246,7 @@ class acf_field_select extends acf_field {
 		// placeholder
 		if( empty($field['placeholder']) ) {
 		
-			$field['placeholder'] = __("Select",'acf');
+			$field['placeholder'] = _x('Select', 'verb', 'acf');
 			
 		}
 		
@@ -231,6 +260,7 @@ class acf_field_select extends acf_field {
 		
 		
 		// null
+		// - have tried array_merge but this causes keys to re-index if is numeric (post ID's)
 		if( $field['allow_null'] && !$field['multiple'] ) {
 			
 			$prepend = array(''	=> '- ' . $field['placeholder'] . ' -');
@@ -239,6 +269,7 @@ class acf_field_select extends acf_field {
 		}
 		
 		
+		
 		// vars
 		$atts = array(
 			'id'				=> $field['id'],
@@ -482,6 +513,21 @@ class acf_field_select extends acf_field {
 			),
 			'layout'	=>	'horizontal',
 		));
+		
+		
+		// return_format
+		acf_render_field_setting( $field, array(
+			'label'			=> __('Return Format','acf'),
+			'instructions'	=> __('Specify the value returned','acf'),
+			'type'			=> 'radio',
+			'name'			=> 'return_format',
+			'layout'		=> 'horizontal',
+			'choices'		=> array(
+				'value'			=> __('Value','acf'),
+				'label'			=> __('Label','acf'),
+				'array'			=> __('Both (Array)','acf')
+			)
+		));
 			
 	}
 	
@@ -603,10 +649,89 @@ class acf_field_select extends acf_field {
 		
 	}
 	
+	
+	/*
+	*  format_value()
+	*
+	*  This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$value (mixed) the value which was loaded from the database
+	*  @param	$post_id (mixed) the $post_id from which the value was loaded
+	*  @param	$field (array) the field array holding all the field options
+	*
+	*  @return	$value (mixed) the modified value
+	*/
+	
+	function format_value( $value, $post_id, $field ) {
+		
+		// array
+		if( acf_is_array($value) ) {
+			
+			foreach( $value as $i => $v ) {
+				
+				$value[ $i ] = $this->format_value_single( $v, $post_id, $field );
+				
+			}
+			
+		} else {
+			
+			$value = $this->format_value_single( $value, $post_id, $field );
+			
+		}
+		
+		
+		// return
+		return $value;
+		
+	}
+	
+	
+	function format_value_single( $value, $post_id, $field ) {
+		
+		// bail ealry if is empty
+		if( acf_is_empty($value) ) return $value;
+		
+		
+		// vars
+		$label = acf_maybe_get($field['choices'], $value, $value);
+		
+		
+		// value
+		if( $field['return_format'] == 'value' ) {
+			
+			// do nothing
+		
+		// label	
+		} elseif( $field['return_format'] == 'label' ) {
+			
+			$value = $label;
+		
+		// array	
+		} elseif( $field['return_format'] == 'array' ) {
+			
+			$value = array(
+				'value'	=> $value,
+				'label'	=> $label
+			);
+			
+		}
+		
+		
+		// return
+		return $value;
+		
+	}
+	
 }
 
-new acf_field_select();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_select() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/tab.php b/fields/tab.php
index 0c56c1e..952a632 100644
--- a/fields/tab.php
+++ b/fields/tab.php
@@ -36,7 +36,7 @@ class acf_field_tab extends acf_field {
 		$this->label = __("Tab",'acf');
 		$this->category = 'layout';
 		$this->defaults = array(
-			'value'		=> false, // prevents acf_render_fields() from attempting to load value
+			'value'		=> false, // prevents ACF from attempting to load value
 			'placement'	=> 'top',
 			'endpoint'	=> 0 // added in 5.2.8
 		);
@@ -135,10 +135,39 @@ class acf_field_tab extends acf_field {
 				
 	}
 	
+	
+	/*
+	*  update_field()
+	*
+	*  This filter is appied to the $field before it is saved to the database
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$field - the field array holding all the field options
+	*  @param	$post_id - the field group ID (post_type = acf)
+	*
+	*  @return	$field - the modified field
+	*/
+
+	function update_field( $field ) {
+		
+		// remove name
+		$field['name'] = '';
+		$field['required'] = 0;
+		
+		
+		// return
+		return $field;
+	}
+	
 }
 
-new acf_field_tab();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_tab() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/taxonomy.php b/fields/taxonomy.php
index f4e079c..b7f46bc 100644
--- a/fields/taxonomy.php
+++ b/fields/taxonomy.php
@@ -66,7 +66,36 @@ class acf_field_taxonomy extends acf_field {
 	
 	
 	/*
-	*  get_choices
+	*  ajax_query
+	*
+	*  description
+	*
+	*  @type	function
+	*  @date	24/10/13
+	*  @since	5.0.0
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function ajax_query() {
+		
+		// validate
+		if( !acf_verify_ajax() ) die();
+		
+		
+		// get choices
+		$response = $this->get_ajax_query( $_POST );
+		
+		
+		// return
+		acf_send_ajax_results($response);
+			
+	}
+	
+	
+	/*
+	*  get_ajax_query
 	*
 	*  This function will return an array of data formatted for use in a select2 AJAX response
 	*
@@ -78,7 +107,7 @@ class acf_field_taxonomy extends acf_field {
 	*  @return	(array)
 	*/
 	
-	function get_choices( $options = array() ) {
+	function get_ajax_query( $options = array() ) {
 		
    		// defaults
    		$options = acf_parse_args($options, array(
@@ -91,19 +120,15 @@ class acf_field_taxonomy extends acf_field {
 		
 		// load field
 		$field = acf_get_field( $options['field_key'] );
-		
-		if( !$field ) {
-		
-			return false;
-			
-		}
+		if( !$field ) return false;
 		
 		
 		// vars
-   		$r = array();
+   		$results = array();
 		$args = array();
 		$is_hierarchical = is_taxonomy_hierarchical( $field['taxonomy'] );
 		$is_pagination = ($options['paged'] > 0);
+		$is_search = false;
 		$limit = 20;
 		$offset = 20 * ($options['paged'] - 1);
 		
@@ -114,19 +139,25 @@ class acf_field_taxonomy extends acf_field {
 		
 		// pagination
 		// - don't bother for hierarchial terms, we will need to load all terms anyway
-		if( !$is_hierarchical && $is_pagination ) {
+		if( $is_pagination && !$is_hierarchical ) {
 			
-			$args['offset'] = $offset;
 			$args['number'] = $limit;
+			$args['offset'] = $offset;
 		
 		}
 		
 		
 		// search
-		if( $options['s'] ) {
-		
-			$args['search'] = $options['s'];
-		
+		if( $options['s'] !== '' ) {
+			
+			// strip slashes (search may be integer)
+			$s = wp_unslash( strval($options['s']) );
+			
+			
+			// update vars
+			$args['search'] = $s;
+			$is_search = true;
+			
 		}
 		
 		
@@ -134,7 +165,7 @@ class acf_field_taxonomy extends acf_field {
 		$args = apply_filters('acf/fields/taxonomy/query', $args, $field, $options['post_id']);
 		$args = apply_filters('acf/fields/taxonomy/query/name=' . $field['name'], $args, $field, $options['post_id'] );
 		$args = apply_filters('acf/fields/taxonomy/query/key=' . $field['key'], $args, $field, $options['post_id'] );
-			
+		
 		
 		// get terms
 		$terms = get_terms( $field['taxonomy'], $args );
@@ -143,13 +174,18 @@ class acf_field_taxonomy extends acf_field {
 		// sort into hierachial order!
 		if( $is_hierarchical ) {
 			
+			// update vars
+			$limit = acf_maybe_get( $args, 'number', $limit );
+			$offset = acf_maybe_get( $args, 'offset', $offset );
+			
+			
 			// get parent
 			$parent = acf_maybe_get( $args, 'parent', 0 );
 			$parent = acf_maybe_get( $args, 'child_of', $parent );
 			
 			
 			// this will fail if a search has taken place because parents wont exist
-			if( empty($args['search']) ) {
+			if( !$is_search ) {
 			
 				$terms = _get_term_children( $parent, $terms, $field['taxonomy'] );
 				
@@ -170,7 +206,7 @@ class acf_field_taxonomy extends acf_field {
 		foreach( $terms as $term ) {
 		
 			// add to json
-			$r[] = array(
+			$results[] = array(
 				'id'	=> $term->term_id,
 				'text'	=> $this->get_term_title( $term, $field, $options['post_id'] )
 			);
@@ -178,42 +214,15 @@ class acf_field_taxonomy extends acf_field {
 		}
 		
 		
+		// vars
+		$response = array(
+			'results'	=> $results,
+			'limit'		=> $limit
+		);
+		
+		
 		// return
-		return $r;
-			
-	}
-	
-	
-	/*
-	*  ajax_query
-	*
-	*  description
-	*
-	*  @type	function
-	*  @date	24/10/13
-	*  @since	5.0.0
-	*
-	*  @param	$post_id (int)
-	*  @return	$post_id (int)
-	*/
-	
-	function ajax_query() {
-		
-		// validate
-		if( !acf_verify_ajax() ) die();
-		
-		
-		// get choices
-		$choices = $this->get_choices( $_POST );
-		
-		
-		// validate
-		if( !$choices ) die();
-		
-		
-		// return JSON
-		echo json_encode( $choices );
-		die();
+		return $response;
 			
 	}
 	
@@ -337,7 +346,8 @@ class acf_field_taxonomy extends acf_field {
 		if( $field['load_terms'] ) {
 			
 			// get terms
-			$term_ids = wp_get_object_terms($post_id, $field['taxonomy'], array('fields' => 'ids', 'orderby' => 'none'));
+			$info = acf_get_post_id_info($post_id);
+			$term_ids = wp_get_object_terms($info['id'], $field['taxonomy'], array('fields' => 'ids', 'orderby' => 'none'));
 			
 			
 			// bail early if no terms
@@ -421,16 +431,6 @@ class acf_field_taxonomy extends acf_field {
 			$term_ids = array_map('intval', $term_ids);
 			
 			
-			// if called directly from frontend update_field()
-			if( !did_action('acf/save_post') ) {
-				
-				wp_set_object_terms( $post_id, $term_ids, $taxonomy, false );
-				
-				return $value;
-				
-			}
-			
-			
 			// get existing term id's (from a previously saved field)
 			$old_term_ids = isset($this->save_post_terms[ $taxonomy ]) ? $this->save_post_terms[ $taxonomy ] : array();
 			
@@ -438,6 +438,16 @@ class acf_field_taxonomy extends acf_field {
 			// append
 			$this->save_post_terms[ $taxonomy ] = array_merge($old_term_ids, $term_ids);
 			
+			
+			// if called directly from frontend update_field()
+			if( !did_action('acf/save_post') ) {
+				
+				$this->save_post( $post_id );
+				
+				return $value;
+				
+			}
+			
 		}
 		
 		
@@ -466,12 +476,15 @@ class acf_field_taxonomy extends acf_field {
 		if( empty($this->save_post_terms) ) return;
 		
 		
+		// vars
+		$info = acf_get_post_id_info($post_id);
 		
-		// loop over terms
+		
+		// loop
 		foreach( $this->save_post_terms as $taxonomy => $term_ids ){
 			
-			wp_set_object_terms( $post_id, $term_ids, $taxonomy, false );
-			
+			// save
+			wp_set_object_terms( $info['id'], $term_ids, $taxonomy, false );
 			
 		}
 		
@@ -756,7 +769,7 @@ class acf_field_taxonomy extends acf_field {
 				),
 				__("Single Value",'acf') => array(
 					'radio' => __('Radio Buttons', 'acf'),
-					'select' => __('Select', 'acf')
+					'select' => _x('Select', 'noun', 'acf')
 				)
 			)
 		));
@@ -960,11 +973,11 @@ class acf_field_taxonomy extends acf_field {
 		if( is_taxonomy_hierarchical( $field['taxonomy'] ) ) {
 			
 			$choices = array();
-			$choices2 = $this->get_choices(array( 'field_key' => $field['key'] ));
+			$response = $this->get_ajax_query($args);
 			
-			if( $choices2 ) {
+			if( $response ) {
 				
-				foreach( $choices2 as $v) { 
+				foreach( $response['results'] as $v ) { 
 					
 					$choices[ $v['id'] ] = $v['text'];
 					
@@ -995,9 +1008,13 @@ class acf_field_taxonomy extends acf_field {
 		
 }
 
-new acf_field_taxonomy();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_taxonomy() );
+
+endif; // class_exists check
+
+
 
 if( ! class_exists('acf_taxonomy_field_walker') ) :
 
diff --git a/fields/text.php b/fields/text.php
index 847ef87..584a87b 100644
--- a/fields/text.php
+++ b/fields/text.php
@@ -39,9 +39,7 @@ class acf_field_text extends acf_field {
 			'maxlength'		=> '',
 			'placeholder'	=> '',
 			'prepend'		=> '',
-			'append'		=> '',
-			'readonly'		=> 0,
-			'disabled'		=> 0,
+			'append'		=> ''
 		);
 		
 		
@@ -65,13 +63,14 @@ class acf_field_text extends acf_field {
 	function render_field( $field ) {
 		
 		// vars
+		$atts = array();
 		$o = array( 'type', 'id', 'class', 'name', 'value', 'placeholder' );
 		$s = array( 'readonly', 'disabled' );
 		$e = '';
 		
 		
 		// maxlength
-		if( $field['maxlength'] !== "" ) {
+		if( $field['maxlength'] ) {
 		
 			$o[] = 'maxlength';
 			
@@ -79,7 +78,7 @@ class acf_field_text extends acf_field {
 		
 		
 		// prepend
-		if( $field['prepend'] !== "" ) {
+		if( $field['prepend'] !== '' ) {
 		
 			$field['class'] .= ' acf-is-prepended';
 			$e .= '<div class="acf-input-prepend">' . $field['prepend'] . '</div>';
@@ -88,7 +87,7 @@ class acf_field_text extends acf_field {
 		
 		
 		// append
-		if( $field['append'] !== "" ) {
+		if( $field['append'] !== '' ) {
 		
 			$field['class'] .= ' acf-is-appended';
 			$e .= '<div class="acf-input-append">' . $field['append'] . '</div>';
@@ -96,8 +95,7 @@ class acf_field_text extends acf_field {
 		}
 		
 		
-		// populate atts
-		$atts = array();
+		// append atts
 		foreach( $o as $k ) {
 		
 			$atts[ $k ] = $field[ $k ];	
@@ -105,14 +103,10 @@ class acf_field_text extends acf_field {
 		}
 		
 		
-		// special atts
+		// append special atts
 		foreach( $s as $k ) {
 		
-			if( $field[ $k ] ) {
-			
-				$atts[ $k ] = $k;
-				
-			}
+			if( !empty($field[ $k ]) ) $atts[ $k ] = $k;
 			
 		}
 		
@@ -191,8 +185,10 @@ class acf_field_text extends acf_field {
 	
 }
 
-new acf_field_text();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_text() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/textarea.php b/fields/textarea.php
index c12f162..e447348 100644
--- a/fields/textarea.php
+++ b/fields/textarea.php
@@ -39,8 +39,6 @@ class acf_field_textarea extends acf_field {
 			'new_lines'		=> '',
 			'maxlength'		=> '',
 			'placeholder'	=> '',
-			'readonly'		=> 0,
-			'disabled'		=> 0,
 			'rows'			=> ''
 		);
 		
@@ -65,13 +63,14 @@ class acf_field_textarea extends acf_field {
 	function render_field( $field ) {
 		
 		// vars
+		$atts = array();
 		$o = array( 'id', 'class', 'name', 'placeholder', 'rows' );
 		$s = array( 'readonly', 'disabled' );
 		$e = '';
 		
 		
 		// maxlength
-		if( $field['maxlength'] !== '' ) {
+		if( $field['maxlength'] ) {
 		
 			$o[] = 'maxlength';
 			
@@ -86,8 +85,7 @@ class acf_field_textarea extends acf_field {
 		}
 		
 		
-		// populate atts
-		$atts = array();
+		// append atts
 		foreach( $o as $k ) {
 		
 			$atts[ $k ] = $field[ $k ];	
@@ -95,14 +93,10 @@ class acf_field_textarea extends acf_field {
 		}
 		
 		
-		// special atts
+		// append special atts
 		foreach( $s as $k ) {
 		
-			if( $field[ $k ] ) {
-			
-				$atts[ $k ] = $k;
-				
-			}
+			if( !empty($field[ $k ]) ) $atts[ $k ] = $k;
 			
 		}
 		
@@ -237,8 +231,10 @@ class acf_field_textarea extends acf_field {
 	
 }
 
-new acf_field_textarea();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_textarea() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/time_picker.php b/fields/time_picker.php
index 4f6b833..31e20d3 100644
--- a/fields/time_picker.php
+++ b/fields/time_picker.php
@@ -175,8 +175,10 @@ class acf_field_time_picker extends acf_field {
 	
 }
 
-new acf_field_time_picker();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_time_picker() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/true_false.php b/fields/true_false.php
index c1d91b5..72b612e 100644
--- a/fields/true_false.php
+++ b/fields/true_false.php
@@ -207,8 +207,10 @@ class acf_field_true_false extends acf_field {
 	
 }
 
-new acf_field_true_false();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_true_false() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/url.php b/fields/url.php
index 445281a..b7a5e0d 100644
--- a/fields/url.php
+++ b/fields/url.php
@@ -60,12 +60,13 @@ class acf_field_url extends acf_field {
 	function render_field( $field ) {
 		
 		// vars
+		$atts = array();
 		$o = array( 'type', 'id', 'class', 'name', 'value', 'placeholder' );
+		$s = array( 'readonly', 'disabled' );
 		$e = '';
 		
 		
-		// populate atts
-		$atts = array();
+		// append atts
 		foreach( $o as $k ) {
 		
 			$atts[ $k ] = $field[ $k ];	
@@ -73,14 +74,10 @@ class acf_field_url extends acf_field {
 		}
 		
 		
-		// special atts
-		foreach( array( 'readonly', 'disabled' ) as $k ) {
+		// append special atts
+		foreach( $s as $k ) {
 		
-			if( !empty($field[ $k ]) ) {
-			
-				$atts[ $k ] = $k;
-				
-			}
+			if( !empty($field[ $k ]) ) $atts[ $k ] = $k;
 			
 		}
 		
@@ -177,8 +174,10 @@ class acf_field_url extends acf_field {
 	
 }
 
-new acf_field_url();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_url() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/user.php b/fields/user.php
index 3c022de..73a3f84 100644
--- a/fields/user.php
+++ b/fields/user.php
@@ -54,32 +54,38 @@ class acf_field_user extends acf_field {
 
 	
 	/*
-	*  get_choices
+	*  ajax_query
 	*
-	*  This function will return an array of data formatted for use in a select2 AJAX response
+	*  description
 	*
 	*  @type	function
-	*  @date	15/10/2014
-	*  @since	5.0.9
+	*  @date	24/10/13
+	*  @since	5.0.0
 	*
-	*  @param	$options (array)
-	*  @return	(array)
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
 	*/
 	
-	function get_choices( $options = array() ) {
+	function ajax_query() {
 		
-   		// defaults
-   		$options = acf_parse_args($options, array(
+		// validate
+		if( !acf_verify_ajax() ) die();
+		
+		
+		// defaults
+   		$options = acf_parse_args($_POST, array(
 			'post_id'		=> 0,
 			's'				=> '',
 			'field_key'		=> '',
-			'paged'			=> 1,
+			'paged'			=> 1
 		));
 		
-				
+		
    		// vars
-   		$r = array();
+   		$results = array();
    		$args = array();
+   		$s = false;
+   		$is_search = false;
    		
 		
 		// paged
@@ -87,15 +93,26 @@ class acf_field_user extends acf_field {
    		$args['paged'] = $options['paged'];
    		
    		
+   		// search
+		if( $options['s'] !== '' ) {
+			
+			// strip slashes (search may be integer)
+			$s = wp_unslash( strval($options['s']) );
+			
+			
+			// update vars
+			$args['s'] = $s;
+			$is_search = true;
+			
+		}
+		
+		
 		// load field
 		$field = acf_get_field( $options['field_key'] );
+		if( !$field ) die();
 		
 		
-		// bail early if no field
-		if( !$field ) return false;
-		
-		
-		// update $args
+		// role
 		if( !empty($field['role']) ) {
 		
 			$args['role'] = acf_get_array( $field['role'] );
@@ -104,7 +121,7 @@ class acf_field_user extends acf_field {
 		
 		
 		// search
-		if( $options['s'] ) {
+		if( $is_search ) {
 			
 			// append to $args
 			$args['search'] = '*' . $options['s'] . '*';
@@ -130,101 +147,71 @@ class acf_field_user extends acf_field {
 		$groups = acf_get_grouped_users( $args );
 		
 		
-		// bail early if no groups
-		if( empty($groups) ) return false;
-		
-		
 		// loop
-		foreach( array_keys($groups) as $group_title ) {
+		if( !empty($groups) ) {
 			
-			// vars
-			$users = acf_extract_var( $groups, $group_title );
-			$data = array(
-				'text'		=> $group_title,
-				'children'	=> array()
-			);
-			
-			
-			// append users
-			foreach( array_keys($users) as $user_id ) {
+			foreach( array_keys($groups) as $group_title ) {
 				
-				$users[ $user_id ] = $this->get_result( $users[ $user_id ], $field, $options['post_id'] );
-				
-			};
-			
-			
-			// order by search
-			if( !empty($args['s']) ) {
-				
-				$users = acf_order_by_search( $users, $args['s'] );
-				
-			}
-			
-			
-			// append to $data
-			foreach( $users as $id => $title ) {
-				
-				$data['children'][] = array(
-					'id'	=> $id,
-					'text'	=> $title
+				// vars
+				$users = acf_extract_var( $groups, $group_title );
+				$data = array(
+					'text'		=> $group_title,
+					'children'	=> array()
 				);
 				
+				
+				// append users
+				foreach( array_keys($users) as $user_id ) {
+					
+					$users[ $user_id ] = $this->get_result( $users[ $user_id ], $field, $options['post_id'] );
+					
+				};
+				
+				
+				// order by search
+				if( $is_search && empty($args['orderby']) ) {
+					
+					$users = acf_order_by_search( $users, $args['s'] );
+					
+				}
+				
+				
+				// append to $data
+				foreach( $users as $id => $title ) {
+					
+					$data['children'][] = array(
+						'id'	=> $id,
+						'text'	=> $title
+					);
+					
+				}
+				
+				
+				// append to $r
+				$results[] = $data;
+				
 			}
 			
 			
-			// append to $r
-			$r[] = $data;
-			
 		}
 		
-		
 		// optgroup or single
 		if( !empty($args['role']) && count($args['role']) == 1 ) {
 			
-			$r = $r[0]['children'];
+			$results = $results[0]['children'];
 			
 		}
 		
 		
 		// return
-		return $r;
-			
+		acf_send_ajax_results(array(
+			'results'	=> $results,
+			'limit'		=> $args['users_per_page']
+		));
+		
 	}
 	
 	
-	/*
-	*  ajax_query
-	*
-	*  description
-	*
-	*  @type	function
-	*  @date	24/10/13
-	*  @since	5.0.0
-	*
-	*  @param	$post_id (int)
-	*  @return	$post_id (int)
-	*/
-	
-	function ajax_query() {
-		
-		// validate
-		if( !acf_verify_ajax() ) die();
-		
-		
-		// get choices
-		$choices = $this->get_choices( $_POST );
-		
-		
-		// validate
-		if( !$choices ) die();
-		
-		
-		// return JSON
-		echo json_encode( $choices );
-		die();
-			
-	}
-	
 	
 	/*
 	*  get_result
@@ -244,11 +231,7 @@ class acf_field_user extends acf_field {
 	function get_result( $user, $field, $post_id = 0 ) {
 		
 		// get post_id
-		if( !$post_id ) {
-			
-			$post_id = acf_get_setting('form_data/post_id', get_the_ID());
-			
-		}
+		if( !$post_id ) $post_id = acf_get_form_data('post_id');
 		
 		
 		// vars
@@ -588,8 +571,10 @@ class acf_field_user extends acf_field {
 		
 }
 
-new acf_field_user();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_user() );
+
+endif; // class_exists check
 
 ?>
diff --git a/fields/wysiwyg.php b/fields/wysiwyg.php
index b7b2e28..0c57806 100644
--- a/fields/wysiwyg.php
+++ b/fields/wysiwyg.php
@@ -259,7 +259,11 @@ acf.fields.wysiwyg.toolbars = <?php echo json_encode($json); ?>;
 		
 		
 		// detect mode
-		if( $field['tabs'] == 'visual' ) {
+		if( !user_can_richedit() ) {
+			
+			$show_tabs = false;
+			
+		} elseif( $field['tabs'] == 'visual' ) {
 			
 			// case: visual tab only
 			$default_editor = 'tinymce';
@@ -462,8 +466,10 @@ acf.fields.wysiwyg.toolbars = <?php echo json_encode($json); ?>;
 	
 }
 
-new acf_field_wysiwyg();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_wysiwyg() );
+
+endif; // class_exists check
 
 ?>
diff --git a/forms/attachment.php b/forms/attachment.php
index 4c7e305..e52a8d1 100644
--- a/forms/attachment.php
+++ b/forms/attachment.php
@@ -167,20 +167,14 @@ acf.unload.active = 0;
 	function edit_attachment( $form_fields, $post ) {
 		
 		// vars
-		$el = 'tr';
+		$is_page = $this->validate_page();
 		$post_id = $post->ID;
+		$el = 'tr';
 		$args = array(
 			'attachment' => $post_id
 		);
 		
 		
-		// $el
-		if( $this->validate_page() ) {
-			
-			//$el = 'div';
-			
-		}
-		
 		// get field groups
 		$field_groups = acf_get_field_groups( $args );
 		
@@ -201,6 +195,7 @@ acf.unload.active = 0;
 			if( $this->validate_page() ) {
 				
 				echo '<style type="text/css">
+					
 					.compat-attachment-fields,
 					.compat-attachment-fields > tbody,
 					.compat-attachment-fields > tbody > tr,
@@ -208,46 +203,60 @@ acf.unload.active = 0;
 					.compat-attachment-fields > tbody > tr > td {
 						display: block;
 					}
-					tr.acf-field {
-						display: block;
-						margin: 0 0 13px;
+					
+					.compat-attachment-fields > tbody > tr.acf-field {
+						margin: 0 0 15px;
 					}
-					tr.acf-field td.acf-label {
-						display: block;
+					
+					.compat-attachment-fields > tbody > tr.acf-field > td.acf-label {
 						margin: 0;
 					}
-					tr.acf-field td.acf-input {
-						display: block;
+					
+					.compat-attachment-fields > tbody > tr.acf-field > td.acf-label label {
+						margin: 0;
+						padding: 0;
+					}
+					
+					.compat-attachment-fields > tbody > tr.acf-field > td.acf-label p {
+						margin: 0 0 3px !important;
+					}
+					
+					.compat-attachment-fields > tbody > tr.acf-field > td.acf-input {
 						margin: 0;
 					}
+					
 				</style>';
 				
 			}
 			
 			
-			// $el
-			//if( $el == 'tr' ) {
-				
-				echo '</td></tr>';
-				
-			//}
+			// open
+			echo '</td></tr>';
 			
 			
+			// loop
 			foreach( $field_groups as $field_group ) {
 				
+				// load fields
 				$fields = acf_get_fields( $field_group );
 				
-				acf_render_fields( $post_id, $fields, $el, 'field' );
+				
+				// override instruction placement for modal
+				if( !$is_page ) {
+					
+					$field_group['instruction_placement'] = 'field';
+				}
+				
+				
+				// render			
+				acf_render_fields( $post_id, $fields, $el, $field_group['instruction_placement'] );
 				
 			}
 			
 			
-			// $el
-			//if( $el == 'tr' ) {
-				
-				echo '<tr class="compat-field-acf-blank"><td>';
-				
-			//}
+			// close
+			echo '<tr class="compat-field-acf-blank"><td>';
+			
 			
 			
 			$html = ob_get_contents();
diff --git a/forms/post.php b/forms/post.php
index 9265fba..4f6e078 100644
--- a/forms/post.php
+++ b/forms/post.php
@@ -483,6 +483,49 @@ if( typeof acf !== 'undefined' ) {
 	}
 	
 	
+	/*
+	*  allow_save_post
+	*
+	*  This function will return true if the post is allowed to be saved
+	*
+	*  @type	function
+	*  @date	26/06/2016
+	*  @since	5.3.8
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function allow_save_post( $post ) {
+		
+		// vars
+		$allow = true;
+		$reject = array( 'auto-draft', 'revision', 'acf-field', 'acf-field-group' );
+		$wp_preview = acf_maybe_get($_POST, 'wp-preview');
+		
+		
+		// check post type
+		if( in_array($post->post_type, $reject) ) {
+			
+			$allow = false;
+			
+		}
+		
+		
+		// allow preview
+		if( $post->post_type == 'revision' && $wp_preview === 'dopreview' ) {
+			
+			$allow = true;
+			
+		}
+		
+		
+		// return
+		return $allow;
+		
+	}
+	
+	
 	/*
 	*  save_post
 	*
@@ -498,50 +541,30 @@ if( typeof acf !== 'undefined' ) {
 	
 	function save_post( $post_id, $post ) {
 		
-		// do not save if this is an auto save routine
-		if( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) {
-			
-			return $post_id;
-			
-		}
+		// bail ealry if no allowed to save this post type
+		if( !$this->allow_save_post($post) ) return $post_id;
 		
 		
-		// bail early if is acf-field-group or acf-field
-		if( in_array($post->post_type, array('acf-field', 'acf-field-group'))) {
-			
-			return $post_id;
-			
-		}
+		// ensure saving to the correct post
+		if( !acf_verify_nonce('post', $post_id) ) return $post_id;
 		
 		
-		// verify and remove nonce
-		if( !acf_verify_nonce('post', $post_id) ) {
-			
-			return $post_id;
-			
-		}
-		
-		
-		// validate and save
+		// validate for published post (allow draft to save without validation)
 		if( get_post_status($post_id) == 'publish' ) {
 			
-			if( acf_validate_save_post(true) ) {
+			// show errors
+			acf_validate_save_post( true );
 				
-				acf_save_post( $post_id );
-				
-			}
-			
-		} else {
-			
-			acf_save_post( $post_id );
-			
 		}
 		
 		
+		// save
+		acf_save_post( $post_id );
+				
+		
 		// return
 		return $post_id;
 		
-        
 	}
 	
 	
diff --git a/forms/user.php b/forms/user.php
index 51ade8d..933a4e3 100644
--- a/forms/user.php
+++ b/forms/user.php
@@ -105,7 +105,7 @@ class acf_form_user {
 			return;
 			
 		}
-
+		
 		
 		// load acf scripts
 		acf_enqueue_scripts();
@@ -302,11 +302,11 @@ class acf_form_user {
 .acf-field input[type="email"],
 .acf-field input[type="url"],
 .acf-field select {
-    width: 25em;
+    max-width: 25em;
 }
 
 .acf-field textarea {
-	width: 500px;
+	max-width: 500px;
 }
 
 
@@ -319,7 +319,7 @@ class acf_form_user {
 .acf-field .acf-field input[type="url"],
 .acf-field .acf-field textarea,
 .acf-field .acf-field select {
-    width: 100%;
+    max-width: none;
 }
 
 <?php else: ?>
diff --git a/lang/acf-de_CH.mo b/lang/acf-de_CH.mo
index 339333c..0f39df9 100644
Binary files a/lang/acf-de_CH.mo and b/lang/acf-de_CH.mo differ
diff --git a/lang/acf-de_CH.po b/lang/acf-de_CH.po
index 99ec082..fbea974 100644
--- a/lang/acf-de_CH.po
+++ b/lang/acf-de_CH.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Advanced Custom Fields Pro v5.3.8\n"
+"Project-Id-Version: Advanced Custom Fields Pro v5.4.0\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
-"POT-Creation-Date: 2016-05-04 09:26+0200\n"
-"PO-Revision-Date: 2016-05-04 09:38+0200\n"
+"POT-Creation-Date: 2016-07-28 10:37+0200\n"
+"PO-Revision-Date: 2016-07-28 10:53+0200\n"
 "Last-Translator: Raphael Hüni <rafhun@gmail.com>\n"
 "Language-Team: Raphael Hüni <rafhun@gmail.com>\n"
 "Language: de_CH\n"
@@ -28,109 +28,109 @@ msgid "Advanced Custom Fields"
 msgstr "Advanced Custom Fields"
 
 # @ acf
-#: acf.php:263 admin/admin.php:61
+#: acf.php:271 admin/admin.php:61
 msgid "Field Groups"
 msgstr "Feld-Gruppen"
 
 # @ acf
-#: acf.php:264
+#: acf.php:272
 msgid "Field Group"
 msgstr "Feld-Gruppe"
 
 # @ acf
-#: acf.php:265 acf.php:297 admin/admin.php:62
-#: pro/fields/flexible-content.php:496
+#: acf.php:273 acf.php:305 admin/admin.php:62
+#: pro/fields/flexible-content.php:500
 msgid "Add New"
 msgstr "Erstellen"
 
 # @ acf
-#: acf.php:266
+#: acf.php:274
 msgid "Add New Field Group"
 msgstr "Neue Feld-Gruppe erstellen"
 
 # @ acf
-#: acf.php:267
+#: acf.php:275
 msgid "Edit Field Group"
 msgstr "Feld-Gruppe bearbeiten"
 
 # @ acf
-#: acf.php:268
+#: acf.php:276
 msgid "New Field Group"
 msgstr "Neue Feld-Gruppe"
 
 # @ acf
-#: acf.php:269
+#: acf.php:277
 msgid "View Field Group"
 msgstr "Feld-Gruppe anzeigen"
 
 # @ acf
-#: acf.php:270
+#: acf.php:278
 msgid "Search Field Groups"
 msgstr "Feld-Gruppen suchen"
 
 # @ acf
-#: acf.php:271
+#: acf.php:279
 msgid "No Field Groups found"
 msgstr "Keine Feld-Gruppen gefunden"
 
 # @ acf
-#: acf.php:272
+#: acf.php:280
 msgid "No Field Groups found in Trash"
 msgstr "Keine Feld-Gruppen im Papierkorb gefunden"
 
 # @ acf
-#: acf.php:295 admin/field-group.php:176 admin/field-group.php:223
-#: admin/field-groups.php:528
+#: acf.php:303 admin/field-group.php:182 admin/field-group.php:280
+#: admin/field-groups.php:528 pro/fields/clone.php:662
 msgid "Fields"
 msgstr "Felder"
 
 # @ acf
-#: acf.php:296
+#: acf.php:304
 msgid "Field"
 msgstr "Feld"
 
 # @ acf
-#: acf.php:298
+#: acf.php:306
 msgid "Add New Field"
 msgstr "Feld hinzufügen"
 
 # @ acf
-#: acf.php:299
+#: acf.php:307
 msgid "Edit Field"
 msgstr "Feld bearbeiten"
 
 # @ acf
-#: acf.php:300 admin/views/field-group-fields.php:18
+#: acf.php:308 admin/views/field-group-fields.php:54
 #: admin/views/settings-info.php:111
 msgid "New Field"
 msgstr "Neues Feld"
 
 # @ acf
-#: acf.php:301
+#: acf.php:309
 msgid "View Field"
 msgstr "Feld anzeigen"
 
 # @ acf
-#: acf.php:302
+#: acf.php:310
 msgid "Search Fields"
 msgstr "Felder suchen"
 
 # @ acf
-#: acf.php:303
+#: acf.php:311
 msgid "No Fields found"
 msgstr "Keine Felder gefunden"
 
 # @ acf
-#: acf.php:304
+#: acf.php:312
 msgid "No Fields found in Trash"
 msgstr "Keine Feld-Gruppen im Papierkorb gefunden"
 
-#: acf.php:343 admin/field-group.php:316 admin/field-groups.php:586
+#: acf.php:351 admin/field-group.php:395 admin/field-groups.php:585
 #: admin/views/field-group-options.php:13
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: acf.php:348
+#: acf.php:356
 #, php-format
 msgid "Disabled <span class=\"count\">(%s)</span>"
 msgid_plural "Disabled <span class=\"count\">(%s)</span>"
@@ -178,183 +178,183 @@ msgid "Field group draft updated."
 msgstr "Entwurf der Feld-Gruppe aktualisiert."
 
 # @ acf
-#: admin/field-group.php:177
+#: admin/field-group.php:183
 msgid "Location"
 msgstr "Position"
 
-#: admin/field-group.php:178
+#: admin/field-group.php:184
 msgid "Settings"
 msgstr "Einstellungen"
 
 # @ acf
-#: admin/field-group.php:217
+#: admin/field-group.php:274
 msgid "Move to trash. Are you sure?"
 msgstr "Wirklich in den Papierkorb verschieben?"
 
 # @ acf
-#: admin/field-group.php:218
+#: admin/field-group.php:275
 msgid "checked"
 msgstr "ausgewählt"
 
 # @ acf
-#: admin/field-group.php:219
+#: admin/field-group.php:276
 msgid "No toggle fields available"
 msgstr "Es liegen keine Auswahl-Feld-Typen vor"
 
 # @ acf
-#: admin/field-group.php:220
+#: admin/field-group.php:277
 msgid "Field group title is required"
 msgstr "Es ist ein Titel für die Feld-Gruppe erforderlich"
 
 # @ acf
-#: admin/field-group.php:221 api/api-field-group.php:620
+#: admin/field-group.php:278 api/api-field-group.php:651
 msgid "copy"
 msgstr "kopieren"
 
 # @ acf
-#: admin/field-group.php:222
+#: admin/field-group.php:279
 #: admin/views/field-group-field-conditional-logic.php:62
 #: admin/views/field-group-field-conditional-logic.php:162
 #: admin/views/field-group-locations.php:59
-#: admin/views/field-group-locations.php:135 api/api-helpers.php:3673
+#: admin/views/field-group-locations.php:135 api/api-helpers.php:3952
 msgid "or"
 msgstr "oder"
 
 # @ acf
-#: admin/field-group.php:224
+#: admin/field-group.php:281
 msgid "Parent fields"
 msgstr "Übergeordnete Felder"
 
 # @ acf
-#: admin/field-group.php:225
+#: admin/field-group.php:282
 msgid "Sibling fields"
 msgstr "Geschwister-Felder"
 
 # @ acf
-#: admin/field-group.php:226
+#: admin/field-group.php:283
 msgid "Move Custom Field"
 msgstr "Benutzerdefiniertes Feld verschieben"
 
 # @ acf
-#: admin/field-group.php:227
+#: admin/field-group.php:284
 msgid "This field cannot be moved until its changes have been saved"
 msgstr "Diese Feld kann nicht verschoben werden, bevor es gesichert wurde."
 
 # @ acf
-#: admin/field-group.php:228
+#: admin/field-group.php:285
 msgid "Null"
 msgstr "Null"
 
 # @ acf
-#: admin/field-group.php:229 core/input.php:254
+#: admin/field-group.php:286 core/input.php:257
 msgid "The changes you made will be lost if you navigate away from this page"
 msgstr ""
 "Die vorgenommenen Änderungen gehen verloren wenn diese Seite verlassen wird."
 
 # @ acf
-#: admin/field-group.php:230
+#: admin/field-group.php:287
 msgid "The string \"field_\" may not be used at the start of a field name"
 msgstr "Der Feldname darf nicht mit \"field_\" beginnen"
 
-#: admin/field-group.php:286
+#: admin/field-group.php:365
 msgid "Field Keys"
 msgstr "Feldschlüssel"
 
-#: admin/field-group.php:316 admin/views/field-group-options.php:12
+#: admin/field-group.php:395 admin/views/field-group-options.php:12
 msgid "Active"
 msgstr "Aktiviert"
 
 # @ acf
-#: admin/field-group.php:789
+#: admin/field-group.php:842
 msgid "Front Page"
 msgstr "Startseite"
 
 # @ acf
-#: admin/field-group.php:790
+#: admin/field-group.php:843
 msgid "Posts Page"
 msgstr "Beitrags-Seite"
 
 # @ acf
-#: admin/field-group.php:791
+#: admin/field-group.php:844
 msgid "Top Level Page (no parent)"
 msgstr "Seite ohne übergeordnete Seiten"
 
 # @ acf
-#: admin/field-group.php:792
+#: admin/field-group.php:845
 msgid "Parent Page (has children)"
 msgstr "Übergeordnete Seite (mit Unterseiten)"
 
 # @ acf
-#: admin/field-group.php:793
+#: admin/field-group.php:846
 msgid "Child Page (has parent)"
 msgstr "Unterseite (mit übergeordneter Seite)"
 
 # @ acf
-#: admin/field-group.php:809
+#: admin/field-group.php:862
 msgid "Default Template"
 msgstr "Standard-Template"
 
 # @ acf
-#: admin/field-group.php:832
+#: admin/field-group.php:885
 msgid "Logged in"
 msgstr "ist angemeldet"
 
 # @ acf
-#: admin/field-group.php:833
+#: admin/field-group.php:886
 msgid "Viewing front end"
 msgstr "ist im Front-End"
 
 # @ acf
-#: admin/field-group.php:834
+#: admin/field-group.php:887
 msgid "Viewing back end"
 msgstr "ist im Back-End"
 
 # @ acf
-#: admin/field-group.php:853
+#: admin/field-group.php:906
 msgid "Super Admin"
 msgstr "Super-Admin"
 
 # @ acf
-#: admin/field-group.php:864 admin/field-group.php:872
-#: admin/field-group.php:886 admin/field-group.php:893
-#: admin/field-group.php:910 admin/field-group.php:927 fields/file.php:241
-#: fields/image.php:237 pro/fields/gallery.php:679
+#: admin/field-group.php:917 admin/field-group.php:925
+#: admin/field-group.php:939 admin/field-group.php:946
+#: admin/field-group.php:963 admin/field-group.php:980 fields/file.php:241
+#: fields/image.php:237 pro/fields/gallery.php:676
 msgid "All"
 msgstr "Alle"
 
 # @ acf
-#: admin/field-group.php:873
+#: admin/field-group.php:926
 msgid "Add / Edit"
 msgstr "Hinzufügen / Bearbeiten"
 
 # @ acf
-#: admin/field-group.php:874
+#: admin/field-group.php:927
 msgid "Register"
 msgstr "Registrieren"
 
 # @ acf
-#: admin/field-group.php:1114
+#: admin/field-group.php:1167
 msgid "Move Complete."
 msgstr "Verschieben erfolgreich abgeschlossen."
 
 # @ acf
-#: admin/field-group.php:1115
+#: admin/field-group.php:1168
 #, php-format
 msgid "The %s field can now be found in the %s field group"
 msgstr "Das Feld \"%s\" wurde in die %s Feld-Gruppe verschoben"
 
 # @ acf
-#: admin/field-group.php:1117
+#: admin/field-group.php:1170
 msgid "Close Window"
 msgstr "Schliessen"
 
 # @ acf
-#: admin/field-group.php:1152
+#: admin/field-group.php:1205
 msgid "Please select the destination for this field"
 msgstr "In welche Feld-Gruppe solle dieses Feld verschoben werden"
 
 # @ acf
-#: admin/field-group.php:1159
+#: admin/field-group.php:1212
 msgid "Move Field"
 msgstr "Feld verschieben"
 
@@ -394,20 +394,20 @@ msgstr[0] "%s Feld-Gruppe synchronisiert."
 msgstr[1] "%s Feld-Gruppen synchronisiert."
 
 # @ acf
-#: admin/field-groups.php:412 admin/field-groups.php:576
+#: admin/field-groups.php:412 admin/field-groups.php:575
 msgid "Sync available"
 msgstr "Synchronisierung verfügbar"
 
 # @ acf
-#: admin/field-groups.php:525 api/api-template.php:989
-#: api/api-template.php:1202 pro/fields/gallery.php:371
+#: admin/field-groups.php:525 api/api-template.php:1077
+#: api/api-template.php:1290 pro/fields/gallery.php:370
 msgid "Title"
 msgstr "Titel"
 
 # @ acf
 #: admin/field-groups.php:526 admin/views/field-group-options.php:93
-#: admin/views/update-network.php:20 admin/views/update-network.php:28
-#: pro/fields/gallery.php:398
+#: admin/views/update-network.php:25 admin/views/update-network.php:33
+#: pro/fields/gallery.php:397
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -416,95 +416,95 @@ msgid "Status"
 msgstr "Status"
 
 # @ acf
-#: admin/field-groups.php:624 admin/settings-info.php:76
+#: admin/field-groups.php:623 admin/settings-info.php:76
 #: pro/admin/views/settings-updates.php:111
 msgid "Changelog"
 msgstr "Versionshinweise"
 
-#: admin/field-groups.php:625
+#: admin/field-groups.php:624
 #, php-format
 msgid "See what's new in <a href=\"%s\">version %s</a>."
 msgstr "Sieh dir die Neuerungen in <a href=\"%s\">Version%s</a> an."
 
 # @ acf
-#: admin/field-groups.php:627
+#: admin/field-groups.php:626
 msgid "Resources"
 msgstr "Dokumentation (engl.)"
 
 # @ acf
-#: admin/field-groups.php:629
+#: admin/field-groups.php:628
 msgid "Getting Started"
 msgstr "Erste Schritte"
 
 # @ acf
-#: admin/field-groups.php:630 pro/admin/settings-updates.php:73
+#: admin/field-groups.php:629 pro/admin/settings-updates.php:57
 #: pro/admin/views/settings-updates.php:17
 msgid "Updates"
 msgstr "Aktualisierungen"
 
 # @ acf
-#: admin/field-groups.php:631
+#: admin/field-groups.php:630
 msgid "Field Types"
 msgstr "Feld-Typen"
 
 # @ acf
-#: admin/field-groups.php:632
+#: admin/field-groups.php:631
 msgid "Functions"
 msgstr "Funktionen"
 
 # @ acf
-#: admin/field-groups.php:633
+#: admin/field-groups.php:632
 msgid "Actions"
 msgstr "Aktionen"
 
 # @ acf
-#: admin/field-groups.php:634 fields/relationship.php:720
+#: admin/field-groups.php:633 fields/relationship.php:737
 msgid "Filters"
 msgstr "Filter"
 
 # @ acf
-#: admin/field-groups.php:635
+#: admin/field-groups.php:634
 msgid "'How to' guides"
 msgstr "Kurzanleitungen"
 
 # @ acf
-#: admin/field-groups.php:636
+#: admin/field-groups.php:635
 msgid "Tutorials"
 msgstr "Tutorials"
 
-#: admin/field-groups.php:637
+#: admin/field-groups.php:636
 msgid "FAQ"
 msgstr "FAQ"
 
 # @ acf
-#: admin/field-groups.php:642
+#: admin/field-groups.php:641
 msgid "Created by"
 msgstr "Erstellt von"
 
 # @ acf
-#: admin/field-groups.php:685
+#: admin/field-groups.php:684
 msgid "Duplicate this item"
 msgstr "Dieses Element duplizieren"
 
 # @ acf
-#: admin/field-groups.php:685 admin/field-groups.php:701
-#: admin/views/field-group-field.php:58 pro/fields/flexible-content.php:495
+#: admin/field-groups.php:684 admin/field-groups.php:700
+#: admin/views/field-group-field.php:59 pro/fields/flexible-content.php:499
 msgid "Duplicate"
 msgstr "Duplizieren"
 
 # @ acf
-#: admin/field-groups.php:747
+#: admin/field-groups.php:751
 #, php-format
 msgid "Select %s"
 msgstr "%s auswählen"
 
 # @ acf
-#: admin/field-groups.php:755
+#: admin/field-groups.php:759
 msgid "Synchronise field group"
 msgstr "Synchronisiere Feld-Gruppe"
 
 # @ acf
-#: admin/field-groups.php:755 admin/field-groups.php:772
+#: admin/field-groups.php:759 admin/field-groups.php:776
 msgid "Sync"
 msgstr "Synchronisieren"
 
@@ -528,82 +528,63 @@ msgstr "Info"
 msgid "What's New"
 msgstr "Was gibt es Neues"
 
-#: admin/settings-tools.php:54 admin/views/settings-tools-export.php:23
+#: admin/settings-tools.php:50 admin/views/settings-tools-export.php:23
 #: admin/views/settings-tools.php:31
 msgid "Tools"
 msgstr "Werkzeuge"
 
 # @ acf
-#: admin/settings-tools.php:151 admin/settings-tools.php:369
+#: admin/settings-tools.php:147 admin/settings-tools.php:380
 msgid "No field groups selected"
 msgstr "Keine Feld-Gruppe ausgewählt"
 
 # @ acf
-#: admin/settings-tools.php:188 fields/file.php:175
+#: admin/settings-tools.php:184 fields/file.php:175
 msgid "No file selected"
 msgstr "Keine Datei ausgewählt"
 
 # @ acf
-#: admin/settings-tools.php:201
+#: admin/settings-tools.php:197
 msgid "Error uploading file. Please try again"
 msgstr "Fehler beim Upload. Bitte erneut versuchen."
 
 # @ acf
-#: admin/settings-tools.php:210
+#: admin/settings-tools.php:206
 msgid "Incorrect file type"
 msgstr "Falscher Dateityp"
 
 # @ acf
-#: admin/settings-tools.php:227
+#: admin/settings-tools.php:223
 msgid "Import file empty"
 msgstr "Die importierte Datei ist leer"
 
-# @ acf
-#: admin/settings-tools.php:323
+#: admin/settings-tools.php:331
 #, php-format
-msgid "<b>Success</b>. Import tool added %s field groups: %s"
-msgstr "<b>Erfolgreich</b>. Der Import hat %s Feld-Gruppen hinzugefügt: %s"
+msgid "Imported 1 field group"
+msgid_plural "Imported %s field groups"
+msgstr[0] "Eine Feldgruppe importiert"
+msgstr[1] "%s Feldgruppen importiert"
 
 # @ acf
-#: admin/settings-tools.php:332
-#, php-format
-msgid ""
-"<b>Warning</b>. Import tool detected %s field groups already exist and have "
-"been ignored: %s"
-msgstr ""
-"<b>Warnung</b>. Der Import hat %s Feld-Gruppen erkannt, die schon vorhanden "
-"sind und diese ignoriert: %s"
-
-# @ acf
-#: admin/update.php:113
-msgid "Upgrade ACF"
-msgstr "Aktualisiere ACF"
-
-# @ acf
-#: admin/update.php:143
-msgid "Review sites & upgrade"
-msgstr "Übersicht Seiten & Aktualisierungen"
-
-# @ acf
-#: admin/update.php:298
-msgid "Upgrade"
-msgstr "Aktualisieren"
-
-# @ acf
-#: admin/update.php:349
+#: admin/update-network.php:96 admin/update.php:104 admin/update.php:155
 msgid "Upgrade Database"
 msgstr "Aktualisiere Datenbank"
 
-#: admin/update.php:414
+# @ acf
+#: admin/update-network.php:148
+msgid "Review sites & upgrade"
+msgstr "Übersicht Seiten & Aktualisierungen"
+
+#: admin/update.php:220
 msgid "Error validating request"
 msgstr "Fehler beim Überprüfen der Anfrage"
 
 # @ acf
-#: admin/update.php:437 admin/views/update.php:110
+#: admin/update.php:243 admin/views/update.php:110
 msgid "No updates available"
 msgstr "Keine Aktualisierungen verfügbar"
 
-#: admin/update.php:454
+#: admin/update.php:260
 msgid "Error loading update"
 msgstr "Fehler beim Laden des Update"
 
@@ -614,27 +595,31 @@ msgstr "Bedingungen für die Anzeige"
 
 # @ acf
 #: admin/views/field-group-field-conditional-logic.php:40
-#: admin/views/field-group-field.php:140 fields/checkbox.php:243
-#: fields/message.php:144 fields/page_link.php:539 fields/page_link.php:553
-#: fields/post_object.php:403 fields/post_object.php:417 fields/radio.php:250
-#: fields/select.php:377 fields/select.php:391 fields/select.php:405
-#: fields/select.php:419 fields/tab.php:130 fields/taxonomy.php:784
-#: fields/taxonomy.php:798 fields/taxonomy.php:812 fields/taxonomy.php:826
-#: fields/user.php:416 fields/user.php:430 fields/wysiwyg.php:418
-#: pro/admin/views/settings-updates.php:93
+#: admin/views/field-group-field.php:141 fields/checkbox.php:244
+#: fields/message.php:144 fields/page_link.php:533 fields/page_link.php:547
+#: fields/page_link.php:561 fields/post_object.php:432
+#: fields/post_object.php:446 fields/radio.php:255 fields/select.php:469
+#: fields/select.php:483 fields/select.php:497 fields/select.php:511
+#: fields/tab.php:130 fields/taxonomy.php:785 fields/taxonomy.php:799
+#: fields/taxonomy.php:813 fields/taxonomy.php:827 fields/user.php:399
+#: fields/user.php:413 fields/wysiwyg.php:418
+#: pro/admin/views/settings-updates.php:93 pro/fields/clone.php:716
+#: pro/fields/clone.php:734
 msgid "Yes"
 msgstr "Ja"
 
 # @ acf
 #: admin/views/field-group-field-conditional-logic.php:41
-#: admin/views/field-group-field.php:141 fields/checkbox.php:244
-#: fields/message.php:145 fields/page_link.php:540 fields/page_link.php:554
-#: fields/post_object.php:404 fields/post_object.php:418 fields/radio.php:251
-#: fields/select.php:378 fields/select.php:392 fields/select.php:406
-#: fields/select.php:420 fields/tab.php:131 fields/taxonomy.php:699
-#: fields/taxonomy.php:785 fields/taxonomy.php:799 fields/taxonomy.php:813
-#: fields/taxonomy.php:827 fields/user.php:417 fields/user.php:431
-#: fields/wysiwyg.php:419 pro/admin/views/settings-updates.php:103
+#: admin/views/field-group-field.php:142 fields/checkbox.php:245
+#: fields/message.php:145 fields/page_link.php:534 fields/page_link.php:548
+#: fields/page_link.php:562 fields/post_object.php:433
+#: fields/post_object.php:447 fields/radio.php:256 fields/select.php:470
+#: fields/select.php:484 fields/select.php:498 fields/select.php:512
+#: fields/tab.php:131 fields/taxonomy.php:700 fields/taxonomy.php:786
+#: fields/taxonomy.php:800 fields/taxonomy.php:814 fields/taxonomy.php:828
+#: fields/user.php:400 fields/user.php:414 fields/wysiwyg.php:419
+#: pro/admin/views/settings-updates.php:103 pro/fields/clone.php:717
+#: pro/fields/clone.php:735
 msgid "No"
 msgstr "Nein"
 
@@ -668,148 +653,150 @@ msgid "Add rule group"
 msgstr "Regel-Gruppe hinzufügen"
 
 # @ acf
-#: admin/views/field-group-field.php:49 pro/fields/flexible-content.php:342
+#: admin/views/field-group-field.php:50 pro/fields/flexible-content.php:346
 #: pro/fields/repeater.php:302
 msgid "Drag to reorder"
 msgstr "Ziehen zum Sortieren"
 
 # @ acf
-#: admin/views/field-group-field.php:54 admin/views/field-group-field.php:57
+#: admin/views/field-group-field.php:55 admin/views/field-group-field.php:58
 msgid "Edit field"
 msgstr "Feld bearbeiten"
 
 # @ acf
-#: admin/views/field-group-field.php:57 core/media.php:55 fields/image.php:142
-#: pro/fields/gallery.php:358
+#: admin/views/field-group-field.php:58 fields/image.php:142
+#: pro/fields/gallery.php:357
 msgid "Edit"
 msgstr "Bearbeiten"
 
 # @ acf
-#: admin/views/field-group-field.php:58
+#: admin/views/field-group-field.php:59
 msgid "Duplicate field"
 msgstr "Feld duplizieren"
 
 # @ acf
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move field to another group"
 msgstr "Feld in eine andere Gruppe verschieben"
 
 # @ acf
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move"
 msgstr "Verschieben"
 
 # @ acf
-#: admin/views/field-group-field.php:60
+#: admin/views/field-group-field.php:61
 msgid "Delete field"
 msgstr "Feld löschen"
 
 # @ acf
-#: admin/views/field-group-field.php:60 pro/fields/flexible-content.php:494
+#: admin/views/field-group-field.php:61 pro/fields/flexible-content.php:498
 msgid "Delete"
 msgstr "Löschen"
 
 # @ acf
-#: admin/views/field-group-field.php:68 fields/oembed.php:225
-#: fields/taxonomy.php:900
+#: admin/views/field-group-field.php:69 fields/oembed.php:225
+#: fields/taxonomy.php:901
 msgid "Error"
 msgstr "Fehler"
 
 # @ acf
-#: admin/views/field-group-field.php:68
+#: admin/views/field-group-field.php:69
 msgid "Field type does not exist"
 msgstr "Feld-Typ existiert nicht"
 
 # @ acf
-#: admin/views/field-group-field.php:81
+#: admin/views/field-group-field.php:82
 msgid "Field Label"
 msgstr "Bezeichnung"
 
 # @ acf
-#: admin/views/field-group-field.php:82
+#: admin/views/field-group-field.php:83
 msgid "This is the name which will appear on the EDIT page"
 msgstr "Dieser Name wird in der Bearbeitungs-Ansicht eines Beitrags angezeigt"
 
 # @ acf
-#: admin/views/field-group-field.php:94
+#: admin/views/field-group-field.php:95
 msgid "Field Name"
 msgstr "Feld-Name"
 
 # @ acf
-#: admin/views/field-group-field.php:95
+#: admin/views/field-group-field.php:96
 msgid "Single word, no spaces. Underscores and dashes allowed"
 msgstr ""
 "Nur ein Wort ohne Leerzeichen; es sind nur Unterstriche und Bindestriche als "
 "Sonderzeichen erlaubt"
 
 # @ acf
-#: admin/views/field-group-field.php:107
+#: admin/views/field-group-field.php:108
 msgid "Field Type"
 msgstr "Feld-Typ"
 
 # @ acf
-#: admin/views/field-group-field.php:121 fields/tab.php:103
+#: admin/views/field-group-field.php:122 fields/tab.php:103
 msgid "Instructions"
 msgstr "Anweisungen"
 
 # @ acf
-#: admin/views/field-group-field.php:122
+#: admin/views/field-group-field.php:123
 msgid "Instructions for authors. Shown when submitting data"
 msgstr "Anweisungen für Autoren werden in der Bearbeitungs-Ansicht angezeigt"
 
 # @ acf
-#: admin/views/field-group-field.php:133
+#: admin/views/field-group-field.php:134
 msgid "Required?"
 msgstr "Erforderlich?"
 
 # @ acf
-#: admin/views/field-group-field.php:162
+#: admin/views/field-group-field.php:163
 msgid "Wrapper Attributes"
 msgstr "Wrapper-Attribute"
 
 # @ acf
-#: admin/views/field-group-field.php:168
+#: admin/views/field-group-field.php:169
 msgid "width"
 msgstr "Breite"
 
 # @ acf
-#: admin/views/field-group-field.php:182
+#: admin/views/field-group-field.php:183
 msgid "class"
 msgstr "Klasse"
 
 # @ acf
-#: admin/views/field-group-field.php:195
+#: admin/views/field-group-field.php:196
 msgid "id"
 msgstr "ID"
 
 # @ acf
-#: admin/views/field-group-field.php:207
+#: admin/views/field-group-field.php:208
 msgid "Close Field"
 msgstr "Feld schliessen"
 
 # @ acf
-#: admin/views/field-group-fields.php:29
+#: admin/views/field-group-fields.php:17
 msgid "Order"
 msgstr "Reihenfolge"
 
 # @ acf
-#: admin/views/field-group-fields.php:30 pro/fields/flexible-content.php:521
+#: admin/views/field-group-fields.php:18 fields/checkbox.php:259
+#: fields/radio.php:314 fields/select.php:527
+#: pro/fields/flexible-content.php:525
 msgid "Label"
 msgstr "Name"
 
 # @ acf
-#: admin/views/field-group-fields.php:31 fields/taxonomy.php:966
-#: pro/fields/flexible-content.php:534
+#: admin/views/field-group-fields.php:19 fields/taxonomy.php:967
+#: pro/fields/flexible-content.php:538
 msgid "Name"
 msgstr "Feld-Name"
 
 # @ acf
-#: admin/views/field-group-fields.php:32
+#: admin/views/field-group-fields.php:20
 msgid "Type"
 msgstr "Typ"
 
 # @ acf
-#: admin/views/field-group-fields.php:44
+#: admin/views/field-group-fields.php:38
 msgid ""
 "No fields. Click the <strong>+ Add Field</strong> button to create your "
 "first field."
@@ -818,7 +805,7 @@ msgstr ""
 "Button</strong> und erstelle Dein erstes Feld."
 
 # @ acf
-#: admin/views/field-group-fields.php:51
+#: admin/views/field-group-fields.php:44
 msgid "+ Add Field"
 msgstr "+ Feld hinzufügen"
 
@@ -829,7 +816,7 @@ msgid "Post"
 msgstr "Beitrag"
 
 # @ acf
-#: admin/views/field-group-locations.php:6 fields/relationship.php:726
+#: admin/views/field-group-locations.php:6 fields/relationship.php:743
 msgid "Post Type"
 msgstr "Beitrags-Typ"
 
@@ -1093,7 +1080,7 @@ msgid "Page Attributes"
 msgstr "Seiten-Attribute"
 
 # @ acf
-#: admin/views/field-group-options.php:123 fields/relationship.php:739
+#: admin/views/field-group-options.php:123 fields/relationship.php:756
 msgid "Featured Image"
 msgstr "Beitragsbild"
 
@@ -1541,48 +1528,52 @@ msgstr "Datei auswählen"
 msgid "Import"
 msgstr "Importieren"
 
+#: admin/views/update-network.php:4
+msgid "Upgrade Sites"
+msgstr "Seiten aktualisieren"
+
 # @ acf
-#: admin/views/update-network.php:8 admin/views/update.php:8
+#: admin/views/update-network.php:13 admin/views/update.php:8
 msgid "Advanced Custom Fields Database Upgrade"
 msgstr "Advanced Custom Fields Datenbank Aktualisierung"
 
-# @ acf
-#: admin/views/update-network.php:10
+#: admin/views/update-network.php:15
+#, php-format
 msgid ""
 "The following sites require a DB upgrade. Check the ones you want to update "
-"and then click “Upgrade Database”."
+"and then click %s."
 msgstr ""
-"Die folgenden Seiten erfordern eine Datenbank-Aktualisierung. Markiere die "
-"gewünschten Seiten und klicke \\\"Aktualisiere Datenbank\\\"."
+"Die folgenden Seiten ben&ouml;tigen ein DB Upgrade. W&auml;hle jene aus, die "
+"du aktualisieren willst und klicke dann %s."
 
 # @ acf
-#: admin/views/update-network.php:19 admin/views/update-network.php:27
+#: admin/views/update-network.php:24 admin/views/update-network.php:32
 msgid "Site"
 msgstr "Seite"
 
 # @ acf
-#: admin/views/update-network.php:47
+#: admin/views/update-network.php:52
 #, php-format
 msgid "Site requires database upgrade from %s to %s"
 msgstr "Die Seite erfordert eine Datenbank-Aktualisierung von %s auf %s"
 
 # @ acf
-#: admin/views/update-network.php:49
+#: admin/views/update-network.php:54
 msgid "Site is up to date"
 msgstr "Seite ist aktuell"
 
 # @ acf
-#: admin/views/update-network.php:62 admin/views/update.php:16
+#: admin/views/update-network.php:67 admin/views/update.php:16
 msgid "Database Upgrade complete"
 msgstr "Datenbank-Aktualisierung fertiggestellt"
 
 # @ acf
-#: admin/views/update-network.php:62
+#: admin/views/update-network.php:67
 msgid "Return to network dashboard"
 msgstr "Zum Netzwerk Dashboard"
 
 # @ acf
-#: admin/views/update-network.php:101 admin/views/update-notice.php:35
+#: admin/views/update-network.php:106 admin/views/update-notice.php:35
 msgid ""
 "It is strongly recommended that you backup your database before proceeding. "
 "Are you sure you wish to run the updater now?"
@@ -1592,12 +1583,12 @@ msgstr ""
 "willst?"
 
 # @ default
-#: admin/views/update-network.php:157
+#: admin/views/update-network.php:162
 msgid "Upgrade complete"
 msgstr "Aktualisierung abgeschlossen"
 
 # @ acf
-#: admin/views/update-network.php:161 admin/views/update.php:14
+#: admin/views/update-network.php:166 admin/views/update.php:14
 #, php-format
 msgid "Upgrading data to version %s"
 msgstr "Aktualisiere Daten auf Version %s"
@@ -1633,93 +1624,98 @@ msgid "See what's new"
 msgstr "Was ist neu"
 
 # @ acf
-#: api/api-helpers.php:933
+#: api/api-helpers.php:944
 msgid "Thumbnail"
 msgstr "Miniaturbild"
 
 # @ acf
-#: api/api-helpers.php:934
+#: api/api-helpers.php:945
 msgid "Medium"
 msgstr "Mittel"
 
 # @ acf
-#: api/api-helpers.php:935
+#: api/api-helpers.php:946
 msgid "Large"
 msgstr "Gross"
 
 # @ acf
-#: api/api-helpers.php:984
+#: api/api-helpers.php:995
 msgid "Full Size"
 msgstr "Volle Grösse"
 
 # @ acf
-#: api/api-helpers.php:1196 api/api-helpers.php:1759
+#: api/api-helpers.php:1207 api/api-helpers.php:1770 pro/fields/clone.php:849
 msgid "(no title)"
 msgstr "(ohne Titel)"
 
+#: api/api-helpers.php:1807 fields/page_link.php:284 fields/post_object.php:283
+#: fields/taxonomy.php:989
+msgid "Parent"
+msgstr "Eltern"
+
 # @ acf
-#: api/api-helpers.php:3594
+#: api/api-helpers.php:3873
 #, php-format
 msgid "Image width must be at least %dpx."
 msgstr "Die Breite des Bildes muss mindestens %dpx sein."
 
 # @ acf
-#: api/api-helpers.php:3599
+#: api/api-helpers.php:3878
 #, php-format
 msgid "Image width must not exceed %dpx."
 msgstr "Die Breite des Bildes darf %dpx nicht überschreiten."
 
 # @ acf
-#: api/api-helpers.php:3615
+#: api/api-helpers.php:3894
 #, php-format
 msgid "Image height must be at least %dpx."
 msgstr "Die Höhe des Bildes muss mindestens %dpx sein."
 
 # @ acf
-#: api/api-helpers.php:3620
+#: api/api-helpers.php:3899
 #, php-format
 msgid "Image height must not exceed %dpx."
 msgstr "Die Höhe des Bild darf %dpx nicht überschreiten."
 
 # @ acf
-#: api/api-helpers.php:3638
+#: api/api-helpers.php:3917
 #, php-format
 msgid "File size must be at least %s."
 msgstr "Die Dateigrösse muss mindestens %s sein."
 
 # @ acf
-#: api/api-helpers.php:3643
+#: api/api-helpers.php:3922
 #, php-format
 msgid "File size must must not exceed %s."
 msgstr "Die Dateigrösse darf %s nicht überschreiten."
 
 # @ acf
-#: api/api-helpers.php:3677
+#: api/api-helpers.php:3956
 #, php-format
 msgid "File type must be %s."
 msgstr "Der Dateityp muss %s sein."
 
-#: api/api-template.php:1004
+#: api/api-template.php:1092
 msgid "Spam Detected"
 msgstr "Spam erkannt"
 
 # @ acf
-#: api/api-template.php:1147 core/media.php:56 pro/api/api-options-page.php:50
-#: pro/fields/gallery.php:581
+#: api/api-template.php:1235 pro/api/api-options-page.php:50
+#: pro/fields/gallery.php:588
 msgid "Update"
 msgstr "Aktualisieren"
 
 # @ acf
-#: api/api-template.php:1148
+#: api/api-template.php:1236
 msgid "Post updated"
 msgstr "Beitrag aktualisiert"
 
 # @ acf
-#: api/api-template.php:1216 core/field.php:133
+#: api/api-template.php:1304 core/field.php:133
 msgid "Content"
 msgstr "Inhalt"
 
-#: api/api-template.php:1281
+#: api/api-template.php:1369
 msgid "Validate Email"
 msgstr "E-Mail bestätigen"
 
@@ -1744,56 +1740,65 @@ msgid "jQuery"
 msgstr "jQuery"
 
 # @ acf
-#: core/field.php:137 fields/checkbox.php:223 fields/radio.php:288
-#: pro/fields/flexible-content.php:491 pro/fields/flexible-content.php:540
-#: pro/fields/repeater.php:459
+#: core/field.php:137 fields/checkbox.php:224 fields/radio.php:293
+#: pro/fields/clone.php:692 pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:544 pro/fields/repeater.php:459
 msgid "Layout"
 msgstr "Layout"
 
 # @ acf
-#: core/input.php:255
+#: core/input.php:258
 msgid "Expand Details"
 msgstr "Details einblenden"
 
 # @ acf
-#: core/input.php:256
+#: core/input.php:259
 msgid "Collapse Details"
 msgstr "Details ausblenden"
 
 # @ acf
-#: core/input.php:257
+#: core/input.php:260
 msgid "Validation successful"
 msgstr "Überprüfung erfolgreich"
 
 # @ acf
-#: core/input.php:258 core/validation.php:306 forms/widget.php:238
+#: core/input.php:261 core/validation.php:306 forms/widget.php:234
 msgid "Validation failed"
 msgstr "Überprüfung fehlgeschlagen"
 
 # @ acf
-#: core/input.php:259
+#: core/input.php:262
 msgid "1 field requires attention"
 msgstr "Für 1 Feld ist eine Aktualisierung notwendig"
 
 # @ acf
-#: core/input.php:260
+#: core/input.php:263
 #, php-format
 msgid "%d fields require attention"
 msgstr "Für %d Felder ist eine Aktualisierung notwendig"
 
-#: core/input.php:261
+#: core/input.php:264
 msgid "Restricted"
 msgstr "Eingeschränkt"
 
-# @ acf
-#: core/media.php:54 fields/select.php:36 fields/select.php:167
-#: fields/taxonomy.php:771
+#: core/media.php:54 fields/select.php:249
+msgctxt "verb"
 msgid "Select"
-msgstr "Auswahlmenü"
+msgstr "Auswählen"
+
+#: core/media.php:55
+msgctxt "verb"
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: core/media.php:56
+msgctxt "verb"
+msgid "Update"
+msgstr "Aktualisieren"
 
 # @ acf
 #: core/media.php:57 fields/file.php:49 fields/image.php:54
-#: pro/fields/gallery.php:56
+#: pro/fields/gallery.php:55
 msgid "Uploaded to this post"
 msgstr "Zu diesem Beitrag hochgeladen"
 
@@ -1804,69 +1809,89 @@ msgid "%s value is required"
 msgstr "%s Wert ist notwendig"
 
 # @ acf
-#: fields/checkbox.php:36 fields/taxonomy.php:766
+#: fields/checkbox.php:36 fields/taxonomy.php:767
 msgid "Checkbox"
 msgstr "Checkbox"
 
 # @ acf
-#: fields/checkbox.php:141
+#: fields/checkbox.php:142
 msgid "Toggle All"
 msgstr "Alle auswählen"
 
 # @ acf
-#: fields/checkbox.php:205 fields/radio.php:236 fields/select.php:354
+#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:446
 msgid "Choices"
 msgstr "Auswahlmöglichkeiten"
 
 # @ acf
-#: fields/checkbox.php:206 fields/radio.php:237 fields/select.php:355
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "Enter each choice on a new line."
 msgstr "Jede Auswahlmöglichkeit in separater Zeile eingeben."
 
 # @ acf
-#: fields/checkbox.php:206 fields/radio.php:237 fields/select.php:355
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "For more control, you may specify both a value and label like this:"
 msgstr ""
 "Für eine bessere Darstellung, kannst Du auch einen Wert und dazu dessen "
 "Beschriftung definieren:"
 
 # @ acf
-#: fields/checkbox.php:206 fields/radio.php:237 fields/select.php:355
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "red : Red"
 msgstr "rot : Rot"
 
 # @ acf
-#: fields/checkbox.php:214 fields/color_picker.php:147 fields/email.php:124
-#: fields/number.php:150 fields/radio.php:279 fields/select.php:363
+#: fields/checkbox.php:215 fields/color_picker.php:147 fields/email.php:124
+#: fields/number.php:150 fields/radio.php:284 fields/select.php:455
 #: fields/text.php:148 fields/textarea.php:145 fields/true_false.php:115
 #: fields/url.php:117 fields/wysiwyg.php:379
 msgid "Default Value"
 msgstr "Standardwert"
 
 # @ acf
-#: fields/checkbox.php:215 fields/select.php:364
+#: fields/checkbox.php:216 fields/select.php:456
 msgid "Enter each default value on a new line"
 msgstr "Jeden Standardwert in einer neuen Zeile eingeben"
 
 # @ acf
-#: fields/checkbox.php:229 fields/radio.php:294
+#: fields/checkbox.php:230 fields/radio.php:299
 msgid "Vertical"
 msgstr "Vertikal"
 
 # @ acf
-#: fields/checkbox.php:230 fields/radio.php:295
+#: fields/checkbox.php:231 fields/radio.php:300
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: fields/checkbox.php:237
+#: fields/checkbox.php:238
 msgid "Toggle"
 msgstr "Auswählen"
 
-#: fields/checkbox.php:238
+#: fields/checkbox.php:239
 msgid "Prepend an extra checkbox to toggle all choices"
 msgstr ""
 "Hänge eine zusätzliche Checkbox an mit der man alle Optionen auswählen kann"
 
+# @ acf
+#: fields/checkbox.php:252 fields/file.php:220 fields/image.php:206
+#: fields/radio.php:307 fields/taxonomy.php:836
+msgid "Return Value"
+msgstr "Rückgabewert"
+
+# @ acf
+#: fields/checkbox.php:253 fields/file.php:221 fields/image.php:207
+#: fields/radio.php:308
+msgid "Specify the returned value on front end"
+msgstr "Legt den Rückgabewert für das Front-End fest"
+
+#: fields/checkbox.php:258 fields/radio.php:313 fields/select.php:526
+msgid "Value"
+msgstr "Wert"
+
+#: fields/checkbox.php:260 fields/radio.php:315 fields/select.php:528
+msgid "Both (Array)"
+msgstr "Beide (Array)"
+
 # @ acf
 #: fields/color_picker.php:36
 msgid "Color Picker"
@@ -1896,54 +1921,147 @@ msgstr "Aktuelle Farbe"
 msgid "Date Picker"
 msgstr "Datum"
 
-# @ acf
-#: fields/date_picker.php:72
+#: fields/date_picker.php:44
+msgctxt "Date Picker JS closeText"
 msgid "Done"
-msgstr "Fertig"
+msgstr "Schliessen"
 
-# @ acf
-#: fields/date_picker.php:73
+#: fields/date_picker.php:45
+msgctxt "Date Picker JS currentText"
 msgid "Today"
 msgstr "Heute"
 
-# @ acf
-#: fields/date_picker.php:76
-msgid "Show a different month"
-msgstr "Zeige einen anderen Monat"
+#: fields/date_picker.php:46
+msgctxt "Date Picker JS nextText"
+msgid "Next"
+msgstr "Weiter"
+
+#: fields/date_picker.php:47
+msgctxt "Date Picker JS prevText"
+msgid "Prev"
+msgstr "Zurück"
+
+#: fields/date_picker.php:48
+msgctxt "Date Picker JS weekHeader"
+msgid "Wk"
+msgstr "KW"
 
 # @ acf
-#: fields/date_picker.php:174
+#: fields/date_picker.php:195 fields/date_time_picker.php:184
+#: fields/time_picker.php:126
 msgid "Display Format"
 msgstr "Darstellungs-Format"
 
 # @ acf
-#: fields/date_picker.php:175
+#: fields/date_picker.php:196 fields/date_time_picker.php:185
+#: fields/time_picker.php:127
 msgid "The format displayed when editing a post"
 msgstr "Das Datums-Format für die Anzeige in der Bearbeitungs-Ansicht"
 
 # @ acf
-#: fields/date_picker.php:189 fields/post_object.php:426
-#: fields/relationship.php:766
+#: fields/date_picker.php:210 fields/date_time_picker.php:200
+#: fields/post_object.php:455 fields/relationship.php:783 fields/select.php:520
+#: fields/time_picker.php:140
 msgid "Return Format"
 msgstr "Rückgabewert"
 
 # @ acf
-#: fields/date_picker.php:190
+#: fields/date_picker.php:211 fields/date_time_picker.php:201
+#: fields/time_picker.php:141
 msgid "The format returned via template functions"
 msgstr "Das Datums-Format für die Ausgabe in den Template-Funktionen"
 
 # @ acf
-#: fields/date_picker.php:205
+#: fields/date_picker.php:226 fields/date_time_picker.php:216
 msgid "Week Starts On"
 msgstr "Die Woche beginnt am"
 
+#: fields/date_time_picker.php:36
+msgid "Date Time Picker"
+msgstr "Datum/Uhrzeit"
+
+#: fields/date_time_picker.php:44
+msgctxt "Date Time Picker JS timeOnlyTitle"
+msgid "Choose Time"
+msgstr "Zeit setzen"
+
+#: fields/date_time_picker.php:45
+msgctxt "Date Time Picker JS timeText"
+msgid "Time"
+msgstr "Zeit"
+
+#: fields/date_time_picker.php:46
+msgctxt "Date Time Picker JS hourText"
+msgid "Hour"
+msgstr "Stunde"
+
+#: fields/date_time_picker.php:47
+msgctxt "Date Time Picker JS minuteText"
+msgid "Minute"
+msgstr "Minute"
+
+#: fields/date_time_picker.php:48
+msgctxt "Date Time Picker JS secondText"
+msgid "Second"
+msgstr "Sekunde"
+
+#: fields/date_time_picker.php:49
+msgctxt "Date Time Picker JS millisecText"
+msgid "Millisecond"
+msgstr "Millisekunde"
+
+#: fields/date_time_picker.php:50
+msgctxt "Date Time Picker JS microsecText"
+msgid "Microsecond"
+msgstr "Mikrosekunde"
+
+#: fields/date_time_picker.php:51
+msgctxt "Date Time Picker JS timezoneText"
+msgid "Time Zone"
+msgstr "Zeitzone"
+
+#: fields/date_time_picker.php:52
+msgctxt "Date Time Picker JS currentText"
+msgid "Now"
+msgstr "Jetzt"
+
+#: fields/date_time_picker.php:53
+msgctxt "Date Time Picker JS closeText"
+msgid "Done"
+msgstr "Schliessen"
+
+#: fields/date_time_picker.php:54
+msgctxt "Date Time Picker JS selectText"
+msgid "Select"
+msgstr "Auswählen"
+
+#: fields/date_time_picker.php:56
+msgctxt "Date Time Picker JS amText"
+msgid "AM"
+msgstr "AM"
+
+#: fields/date_time_picker.php:57
+msgctxt "Date Time Picker JS amTextShort"
+msgid "A"
+msgstr "A"
+
+#: fields/date_time_picker.php:60
+msgctxt "Date Time Picker JS pmText"
+msgid "PM"
+msgstr "PM"
+
+#: fields/date_time_picker.php:61
+msgctxt "Date Time Picker JS pmTextShort"
+msgid "P"
+msgstr "P"
+
 # @ acf
 #: fields/email.php:36
 msgid "Email"
 msgstr "E-Mail"
 
 # @ acf
-#: fields/email.php:125 fields/number.php:151 fields/radio.php:280
+#: fields/email.php:125 fields/number.php:151 fields/radio.php:285
 #: fields/text.php:149 fields/textarea.php:146 fields/url.php:118
 #: fields/wysiwyg.php:380
 msgid "Appears when creating a new post"
@@ -2006,8 +2124,8 @@ msgstr "Dateiname"
 
 # @ acf
 #: fields/file.php:152 fields/file.php:253 fields/file.php:264
-#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:710
-#: pro/fields/gallery.php:743
+#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:707
+#: pro/fields/gallery.php:740
 msgid "File size"
 msgstr "Dateigrösse"
 
@@ -2016,16 +2134,6 @@ msgstr "Dateigrösse"
 msgid "Add File"
 msgstr "Datei hinzufügen"
 
-# @ acf
-#: fields/file.php:220 fields/image.php:206 fields/taxonomy.php:835
-msgid "Return Value"
-msgstr "Rückgabewert"
-
-# @ acf
-#: fields/file.php:221 fields/image.php:207
-msgid "Specify the returned value on front end"
-msgstr "Legt den Rückgabewert für das Front-End fest"
-
 # @ acf
 #: fields/file.php:226
 msgid "File Array"
@@ -2042,22 +2150,22 @@ msgid "File ID"
 msgstr "Datei-ID"
 
 # @ acf
-#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:673
+#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:670
 msgid "Library"
 msgstr "Medienübersicht"
 
 # @ acf
-#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:674
+#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:671
 msgid "Limit the media library choice"
 msgstr "Beschränkt die Auswahl in der Medienübersicht"
 
 # @ acf
-#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:680
+#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:677
 msgid "Uploaded to post"
 msgstr "Für den Beitrag hochgeladen"
 
 # @ acf
-#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:687
+#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:684
 msgid "Minimum"
 msgstr "Minimum"
 
@@ -2069,17 +2177,17 @@ msgstr ""
 "erfüllen"
 
 # @ acf
-#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:720
+#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:717
 msgid "Maximum"
 msgstr "Maximum"
 
 # @ acf
-#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:753
+#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:750
 msgid "Allowed file types"
 msgstr "Erlaubte Datei-Formate"
 
 # @ acf
-#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:754
+#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:751
 msgid "Comma separated list. Leave blank for all types"
 msgstr ""
 "Komma separierte Liste; ein leeres Feld bedeutet alle Dateiformate sind "
@@ -2101,7 +2209,7 @@ msgid "Sorry, this browser does not support geolocation"
 msgstr "Dieser Browser unterstützt keine Geo-Lokation"
 
 # @ acf
-#: fields/google-map.php:133 fields/relationship.php:725
+#: fields/google-map.php:133 fields/relationship.php:742
 msgid "Search"
 msgstr "Suchen"
 
@@ -2142,7 +2250,7 @@ msgstr "Legt die Zoomstufe der Karte fest"
 
 # @ acf
 #: fields/google-map.php:203 fields/image.php:257 fields/image.php:290
-#: fields/oembed.php:275 pro/fields/gallery.php:699 pro/fields/gallery.php:732
+#: fields/oembed.php:275 pro/fields/gallery.php:696 pro/fields/gallery.php:729
 msgid "Height"
 msgstr "Höhe"
 
@@ -2162,12 +2270,12 @@ msgid "Select Image"
 msgstr "Bild auswählen"
 
 # @ acf
-#: fields/image.php:52 pro/fields/gallery.php:54
+#: fields/image.php:52 pro/fields/gallery.php:53
 msgid "Edit Image"
 msgstr "Bild bearbeiten"
 
 # @ acf
-#: fields/image.php:53 pro/fields/gallery.php:55
+#: fields/image.php:53 pro/fields/gallery.php:54
 msgid "Update Image"
 msgstr "Bild aktualisieren"
 
@@ -2177,7 +2285,7 @@ msgid "All images"
 msgstr "Alle Bilder"
 
 # @ acf
-#: fields/image.php:144 pro/fields/gallery.php:359 pro/fields/gallery.php:537
+#: fields/image.php:144 pro/fields/gallery.php:358 pro/fields/gallery.php:546
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -2207,18 +2315,18 @@ msgid "Image ID"
 msgstr "Bild-ID"
 
 # @ acf
-#: fields/image.php:221 pro/fields/gallery.php:650
+#: fields/image.php:221
 msgid "Preview Size"
 msgstr "Masse der Vorschau"
 
 # @ acf
-#: fields/image.php:222 pro/fields/gallery.php:651
+#: fields/image.php:222
 msgid "Shown when entering data"
 msgstr "Legt fest welche Masse die Vorschau in der Bearbeitungs-Ansicht hat"
 
 # @ acf
-#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:688
-#: pro/fields/gallery.php:721
+#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:685
+#: pro/fields/gallery.php:718
 msgid "Restrict which images can be uploaded"
 msgstr ""
 "Erlaubt nur das Hochladen von Bildern, die die angegebenen Eigenschaften "
@@ -2226,7 +2334,7 @@ msgstr ""
 
 # @ acf
 #: fields/image.php:249 fields/image.php:282 fields/oembed.php:264
-#: pro/fields/gallery.php:691 pro/fields/gallery.php:724
+#: pro/fields/gallery.php:688 pro/fields/gallery.php:721
 msgid "Width"
 msgstr "Breite"
 
@@ -2330,43 +2438,47 @@ msgid "Embed Size"
 msgstr "Masse"
 
 # @ acf
-#: fields/page_link.php:197
+#: fields/page_link.php:192
 msgid "Archives"
 msgstr "Archive"
 
 # @ acf
-#: fields/page_link.php:506 fields/post_object.php:370
-#: fields/relationship.php:692
+#: fields/page_link.php:500 fields/post_object.php:399
+#: fields/relationship.php:709
 msgid "Filter by Post Type"
 msgstr "Nach Post Types filtern"
 
 # @ acf
-#: fields/page_link.php:514 fields/post_object.php:378
-#: fields/relationship.php:700
+#: fields/page_link.php:508 fields/post_object.php:407
+#: fields/relationship.php:717
 msgid "All post types"
 msgstr "Alle verfügbaren Post Types"
 
 # @ acf
-#: fields/page_link.php:520 fields/post_object.php:384
-#: fields/relationship.php:706
+#: fields/page_link.php:514 fields/post_object.php:413
+#: fields/relationship.php:723
 msgid "Filter by Taxonomy"
 msgstr "Nach Taxonomien filtern"
 
 # @ acf
-#: fields/page_link.php:528 fields/post_object.php:392
-#: fields/relationship.php:714
+#: fields/page_link.php:522 fields/post_object.php:421
+#: fields/relationship.php:731
 msgid "All taxonomies"
 msgstr "Alle Taxonomien"
 
 # @ acf
-#: fields/page_link.php:534 fields/post_object.php:398 fields/radio.php:245
-#: fields/select.php:372 fields/taxonomy.php:779 fields/user.php:411
+#: fields/page_link.php:528 fields/post_object.php:427 fields/radio.php:250
+#: fields/select.php:464 fields/taxonomy.php:780 fields/user.php:394
 msgid "Allow Null?"
 msgstr "NULL-Werte zulassen?"
 
+#: fields/page_link.php:542
+msgid "Allow Archives URLs"
+msgstr "Archiv URLs erlauben"
+
 # @ acf
-#: fields/page_link.php:548 fields/post_object.php:412 fields/select.php:386
-#: fields/user.php:425
+#: fields/page_link.php:556 fields/post_object.php:441 fields/select.php:478
+#: fields/user.php:408
 msgid "Select multiple values?"
 msgstr "Mehrere Werte auswählbar?"
 
@@ -2376,13 +2488,13 @@ msgid "Password"
 msgstr "Passwort"
 
 # @ acf
-#: fields/post_object.php:36 fields/post_object.php:431
-#: fields/relationship.php:771
+#: fields/post_object.php:36 fields/post_object.php:460
+#: fields/relationship.php:788
 msgid "Post Object"
 msgstr "Beitrags-Objekt"
 
 # @ acf
-#: fields/post_object.php:432 fields/relationship.php:772
+#: fields/post_object.php:461 fields/relationship.php:789
 msgid "Post ID"
 msgstr "Beitrags-ID"
 
@@ -2392,24 +2504,24 @@ msgid "Radio Button"
 msgstr "Radio-Button"
 
 # @ acf
-#: fields/radio.php:259
+#: fields/radio.php:264
 msgid "Other"
 msgstr "Sonstige"
 
 # @ acf
-#: fields/radio.php:263
+#: fields/radio.php:268
 msgid "Add 'other' choice to allow for custom values"
 msgstr ""
 "Fügt die Option 'Sonstige' hinzu, welche erlaubt, benutzerdefinierte Werte "
 "hinzuzufügen"
 
 # @ acf
-#: fields/radio.php:269
+#: fields/radio.php:274
 msgid "Save Other"
 msgstr "'Sonstige' speichern"
 
 # @ acf
-#: fields/radio.php:273
+#: fields/radio.php:278
 msgid "Save 'other' values to the field's choices"
 msgstr "Füge 'Sonstige'-Werte zu den Auswahl Optionen hinzu"
 
@@ -2439,63 +2551,136 @@ msgid "No matches found"
 msgstr "Keine Übereinstimmung gefunden"
 
 # @ acf
-#: fields/relationship.php:573
+#: fields/relationship.php:590
 msgid "Search..."
 msgstr "Suchen..."
 
 # @ acf
-#: fields/relationship.php:582
+#: fields/relationship.php:599
 msgid "Select post type"
 msgstr "Beitrag-Typ auswählen"
 
 # @ acf
-#: fields/relationship.php:595
+#: fields/relationship.php:612
 msgid "Select taxonomy"
 msgstr "Taxonomie auswählen"
 
 # @ acf
-#: fields/relationship.php:727 fields/taxonomy.php:36 fields/taxonomy.php:749
+#: fields/relationship.php:744 fields/taxonomy.php:36 fields/taxonomy.php:750
 msgid "Taxonomy"
 msgstr "Taxonomie"
 
 # @ acf
-#: fields/relationship.php:734
+#: fields/relationship.php:751
 msgid "Elements"
 msgstr "Elemente"
 
 # @ acf
-#: fields/relationship.php:735
+#: fields/relationship.php:752
 msgid "Selected elements will be displayed in each result"
 msgstr "Die ausgewählten Elemente werden in jedem Ergebnis mit angezeigt"
 
 # @ acf
-#: fields/relationship.php:746
+#: fields/relationship.php:763
 msgid "Minimum posts"
 msgstr "Min. Anzahl der Beiträge"
 
 # @ acf
-#: fields/relationship.php:755
+#: fields/relationship.php:772
 msgid "Maximum posts"
 msgstr "Max. Anzahl der Beiträge"
 
 # @ acf
-#: fields/relationship.php:859 pro/fields/gallery.php:826
+#: fields/relationship.php:876 pro/fields/gallery.php:823
 #, php-format
 msgid "%s requires at least %s selection"
 msgid_plural "%s requires at least %s selections"
 msgstr[0] "%s benötigt mindestens %s Selektion"
 msgstr[1] "%s benötigt mindestens %s Selektionen"
 
+#: fields/select.php:36 fields/taxonomy.php:772
+msgctxt "noun"
+msgid "Select"
+msgstr "Auswahlmenü"
+
+#: fields/select.php:49
+msgctxt "Select2 JS matches_1"
+msgid "One result is available, press enter to select it."
+msgstr "Ein Resultat gefunden, mit Enter auswählen."
+
+#: fields/select.php:50
+#, php-format
+msgctxt "Select2 JS matches_n"
+msgid "%d results are available, use up and down arrow keys to navigate."
+msgstr "%d Resultate gefunden, benutze die Pfeiltasten um zu navigieren."
+
+#: fields/select.php:51
+msgctxt "Select2 JS matches_0"
+msgid "No matches found"
+msgstr "Keine Übereinstimmungen gefunden"
+
+#: fields/select.php:52
+msgctxt "Select2 JS input_too_short_1"
+msgid "Please enter 1 or more characters"
+msgstr "Bitte eins oder mehrere Zeichen eingeben"
+
+#: fields/select.php:53
+#, php-format
+msgctxt "Select2 JS input_too_short_n"
+msgid "Please enter %d or more characters"
+msgstr "Bitte %d mehr Zeichen eingeben"
+
+#: fields/select.php:54
+msgctxt "Select2 JS input_too_long_1"
+msgid "Please delete 1 character"
+msgstr "Bitte ein Zeichen löschen"
+
+#: fields/select.php:55
+#, php-format
+msgctxt "Select2 JS input_too_long_n"
+msgid "Please delete %d characters"
+msgstr "Bitte %d Zeichen löschen"
+
+#: fields/select.php:56
+msgctxt "Select2 JS selection_too_long_1"
+msgid "You can only select 1 item"
+msgstr "Du kannst du ein Resultat wählen"
+
+#: fields/select.php:57
+#, php-format
+msgctxt "Select2 JS selection_too_long_n"
+msgid "You can only select %d items"
+msgstr "Du kannst nur %d Resultate auswählen"
+
+#: fields/select.php:58
+msgctxt "Select2 JS load_more"
+msgid "Loading more results&hellip;"
+msgstr "Lade weitere Resultate&hellip;"
+
+#: fields/select.php:59
+msgctxt "Select2 JS searching"
+msgid "Searching&hellip;"
+msgstr "Suche&hellip;"
+
+#: fields/select.php:60
+msgctxt "Select2 JS load_fail"
+msgid "Loading failed"
+msgstr "Fehler beim Laden"
+
 # @ acf
-#: fields/select.php:400
+#: fields/select.php:492
 msgid "Stylised UI"
 msgstr "Modernes Auswahlfeld"
 
 # @ acf
-#: fields/select.php:414
+#: fields/select.php:506
 msgid "Use AJAX to lazy load choices?"
 msgstr "AJAX zum Laden der Einträge aktivieren"
 
+#: fields/select.php:521
+msgid "Specify the value returned"
+msgstr "Rückgabewert festlegen"
+
 # @ acf
 #: fields/tab.php:36
 msgid "Tab"
@@ -2544,106 +2729,102 @@ msgid "Use this field as an end-point and start a new group of tabs"
 msgstr "Benutze das Feld als einen Abschluss und starte eine Gruppe an Tabs"
 
 # @ acf
-#: fields/taxonomy.php:718
+#: fields/taxonomy.php:719
 msgid "None"
 msgstr "Nur Text"
 
 # @ acf
-#: fields/taxonomy.php:750
+#: fields/taxonomy.php:751
 msgid "Select the taxonomy to be displayed"
 msgstr "Wähle die Taxonomie, welche angezeigt werden soll"
 
 # @ acf
-#: fields/taxonomy.php:759
+#: fields/taxonomy.php:760
 msgid "Appearance"
 msgstr "Anzeige"
 
 # @ acf
-#: fields/taxonomy.php:760
+#: fields/taxonomy.php:761
 msgid "Select the appearance of this field"
 msgstr "Wähle das Aussehen für dieses Feld"
 
 # @ acf
-#: fields/taxonomy.php:765
+#: fields/taxonomy.php:766
 msgid "Multiple Values"
 msgstr "Mehrere Werte auswählen?"
 
 # @ acf
-#: fields/taxonomy.php:767
+#: fields/taxonomy.php:768
 msgid "Multi Select"
 msgstr "Auswahlmenü"
 
 # @ acf
-#: fields/taxonomy.php:769
+#: fields/taxonomy.php:770
 msgid "Single Value"
 msgstr "Einzelne Werte"
 
 # @ acf
-#: fields/taxonomy.php:770
+#: fields/taxonomy.php:771
 msgid "Radio Buttons"
 msgstr "Radio Button"
 
 # @ acf
-#: fields/taxonomy.php:793
+#: fields/taxonomy.php:794
 msgid "Create Terms"
 msgstr "Neue Einträge erlauben"
 
 # @ acf
-#: fields/taxonomy.php:794
+#: fields/taxonomy.php:795
 msgid "Allow new terms to be created whilst editing"
 msgstr "Erlaube das Erstellen neuer Einträge beim Editieren"
 
-#: fields/taxonomy.php:807
+#: fields/taxonomy.php:808
 msgid "Save Terms"
 msgstr "Einträge speichern"
 
 # @ acf
-#: fields/taxonomy.php:808
+#: fields/taxonomy.php:809
 msgid "Connect selected terms to the post"
 msgstr "Speichert die ausgewählten Einträge auch im Beitrag"
 
-#: fields/taxonomy.php:821
+#: fields/taxonomy.php:822
 msgid "Load Terms"
 msgstr "Einträge laden"
 
-#: fields/taxonomy.php:822
+#: fields/taxonomy.php:823
 msgid "Load value from posts terms"
 msgstr "Den Wert von den Einträgen des Beitrags laden"
 
 # @ acf
-#: fields/taxonomy.php:840
+#: fields/taxonomy.php:841
 msgid "Term Object"
 msgstr "Begriffs-Objekt"
 
 # @ acf
-#: fields/taxonomy.php:841
+#: fields/taxonomy.php:842
 msgid "Term ID"
 msgstr "Begriffs-ID"
 
 # @ acf
-#: fields/taxonomy.php:900
+#: fields/taxonomy.php:901
 #, php-format
 msgid "User unable to add new %s"
 msgstr "Der Benutzer kann keine neue %s hinzufügen"
 
 # @ acf
-#: fields/taxonomy.php:913
+#: fields/taxonomy.php:914
 #, php-format
 msgid "%s already exists"
 msgstr "%s ist bereits vorhanden"
 
 # @ acf
-#: fields/taxonomy.php:954
+#: fields/taxonomy.php:955
 #, php-format
 msgid "%s added"
 msgstr "%s hinzugefügt"
 
-#: fields/taxonomy.php:988
-msgid "Parent"
-msgstr "Eltern"
-
 # @ acf
-#: fields/taxonomy.php:999
+#: fields/taxonomy.php:1000
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -2677,6 +2858,10 @@ msgstr "Zeilenanzahl"
 msgid "Sets the textarea height"
 msgstr "Definiert die Höhe des Textfelds"
 
+#: fields/time_picker.php:36
+msgid "Time Picker"
+msgstr "Uhrzeit"
+
 # @ acf
 #: fields/true_false.php:36
 msgid "True / False"
@@ -2698,12 +2883,12 @@ msgid "Value must be a valid URL"
 msgstr "Bitte eine gültige URL eingeben"
 
 # @ acf
-#: fields/user.php:396
+#: fields/user.php:379
 msgid "Filter by role"
 msgstr "Filtere nach Benutzerrollen"
 
 # @ acf
-#: fields/user.php:404
+#: fields/user.php:387
 msgid "All user roles"
 msgstr "Alle Benutzerrollen"
 
@@ -2754,11 +2939,11 @@ msgid "Show Media Upload Buttons?"
 msgstr "Button zum Hochladen von Medien anzeigen?"
 
 # @ acf
-#: forms/comment.php:166 forms/post.php:294 pro/admin/options-page.php:416
+#: forms/comment.php:166 forms/post.php:295 pro/admin/options-page.php:416
 msgid "Edit field group"
 msgstr "Feld-Gruppen bearbeiten"
 
-#: forms/widget.php:239
+#: forms/widget.php:235
 #, php-format
 msgid "1 field requires attention."
 msgid_plural "%d fields require attention."
@@ -2772,7 +2957,7 @@ msgid "Advanced Custom Fields PRO"
 msgstr "Advanced Custom Fields PRO"
 
 # @ acf
-#: pro/acf-pro.php:191
+#: pro/acf-pro.php:192
 msgid "Flexible Content requires at least 1 layout"
 msgstr "Flexibler Inhalt benötigt mindestens ein Layout"
 
@@ -2807,17 +2992,11 @@ msgid "Create a Custom Field Group"
 msgstr "Erstelle eine Feld-Gruppe"
 
 # @ acf
-#: pro/admin/settings-updates.php:137
+#: pro/admin/settings-updates.php:87
 msgid "<b>Error</b>. Could not connect to update server"
 msgstr ""
 "<b>Fehler</b>. Verbindung zum Update-Server konnte nicht hergestellt werden."
 
-# @ acf
-#: pro/admin/settings-updates.php:267 pro/admin/settings-updates.php:338
-msgid "<b>Connection Error</b>. Sorry, please try again"
-msgstr ""
-"<b>Verbindungsfehler</b>. Entschuldige, versuche es bitte später noch einmal"
-
 # @ acf
 #: pro/admin/views/settings-updates.php:11
 msgid "Deactivate License"
@@ -2895,7 +3074,7 @@ msgstr "Aktualisierungs-Hinweis"
 msgid "Options"
 msgstr "Optionen"
 
-#: pro/core/updates.php:194
+#: pro/core/updates.php:206
 #, php-format
 msgid ""
 "To enable updates, please enter your license key on the <a href=\"%s"
@@ -2907,6 +3086,79 @@ msgstr ""
 "Lizenzschlüssel haben, findest du hier <a href=\"%s\" target=\"_blank"
 "\">Details & Preise</a>."
 
+#: pro/fields/clone.php:36
+msgctxt "noun"
+msgid "Clone"
+msgstr "Klonen"
+
+#: pro/fields/clone.php:663
+msgid "Select one or more fields you wish to clone"
+msgstr "Wähle eines oder mehrere Felder aus, das/die du klonen willst"
+
+# @ acf
+#: pro/fields/clone.php:678
+msgid "Display"
+msgstr "Anzeige"
+
+#: pro/fields/clone.php:679
+msgid "Specify the style used to render the clone field"
+msgstr "Gib an, wie die geklonten Felder ausgegeben werden sollen"
+
+#: pro/fields/clone.php:684
+msgid "Group (displays selected fields in a group within this field)"
+msgstr ""
+"Gruppe (zeigt die ausgewählten Felder in einer Gruppe innerhalb dieses Felds "
+"an)"
+
+#: pro/fields/clone.php:685
+msgid "Seamless (replaces this field with selected fields)"
+msgstr "Nahtlos (ersetzt dieses Feld mit den ausgewählten Feldern)"
+
+#: pro/fields/clone.php:693
+msgid "Specify the style used to render the selected fields"
+msgstr "Gib an, wie die ausgewählten Felder angezeigt werden sollen"
+
+# @ acf
+#: pro/fields/clone.php:698 pro/fields/flexible-content.php:555
+#: pro/fields/repeater.php:467
+msgid "Block"
+msgstr "Block"
+
+# @ acf
+#: pro/fields/clone.php:699 pro/fields/flexible-content.php:554
+#: pro/fields/repeater.php:466
+msgid "Table"
+msgstr "Tabelle"
+
+# @ acf
+#: pro/fields/clone.php:700 pro/fields/flexible-content.php:556
+#: pro/fields/repeater.php:468
+msgid "Row"
+msgstr "Reihe"
+
+#: pro/fields/clone.php:706
+#, php-format
+msgid "Labels will be displayed as %s"
+msgstr "Bezeichnungen werden angezeigt als %s"
+
+#: pro/fields/clone.php:709
+msgid "Prefix Field Labels"
+msgstr "Präfix für Feld Bezeichnungen"
+
+#: pro/fields/clone.php:724
+#, php-format
+msgid "Values will be saved as %s"
+msgstr "Werte werden gespeichert als %s"
+
+#: pro/fields/clone.php:727
+msgid "Prefix Field Names"
+msgstr "Präfix für Feld Namen"
+
+#: pro/fields/clone.php:883
+#, php-format
+msgid "All fields from %s field group"
+msgstr "Alle Felder der %s Feld-Gruppe"
+
 # @ acf
 #: pro/fields/flexible-content.php:36
 msgid "Flexible Content"
@@ -2963,87 +3215,72 @@ msgid "{required} {label} {identifier} required (min {min})"
 msgstr "{required} {label} {identifier} erforderlich (min {min})"
 
 # @ acf
-#: pro/fields/flexible-content.php:216
+#: pro/fields/flexible-content.php:220
 #, php-format
 msgid "Click the \"%s\" button below to start creating your layout"
 msgstr "Klicke \"%s\" zum Erstellen des Layouts"
 
 # @ acf
-#: pro/fields/flexible-content.php:346
+#: pro/fields/flexible-content.php:350
 msgid "Add layout"
 msgstr "Layout hinzufügen"
 
 # @ acf
-#: pro/fields/flexible-content.php:349
+#: pro/fields/flexible-content.php:353
 msgid "Remove layout"
 msgstr "Layout entfernen"
 
-#: pro/fields/flexible-content.php:352 pro/fields/repeater.php:304
+#: pro/fields/flexible-content.php:356 pro/fields/repeater.php:304
 msgid "Click to toggle"
 msgstr "Zum Auswählen anklicken"
 
 # @ acf
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder Layout"
 msgstr "Layout sortieren"
 
 # @ acf
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder"
 msgstr "Sortieren"
 
 # @ acf
-#: pro/fields/flexible-content.php:494
+#: pro/fields/flexible-content.php:498
 msgid "Delete Layout"
 msgstr "Layout löschen"
 
 # @ acf
-#: pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:499
 msgid "Duplicate Layout"
 msgstr "Layout duplizieren"
 
 # @ acf
-#: pro/fields/flexible-content.php:496
+#: pro/fields/flexible-content.php:500
 msgid "Add New Layout"
 msgstr "Neues Layout hinzufügen"
 
 # @ acf
-#: pro/fields/flexible-content.php:550 pro/fields/repeater.php:466
-msgid "Table"
-msgstr "Tabelle"
-
-# @ acf
-#: pro/fields/flexible-content.php:551 pro/fields/repeater.php:467
-msgid "Block"
-msgstr "Block"
-
-# @ acf
-#: pro/fields/flexible-content.php:552 pro/fields/repeater.php:468
-msgid "Row"
-msgstr "Reihe"
-
-# @ acf
-#: pro/fields/flexible-content.php:567
+#: pro/fields/flexible-content.php:571
 msgid "Min"
 msgstr "Min"
 
 # @ acf
-#: pro/fields/flexible-content.php:580
+#: pro/fields/flexible-content.php:584
 msgid "Max"
 msgstr "Max"
 
 # @ acf
-#: pro/fields/flexible-content.php:608 pro/fields/repeater.php:475
+#: pro/fields/flexible-content.php:612 pro/fields/repeater.php:475
 msgid "Button Label"
 msgstr "Button-Beschriftung"
 
 # @ acf
-#: pro/fields/flexible-content.php:617
+#: pro/fields/flexible-content.php:621
 msgid "Minimum Layouts"
 msgstr "Minimum Layouts"
 
 # @ acf
-#: pro/fields/flexible-content.php:626
+#: pro/fields/flexible-content.php:630
 msgid "Maximum Layouts"
 msgstr "Maximum Layouts"
 
@@ -3053,86 +3290,86 @@ msgid "Gallery"
 msgstr "Galerie"
 
 # @ acf
-#: pro/fields/gallery.php:53
+#: pro/fields/gallery.php:52
 msgid "Add Image to Gallery"
 msgstr "Bild zur Galerie hinzufügen"
 
 # @ acf
-#: pro/fields/gallery.php:57
+#: pro/fields/gallery.php:56
 msgid "Maximum selection reached"
 msgstr "Maximale Auswahl erreicht"
 
 # @ acf
-#: pro/fields/gallery.php:337
+#: pro/fields/gallery.php:336
 msgid "Length"
 msgstr "Länge"
 
-#: pro/fields/gallery.php:380
+#: pro/fields/gallery.php:379
 msgid "Caption"
 msgstr "Beschriftung"
 
-#: pro/fields/gallery.php:389
+#: pro/fields/gallery.php:388
 msgid "Alt Text"
 msgstr "Alt Text"
 
 # @ acf
-#: pro/fields/gallery.php:552
+#: pro/fields/gallery.php:559
 msgid "Add to gallery"
 msgstr "Zur Galerie hinzufügen"
 
 # @ acf
-#: pro/fields/gallery.php:556
+#: pro/fields/gallery.php:563
 msgid "Bulk actions"
 msgstr "Massenverarbeitung"
 
 # @ acf
-#: pro/fields/gallery.php:557
+#: pro/fields/gallery.php:564
 msgid "Sort by date uploaded"
 msgstr "Sortiere nach Upload-Datum"
 
 # @ acf
-#: pro/fields/gallery.php:558
+#: pro/fields/gallery.php:565
 msgid "Sort by date modified"
 msgstr "Sortiere nach Änderungs-Datum"
 
 # @ acf
-#: pro/fields/gallery.php:559
+#: pro/fields/gallery.php:566
 msgid "Sort by title"
 msgstr "Sortiere nach Titel"
 
 # @ acf
-#: pro/fields/gallery.php:560
+#: pro/fields/gallery.php:567
 msgid "Reverse current order"
 msgstr "Aktuelle Sortierung umkehren"
 
 # @ acf
-#: pro/fields/gallery.php:578
+#: pro/fields/gallery.php:585
 msgid "Close"
 msgstr "Schliessen"
 
 # @ acf
-#: pro/fields/gallery.php:632
+#: pro/fields/gallery.php:639
 msgid "Minimum Selection"
 msgstr "Minimale Auswahl"
 
 # @ acf
-#: pro/fields/gallery.php:641
+#: pro/fields/gallery.php:648
 msgid "Maximum Selection"
 msgstr "Maximale Auswahl"
 
-#: pro/fields/gallery.php:660
+#: pro/fields/gallery.php:657
 msgid "Insert"
 msgstr "Einfügen"
 
-#: pro/fields/gallery.php:661
+#: pro/fields/gallery.php:658
 msgid "Specify where new attachments are added"
 msgstr "Gib an, wo neue Anhänge eingefügt werden sollen"
 
-#: pro/fields/gallery.php:665
+#: pro/fields/gallery.php:662
 msgid "Append to the end"
 msgstr "Am Schluss anhängen"
 
-#: pro/fields/gallery.php:666
+#: pro/fields/gallery.php:663
 msgid "Prepend to the beginning"
 msgstr "Vor Beginn einfügen"
 
@@ -3206,6 +3443,56 @@ msgstr "Elliot Condon"
 msgid "http://www.elliotcondon.com/"
 msgstr "http://www.elliotcondon.com/"
 
+# @ acf
+#~ msgid "Select"
+#~ msgstr "Auswählen"
+
+# @ acf
+#~ msgid "<b>Connection Error</b>. Sorry, please try again"
+#~ msgstr ""
+#~ "<b>Verbindungsfehler</b>. Entschuldige, versuche es bitte später noch "
+#~ "einmal"
+
+# @ acf
+#~ msgid "<b>Success</b>. Import tool added %s field groups: %s"
+#~ msgstr "<b>Erfolgreich</b>. Der Import hat %s Feld-Gruppen hinzugefügt: %s"
+
+# @ acf
+#~ msgid ""
+#~ "<b>Warning</b>. Import tool detected %s field groups already exist and "
+#~ "have been ignored: %s"
+#~ msgstr ""
+#~ "<b>Warnung</b>. Der Import hat %s Feld-Gruppen erkannt, die schon "
+#~ "vorhanden sind und diese ignoriert: %s"
+
+# @ acf
+#~ msgid "Upgrade ACF"
+#~ msgstr "Aktualisiere ACF"
+
+# @ acf
+#~ msgid "Upgrade"
+#~ msgstr "Aktualisieren"
+
+# @ acf
+#~ msgid ""
+#~ "The following sites require a DB upgrade. Check the ones you want to "
+#~ "update and then click “Upgrade Database”."
+#~ msgstr ""
+#~ "Die folgenden Seiten erfordern eine Datenbank-Aktualisierung. Markiere "
+#~ "die gewünschten Seiten und klicke \\\"Aktualisiere Datenbank\\\"."
+
+# @ acf
+#~ msgid "Done"
+#~ msgstr "Fertig"
+
+# @ acf
+#~ msgid "Today"
+#~ msgstr "Heute"
+
+# @ acf
+#~ msgid "Show a different month"
+#~ msgstr "Zeige einen anderen Monat"
+
 # @ acf
 #~ msgid "See what's new in"
 #~ msgstr "Neuerungen in"
@@ -3303,10 +3590,6 @@ msgstr "http://www.elliotcondon.com/"
 #~ msgid "Warning"
 #~ msgstr "Warnung"
 
-# @ acf
-#~ msgid "Display"
-#~ msgstr "Anzeige"
-
 # @ acf
 #~ msgid "Show Field Keys"
 #~ msgstr "Zeige Feld-Schlüssel"
diff --git a/lang/acf-de_DE.mo b/lang/acf-de_DE.mo
index 0447601..6b97029 100644
Binary files a/lang/acf-de_DE.mo and b/lang/acf-de_DE.mo differ
diff --git a/lang/acf-de_DE.po b/lang/acf-de_DE.po
index c8fec4b..739c597 100644
--- a/lang/acf-de_DE.po
+++ b/lang/acf-de_DE.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Advanced Custom Fields Pro v5.3.9\n"
+"Project-Id-Version: Advanced Custom Fields Pro v5.4\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
-"POT-Creation-Date: 2016-06-02 02:15+0200\n"
-"PO-Revision-Date: 2016-06-02 03:30+0200\n"
+"POT-Creation-Date: 2016-07-29 00:27+0200\n"
+"PO-Revision-Date: 2016-07-29 00:42+0200\n"
 "Last-Translator: Ralf Koller <r.koller@gmail.com>\n"
 "Language-Team: Ralf Koller <r.koller@gmail.com>\n"
 "Language: de_DE\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.8\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
 "esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
@@ -28,109 +28,109 @@ msgid "Advanced Custom Fields"
 msgstr "Advanced Custom Fields"
 
 # @ acf
-#: acf.php:265 admin/admin.php:61
+#: acf.php:271 admin/admin.php:61
 msgid "Field Groups"
 msgstr "Feld-Gruppen"
 
 # @ acf
-#: acf.php:266
+#: acf.php:272
 msgid "Field Group"
 msgstr "Feld-Gruppe"
 
 # @ acf
-#: acf.php:267 acf.php:299 admin/admin.php:62
-#: pro/fields/flexible-content.php:496
+#: acf.php:273 acf.php:305 admin/admin.php:62
+#: pro/fields/flexible-content.php:500
 msgid "Add New"
 msgstr "Erstellen"
 
 # @ acf
-#: acf.php:268
+#: acf.php:274
 msgid "Add New Field Group"
 msgstr "Neue Feld-Gruppe erstellen"
 
 # @ acf
-#: acf.php:269
+#: acf.php:275
 msgid "Edit Field Group"
 msgstr "Feld-Gruppe bearbeiten"
 
 # @ acf
-#: acf.php:270
+#: acf.php:276
 msgid "New Field Group"
 msgstr "Neue Feld-Gruppe"
 
 # @ acf
-#: acf.php:271
+#: acf.php:277
 msgid "View Field Group"
 msgstr "Feld-Gruppe anzeigen"
 
 # @ acf
-#: acf.php:272
+#: acf.php:278
 msgid "Search Field Groups"
 msgstr "Feld-Gruppen suchen"
 
 # @ acf
-#: acf.php:273
+#: acf.php:279
 msgid "No Field Groups found"
 msgstr "Keine Feld-Gruppen gefunden"
 
 # @ acf
-#: acf.php:274
+#: acf.php:280
 msgid "No Field Groups found in Trash"
 msgstr "Keine Feld-Gruppen im Papierkorb gefunden"
 
 # @ acf
-#: acf.php:297 admin/field-group.php:182 admin/field-group.php:280
-#: admin/field-groups.php:528
+#: acf.php:303 admin/field-group.php:182 admin/field-group.php:280
+#: admin/field-groups.php:528 pro/fields/clone.php:662
 msgid "Fields"
 msgstr "Felder"
 
 # @ acf
-#: acf.php:298
+#: acf.php:304
 msgid "Field"
 msgstr "Feld"
 
 # @ acf
-#: acf.php:300
+#: acf.php:306
 msgid "Add New Field"
 msgstr "Feld hinzufügen"
 
 # @ acf
-#: acf.php:301
+#: acf.php:307
 msgid "Edit Field"
 msgstr "Feld bearbeiten"
 
 # @ acf
-#: acf.php:302 admin/views/field-group-fields.php:18
+#: acf.php:308 admin/views/field-group-fields.php:54
 #: admin/views/settings-info.php:111
 msgid "New Field"
 msgstr "Neues Feld"
 
 # @ acf
-#: acf.php:303
+#: acf.php:309
 msgid "View Field"
 msgstr "Feld anzeigen"
 
 # @ acf
-#: acf.php:304
+#: acf.php:310
 msgid "Search Fields"
 msgstr "Felder suchen"
 
 # @ acf
-#: acf.php:305
+#: acf.php:311
 msgid "No Fields found"
 msgstr "Keine Felder gefunden"
 
 # @ acf
-#: acf.php:306
+#: acf.php:312
 msgid "No Fields found in Trash"
 msgstr "Keine Feld-Gruppen im Papierkorb gefunden"
 
-#: acf.php:345 admin/field-group.php:395 admin/field-groups.php:586
+#: acf.php:351 admin/field-group.php:395 admin/field-groups.php:585
 #: admin/views/field-group-options.php:13
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: acf.php:350
+#: acf.php:356
 #, php-format
 msgid "Disabled <span class=\"count\">(%s)</span>"
 msgid_plural "Disabled <span class=\"count\">(%s)</span>"
@@ -207,7 +207,7 @@ msgid "Field group title is required"
 msgstr "Es ist ein Titel für die Feld-Gruppe erforderlich"
 
 # @ acf
-#: admin/field-group.php:278 api/api-field-group.php:620
+#: admin/field-group.php:278 api/api-field-group.php:651
 msgid "copy"
 msgstr "kopieren"
 
@@ -216,7 +216,7 @@ msgstr "kopieren"
 #: admin/views/field-group-field-conditional-logic.php:62
 #: admin/views/field-group-field-conditional-logic.php:162
 #: admin/views/field-group-locations.php:59
-#: admin/views/field-group-locations.php:135 api/api-helpers.php:3684
+#: admin/views/field-group-locations.php:135 api/api-helpers.php:3952
 msgid "or"
 msgstr "oder"
 
@@ -265,96 +265,96 @@ msgid "Active"
 msgstr "Aktiviert"
 
 # @ acf
-#: admin/field-group.php:843
+#: admin/field-group.php:842
 msgid "Front Page"
 msgstr "Startseite"
 
 # @ acf
-#: admin/field-group.php:844
+#: admin/field-group.php:843
 msgid "Posts Page"
 msgstr "Beitrags-Seite"
 
 # @ acf
-#: admin/field-group.php:845
+#: admin/field-group.php:844
 msgid "Top Level Page (no parent)"
 msgstr "Seite ohne übergeordnete Seiten"
 
 # @ acf
-#: admin/field-group.php:846
+#: admin/field-group.php:845
 msgid "Parent Page (has children)"
 msgstr "Übergeordnete Seite (mit Unterseiten)"
 
 # @ acf
-#: admin/field-group.php:847
+#: admin/field-group.php:846
 msgid "Child Page (has parent)"
 msgstr "Unterseite (mit übergeordneter Seite)"
 
 # @ acf
-#: admin/field-group.php:863
+#: admin/field-group.php:862
 msgid "Default Template"
 msgstr "Standard-Template"
 
 # @ acf
-#: admin/field-group.php:886
+#: admin/field-group.php:885
 msgid "Logged in"
 msgstr "ist angemeldet"
 
 # @ acf
-#: admin/field-group.php:887
+#: admin/field-group.php:886
 msgid "Viewing front end"
 msgstr "ist im Front-End"
 
 # @ acf
-#: admin/field-group.php:888
+#: admin/field-group.php:887
 msgid "Viewing back end"
 msgstr "ist im Back-End"
 
 # @ acf
-#: admin/field-group.php:907
+#: admin/field-group.php:906
 msgid "Super Admin"
 msgstr "Super-Admin"
 
 # @ acf
-#: admin/field-group.php:918 admin/field-group.php:926
-#: admin/field-group.php:940 admin/field-group.php:947
-#: admin/field-group.php:964 admin/field-group.php:981 fields/file.php:241
-#: fields/image.php:237 pro/fields/gallery.php:684
+#: admin/field-group.php:917 admin/field-group.php:925
+#: admin/field-group.php:939 admin/field-group.php:946
+#: admin/field-group.php:963 admin/field-group.php:980 fields/file.php:241
+#: fields/image.php:237 pro/fields/gallery.php:676
 msgid "All"
 msgstr "Alle"
 
 # @ acf
-#: admin/field-group.php:927
+#: admin/field-group.php:926
 msgid "Add / Edit"
 msgstr "Hinzufügen / Bearbeiten"
 
 # @ acf
-#: admin/field-group.php:928
+#: admin/field-group.php:927
 msgid "Register"
 msgstr "Registrieren"
 
 # @ acf
-#: admin/field-group.php:1168
+#: admin/field-group.php:1167
 msgid "Move Complete."
 msgstr "Verschieben erfolgreich abgeschlossen."
 
 # @ acf
-#: admin/field-group.php:1169
+#: admin/field-group.php:1168
 #, php-format
 msgid "The %s field can now be found in the %s field group"
 msgstr "Das Feld \"%s\" wurde in die %s Feld-Gruppe verschoben"
 
 # @ acf
-#: admin/field-group.php:1171
+#: admin/field-group.php:1170
 msgid "Close Window"
 msgstr "Schließen"
 
 # @ acf
-#: admin/field-group.php:1206
+#: admin/field-group.php:1205
 msgid "Please select the destination for this field"
 msgstr "In welche Feld-Gruppe solle dieses Feld verschoben werden"
 
 # @ acf
-#: admin/field-group.php:1213
+#: admin/field-group.php:1212
 msgid "Move Field"
 msgstr "Feld verschieben"
 
@@ -394,20 +394,20 @@ msgstr[0] "%s Feld-Gruppe synchronisiert."
 msgstr[1] "%s Feld-Gruppen synchronisiert."
 
 # @ acf
-#: admin/field-groups.php:412 admin/field-groups.php:576
+#: admin/field-groups.php:412 admin/field-groups.php:575
 msgid "Sync available"
 msgstr "Synchronisierung verfügbar"
 
 # @ acf
-#: admin/field-groups.php:525 api/api-template.php:1058
-#: api/api-template.php:1271 pro/fields/gallery.php:371
+#: admin/field-groups.php:525 api/api-template.php:1077
+#: api/api-template.php:1290 pro/fields/gallery.php:370
 msgid "Title"
 msgstr "Titel"
 
 # @ acf
 #: admin/field-groups.php:526 admin/views/field-group-options.php:93
-#: admin/views/update-network.php:20 admin/views/update-network.php:28
-#: pro/fields/gallery.php:398
+#: admin/views/update-network.php:25 admin/views/update-network.php:33
+#: pro/fields/gallery.php:397
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -416,95 +416,95 @@ msgid "Status"
 msgstr "Status"
 
 # @ acf
-#: admin/field-groups.php:624 admin/settings-info.php:76
+#: admin/field-groups.php:623 admin/settings-info.php:76
 #: pro/admin/views/settings-updates.php:111
 msgid "Changelog"
 msgstr "Versionshinweise"
 
-#: admin/field-groups.php:625
+#: admin/field-groups.php:624
 #, php-format
 msgid "See what's new in <a href=\"%s\">version %s</a>."
 msgstr "Was gibt es Neues in <a href=\"%s\">Version %s</a>."
 
 # @ acf
-#: admin/field-groups.php:627
+#: admin/field-groups.php:626
 msgid "Resources"
 msgstr "Dokumentation (engl.)"
 
 # @ acf
-#: admin/field-groups.php:629
+#: admin/field-groups.php:628
 msgid "Getting Started"
 msgstr "Erste Schritte"
 
 # @ acf
-#: admin/field-groups.php:630 pro/admin/settings-updates.php:73
+#: admin/field-groups.php:629 pro/admin/settings-updates.php:57
 #: pro/admin/views/settings-updates.php:17
 msgid "Updates"
 msgstr "Aktualisierungen"
 
 # @ acf
-#: admin/field-groups.php:631
+#: admin/field-groups.php:630
 msgid "Field Types"
 msgstr "Feld-Typen"
 
 # @ acf
-#: admin/field-groups.php:632
+#: admin/field-groups.php:631
 msgid "Functions"
 msgstr "Funktionen"
 
 # @ acf
-#: admin/field-groups.php:633
+#: admin/field-groups.php:632
 msgid "Actions"
 msgstr "Aktionen"
 
 # @ acf
-#: admin/field-groups.php:634 fields/relationship.php:720
+#: admin/field-groups.php:633 fields/relationship.php:737
 msgid "Filters"
 msgstr "Filter"
 
 # @ acf
-#: admin/field-groups.php:635
+#: admin/field-groups.php:634
 msgid "'How to' guides"
 msgstr "Kurzanleitungen"
 
 # @ acf
-#: admin/field-groups.php:636
+#: admin/field-groups.php:635
 msgid "Tutorials"
 msgstr "Tutorials"
 
-#: admin/field-groups.php:637
+#: admin/field-groups.php:636
 msgid "FAQ"
 msgstr "Häufig gestellte Fragen"
 
 # @ acf
-#: admin/field-groups.php:642
+#: admin/field-groups.php:641
 msgid "Created by"
 msgstr "Erstellt von"
 
 # @ acf
-#: admin/field-groups.php:685
+#: admin/field-groups.php:684
 msgid "Duplicate this item"
 msgstr "Dieses Element duplizieren"
 
 # @ acf
-#: admin/field-groups.php:685 admin/field-groups.php:701
-#: admin/views/field-group-field.php:58 pro/fields/flexible-content.php:495
+#: admin/field-groups.php:684 admin/field-groups.php:700
+#: admin/views/field-group-field.php:59 pro/fields/flexible-content.php:499
 msgid "Duplicate"
 msgstr "Duplizieren"
 
 # @ acf
-#: admin/field-groups.php:747
+#: admin/field-groups.php:751
 #, php-format
 msgid "Select %s"
 msgstr "%s auswählen"
 
 # @ acf
-#: admin/field-groups.php:755
+#: admin/field-groups.php:759
 msgid "Synchronise field group"
 msgstr "Synchronisiere Feld-Gruppe"
 
 # @ acf
-#: admin/field-groups.php:755 admin/field-groups.php:772
+#: admin/field-groups.php:759 admin/field-groups.php:776
 msgid "Sync"
 msgstr "Synchronisieren"
 
@@ -528,82 +528,63 @@ msgstr "Info"
 msgid "What's New"
 msgstr "Was gibt es Neues"
 
-#: admin/settings-tools.php:54 admin/views/settings-tools-export.php:23
+#: admin/settings-tools.php:50 admin/views/settings-tools-export.php:23
 #: admin/views/settings-tools.php:31
 msgid "Tools"
 msgstr "Werkzeuge"
 
 # @ acf
-#: admin/settings-tools.php:151 admin/settings-tools.php:369
+#: admin/settings-tools.php:147 admin/settings-tools.php:380
 msgid "No field groups selected"
 msgstr "Keine Feld-Gruppe ausgewählt"
 
 # @ acf
-#: admin/settings-tools.php:188 fields/file.php:175
+#: admin/settings-tools.php:184 fields/file.php:175
 msgid "No file selected"
 msgstr "Keine Datei ausgewählt"
 
 # @ acf
-#: admin/settings-tools.php:201
+#: admin/settings-tools.php:197
 msgid "Error uploading file. Please try again"
 msgstr "Fehler beim Upload. Bitte erneut versuchen."
 
 # @ acf
-#: admin/settings-tools.php:210
+#: admin/settings-tools.php:206
 msgid "Incorrect file type"
 msgstr "Falscher Dateityp"
 
 # @ acf
-#: admin/settings-tools.php:227
+#: admin/settings-tools.php:223
 msgid "Import file empty"
 msgstr "Die importierte Datei ist leer"
 
-# @ acf
-#: admin/settings-tools.php:323
+#: admin/settings-tools.php:331
 #, php-format
-msgid "<b>Success</b>. Import tool added %s field groups: %s"
-msgstr "<b>Erfolgreich</b>. Der Import hat %s Feld-Gruppen hinzugefügt: %s"
+msgid "Imported 1 field group"
+msgid_plural "Imported %s field groups"
+msgstr[0] "Eine Feld-Gruppe importiert"
+msgstr[1] "%s Feld-Gruppen importiert"
 
 # @ acf
-#: admin/settings-tools.php:332
-#, php-format
-msgid ""
-"<b>Warning</b>. Import tool detected %s field groups already exist and have "
-"been ignored: %s"
-msgstr ""
-"<b>Warnung</b>. Der Import hat %s Feld-Gruppen erkannt, die schon vorhanden "
-"sind und diese ignoriert: %s"
-
-# @ acf
-#: admin/update.php:113
-msgid "Upgrade ACF"
-msgstr "Aktualisiere ACF"
-
-# @ acf
-#: admin/update.php:166
-msgid "Review sites & upgrade"
-msgstr "Übersicht Seiten & Aktualisierungen"
-
-# @ acf
-#: admin/update.php:317
-msgid "Upgrade"
-msgstr "Aktualisieren"
-
-# @ acf
-#: admin/update.php:368
+#: admin/update-network.php:96 admin/update.php:104 admin/update.php:155
 msgid "Upgrade Database"
 msgstr "Aktualisiere Datenbank"
 
-#: admin/update.php:433
+# @ acf
+#: admin/update-network.php:148
+msgid "Review sites & upgrade"
+msgstr "Übersicht Seiten & Aktualisierungen"
+
+#: admin/update.php:220
 msgid "Error validating request"
 msgstr "Fehler bei der Überprüfung der Anfrage"
 
 # @ acf
-#: admin/update.php:456 admin/views/update.php:110
+#: admin/update.php:243 admin/views/update.php:110
 msgid "No updates available"
 msgstr "Keine Aktualisierungen verfügbar"
 
-#: admin/update.php:473
+#: admin/update.php:260
 msgid "Error loading update"
 msgstr "Fehler beim Laden der Aktualisierung"
 
@@ -614,27 +595,31 @@ msgstr "Bedingungen für die Anzeige"
 
 # @ acf
 #: admin/views/field-group-field-conditional-logic.php:40
-#: admin/views/field-group-field.php:140 fields/checkbox.php:243
-#: fields/message.php:144 fields/page_link.php:539 fields/page_link.php:553
-#: fields/post_object.php:403 fields/post_object.php:417 fields/radio.php:254
-#: fields/select.php:440 fields/select.php:454 fields/select.php:468
-#: fields/select.php:482 fields/tab.php:130 fields/taxonomy.php:772
-#: fields/taxonomy.php:786 fields/taxonomy.php:800 fields/taxonomy.php:814
-#: fields/user.php:416 fields/user.php:430 fields/wysiwyg.php:418
-#: pro/admin/views/settings-updates.php:93
+#: admin/views/field-group-field.php:141 fields/checkbox.php:244
+#: fields/message.php:144 fields/page_link.php:533 fields/page_link.php:547
+#: fields/page_link.php:561 fields/post_object.php:432
+#: fields/post_object.php:446 fields/radio.php:255 fields/select.php:469
+#: fields/select.php:483 fields/select.php:497 fields/select.php:511
+#: fields/tab.php:130 fields/taxonomy.php:785 fields/taxonomy.php:799
+#: fields/taxonomy.php:813 fields/taxonomy.php:827 fields/user.php:399
+#: fields/user.php:413 fields/wysiwyg.php:418
+#: pro/admin/views/settings-updates.php:93 pro/fields/clone.php:716
+#: pro/fields/clone.php:734
 msgid "Yes"
 msgstr "Ja"
 
 # @ acf
 #: admin/views/field-group-field-conditional-logic.php:41
-#: admin/views/field-group-field.php:141 fields/checkbox.php:244
-#: fields/message.php:145 fields/page_link.php:540 fields/page_link.php:554
-#: fields/post_object.php:404 fields/post_object.php:418 fields/radio.php:255
-#: fields/select.php:441 fields/select.php:455 fields/select.php:469
-#: fields/select.php:483 fields/tab.php:131 fields/taxonomy.php:687
-#: fields/taxonomy.php:773 fields/taxonomy.php:787 fields/taxonomy.php:801
-#: fields/taxonomy.php:815 fields/user.php:417 fields/user.php:431
-#: fields/wysiwyg.php:419 pro/admin/views/settings-updates.php:103
+#: admin/views/field-group-field.php:142 fields/checkbox.php:245
+#: fields/message.php:145 fields/page_link.php:534 fields/page_link.php:548
+#: fields/page_link.php:562 fields/post_object.php:433
+#: fields/post_object.php:447 fields/radio.php:256 fields/select.php:470
+#: fields/select.php:484 fields/select.php:498 fields/select.php:512
+#: fields/tab.php:131 fields/taxonomy.php:700 fields/taxonomy.php:786
+#: fields/taxonomy.php:800 fields/taxonomy.php:814 fields/taxonomy.php:828
+#: fields/user.php:400 fields/user.php:414 fields/wysiwyg.php:419
+#: pro/admin/views/settings-updates.php:103 pro/fields/clone.php:717
+#: pro/fields/clone.php:735
 msgid "No"
 msgstr "Nein"
 
@@ -668,148 +653,150 @@ msgid "Add rule group"
 msgstr "Regel-Gruppe hinzufügen"
 
 # @ acf
-#: admin/views/field-group-field.php:49 pro/fields/flexible-content.php:342
+#: admin/views/field-group-field.php:50 pro/fields/flexible-content.php:346
 #: pro/fields/repeater.php:302
 msgid "Drag to reorder"
 msgstr "Ziehen zum Sortieren"
 
 # @ acf
-#: admin/views/field-group-field.php:54 admin/views/field-group-field.php:57
+#: admin/views/field-group-field.php:55 admin/views/field-group-field.php:58
 msgid "Edit field"
 msgstr "Feld bearbeiten"
 
 # @ acf
-#: admin/views/field-group-field.php:57 core/media.php:55 fields/image.php:142
-#: pro/fields/gallery.php:358
+#: admin/views/field-group-field.php:58 fields/image.php:142
+#: pro/fields/gallery.php:357
 msgid "Edit"
 msgstr "Bearbeiten"
 
 # @ acf
-#: admin/views/field-group-field.php:58
+#: admin/views/field-group-field.php:59
 msgid "Duplicate field"
 msgstr "Feld duplizieren"
 
 # @ acf
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move field to another group"
 msgstr "Feld in eine andere Gruppe verschieben"
 
 # @ acf
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move"
 msgstr "Verschieben"
 
 # @ acf
-#: admin/views/field-group-field.php:60
+#: admin/views/field-group-field.php:61
 msgid "Delete field"
 msgstr "Feld löschen"
 
 # @ acf
-#: admin/views/field-group-field.php:60 pro/fields/flexible-content.php:494
+#: admin/views/field-group-field.php:61 pro/fields/flexible-content.php:498
 msgid "Delete"
 msgstr "Löschen"
 
 # @ acf
-#: admin/views/field-group-field.php:68 fields/oembed.php:225
-#: fields/taxonomy.php:888
+#: admin/views/field-group-field.php:69 fields/oembed.php:225
+#: fields/taxonomy.php:901
 msgid "Error"
 msgstr "Fehler"
 
 # @ acf
-#: admin/views/field-group-field.php:68
+#: admin/views/field-group-field.php:69
 msgid "Field type does not exist"
 msgstr "Feld-Typ existiert nicht"
 
 # @ acf
-#: admin/views/field-group-field.php:81
+#: admin/views/field-group-field.php:82
 msgid "Field Label"
 msgstr "Bezeichnung"
 
 # @ acf
-#: admin/views/field-group-field.php:82
+#: admin/views/field-group-field.php:83
 msgid "This is the name which will appear on the EDIT page"
 msgstr "Dieser Name wird in der Bearbeitungs-Ansicht eines Beitrags angezeigt"
 
 # @ acf
-#: admin/views/field-group-field.php:94
+#: admin/views/field-group-field.php:95
 msgid "Field Name"
 msgstr "Feld-Name"
 
 # @ acf
-#: admin/views/field-group-field.php:95
+#: admin/views/field-group-field.php:96
 msgid "Single word, no spaces. Underscores and dashes allowed"
 msgstr ""
 "Nur ein Wort ohne Leerzeichen; es sind nur Unterstriche und Bindestriche als "
 "Sonderzeichen erlaubt"
 
 # @ acf
-#: admin/views/field-group-field.php:107
+#: admin/views/field-group-field.php:108
 msgid "Field Type"
 msgstr "Feld-Typ"
 
 # @ acf
-#: admin/views/field-group-field.php:121 fields/tab.php:103
+#: admin/views/field-group-field.php:122 fields/tab.php:103
 msgid "Instructions"
 msgstr "Anweisungen"
 
 # @ acf
-#: admin/views/field-group-field.php:122
+#: admin/views/field-group-field.php:123
 msgid "Instructions for authors. Shown when submitting data"
 msgstr "Anweisungen für Autoren werden in der Bearbeitungs-Ansicht angezeigt"
 
 # @ acf
-#: admin/views/field-group-field.php:133
+#: admin/views/field-group-field.php:134
 msgid "Required?"
 msgstr "Erforderlich?"
 
 # @ acf
-#: admin/views/field-group-field.php:162
+#: admin/views/field-group-field.php:163
 msgid "Wrapper Attributes"
 msgstr "Wrapper-Attribute"
 
 # @ acf
-#: admin/views/field-group-field.php:168
+#: admin/views/field-group-field.php:169
 msgid "width"
 msgstr "Breite"
 
 # @ acf
-#: admin/views/field-group-field.php:182
+#: admin/views/field-group-field.php:183
 msgid "class"
 msgstr "Klasse"
 
 # @ acf
-#: admin/views/field-group-field.php:195
+#: admin/views/field-group-field.php:196
 msgid "id"
 msgstr "ID"
 
 # @ acf
-#: admin/views/field-group-field.php:207
+#: admin/views/field-group-field.php:208
 msgid "Close Field"
 msgstr "Feld schließen"
 
 # @ acf
-#: admin/views/field-group-fields.php:29
+#: admin/views/field-group-fields.php:17
 msgid "Order"
 msgstr "Reihenfolge"
 
 # @ acf
-#: admin/views/field-group-fields.php:30 pro/fields/flexible-content.php:521
+#: admin/views/field-group-fields.php:18 fields/checkbox.php:259
+#: fields/radio.php:314 fields/select.php:527
+#: pro/fields/flexible-content.php:525
 msgid "Label"
 msgstr "Name"
 
 # @ acf
-#: admin/views/field-group-fields.php:31 fields/taxonomy.php:954
-#: pro/fields/flexible-content.php:534
+#: admin/views/field-group-fields.php:19 fields/taxonomy.php:967
+#: pro/fields/flexible-content.php:538
 msgid "Name"
 msgstr "Feld-Name"
 
 # @ acf
-#: admin/views/field-group-fields.php:32
+#: admin/views/field-group-fields.php:20
 msgid "Type"
 msgstr "Typ"
 
 # @ acf
-#: admin/views/field-group-fields.php:44
+#: admin/views/field-group-fields.php:38
 msgid ""
 "No fields. Click the <strong>+ Add Field</strong> button to create your "
 "first field."
@@ -818,7 +805,7 @@ msgstr ""
 "Button</strong> und erstelle Dein erstes Feld."
 
 # @ acf
-#: admin/views/field-group-fields.php:51
+#: admin/views/field-group-fields.php:44
 msgid "+ Add Field"
 msgstr "+ Feld hinzufügen"
 
@@ -829,7 +816,7 @@ msgid "Post"
 msgstr "Beitrag"
 
 # @ acf
-#: admin/views/field-group-locations.php:6 fields/relationship.php:726
+#: admin/views/field-group-locations.php:6 fields/relationship.php:743
 msgid "Post Type"
 msgstr "Beitrags-Typ"
 
@@ -1093,7 +1080,7 @@ msgid "Page Attributes"
 msgstr "Seiten-Attribute"
 
 # @ acf
-#: admin/views/field-group-options.php:123 fields/relationship.php:739
+#: admin/views/field-group-options.php:123 fields/relationship.php:756
 msgid "Featured Image"
 msgstr "Beitragsbild"
 
@@ -1541,48 +1528,52 @@ msgstr "Datei auswählen"
 msgid "Import"
 msgstr "Importieren"
 
+#: admin/views/update-network.php:4
+msgid "Upgrade Sites"
+msgstr "Seiten aktualisieren"
+
 # @ acf
-#: admin/views/update-network.php:8 admin/views/update.php:8
+#: admin/views/update-network.php:13 admin/views/update.php:8
 msgid "Advanced Custom Fields Database Upgrade"
 msgstr "Advanced Custom Fields Datenbank Aktualisierung"
 
-# @ acf
-#: admin/views/update-network.php:10
+#: admin/views/update-network.php:15
+#, php-format
 msgid ""
 "The following sites require a DB upgrade. Check the ones you want to update "
-"and then click “Upgrade Database”."
+"and then click %s."
 msgstr ""
-"Die folgenden Seiten erfordern eine Datenbank- Aktualisierung. Markiere die "
-"gewünschten Seiten und klicke \\\"Aktualisiere Datenbank\\\"."
+"Folgende Seiten erfordern eine Datenbank-Aktualisierung. Markiere die "
+"gewünschten Seiten und klicke dann %s."
 
 # @ acf
-#: admin/views/update-network.php:19 admin/views/update-network.php:27
+#: admin/views/update-network.php:24 admin/views/update-network.php:32
 msgid "Site"
 msgstr "Seite"
 
 # @ acf
-#: admin/views/update-network.php:47
+#: admin/views/update-network.php:52
 #, php-format
 msgid "Site requires database upgrade from %s to %s"
 msgstr "Die Seite erfordert eine Datenbank-Aktualisierung von %s auf %s"
 
 # @ acf
-#: admin/views/update-network.php:49
+#: admin/views/update-network.php:54
 msgid "Site is up to date"
 msgstr "Seite ist aktuell"
 
 # @ acf
-#: admin/views/update-network.php:62 admin/views/update.php:16
+#: admin/views/update-network.php:67 admin/views/update.php:16
 msgid "Database Upgrade complete"
 msgstr "Datenbank-Aktualisierung fertiggestellt"
 
 # @ acf
-#: admin/views/update-network.php:62
+#: admin/views/update-network.php:67
 msgid "Return to network dashboard"
 msgstr "Zum Netzwerk Dashboard"
 
 # @ acf
-#: admin/views/update-network.php:101 admin/views/update-notice.php:35
+#: admin/views/update-network.php:106 admin/views/update-notice.php:35
 msgid ""
 "It is strongly recommended that you backup your database before proceeding. "
 "Are you sure you wish to run the updater now?"
@@ -1592,12 +1583,12 @@ msgstr ""
 "willst?"
 
 # @ default
-#: admin/views/update-network.php:157
+#: admin/views/update-network.php:162
 msgid "Upgrade complete"
 msgstr "Aktualisierung abgeschlossen"
 
 # @ acf
-#: admin/views/update-network.php:161 admin/views/update.php:14
+#: admin/views/update-network.php:166 admin/views/update.php:14
 #, php-format
 msgid "Upgrading data to version %s"
 msgstr "Aktualisiere Daten auf Version %s"
@@ -1633,93 +1624,98 @@ msgid "See what's new"
 msgstr "Was ist neu"
 
 # @ acf
-#: api/api-helpers.php:933
+#: api/api-helpers.php:944
 msgid "Thumbnail"
 msgstr "Miniaturbild"
 
 # @ acf
-#: api/api-helpers.php:934
+#: api/api-helpers.php:945
 msgid "Medium"
 msgstr "Mittel"
 
 # @ acf
-#: api/api-helpers.php:935
+#: api/api-helpers.php:946
 msgid "Large"
 msgstr "Groß"
 
 # @ acf
-#: api/api-helpers.php:984
+#: api/api-helpers.php:995
 msgid "Full Size"
 msgstr "Volle Größe"
 
 # @ acf
-#: api/api-helpers.php:1196 api/api-helpers.php:1759
+#: api/api-helpers.php:1207 api/api-helpers.php:1770 pro/fields/clone.php:849
 msgid "(no title)"
 msgstr "(ohne Titel)"
 
+#: api/api-helpers.php:1807 fields/page_link.php:284 fields/post_object.php:283
+#: fields/taxonomy.php:989
+msgid "Parent"
+msgstr "Übergeordnet"
+
 # @ acf
-#: api/api-helpers.php:3605
+#: api/api-helpers.php:3873
 #, php-format
 msgid "Image width must be at least %dpx."
 msgstr "Die Breite des Bildes muss mindestens %dpx sein."
 
 # @ acf
-#: api/api-helpers.php:3610
+#: api/api-helpers.php:3878
 #, php-format
 msgid "Image width must not exceed %dpx."
 msgstr "Die Breite des Bildes darf %dpx nicht überschreiten."
 
 # @ acf
-#: api/api-helpers.php:3626
+#: api/api-helpers.php:3894
 #, php-format
 msgid "Image height must be at least %dpx."
 msgstr "Die Höhe des Bildes muss mindestens %dpx sein."
 
 # @ acf
-#: api/api-helpers.php:3631
+#: api/api-helpers.php:3899
 #, php-format
 msgid "Image height must not exceed %dpx."
 msgstr "Die Höhe des Bild darf %dpx nicht überschreiten."
 
 # @ acf
-#: api/api-helpers.php:3649
+#: api/api-helpers.php:3917
 #, php-format
 msgid "File size must be at least %s."
 msgstr "Die Dateigröße muss mindestens %s sein."
 
 # @ acf
-#: api/api-helpers.php:3654
+#: api/api-helpers.php:3922
 #, php-format
 msgid "File size must must not exceed %s."
 msgstr "Die Dateigröße darf %s nicht überschreiten."
 
 # @ acf
-#: api/api-helpers.php:3688
+#: api/api-helpers.php:3956
 #, php-format
 msgid "File type must be %s."
 msgstr "Der Dateityp muss %s sein."
 
-#: api/api-template.php:1073
+#: api/api-template.php:1092
 msgid "Spam Detected"
 msgstr "Spam entdeckt"
 
 # @ acf
-#: api/api-template.php:1216 core/media.php:56 pro/api/api-options-page.php:50
-#: pro/fields/gallery.php:586
+#: api/api-template.php:1235 pro/api/api-options-page.php:50
+#: pro/fields/gallery.php:588
 msgid "Update"
 msgstr "Aktualisieren"
 
 # @ acf
-#: api/api-template.php:1217
+#: api/api-template.php:1236
 msgid "Post updated"
 msgstr "Beitrag aktualisiert"
 
 # @ acf
-#: api/api-template.php:1285 core/field.php:133
+#: api/api-template.php:1304 core/field.php:133
 msgid "Content"
 msgstr "Inhalt"
 
-#: api/api-template.php:1350
+#: api/api-template.php:1369
 msgid "Validate Email"
 msgstr "E-Mail bestätigen"
 
@@ -1744,9 +1740,9 @@ msgid "jQuery"
 msgstr "jQuery"
 
 # @ acf
-#: core/field.php:137 fields/checkbox.php:223 fields/radio.php:292
-#: pro/fields/flexible-content.php:491 pro/fields/flexible-content.php:540
-#: pro/fields/repeater.php:459
+#: core/field.php:137 fields/checkbox.php:224 fields/radio.php:293
+#: pro/fields/clone.php:692 pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:544 pro/fields/repeater.php:459
 msgid "Layout"
 msgstr "Layout"
 
@@ -1785,15 +1781,24 @@ msgstr "Für %d Felder ist eine Aktualisierung notwendig"
 msgid "Restricted"
 msgstr "Eingeschränkt"
 
-# @ acf
-#: core/media.php:54 fields/select.php:36 fields/select.php:230
-#: fields/taxonomy.php:759
+#: core/media.php:54 fields/select.php:249
+msgctxt "verb"
 msgid "Select"
-msgstr "Auswahlmenü"
+msgstr "Auswählen"
+
+#: core/media.php:55
+msgctxt "verb"
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: core/media.php:56
+msgctxt "verb"
+msgid "Update"
+msgstr "Aktualisieren"
 
 # @ acf
 #: core/media.php:57 fields/file.php:49 fields/image.php:54
-#: pro/fields/gallery.php:56
+#: pro/fields/gallery.php:55
 msgid "Uploaded to this post"
 msgstr "Zu diesem Beitrag hochgeladen"
 
@@ -1804,69 +1809,89 @@ msgid "%s value is required"
 msgstr "%s Wert ist notwendig"
 
 # @ acf
-#: fields/checkbox.php:36 fields/taxonomy.php:754
+#: fields/checkbox.php:36 fields/taxonomy.php:767
 msgid "Checkbox"
 msgstr "Checkbox"
 
 # @ acf
-#: fields/checkbox.php:141
+#: fields/checkbox.php:142
 msgid "Toggle All"
 msgstr "Alle auswählen"
 
 # @ acf
-#: fields/checkbox.php:205 fields/radio.php:240 fields/select.php:417
+#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:446
 msgid "Choices"
 msgstr "Auswahlmöglichkeiten"
 
 # @ acf
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "Enter each choice on a new line."
 msgstr "Jede Auswahlmöglichkeit in separater Zeile eingeben."
 
 # @ acf
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "For more control, you may specify both a value and label like this:"
 msgstr ""
 "Für eine bessere Darstellung, kannst Du auch einen Wert und dazu dessen "
 "Beschriftung definieren:"
 
 # @ acf
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "red : Red"
 msgstr "rot : Rot"
 
 # @ acf
-#: fields/checkbox.php:214 fields/color_picker.php:147 fields/email.php:124
-#: fields/number.php:150 fields/radio.php:283 fields/select.php:426
+#: fields/checkbox.php:215 fields/color_picker.php:147 fields/email.php:124
+#: fields/number.php:150 fields/radio.php:284 fields/select.php:455
 #: fields/text.php:148 fields/textarea.php:145 fields/true_false.php:115
 #: fields/url.php:117 fields/wysiwyg.php:379
 msgid "Default Value"
 msgstr "Standardwert"
 
 # @ acf
-#: fields/checkbox.php:215 fields/select.php:427
+#: fields/checkbox.php:216 fields/select.php:456
 msgid "Enter each default value on a new line"
 msgstr "Jeden Standardwert in einer neuen Zeile eingeben"
 
 # @ acf
-#: fields/checkbox.php:229 fields/radio.php:298
+#: fields/checkbox.php:230 fields/radio.php:299
 msgid "Vertical"
 msgstr "Vertikal"
 
 # @ acf
-#: fields/checkbox.php:230 fields/radio.php:299
+#: fields/checkbox.php:231 fields/radio.php:300
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: fields/checkbox.php:237
+#: fields/checkbox.php:238
 msgid "Toggle"
 msgstr "Auswählen"
 
-#: fields/checkbox.php:238
+#: fields/checkbox.php:239
 msgid "Prepend an extra checkbox to toggle all choices"
 msgstr ""
 "Hänge eine zusätzliche Checkbox an mit der man alle Optionen auswählen kann"
 
+# @ acf
+#: fields/checkbox.php:252 fields/file.php:220 fields/image.php:206
+#: fields/radio.php:307 fields/taxonomy.php:836
+msgid "Return Value"
+msgstr "Rückgabewert"
+
+# @ acf
+#: fields/checkbox.php:253 fields/file.php:221 fields/image.php:207
+#: fields/radio.php:308
+msgid "Specify the returned value on front end"
+msgstr "Legt den Rückgabewert für das Front-End fest"
+
+#: fields/checkbox.php:258 fields/radio.php:313 fields/select.php:526
+msgid "Value"
+msgstr "Wert"
+
+#: fields/checkbox.php:260 fields/radio.php:315 fields/select.php:528
+msgid "Both (Array)"
+msgstr "Beide (Array)"
+
 # @ acf
 #: fields/color_picker.php:36
 msgid "Color Picker"
@@ -1922,32 +1947,32 @@ msgid "Wk"
 msgstr "Wo."
 
 # @ acf
-#: fields/date_picker.php:201 fields/date_time_picker.php:245
-#: fields/time_picker.php:131
+#: fields/date_picker.php:195 fields/date_time_picker.php:184
+#: fields/time_picker.php:126
 msgid "Display Format"
 msgstr "Darstellungs-Format"
 
 # @ acf
-#: fields/date_picker.php:202 fields/date_time_picker.php:246
-#: fields/time_picker.php:132
+#: fields/date_picker.php:196 fields/date_time_picker.php:185
+#: fields/time_picker.php:127
 msgid "The format displayed when editing a post"
 msgstr "Das Datums-Format für die Anzeige in der Bearbeitungs-Ansicht"
 
 # @ acf
-#: fields/date_picker.php:216 fields/date_time_picker.php:261
-#: fields/post_object.php:426 fields/relationship.php:766
-#: fields/time_picker.php:145
+#: fields/date_picker.php:210 fields/date_time_picker.php:200
+#: fields/post_object.php:455 fields/relationship.php:783 fields/select.php:520
+#: fields/time_picker.php:140
 msgid "Return Format"
 msgstr "Rückgabewert"
 
 # @ acf
-#: fields/date_picker.php:217 fields/date_time_picker.php:262
-#: fields/time_picker.php:146
+#: fields/date_picker.php:211 fields/date_time_picker.php:201
+#: fields/time_picker.php:141
 msgid "The format returned via template functions"
 msgstr "Das Datums-Format für die Ausgabe in den Template-Funktionen"
 
 # @ acf
-#: fields/date_picker.php:232 fields/date_time_picker.php:277
+#: fields/date_picker.php:226 fields/date_time_picker.php:216
 msgid "Week Starts On"
 msgstr "Die Woche beginnt am"
 
@@ -2005,22 +2030,27 @@ msgctxt "Date Time Picker JS closeText"
 msgid "Done"
 msgstr "Fertig"
 
-#: fields/date_time_picker.php:55
+#: fields/date_time_picker.php:54
+msgctxt "Date Time Picker JS selectText"
+msgid "Select"
+msgstr "Auswählen"
+
+#: fields/date_time_picker.php:56
 msgctxt "Date Time Picker JS amText"
 msgid "AM"
 msgstr "vorm."
 
-#: fields/date_time_picker.php:56
+#: fields/date_time_picker.php:57
 msgctxt "Date Time Picker JS amTextShort"
 msgid "A"
 msgstr "vorm."
 
-#: fields/date_time_picker.php:59
+#: fields/date_time_picker.php:60
 msgctxt "Date Time Picker JS pmText"
 msgid "PM"
 msgstr "nachm."
 
-#: fields/date_time_picker.php:60
+#: fields/date_time_picker.php:61
 msgctxt "Date Time Picker JS pmTextShort"
 msgid "P"
 msgstr "nachm."
@@ -2031,7 +2061,7 @@ msgid "Email"
 msgstr "E-Mail"
 
 # @ acf
-#: fields/email.php:125 fields/number.php:151 fields/radio.php:284
+#: fields/email.php:125 fields/number.php:151 fields/radio.php:285
 #: fields/text.php:149 fields/textarea.php:146 fields/url.php:118
 #: fields/wysiwyg.php:380
 msgid "Appears when creating a new post"
@@ -2094,8 +2124,8 @@ msgstr "Dateiname"
 
 # @ acf
 #: fields/file.php:152 fields/file.php:253 fields/file.php:264
-#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:715
-#: pro/fields/gallery.php:748
+#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:707
+#: pro/fields/gallery.php:740
 msgid "File size"
 msgstr "Dateigröße"
 
@@ -2104,16 +2134,6 @@ msgstr "Dateigröße"
 msgid "Add File"
 msgstr "Datei hinzufügen"
 
-# @ acf
-#: fields/file.php:220 fields/image.php:206 fields/taxonomy.php:823
-msgid "Return Value"
-msgstr "Rückgabewert"
-
-# @ acf
-#: fields/file.php:221 fields/image.php:207
-msgid "Specify the returned value on front end"
-msgstr "Legt den Rückgabewert für das Front-End fest"
-
 # @ acf
 #: fields/file.php:226
 msgid "File Array"
@@ -2130,22 +2150,22 @@ msgid "File ID"
 msgstr "Datei-ID"
 
 # @ acf
-#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:678
+#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:670
 msgid "Library"
 msgstr "Medienübersicht"
 
 # @ acf
-#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:679
+#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:671
 msgid "Limit the media library choice"
 msgstr "Beschränkt die Auswahl in der Medienübersicht"
 
 # @ acf
-#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:685
+#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:677
 msgid "Uploaded to post"
 msgstr "Für den Beitrag hochgeladen"
 
 # @ acf
-#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:692
+#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:684
 msgid "Minimum"
 msgstr "Minimum"
 
@@ -2157,17 +2177,17 @@ msgstr ""
 "erfüllen"
 
 # @ acf
-#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:725
+#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:717
 msgid "Maximum"
 msgstr "Maximum"
 
 # @ acf
-#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:758
+#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:750
 msgid "Allowed file types"
 msgstr "Erlaubte Datei-Formate"
 
 # @ acf
-#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:759
+#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:751
 msgid "Comma separated list. Leave blank for all types"
 msgstr ""
 "Komma separierte Liste; ein leeres Feld bedeutet alle Dateiformate sind "
@@ -2189,7 +2209,7 @@ msgid "Sorry, this browser does not support geolocation"
 msgstr "Dieser Browser unterstützt keine Geo-Lokation"
 
 # @ acf
-#: fields/google-map.php:133 fields/relationship.php:725
+#: fields/google-map.php:133 fields/relationship.php:742
 msgid "Search"
 msgstr "Suchen"
 
@@ -2230,7 +2250,7 @@ msgstr "Legt die Zoomstufe der Karte fest"
 
 # @ acf
 #: fields/google-map.php:203 fields/image.php:257 fields/image.php:290
-#: fields/oembed.php:275 pro/fields/gallery.php:704 pro/fields/gallery.php:737
+#: fields/oembed.php:275 pro/fields/gallery.php:696 pro/fields/gallery.php:729
 msgid "Height"
 msgstr "Höhe"
 
@@ -2250,12 +2270,12 @@ msgid "Select Image"
 msgstr "Bild auswählen"
 
 # @ acf
-#: fields/image.php:52 pro/fields/gallery.php:54
+#: fields/image.php:52 pro/fields/gallery.php:53
 msgid "Edit Image"
 msgstr "Bild bearbeiten"
 
 # @ acf
-#: fields/image.php:53 pro/fields/gallery.php:55
+#: fields/image.php:53 pro/fields/gallery.php:54
 msgid "Update Image"
 msgstr "Bild aktualisieren"
 
@@ -2265,7 +2285,7 @@ msgid "All images"
 msgstr "Alle Bilder"
 
 # @ acf
-#: fields/image.php:144 pro/fields/gallery.php:359 pro/fields/gallery.php:542
+#: fields/image.php:144 pro/fields/gallery.php:358 pro/fields/gallery.php:546
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -2295,18 +2315,18 @@ msgid "Image ID"
 msgstr "Bild-ID"
 
 # @ acf
-#: fields/image.php:221 pro/fields/gallery.php:655
+#: fields/image.php:221
 msgid "Preview Size"
 msgstr "Maße der Vorschau"
 
 # @ acf
-#: fields/image.php:222 pro/fields/gallery.php:656
+#: fields/image.php:222
 msgid "Shown when entering data"
 msgstr "Legt fest welche Maße die Vorschau in der Bearbeitungs-Ansicht hat"
 
 # @ acf
-#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:693
-#: pro/fields/gallery.php:726
+#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:685
+#: pro/fields/gallery.php:718
 msgid "Restrict which images can be uploaded"
 msgstr ""
 "Erlaubt nur das Hochladen von Bildern die die angegebenen Eigenschaften "
@@ -2314,7 +2334,7 @@ msgstr ""
 
 # @ acf
 #: fields/image.php:249 fields/image.php:282 fields/oembed.php:264
-#: pro/fields/gallery.php:696 pro/fields/gallery.php:729
+#: pro/fields/gallery.php:688 pro/fields/gallery.php:721
 msgid "Width"
 msgstr "Breite"
 
@@ -2418,43 +2438,47 @@ msgid "Embed Size"
 msgstr "Maße"
 
 # @ acf
-#: fields/page_link.php:197
+#: fields/page_link.php:192
 msgid "Archives"
 msgstr "Archive"
 
 # @ acf
-#: fields/page_link.php:506 fields/post_object.php:370
-#: fields/relationship.php:692
+#: fields/page_link.php:500 fields/post_object.php:399
+#: fields/relationship.php:709
 msgid "Filter by Post Type"
 msgstr "Nach Post Types filtern"
 
 # @ acf
-#: fields/page_link.php:514 fields/post_object.php:378
-#: fields/relationship.php:700
+#: fields/page_link.php:508 fields/post_object.php:407
+#: fields/relationship.php:717
 msgid "All post types"
 msgstr "Alle verfügbaren Post Types"
 
 # @ acf
-#: fields/page_link.php:520 fields/post_object.php:384
-#: fields/relationship.php:706
+#: fields/page_link.php:514 fields/post_object.php:413
+#: fields/relationship.php:723
 msgid "Filter by Taxonomy"
 msgstr "Nach Taxonomien filtern"
 
 # @ acf
-#: fields/page_link.php:528 fields/post_object.php:392
-#: fields/relationship.php:714
+#: fields/page_link.php:522 fields/post_object.php:421
+#: fields/relationship.php:731
 msgid "All taxonomies"
 msgstr "Alle Taxonomien"
 
 # @ acf
-#: fields/page_link.php:534 fields/post_object.php:398 fields/radio.php:249
-#: fields/select.php:435 fields/taxonomy.php:767 fields/user.php:411
+#: fields/page_link.php:528 fields/post_object.php:427 fields/radio.php:250
+#: fields/select.php:464 fields/taxonomy.php:780 fields/user.php:394
 msgid "Allow Null?"
 msgstr "NULL-Werte zulassen?"
 
+#: fields/page_link.php:542
+msgid "Allow Archives URLs"
+msgstr "Archiv-URL's zulassen"
+
 # @ acf
-#: fields/page_link.php:548 fields/post_object.php:412 fields/select.php:449
-#: fields/user.php:425
+#: fields/page_link.php:556 fields/post_object.php:441 fields/select.php:478
+#: fields/user.php:408
 msgid "Select multiple values?"
 msgstr "Mehrere Werte auswählbar?"
 
@@ -2464,13 +2488,13 @@ msgid "Password"
 msgstr "Passwort"
 
 # @ acf
-#: fields/post_object.php:36 fields/post_object.php:431
-#: fields/relationship.php:771
+#: fields/post_object.php:36 fields/post_object.php:460
+#: fields/relationship.php:788
 msgid "Post Object"
 msgstr "Beitrags-Objekt"
 
 # @ acf
-#: fields/post_object.php:432 fields/relationship.php:772
+#: fields/post_object.php:461 fields/relationship.php:789
 msgid "Post ID"
 msgstr "Beitrags-ID"
 
@@ -2480,24 +2504,24 @@ msgid "Radio Button"
 msgstr "Radio-Button"
 
 # @ acf
-#: fields/radio.php:263
+#: fields/radio.php:264
 msgid "Other"
 msgstr "Sonstige"
 
 # @ acf
-#: fields/radio.php:267
+#: fields/radio.php:268
 msgid "Add 'other' choice to allow for custom values"
 msgstr ""
 "Fügt die Option 'Sonstige' hinzu welche erlaubt benutzerdefinierte Werte "
 "hinzuzufügen"
 
 # @ acf
-#: fields/radio.php:273
+#: fields/radio.php:274
 msgid "Save Other"
 msgstr "'Sonstige' speichern"
 
 # @ acf
-#: fields/radio.php:277
+#: fields/radio.php:278
 msgid "Save 'other' values to the field's choices"
 msgstr "Füge 'Sonstige'-Werte zu den Auswahl Optionen hinzu"
 
@@ -2527,60 +2551,65 @@ msgid "No matches found"
 msgstr "Keine Übereinstimmung gefunden"
 
 # @ acf
-#: fields/relationship.php:573
+#: fields/relationship.php:590
 msgid "Search..."
 msgstr "Suchen..."
 
 # @ acf
-#: fields/relationship.php:582
+#: fields/relationship.php:599
 msgid "Select post type"
 msgstr "Beitrag-Typ auswählen"
 
 # @ acf
-#: fields/relationship.php:595
+#: fields/relationship.php:612
 msgid "Select taxonomy"
 msgstr "Taxonomie auswählen"
 
 # @ acf
-#: fields/relationship.php:727 fields/taxonomy.php:36 fields/taxonomy.php:737
+#: fields/relationship.php:744 fields/taxonomy.php:36 fields/taxonomy.php:750
 msgid "Taxonomy"
 msgstr "Taxonomie"
 
 # @ acf
-#: fields/relationship.php:734
+#: fields/relationship.php:751
 msgid "Elements"
 msgstr "Elemente"
 
 # @ acf
-#: fields/relationship.php:735
+#: fields/relationship.php:752
 msgid "Selected elements will be displayed in each result"
 msgstr "Die ausgewählten Elemente werden in jedem Ergebnis mit angezeigt"
 
 # @ acf
-#: fields/relationship.php:746
+#: fields/relationship.php:763
 msgid "Minimum posts"
 msgstr "Min. Anzahl der Beiträge"
 
 # @ acf
-#: fields/relationship.php:755
+#: fields/relationship.php:772
 msgid "Maximum posts"
 msgstr "Max. Anzahl der Beiträge"
 
 # @ acf
-#: fields/relationship.php:859 pro/fields/gallery.php:831
+#: fields/relationship.php:876 pro/fields/gallery.php:823
 #, php-format
 msgid "%s requires at least %s selection"
 msgid_plural "%s requires at least %s selections"
 msgstr[0] "%s benötigt mindestens %s Selektion"
 msgstr[1] "%s benötigt mindestens %s Selektionen"
 
-#: fields/select.php:50
+#: fields/select.php:36 fields/taxonomy.php:772
+msgctxt "noun"
+msgid "Select"
+msgstr "Auswahl"
+
+#: fields/select.php:49
 msgctxt "Select2 JS matches_1"
 msgid "One result is available, press enter to select it."
 msgstr ""
 "Es ist ein Ergebnis verfügbar, drücke die Eingabetaste um es auszuwählen."
 
-#: fields/select.php:51
+#: fields/select.php:50
 #, php-format
 msgctxt "Select2 JS matches_n"
 msgid "%d results are available, use up and down arrow keys to navigate."
@@ -2588,69 +2617,73 @@ msgstr ""
 "Es sind %d Ergebnisse verfügbar, benutze die Pfeiltasten um nach oben und "
 "unten zu navigieren."
 
-#: fields/select.php:52
+#: fields/select.php:51
 msgctxt "Select2 JS matches_0"
 msgid "No matches found"
 msgstr "Keine Übereinstimmungen gefunden"
 
-#: fields/select.php:53
+#: fields/select.php:52
 msgctxt "Select2 JS input_too_short_1"
 msgid "Please enter 1 or more characters"
 msgstr "Gib bitte ein oder mehr Zeichen ein"
 
-#: fields/select.php:54
+#: fields/select.php:53
 #, php-format
 msgctxt "Select2 JS input_too_short_n"
 msgid "Please enter %d or more characters"
 msgstr "Gib bitte %d oder mehr Zeichen ein"
 
-#: fields/select.php:55
+#: fields/select.php:54
 msgctxt "Select2 JS input_too_long_1"
 msgid "Please delete 1 character"
 msgstr "Lösche bitte ein Zeichen"
 
-#: fields/select.php:56
+#: fields/select.php:55
 #, php-format
 msgctxt "Select2 JS input_too_long_n"
 msgid "Please delete %d characters"
 msgstr "Lösche bitte %d Zeichen"
 
-#: fields/select.php:57
+#: fields/select.php:56
 msgctxt "Select2 JS selection_too_long_1"
 msgid "You can only select 1 item"
 msgstr "Du kannst nur ein Element auswählen"
 
-#: fields/select.php:58
+#: fields/select.php:57
 #, php-format
 msgctxt "Select2 JS selection_too_long_n"
 msgid "You can only select %d items"
 msgstr "Du kannst nur %d Elemente auswählen"
 
-#: fields/select.php:59
+#: fields/select.php:58
 msgctxt "Select2 JS load_more"
 msgid "Loading more results&hellip;"
 msgstr "Mehr Ergebnisse laden&hellip;"
 
-#: fields/select.php:60
+#: fields/select.php:59
 msgctxt "Select2 JS searching"
 msgid "Searching&hellip;"
 msgstr "Suchen&hellip;"
 
-#: fields/select.php:61
+#: fields/select.php:60
 msgctxt "Select2 JS load_fail"
 msgid "Loading failed"
 msgstr "Laden fehlgeschlagen"
 
 # @ acf
-#: fields/select.php:463
+#: fields/select.php:492
 msgid "Stylised UI"
 msgstr "Modernes Auswahlfeld"
 
 # @ acf
-#: fields/select.php:477
+#: fields/select.php:506
 msgid "Use AJAX to lazy load choices?"
 msgstr "AJAX zum Laden der Einträge aktivieren"
 
+#: fields/select.php:521
+msgid "Specify the value returned"
+msgstr "Lege den Rückgabewert fest"
+
 # @ acf
 #: fields/tab.php:36
 msgid "Tab"
@@ -2699,106 +2732,102 @@ msgid "Use this field as an end-point and start a new group of tabs"
 msgstr "Benutze das Feld als einen Abschluss und starte eine Gruppe an Tabs"
 
 # @ acf
-#: fields/taxonomy.php:706
+#: fields/taxonomy.php:719
 msgid "None"
 msgstr "Nur Text"
 
 # @ acf
-#: fields/taxonomy.php:738
+#: fields/taxonomy.php:751
 msgid "Select the taxonomy to be displayed"
 msgstr "Wähle die Taxonomie, welche angezeigt werden soll"
 
 # @ acf
-#: fields/taxonomy.php:747
+#: fields/taxonomy.php:760
 msgid "Appearance"
 msgstr "Anzeige"
 
 # @ acf
-#: fields/taxonomy.php:748
+#: fields/taxonomy.php:761
 msgid "Select the appearance of this field"
 msgstr "Wähle das Aussehen für dieses Feld"
 
 # @ acf
-#: fields/taxonomy.php:753
+#: fields/taxonomy.php:766
 msgid "Multiple Values"
 msgstr "Mehrere Werte auswählen?"
 
 # @ acf
-#: fields/taxonomy.php:755
+#: fields/taxonomy.php:768
 msgid "Multi Select"
 msgstr "Auswahlmenü"
 
 # @ acf
-#: fields/taxonomy.php:757
+#: fields/taxonomy.php:770
 msgid "Single Value"
 msgstr "Einzelne Werte"
 
 # @ acf
-#: fields/taxonomy.php:758
+#: fields/taxonomy.php:771
 msgid "Radio Buttons"
 msgstr "Radio Button"
 
 # @ acf
-#: fields/taxonomy.php:781
+#: fields/taxonomy.php:794
 msgid "Create Terms"
 msgstr "Neue Einträge erlauben"
 
 # @ acf
-#: fields/taxonomy.php:782
+#: fields/taxonomy.php:795
 msgid "Allow new terms to be created whilst editing"
 msgstr "Erlaube das Erstellen neuer Einträge beim Editieren"
 
-#: fields/taxonomy.php:795
+#: fields/taxonomy.php:808
 msgid "Save Terms"
 msgstr "Einträge speichern"
 
 # @ acf
-#: fields/taxonomy.php:796
+#: fields/taxonomy.php:809
 msgid "Connect selected terms to the post"
 msgstr "Speichert die ausgewählten Einträge auch im Beitrag"
 
-#: fields/taxonomy.php:809
+#: fields/taxonomy.php:822
 msgid "Load Terms"
 msgstr "Einträge laden"
 
-#: fields/taxonomy.php:810
+#: fields/taxonomy.php:823
 msgid "Load value from posts terms"
 msgstr "Den Wert von den Einträgen des Beitrags laden"
 
 # @ acf
-#: fields/taxonomy.php:828
+#: fields/taxonomy.php:841
 msgid "Term Object"
 msgstr "Begriffs-Objekt"
 
 # @ acf
-#: fields/taxonomy.php:829
+#: fields/taxonomy.php:842
 msgid "Term ID"
 msgstr "Begriffs-ID"
 
 # @ acf
-#: fields/taxonomy.php:888
+#: fields/taxonomy.php:901
 #, php-format
 msgid "User unable to add new %s"
 msgstr "Der Benutzer kann keine neue %s hinzufügen"
 
 # @ acf
-#: fields/taxonomy.php:901
+#: fields/taxonomy.php:914
 #, php-format
 msgid "%s already exists"
 msgstr "%s ist bereits vorhanden"
 
 # @ acf
-#: fields/taxonomy.php:942
+#: fields/taxonomy.php:955
 #, php-format
 msgid "%s added"
 msgstr "%s hinzugefügt"
 
-#: fields/taxonomy.php:976
-msgid "Parent"
-msgstr "Übergeordnet"
-
 # @ acf
-#: fields/taxonomy.php:987
+#: fields/taxonomy.php:1000
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -2857,12 +2886,12 @@ msgid "Value must be a valid URL"
 msgstr "Bitte eine gültige URL eingeben"
 
 # @ acf
-#: fields/user.php:396
+#: fields/user.php:379
 msgid "Filter by role"
 msgstr "Filtere nach Benutzerrollen"
 
 # @ acf
-#: fields/user.php:404
+#: fields/user.php:387
 msgid "All user roles"
 msgstr "Alle Benutzerrollen"
 
@@ -2931,7 +2960,7 @@ msgid "Advanced Custom Fields PRO"
 msgstr "Advanced Custom Fields PRO"
 
 # @ acf
-#: pro/acf-pro.php:191
+#: pro/acf-pro.php:192
 msgid "Flexible Content requires at least 1 layout"
 msgstr "Flexibler Inhalt benötigt mindestens ein Layout"
 
@@ -2966,17 +2995,11 @@ msgid "Create a Custom Field Group"
 msgstr "Erstelle eine Feld-Gruppe"
 
 # @ acf
-#: pro/admin/settings-updates.php:137
+#: pro/admin/settings-updates.php:87
 msgid "<b>Error</b>. Could not connect to update server"
 msgstr ""
 "<b>Fehler</b>. Verbindung zum Update-Server konnte nicht hergestellt werden."
 
-# @ acf
-#: pro/admin/settings-updates.php:267 pro/admin/settings-updates.php:338
-msgid "<b>Connection Error</b>. Sorry, please try again"
-msgstr ""
-"<b>Verbindungsfehler</b>. Entschuldige, versuche es bitte später noch einmal"
-
 # @ acf
 #: pro/admin/views/settings-updates.php:11
 msgid "Deactivate License"
@@ -3055,7 +3078,7 @@ msgstr "Aktualisierungs-Hinweis"
 msgid "Options"
 msgstr "Optionen"
 
-#: pro/core/updates.php:194
+#: pro/core/updates.php:206
 #, php-format
 msgid ""
 "To enable updates, please enter your license key on the <a href=\"%s"
@@ -3067,6 +3090,80 @@ msgstr ""
 "informiere Dich bitte hier hinsichtlich der <a href=\"%s\" target=\"_blank"
 "\">Preise und Einzelheiten</a>."
 
+#: pro/fields/clone.php:36
+msgctxt "noun"
+msgid "Clone"
+msgstr "Klon"
+
+#: pro/fields/clone.php:663
+msgid "Select one or more fields you wish to clone"
+msgstr "Wähle ein oder mehrere Felder aus die Du klonen möchtest"
+
+# @ acf
+#: pro/fields/clone.php:678
+msgid "Display"
+msgstr "Anzeige"
+
+#: pro/fields/clone.php:679
+msgid "Specify the style used to render the clone field"
+msgstr "Gib den Stil an mit dem das Klon-Feld angezeigt werden soll"
+
+#: pro/fields/clone.php:684
+msgid "Group (displays selected fields in a group within this field)"
+msgstr ""
+"Gruppe (zeigt die ausgewählten Felder in einer Gruppe innerhalb dieses "
+"Feldes an)"
+
+#: pro/fields/clone.php:685
+msgid "Seamless (replaces this field with selected fields)"
+msgstr "Nahtlos (ersetzt dieses Feld mit den ausgewählten Feldern)"
+
+#: pro/fields/clone.php:693
+msgid "Specify the style used to render the selected fields"
+msgstr ""
+"Gib den Stil an mit dem die ausgewählten Felder angezeigt werden sollen"
+
+# @ acf
+#: pro/fields/clone.php:698 pro/fields/flexible-content.php:555
+#: pro/fields/repeater.php:467
+msgid "Block"
+msgstr "Block"
+
+# @ acf
+#: pro/fields/clone.php:699 pro/fields/flexible-content.php:554
+#: pro/fields/repeater.php:466
+msgid "Table"
+msgstr "Tabelle"
+
+# @ acf
+#: pro/fields/clone.php:700 pro/fields/flexible-content.php:556
+#: pro/fields/repeater.php:468
+msgid "Row"
+msgstr "Reihe"
+
+#: pro/fields/clone.php:706
+#, php-format
+msgid "Labels will be displayed as %s"
+msgstr "Bezeichnungen werden als %s angezeigt"
+
+#: pro/fields/clone.php:709
+msgid "Prefix Field Labels"
+msgstr "Präfix für Feld-Beschriftungen"
+
+#: pro/fields/clone.php:724
+#, php-format
+msgid "Values will be saved as %s"
+msgstr "Werte werden als %s gespeichert"
+
+#: pro/fields/clone.php:727
+msgid "Prefix Field Names"
+msgstr "Präfix für Feld-Namen"
+
+#: pro/fields/clone.php:883
+#, php-format
+msgid "All fields from %s field group"
+msgstr "Alle Felder von Feld-Gruppe %s"
+
 # @ acf
 #: pro/fields/flexible-content.php:36
 msgid "Flexible Content"
@@ -3123,87 +3220,72 @@ msgid "{required} {label} {identifier} required (min {min})"
 msgstr "{required} {label} {identifier} erforderlich (min {min})"
 
 # @ acf
-#: pro/fields/flexible-content.php:216
+#: pro/fields/flexible-content.php:220
 #, php-format
 msgid "Click the \"%s\" button below to start creating your layout"
 msgstr "Klicke \"%s\" zum Erstellen des Layouts"
 
 # @ acf
-#: pro/fields/flexible-content.php:346
+#: pro/fields/flexible-content.php:350
 msgid "Add layout"
 msgstr "Layout hinzufügen"
 
 # @ acf
-#: pro/fields/flexible-content.php:349
+#: pro/fields/flexible-content.php:353
 msgid "Remove layout"
 msgstr "Layout entfernen"
 
-#: pro/fields/flexible-content.php:352 pro/fields/repeater.php:304
+#: pro/fields/flexible-content.php:356 pro/fields/repeater.php:304
 msgid "Click to toggle"
 msgstr "Zum Auswählen anklicken"
 
 # @ acf
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder Layout"
 msgstr "Layout sortieren"
 
 # @ acf
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder"
 msgstr "Sortieren"
 
 # @ acf
-#: pro/fields/flexible-content.php:494
+#: pro/fields/flexible-content.php:498
 msgid "Delete Layout"
 msgstr "Layout löschen"
 
 # @ acf
-#: pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:499
 msgid "Duplicate Layout"
 msgstr "Layout duplizieren"
 
 # @ acf
-#: pro/fields/flexible-content.php:496
+#: pro/fields/flexible-content.php:500
 msgid "Add New Layout"
 msgstr "Neues Layout hinzufügen"
 
 # @ acf
-#: pro/fields/flexible-content.php:550 pro/fields/repeater.php:466
-msgid "Table"
-msgstr "Tabelle"
-
-# @ acf
-#: pro/fields/flexible-content.php:551 pro/fields/repeater.php:467
-msgid "Block"
-msgstr "Block"
-
-# @ acf
-#: pro/fields/flexible-content.php:552 pro/fields/repeater.php:468
-msgid "Row"
-msgstr "Reihe"
-
-# @ acf
-#: pro/fields/flexible-content.php:567
+#: pro/fields/flexible-content.php:571
 msgid "Min"
 msgstr "Min"
 
 # @ acf
-#: pro/fields/flexible-content.php:580
+#: pro/fields/flexible-content.php:584
 msgid "Max"
 msgstr "Max"
 
 # @ acf
-#: pro/fields/flexible-content.php:608 pro/fields/repeater.php:475
+#: pro/fields/flexible-content.php:612 pro/fields/repeater.php:475
 msgid "Button Label"
 msgstr "Button-Beschriftung"
 
 # @ acf
-#: pro/fields/flexible-content.php:617
+#: pro/fields/flexible-content.php:621
 msgid "Minimum Layouts"
 msgstr "Minimum Layouts"
 
 # @ acf
-#: pro/fields/flexible-content.php:626
+#: pro/fields/flexible-content.php:630
 msgid "Maximum Layouts"
 msgstr "Maximum Layouts"
 
@@ -3213,86 +3295,86 @@ msgid "Gallery"
 msgstr "Galerie"
 
 # @ acf
-#: pro/fields/gallery.php:53
+#: pro/fields/gallery.php:52
 msgid "Add Image to Gallery"
 msgstr "Bild zur Galerie hinzufügen"
 
 # @ acf
-#: pro/fields/gallery.php:57
+#: pro/fields/gallery.php:56
 msgid "Maximum selection reached"
 msgstr "Maximale Auswahl erreicht"
 
 # @ acf
-#: pro/fields/gallery.php:337
+#: pro/fields/gallery.php:336
 msgid "Length"
 msgstr "Länge"
 
-#: pro/fields/gallery.php:380
+#: pro/fields/gallery.php:379
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: pro/fields/gallery.php:389
+#: pro/fields/gallery.php:388
 msgid "Alt Text"
 msgstr "Alt Text"
 
 # @ acf
-#: pro/fields/gallery.php:557
+#: pro/fields/gallery.php:559
 msgid "Add to gallery"
 msgstr "Zur Galerie hinzufügen"
 
 # @ acf
-#: pro/fields/gallery.php:561
+#: pro/fields/gallery.php:563
 msgid "Bulk actions"
 msgstr "Massenverarbeitung"
 
 # @ acf
-#: pro/fields/gallery.php:562
+#: pro/fields/gallery.php:564
 msgid "Sort by date uploaded"
 msgstr "Sortiere nach Upload-Datum"
 
 # @ acf
-#: pro/fields/gallery.php:563
+#: pro/fields/gallery.php:565
 msgid "Sort by date modified"
 msgstr "Sortiere nach Änderungs-Datum"
 
 # @ acf
-#: pro/fields/gallery.php:564
+#: pro/fields/gallery.php:566
 msgid "Sort by title"
 msgstr "Sortiere nach Titel"
 
 # @ acf
-#: pro/fields/gallery.php:565
+#: pro/fields/gallery.php:567
 msgid "Reverse current order"
 msgstr "Aktuelle Sortierung umkehren"
 
 # @ acf
-#: pro/fields/gallery.php:583
+#: pro/fields/gallery.php:585
 msgid "Close"
 msgstr "Schließen"
 
 # @ acf
-#: pro/fields/gallery.php:637
+#: pro/fields/gallery.php:639
 msgid "Minimum Selection"
 msgstr "Minimale Auswahl"
 
 # @ acf
-#: pro/fields/gallery.php:646
+#: pro/fields/gallery.php:648
 msgid "Maximum Selection"
 msgstr "Maximale Auswahl"
 
-#: pro/fields/gallery.php:665
+#: pro/fields/gallery.php:657
 msgid "Insert"
 msgstr "Einfügen"
 
-#: pro/fields/gallery.php:666
+#: pro/fields/gallery.php:658
 msgid "Specify where new attachments are added"
 msgstr "Gib an wo neue Anhänge hinzugefügt werden"
 
-#: pro/fields/gallery.php:670
+#: pro/fields/gallery.php:662
 msgid "Append to the end"
 msgstr "Anhängen"
 
-#: pro/fields/gallery.php:671
+#: pro/fields/gallery.php:663
 msgid "Prepend to the beginning"
 msgstr "Voranstellen"
 
@@ -3366,6 +3448,44 @@ msgstr "Elliot Condon"
 msgid "http://www.elliotcondon.com/"
 msgstr "http://www.elliotcondon.com/"
 
+# @ acf
+#~ msgid "<b>Success</b>. Import tool added %s field groups: %s"
+#~ msgstr "<b>Erfolgreich</b>. Der Import hat %s Feld-Gruppen hinzugefügt: %s"
+
+# @ acf
+#~ msgid ""
+#~ "<b>Warning</b>. Import tool detected %s field groups already exist and "
+#~ "have been ignored: %s"
+#~ msgstr ""
+#~ "<b>Warnung</b>. Der Import hat %s Feld-Gruppen erkannt, die schon "
+#~ "vorhanden sind und diese ignoriert: %s"
+
+# @ acf
+#~ msgid "Upgrade ACF"
+#~ msgstr "Aktualisiere ACF"
+
+# @ acf
+#~ msgid "Upgrade"
+#~ msgstr "Aktualisieren"
+
+# @ acf
+#~ msgid ""
+#~ "The following sites require a DB upgrade. Check the ones you want to "
+#~ "update and then click “Upgrade Database”."
+#~ msgstr ""
+#~ "Die folgenden Seiten erfordern eine Datenbank- Aktualisierung. Markiere "
+#~ "die gewünschten Seiten und klicke \\\"Aktualisiere Datenbank\\\"."
+
+# @ acf
+#~ msgid "Select"
+#~ msgstr "Auswahlmenü"
+
+# @ acf
+#~ msgid "<b>Connection Error</b>. Sorry, please try again"
+#~ msgstr ""
+#~ "<b>Verbindungsfehler</b>. Entschuldige, versuche es bitte später noch "
+#~ "einmal"
+
 # @ acf
 #~ msgid "Done"
 #~ msgstr "Fertig"
@@ -3475,10 +3595,6 @@ msgstr "http://www.elliotcondon.com/"
 #~ msgid "Warning"
 #~ msgstr "Warnung"
 
-# @ acf
-#~ msgid "Display"
-#~ msgstr "Anzeige"
-
 # @ acf
 #~ msgid "Show Field Keys"
 #~ msgstr "Zeige Feld-Schlüssel"
diff --git a/lang/acf-de_DE_formal.mo b/lang/acf-de_DE_formal.mo
index 6f415e2..78481f7 100644
Binary files a/lang/acf-de_DE_formal.mo and b/lang/acf-de_DE_formal.mo differ
diff --git a/lang/acf-de_DE_formal.po b/lang/acf-de_DE_formal.po
index ef20dea..46dc0cb 100644
--- a/lang/acf-de_DE_formal.po
+++ b/lang/acf-de_DE_formal.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Advanced Custom Fields Pro v5.3.9 Formal\n"
+"Project-Id-Version: Advanced Custom Fields Pro v5.4 Formal\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
-"POT-Creation-Date: 2016-06-02 02:41+0200\n"
-"PO-Revision-Date: 2016-06-02 03:29+0200\n"
+"POT-Creation-Date: 2016-07-29 00:37+0200\n"
+"PO-Revision-Date: 2016-07-29 00:42+0200\n"
 "Last-Translator: Ralf Koller <r.koller@gmail.com>\n"
 "Language-Team: Ralf Koller <r.koller@gmail.com>\n"
 "Language: de_DE\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.8\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
 "esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
@@ -28,109 +28,109 @@ msgid "Advanced Custom Fields"
 msgstr "Advanced Custom Fields"
 
 # @ acf
-#: acf.php:265 admin/admin.php:61
+#: acf.php:271 admin/admin.php:61
 msgid "Field Groups"
 msgstr "Feld-Gruppen"
 
 # @ acf
-#: acf.php:266
+#: acf.php:272
 msgid "Field Group"
 msgstr "Feld-Gruppe"
 
 # @ acf
-#: acf.php:267 acf.php:299 admin/admin.php:62
-#: pro/fields/flexible-content.php:496
+#: acf.php:273 acf.php:305 admin/admin.php:62
+#: pro/fields/flexible-content.php:500
 msgid "Add New"
 msgstr "Erstellen"
 
 # @ acf
-#: acf.php:268
+#: acf.php:274
 msgid "Add New Field Group"
 msgstr "Neue Feld-Gruppe erstellen"
 
 # @ acf
-#: acf.php:269
+#: acf.php:275
 msgid "Edit Field Group"
 msgstr "Feld-Gruppe bearbeiten"
 
 # @ acf
-#: acf.php:270
+#: acf.php:276
 msgid "New Field Group"
 msgstr "Neue Feld-Gruppe"
 
 # @ acf
-#: acf.php:271
+#: acf.php:277
 msgid "View Field Group"
 msgstr "Feld-Gruppe anzeigen"
 
 # @ acf
-#: acf.php:272
+#: acf.php:278
 msgid "Search Field Groups"
 msgstr "Feld-Gruppen suchen"
 
 # @ acf
-#: acf.php:273
+#: acf.php:279
 msgid "No Field Groups found"
 msgstr "Keine Feld-Gruppen gefunden"
 
 # @ acf
-#: acf.php:274
+#: acf.php:280
 msgid "No Field Groups found in Trash"
 msgstr "Keine Feld-Gruppen im Papierkorb gefunden"
 
 # @ acf
-#: acf.php:297 admin/field-group.php:182 admin/field-group.php:280
-#: admin/field-groups.php:528
+#: acf.php:303 admin/field-group.php:182 admin/field-group.php:280
+#: admin/field-groups.php:528 pro/fields/clone.php:662
 msgid "Fields"
 msgstr "Felder"
 
 # @ acf
-#: acf.php:298
+#: acf.php:304
 msgid "Field"
 msgstr "Feld"
 
 # @ acf
-#: acf.php:300
+#: acf.php:306
 msgid "Add New Field"
 msgstr "Feld hinzufügen"
 
 # @ acf
-#: acf.php:301
+#: acf.php:307
 msgid "Edit Field"
 msgstr "Feld bearbeiten"
 
 # @ acf
-#: acf.php:302 admin/views/field-group-fields.php:18
+#: acf.php:308 admin/views/field-group-fields.php:54
 #: admin/views/settings-info.php:111
 msgid "New Field"
 msgstr "Neues Feld"
 
 # @ acf
-#: acf.php:303
+#: acf.php:309
 msgid "View Field"
 msgstr "Feld anzeigen"
 
 # @ acf
-#: acf.php:304
+#: acf.php:310
 msgid "Search Fields"
 msgstr "Felder suchen"
 
 # @ acf
-#: acf.php:305
+#: acf.php:311
 msgid "No Fields found"
 msgstr "Keine Felder gefunden"
 
 # @ acf
-#: acf.php:306
+#: acf.php:312
 msgid "No Fields found in Trash"
 msgstr "Keine Feld-Gruppen im Papierkorb gefunden"
 
-#: acf.php:345 admin/field-group.php:395 admin/field-groups.php:586
+#: acf.php:351 admin/field-group.php:395 admin/field-groups.php:585
 #: admin/views/field-group-options.php:13
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: acf.php:350
+#: acf.php:356
 #, php-format
 msgid "Disabled <span class=\"count\">(%s)</span>"
 msgid_plural "Disabled <span class=\"count\">(%s)</span>"
@@ -207,7 +207,7 @@ msgid "Field group title is required"
 msgstr "Es ist ein Titel für die Feld-Gruppe erforderlich"
 
 # @ acf
-#: admin/field-group.php:278 api/api-field-group.php:620
+#: admin/field-group.php:278 api/api-field-group.php:651
 msgid "copy"
 msgstr "kopieren"
 
@@ -216,7 +216,7 @@ msgstr "kopieren"
 #: admin/views/field-group-field-conditional-logic.php:62
 #: admin/views/field-group-field-conditional-logic.php:162
 #: admin/views/field-group-locations.php:59
-#: admin/views/field-group-locations.php:135 api/api-helpers.php:3684
+#: admin/views/field-group-locations.php:135 api/api-helpers.php:3952
 msgid "or"
 msgstr "oder"
 
@@ -265,96 +265,96 @@ msgid "Active"
 msgstr "Aktiviert"
 
 # @ acf
-#: admin/field-group.php:843
+#: admin/field-group.php:842
 msgid "Front Page"
 msgstr "Startseite"
 
 # @ acf
-#: admin/field-group.php:844
+#: admin/field-group.php:843
 msgid "Posts Page"
 msgstr "Beitrags-Seite"
 
 # @ acf
-#: admin/field-group.php:845
+#: admin/field-group.php:844
 msgid "Top Level Page (no parent)"
 msgstr "Seite ohne übergeordnete Seiten"
 
 # @ acf
-#: admin/field-group.php:846
+#: admin/field-group.php:845
 msgid "Parent Page (has children)"
 msgstr "Übergeordnete Seite (mit Unterseiten)"
 
 # @ acf
-#: admin/field-group.php:847
+#: admin/field-group.php:846
 msgid "Child Page (has parent)"
 msgstr "Unterseite (mit übergeordneter Seite)"
 
 # @ acf
-#: admin/field-group.php:863
+#: admin/field-group.php:862
 msgid "Default Template"
 msgstr "Standard-Template"
 
 # @ acf
-#: admin/field-group.php:886
+#: admin/field-group.php:885
 msgid "Logged in"
 msgstr "ist angemeldet"
 
 # @ acf
-#: admin/field-group.php:887
+#: admin/field-group.php:886
 msgid "Viewing front end"
 msgstr "ist im Front-End"
 
 # @ acf
-#: admin/field-group.php:888
+#: admin/field-group.php:887
 msgid "Viewing back end"
 msgstr "ist im Back-End"
 
 # @ acf
-#: admin/field-group.php:907
+#: admin/field-group.php:906
 msgid "Super Admin"
 msgstr "Super-Admin"
 
 # @ acf
-#: admin/field-group.php:918 admin/field-group.php:926
-#: admin/field-group.php:940 admin/field-group.php:947
-#: admin/field-group.php:964 admin/field-group.php:981 fields/file.php:241
-#: fields/image.php:237 pro/fields/gallery.php:684
+#: admin/field-group.php:917 admin/field-group.php:925
+#: admin/field-group.php:939 admin/field-group.php:946
+#: admin/field-group.php:963 admin/field-group.php:980 fields/file.php:241
+#: fields/image.php:237 pro/fields/gallery.php:676
 msgid "All"
 msgstr "Alle"
 
 # @ acf
-#: admin/field-group.php:927
+#: admin/field-group.php:926
 msgid "Add / Edit"
 msgstr "Hinzufügen / Bearbeiten"
 
 # @ acf
-#: admin/field-group.php:928
+#: admin/field-group.php:927
 msgid "Register"
 msgstr "Registrieren"
 
 # @ acf
-#: admin/field-group.php:1168
+#: admin/field-group.php:1167
 msgid "Move Complete."
 msgstr "Verschieben erfolgreich abgeschlossen."
 
 # @ acf
-#: admin/field-group.php:1169
+#: admin/field-group.php:1168
 #, php-format
 msgid "The %s field can now be found in the %s field group"
 msgstr "Das Feld \"%s\" wurde in die %s Feld-Gruppe verschoben"
 
 # @ acf
-#: admin/field-group.php:1171
+#: admin/field-group.php:1170
 msgid "Close Window"
 msgstr "Schließen"
 
 # @ acf
-#: admin/field-group.php:1206
+#: admin/field-group.php:1205
 msgid "Please select the destination for this field"
 msgstr "In welche Feld-Gruppe solle dieses Feld verschoben werden"
 
 # @ acf
-#: admin/field-group.php:1213
+#: admin/field-group.php:1212
 msgid "Move Field"
 msgstr "Feld verschieben"
 
@@ -394,20 +394,20 @@ msgstr[0] "%s Feld-Gruppe synchronisiert."
 msgstr[1] "%s Feld-Gruppen synchronisiert."
 
 # @ acf
-#: admin/field-groups.php:412 admin/field-groups.php:576
+#: admin/field-groups.php:412 admin/field-groups.php:575
 msgid "Sync available"
 msgstr "Synchronisierung verfügbar"
 
 # @ acf
-#: admin/field-groups.php:525 api/api-template.php:1058
-#: api/api-template.php:1271 pro/fields/gallery.php:371
+#: admin/field-groups.php:525 api/api-template.php:1077
+#: api/api-template.php:1290 pro/fields/gallery.php:370
 msgid "Title"
 msgstr "Titel"
 
 # @ acf
 #: admin/field-groups.php:526 admin/views/field-group-options.php:93
-#: admin/views/update-network.php:20 admin/views/update-network.php:28
-#: pro/fields/gallery.php:398
+#: admin/views/update-network.php:25 admin/views/update-network.php:33
+#: pro/fields/gallery.php:397
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -416,95 +416,95 @@ msgid "Status"
 msgstr "Status"
 
 # @ acf
-#: admin/field-groups.php:624 admin/settings-info.php:76
+#: admin/field-groups.php:623 admin/settings-info.php:76
 #: pro/admin/views/settings-updates.php:111
 msgid "Changelog"
 msgstr "Versionshinweise"
 
-#: admin/field-groups.php:625
+#: admin/field-groups.php:624
 #, php-format
 msgid "See what's new in <a href=\"%s\">version %s</a>."
 msgstr "Was gibt es Neues in <a href=„%s“>Version %s</a>."
 
 # @ acf
-#: admin/field-groups.php:627
+#: admin/field-groups.php:626
 msgid "Resources"
 msgstr "Dokumentation (engl.)"
 
 # @ acf
-#: admin/field-groups.php:629
+#: admin/field-groups.php:628
 msgid "Getting Started"
 msgstr "Erste Schritte"
 
 # @ acf
-#: admin/field-groups.php:630 pro/admin/settings-updates.php:73
+#: admin/field-groups.php:629 pro/admin/settings-updates.php:57
 #: pro/admin/views/settings-updates.php:17
 msgid "Updates"
 msgstr "Aktualisierungen"
 
 # @ acf
-#: admin/field-groups.php:631
+#: admin/field-groups.php:630
 msgid "Field Types"
 msgstr "Feld-Typen"
 
 # @ acf
-#: admin/field-groups.php:632
+#: admin/field-groups.php:631
 msgid "Functions"
 msgstr "Funktionen"
 
 # @ acf
-#: admin/field-groups.php:633
+#: admin/field-groups.php:632
 msgid "Actions"
 msgstr "Aktionen"
 
 # @ acf
-#: admin/field-groups.php:634 fields/relationship.php:720
+#: admin/field-groups.php:633 fields/relationship.php:737
 msgid "Filters"
 msgstr "Filter"
 
 # @ acf
-#: admin/field-groups.php:635
+#: admin/field-groups.php:634
 msgid "'How to' guides"
 msgstr "Kurzanleitungen"
 
 # @ acf
-#: admin/field-groups.php:636
+#: admin/field-groups.php:635
 msgid "Tutorials"
 msgstr "Tutorials"
 
-#: admin/field-groups.php:637
+#: admin/field-groups.php:636
 msgid "FAQ"
 msgstr "Häufig gestellte Fragen"
 
 # @ acf
-#: admin/field-groups.php:642
+#: admin/field-groups.php:641
 msgid "Created by"
 msgstr "Erstellt von"
 
 # @ acf
-#: admin/field-groups.php:685
+#: admin/field-groups.php:684
 msgid "Duplicate this item"
 msgstr "Dieses Element duplizieren"
 
 # @ acf
-#: admin/field-groups.php:685 admin/field-groups.php:701
-#: admin/views/field-group-field.php:58 pro/fields/flexible-content.php:495
+#: admin/field-groups.php:684 admin/field-groups.php:700
+#: admin/views/field-group-field.php:59 pro/fields/flexible-content.php:499
 msgid "Duplicate"
 msgstr "Duplizieren"
 
 # @ acf
-#: admin/field-groups.php:747
+#: admin/field-groups.php:751
 #, php-format
 msgid "Select %s"
 msgstr "%s auswählen"
 
 # @ acf
-#: admin/field-groups.php:755
+#: admin/field-groups.php:759
 msgid "Synchronise field group"
 msgstr "Synchronisiere Feld-Gruppe"
 
 # @ acf
-#: admin/field-groups.php:755 admin/field-groups.php:772
+#: admin/field-groups.php:759 admin/field-groups.php:776
 msgid "Sync"
 msgstr "Synchronisieren"
 
@@ -528,82 +528,63 @@ msgstr "Info"
 msgid "What's New"
 msgstr "Was gibt es Neues"
 
-#: admin/settings-tools.php:54 admin/views/settings-tools-export.php:23
+#: admin/settings-tools.php:50 admin/views/settings-tools-export.php:23
 #: admin/views/settings-tools.php:31
 msgid "Tools"
 msgstr "Werkzeuge"
 
 # @ acf
-#: admin/settings-tools.php:151 admin/settings-tools.php:369
+#: admin/settings-tools.php:147 admin/settings-tools.php:380
 msgid "No field groups selected"
 msgstr "Keine Feld-Gruppe ausgewählt"
 
 # @ acf
-#: admin/settings-tools.php:188 fields/file.php:175
+#: admin/settings-tools.php:184 fields/file.php:175
 msgid "No file selected"
 msgstr "Keine Datei ausgewählt"
 
 # @ acf
-#: admin/settings-tools.php:201
+#: admin/settings-tools.php:197
 msgid "Error uploading file. Please try again"
 msgstr "Fehler beim Upload. Bitte erneut versuchen."
 
 # @ acf
-#: admin/settings-tools.php:210
+#: admin/settings-tools.php:206
 msgid "Incorrect file type"
 msgstr "Falscher Dateityp"
 
 # @ acf
-#: admin/settings-tools.php:227
+#: admin/settings-tools.php:223
 msgid "Import file empty"
 msgstr "Die importierte Datei ist leer"
 
-# @ acf
-#: admin/settings-tools.php:323
+#: admin/settings-tools.php:331
 #, php-format
-msgid "<b>Success</b>. Import tool added %s field groups: %s"
-msgstr "<b>Erfolgreich</b>. Der Import hat %s Feld-Gruppen hinzugefügt: %s"
+msgid "Imported 1 field group"
+msgid_plural "Imported %s field groups"
+msgstr[0] "Eine Feld-Gruppe importiert"
+msgstr[1] "%s Feld-Gruppen importiert"
 
 # @ acf
-#: admin/settings-tools.php:332
-#, php-format
-msgid ""
-"<b>Warning</b>. Import tool detected %s field groups already exist and have "
-"been ignored: %s"
-msgstr ""
-"<b>Warnung</b>. Der Import hat %s Feld-Gruppen erkannt, die schon vorhanden "
-"sind und diese ignoriert: %s"
-
-# @ acf
-#: admin/update.php:113
-msgid "Upgrade ACF"
-msgstr "Aktualisiere ACF"
-
-# @ acf
-#: admin/update.php:166
-msgid "Review sites & upgrade"
-msgstr "Übersicht Seiten & Aktualisierungen"
-
-# @ acf
-#: admin/update.php:317
-msgid "Upgrade"
-msgstr "Aktualisieren"
-
-# @ acf
-#: admin/update.php:368
+#: admin/update-network.php:96 admin/update.php:104 admin/update.php:155
 msgid "Upgrade Database"
 msgstr "Aktualisiere Datenbank"
 
-#: admin/update.php:433
+# @ acf
+#: admin/update-network.php:148
+msgid "Review sites & upgrade"
+msgstr "Übersicht Seiten & Aktualisierungen"
+
+#: admin/update.php:220
 msgid "Error validating request"
 msgstr "Fehler bei der Überprüfung der Anfrage"
 
 # @ acf
-#: admin/update.php:456 admin/views/update.php:110
+#: admin/update.php:243 admin/views/update.php:110
 msgid "No updates available"
 msgstr "Keine Aktualisierungen verfügbar"
 
-#: admin/update.php:473
+#: admin/update.php:260
 msgid "Error loading update"
 msgstr "Fehler beim Laden der Aktualisierung"
 
@@ -614,27 +595,31 @@ msgstr "Bedingungen für die Anzeige"
 
 # @ acf
 #: admin/views/field-group-field-conditional-logic.php:40
-#: admin/views/field-group-field.php:140 fields/checkbox.php:243
-#: fields/message.php:144 fields/page_link.php:539 fields/page_link.php:553
-#: fields/post_object.php:403 fields/post_object.php:417 fields/radio.php:254
-#: fields/select.php:440 fields/select.php:454 fields/select.php:468
-#: fields/select.php:482 fields/tab.php:130 fields/taxonomy.php:772
-#: fields/taxonomy.php:786 fields/taxonomy.php:800 fields/taxonomy.php:814
-#: fields/user.php:416 fields/user.php:430 fields/wysiwyg.php:418
-#: pro/admin/views/settings-updates.php:93
+#: admin/views/field-group-field.php:141 fields/checkbox.php:244
+#: fields/message.php:144 fields/page_link.php:533 fields/page_link.php:547
+#: fields/page_link.php:561 fields/post_object.php:432
+#: fields/post_object.php:446 fields/radio.php:255 fields/select.php:469
+#: fields/select.php:483 fields/select.php:497 fields/select.php:511
+#: fields/tab.php:130 fields/taxonomy.php:785 fields/taxonomy.php:799
+#: fields/taxonomy.php:813 fields/taxonomy.php:827 fields/user.php:399
+#: fields/user.php:413 fields/wysiwyg.php:418
+#: pro/admin/views/settings-updates.php:93 pro/fields/clone.php:716
+#: pro/fields/clone.php:734
 msgid "Yes"
 msgstr "Ja"
 
 # @ acf
 #: admin/views/field-group-field-conditional-logic.php:41
-#: admin/views/field-group-field.php:141 fields/checkbox.php:244
-#: fields/message.php:145 fields/page_link.php:540 fields/page_link.php:554
-#: fields/post_object.php:404 fields/post_object.php:418 fields/radio.php:255
-#: fields/select.php:441 fields/select.php:455 fields/select.php:469
-#: fields/select.php:483 fields/tab.php:131 fields/taxonomy.php:687
-#: fields/taxonomy.php:773 fields/taxonomy.php:787 fields/taxonomy.php:801
-#: fields/taxonomy.php:815 fields/user.php:417 fields/user.php:431
-#: fields/wysiwyg.php:419 pro/admin/views/settings-updates.php:103
+#: admin/views/field-group-field.php:142 fields/checkbox.php:245
+#: fields/message.php:145 fields/page_link.php:534 fields/page_link.php:548
+#: fields/page_link.php:562 fields/post_object.php:433
+#: fields/post_object.php:447 fields/radio.php:256 fields/select.php:470
+#: fields/select.php:484 fields/select.php:498 fields/select.php:512
+#: fields/tab.php:131 fields/taxonomy.php:700 fields/taxonomy.php:786
+#: fields/taxonomy.php:800 fields/taxonomy.php:814 fields/taxonomy.php:828
+#: fields/user.php:400 fields/user.php:414 fields/wysiwyg.php:419
+#: pro/admin/views/settings-updates.php:103 pro/fields/clone.php:717
+#: pro/fields/clone.php:735
 msgid "No"
 msgstr "Nein"
 
@@ -668,148 +653,150 @@ msgid "Add rule group"
 msgstr "Regel-Gruppe hinzufügen"
 
 # @ acf
-#: admin/views/field-group-field.php:49 pro/fields/flexible-content.php:342
+#: admin/views/field-group-field.php:50 pro/fields/flexible-content.php:346
 #: pro/fields/repeater.php:302
 msgid "Drag to reorder"
 msgstr "Ziehen zum Sortieren"
 
 # @ acf
-#: admin/views/field-group-field.php:54 admin/views/field-group-field.php:57
+#: admin/views/field-group-field.php:55 admin/views/field-group-field.php:58
 msgid "Edit field"
 msgstr "Feld bearbeiten"
 
 # @ acf
-#: admin/views/field-group-field.php:57 core/media.php:55 fields/image.php:142
-#: pro/fields/gallery.php:358
+#: admin/views/field-group-field.php:58 fields/image.php:142
+#: pro/fields/gallery.php:357
 msgid "Edit"
 msgstr "Bearbeiten"
 
 # @ acf
-#: admin/views/field-group-field.php:58
+#: admin/views/field-group-field.php:59
 msgid "Duplicate field"
 msgstr "Feld duplizieren"
 
 # @ acf
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move field to another group"
 msgstr "Feld in eine andere Gruppe verschieben"
 
 # @ acf
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move"
 msgstr "Verschieben"
 
 # @ acf
-#: admin/views/field-group-field.php:60
+#: admin/views/field-group-field.php:61
 msgid "Delete field"
 msgstr "Feld löschen"
 
 # @ acf
-#: admin/views/field-group-field.php:60 pro/fields/flexible-content.php:494
+#: admin/views/field-group-field.php:61 pro/fields/flexible-content.php:498
 msgid "Delete"
 msgstr "Löschen"
 
 # @ acf
-#: admin/views/field-group-field.php:68 fields/oembed.php:225
-#: fields/taxonomy.php:888
+#: admin/views/field-group-field.php:69 fields/oembed.php:225
+#: fields/taxonomy.php:901
 msgid "Error"
 msgstr "Fehler"
 
 # @ acf
-#: admin/views/field-group-field.php:68
+#: admin/views/field-group-field.php:69
 msgid "Field type does not exist"
 msgstr "Feld-Typ existiert nicht"
 
 # @ acf
-#: admin/views/field-group-field.php:81
+#: admin/views/field-group-field.php:82
 msgid "Field Label"
 msgstr "Bezeichnung"
 
 # @ acf
-#: admin/views/field-group-field.php:82
+#: admin/views/field-group-field.php:83
 msgid "This is the name which will appear on the EDIT page"
 msgstr "Dieser Name wird in der Bearbeitungs-Ansicht eines Beitrags angezeigt"
 
 # @ acf
-#: admin/views/field-group-field.php:94
+#: admin/views/field-group-field.php:95
 msgid "Field Name"
 msgstr "Feld-Name"
 
 # @ acf
-#: admin/views/field-group-field.php:95
+#: admin/views/field-group-field.php:96
 msgid "Single word, no spaces. Underscores and dashes allowed"
 msgstr ""
 "Nur ein Wort ohne Leerzeichen; es sind nur Unterstriche und Bindestriche als "
 "Sonderzeichen erlaubt"
 
 # @ acf
-#: admin/views/field-group-field.php:107
+#: admin/views/field-group-field.php:108
 msgid "Field Type"
 msgstr "Feld-Typ"
 
 # @ acf
-#: admin/views/field-group-field.php:121 fields/tab.php:103
+#: admin/views/field-group-field.php:122 fields/tab.php:103
 msgid "Instructions"
 msgstr "Anweisungen"
 
 # @ acf
-#: admin/views/field-group-field.php:122
+#: admin/views/field-group-field.php:123
 msgid "Instructions for authors. Shown when submitting data"
 msgstr "Anweisungen für Autoren werden in der Bearbeitungs-Ansicht angezeigt"
 
 # @ acf
-#: admin/views/field-group-field.php:133
+#: admin/views/field-group-field.php:134
 msgid "Required?"
 msgstr "Erforderlich?"
 
 # @ acf
-#: admin/views/field-group-field.php:162
+#: admin/views/field-group-field.php:163
 msgid "Wrapper Attributes"
 msgstr "Wrapper-Attribute"
 
 # @ acf
-#: admin/views/field-group-field.php:168
+#: admin/views/field-group-field.php:169
 msgid "width"
 msgstr "Breite"
 
 # @ acf
-#: admin/views/field-group-field.php:182
+#: admin/views/field-group-field.php:183
 msgid "class"
 msgstr "Klasse"
 
 # @ acf
-#: admin/views/field-group-field.php:195
+#: admin/views/field-group-field.php:196
 msgid "id"
 msgstr "ID"
 
 # @ acf
-#: admin/views/field-group-field.php:207
+#: admin/views/field-group-field.php:208
 msgid "Close Field"
 msgstr "Feld schließen"
 
 # @ acf
-#: admin/views/field-group-fields.php:29
+#: admin/views/field-group-fields.php:17
 msgid "Order"
 msgstr "Reihenfolge"
 
 # @ acf
-#: admin/views/field-group-fields.php:30 pro/fields/flexible-content.php:521
+#: admin/views/field-group-fields.php:18 fields/checkbox.php:259
+#: fields/radio.php:314 fields/select.php:527
+#: pro/fields/flexible-content.php:525
 msgid "Label"
 msgstr "Name"
 
 # @ acf
-#: admin/views/field-group-fields.php:31 fields/taxonomy.php:954
-#: pro/fields/flexible-content.php:534
+#: admin/views/field-group-fields.php:19 fields/taxonomy.php:967
+#: pro/fields/flexible-content.php:538
 msgid "Name"
 msgstr "Feld-Name"
 
 # @ acf
-#: admin/views/field-group-fields.php:32
+#: admin/views/field-group-fields.php:20
 msgid "Type"
 msgstr "Typ"
 
 # @ acf
-#: admin/views/field-group-fields.php:44
+#: admin/views/field-group-fields.php:38
 msgid ""
 "No fields. Click the <strong>+ Add Field</strong> button to create your "
 "first field."
@@ -818,7 +805,7 @@ msgstr ""
 "hinzufügen-Button</strong> und erstellen Sie Ihr erstes Feld."
 
 # @ acf
-#: admin/views/field-group-fields.php:51
+#: admin/views/field-group-fields.php:44
 msgid "+ Add Field"
 msgstr "+ Feld hinzufügen"
 
@@ -829,7 +816,7 @@ msgid "Post"
 msgstr "Beitrag"
 
 # @ acf
-#: admin/views/field-group-locations.php:6 fields/relationship.php:726
+#: admin/views/field-group-locations.php:6 fields/relationship.php:743
 msgid "Post Type"
 msgstr "Beitrags-Typ"
 
@@ -1093,7 +1080,7 @@ msgid "Page Attributes"
 msgstr "Seiten-Attribute"
 
 # @ acf
-#: admin/views/field-group-options.php:123 fields/relationship.php:739
+#: admin/views/field-group-options.php:123 fields/relationship.php:756
 msgid "Featured Image"
 msgstr "Beitragsbild"
 
@@ -1541,48 +1528,52 @@ msgstr "Datei auswählen"
 msgid "Import"
 msgstr "Importieren"
 
+#: admin/views/update-network.php:4
+msgid "Upgrade Sites"
+msgstr "Seiten aktualisieren"
+
 # @ acf
-#: admin/views/update-network.php:8 admin/views/update.php:8
+#: admin/views/update-network.php:13 admin/views/update.php:8
 msgid "Advanced Custom Fields Database Upgrade"
 msgstr "Advanced Custom Fields Datenbank Aktualisierung"
 
-# @ acf
-#: admin/views/update-network.php:10
+#: admin/views/update-network.php:15
+#, php-format
 msgid ""
 "The following sites require a DB upgrade. Check the ones you want to update "
-"and then click “Upgrade Database”."
+"and then click %s."
 msgstr ""
-"Die folgenden Seiten erfordern eine Datenbank- Aktualisierung. Markieren Sie "
-"die gewünschten Seiten und klicken \\\"Aktualisiere Datenbank\\\"."
+"Folgende Seiten erfordern eine Datenbank-Aktualisierung. Markieren Sie die "
+"gewünschten Seiten und klicken Sie dann %s."
 
 # @ acf
-#: admin/views/update-network.php:19 admin/views/update-network.php:27
+#: admin/views/update-network.php:24 admin/views/update-network.php:32
 msgid "Site"
 msgstr "Seite"
 
 # @ acf
-#: admin/views/update-network.php:47
+#: admin/views/update-network.php:52
 #, php-format
 msgid "Site requires database upgrade from %s to %s"
 msgstr "Die Seite erfordert eine Datenbank-Aktualisierung von %s auf %s"
 
 # @ acf
-#: admin/views/update-network.php:49
+#: admin/views/update-network.php:54
 msgid "Site is up to date"
 msgstr "Seite ist aktuell"
 
 # @ acf
-#: admin/views/update-network.php:62 admin/views/update.php:16
+#: admin/views/update-network.php:67 admin/views/update.php:16
 msgid "Database Upgrade complete"
 msgstr "Datenbank-Aktualisierung fertiggestellt"
 
 # @ acf
-#: admin/views/update-network.php:62
+#: admin/views/update-network.php:67
 msgid "Return to network dashboard"
 msgstr "Zum Netzwerk Dashboard"
 
 # @ acf
-#: admin/views/update-network.php:101 admin/views/update-notice.php:35
+#: admin/views/update-network.php:106 admin/views/update-notice.php:35
 msgid ""
 "It is strongly recommended that you backup your database before proceeding. "
 "Are you sure you wish to run the updater now?"
@@ -1592,12 +1583,12 @@ msgstr ""
 "wollen?"
 
 # @ default
-#: admin/views/update-network.php:157
+#: admin/views/update-network.php:162
 msgid "Upgrade complete"
 msgstr "Aktualisierung abgeschlossen"
 
 # @ acf
-#: admin/views/update-network.php:161 admin/views/update.php:14
+#: admin/views/update-network.php:166 admin/views/update.php:14
 #, php-format
 msgid "Upgrading data to version %s"
 msgstr "Aktualisiere Daten auf Version %s"
@@ -1633,93 +1624,98 @@ msgid "See what's new"
 msgstr "Was ist neu"
 
 # @ acf
-#: api/api-helpers.php:933
+#: api/api-helpers.php:944
 msgid "Thumbnail"
 msgstr "Miniaturbild"
 
 # @ acf
-#: api/api-helpers.php:934
+#: api/api-helpers.php:945
 msgid "Medium"
 msgstr "Mittel"
 
 # @ acf
-#: api/api-helpers.php:935
+#: api/api-helpers.php:946
 msgid "Large"
 msgstr "Groß"
 
 # @ acf
-#: api/api-helpers.php:984
+#: api/api-helpers.php:995
 msgid "Full Size"
 msgstr "Volle Größe"
 
 # @ acf
-#: api/api-helpers.php:1196 api/api-helpers.php:1759
+#: api/api-helpers.php:1207 api/api-helpers.php:1770 pro/fields/clone.php:849
 msgid "(no title)"
 msgstr "(ohne Titel)"
 
+#: api/api-helpers.php:1807 fields/page_link.php:284 fields/post_object.php:283
+#: fields/taxonomy.php:989
+msgid "Parent"
+msgstr "Übergeordnet"
+
 # @ acf
-#: api/api-helpers.php:3605
+#: api/api-helpers.php:3873
 #, php-format
 msgid "Image width must be at least %dpx."
 msgstr "Die Breite des Bildes muss mindestens %dpx sein."
 
 # @ acf
-#: api/api-helpers.php:3610
+#: api/api-helpers.php:3878
 #, php-format
 msgid "Image width must not exceed %dpx."
 msgstr "Die Breite des Bildes darf %dpx nicht überschreiten."
 
 # @ acf
-#: api/api-helpers.php:3626
+#: api/api-helpers.php:3894
 #, php-format
 msgid "Image height must be at least %dpx."
 msgstr "Die Höhe des Bildes muss mindestens %dpx sein."
 
 # @ acf
-#: api/api-helpers.php:3631
+#: api/api-helpers.php:3899
 #, php-format
 msgid "Image height must not exceed %dpx."
 msgstr "Die Höhe des Bild darf %dpx nicht überschreiten."
 
 # @ acf
-#: api/api-helpers.php:3649
+#: api/api-helpers.php:3917
 #, php-format
 msgid "File size must be at least %s."
 msgstr "Die Dateigröße muss mindestens %s sein."
 
 # @ acf
-#: api/api-helpers.php:3654
+#: api/api-helpers.php:3922
 #, php-format
 msgid "File size must must not exceed %s."
 msgstr "Die Dateigröße darf %s nicht überschreiten."
 
 # @ acf
-#: api/api-helpers.php:3688
+#: api/api-helpers.php:3956
 #, php-format
 msgid "File type must be %s."
 msgstr "Der Dateityp muss %s sein."
 
-#: api/api-template.php:1073
+#: api/api-template.php:1092
 msgid "Spam Detected"
 msgstr "Spam entdeckt"
 
 # @ acf
-#: api/api-template.php:1216 core/media.php:56 pro/api/api-options-page.php:50
-#: pro/fields/gallery.php:586
+#: api/api-template.php:1235 pro/api/api-options-page.php:50
+#: pro/fields/gallery.php:588
 msgid "Update"
 msgstr "Aktualisieren"
 
 # @ acf
-#: api/api-template.php:1217
+#: api/api-template.php:1236
 msgid "Post updated"
 msgstr "Beitrag aktualisiert"
 
 # @ acf
-#: api/api-template.php:1285 core/field.php:133
+#: api/api-template.php:1304 core/field.php:133
 msgid "Content"
 msgstr "Inhalt"
 
-#: api/api-template.php:1350
+#: api/api-template.php:1369
 msgid "Validate Email"
 msgstr "E-Mail bestätigen"
 
@@ -1744,9 +1740,9 @@ msgid "jQuery"
 msgstr "jQuery"
 
 # @ acf
-#: core/field.php:137 fields/checkbox.php:223 fields/radio.php:292
-#: pro/fields/flexible-content.php:491 pro/fields/flexible-content.php:540
-#: pro/fields/repeater.php:459
+#: core/field.php:137 fields/checkbox.php:224 fields/radio.php:293
+#: pro/fields/clone.php:692 pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:544 pro/fields/repeater.php:459
 msgid "Layout"
 msgstr "Layout"
 
@@ -1785,15 +1781,24 @@ msgstr "Für %d Felder ist eine Aktualisierung notwendig"
 msgid "Restricted"
 msgstr "Eingeschränkt"
 
-# @ acf
-#: core/media.php:54 fields/select.php:36 fields/select.php:230
-#: fields/taxonomy.php:759
+#: core/media.php:54 fields/select.php:249
+msgctxt "verb"
 msgid "Select"
-msgstr "Auswahlmenü"
+msgstr "Auswählen"
+
+#: core/media.php:55
+msgctxt "verb"
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: core/media.php:56
+msgctxt "verb"
+msgid "Update"
+msgstr "Aktualisieren"
 
 # @ acf
 #: core/media.php:57 fields/file.php:49 fields/image.php:54
-#: pro/fields/gallery.php:56
+#: pro/fields/gallery.php:55
 msgid "Uploaded to this post"
 msgstr "Zu diesem Beitrag hochgeladen"
 
@@ -1804,69 +1809,89 @@ msgid "%s value is required"
 msgstr "%s Wert ist notwendig"
 
 # @ acf
-#: fields/checkbox.php:36 fields/taxonomy.php:754
+#: fields/checkbox.php:36 fields/taxonomy.php:767
 msgid "Checkbox"
 msgstr "Checkbox"
 
 # @ acf
-#: fields/checkbox.php:141
+#: fields/checkbox.php:142
 msgid "Toggle All"
 msgstr "Alle auswählen"
 
 # @ acf
-#: fields/checkbox.php:205 fields/radio.php:240 fields/select.php:417
+#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:446
 msgid "Choices"
 msgstr "Auswahlmöglichkeiten"
 
 # @ acf
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "Enter each choice on a new line."
 msgstr "Jede Auswahlmöglichkeit in separater Zeile eingeben."
 
 # @ acf
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "For more control, you may specify both a value and label like this:"
 msgstr ""
 "Für eine bessere Darstellung, können Sie auch einen Wert und dazu dessen "
 "Beschriftung definieren:"
 
 # @ acf
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "red : Red"
 msgstr "rot : Rot"
 
 # @ acf
-#: fields/checkbox.php:214 fields/color_picker.php:147 fields/email.php:124
-#: fields/number.php:150 fields/radio.php:283 fields/select.php:426
+#: fields/checkbox.php:215 fields/color_picker.php:147 fields/email.php:124
+#: fields/number.php:150 fields/radio.php:284 fields/select.php:455
 #: fields/text.php:148 fields/textarea.php:145 fields/true_false.php:115
 #: fields/url.php:117 fields/wysiwyg.php:379
 msgid "Default Value"
 msgstr "Standardwert"
 
 # @ acf
-#: fields/checkbox.php:215 fields/select.php:427
+#: fields/checkbox.php:216 fields/select.php:456
 msgid "Enter each default value on a new line"
 msgstr "Jeden Standardwert in einer neuen Zeile eingeben"
 
 # @ acf
-#: fields/checkbox.php:229 fields/radio.php:298
+#: fields/checkbox.php:230 fields/radio.php:299
 msgid "Vertical"
 msgstr "Vertikal"
 
 # @ acf
-#: fields/checkbox.php:230 fields/radio.php:299
+#: fields/checkbox.php:231 fields/radio.php:300
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: fields/checkbox.php:237
+#: fields/checkbox.php:238
 msgid "Toggle"
 msgstr "Auswählen"
 
-#: fields/checkbox.php:238
+#: fields/checkbox.php:239
 msgid "Prepend an extra checkbox to toggle all choices"
 msgstr ""
 "Hänge eine zusätzliche Checkbox an mit der man alle Optionen auswählen kann"
 
+# @ acf
+#: fields/checkbox.php:252 fields/file.php:220 fields/image.php:206
+#: fields/radio.php:307 fields/taxonomy.php:836
+msgid "Return Value"
+msgstr "Rückgabewert"
+
+# @ acf
+#: fields/checkbox.php:253 fields/file.php:221 fields/image.php:207
+#: fields/radio.php:308
+msgid "Specify the returned value on front end"
+msgstr "Legt den Rückgabewert für das Front-End fest"
+
+#: fields/checkbox.php:258 fields/radio.php:313 fields/select.php:526
+msgid "Value"
+msgstr "Wert"
+
+#: fields/checkbox.php:260 fields/radio.php:315 fields/select.php:528
+msgid "Both (Array)"
+msgstr "Beide (Array)"
+
 # @ acf
 #: fields/color_picker.php:36
 msgid "Color Picker"
@@ -1922,32 +1947,32 @@ msgid "Wk"
 msgstr "Wo."
 
 # @ acf
-#: fields/date_picker.php:201 fields/date_time_picker.php:245
-#: fields/time_picker.php:131
+#: fields/date_picker.php:195 fields/date_time_picker.php:184
+#: fields/time_picker.php:126
 msgid "Display Format"
 msgstr "Darstellungs-Format"
 
 # @ acf
-#: fields/date_picker.php:202 fields/date_time_picker.php:246
-#: fields/time_picker.php:132
+#: fields/date_picker.php:196 fields/date_time_picker.php:185
+#: fields/time_picker.php:127
 msgid "The format displayed when editing a post"
 msgstr "Das Datums-Format für die Anzeige in der Bearbeitungs-Ansicht"
 
 # @ acf
-#: fields/date_picker.php:216 fields/date_time_picker.php:261
-#: fields/post_object.php:426 fields/relationship.php:766
-#: fields/time_picker.php:145
+#: fields/date_picker.php:210 fields/date_time_picker.php:200
+#: fields/post_object.php:455 fields/relationship.php:783 fields/select.php:520
+#: fields/time_picker.php:140
 msgid "Return Format"
 msgstr "Rückgabewert"
 
 # @ acf
-#: fields/date_picker.php:217 fields/date_time_picker.php:262
-#: fields/time_picker.php:146
+#: fields/date_picker.php:211 fields/date_time_picker.php:201
+#: fields/time_picker.php:141
 msgid "The format returned via template functions"
 msgstr "Das Datums-Format für die Ausgabe in den Template-Funktionen"
 
 # @ acf
-#: fields/date_picker.php:232 fields/date_time_picker.php:277
+#: fields/date_picker.php:226 fields/date_time_picker.php:216
 msgid "Week Starts On"
 msgstr "Die Woche beginnt am"
 
@@ -2005,22 +2030,27 @@ msgctxt "Date Time Picker JS closeText"
 msgid "Done"
 msgstr "Fertig"
 
-#: fields/date_time_picker.php:55
+#: fields/date_time_picker.php:54
+msgctxt "Date Time Picker JS selectText"
+msgid "Select"
+msgstr "Auswählen"
+
+#: fields/date_time_picker.php:56
 msgctxt "Date Time Picker JS amText"
 msgid "AM"
 msgstr "vorm."
 
-#: fields/date_time_picker.php:56
+#: fields/date_time_picker.php:57
 msgctxt "Date Time Picker JS amTextShort"
 msgid "A"
 msgstr "vorm."
 
-#: fields/date_time_picker.php:59
+#: fields/date_time_picker.php:60
 msgctxt "Date Time Picker JS pmText"
 msgid "PM"
 msgstr "nachm."
 
-#: fields/date_time_picker.php:60
+#: fields/date_time_picker.php:61
 msgctxt "Date Time Picker JS pmTextShort"
 msgid "P"
 msgstr "nachm."
@@ -2031,7 +2061,7 @@ msgid "Email"
 msgstr "E-Mail"
 
 # @ acf
-#: fields/email.php:125 fields/number.php:151 fields/radio.php:284
+#: fields/email.php:125 fields/number.php:151 fields/radio.php:285
 #: fields/text.php:149 fields/textarea.php:146 fields/url.php:118
 #: fields/wysiwyg.php:380
 msgid "Appears when creating a new post"
@@ -2094,8 +2124,8 @@ msgstr "Dateiname"
 
 # @ acf
 #: fields/file.php:152 fields/file.php:253 fields/file.php:264
-#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:715
-#: pro/fields/gallery.php:748
+#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:707
+#: pro/fields/gallery.php:740
 msgid "File size"
 msgstr "Dateigröße"
 
@@ -2104,16 +2134,6 @@ msgstr "Dateigröße"
 msgid "Add File"
 msgstr "Datei hinzufügen"
 
-# @ acf
-#: fields/file.php:220 fields/image.php:206 fields/taxonomy.php:823
-msgid "Return Value"
-msgstr "Rückgabewert"
-
-# @ acf
-#: fields/file.php:221 fields/image.php:207
-msgid "Specify the returned value on front end"
-msgstr "Legt den Rückgabewert für das Front-End fest"
-
 # @ acf
 #: fields/file.php:226
 msgid "File Array"
@@ -2130,22 +2150,22 @@ msgid "File ID"
 msgstr "Datei-ID"
 
 # @ acf
-#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:678
+#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:670
 msgid "Library"
 msgstr "Medienübersicht"
 
 # @ acf
-#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:679
+#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:671
 msgid "Limit the media library choice"
 msgstr "Beschränkt die Auswahl in der Medienübersicht"
 
 # @ acf
-#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:685
+#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:677
 msgid "Uploaded to post"
 msgstr "Für den Beitrag hochgeladen"
 
 # @ acf
-#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:692
+#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:684
 msgid "Minimum"
 msgstr "Minimum"
 
@@ -2157,17 +2177,17 @@ msgstr ""
 "erfüllen"
 
 # @ acf
-#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:725
+#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:717
 msgid "Maximum"
 msgstr "Maximum"
 
 # @ acf
-#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:758
+#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:750
 msgid "Allowed file types"
 msgstr "Erlaubte Datei-Formate"
 
 # @ acf
-#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:759
+#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:751
 msgid "Comma separated list. Leave blank for all types"
 msgstr ""
 "Komma separierte Liste; ein leeres Feld bedeutet alle Dateiformate sind "
@@ -2189,7 +2209,7 @@ msgid "Sorry, this browser does not support geolocation"
 msgstr "Dieser Browser unterstützt keine Geo-Lokation"
 
 # @ acf
-#: fields/google-map.php:133 fields/relationship.php:725
+#: fields/google-map.php:133 fields/relationship.php:742
 msgid "Search"
 msgstr "Suchen"
 
@@ -2230,7 +2250,7 @@ msgstr "Legt die Zoomstufe der Karte fest"
 
 # @ acf
 #: fields/google-map.php:203 fields/image.php:257 fields/image.php:290
-#: fields/oembed.php:275 pro/fields/gallery.php:704 pro/fields/gallery.php:737
+#: fields/oembed.php:275 pro/fields/gallery.php:696 pro/fields/gallery.php:729
 msgid "Height"
 msgstr "Höhe"
 
@@ -2250,12 +2270,12 @@ msgid "Select Image"
 msgstr "Bild auswählen"
 
 # @ acf
-#: fields/image.php:52 pro/fields/gallery.php:54
+#: fields/image.php:52 pro/fields/gallery.php:53
 msgid "Edit Image"
 msgstr "Bild bearbeiten"
 
 # @ acf
-#: fields/image.php:53 pro/fields/gallery.php:55
+#: fields/image.php:53 pro/fields/gallery.php:54
 msgid "Update Image"
 msgstr "Bild aktualisieren"
 
@@ -2265,7 +2285,7 @@ msgid "All images"
 msgstr "Alle Bilder"
 
 # @ acf
-#: fields/image.php:144 pro/fields/gallery.php:359 pro/fields/gallery.php:542
+#: fields/image.php:144 pro/fields/gallery.php:358 pro/fields/gallery.php:546
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -2295,18 +2315,18 @@ msgid "Image ID"
 msgstr "Bild-ID"
 
 # @ acf
-#: fields/image.php:221 pro/fields/gallery.php:655
+#: fields/image.php:221
 msgid "Preview Size"
 msgstr "Maße der Vorschau"
 
 # @ acf
-#: fields/image.php:222 pro/fields/gallery.php:656
+#: fields/image.php:222
 msgid "Shown when entering data"
 msgstr "Legt fest welche Maße die Vorschau in der Bearbeitungs-Ansicht hat"
 
 # @ acf
-#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:693
-#: pro/fields/gallery.php:726
+#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:685
+#: pro/fields/gallery.php:718
 msgid "Restrict which images can be uploaded"
 msgstr ""
 "Erlaubt nur das Hochladen von Bildern die die angegebenen Eigenschaften "
@@ -2314,7 +2334,7 @@ msgstr ""
 
 # @ acf
 #: fields/image.php:249 fields/image.php:282 fields/oembed.php:264
-#: pro/fields/gallery.php:696 pro/fields/gallery.php:729
+#: pro/fields/gallery.php:688 pro/fields/gallery.php:721
 msgid "Width"
 msgstr "Breite"
 
@@ -2418,43 +2438,47 @@ msgid "Embed Size"
 msgstr "Maße"
 
 # @ acf
-#: fields/page_link.php:197
+#: fields/page_link.php:192
 msgid "Archives"
 msgstr "Archive"
 
 # @ acf
-#: fields/page_link.php:506 fields/post_object.php:370
-#: fields/relationship.php:692
+#: fields/page_link.php:500 fields/post_object.php:399
+#: fields/relationship.php:709
 msgid "Filter by Post Type"
 msgstr "Nach Post Types filtern"
 
 # @ acf
-#: fields/page_link.php:514 fields/post_object.php:378
-#: fields/relationship.php:700
+#: fields/page_link.php:508 fields/post_object.php:407
+#: fields/relationship.php:717
 msgid "All post types"
 msgstr "Alle verfügbaren Post Types"
 
 # @ acf
-#: fields/page_link.php:520 fields/post_object.php:384
-#: fields/relationship.php:706
+#: fields/page_link.php:514 fields/post_object.php:413
+#: fields/relationship.php:723
 msgid "Filter by Taxonomy"
 msgstr "Nach Taxonomien filtern"
 
 # @ acf
-#: fields/page_link.php:528 fields/post_object.php:392
-#: fields/relationship.php:714
+#: fields/page_link.php:522 fields/post_object.php:421
+#: fields/relationship.php:731
 msgid "All taxonomies"
 msgstr "Alle Taxonomien"
 
 # @ acf
-#: fields/page_link.php:534 fields/post_object.php:398 fields/radio.php:249
-#: fields/select.php:435 fields/taxonomy.php:767 fields/user.php:411
+#: fields/page_link.php:528 fields/post_object.php:427 fields/radio.php:250
+#: fields/select.php:464 fields/taxonomy.php:780 fields/user.php:394
 msgid "Allow Null?"
 msgstr "NULL-Werte zulassen?"
 
+#: fields/page_link.php:542
+msgid "Allow Archives URLs"
+msgstr "Archiv-URL's zulassen"
+
 # @ acf
-#: fields/page_link.php:548 fields/post_object.php:412 fields/select.php:449
-#: fields/user.php:425
+#: fields/page_link.php:556 fields/post_object.php:441 fields/select.php:478
+#: fields/user.php:408
 msgid "Select multiple values?"
 msgstr "Mehrere Werte auswählbar?"
 
@@ -2464,13 +2488,13 @@ msgid "Password"
 msgstr "Passwort"
 
 # @ acf
-#: fields/post_object.php:36 fields/post_object.php:431
-#: fields/relationship.php:771
+#: fields/post_object.php:36 fields/post_object.php:460
+#: fields/relationship.php:788
 msgid "Post Object"
 msgstr "Beitrags-Objekt"
 
 # @ acf
-#: fields/post_object.php:432 fields/relationship.php:772
+#: fields/post_object.php:461 fields/relationship.php:789
 msgid "Post ID"
 msgstr "Beitrags-ID"
 
@@ -2480,24 +2504,24 @@ msgid "Radio Button"
 msgstr "Radio-Button"
 
 # @ acf
-#: fields/radio.php:263
+#: fields/radio.php:264
 msgid "Other"
 msgstr "Sonstige"
 
 # @ acf
-#: fields/radio.php:267
+#: fields/radio.php:268
 msgid "Add 'other' choice to allow for custom values"
 msgstr ""
 "Fügt die Option 'Sonstige' hinzu welche erlaubt benutzerdefinierte Werte "
 "hinzuzufügen"
 
 # @ acf
-#: fields/radio.php:273
+#: fields/radio.php:274
 msgid "Save Other"
 msgstr "'Sonstige' speichern"
 
 # @ acf
-#: fields/radio.php:277
+#: fields/radio.php:278
 msgid "Save 'other' values to the field's choices"
 msgstr "Füge 'Sonstige'-Werte zu den Auswahl Optionen hinzu"
 
@@ -2527,61 +2551,66 @@ msgid "No matches found"
 msgstr "Keine Übereinstimmung gefunden"
 
 # @ acf
-#: fields/relationship.php:573
+#: fields/relationship.php:590
 msgid "Search..."
 msgstr "Suchen..."
 
 # @ acf
-#: fields/relationship.php:582
+#: fields/relationship.php:599
 msgid "Select post type"
 msgstr "Beitrag-Typ auswählen"
 
 # @ acf
-#: fields/relationship.php:595
+#: fields/relationship.php:612
 msgid "Select taxonomy"
 msgstr "Taxonomie auswählen"
 
 # @ acf
-#: fields/relationship.php:727 fields/taxonomy.php:36 fields/taxonomy.php:737
+#: fields/relationship.php:744 fields/taxonomy.php:36 fields/taxonomy.php:750
 msgid "Taxonomy"
 msgstr "Taxonomie"
 
 # @ acf
-#: fields/relationship.php:734
+#: fields/relationship.php:751
 msgid "Elements"
 msgstr "Elemente"
 
 # @ acf
-#: fields/relationship.php:735
+#: fields/relationship.php:752
 msgid "Selected elements will be displayed in each result"
 msgstr "Die ausgewählten Elemente werden in jedem Ergebnis mit angezeigt"
 
 # @ acf
-#: fields/relationship.php:746
+#: fields/relationship.php:763
 msgid "Minimum posts"
 msgstr "Min. Anzahl der Beiträge"
 
 # @ acf
-#: fields/relationship.php:755
+#: fields/relationship.php:772
 msgid "Maximum posts"
 msgstr "Max. Anzahl der Beiträge"
 
 # @ acf
-#: fields/relationship.php:859 pro/fields/gallery.php:831
+#: fields/relationship.php:876 pro/fields/gallery.php:823
 #, php-format
 msgid "%s requires at least %s selection"
 msgid_plural "%s requires at least %s selections"
 msgstr[0] "%s benötigt mindestens %s Selektion"
 msgstr[1] "%s benötigt mindestens %s Selektionen"
 
-#: fields/select.php:50
+#: fields/select.php:36 fields/taxonomy.php:772
+msgctxt "noun"
+msgid "Select"
+msgstr "Auswahl"
+
+#: fields/select.php:49
 msgctxt "Select2 JS matches_1"
 msgid "One result is available, press enter to select it."
 msgstr ""
 "Es ist ein Ergebnis verfügbar, drücken Sie die Eingabetaste um es "
 "auszuwählen."
 
-#: fields/select.php:51
+#: fields/select.php:50
 #, php-format
 msgctxt "Select2 JS matches_n"
 msgid "%d results are available, use up and down arrow keys to navigate."
@@ -2589,69 +2618,73 @@ msgstr ""
 "Es sind %d Ergebnisse verfügbar, benutzen Sie die Pfeiltasten um nach oben "
 "und unten zu navigieren."
 
-#: fields/select.php:52
+#: fields/select.php:51
 msgctxt "Select2 JS matches_0"
 msgid "No matches found"
 msgstr "Keine Übereinstimmungen gefunden"
 
-#: fields/select.php:53
+#: fields/select.php:52
 msgctxt "Select2 JS input_too_short_1"
 msgid "Please enter 1 or more characters"
 msgstr "Geben Sie bitte ein oder mehr Zeichen ein"
 
-#: fields/select.php:54
+#: fields/select.php:53
 #, php-format
 msgctxt "Select2 JS input_too_short_n"
 msgid "Please enter %d or more characters"
 msgstr "Geben Sie bitte %d oder mehr Zeichen ein"
 
-#: fields/select.php:55
+#: fields/select.php:54
 msgctxt "Select2 JS input_too_long_1"
 msgid "Please delete 1 character"
 msgstr "Löschen Sie bitte ein Zeichen"
 
-#: fields/select.php:56
+#: fields/select.php:55
 #, php-format
 msgctxt "Select2 JS input_too_long_n"
 msgid "Please delete %d characters"
 msgstr "Löschen Sie bitte %d Zeichen"
 
-#: fields/select.php:57
+#: fields/select.php:56
 msgctxt "Select2 JS selection_too_long_1"
 msgid "You can only select 1 item"
 msgstr "Sie können nur ein Element auswählen"
 
-#: fields/select.php:58
+#: fields/select.php:57
 #, php-format
 msgctxt "Select2 JS selection_too_long_n"
 msgid "You can only select %d items"
 msgstr "Sie können nur %d Elemente auswählen"
 
-#: fields/select.php:59
+#: fields/select.php:58
 msgctxt "Select2 JS load_more"
 msgid "Loading more results&hellip;"
 msgstr "Mehr Ergebnisse laden&hellip;"
 
-#: fields/select.php:60
+#: fields/select.php:59
 msgctxt "Select2 JS searching"
 msgid "Searching&hellip;"
 msgstr "Suchen&hellip;"
 
-#: fields/select.php:61
+#: fields/select.php:60
 msgctxt "Select2 JS load_fail"
 msgid "Loading failed"
 msgstr "Laden fehlgeschlagen"
 
 # @ acf
-#: fields/select.php:463
+#: fields/select.php:492
 msgid "Stylised UI"
 msgstr "Modernes Auswahlfeld"
 
 # @ acf
-#: fields/select.php:477
+#: fields/select.php:506
 msgid "Use AJAX to lazy load choices?"
 msgstr "AJAX zum Laden der Einträge aktivieren"
 
+#: fields/select.php:521
+msgid "Specify the value returned"
+msgstr "Legen Sie den Rückgabewert fest"
+
 # @ acf
 #: fields/tab.php:36
 msgid "Tab"
@@ -2700,106 +2733,102 @@ msgid "Use this field as an end-point and start a new group of tabs"
 msgstr "Benutze das Feld als einen Abschluss und starte eine Gruppe an Tabs"
 
 # @ acf
-#: fields/taxonomy.php:706
+#: fields/taxonomy.php:719
 msgid "None"
 msgstr "Nur Text"
 
 # @ acf
-#: fields/taxonomy.php:738
+#: fields/taxonomy.php:751
 msgid "Select the taxonomy to be displayed"
 msgstr "Wähle die Taxonomie, welche angezeigt werden soll"
 
 # @ acf
-#: fields/taxonomy.php:747
+#: fields/taxonomy.php:760
 msgid "Appearance"
 msgstr "Anzeige"
 
 # @ acf
-#: fields/taxonomy.php:748
+#: fields/taxonomy.php:761
 msgid "Select the appearance of this field"
 msgstr "Wähle das Aussehen für dieses Feld"
 
 # @ acf
-#: fields/taxonomy.php:753
+#: fields/taxonomy.php:766
 msgid "Multiple Values"
 msgstr "Mehrere Werte auswählen?"
 
 # @ acf
-#: fields/taxonomy.php:755
+#: fields/taxonomy.php:768
 msgid "Multi Select"
 msgstr "Auswahlmenü"
 
 # @ acf
-#: fields/taxonomy.php:757
+#: fields/taxonomy.php:770
 msgid "Single Value"
 msgstr "Einzelne Werte"
 
 # @ acf
-#: fields/taxonomy.php:758
+#: fields/taxonomy.php:771
 msgid "Radio Buttons"
 msgstr "Radio Button"
 
 # @ acf
-#: fields/taxonomy.php:781
+#: fields/taxonomy.php:794
 msgid "Create Terms"
 msgstr "Neue Einträge erlauben"
 
 # @ acf
-#: fields/taxonomy.php:782
+#: fields/taxonomy.php:795
 msgid "Allow new terms to be created whilst editing"
 msgstr "Erlaube das Erstellen neuer Einträge beim Editieren"
 
-#: fields/taxonomy.php:795
+#: fields/taxonomy.php:808
 msgid "Save Terms"
 msgstr "Einträge speichern"
 
 # @ acf
-#: fields/taxonomy.php:796
+#: fields/taxonomy.php:809
 msgid "Connect selected terms to the post"
 msgstr "Speichert die ausgewählten Einträge auch im Beitrag"
 
-#: fields/taxonomy.php:809
+#: fields/taxonomy.php:822
 msgid "Load Terms"
 msgstr "Einträge laden"
 
-#: fields/taxonomy.php:810
+#: fields/taxonomy.php:823
 msgid "Load value from posts terms"
 msgstr "Den Wert von den Einträgen des Beitrags laden"
 
 # @ acf
-#: fields/taxonomy.php:828
+#: fields/taxonomy.php:841
 msgid "Term Object"
 msgstr "Begriffs-Objekt"
 
 # @ acf
-#: fields/taxonomy.php:829
+#: fields/taxonomy.php:842
 msgid "Term ID"
 msgstr "Begriffs-ID"
 
 # @ acf
-#: fields/taxonomy.php:888
+#: fields/taxonomy.php:901
 #, php-format
 msgid "User unable to add new %s"
 msgstr "Der Benutzer kann keine neue %s hinzufügen"
 
 # @ acf
-#: fields/taxonomy.php:901
+#: fields/taxonomy.php:914
 #, php-format
 msgid "%s already exists"
 msgstr "%s ist bereits vorhanden"
 
 # @ acf
-#: fields/taxonomy.php:942
+#: fields/taxonomy.php:955
 #, php-format
 msgid "%s added"
 msgstr "%s hinzugefügt"
 
-#: fields/taxonomy.php:976
-msgid "Parent"
-msgstr "Übergeordnet"
-
 # @ acf
-#: fields/taxonomy.php:987
+#: fields/taxonomy.php:1000
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -2858,12 +2887,12 @@ msgid "Value must be a valid URL"
 msgstr "Bitte eine gültige URL eingeben"
 
 # @ acf
-#: fields/user.php:396
+#: fields/user.php:379
 msgid "Filter by role"
 msgstr "Filtere nach Benutzerrollen"
 
 # @ acf
-#: fields/user.php:404
+#: fields/user.php:387
 msgid "All user roles"
 msgstr "Alle Benutzerrollen"
 
@@ -2932,7 +2961,7 @@ msgid "Advanced Custom Fields PRO"
 msgstr "Advanced Custom Fields PRO"
 
 # @ acf
-#: pro/acf-pro.php:191
+#: pro/acf-pro.php:192
 msgid "Flexible Content requires at least 1 layout"
 msgstr "Flexibler Inhalt benötigt mindestens ein Layout"
 
@@ -2967,18 +2996,11 @@ msgid "Create a Custom Field Group"
 msgstr "Erstelle eine Feld-Gruppe"
 
 # @ acf
-#: pro/admin/settings-updates.php:137
+#: pro/admin/settings-updates.php:87
 msgid "<b>Error</b>. Could not connect to update server"
 msgstr ""
 "<b>Fehler</b>. Verbindung zum Update-Server konnte nicht hergestellt werden."
 
-# @ acf
-#: pro/admin/settings-updates.php:267 pro/admin/settings-updates.php:338
-msgid "<b>Connection Error</b>. Sorry, please try again"
-msgstr ""
-"<b>Verbindungsfehler</b>. Entschuldigung, versuchen Sie es bitte später noch "
-"einmal"
-
 # @ acf
 #: pro/admin/views/settings-updates.php:11
 msgid "Deactivate License"
@@ -3057,7 +3079,7 @@ msgstr "Aktualisierungs-Hinweis"
 msgid "Options"
 msgstr "Optionen"
 
-#: pro/core/updates.php:194
+#: pro/core/updates.php:206
 #, php-format
 msgid ""
 "To enable updates, please enter your license key on the <a href=\"%s"
@@ -3069,6 +3091,80 @@ msgstr ""
 "besitzen informieren Sie sich bitte hier hinsichtlich der <a href=„%s“ "
 "target=„_blank“>Preise und Einzelheiten</a>."
 
+#: pro/fields/clone.php:36
+msgctxt "noun"
+msgid "Clone"
+msgstr "Klon"
+
+#: pro/fields/clone.php:663
+msgid "Select one or more fields you wish to clone"
+msgstr "Wählen Sie ein oder mehrere Felder aus die Sie klonen möchten"
+
+# @ acf
+#: pro/fields/clone.php:678
+msgid "Display"
+msgstr "Anzeige"
+
+#: pro/fields/clone.php:679
+msgid "Specify the style used to render the clone field"
+msgstr "Geben Sie den Stil an mit dem das Klon-Feld angezeigt werden soll"
+
+#: pro/fields/clone.php:684
+msgid "Group (displays selected fields in a group within this field)"
+msgstr ""
+"Gruppe (zeigt die ausgewählten Felder in einer Gruppe innerhalb dieses "
+"Feldes an)"
+
+#: pro/fields/clone.php:685
+msgid "Seamless (replaces this field with selected fields)"
+msgstr "Nahtlos (ersetzt dieses Feld mit den ausgewählten Feldern)"
+
+#: pro/fields/clone.php:693
+msgid "Specify the style used to render the selected fields"
+msgstr ""
+"Geben Sie den Stil an mit dem die ausgewählten Felder angezeigt werden sollen"
+
+# @ acf
+#: pro/fields/clone.php:698 pro/fields/flexible-content.php:555
+#: pro/fields/repeater.php:467
+msgid "Block"
+msgstr "Block"
+
+# @ acf
+#: pro/fields/clone.php:699 pro/fields/flexible-content.php:554
+#: pro/fields/repeater.php:466
+msgid "Table"
+msgstr "Tabelle"
+
+# @ acf
+#: pro/fields/clone.php:700 pro/fields/flexible-content.php:556
+#: pro/fields/repeater.php:468
+msgid "Row"
+msgstr "Reihe"
+
+#: pro/fields/clone.php:706
+#, php-format
+msgid "Labels will be displayed as %s"
+msgstr "Bezeichnungen werden als %s angezeigt"
+
+#: pro/fields/clone.php:709
+msgid "Prefix Field Labels"
+msgstr "Präfix für Feld-Beschriftungen"
+
+#: pro/fields/clone.php:724
+#, php-format
+msgid "Values will be saved as %s"
+msgstr "Werte werden als %s gespeichert"
+
+#: pro/fields/clone.php:727
+msgid "Prefix Field Names"
+msgstr "Präfix für Feld-Namen"
+
+#: pro/fields/clone.php:883
+#, php-format
+msgid "All fields from %s field group"
+msgstr "Alle Felder von Feld-Gruppe %s"
+
 # @ acf
 #: pro/fields/flexible-content.php:36
 msgid "Flexible Content"
@@ -3125,87 +3221,72 @@ msgid "{required} {label} {identifier} required (min {min})"
 msgstr "{required} {label} {identifier} erforderlich (min {min})"
 
 # @ acf
-#: pro/fields/flexible-content.php:216
+#: pro/fields/flexible-content.php:220
 #, php-format
 msgid "Click the \"%s\" button below to start creating your layout"
 msgstr "Klicke \"%s\" zum Erstellen des Layouts"
 
 # @ acf
-#: pro/fields/flexible-content.php:346
+#: pro/fields/flexible-content.php:350
 msgid "Add layout"
 msgstr "Layout hinzufügen"
 
 # @ acf
-#: pro/fields/flexible-content.php:349
+#: pro/fields/flexible-content.php:353
 msgid "Remove layout"
 msgstr "Layout entfernen"
 
-#: pro/fields/flexible-content.php:352 pro/fields/repeater.php:304
+#: pro/fields/flexible-content.php:356 pro/fields/repeater.php:304
 msgid "Click to toggle"
 msgstr "Zum Auswählen anklicken"
 
 # @ acf
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder Layout"
 msgstr "Layout sortieren"
 
 # @ acf
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder"
 msgstr "Sortieren"
 
 # @ acf
-#: pro/fields/flexible-content.php:494
+#: pro/fields/flexible-content.php:498
 msgid "Delete Layout"
 msgstr "Layout löschen"
 
 # @ acf
-#: pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:499
 msgid "Duplicate Layout"
 msgstr "Layout duplizieren"
 
 # @ acf
-#: pro/fields/flexible-content.php:496
+#: pro/fields/flexible-content.php:500
 msgid "Add New Layout"
 msgstr "Neues Layout hinzufügen"
 
 # @ acf
-#: pro/fields/flexible-content.php:550 pro/fields/repeater.php:466
-msgid "Table"
-msgstr "Tabelle"
-
-# @ acf
-#: pro/fields/flexible-content.php:551 pro/fields/repeater.php:467
-msgid "Block"
-msgstr "Block"
-
-# @ acf
-#: pro/fields/flexible-content.php:552 pro/fields/repeater.php:468
-msgid "Row"
-msgstr "Reihe"
-
-# @ acf
-#: pro/fields/flexible-content.php:567
+#: pro/fields/flexible-content.php:571
 msgid "Min"
 msgstr "Min"
 
 # @ acf
-#: pro/fields/flexible-content.php:580
+#: pro/fields/flexible-content.php:584
 msgid "Max"
 msgstr "Max"
 
 # @ acf
-#: pro/fields/flexible-content.php:608 pro/fields/repeater.php:475
+#: pro/fields/flexible-content.php:612 pro/fields/repeater.php:475
 msgid "Button Label"
 msgstr "Button-Beschriftung"
 
 # @ acf
-#: pro/fields/flexible-content.php:617
+#: pro/fields/flexible-content.php:621
 msgid "Minimum Layouts"
 msgstr "Minimum Layouts"
 
 # @ acf
-#: pro/fields/flexible-content.php:626
+#: pro/fields/flexible-content.php:630
 msgid "Maximum Layouts"
 msgstr "Maximum Layouts"
 
@@ -3215,86 +3296,86 @@ msgid "Gallery"
 msgstr "Galerie"
 
 # @ acf
-#: pro/fields/gallery.php:53
+#: pro/fields/gallery.php:52
 msgid "Add Image to Gallery"
 msgstr "Bild zur Galerie hinzufügen"
 
 # @ acf
-#: pro/fields/gallery.php:57
+#: pro/fields/gallery.php:56
 msgid "Maximum selection reached"
 msgstr "Maximale Auswahl erreicht"
 
 # @ acf
-#: pro/fields/gallery.php:337
+#: pro/fields/gallery.php:336
 msgid "Length"
 msgstr "Länge"
 
-#: pro/fields/gallery.php:380
+#: pro/fields/gallery.php:379
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: pro/fields/gallery.php:389
+#: pro/fields/gallery.php:388
 msgid "Alt Text"
 msgstr "Alt Text"
 
 # @ acf
-#: pro/fields/gallery.php:557
+#: pro/fields/gallery.php:559
 msgid "Add to gallery"
 msgstr "Zur Galerie hinzufügen"
 
 # @ acf
-#: pro/fields/gallery.php:561
+#: pro/fields/gallery.php:563
 msgid "Bulk actions"
 msgstr "Massenverarbeitung"
 
 # @ acf
-#: pro/fields/gallery.php:562
+#: pro/fields/gallery.php:564
 msgid "Sort by date uploaded"
 msgstr "Sortiere nach Upload-Datum"
 
 # @ acf
-#: pro/fields/gallery.php:563
+#: pro/fields/gallery.php:565
 msgid "Sort by date modified"
 msgstr "Sortiere nach Änderungs-Datum"
 
 # @ acf
-#: pro/fields/gallery.php:564
+#: pro/fields/gallery.php:566
 msgid "Sort by title"
 msgstr "Sortiere nach Titel"
 
 # @ acf
-#: pro/fields/gallery.php:565
+#: pro/fields/gallery.php:567
 msgid "Reverse current order"
 msgstr "Aktuelle Sortierung umkehren"
 
 # @ acf
-#: pro/fields/gallery.php:583
+#: pro/fields/gallery.php:585
 msgid "Close"
 msgstr "Schließen"
 
 # @ acf
-#: pro/fields/gallery.php:637
+#: pro/fields/gallery.php:639
 msgid "Minimum Selection"
 msgstr "Minimale Auswahl"
 
 # @ acf
-#: pro/fields/gallery.php:646
+#: pro/fields/gallery.php:648
 msgid "Maximum Selection"
 msgstr "Maximale Auswahl"
 
-#: pro/fields/gallery.php:665
+#: pro/fields/gallery.php:657
 msgid "Insert"
 msgstr "Einfügen"
 
-#: pro/fields/gallery.php:666
+#: pro/fields/gallery.php:658
 msgid "Specify where new attachments are added"
 msgstr "Geben Sie an wo neue Anhänge hinzugefügt werden"
 
-#: pro/fields/gallery.php:670
+#: pro/fields/gallery.php:662
 msgid "Append to the end"
 msgstr "Anhängen"
 
-#: pro/fields/gallery.php:671
+#: pro/fields/gallery.php:663
 msgid "Prepend to the beginning"
 msgstr "Voranstellen"
 
@@ -3368,6 +3449,44 @@ msgstr "Elliot Condon"
 msgid "http://www.elliotcondon.com/"
 msgstr "http://www.elliotcondon.com/"
 
+# @ acf
+#~ msgid "<b>Success</b>. Import tool added %s field groups: %s"
+#~ msgstr "<b>Erfolgreich</b>. Der Import hat %s Feld-Gruppen hinzugefügt: %s"
+
+# @ acf
+#~ msgid ""
+#~ "<b>Warning</b>. Import tool detected %s field groups already exist and "
+#~ "have been ignored: %s"
+#~ msgstr ""
+#~ "<b>Warnung</b>. Der Import hat %s Feld-Gruppen erkannt, die schon "
+#~ "vorhanden sind und diese ignoriert: %s"
+
+# @ acf
+#~ msgid "Upgrade ACF"
+#~ msgstr "Aktualisiere ACF"
+
+# @ acf
+#~ msgid "Upgrade"
+#~ msgstr "Aktualisieren"
+
+# @ acf
+#~ msgid ""
+#~ "The following sites require a DB upgrade. Check the ones you want to "
+#~ "update and then click “Upgrade Database”."
+#~ msgstr ""
+#~ "Die folgenden Seiten erfordern eine Datenbank- Aktualisierung. Markieren "
+#~ "Sie die gewünschten Seiten und klicken \\\"Aktualisiere Datenbank\\\"."
+
+# @ acf
+#~ msgid "Select"
+#~ msgstr "Auswahlmenü"
+
+# @ acf
+#~ msgid "<b>Connection Error</b>. Sorry, please try again"
+#~ msgstr ""
+#~ "<b>Verbindungsfehler</b>. Entschuldigung, versuchen Sie es bitte später "
+#~ "noch einmal"
+
 # @ acf
 #~ msgid "Done"
 #~ msgstr "Fertig"
@@ -3477,10 +3596,6 @@ msgstr "http://www.elliotcondon.com/"
 #~ msgid "Warning"
 #~ msgstr "Warnung"
 
-# @ acf
-#~ msgid "Display"
-#~ msgstr "Anzeige"
-
 # @ acf
 #~ msgid "Show Field Keys"
 #~ msgstr "Zeige Feld-Schlüssel"
diff --git a/lang/acf-fa_IR.mo b/lang/acf-fa_IR.mo
index c9a1c35..aefb8d9 100644
Binary files a/lang/acf-fa_IR.mo and b/lang/acf-fa_IR.mo differ
diff --git a/lang/acf-fa_IR.po b/lang/acf-fa_IR.po
index 99cd0d6..0be3807 100644
--- a/lang/acf-fa_IR.po
+++ b/lang/acf-fa_IR.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Advanced Custom Fields Pro v5.2.9\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
-"POT-Creation-Date: 2015-11-19 10:59+0330\n"
-"PO-Revision-Date: 2016-04-07 10:30+1000\n"
+"POT-Creation-Date: 2016-08-06 19:58+0430\n"
+"PO-Revision-Date: 2016-08-06 20:09+0430\n"
 "Last-Translator: Elliot Condon <e@elliotcondon.com>\n"
 "Language-Team: Kamel Kimiaei Fard <Kamel.Kimiaei.Fard@gmail.com>\n"
 "Language: fa\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.1\n"
+"X-Generator: Poedit 1.8.8\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
 "esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
@@ -22,95 +22,95 @@ msgstr ""
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SearchPathExcluded-0: *.js\n"
 
-#: acf.php:63
+#: acf.php:60
 msgid "Advanced Custom Fields"
 msgstr "زمینه‌های دلخواه پیشرفته"
 
-#: acf.php:264 admin/admin.php:61
+#: acf.php:271 admin/admin.php:61
 msgid "Field Groups"
 msgstr "گروه‌های زمینه"
 
-#: acf.php:265
+#: acf.php:272
 msgid "Field Group"
 msgstr "گروه زمینه"
 
-#: acf.php:266 acf.php:298 admin/admin.php:62
-#: pro/fields/flexible-content.php:505
+#: acf.php:273 acf.php:305 admin/admin.php:62
+#: pro/fields/flexible-content.php:500
 msgid "Add New"
 msgstr "افزودن"
 
-#: acf.php:267
+#: acf.php:274
 msgid "Add New Field Group"
 msgstr "افزودن گروه زمینه جدید"
 
-#: acf.php:268
+#: acf.php:275
 msgid "Edit Field Group"
 msgstr "ویرایش گروه زمینه"
 
-#: acf.php:269
+#: acf.php:276
 msgid "New Field Group"
 msgstr "گروه زمینه جدید"
 
-#: acf.php:270
+#: acf.php:277
 msgid "View Field Group"
 msgstr "مشاهده گروه زمینه"
 
-#: acf.php:271
+#: acf.php:278
 msgid "Search Field Groups"
 msgstr "جستجوی گروه های زمینه"
 
-#: acf.php:272
+#: acf.php:279
 msgid "No Field Groups found"
 msgstr "گروه زمینه ای یافت نشد"
 
-#: acf.php:273
+#: acf.php:280
 msgid "No Field Groups found in Trash"
 msgstr "گروه زمینه ای در زباله دان یافت نشد"
 
-#: acf.php:296 admin/field-group.php:182 admin/field-group.php:213
-#: admin/field-groups.php:528
+#: acf.php:303 admin/field-group.php:182 admin/field-group.php:280
+#: admin/field-groups.php:528 pro/fields/clone.php:679
 msgid "Fields"
 msgstr "زمینه ها"
 
-#: acf.php:297
+#: acf.php:304
 msgid "Field"
 msgstr "زمینه"
 
-#: acf.php:299
+#: acf.php:306
 msgid "Add New Field"
 msgstr "زمینه جدید"
 
-#: acf.php:300
+#: acf.php:307
 msgid "Edit Field"
 msgstr "ویرایش زمینه"
 
-#: acf.php:301 admin/views/field-group-fields.php:18
+#: acf.php:308 admin/views/field-group-fields.php:54
 #: admin/views/settings-info.php:111
 msgid "New Field"
 msgstr "زمینه جدید"
 
-#: acf.php:302
+#: acf.php:309
 msgid "View Field"
 msgstr "نمایش زمینه"
 
-#: acf.php:303
+#: acf.php:310
 msgid "Search Fields"
 msgstr "جستجوی گروه های زمینه"
 
-#: acf.php:304
+#: acf.php:311
 msgid "No Fields found"
 msgstr "گروه زمینه ای یافت نشد"
 
-#: acf.php:305
+#: acf.php:312
 msgid "No Fields found in Trash"
 msgstr "گروه زمینه ای در زباله دان یافت نشد"
 
-#: acf.php:344 admin/field-group.php:283 admin/field-groups.php:586
+#: acf.php:351 admin/field-group.php:395 admin/field-groups.php:585
 #: admin/views/field-group-options.php:13
 msgid "Disabled"
 msgstr "غیرفعال"
 
-#: acf.php:349
+#: acf.php:356
 #, php-format
 msgid "Disabled <span class=\"count\">(%s)</span>"
 msgid_plural "Disabled <span class=\"count\">(%s)</span>"
@@ -148,151 +148,151 @@ msgstr "گروه زمینه برنامه ریزی انتشار پیدا کرده
 msgid "Field group draft updated."
 msgstr "پیش نویش گروه زمینه بروز شد."
 
-#: admin/field-group.php:176
-msgid "Move to trash. Are you sure?"
-msgstr "انتقال به زباله دان، آیا شما مطمئنید؟"
-
-#: admin/field-group.php:177
-msgid "checked"
-msgstr "انتخاب شده"
-
-#: admin/field-group.php:178
-msgid "No toggle fields available"
-msgstr "هیچ زمینه شرط پذیری موجود نیست"
-
-#: admin/field-group.php:179
-msgid "Field group title is required"
-msgstr "عنوان گروه زمینه ضروری است"
-
-#: admin/field-group.php:180 api/api-field-group.php:615
-msgid "copy"
-msgstr "کپی"
-
-#: admin/field-group.php:181
-#: admin/views/field-group-field-conditional-logic.php:62
-#: admin/views/field-group-field-conditional-logic.php:162
-#: admin/views/field-group-locations.php:59
-#: admin/views/field-group-locations.php:135 api/api-helpers.php:3326
-msgid "or"
-msgstr "یا"
-
 #: admin/field-group.php:183
-msgid "Parent fields"
-msgstr "زمینه های مادر"
-
-#: admin/field-group.php:184
-msgid "Sibling fields"
-msgstr "زمینه های هدف"
-
-#: admin/field-group.php:185
-msgid "Move Custom Field"
-msgstr "جابجایی زمینه دلخواه"
-
-#: admin/field-group.php:186
-msgid "This field cannot be moved until its changes have been saved"
-msgstr "این زمینه قبل از اینکه ذخیره شود نمی تواند جابجا شود"
-
-#: admin/field-group.php:187
-msgid "Null"
-msgstr "خالی (null)"
-
-#: admin/field-group.php:188 core/input.php:128
-msgid "The changes you made will be lost if you navigate away from this page"
-msgstr "اگر از صفحه جاری خارج شوید ، تغییرات شما ذخیره نخواهند شد"
-
-#: admin/field-group.php:189
-msgid "The string \"field_\" may not be used at the start of a field name"
-msgstr "کلمه متنی \"field_\" نباید در ابتدای نام فیلد استفاده شود."
-
-#: admin/field-group.php:214
 msgid "Location"
 msgstr "مکان"
 
-#: admin/field-group.php:215
+#: admin/field-group.php:184
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: admin/field-group.php:253
+#: admin/field-group.php:274
+msgid "Move to trash. Are you sure?"
+msgstr "انتقال به زباله دان، آیا شما مطمئنید؟"
+
+#: admin/field-group.php:275
+msgid "checked"
+msgstr "انتخاب شده"
+
+#: admin/field-group.php:276
+msgid "No toggle fields available"
+msgstr "هیچ زمینه شرط پذیری موجود نیست"
+
+#: admin/field-group.php:277
+msgid "Field group title is required"
+msgstr "عنوان گروه زمینه ضروری است"
+
+#: admin/field-group.php:278 api/api-field-group.php:651
+msgid "copy"
+msgstr "کپی"
+
+#: admin/field-group.php:279
+#: admin/views/field-group-field-conditional-logic.php:62
+#: admin/views/field-group-field-conditional-logic.php:162
+#: admin/views/field-group-locations.php:59
+#: admin/views/field-group-locations.php:135 api/api-helpers.php:3952
+msgid "or"
+msgstr "یا"
+
+#: admin/field-group.php:281
+msgid "Parent fields"
+msgstr "زمینه های مادر"
+
+#: admin/field-group.php:282
+msgid "Sibling fields"
+msgstr "زمینه های هدف"
+
+#: admin/field-group.php:283
+msgid "Move Custom Field"
+msgstr "جابجایی زمینه دلخواه"
+
+#: admin/field-group.php:284
+msgid "This field cannot be moved until its changes have been saved"
+msgstr "این زمینه قبل از اینکه ذخیره شود نمی تواند جابجا شود"
+
+#: admin/field-group.php:285
+msgid "Null"
+msgstr "خالی (null)"
+
+#: admin/field-group.php:286 core/input.php:257
+msgid "The changes you made will be lost if you navigate away from this page"
+msgstr "اگر از صفحه جاری خارج شوید ، تغییرات شما ذخیره نخواهند شد"
+
+#: admin/field-group.php:287
+msgid "The string \"field_\" may not be used at the start of a field name"
+msgstr "کلمه متنی \"field_\" نباید در ابتدای نام فیلد استفاده شود."
+
+#: admin/field-group.php:365
 msgid "Field Keys"
 msgstr "کایدهای زمینه"
 
-#: admin/field-group.php:283 admin/views/field-group-options.php:12
+#: admin/field-group.php:395 admin/views/field-group-options.php:12
 msgid "Active"
 msgstr "فعال"
 
-#: admin/field-group.php:752
+#: admin/field-group.php:842
 msgid "Front Page"
 msgstr "برگه نخست"
 
-#: admin/field-group.php:753
+#: admin/field-group.php:843
 msgid "Posts Page"
 msgstr "برگه ی نوشته ها"
 
-#: admin/field-group.php:754
+#: admin/field-group.php:844
 msgid "Top Level Page (no parent)"
 msgstr "بالاترین سطح برگه(بدون والد)"
 
-#: admin/field-group.php:755
+#: admin/field-group.php:845
 msgid "Parent Page (has children)"
 msgstr "برگه مادر (دارای زیر مجموعه)"
 
-#: admin/field-group.php:756
+#: admin/field-group.php:846
 msgid "Child Page (has parent)"
 msgstr "برگه زیر مجموعه (دارای مادر)"
 
-#: admin/field-group.php:772
+#: admin/field-group.php:862
 msgid "Default Template"
 msgstr "پوسته پیش فرض"
 
-#: admin/field-group.php:794
+#: admin/field-group.php:885
 msgid "Logged in"
 msgstr "وارده شده"
 
-#: admin/field-group.php:795
+#: admin/field-group.php:886
 msgid "Viewing front end"
 msgstr "درحال نمایش سمت کاربر"
 
-#: admin/field-group.php:796
+#: admin/field-group.php:887
 msgid "Viewing back end"
 msgstr "درحال نمایش سمت مدیریت"
 
-#: admin/field-group.php:815
+#: admin/field-group.php:906
 msgid "Super Admin"
 msgstr "مدیرکل"
 
-#: admin/field-group.php:826 admin/field-group.php:834
-#: admin/field-group.php:848 admin/field-group.php:855
-#: admin/field-group.php:870 admin/field-group.php:880 fields/file.php:235
-#: fields/image.php:226 pro/fields/gallery.php:661
+#: admin/field-group.php:917 admin/field-group.php:925
+#: admin/field-group.php:939 admin/field-group.php:946
+#: admin/field-group.php:963 admin/field-group.php:980 fields/file.php:241
+#: fields/image.php:237 pro/fields/gallery.php:676
 msgid "All"
 msgstr "همه"
 
-#: admin/field-group.php:835
+#: admin/field-group.php:926
 msgid "Add / Edit"
 msgstr "اضافه کردن/ویرایش"
 
-#: admin/field-group.php:836
+#: admin/field-group.php:927
 msgid "Register"
 msgstr "ثبت نام"
 
-#: admin/field-group.php:1067
+#: admin/field-group.php:1167
 msgid "Move Complete."
 msgstr "انتقال کامل شد."
 
-#: admin/field-group.php:1068
+#: admin/field-group.php:1168
 #, php-format
 msgid "The %s field can now be found in the %s field group"
 msgstr "زمینه %s اکنون در گروه زمینه %s  قرار گرفته است"
 
-#: admin/field-group.php:1070
+#: admin/field-group.php:1170
 msgid "Close Window"
 msgstr "بستن زمینه"
 
-#: admin/field-group.php:1105
+#: admin/field-group.php:1205
 msgid "Please select the destination for this field"
 msgstr "مقصد انتقال این زمینه را مشخص کنید"
 
-#: admin/field-group.php:1112
+#: admin/field-group.php:1212
 msgid "Move Field"
 msgstr "جابجایی زمینه"
 
@@ -324,16 +324,18 @@ msgid "%s field group synchronised."
 msgid_plural "%s field groups synchronised."
 msgstr[0] "گروه زمینه %s هماهنگ شده است"
 
-#: admin/field-groups.php:412 admin/field-groups.php:576
+#: admin/field-groups.php:412 admin/field-groups.php:575
 msgid "Sync available"
 msgstr "هماهنگ سازی موجود است"
 
-#: admin/field-groups.php:525
+#: admin/field-groups.php:525 api/api-template.php:1077
+#: api/api-template.php:1290 pro/fields/gallery.php:370
 msgid "Title"
 msgstr "عنوان"
 
 #: admin/field-groups.php:526 admin/views/field-group-options.php:93
-#: admin/views/update-network.php:20 admin/views/update-network.php:28
+#: admin/views/update-network.php:25 admin/views/update-network.php:33
+#: pro/fields/gallery.php:397
 msgid "Description"
 msgstr "توضیحات"
 
@@ -341,56 +343,57 @@ msgstr "توضیحات"
 msgid "Status"
 msgstr "وضعیت"
 
-#: admin/field-groups.php:624 admin/settings-info.php:76
+#: admin/field-groups.php:623 admin/settings-info.php:76
 #: pro/admin/views/settings-updates.php:111
 msgid "Changelog"
 msgstr "تغییرات"
 
-#: admin/field-groups.php:625
-msgid "See what's new in"
-msgstr "ببینید چه چیزی جدید است"
+#: admin/field-groups.php:624
+#, php-format
+msgid "See what's new in <a href=\"%s\">version %s</a>."
+msgstr ""
 
-#: admin/field-groups.php:625
-msgid "version"
-msgstr "نسخه"
-
-#: admin/field-groups.php:627
+#: admin/field-groups.php:626
 msgid "Resources"
 msgstr "منابع"
 
-#: admin/field-groups.php:629
+#: admin/field-groups.php:628
 msgid "Getting Started"
 msgstr "راهنمای شروع"
 
-#: admin/field-groups.php:630 pro/admin/settings-updates.php:73
+#: admin/field-groups.php:629 pro/admin/settings-updates.php:57
 #: pro/admin/views/settings-updates.php:17
 msgid "Updates"
 msgstr "بروزرسانی ها"
 
-#: admin/field-groups.php:631
+#: admin/field-groups.php:630
 msgid "Field Types"
 msgstr "انواع زمینه"
 
-#: admin/field-groups.php:632
+#: admin/field-groups.php:631
 msgid "Functions"
 msgstr "توابع"
 
-#: admin/field-groups.php:633
+#: admin/field-groups.php:632
 msgid "Actions"
 msgstr "اکشن ها (مربوط به کدنویسی)"
 
-#: admin/field-groups.php:634 fields/relationship.php:717
+#: admin/field-groups.php:633 fields/relationship.php:737
 msgid "Filters"
 msgstr "فیلترها"
 
-#: admin/field-groups.php:635
+#: admin/field-groups.php:634
 msgid "'How to' guides"
 msgstr "راهنماهای کوتاه"
 
-#: admin/field-groups.php:636
+#: admin/field-groups.php:635
 msgid "Tutorials"
 msgstr "آموزش ها"
 
+#: admin/field-groups.php:636
+msgid "FAQ"
+msgstr ""
+
 #: admin/field-groups.php:641
 msgid "Created by"
 msgstr "برنامه نویسی شده توسط"
@@ -400,20 +403,20 @@ msgid "Duplicate this item"
 msgstr "تکثیر این زمینه"
 
 #: admin/field-groups.php:684 admin/field-groups.php:700
-#: admin/views/field-group-field.php:59 pro/fields/flexible-content.php:504
+#: admin/views/field-group-field.php:59 pro/fields/flexible-content.php:499
 msgid "Duplicate"
 msgstr "تکثیر"
 
-#: admin/field-groups.php:746
+#: admin/field-groups.php:751
 #, php-format
 msgid "Select %s"
 msgstr "انتخاب %s"
 
-#: admin/field-groups.php:754
+#: admin/field-groups.php:759
 msgid "Synchronise field group"
 msgstr "هماهنگ سازی گروه زمینه"
 
-#: admin/field-groups.php:754 admin/field-groups.php:771
+#: admin/field-groups.php:759 admin/field-groups.php:776
 msgid "Sync"
 msgstr "هماهنگ"
 
@@ -433,86 +436,86 @@ msgstr "اطلاعات"
 msgid "What's New"
 msgstr "چه چیز جدید است؟"
 
-#: admin/settings-tools.php:54 admin/views/settings-tools-export.php:28
+#: admin/settings-tools.php:50 admin/views/settings-tools-export.php:23
 #: admin/views/settings-tools.php:31
 msgid "Tools"
 msgstr "ابزارها"
 
-#: admin/settings-tools.php:151 admin/settings-tools.php:365
+#: admin/settings-tools.php:147 admin/settings-tools.php:380
 msgid "No field groups selected"
 msgstr "گروه زمینه ای انتخاب نشده است"
 
-#: admin/settings-tools.php:188
+#: admin/settings-tools.php:184 fields/file.php:175
 msgid "No file selected"
 msgstr "هیچ پرونده ای انتخاب نشده"
 
-#: admin/settings-tools.php:201
+#: admin/settings-tools.php:197
 msgid "Error uploading file. Please try again"
 msgstr "خطا در آپلود فایل. لطفا مجدد بررسی کنید"
 
-#: admin/settings-tools.php:210
+#: admin/settings-tools.php:206
 msgid "Incorrect file type"
 msgstr "نوع فایل صحیح نیست"
 
-#: admin/settings-tools.php:227
+#: admin/settings-tools.php:223
 msgid "Import file empty"
 msgstr "فایل وارد شده خالی است"
 
-#: admin/settings-tools.php:323
+#: admin/settings-tools.php:331
 #, php-format
-msgid "<b>Success</b>. Import tool added %s field groups: %s"
-msgstr "<b>انجام شد</b> ابزار وارد سازی %s زمینه را وارد کرد: %s"
+msgid "Imported 1 field group"
+msgid_plural "Imported %s field groups"
+msgstr[0] ""
 
-#: admin/settings-tools.php:332
-#, php-format
-msgid ""
-"<b>Warning</b>. Import tool detected %s field groups already exist and have "
-"been ignored: %s"
-msgstr ""
-"<b>اخطار</b> ابزار وارد سازی تشخصی داد که گروه زمینه %s اکنون موجود می باشد "
-"و %s نادیده گرفته شد"
+#: admin/update-network.php:96 admin/update.php:104 admin/update.php:155
+msgid "Upgrade Database"
+msgstr "به‌روزرسانی پایگاه داده"
 
-#: admin/update.php:113
-msgid "Upgrade ACF"
-msgstr "بروزرسانی "
-
-#: admin/update.php:143
+#: admin/update-network.php:148
 msgid "Review sites & upgrade"
 msgstr "بازبینی و به‌روزرسانی سایت‌ها"
 
-#: admin/update.php:298
-msgid "Upgrade"
-msgstr "بروزرسانی"
+#: admin/update.php:220
+msgid "Error validating request"
+msgstr ""
 
-#: admin/update.php:328
-msgid "Upgrade Database"
-msgstr "به‌روزرسانی پایگاه داده"
+#: admin/update.php:243 admin/views/update.php:110
+msgid "No updates available"
+msgstr "به‌روزرسانی موجود نیست"
+
+#: admin/update.php:260
+msgid "Error loading update"
+msgstr ""
 
 #: admin/views/field-group-field-conditional-logic.php:29
 msgid "Conditional Logic"
 msgstr "منطق شرطی"
 
 #: admin/views/field-group-field-conditional-logic.php:40
-#: admin/views/field-group-field.php:141 fields/checkbox.php:246
-#: fields/message.php:144 fields/page_link.php:553 fields/page_link.php:567
-#: fields/post_object.php:419 fields/post_object.php:433 fields/select.php:396
-#: fields/select.php:410 fields/select.php:424 fields/select.php:438
-#: fields/tab.php:161 fields/taxonomy.php:796 fields/taxonomy.php:810
-#: fields/taxonomy.php:824 fields/taxonomy.php:838 fields/user.php:457
-#: fields/user.php:471 fields/wysiwyg.php:401
-#: pro/admin/views/settings-updates.php:93
+#: admin/views/field-group-field.php:141 fields/checkbox.php:244
+#: fields/message.php:144 fields/page_link.php:533 fields/page_link.php:547
+#: fields/page_link.php:561 fields/post_object.php:432
+#: fields/post_object.php:446 fields/radio.php:255 fields/select.php:469
+#: fields/select.php:483 fields/select.php:497 fields/select.php:511
+#: fields/tab.php:130 fields/taxonomy.php:785 fields/taxonomy.php:799
+#: fields/taxonomy.php:813 fields/taxonomy.php:827 fields/user.php:399
+#: fields/user.php:413 fields/wysiwyg.php:418
+#: pro/admin/views/settings-updates.php:93 pro/fields/clone.php:733
+#: pro/fields/clone.php:751
 msgid "Yes"
 msgstr "بله"
 
 #: admin/views/field-group-field-conditional-logic.php:41
-#: admin/views/field-group-field.php:142 fields/checkbox.php:247
-#: fields/message.php:145 fields/page_link.php:554 fields/page_link.php:568
-#: fields/post_object.php:420 fields/post_object.php:434 fields/select.php:397
-#: fields/select.php:411 fields/select.php:425 fields/select.php:439
-#: fields/tab.php:162 fields/taxonomy.php:711 fields/taxonomy.php:797
-#: fields/taxonomy.php:811 fields/taxonomy.php:825 fields/taxonomy.php:839
-#: fields/user.php:458 fields/user.php:472 fields/wysiwyg.php:402
-#: pro/admin/views/settings-updates.php:103
+#: admin/views/field-group-field.php:142 fields/checkbox.php:245
+#: fields/message.php:145 fields/page_link.php:534 fields/page_link.php:548
+#: fields/page_link.php:562 fields/post_object.php:433
+#: fields/post_object.php:447 fields/radio.php:256 fields/select.php:470
+#: fields/select.php:484 fields/select.php:498 fields/select.php:512
+#: fields/tab.php:131 fields/taxonomy.php:700 fields/taxonomy.php:786
+#: fields/taxonomy.php:800 fields/taxonomy.php:814 fields/taxonomy.php:828
+#: fields/user.php:400 fields/user.php:414 fields/wysiwyg.php:419
+#: pro/admin/views/settings-updates.php:103 pro/fields/clone.php:734
+#: pro/fields/clone.php:752
 msgid "No"
 msgstr "خیر"
 
@@ -540,11 +543,17 @@ msgstr "و"
 msgid "Add rule group"
 msgstr "افزودن گروه قانون"
 
-#: admin/views/field-group-field.php:54 admin/views/field-group-field.php:58
+#: admin/views/field-group-field.php:50 pro/fields/flexible-content.php:346
+#: pro/fields/repeater.php:302
+msgid "Drag to reorder"
+msgstr "گرفتن و کشیدن برای مرتب سازی"
+
+#: admin/views/field-group-field.php:55 admin/views/field-group-field.php:58
 msgid "Edit field"
 msgstr "ویرایش زمینه"
 
-#: admin/views/field-group-field.php:58 pro/fields/gallery.php:363
+#: admin/views/field-group-field.php:58 fields/image.php:142
+#: pro/fields/gallery.php:357
 msgid "Edit"
 msgstr "ویرایش"
 
@@ -564,12 +573,12 @@ msgstr "انتقال"
 msgid "Delete field"
 msgstr "حذف زمینه"
 
-#: admin/views/field-group-field.php:61 pro/fields/flexible-content.php:503
+#: admin/views/field-group-field.php:61 pro/fields/flexible-content.php:498
 msgid "Delete"
 msgstr "حذف"
 
-#: admin/views/field-group-field.php:69 fields/oembed.php:212
-#: fields/taxonomy.php:912
+#: admin/views/field-group-field.php:69 fields/oembed.php:225
+#: fields/taxonomy.php:901
 msgid "Error"
 msgstr "خطا"
 
@@ -597,7 +606,7 @@ msgstr "تک کلمه، بدون فاصله. خط زیرین و خط تیره ه
 msgid "Field Type"
 msgstr "نوع زمینه"
 
-#: admin/views/field-group-field.php:122 fields/tab.php:134
+#: admin/views/field-group-field.php:122 fields/tab.php:103
 msgid "Instructions"
 msgstr "دستورالعمل ها"
 
@@ -629,23 +638,26 @@ msgstr "شناسه"
 msgid "Close Field"
 msgstr "بستن زمینه"
 
-#: admin/views/field-group-fields.php:29
+#: admin/views/field-group-fields.php:17
 msgid "Order"
 msgstr "شماره ترتیب"
 
-#: admin/views/field-group-fields.php:30 pro/fields/flexible-content.php:530
+#: admin/views/field-group-fields.php:18 fields/checkbox.php:259
+#: fields/radio.php:314 fields/select.php:527
+#: pro/fields/flexible-content.php:525
 msgid "Label"
 msgstr "برچسب زمینه"
 
-#: admin/views/field-group-fields.php:31 pro/fields/flexible-content.php:543
+#: admin/views/field-group-fields.php:19 fields/taxonomy.php:967
+#: pro/fields/flexible-content.php:538
 msgid "Name"
 msgstr "نام"
 
-#: admin/views/field-group-fields.php:32
+#: admin/views/field-group-fields.php:20
 msgid "Type"
 msgstr "نوع زمینه"
 
-#: admin/views/field-group-fields.php:44
+#: admin/views/field-group-fields.php:38
 msgid ""
 "No fields. Click the <strong>+ Add Field</strong> button to create your "
 "first field."
@@ -653,11 +665,7 @@ msgstr ""
 "هیچ زمینه ای وجود ندارد. روی دکمه<strong>+ افزودن زمینه</strong> کلیک کنید "
 "تا اولین زمینه خود را بسازید."
 
-#: admin/views/field-group-fields.php:51
-msgid "Drag and drop to reorder"
-msgstr "با گرفتن و کشیدن مرتب سازی کنید"
-
-#: admin/views/field-group-fields.php:54
+#: admin/views/field-group-fields.php:44
 msgid "+ Add Field"
 msgstr "+ افزودن زمینه"
 
@@ -666,7 +674,7 @@ msgstr "+ افزودن زمینه"
 msgid "Post"
 msgstr "نوشته"
 
-#: admin/views/field-group-locations.php:6 fields/relationship.php:723
+#: admin/views/field-group-locations.php:6 fields/relationship.php:743
 msgid "Post Type"
 msgstr "نوع نوشته"
 
@@ -723,7 +731,7 @@ msgstr "فرم کاربر"
 msgid "User Role"
 msgstr "نقش کاربر"
 
-#: admin/views/field-group-locations.php:25 pro/admin/options-page.php:48
+#: admin/views/field-group-locations.php:25 pro/admin/options-page.php:49
 msgid "Forms"
 msgstr "فرم ها"
 
@@ -791,11 +799,11 @@ msgstr "کنار"
 msgid "Label placement"
 msgstr "مکان برچسب"
 
-#: admin/views/field-group-options.php:59 fields/tab.php:148
+#: admin/views/field-group-options.php:59 fields/tab.php:117
 msgid "Top aligned"
 msgstr "سمت بالا"
 
-#: admin/views/field-group-options.php:60 fields/tab.php:149
+#: admin/views/field-group-options.php:60 fields/tab.php:118
 msgid "Left Aligned"
 msgstr "سمت چپ"
 
@@ -879,7 +887,7 @@ msgstr "فرمت"
 msgid "Page Attributes"
 msgstr "صفات برگه"
 
-#: admin/views/field-group-options.php:123 fields/relationship.php:736
+#: admin/views/field-group-options.php:123 fields/relationship.php:756
 msgid "Featured Image"
 msgstr "تصویر شاخص"
 
@@ -1170,11 +1178,11 @@ msgstr ""
 msgid "We think you'll love the changes in %s."
 msgstr "فکر می کنیم شما تغییرات در %s را دوست خواهید داشت"
 
-#: admin/views/settings-tools-export.php:32
+#: admin/views/settings-tools-export.php:27
 msgid "Export Field Groups to PHP"
 msgstr "برون بری گروه های زمینه به PHP"
 
-#: admin/views/settings-tools-export.php:36
+#: admin/views/settings-tools-export.php:31
 msgid ""
 "The following code can be used to register a local version of the selected "
 "field group(s). A local field group can provide many benefits such as faster "
@@ -1236,40 +1244,43 @@ msgstr "انتخاب پرونده"
 msgid "Import"
 msgstr "وارد کردن"
 
-#: admin/views/update-network.php:8 admin/views/update.php:8
+#: admin/views/update-network.php:4
+msgid "Upgrade Sites"
+msgstr ""
+
+#: admin/views/update-network.php:13 admin/views/update.php:8
 msgid "Advanced Custom Fields Database Upgrade"
 msgstr "به‌روزرسانی پایگاه داده زمینه های دلخواه پیشرفته"
 
-#: admin/views/update-network.php:10
+#: admin/views/update-network.php:15
+#, php-format
 msgid ""
 "The following sites require a DB upgrade. Check the ones you want to update "
-"and then click “Upgrade Database”."
+"and then click %s."
 msgstr ""
-"سایت‌های زیر نیاز به به‌روزرسانی دیتابیس دارند. آن‌هایی که تمایل دارید را "
-"انتخاب کنید و دکمه به روزرسانی را کلیک کنید."
 
-#: admin/views/update-network.php:19 admin/views/update-network.php:27
+#: admin/views/update-network.php:24 admin/views/update-network.php:32
 msgid "Site"
 msgstr "سایت"
 
-#: admin/views/update-network.php:47
+#: admin/views/update-network.php:52
 #, php-format
 msgid "Site requires database upgrade from %s to %s"
 msgstr "سایت نیاز به به‌روزرسانی از %s به %s  دارد"
 
-#: admin/views/update-network.php:49
+#: admin/views/update-network.php:54
 msgid "Site is up to date"
 msgstr "سایت به روز است"
 
-#: admin/views/update-network.php:62 admin/views/update.php:16
+#: admin/views/update-network.php:67 admin/views/update.php:16
 msgid "Database Upgrade complete"
 msgstr "به روزرسانی دیتابیس انجام شد"
 
-#: admin/views/update-network.php:62
+#: admin/views/update-network.php:67
 msgid "Return to network dashboard"
 msgstr "بازگشت به پیشخوان شبکه"
 
-#: admin/views/update-network.php:101 admin/views/update-notice.php:35
+#: admin/views/update-network.php:106 admin/views/update-notice.php:35
 msgid ""
 "It is strongly recommended that you backup your database before proceeding. "
 "Are you sure you wish to run the updater now?"
@@ -1277,13 +1288,14 @@ msgstr ""
 "قویا توصیه می شود از بانک اطلاعاتی خود قبل از هر کاری پشتیبان تهیه کنید. آیا "
 "مایلید به روز رسانی انجام شود؟"
 
-#: admin/views/update-network.php:157
+#: admin/views/update-network.php:162
 msgid "Upgrade complete"
 msgstr "به‌روزرسانی انجام شد"
 
-#: admin/views/update-network.php:161
-msgid "Upgrading data to"
-msgstr "به روزرسانی داده ها به"
+#: admin/views/update-network.php:166 admin/views/update.php:14
+#, php-format
+msgid "Upgrading data to version %s"
+msgstr "به روز رسانی داده ها به نسحه %s"
 
 #: admin/views/update-notice.php:23
 msgid "Database Upgrade Required"
@@ -1306,252 +1318,396 @@ msgstr ""
 msgid "Reading upgrade tasks..."
 msgstr "در حال خواندن مراحل به روزرسانی..."
 
-#: admin/views/update.php:14
-#, php-format
-msgid "Upgrading data to version %s"
-msgstr "به روز رسانی داده ها به نسحه %s"
-
 #: admin/views/update.php:16
 msgid "See what's new"
 msgstr "ببینید چه چیزی جدید است"
 
-#: admin/views/update.php:110
-msgid "No updates available"
-msgstr "به‌روزرسانی موجود نیست"
-
-#: api/api-helpers.php:876
+#: api/api-helpers.php:944
 msgid "Thumbnail"
 msgstr "تصویر بندانگشتی"
 
-#: api/api-helpers.php:877
+#: api/api-helpers.php:945
 msgid "Medium"
 msgstr "متوسط"
 
-#: api/api-helpers.php:878
+#: api/api-helpers.php:946
 msgid "Large"
 msgstr "بزرگ"
 
-#: api/api-helpers.php:926
+#: api/api-helpers.php:995
 msgid "Full Size"
 msgstr "اندازه کامل"
 
-#: api/api-helpers.php:1636
+#: api/api-helpers.php:1207 api/api-helpers.php:1770 pro/fields/clone.php:866
 msgid "(no title)"
 msgstr "(بدون عنوان)"
 
-#: api/api-helpers.php:3247
+#: api/api-helpers.php:1807 fields/page_link.php:284 fields/post_object.php:283
+#: fields/taxonomy.php:989
+msgid "Parent"
+msgstr ""
+
+#: api/api-helpers.php:3873
 #, php-format
 msgid "Image width must be at least %dpx."
 msgstr "عرض تصویر باید حداقل %d پیکسل باشد."
 
-#: api/api-helpers.php:3252
+#: api/api-helpers.php:3878
 #, php-format
 msgid "Image width must not exceed %dpx."
 msgstr "عرض تصویر نباید از %d پیکسل بیشتر باشد."
 
-#: api/api-helpers.php:3268
+#: api/api-helpers.php:3894
 #, php-format
 msgid "Image height must be at least %dpx."
 msgstr "ارتفاع فایل باید حداقل %d پیکسل باشد."
 
-#: api/api-helpers.php:3273
+#: api/api-helpers.php:3899
 #, php-format
 msgid "Image height must not exceed %dpx."
 msgstr "ارتفاع تصویر نباید از %d پیکسل بیشتر باشد."
 
-#: api/api-helpers.php:3291
+#: api/api-helpers.php:3917
 #, php-format
 msgid "File size must be at least %s."
 msgstr "حجم فایل باید حداقل %s باشد."
 
-#: api/api-helpers.php:3296
+#: api/api-helpers.php:3922
 #, php-format
 msgid "File size must must not exceed %s."
 msgstr "حجم فایل ها نباید از %s بیشتر باشد."
 
-#: api/api-helpers.php:3330
+#: api/api-helpers.php:3956
 #, php-format
 msgid "File type must be %s."
 msgstr "نوع فایل باید %s باشد"
 
-#: api/api-template.php:1209 pro/fields/gallery.php:572
+#: api/api-template.php:1092
+msgid "Spam Detected"
+msgstr ""
+
+#: api/api-template.php:1235 pro/api/api-options-page.php:50
+#: pro/fields/gallery.php:588
 msgid "Update"
 msgstr "بروزرسانی"
 
-#: api/api-template.php:1210
+#: api/api-template.php:1236
 msgid "Post updated"
 msgstr "نوشته بروز شد."
 
-#: core/field.php:131
-msgid "Basic"
-msgstr "پایه"
-
-#: core/field.php:132
+#: api/api-template.php:1304 core/field.php:133
 msgid "Content"
 msgstr "محتوا"
 
-#: core/field.php:133
+#: api/api-template.php:1369
+msgid "Validate Email"
+msgstr ""
+
+#: core/field.php:132
+msgid "Basic"
+msgstr "پایه"
+
+#: core/field.php:134
 msgid "Choice"
 msgstr "انتخاب"
 
-#: core/field.php:134
+#: core/field.php:135
 msgid "Relational"
 msgstr "رابطه"
 
-#: core/field.php:135
+#: core/field.php:136
 msgid "jQuery"
 msgstr "جی کوئری"
 
-#: core/field.php:136 fields/checkbox.php:226 fields/radio.php:231
-#: pro/fields/flexible-content.php:500 pro/fields/flexible-content.php:549
-#: pro/fields/repeater.php:467
+#: core/field.php:137 fields/checkbox.php:224 fields/radio.php:293
+#: pro/fields/clone.php:709 pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:544 pro/fields/repeater.php:459
 msgid "Layout"
 msgstr "چیدمان"
 
-#: core/input.php:129
+#: core/input.php:258
 msgid "Expand Details"
 msgstr "نمایش جزئیات"
 
-#: core/input.php:130
+#: core/input.php:259
 msgid "Collapse Details"
 msgstr "عدم نمایش جزئیات"
 
-#: core/input.php:131
+#: core/input.php:260
 msgid "Validation successful"
 msgstr "اعتبار سنجی موفق بود"
 
-#: core/input.php:132
+#: core/input.php:261 core/validation.php:306 forms/widget.php:234
 msgid "Validation failed"
 msgstr "مشکل در اعتبار سنجی"
 
-#: core/input.php:133
+#: core/input.php:262
 msgid "1 field requires attention"
 msgstr "یکی از گزینه ها نیاز به بررسی دارد"
 
-#: core/input.php:134
+#: core/input.php:263
 #, php-format
 msgid "%d fields require attention"
 msgstr "%d گزینه نیاز به بررسی دارد"
 
-#: core/input.php:135
+#: core/input.php:264
 msgid "Restricted"
 msgstr "ممنوع"
 
-#: core/input.php:533
+#: core/media.php:54 fields/select.php:249
+msgctxt "verb"
+msgid "Select"
+msgstr ""
+
+#: core/media.php:55
+msgctxt "verb"
+msgid "Edit"
+msgstr ""
+
+#: core/media.php:56
+msgctxt "verb"
+msgid "Update"
+msgstr ""
+
+#: core/media.php:57 fields/file.php:49 fields/image.php:54
+#: pro/fields/gallery.php:55
+msgid "Uploaded to this post"
+msgstr "بارگذاری شده در این نوشته"
+
+#: core/validation.php:207
 #, php-format
 msgid "%s value is required"
 msgstr "مقدار %s لازم است"
 
-#: fields/checkbox.php:36 fields/taxonomy.php:778
+#: fields/checkbox.php:36 fields/taxonomy.php:767
 msgid "Checkbox"
 msgstr "جعبه انتخاب(چک باکس)"
 
-#: fields/checkbox.php:144
+#: fields/checkbox.php:142
 msgid "Toggle All"
 msgstr "انتخاب همه"
 
-#: fields/checkbox.php:208 fields/radio.php:193 fields/select.php:373
+#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:446
 msgid "Choices"
 msgstr "انتخاب ها"
 
-#: fields/checkbox.php:209 fields/radio.php:194 fields/select.php:374
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "Enter each choice on a new line."
 msgstr "هر انتخاب را در یک خط جدید وارد کنید."
 
-#: fields/checkbox.php:209 fields/radio.php:194 fields/select.php:374
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "For more control, you may specify both a value and label like this:"
 msgstr "برای کنترل بیشتر، ممکن است هر دو مقدار و برچسب را مانند زیر مشخص کنید:"
 
-#: fields/checkbox.php:209 fields/radio.php:194 fields/select.php:374
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "red : Red"
 msgstr "red : قرمز"
 
-#: fields/checkbox.php:217 fields/color_picker.php:158 fields/email.php:124
-#: fields/number.php:150 fields/radio.php:222 fields/select.php:382
+#: fields/checkbox.php:215 fields/color_picker.php:147 fields/email.php:124
+#: fields/number.php:150 fields/radio.php:284 fields/select.php:455
 #: fields/text.php:148 fields/textarea.php:145 fields/true_false.php:115
-#: fields/url.php:117 fields/wysiwyg.php:362
+#: fields/url.php:117 fields/wysiwyg.php:379
 msgid "Default Value"
 msgstr "مقدار پیش فرض"
 
-#: fields/checkbox.php:218 fields/select.php:383
+#: fields/checkbox.php:216 fields/select.php:456
 msgid "Enter each default value on a new line"
 msgstr "هر مقدار پیش فرض را در یک خط جدید وارد کنید"
 
-#: fields/checkbox.php:232 fields/radio.php:237
+#: fields/checkbox.php:230 fields/radio.php:299
 msgid "Vertical"
 msgstr "عمودی"
 
-#: fields/checkbox.php:233 fields/radio.php:238
+#: fields/checkbox.php:231 fields/radio.php:300
 msgid "Horizontal"
 msgstr "افقی"
 
-#: fields/checkbox.php:240
+#: fields/checkbox.php:238
 msgid "Toggle"
 msgstr "انتخاب"
 
-#: fields/checkbox.php:241
+#: fields/checkbox.php:239
 msgid "Prepend an extra checkbox to toggle all choices"
 msgstr "اضافه کردن چک باکس اضافی برای انتخاب همه"
 
+#: fields/checkbox.php:252 fields/file.php:220 fields/image.php:206
+#: fields/radio.php:307 fields/taxonomy.php:836
+msgid "Return Value"
+msgstr "مقدار بازگشت"
+
+#: fields/checkbox.php:253 fields/file.php:221 fields/image.php:207
+#: fields/radio.php:308
+msgid "Specify the returned value on front end"
+msgstr "مقدار برگشتی در نمایش نهایی را تعیین کنید"
+
+#: fields/checkbox.php:258 fields/radio.php:313 fields/select.php:526
+msgid "Value"
+msgstr ""
+
+#: fields/checkbox.php:260 fields/radio.php:315 fields/select.php:528
+msgid "Both (Array)"
+msgstr ""
+
 #: fields/color_picker.php:36
 msgid "Color Picker"
 msgstr "انتخاب رنگ"
 
-#: fields/color_picker.php:94
+#: fields/color_picker.php:83
 msgid "Clear"
 msgstr "پاکسازی"
 
-#: fields/color_picker.php:95
+#: fields/color_picker.php:84
 msgid "Default"
 msgstr "پیش فرض"
 
-#: fields/color_picker.php:96
+#: fields/color_picker.php:85
 msgid "Select Color"
 msgstr "انتخاب رنگ"
 
+#: fields/color_picker.php:86
+msgid "Current Color"
+msgstr ""
+
 #: fields/date_picker.php:36
 msgid "Date Picker"
 msgstr "تاریخ"
 
-#: fields/date_picker.php:72
+#: fields/date_picker.php:44
+msgctxt "Date Picker JS closeText"
 msgid "Done"
-msgstr "انجام شده"
+msgstr ""
 
-#: fields/date_picker.php:73
+#: fields/date_picker.php:45
+msgctxt "Date Picker JS currentText"
 msgid "Today"
-msgstr "امروز"
+msgstr ""
 
-#: fields/date_picker.php:76
-msgid "Show a different month"
-msgstr "نمایش یک ماه دیگر"
+#: fields/date_picker.php:46
+msgctxt "Date Picker JS nextText"
+msgid "Next"
+msgstr ""
 
-#: fields/date_picker.php:149
+#: fields/date_picker.php:47
+msgctxt "Date Picker JS prevText"
+msgid "Prev"
+msgstr ""
+
+#: fields/date_picker.php:48
+msgctxt "Date Picker JS weekHeader"
+msgid "Wk"
+msgstr ""
+
+#: fields/date_picker.php:195 fields/date_time_picker.php:184
+#: fields/time_picker.php:126
 msgid "Display Format"
 msgstr "فرمت نمایش"
 
-#: fields/date_picker.php:150
+#: fields/date_picker.php:196 fields/date_time_picker.php:185
+#: fields/time_picker.php:127
 msgid "The format displayed when editing a post"
 msgstr "قالب در زمان نمایش نوشته دیده خواهد شد"
 
-#: fields/date_picker.php:164
-msgid "Return format"
+#: fields/date_picker.php:210 fields/date_time_picker.php:200
+#: fields/post_object.php:455 fields/relationship.php:783 fields/select.php:520
+#: fields/time_picker.php:140
+msgid "Return Format"
 msgstr "فرمت بازگشت"
 
-#: fields/date_picker.php:165
+#: fields/date_picker.php:211 fields/date_time_picker.php:201
+#: fields/time_picker.php:141
 msgid "The format returned via template functions"
 msgstr "قالب توسط توابع پوسته نمایش داده خواهد شد"
 
-#: fields/date_picker.php:180
+#: fields/date_picker.php:226 fields/date_time_picker.php:216
 msgid "Week Starts On"
 msgstr "اولین روز هفته"
 
+#: fields/date_time_picker.php:36
+msgid "Date Time Picker"
+msgstr ""
+
+#: fields/date_time_picker.php:44
+msgctxt "Date Time Picker JS timeOnlyTitle"
+msgid "Choose Time"
+msgstr ""
+
+#: fields/date_time_picker.php:45
+msgctxt "Date Time Picker JS timeText"
+msgid "Time"
+msgstr ""
+
+#: fields/date_time_picker.php:46
+msgctxt "Date Time Picker JS hourText"
+msgid "Hour"
+msgstr ""
+
+#: fields/date_time_picker.php:47
+msgctxt "Date Time Picker JS minuteText"
+msgid "Minute"
+msgstr ""
+
+#: fields/date_time_picker.php:48
+msgctxt "Date Time Picker JS secondText"
+msgid "Second"
+msgstr ""
+
+#: fields/date_time_picker.php:49
+msgctxt "Date Time Picker JS millisecText"
+msgid "Millisecond"
+msgstr ""
+
+#: fields/date_time_picker.php:50
+msgctxt "Date Time Picker JS microsecText"
+msgid "Microsecond"
+msgstr ""
+
+#: fields/date_time_picker.php:51
+msgctxt "Date Time Picker JS timezoneText"
+msgid "Time Zone"
+msgstr ""
+
+#: fields/date_time_picker.php:52
+msgctxt "Date Time Picker JS currentText"
+msgid "Now"
+msgstr ""
+
+#: fields/date_time_picker.php:53
+msgctxt "Date Time Picker JS closeText"
+msgid "Done"
+msgstr ""
+
+#: fields/date_time_picker.php:54
+msgctxt "Date Time Picker JS selectText"
+msgid "Select"
+msgstr ""
+
+#: fields/date_time_picker.php:56
+msgctxt "Date Time Picker JS amText"
+msgid "AM"
+msgstr ""
+
+#: fields/date_time_picker.php:57
+msgctxt "Date Time Picker JS amTextShort"
+msgid "A"
+msgstr ""
+
+#: fields/date_time_picker.php:60
+msgctxt "Date Time Picker JS pmText"
+msgid "PM"
+msgstr ""
+
+#: fields/date_time_picker.php:61
+msgctxt "Date Time Picker JS pmTextShort"
+msgid "P"
+msgstr ""
+
 #: fields/email.php:36
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: fields/email.php:125 fields/number.php:151 fields/radio.php:223
+#: fields/email.php:125 fields/number.php:151 fields/radio.php:285
 #: fields/text.php:149 fields/textarea.php:146 fields/url.php:118
-#: fields/wysiwyg.php:363
+#: fields/wysiwyg.php:380
 msgid "Appears when creating a new post"
 msgstr "هنگام ایجاد یک نوشته جدید نمایش داده می شود"
 
@@ -1597,80 +1753,61 @@ msgstr "ویرایش پرونده"
 msgid "Update File"
 msgstr "بروزرسانی پرونده"
 
-#: fields/file.php:49 pro/fields/gallery.php:55
-msgid "uploaded to this post"
-msgstr "بارگذاری شده در این نوشته"
+#: fields/file.php:148
+msgid "File name"
+msgstr ""
 
-#: fields/file.php:142
-msgid "File Name"
-msgstr "نام پرونده"
-
-#: fields/file.php:146
-msgid "File Size"
-msgstr "اندازه پرونده"
-
-#: fields/file.php:169
-msgid "No File selected"
-msgstr "هیچ پرونده ای انتخاب نشده"
-
-#: fields/file.php:169
-msgid "Add File"
-msgstr "افزودن پرونده"
-
-#: fields/file.php:214 fields/image.php:195 fields/taxonomy.php:847
-msgid "Return Value"
-msgstr "مقدار بازگشت"
-
-#: fields/file.php:215 fields/image.php:196
-msgid "Specify the returned value on front end"
-msgstr "مقدار برگشتی در نمایش نهایی را تعیین کنید"
-
-#: fields/file.php:220
-msgid "File Array"
-msgstr "آرایه فایل"
-
-#: fields/file.php:221
-msgid "File URL"
-msgstr "آدرس پرونده"
-
-#: fields/file.php:222
-msgid "File ID"
-msgstr "شناسه(ID) پرونده"
-
-#: fields/file.php:229 fields/image.php:220 pro/fields/gallery.php:655
-msgid "Library"
-msgstr "کتابخانه"
-
-#: fields/file.php:230 fields/image.php:221 pro/fields/gallery.php:656
-msgid "Limit the media library choice"
-msgstr "محدود کردن انتخاب کتابخانه چندرسانه ای"
-
-#: fields/file.php:236 fields/image.php:227 pro/fields/gallery.php:662
-msgid "Uploaded to post"
-msgstr "بارگذاری شده در نوشته"
-
-#: fields/file.php:243 fields/image.php:234 pro/fields/gallery.php:669
-msgid "Minimum"
-msgstr "کمترین"
-
-#: fields/file.php:244 fields/file.php:255
-msgid "Restrict which files can be uploaded"
-msgstr "محدودیت در آپلود فایل ها"
-
-#: fields/file.php:247 fields/file.php:258 fields/image.php:257
-#: fields/image.php:290 pro/fields/gallery.php:692 pro/fields/gallery.php:725
+#: fields/file.php:152 fields/file.php:253 fields/file.php:264
+#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:707
+#: pro/fields/gallery.php:740
 msgid "File size"
 msgstr "اندازه فایل"
 
-#: fields/file.php:254 fields/image.php:267 pro/fields/gallery.php:702
+#: fields/file.php:175
+msgid "Add File"
+msgstr "افزودن پرونده"
+
+#: fields/file.php:226
+msgid "File Array"
+msgstr "آرایه فایل"
+
+#: fields/file.php:227
+msgid "File URL"
+msgstr "آدرس پرونده"
+
+#: fields/file.php:228
+msgid "File ID"
+msgstr "شناسه(ID) پرونده"
+
+#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:670
+msgid "Library"
+msgstr "کتابخانه"
+
+#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:671
+msgid "Limit the media library choice"
+msgstr "محدود کردن انتخاب کتابخانه چندرسانه ای"
+
+#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:677
+msgid "Uploaded to post"
+msgstr "بارگذاری شده در نوشته"
+
+#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:684
+msgid "Minimum"
+msgstr "کمترین"
+
+#: fields/file.php:250 fields/file.php:261
+msgid "Restrict which files can be uploaded"
+msgstr "محدودیت در آپلود فایل ها"
+
+#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:717
 msgid "Maximum"
 msgstr "بیشترین"
 
-#: fields/file.php:265 fields/image.php:300 pro/fields/gallery.php:735
+#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:750
 msgid "Allowed file types"
 msgstr "انواع مجاز فایل"
 
-#: fields/file.php:266 fields/image.php:301 pro/fields/gallery.php:736
+#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:751
 msgid "Comma separated list. Leave blank for all types"
 msgstr "با کامای انگلیسی جدا کرده یا برای عدم محدودیت خالی بگذارید"
 
@@ -1686,7 +1823,7 @@ msgstr "مکان یابی"
 msgid "Sorry, this browser does not support geolocation"
 msgstr "با عرض پوزش، این مرورگر از موقعیت یابی جغرافیایی پشتیبانی نمی کند"
 
-#: fields/google-map.php:133 fields/relationship.php:722
+#: fields/google-map.php:133 fields/relationship.php:742
 msgid "Search"
 msgstr "جستجو"
 
@@ -1718,8 +1855,8 @@ msgstr "بزرگنمایی"
 msgid "Set the initial zoom level"
 msgstr "تعین مقدار بزرگنمایی اولیه"
 
-#: fields/google-map.php:203 fields/image.php:246 fields/image.php:279
-#: fields/oembed.php:262 pro/fields/gallery.php:681 pro/fields/gallery.php:714
+#: fields/google-map.php:203 fields/image.php:257 fields/image.php:290
+#: fields/oembed.php:275 pro/fields/gallery.php:696 pro/fields/gallery.php:729
 msgid "Height"
 msgstr "ارتفاع"
 
@@ -1743,49 +1880,49 @@ msgstr "ویرایش تصویر"
 msgid "Update Image"
 msgstr "بروزرسانی تصویر"
 
-#: fields/image.php:54
-msgid "Uploaded to this post"
-msgstr "بارگذاری شده در این نوشته"
-
 #: fields/image.php:55
 msgid "All images"
 msgstr "تمام تصاویر"
 
-#: fields/image.php:147
+#: fields/image.php:144 pro/fields/gallery.php:358 pro/fields/gallery.php:546
+msgid "Remove"
+msgstr "حذف"
+
+#: fields/image.php:158
 msgid "No image selected"
 msgstr "هیچ تصویری انتخاب نشده"
 
-#: fields/image.php:147
+#: fields/image.php:158
 msgid "Add Image"
 msgstr "افزودن تصویر"
 
-#: fields/image.php:201
+#: fields/image.php:212
 msgid "Image Array"
 msgstr "آرایه تصاویر"
 
-#: fields/image.php:202
+#: fields/image.php:213
 msgid "Image URL"
 msgstr "آدرس تصویر"
 
-#: fields/image.php:203
+#: fields/image.php:214
 msgid "Image ID"
 msgstr "شناسه(ID) تصویر"
 
-#: fields/image.php:210 pro/fields/gallery.php:645
+#: fields/image.php:221
 msgid "Preview Size"
 msgstr "اندازه پیش نمایش"
 
-#: fields/image.php:211 pro/fields/gallery.php:646
+#: fields/image.php:222
 msgid "Shown when entering data"
 msgstr "هنگام وارد کردن داده ها نمایش داده می شود"
 
-#: fields/image.php:235 fields/image.php:268 pro/fields/gallery.php:670
-#: pro/fields/gallery.php:703
+#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:685
+#: pro/fields/gallery.php:718
 msgid "Restrict which images can be uploaded"
 msgstr "محدودیت در آپلود تصاویر"
 
-#: fields/image.php:238 fields/image.php:271 fields/oembed.php:251
-#: pro/fields/gallery.php:673 pro/fields/gallery.php:706
+#: fields/image.php:249 fields/image.php:282 fields/oembed.php:264
+#: pro/fields/gallery.php:688 pro/fields/gallery.php:721
 msgid "Width"
 msgstr "عرض"
 
@@ -1855,49 +1992,53 @@ msgstr "مقدار باید کوچکتر یا مساوی %d باشد"
 msgid "oEmbed"
 msgstr "oEmbed"
 
-#: fields/oembed.php:199
+#: fields/oembed.php:212
 msgid "Enter URL"
 msgstr "آدرس را وارد کنید"
 
-#: fields/oembed.php:212
+#: fields/oembed.php:225
 msgid "No embed found for the given URL"
 msgstr "امکان جاسازی برای آدرس وارد شده یافت نشد"
 
-#: fields/oembed.php:248 fields/oembed.php:259
+#: fields/oembed.php:261 fields/oembed.php:272
 msgid "Embed Size"
 msgstr "اندازه جانمایی"
 
-#: fields/page_link.php:197
+#: fields/page_link.php:192
 msgid "Archives"
 msgstr "بایگانی ها"
 
-#: fields/page_link.php:520 fields/post_object.php:386
-#: fields/relationship.php:689
+#: fields/page_link.php:500 fields/post_object.php:399
+#: fields/relationship.php:709
 msgid "Filter by Post Type"
 msgstr "فیلتر با نوع نوشته"
 
-#: fields/page_link.php:528 fields/post_object.php:394
-#: fields/relationship.php:697
+#: fields/page_link.php:508 fields/post_object.php:407
+#: fields/relationship.php:717
 msgid "All post types"
 msgstr "تمام انواع نوشته"
 
-#: fields/page_link.php:534 fields/post_object.php:400
-#: fields/relationship.php:703
+#: fields/page_link.php:514 fields/post_object.php:413
+#: fields/relationship.php:723
 msgid "Filter by Taxonomy"
 msgstr "فیلتر با طبقه بندی"
 
-#: fields/page_link.php:542 fields/post_object.php:408
-#: fields/relationship.php:711
+#: fields/page_link.php:522 fields/post_object.php:421
+#: fields/relationship.php:731
 msgid "All taxonomies"
 msgstr "تمام طبقه بندی ها"
 
-#: fields/page_link.php:548 fields/post_object.php:414 fields/select.php:391
-#: fields/taxonomy.php:791 fields/user.php:452
+#: fields/page_link.php:528 fields/post_object.php:427 fields/radio.php:250
+#: fields/select.php:464 fields/taxonomy.php:780 fields/user.php:394
 msgid "Allow Null?"
 msgstr "آیا Null مجاز است؟"
 
-#: fields/page_link.php:562 fields/post_object.php:428 fields/select.php:405
-#: fields/user.php:466
+#: fields/page_link.php:542
+msgid "Allow Archives URLs"
+msgstr ""
+
+#: fields/page_link.php:556 fields/post_object.php:441 fields/select.php:478
+#: fields/user.php:408
 msgid "Select multiple values?"
 msgstr "آیا چندین مقدار انتخاب شوند؟"
 
@@ -1905,16 +2046,12 @@ msgstr "آیا چندین مقدار انتخاب شوند؟"
 msgid "Password"
 msgstr "رمزعبور"
 
-#: fields/post_object.php:36 fields/post_object.php:447
-#: fields/relationship.php:768
+#: fields/post_object.php:36 fields/post_object.php:460
+#: fields/relationship.php:788
 msgid "Post Object"
 msgstr "آبجکت یک نوشته"
 
-#: fields/post_object.php:442 fields/relationship.php:763
-msgid "Return Format"
-msgstr "فرمت بازگشت"
-
-#: fields/post_object.php:448 fields/relationship.php:769
+#: fields/post_object.php:461 fields/relationship.php:789
 msgid "Post ID"
 msgstr "شناسه(ID) نوشته"
 
@@ -1922,19 +2059,19 @@ msgstr "شناسه(ID) نوشته"
 msgid "Radio Button"
 msgstr "دکمه رادیویی"
 
-#: fields/radio.php:202
+#: fields/radio.php:264
 msgid "Other"
 msgstr "دیگر"
 
-#: fields/radio.php:206
+#: fields/radio.php:268
 msgid "Add 'other' choice to allow for custom values"
 msgstr "افزودن گزینه 'دیگر' برای ثبت مقادیر دلخواه"
 
-#: fields/radio.php:212
+#: fields/radio.php:274
 msgid "Save Other"
 msgstr "ذخیره دیگر"
 
-#: fields/radio.php:216
+#: fields/radio.php:278
 msgid "Save 'other' values to the field's choices"
 msgstr "ذخیره مقادیر دیگر در انتخاب های زمینه"
 
@@ -1958,61 +2095,130 @@ msgstr "درحال خواندن"
 msgid "No matches found"
 msgstr "مطابقتی یافت نشد"
 
-#: fields/relationship.php:570
+#: fields/relationship.php:590
 msgid "Search..."
 msgstr "جستجو . . ."
 
-#: fields/relationship.php:579
+#: fields/relationship.php:599
 msgid "Select post type"
 msgstr "انتحاب نوع نوشته"
 
-#: fields/relationship.php:592
+#: fields/relationship.php:612
 msgid "Select taxonomy"
 msgstr "انتخاب طبقه بندی"
 
-#: fields/relationship.php:724 fields/taxonomy.php:36 fields/taxonomy.php:761
+#: fields/relationship.php:744 fields/taxonomy.php:36 fields/taxonomy.php:750
 msgid "Taxonomy"
 msgstr "طبقه بندی"
 
-#: fields/relationship.php:731
+#: fields/relationship.php:751
 msgid "Elements"
 msgstr "عناصر"
 
-#: fields/relationship.php:732
+#: fields/relationship.php:752
 msgid "Selected elements will be displayed in each result"
 msgstr "عناصر انتخاب شده در هر نتیجه نمایش داده خواهند شد"
 
-#: fields/relationship.php:743
+#: fields/relationship.php:763
 msgid "Minimum posts"
 msgstr "حداقل تعداد نوشته‌ها"
 
-#: fields/relationship.php:752
+#: fields/relationship.php:772
 msgid "Maximum posts"
 msgstr "حداکثر تعداد نوشته ها"
 
-#: fields/relationship.php:856 pro/fields/gallery.php:817
+#: fields/relationship.php:876 pro/fields/gallery.php:823
 #, php-format
 msgid "%s requires at least %s selection"
 msgid_plural "%s requires at least %s selections"
 msgstr[0] "%s نیاز دارد به حداقل %s بخش"
 
-#: fields/select.php:36 fields/select.php:174 fields/taxonomy.php:783
+#: fields/select.php:36 fields/taxonomy.php:772
+msgctxt "noun"
 msgid "Select"
-msgstr "انتخاب(دراپ باکس)"
+msgstr ""
 
-#: fields/select.php:419
+#: fields/select.php:49
+msgctxt "Select2 JS matches_1"
+msgid "One result is available, press enter to select it."
+msgstr ""
+
+#: fields/select.php:50
+#, php-format
+msgctxt "Select2 JS matches_n"
+msgid "%d results are available, use up and down arrow keys to navigate."
+msgstr ""
+
+#: fields/select.php:51
+msgctxt "Select2 JS matches_0"
+msgid "No matches found"
+msgstr ""
+
+#: fields/select.php:52
+msgctxt "Select2 JS input_too_short_1"
+msgid "Please enter 1 or more characters"
+msgstr ""
+
+#: fields/select.php:53
+#, php-format
+msgctxt "Select2 JS input_too_short_n"
+msgid "Please enter %d or more characters"
+msgstr ""
+
+#: fields/select.php:54
+msgctxt "Select2 JS input_too_long_1"
+msgid "Please delete 1 character"
+msgstr ""
+
+#: fields/select.php:55
+#, php-format
+msgctxt "Select2 JS input_too_long_n"
+msgid "Please delete %d characters"
+msgstr ""
+
+#: fields/select.php:56
+msgctxt "Select2 JS selection_too_long_1"
+msgid "You can only select 1 item"
+msgstr ""
+
+#: fields/select.php:57
+#, php-format
+msgctxt "Select2 JS selection_too_long_n"
+msgid "You can only select %d items"
+msgstr ""
+
+#: fields/select.php:58
+msgctxt "Select2 JS load_more"
+msgid "Loading more results&hellip;"
+msgstr ""
+
+#: fields/select.php:59
+msgctxt "Select2 JS searching"
+msgid "Searching&hellip;"
+msgstr ""
+
+#: fields/select.php:60
+msgctxt "Select2 JS load_fail"
+msgid "Loading failed"
+msgstr ""
+
+#: fields/select.php:492
 msgid "Stylised UI"
 msgstr "ظاهر بهینه شده"
 
-#: fields/select.php:433
+#: fields/select.php:506
 msgid "Use AJAX to lazy load choices?"
 msgstr "از ایجکس برای خواندن گزینه های استفاده شود؟"
 
+#: fields/select.php:521
+msgid "Specify the value returned"
+msgstr ""
+
 #: fields/tab.php:36
 msgid "Tab"
 msgstr "تب"
 
-#: fields/tab.php:128
+#: fields/tab.php:97
 msgid ""
 "The tab field will display incorrectly when added to a Table style repeater "
 "field or flexible content field layout"
@@ -2020,7 +2226,7 @@ msgstr ""
 "زمینه تب در زمانی که در آن زمینه تکرارشونده و یا زمینه محتوای انعطاف پذیر به "
 "کار ببرید درست نمایش داده نخواهد شد"
 
-#: fields/tab.php:129
+#: fields/tab.php:98
 msgid ""
 "Use \"Tab Fields\" to better organize your edit screen by grouping fields "
 "together."
@@ -2028,7 +2234,7 @@ msgstr ""
 "از (زمینه تب) برای سازماندهی بهتر صفحه ویرایش با گروه بندی زمینه ها زیر تب "
 "ها استفاده کنید. "
 
-#: fields/tab.php:130
+#: fields/tab.php:99
 msgid ""
 "All fields following this \"tab field\" (or until another \"tab field\" is "
 "defined) will be grouped together using this field's label as the tab "
@@ -2037,103 +2243,98 @@ msgstr ""
 "همه زمینه های زیر این \" زمینه تب \"  (یا تا زمینه تب بعدی) با هم گروه بندی "
 "می شوند و برچسب زمینه در تب به نمایش در خواهد آمد"
 
-#: fields/tab.php:144
+#: fields/tab.php:113
 msgid "Placement"
 msgstr "جانمایی"
 
-#: fields/tab.php:156
+#: fields/tab.php:125
 msgid "End-point"
 msgstr "نقطه پایانی"
 
-#: fields/tab.php:157
+#: fields/tab.php:126
 msgid "Use this field as an end-point and start a new group of tabs"
 msgstr "استفاده از این زمینه به عنوان نقطه پایانی و شروع یک گروه جدید از تب ها"
 
-#: fields/taxonomy.php:591
-#, php-format
-msgid "Add new %s "
-msgstr "افزودن %s "
-
-#: fields/taxonomy.php:730
+#: fields/taxonomy.php:719
 msgid "None"
 msgstr "هیچ"
 
-#: fields/taxonomy.php:762
+#: fields/taxonomy.php:751
 msgid "Select the taxonomy to be displayed"
 msgstr "طبقه‌بندی را برای برون بری انتخاب کنید"
 
-#: fields/taxonomy.php:771
+#: fields/taxonomy.php:760
 msgid "Appearance"
 msgstr "ظاهر"
 
-#: fields/taxonomy.php:772
+#: fields/taxonomy.php:761
 msgid "Select the appearance of this field"
 msgstr "ظاهر این زمینه را مشخص کنید"
 
-#: fields/taxonomy.php:777
+#: fields/taxonomy.php:766
 msgid "Multiple Values"
 msgstr "چندین مقدار"
 
-#: fields/taxonomy.php:779
+#: fields/taxonomy.php:768
 msgid "Multi Select"
 msgstr "چندین انتخاب"
 
-#: fields/taxonomy.php:781
+#: fields/taxonomy.php:770
 msgid "Single Value"
 msgstr "تک مقدار"
 
-#: fields/taxonomy.php:782
+#: fields/taxonomy.php:771
 msgid "Radio Buttons"
 msgstr "دکمه های رادیویی"
 
-#: fields/taxonomy.php:805
+#: fields/taxonomy.php:794
 msgid "Create Terms"
 msgstr "ساخت آیتم (ترم)"
 
-#: fields/taxonomy.php:806
+#: fields/taxonomy.php:795
 msgid "Allow new terms to be created whilst editing"
 msgstr "اجازه به ساخت آیتم‌ها(ترم‌ها) جدید در زمان ویرایش"
 
-#: fields/taxonomy.php:819
+#: fields/taxonomy.php:808
 msgid "Save Terms"
 msgstr "ذخیره ترم ها"
 
-#: fields/taxonomy.php:820
+#: fields/taxonomy.php:809
 msgid "Connect selected terms to the post"
 msgstr "الصاق آیتم های انتخابی به نوشته"
 
-#: fields/taxonomy.php:833
+#: fields/taxonomy.php:822
 msgid "Load Terms"
 msgstr "خواندن ترم ها"
 
-#: fields/taxonomy.php:834
+#: fields/taxonomy.php:823
 msgid "Load value from posts terms"
 msgstr "خواندن مقادیر از ترم های نوشته"
 
-#: fields/taxonomy.php:852
+#: fields/taxonomy.php:841
 msgid "Term Object"
 msgstr "به صورت آبجکت"
 
-#: fields/taxonomy.php:853
+#: fields/taxonomy.php:842
 msgid "Term ID"
 msgstr "شناسه(ID) آیتم(ترم)"
 
-#: fields/taxonomy.php:912
+#: fields/taxonomy.php:901
 #, php-format
 msgid "User unable to add new %s"
 msgstr "کاربر قادر به اضافه کردن%s جدید نیست"
 
-#: fields/taxonomy.php:925
+#: fields/taxonomy.php:914
 #, php-format
 msgid "%s already exists"
 msgstr "%s هم اکنون موجود است"
 
-#: fields/taxonomy.php:966
+#: fields/taxonomy.php:955
 #, php-format
 msgid "%s added"
 msgstr "%s اضافه شد"
 
-#: fields/taxonomy.php:1011
+#: fields/taxonomy.php:1000
 msgid "Add"
 msgstr "افزودن"
 
@@ -2161,6 +2362,10 @@ msgstr "سطرها"
 msgid "Sets the textarea height"
 msgstr "تعیین ارتفاع باکس متن"
 
+#: fields/time_picker.php:36
+msgid "Time Picker"
+msgstr ""
+
 #: fields/true_false.php:36
 msgid "True / False"
 msgstr "صحیح / غلط"
@@ -2177,11 +2382,11 @@ msgstr "URL"
 msgid "Value must be a valid URL"
 msgstr "مقدار باید یک آدرس صحیح باشد"
 
-#: fields/user.php:437
+#: fields/user.php:379
 msgid "Filter by role"
 msgstr "تفکیک با نقش"
 
-#: fields/user.php:445
+#: fields/user.php:387
 msgid "All user roles"
 msgstr "تمام نقش های کاربر"
 
@@ -2189,43 +2394,50 @@ msgstr "تمام نقش های کاربر"
 msgid "Wysiwyg Editor"
 msgstr "ویرایشگر دیداری"
 
-#: fields/wysiwyg.php:314
+#: fields/wysiwyg.php:331
 msgid "Visual"
 msgstr "بصری"
 
-#: fields/wysiwyg.php:315
+#: fields/wysiwyg.php:332
 msgctxt "Name for the Text editor tab (formerly HTML)"
 msgid "Text"
 msgstr "متن"
 
-#: fields/wysiwyg.php:371
+#: fields/wysiwyg.php:388
 msgid "Tabs"
 msgstr "تب ها"
 
-#: fields/wysiwyg.php:376
+#: fields/wysiwyg.php:393
 msgid "Visual & Text"
 msgstr "بصری و متنی"
 
-#: fields/wysiwyg.php:377
+#: fields/wysiwyg.php:394
 msgid "Visual Only"
 msgstr "فقط بصری"
 
-#: fields/wysiwyg.php:378
+#: fields/wysiwyg.php:395
 msgid "Text Only"
 msgstr "فقط متن"
 
-#: fields/wysiwyg.php:385
+#: fields/wysiwyg.php:402
 msgid "Toolbar"
 msgstr "نوار ابزار"
 
-#: fields/wysiwyg.php:395
+#: fields/wysiwyg.php:412
 msgid "Show Media Upload Buttons?"
 msgstr "آیا دکمه های بارگذاری رسانه نمایش داده شوند؟"
 
-#: forms/post.php:298 pro/admin/options-page.php:374
+#: forms/comment.php:166 forms/post.php:295 pro/admin/options-page.php:416
 msgid "Edit field group"
 msgstr "ویرایش گروه زمینه"
 
+#: forms/widget.php:235
+#, php-format
+msgid "1 field requires attention."
+msgid_plural "%d fields require attention."
+msgstr[0] ""
+
+#. Plugin Name of the plugin/theme
 #: pro/acf-pro.php:24
 msgid "Advanced Custom Fields PRO"
 msgstr "زمینه های دلخواه پیشرفته نسخه حرفه ای"
@@ -2234,41 +2446,33 @@ msgstr "زمینه های دلخواه پیشرفته نسخه حرفه ای"
 msgid "Flexible Content requires at least 1 layout"
 msgstr "زمینه محتوای انعطاف پذیر حداقل به یک طرح نیاز دارد"
 
-#: pro/admin/options-page.php:48
+#: pro/admin/options-page.php:49
 msgid "Options Page"
 msgstr "برگه تنظیمات"
 
-#: pro/admin/options-page.php:83
+#: pro/admin/options-page.php:85
 msgid "No options pages exist"
 msgstr "هیچ صفحه تنظیماتی یافت نشد"
 
-#: pro/admin/options-page.php:298
+#: pro/admin/options-page.php:303
 msgid "Options Updated"
 msgstr "تنظیمات به روز شدند"
 
-#: pro/admin/options-page.php:304
-msgid "No Custom Field Groups found for this options page"
-msgstr "هیچ گروه زمینه دلخواهی برای این صفحه تنظیمات یافت نشد"
-
-#: pro/admin/options-page.php:304
-msgid "Create a Custom Field Group"
-msgstr "ساخت گروه زمینه دلخواه"
-
-#: pro/admin/settings-updates.php:137
-msgid "<b>Error</b>. Could not connect to update server"
-msgstr "خطا. امکان اتصال به سرور به روزرسانی الان ممکن نیست"
-
-#: pro/admin/settings-updates.php:267 pro/admin/settings-updates.php:338
-msgid "<b>Connection Error</b>. Sorry, please try again"
-msgstr "خطا در اتصال. متاسفیم. لطفا مجددا بررسی کنید"
-
-#: pro/admin/views/options-page.php:48
+#: pro/admin/options-page.php:309
 msgid "Publish"
 msgstr "انتشار"
 
-#: pro/admin/views/options-page.php:54
-msgid "Save Options"
-msgstr "ذخیره تنظیمات"
+#: pro/admin/options-page.php:315
+msgid "No Custom Field Groups found for this options page"
+msgstr "هیچ گروه زمینه دلخواهی برای این صفحه تنظیمات یافت نشد"
+
+#: pro/admin/options-page.php:315
+msgid "Create a Custom Field Group"
+msgstr "ساخت گروه زمینه دلخواه"
+
+#: pro/admin/settings-updates.php:87
+msgid "<b>Error</b>. Could not connect to update server"
+msgstr "خطا. امکان اتصال به سرور به روزرسانی الان ممکن نیست"
 
 #: pro/admin/views/settings-updates.php:11
 msgid "Deactivate License"
@@ -2279,20 +2483,18 @@ msgid "Activate License"
 msgstr "فعال سازی لایسنس"
 
 #: pro/admin/views/settings-updates.php:21
-msgid "License"
-msgstr "لایسنس"
+msgid "License Information"
+msgstr "اطلاعات لایسنس"
 
 #: pro/admin/views/settings-updates.php:24
+#, php-format
 msgid ""
 "To unlock updates, please enter your license key below. If you don't have a "
-"licence key, please see"
+"licence key, please see <a href=\"%s\" target=\"_blank\">details & pricing</"
+"a>."
 msgstr ""
-"برای به روزرسانی لطفا لایسنس خود را وارد کنید. اگر لایسنس ندارید اینجا را "
-"ببنید:"
-
-#: pro/admin/views/settings-updates.php:24
-msgid "details & pricing"
-msgstr "جزئیات و قیمت"
+"برای به روزرسانی لطفا کد لایسنس را وارد  کنید. <a href=\"%s\" target=\"_blank"
+"\">قیمت ها</a>."
 
 #: pro/admin/views/settings-updates.php:33
 msgid "License Key"
@@ -2334,16 +2536,82 @@ msgstr "نکات به روزرسانی"
 msgid "Options"
 msgstr "تنظیمات"
 
-#: pro/core/updates.php:186
+#: pro/core/updates.php:206
 #, php-format
 msgid ""
 "To enable updates, please enter your license key on the <a href=\"%s"
 "\">Updates</a> page. If you don't have a licence key, please see <a href=\"%s"
-"\">details & pricing</a>"
+"\">details & pricing</a>."
 msgstr ""
-"برای به روز رسانی لایسنس خود را در قسمت  <a href=\"%s\">به روزرسانی ها</a> "
-"وارد کنید. اگر لایسنس ندارید اینجا را ببینید: <a href=\"%s\">جزئیات ئ قیمت</"
-"a>"
+"برای به روزرسانی لطفا کد لایسنس را وارد  کنید. <a href=\"%s\">بروزرسانی</a>. "
+"<a href=\"%s\">قیمت ها</a>"
+
+#: pro/fields/clone.php:36
+msgctxt "noun"
+msgid "Clone"
+msgstr "کپی (هیچ)"
+
+#: pro/fields/clone.php:680
+msgid "Select one or more fields you wish to clone"
+msgstr "انتخاب فیلد دیگری برای کپی"
+
+#: pro/fields/clone.php:695
+msgid "Display"
+msgstr "نمایش"
+
+#: pro/fields/clone.php:696
+msgid "Specify the style used to render the clone field"
+msgstr "مشخص کردن استایل مورد نظر در نمایش دسته فیلدها"
+
+#: pro/fields/clone.php:701
+msgid "Group (displays selected fields in a group within this field)"
+msgstr "گروه ها(نمایش فیلدهای انتخابی در یک گروه با این فیلد)"
+
+#: pro/fields/clone.php:702
+msgid "Seamless (replaces this field with selected fields)"
+msgstr "بدون مانند (جایگزینی این فیلد با فیلدهای انتخابی)"
+
+#: pro/fields/clone.php:710
+msgid "Specify the style used to render the selected fields"
+msgstr "استایل جهت نمایش فیلد انتخابی"
+
+#: pro/fields/clone.php:715 pro/fields/flexible-content.php:555
+#: pro/fields/repeater.php:467
+msgid "Block"
+msgstr "بلوک"
+
+#: pro/fields/clone.php:716 pro/fields/flexible-content.php:554
+#: pro/fields/repeater.php:466
+msgid "Table"
+msgstr "جدول"
+
+#: pro/fields/clone.php:717 pro/fields/flexible-content.php:556
+#: pro/fields/repeater.php:468
+msgid "Row"
+msgstr "سطر"
+
+#: pro/fields/clone.php:723
+#, php-format
+msgid "Labels will be displayed as %s"
+msgstr "برچسب ها نمایش داده شوند به صورت %s"
+
+#: pro/fields/clone.php:726
+msgid "Prefix Field Labels"
+msgstr "پیشوند پرچسب فیلدها"
+
+#: pro/fields/clone.php:741
+#, php-format
+msgid "Values will be saved as %s"
+msgstr "مقادیر ذخیره خواهند شد به صورت %s"
+
+#: pro/fields/clone.php:744
+msgid "Prefix Field Names"
+msgstr "پیشوند نام فایل ها"
+
+#: pro/fields/clone.php:900
+#, php-format
+msgid "All fields from %s field group"
+msgstr "تمام فیلدها از %s گروه فیلد"
 
 #: pro/fields/flexible-content.php:36
 msgid "Flexible Content"
@@ -2389,72 +2657,60 @@ msgstr "{available} {label} {identifier} موجود است (حداکثر {max})"
 msgid "{required} {label} {identifier} required (min {min})"
 msgstr "{required} {label} {identifier} لازم دارد (حداقل {min})"
 
-#: pro/fields/flexible-content.php:211
+#: pro/fields/flexible-content.php:220
 #, php-format
 msgid "Click the \"%s\" button below to start creating your layout"
 msgstr "روی دکمه \"%s\" دز زیر کلیک کنید تا چیدمان خود را بسازید"
 
-#: pro/fields/flexible-content.php:356
+#: pro/fields/flexible-content.php:350
 msgid "Add layout"
 msgstr "طرح جدید"
 
-#: pro/fields/flexible-content.php:359
+#: pro/fields/flexible-content.php:353
 msgid "Remove layout"
 msgstr "حذف طرح"
 
-#: pro/fields/flexible-content.php:362 pro/fields/repeater.php:312
+#: pro/fields/flexible-content.php:356 pro/fields/repeater.php:304
 msgid "Click to toggle"
 msgstr "کلیک برای انتخاب"
 
-#: pro/fields/flexible-content.php:502
+#: pro/fields/flexible-content.php:497
 msgid "Reorder Layout"
 msgstr "ترتیب بندی طرح ها"
 
-#: pro/fields/flexible-content.php:502
+#: pro/fields/flexible-content.php:497
 msgid "Reorder"
 msgstr "مرتب سازی"
 
-#: pro/fields/flexible-content.php:503
+#: pro/fields/flexible-content.php:498
 msgid "Delete Layout"
 msgstr "حذف طرح"
 
-#: pro/fields/flexible-content.php:504
+#: pro/fields/flexible-content.php:499
 msgid "Duplicate Layout"
 msgstr "تکثیر طرح"
 
-#: pro/fields/flexible-content.php:505
+#: pro/fields/flexible-content.php:500
 msgid "Add New Layout"
 msgstr "افزودن طرح جدید"
 
-#: pro/fields/flexible-content.php:559 pro/fields/repeater.php:474
-msgid "Table"
-msgstr "جدول"
-
-#: pro/fields/flexible-content.php:560 pro/fields/repeater.php:475
-msgid "Block"
-msgstr "بلوک"
-
-#: pro/fields/flexible-content.php:561 pro/fields/repeater.php:476
-msgid "Row"
-msgstr "سطر"
-
-#: pro/fields/flexible-content.php:576
+#: pro/fields/flexible-content.php:571
 msgid "Min"
 msgstr "حداقل"
 
-#: pro/fields/flexible-content.php:589
+#: pro/fields/flexible-content.php:584
 msgid "Max"
 msgstr "حداکثر"
 
-#: pro/fields/flexible-content.php:617 pro/fields/repeater.php:483
+#: pro/fields/flexible-content.php:612 pro/fields/repeater.php:475
 msgid "Button Label"
 msgstr "متن دکمه"
 
-#: pro/fields/flexible-content.php:626
+#: pro/fields/flexible-content.php:621
 msgid "Minimum Layouts"
 msgstr "حداقل تعداد طرح ها"
 
-#: pro/fields/flexible-content.php:635
+#: pro/fields/flexible-content.php:630
 msgid "Maximum Layouts"
 msgstr "حداکثر تعداد طرح ها"
 
@@ -2470,50 +2726,70 @@ msgstr "افزودن تصویر به گالری"
 msgid "Maximum selection reached"
 msgstr "بیشترین حد انتخاب شده است"
 
-#: pro/fields/gallery.php:343
+#: pro/fields/gallery.php:336
 msgid "Length"
 msgstr "طول"
 
-#: pro/fields/gallery.php:363
-msgid "Remove"
-msgstr "حذف"
+#: pro/fields/gallery.php:379
+msgid "Caption"
+msgstr "متن"
 
-#: pro/fields/gallery.php:543
+#: pro/fields/gallery.php:388
+msgid "Alt Text"
+msgstr "متن جایگزین"
+
+#: pro/fields/gallery.php:559
 msgid "Add to gallery"
 msgstr "اضافه به گالری"
 
-#: pro/fields/gallery.php:547
+#: pro/fields/gallery.php:563
 msgid "Bulk actions"
 msgstr "کارهای گروهی"
 
-#: pro/fields/gallery.php:548
+#: pro/fields/gallery.php:564
 msgid "Sort by date uploaded"
 msgstr "به ترتیب تاریخ آپلود"
 
-#: pro/fields/gallery.php:549
+#: pro/fields/gallery.php:565
 msgid "Sort by date modified"
 msgstr "به ترتیب تاریخ اعمال تغییرات"
 
-#: pro/fields/gallery.php:550
+#: pro/fields/gallery.php:566
 msgid "Sort by title"
 msgstr "به ترتیب عنوان"
 
-#: pro/fields/gallery.php:551
+#: pro/fields/gallery.php:567
 msgid "Reverse current order"
 msgstr "معکوس سازی ترتیب کنونی"
 
-#: pro/fields/gallery.php:569
+#: pro/fields/gallery.php:585
 msgid "Close"
 msgstr "بستن"
 
-#: pro/fields/gallery.php:627
+#: pro/fields/gallery.php:639
 msgid "Minimum Selection"
 msgstr "حداقل انتخاب"
 
-#: pro/fields/gallery.php:636
+#: pro/fields/gallery.php:648
 msgid "Maximum Selection"
 msgstr "حداکثر انتخاب"
 
+#: pro/fields/gallery.php:657
+msgid "Insert"
+msgstr "درج"
+
+#: pro/fields/gallery.php:658
+msgid "Specify where new attachments are added"
+msgstr "مشخص کنید که پیوست ها کجا اضافه شوند"
+
+#: pro/fields/gallery.php:662
+msgid "Append to the end"
+msgstr "افزودن به انتها"
+
+#: pro/fields/gallery.php:663
+msgid "Prepend to the beginning"
+msgstr "افزودن قبل از"
+
 #: pro/fields/repeater.php:36
 msgid "Repeater"
 msgstr "زمینه تکرار کننده"
@@ -2526,38 +2802,143 @@ msgstr "مقادیر به حداکثر رسیده اند ( {min} سطر )"
 msgid "Maximum rows reached ({max} rows)"
 msgstr "مقادیر به حداکثر رسیده اند ( {max} سطر )"
 
-#: pro/fields/repeater.php:310
-msgid "Drag to reorder"
-msgstr "گرفتن و کشیدن برای مرتب سازی"
-
-#: pro/fields/repeater.php:357
+#: pro/fields/repeater.php:349
 msgid "Add row"
 msgstr "افزودن سطر"
 
-#: pro/fields/repeater.php:358
+#: pro/fields/repeater.php:350
 msgid "Remove row"
 msgstr "حذف سطر"
 
-#: pro/fields/repeater.php:406
+#: pro/fields/repeater.php:398
 msgid "Sub Fields"
 msgstr "زمینه های زیرمجموعه"
 
-#: pro/fields/repeater.php:436
+#: pro/fields/repeater.php:428
 msgid "Collapsed"
 msgstr "جمع شده"
 
-#: pro/fields/repeater.php:437
+#: pro/fields/repeater.php:429
 msgid "Select a sub field to show when row is collapsed"
 msgstr "یک زمینه زیرمجموعه را انتخاب کنید تا زمان بسته شدن طر نمایش داده شود"
 
-#: pro/fields/repeater.php:447
+#: pro/fields/repeater.php:439
 msgid "Minimum Rows"
 msgstr "حداقل تعداد سطرها"
 
-#: pro/fields/repeater.php:457
+#: pro/fields/repeater.php:449
 msgid "Maximum Rows"
 msgstr "حداکثر تعداد سطرها"
 
+#. Plugin URI of the plugin/theme
+msgid "https://www.advancedcustomfields.com/"
+msgstr "https://www.advancedcustomfields.com/"
+
+#. Description of the plugin/theme
+msgid "Customise WordPress with powerful, professional and intuitive fields"
+msgstr "شخصی سازی وردپرس با زمینه های قدرتمند، حرفه ای و دیداری"
+
+#. Author of the plugin/theme
+msgid "Elliot Condon"
+msgstr "Elliot Condon"
+
+#. Author URI of the plugin/theme
+msgid "http://www.elliotcondon.com/"
+msgstr "http://www.elliotcondon.com/"
+
+#~ msgid "See what's new in"
+#~ msgstr "ببینید چه چیزی جدید است"
+
+#~ msgid "version"
+#~ msgstr "نسخه"
+
+#~ msgid "<b>Success</b>. Import tool added %s field groups: %s"
+#~ msgstr "<b>انجام شد</b> ابزار وارد سازی %s زمینه را وارد کرد: %s"
+
+#~ msgid ""
+#~ "<b>Warning</b>. Import tool detected %s field groups already exist and "
+#~ "have been ignored: %s"
+#~ msgstr ""
+#~ "<b>اخطار</b> ابزار وارد سازی تشخصی داد که گروه زمینه %s اکنون موجود می "
+#~ "باشد و %s نادیده گرفته شد"
+
+#~ msgid "Upgrade ACF"
+#~ msgstr "بروزرسانی "
+
+#~ msgid "Upgrade"
+#~ msgstr "بروزرسانی"
+
+#~ msgid "Drag and drop to reorder"
+#~ msgstr "با گرفتن و کشیدن مرتب سازی کنید"
+
+#~ msgid ""
+#~ "The following sites require a DB upgrade. Check the ones you want to "
+#~ "update and then click “Upgrade Database”."
+#~ msgstr ""
+#~ "سایت‌های زیر نیاز به به‌روزرسانی دیتابیس دارند. آن‌هایی که تمایل دارید را "
+#~ "انتخاب کنید و دکمه به روزرسانی را کلیک کنید."
+
+#~ msgid "Upgrading data to"
+#~ msgstr "به روزرسانی داده ها به"
+
+#~ msgid "Done"
+#~ msgstr "انجام شده"
+
+#~ msgid "Today"
+#~ msgstr "امروز"
+
+#~ msgid "Show a different month"
+#~ msgstr "نمایش یک ماه دیگر"
+
+#~ msgid "Return format"
+#~ msgstr "فرمت بازگشت"
+
+#~ msgid "uploaded to this post"
+#~ msgstr "بارگذاری شده در این نوشته"
+
+#~ msgid "File Name"
+#~ msgstr "نام پرونده"
+
+#~ msgid "File Size"
+#~ msgstr "اندازه پرونده"
+
+#~ msgid "No File selected"
+#~ msgstr "هیچ پرونده ای انتخاب نشده"
+
+#~ msgid "Select"
+#~ msgstr "انتخاب(دراپ باکس)"
+
+#~ msgid "Add new %s "
+#~ msgstr "افزودن %s "
+
+#~ msgid "<b>Connection Error</b>. Sorry, please try again"
+#~ msgstr "خطا در اتصال. متاسفیم. لطفا مجددا بررسی کنید"
+
+#~ msgid "Save Options"
+#~ msgstr "ذخیره تنظیمات"
+
+#~ msgid "License"
+#~ msgstr "لایسنس"
+
+#~ msgid ""
+#~ "To unlock updates, please enter your license key below. If you don't have "
+#~ "a licence key, please see"
+#~ msgstr ""
+#~ "برای به روزرسانی لطفا لایسنس خود را وارد کنید. اگر لایسنس ندارید اینجا را "
+#~ "ببنید:"
+
+#~ msgid "details & pricing"
+#~ msgstr "جزئیات و قیمت"
+
+#~ msgid ""
+#~ "To enable updates, please enter your license key on the <a href=\"%s"
+#~ "\">Updates</a> page. If you don't have a licence key, please see <a href="
+#~ "\"%s\">details & pricing</a>"
+#~ msgstr ""
+#~ "برای به روز رسانی لایسنس خود را در قسمت  <a href=\"%s\">به روزرسانی ها</"
+#~ "a> وارد کنید. اگر لایسنس ندارید اینجا را ببینید: <a href=\"%s\">جزئیات ئ "
+#~ "قیمت</a>"
+
 #~ msgid ""
 #~ "Please note that all text will first be passed through the wp function "
 #~ msgstr "دقت کنید که نکاک متن ها اول از تابع وردپرس عبور خواهند کرد"
@@ -2565,9 +2946,6 @@ msgstr "حداکثر تعداد سطرها"
 #~ msgid "Warning"
 #~ msgstr "اخطار"
 
-#~ msgid "Display"
-#~ msgstr "نمایش"
-
 #~ msgid "Hide / Show All"
 #~ msgstr "مخفی کردن / نمایش همه"
 
diff --git a/lang/acf-nl_NL.mo b/lang/acf-nl_NL.mo
index 09c7146..5eaec9e 100644
Binary files a/lang/acf-nl_NL.mo and b/lang/acf-nl_NL.mo differ
diff --git a/lang/acf-nl_NL.po b/lang/acf-nl_NL.po
index 94e4467..e5498f0 100644
--- a/lang/acf-nl_NL.po
+++ b/lang/acf-nl_NL.po
@@ -2,15 +2,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Advanced Custom Fields Pro v5.2.9\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
-"POT-Creation-Date: 2016-02-12 07:59+0100\n"
-"PO-Revision-Date: 2016-04-07 10:30+1000\n"
+"POT-Creation-Date: 2016-07-10 20:42+0200\n"
+"PO-Revision-Date: 2016-07-10 20:52+0200\n"
 "Last-Translator: Elliot Condon <e@elliotcondon.com>\n"
 "Language-Team: Derk Oosterveld <derk@inpoint.nl>\n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.1\n"
+"X-Generator: Poedit 1.8.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
@@ -22,95 +22,95 @@ msgstr ""
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SearchPathExcluded-0: *.js\n"
 
-#: acf.php:63
+#: acf.php:60
 msgid "Advanced Custom Fields"
 msgstr "Advanced Custom Fields"
 
-#: acf.php:266 admin/admin.php:61
+#: acf.php:267 admin/admin.php:61
 msgid "Field Groups"
 msgstr "Groepen"
 
-#: acf.php:267
+#: acf.php:268
 msgid "Field Group"
 msgstr "Nieuwe groep"
 
-#: acf.php:268 acf.php:300 admin/admin.php:62
-#: pro/fields/flexible-content.php:506
+#: acf.php:269 acf.php:301 admin/admin.php:62
+#: pro/fields/flexible-content.php:496
 msgid "Add New"
 msgstr "Nieuwe groep"
 
-#: acf.php:269
+#: acf.php:270
 msgid "Add New Field Group"
 msgstr "Nieuwe groep toevoegen"
 
-#: acf.php:270
+#: acf.php:271
 msgid "Edit Field Group"
 msgstr "Bewerk groep"
 
-#: acf.php:271
+#: acf.php:272
 msgid "New Field Group"
 msgstr "Nieuwe groep"
 
-#: acf.php:272
+#: acf.php:273
 msgid "View Field Group"
 msgstr "Bekijk groep"
 
-#: acf.php:273
+#: acf.php:274
 msgid "Search Field Groups"
 msgstr "Zoek groepen"
 
-#: acf.php:274
+#: acf.php:275
 msgid "No Field Groups found"
 msgstr "Geen groepen gevonden"
 
-#: acf.php:275
+#: acf.php:276
 msgid "No Field Groups found in Trash"
 msgstr "Geen groepen gevonden in de prullenbak"
 
-#: acf.php:298 admin/field-group.php:176 admin/field-group.php:223
+#: acf.php:299 admin/field-group.php:182 admin/field-group.php:280
 #: admin/field-groups.php:528
 msgid "Fields"
 msgstr "Velden"
 
-#: acf.php:299
+#: acf.php:300
 msgid "Field"
 msgstr "Veld"
 
-#: acf.php:301
+#: acf.php:302
 msgid "Add New Field"
 msgstr "Nieuw veld"
 
-#: acf.php:302
+#: acf.php:303
 msgid "Edit Field"
 msgstr "Bewerk veld"
 
-#: acf.php:303 admin/views/field-group-fields.php:18
+#: acf.php:304 admin/views/field-group-fields.php:18
 #: admin/views/settings-info.php:111
 msgid "New Field"
 msgstr "Nieuw veld"
 
-#: acf.php:304
+#: acf.php:305
 msgid "View Field"
 msgstr "Nieuw veld"
 
-#: acf.php:305
+#: acf.php:306
 msgid "Search Fields"
 msgstr "Zoek velden"
 
-#: acf.php:306
+#: acf.php:307
 msgid "No Fields found"
 msgstr "Geen velden gevonden"
 
-#: acf.php:307
+#: acf.php:308
 msgid "No Fields found in Trash"
 msgstr "Geen velden gevonden in de prullenbak"
 
-#: acf.php:346 admin/field-group.php:316 admin/field-groups.php:586
+#: acf.php:347 admin/field-group.php:395 admin/field-groups.php:586
 #: admin/views/field-group-options.php:13
 msgid "Disabled"
 msgstr "Inactief"
 
-#: acf.php:351
+#: acf.php:352
 #, php-format
 msgid "Disabled <span class=\"count\">(%s)</span>"
 msgid_plural "Disabled <span class=\"count\">(%s)</span>"
@@ -131,7 +131,7 @@ msgstr "Groep verwijderd."
 
 #: admin/field-group.php:73
 msgid "Field group published."
-msgstr "Groep gepubliseerd."
+msgstr "Groep gepubliceerd."
 
 #: admin/field-group.php:74
 msgid "Field group saved."
@@ -149,152 +149,152 @@ msgstr "Groep gepland voor."
 msgid "Field group draft updated."
 msgstr "Groep concept bijgewerkt."
 
-#: admin/field-group.php:177
+#: admin/field-group.php:183
 msgid "Location"
 msgstr "Locatie"
 
-#: admin/field-group.php:178
+#: admin/field-group.php:184
 msgid "Settings"
 msgstr "Instellingen"
 
-#: admin/field-group.php:217
+#: admin/field-group.php:274
 msgid "Move to trash. Are you sure?"
 msgstr "Naar prullenbak. Weet je het zeker?"
 
-#: admin/field-group.php:218
+#: admin/field-group.php:275
 msgid "checked"
 msgstr "aangevinkt"
 
-#: admin/field-group.php:219
+#: admin/field-group.php:276
 msgid "No toggle fields available"
 msgstr "Geen aan/uit velden beschikbaar"
 
-#: admin/field-group.php:220
+#: admin/field-group.php:277
 msgid "Field group title is required"
 msgstr "Titel is verplicht"
 
-#: admin/field-group.php:221 api/api-field-group.php:581
+#: admin/field-group.php:278 api/api-field-group.php:620
 msgid "copy"
 msgstr "kopie"
 
-#: admin/field-group.php:222
+#: admin/field-group.php:279
 #: admin/views/field-group-field-conditional-logic.php:62
 #: admin/views/field-group-field-conditional-logic.php:162
 #: admin/views/field-group-locations.php:59
-#: admin/views/field-group-locations.php:135 api/api-helpers.php:3401
+#: admin/views/field-group-locations.php:135 api/api-helpers.php:3684
 msgid "or"
 msgstr "of"
 
-#: admin/field-group.php:224
+#: admin/field-group.php:281
 msgid "Parent fields"
 msgstr "Hoofdpagina"
 
-#: admin/field-group.php:225
+#: admin/field-group.php:282
 msgid "Sibling fields"
 msgstr "Zuster velden"
 
-#: admin/field-group.php:226
+#: admin/field-group.php:283
 msgid "Move Custom Field"
 msgstr "Verplaats extra veld"
 
-#: admin/field-group.php:227
+#: admin/field-group.php:284
 msgid "This field cannot be moved until its changes have been saved"
 msgstr ""
 "Dit veld kan niet worden verplaatst totdat de wijzigingen zijn opgeslagen"
 
-#: admin/field-group.php:228
+#: admin/field-group.php:285
 msgid "Null"
 msgstr "Nul"
 
-#: admin/field-group.php:229 core/input.php:217
+#: admin/field-group.php:286 core/input.php:257
 msgid "The changes you made will be lost if you navigate away from this page"
 msgstr "De gemaakte wijzigingen gaan verloren als je deze pagina verlaat"
 
-#: admin/field-group.php:230
+#: admin/field-group.php:287
 msgid "The string \"field_\" may not be used at the start of a field name"
 msgstr "De string \"field_\" mag niet voor de veld naam staan"
 
-#: admin/field-group.php:286
+#: admin/field-group.php:365
 msgid "Field Keys"
 msgstr "Veld keys"
 
-#: admin/field-group.php:316 admin/views/field-group-options.php:12
+#: admin/field-group.php:395 admin/views/field-group-options.php:12
 msgid "Active"
 msgstr "Actief"
 
-#: admin/field-group.php:785
+#: admin/field-group.php:843
 msgid "Front Page"
 msgstr "Hoofdpagina"
 
-#: admin/field-group.php:786
+#: admin/field-group.php:844
 msgid "Posts Page"
 msgstr "Berichten pagina"
 
-#: admin/field-group.php:787
+#: admin/field-group.php:845
 msgid "Top Level Page (no parent)"
 msgstr "Hoofdpagina (geen hoofd)"
 
-#: admin/field-group.php:788
+#: admin/field-group.php:846
 msgid "Parent Page (has children)"
 msgstr "Hoofdpagina (bevat subitems)"
 
-#: admin/field-group.php:789
+#: admin/field-group.php:847
 msgid "Child Page (has parent)"
 msgstr "Subpagina"
 
-#: admin/field-group.php:805
+#: admin/field-group.php:863
 msgid "Default Template"
 msgstr "Standaard template"
 
-#: admin/field-group.php:827
+#: admin/field-group.php:886
 msgid "Logged in"
 msgstr "Ingelogd"
 
-#: admin/field-group.php:828
+#: admin/field-group.php:887
 msgid "Viewing front end"
 msgstr "Bekijk voorkant"
 
-#: admin/field-group.php:829
+#: admin/field-group.php:888
 msgid "Viewing back end"
 msgstr "Bekijk achterkant"
 
-#: admin/field-group.php:848
+#: admin/field-group.php:907
 msgid "Super Admin"
 msgstr "Super beheerder"
 
-#: admin/field-group.php:859 admin/field-group.php:867
-#: admin/field-group.php:881 admin/field-group.php:888
-#: admin/field-group.php:903 admin/field-group.php:913 fields/file.php:235
-#: fields/image.php:231 pro/fields/gallery.php:661
+#: admin/field-group.php:918 admin/field-group.php:926
+#: admin/field-group.php:940 admin/field-group.php:947
+#: admin/field-group.php:964 admin/field-group.php:981 fields/file.php:241
+#: fields/image.php:237 pro/fields/gallery.php:684
 msgid "All"
 msgstr "Alles"
 
-#: admin/field-group.php:868
+#: admin/field-group.php:927
 msgid "Add / Edit"
 msgstr "Toevoegen / Bewerken"
 
-#: admin/field-group.php:869
+#: admin/field-group.php:928
 msgid "Register"
 msgstr "Registreer"
 
-#: admin/field-group.php:1100
+#: admin/field-group.php:1168
 msgid "Move Complete."
 msgstr "Verplaatsen geslaagd."
 
-#: admin/field-group.php:1101
+#: admin/field-group.php:1169
 #, php-format
 msgid "The %s field can now be found in the %s field group"
 msgstr "Het veld: %s bevindt zich nu in de groep: %s"
 
-#: admin/field-group.php:1103
+#: admin/field-group.php:1171
 msgid "Close Window"
 msgstr "Venster sluiten"
 
-#: admin/field-group.php:1138
+#: admin/field-group.php:1206
 msgid "Please select the destination for this field"
 msgstr "Selecteer de bestemming voor dit veld"
 
-#: admin/field-group.php:1145
+#: admin/field-group.php:1213
 msgid "Move Field"
 msgstr "Veld verplaatsen"
 
@@ -333,12 +333,14 @@ msgstr[1] "%s groepen gesynchroniseerd."
 msgid "Sync available"
 msgstr "Synchronisatie beschikbaar"
 
-#: admin/field-groups.php:525
+#: admin/field-groups.php:525 api/api-template.php:1079
+#: api/api-template.php:1292 pro/fields/gallery.php:371
 msgid "Title"
 msgstr "Titel"
 
 #: admin/field-groups.php:526 admin/views/field-group-options.php:93
-#: admin/views/update-network.php:20 admin/views/update-network.php:28
+#: admin/views/update-network.php:25 admin/views/update-network.php:33
+#: pro/fields/gallery.php:398
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -352,12 +354,9 @@ msgid "Changelog"
 msgstr "Wat is er nieuw?"
 
 #: admin/field-groups.php:625
-msgid "See what's new in"
-msgstr "Bekijk alle vernieuwingen en verbeteringen van"
-
-#: admin/field-groups.php:625
-msgid "version"
-msgstr "versie"
+#, php-format
+msgid "See what's new in <a href=\"%s\">version %s</a>."
+msgstr "Bekijk wat nieuw is in <a href=\"%s\">versie %s</a>."
 
 #: admin/field-groups.php:627
 msgid "Resources"
@@ -367,7 +366,7 @@ msgstr "Documentatie (Engels)"
 msgid "Getting Started"
 msgstr "Aan de slag"
 
-#: admin/field-groups.php:630 pro/admin/settings-updates.php:73
+#: admin/field-groups.php:630 pro/admin/settings-updates.php:61
 #: pro/admin/views/settings-updates.php:17
 msgid "Updates"
 msgstr "Updates"
@@ -384,7 +383,7 @@ msgstr "Functies"
 msgid "Actions"
 msgstr "Acties"
 
-#: admin/field-groups.php:634 fields/relationship.php:717
+#: admin/field-groups.php:634 fields/relationship.php:720
 msgid "Filters"
 msgstr "Filters"
 
@@ -396,29 +395,33 @@ msgstr "Veelgestelde vragen"
 msgid "Tutorials"
 msgstr "Tutorials"
 
-#: admin/field-groups.php:641
+#: admin/field-groups.php:637
+msgid "FAQ"
+msgstr "FAQ"
+
+#: admin/field-groups.php:642
 msgid "Created by"
 msgstr "Ontwikkeld door"
 
-#: admin/field-groups.php:684
+#: admin/field-groups.php:685
 msgid "Duplicate this item"
 msgstr "Dupliceer dit item"
 
-#: admin/field-groups.php:684 admin/field-groups.php:700
-#: admin/views/field-group-field.php:58 pro/fields/flexible-content.php:505
+#: admin/field-groups.php:685 admin/field-groups.php:701
+#: admin/views/field-group-field.php:58 pro/fields/flexible-content.php:495
 msgid "Duplicate"
 msgstr "Dupliceer"
 
-#: admin/field-groups.php:746
+#: admin/field-groups.php:747
 #, php-format
 msgid "Select %s"
 msgstr "Selecteer %s"
 
-#: admin/field-groups.php:754
+#: admin/field-groups.php:755
 msgid "Synchronise field group"
 msgstr "Synchroniseer groep"
 
-#: admin/field-groups.php:754 admin/field-groups.php:771
+#: admin/field-groups.php:755 admin/field-groups.php:772
 msgid "Sync"
 msgstr "Synchroniseer"
 
@@ -438,87 +441,83 @@ msgstr "Informatie"
 msgid "What's New"
 msgstr "Wat is er nieuw"
 
-#: admin/settings-tools.php:54 admin/views/settings-tools-export.php:23
+#: admin/settings-tools.php:50 admin/views/settings-tools-export.php:23
 #: admin/views/settings-tools.php:31
 msgid "Tools"
 msgstr "Tools"
 
-#: admin/settings-tools.php:151 admin/settings-tools.php:369
+#: admin/settings-tools.php:147 admin/settings-tools.php:380
 msgid "No field groups selected"
 msgstr "Geen groepen geselecteerd"
 
-#: admin/settings-tools.php:188
+#: admin/settings-tools.php:184 fields/file.php:175
 msgid "No file selected"
 msgstr "Geen bestanden geselecteerd"
 
-#: admin/settings-tools.php:201
+#: admin/settings-tools.php:197
 msgid "Error uploading file. Please try again"
 msgstr "Fout bij het uploaden van bestand. Probeer het nog eens"
 
-#: admin/settings-tools.php:210
+#: admin/settings-tools.php:206
 msgid "Incorrect file type"
 msgstr "Ongeldig bestandstype"
 
-#: admin/settings-tools.php:227
+#: admin/settings-tools.php:223
 msgid "Import file empty"
 msgstr "Importeer bestand is leeg"
 
-#: admin/settings-tools.php:323
+#: admin/settings-tools.php:331
 #, php-format
-msgid "<b>Success</b>. Import tool added %s field groups: %s"
-msgstr ""
-"<b>Gelukt!</b>. De importeer tool heeft %s velden en %s groepen geïmporteerd"
+msgid "Imported 1 field group"
+msgid_plural "Imported %s field groups"
+msgstr[0] "1 groep geïmporteerd"
+msgstr[1] "%s groepen geïmporteerd"
 
-#: admin/settings-tools.php:332
-#, php-format
-msgid ""
-"<b>Warning</b>. Import tool detected %s field groups already exist and have "
-"been ignored: %s"
-msgstr ""
-"<b>Waarschuwing</b>. De importeer functie heeft %s bestaande veldgroepen "
-"gedetecteerd en heeft deze genegeerd: %s"
+#: admin/update-network.php:96 admin/update.php:104 admin/update.php:155
+msgid "Upgrade Database"
+msgstr "Upgrade database"
 
-#: admin/update.php:113
-msgid "Upgrade ACF"
-msgstr "Upgrade ACF"
-
-#: admin/update.php:143
+#: admin/update-network.php:148
 msgid "Review sites & upgrade"
 msgstr "Controleer websites & upgrade"
 
-#: admin/update.php:298
-msgid "Upgrade"
-msgstr "Upgrade"
+#: admin/update.php:220
+msgid "Error validating request"
+msgstr "Fout bij valideren"
 
-#: admin/update.php:328
-msgid "Upgrade Database"
-msgstr "Upgrade database"
+#: admin/update.php:243 admin/views/update.php:110
+msgid "No updates available"
+msgstr "Geen updates beschikbaar"
+
+#: admin/update.php:260
+msgid "Error loading update"
+msgstr "Fout bij laden van update"
 
 #: admin/views/field-group-field-conditional-logic.php:29
 msgid "Conditional Logic"
 msgstr "Conditionele logica"
 
 #: admin/views/field-group-field-conditional-logic.php:40
-#: admin/views/field-group-field.php:140 fields/checkbox.php:246
-#: fields/message.php:144 fields/page_link.php:553 fields/page_link.php:567
-#: fields/post_object.php:419 fields/post_object.php:433 fields/select.php:377
-#: fields/select.php:391 fields/select.php:405 fields/select.php:419
-#: fields/tab.php:161 fields/taxonomy.php:808 fields/taxonomy.php:822
-#: fields/taxonomy.php:836 fields/taxonomy.php:850 fields/user.php:461
-#: fields/user.php:475 fields/wysiwyg.php:415
+#: admin/views/field-group-field.php:140 fields/checkbox.php:243
+#: fields/message.php:144 fields/page_link.php:539 fields/page_link.php:553
+#: fields/post_object.php:403 fields/post_object.php:417 fields/radio.php:254
+#: fields/select.php:440 fields/select.php:454 fields/select.php:468
+#: fields/select.php:482 fields/tab.php:130 fields/taxonomy.php:772
+#: fields/taxonomy.php:786 fields/taxonomy.php:800 fields/taxonomy.php:814
+#: fields/user.php:416 fields/user.php:430 fields/wysiwyg.php:418
 #: pro/admin/views/settings-updates.php:93
 msgid "Yes"
 msgstr "Ja"
 
 #: admin/views/field-group-field-conditional-logic.php:41
-#: admin/views/field-group-field.php:141 fields/checkbox.php:247
-#: fields/message.php:145 fields/page_link.php:554 fields/page_link.php:568
-#: fields/post_object.php:420 fields/post_object.php:434 fields/select.php:378
-#: fields/select.php:392 fields/select.php:406 fields/select.php:420
-#: fields/tab.php:162 fields/taxonomy.php:723 fields/taxonomy.php:809
-#: fields/taxonomy.php:823 fields/taxonomy.php:837 fields/taxonomy.php:851
-#: fields/user.php:462 fields/user.php:476 fields/wysiwyg.php:416
-#: pro/admin/views/settings-updates.php:103
+#: admin/views/field-group-field.php:141 fields/checkbox.php:244
+#: fields/message.php:145 fields/page_link.php:540 fields/page_link.php:554
+#: fields/post_object.php:404 fields/post_object.php:418 fields/radio.php:255
+#: fields/select.php:441 fields/select.php:455 fields/select.php:469
+#: fields/select.php:483 fields/tab.php:131 fields/taxonomy.php:687
+#: fields/taxonomy.php:773 fields/taxonomy.php:787 fields/taxonomy.php:801
+#: fields/taxonomy.php:815 fields/user.php:417 fields/user.php:431
+#: fields/wysiwyg.php:419 pro/admin/views/settings-updates.php:103
 msgid "No"
 msgstr "Nee"
 
@@ -546,11 +545,17 @@ msgstr "en"
 msgid "Add rule group"
 msgstr "Nieuwe groep toevoegen"
 
+#: admin/views/field-group-field.php:49 pro/fields/flexible-content.php:342
+#: pro/fields/repeater.php:302
+msgid "Drag to reorder"
+msgstr "Sleep om te sorteren"
+
 #: admin/views/field-group-field.php:54 admin/views/field-group-field.php:57
 msgid "Edit field"
 msgstr "Bewerk veld"
 
-#: admin/views/field-group-field.php:57 pro/fields/gallery.php:363
+#: admin/views/field-group-field.php:57 core/media.php:55 fields/image.php:142
+#: pro/fields/gallery.php:358
 msgid "Edit"
 msgstr "Bewerk"
 
@@ -570,12 +575,12 @@ msgstr "Verplaats"
 msgid "Delete field"
 msgstr "Verwijder veld"
 
-#: admin/views/field-group-field.php:60 pro/fields/flexible-content.php:504
+#: admin/views/field-group-field.php:60 pro/fields/flexible-content.php:494
 msgid "Delete"
 msgstr "Verwijder"
 
 #: admin/views/field-group-field.php:68 fields/oembed.php:225
-#: fields/taxonomy.php:924
+#: fields/taxonomy.php:888
 msgid "Error"
 msgstr "Fout"
 
@@ -603,7 +608,7 @@ msgstr "Enkel woord, geen spaties. (Liggende) streepjes toegestaan."
 msgid "Field Type"
 msgstr "Soort veld"
 
-#: admin/views/field-group-field.php:121 fields/tab.php:134
+#: admin/views/field-group-field.php:121 fields/tab.php:103
 msgid "Instructions"
 msgstr "Instructies"
 
@@ -639,11 +644,12 @@ msgstr "Veld sluiten"
 msgid "Order"
 msgstr "Volgorde"
 
-#: admin/views/field-group-fields.php:30 pro/fields/flexible-content.php:531
+#: admin/views/field-group-fields.php:30 pro/fields/flexible-content.php:521
 msgid "Label"
 msgstr "Label"
 
-#: admin/views/field-group-fields.php:31 pro/fields/flexible-content.php:544
+#: admin/views/field-group-fields.php:31 fields/taxonomy.php:954
+#: pro/fields/flexible-content.php:534
 msgid "Name"
 msgstr "Naam"
 
@@ -668,7 +674,7 @@ msgstr "+ Nieuw veld"
 msgid "Post"
 msgstr "Bericht"
 
-#: admin/views/field-group-locations.php:6 fields/relationship.php:723
+#: admin/views/field-group-locations.php:6 fields/relationship.php:726
 msgid "Post Type"
 msgstr "Post type"
 
@@ -725,7 +731,7 @@ msgstr "Gebruiker formulier"
 msgid "User Role"
 msgstr "Rol"
 
-#: admin/views/field-group-locations.php:25 pro/admin/options-page.php:48
+#: admin/views/field-group-locations.php:25 pro/admin/options-page.php:49
 msgid "Forms"
 msgstr "Formulieren"
 
@@ -793,11 +799,11 @@ msgstr "Zijkant"
 msgid "Label placement"
 msgstr "Label positionering"
 
-#: admin/views/field-group-options.php:59 fields/tab.php:148
+#: admin/views/field-group-options.php:59 fields/tab.php:117
 msgid "Top aligned"
 msgstr "Boven velden"
 
-#: admin/views/field-group-options.php:60 fields/tab.php:149
+#: admin/views/field-group-options.php:60 fields/tab.php:118
 msgid "Left Aligned"
 msgstr "Links naast velden"
 
@@ -882,7 +888,7 @@ msgstr "Format"
 msgid "Page Attributes"
 msgstr "Pagina-attributen"
 
-#: admin/views/field-group-options.php:123 fields/relationship.php:736
+#: admin/views/field-group-options.php:123 fields/relationship.php:739
 msgid "Featured Image"
 msgstr "Uitgelichte afbeelding"
 
@@ -1247,40 +1253,45 @@ msgstr "Selecteer bestand"
 msgid "Import"
 msgstr "Importeer"
 
-#: admin/views/update-network.php:8 admin/views/update.php:8
+#: admin/views/update-network.php:4
+msgid "Upgrade Sites"
+msgstr "Upgrade websites"
+
+#: admin/views/update-network.php:13 admin/views/update.php:8
 msgid "Advanced Custom Fields Database Upgrade"
 msgstr "Advanced Custom Fields database upgrade"
 
-#: admin/views/update-network.php:10
+#: admin/views/update-network.php:15
+#, php-format
 msgid ""
 "The following sites require a DB upgrade. Check the ones you want to update "
-"and then click “Upgrade Database”."
+"and then click %s."
 msgstr ""
-"De volgende website vereist een DB upgrade. Selecteer degene die u wilt "
-"updaten en klik op “Upgrade database”."
+"Er is een database upgrade nodig voor de volgende websites. Controleer "
+"degene die je wilt updaten en klik %s."
 
-#: admin/views/update-network.php:19 admin/views/update-network.php:27
+#: admin/views/update-network.php:24 admin/views/update-network.php:32
 msgid "Site"
 msgstr "Website"
 
-#: admin/views/update-network.php:47
+#: admin/views/update-network.php:52
 #, php-format
 msgid "Site requires database upgrade from %s to %s"
 msgstr "Website vereist een database upgrade van %s naar %s"
 
-#: admin/views/update-network.php:49
+#: admin/views/update-network.php:54
 msgid "Site is up to date"
 msgstr "Website is up-to-date"
 
-#: admin/views/update-network.php:62 admin/views/update.php:16
+#: admin/views/update-network.php:67 admin/views/update.php:16
 msgid "Database Upgrade complete"
 msgstr "Database upgrade afgerond"
 
-#: admin/views/update-network.php:62
+#: admin/views/update-network.php:67
 msgid "Return to network dashboard"
 msgstr "Terug naar netwerk dashboard"
 
-#: admin/views/update-network.php:101 admin/views/update-notice.php:35
+#: admin/views/update-network.php:106 admin/views/update-notice.php:35
 msgid ""
 "It is strongly recommended that you backup your database before proceeding. "
 "Are you sure you wish to run the updater now?"
@@ -1288,13 +1299,14 @@ msgstr ""
 "Het is aan te raden om eerst een backup van de database te maken voordat je "
 "de update uitvoert. Weet je zeker dat je de update nu wilt uitvoeren?"
 
-#: admin/views/update-network.php:157
+#: admin/views/update-network.php:162
 msgid "Upgrade complete"
 msgstr "Upgrade afgerond"
 
-#: admin/views/update-network.php:161
-msgid "Upgrading data to"
-msgstr "Upgraden van data naar "
+#: admin/views/update-network.php:166 admin/views/update.php:14
+#, php-format
+msgid "Upgrading data to version %s"
+msgstr "Bezig met upgraden naar versie %s"
 
 #: admin/views/update-notice.php:23
 msgid "Database Upgrade Required"
@@ -1317,196 +1329,202 @@ msgstr ""
 msgid "Reading upgrade tasks..."
 msgstr "Lezen van upgrade taken…"
 
-#: admin/views/update.php:14
-#, php-format
-msgid "Upgrading data to version %s"
-msgstr "Bezig met upgraden naar versie %s"
-
 #: admin/views/update.php:16
 msgid "See what's new"
 msgstr "Bekijk alle vernieuwingen en verbeteringen van"
 
-#: admin/views/update.php:110
-msgid "No updates available"
-msgstr "Geen updates beschikbaar"
-
-#: api/api-helpers.php:909
+#: api/api-helpers.php:933
 msgid "Thumbnail"
 msgstr "Thumbnail"
 
-#: api/api-helpers.php:910
+#: api/api-helpers.php:934
 msgid "Medium"
 msgstr "Gemiddeld"
 
-#: api/api-helpers.php:911
+#: api/api-helpers.php:935
 msgid "Large"
 msgstr "Groot"
 
-#: api/api-helpers.php:959
+#: api/api-helpers.php:984
 msgid "Full Size"
 msgstr "Volledige grootte"
 
-#: api/api-helpers.php:1149 api/api-helpers.php:1711
+#: api/api-helpers.php:1196 api/api-helpers.php:1759
 msgid "(no title)"
 msgstr "(geen titel)"
 
-#: api/api-helpers.php:3322
+#: api/api-helpers.php:3605
 #, php-format
 msgid "Image width must be at least %dpx."
 msgstr "Afbeelding breedte moet tenminste %dpx zijn."
 
-#: api/api-helpers.php:3327
+#: api/api-helpers.php:3610
 #, php-format
 msgid "Image width must not exceed %dpx."
 msgstr "Afbeelding mag niet breder zijn dan %dpx."
 
-#: api/api-helpers.php:3343
+#: api/api-helpers.php:3626
 #, php-format
 msgid "Image height must be at least %dpx."
 msgstr "Afbeelding hoogte moet tenminste %dpx zijn."
 
-#: api/api-helpers.php:3348
+#: api/api-helpers.php:3631
 #, php-format
 msgid "Image height must not exceed %dpx."
 msgstr "Afbeelding mag niet hoger zijn dan %dpx."
 
-#: api/api-helpers.php:3366
+#: api/api-helpers.php:3649
 #, php-format
 msgid "File size must be at least %s."
 msgstr "Bestandsgrootte moet tenminste %s zijn."
 
-#: api/api-helpers.php:3371
+#: api/api-helpers.php:3654
 #, php-format
 msgid "File size must must not exceed %s."
 msgstr "Bestand mag niet groter zijn dan %s."
 
-#: api/api-helpers.php:3405
+#: api/api-helpers.php:3688
 #, php-format
 msgid "File type must be %s."
 msgstr "Bestandstype moet %s zijn."
 
-#: api/api-template.php:1069
+#: api/api-template.php:1094
 msgid "Spam Detected"
 msgstr "Spam gedetecteerd"
 
-#: api/api-template.php:1214 pro/fields/gallery.php:572
+#: api/api-template.php:1237 core/media.php:56 pro/api/api-options-page.php:50
+#: pro/fields/gallery.php:586
 msgid "Update"
 msgstr "Bijwerken"
 
-#: api/api-template.php:1215
+#: api/api-template.php:1238
 msgid "Post updated"
 msgstr "Bericht bijgewerkt"
 
-#: core/field.php:131
-msgid "Basic"
-msgstr "Basis"
-
-#: core/field.php:132
+#: api/api-template.php:1306 core/field.php:133
 msgid "Content"
 msgstr "Inhoud"
 
-#: core/field.php:133
+#: api/api-template.php:1371
+msgid "Validate Email"
+msgstr "Valideer e-mail"
+
+#: core/field.php:132
+msgid "Basic"
+msgstr "Basis"
+
+#: core/field.php:134
 msgid "Choice"
 msgstr "Keuze"
 
-#: core/field.php:134
+#: core/field.php:135
 msgid "Relational"
 msgstr "Relatie"
 
-#: core/field.php:135
+#: core/field.php:136
 msgid "jQuery"
 msgstr "jQuery"
 
-#: core/field.php:136 fields/checkbox.php:226 fields/radio.php:231
-#: pro/fields/flexible-content.php:501 pro/fields/flexible-content.php:550
-#: pro/fields/repeater.php:467
+#: core/field.php:137 fields/checkbox.php:223 fields/radio.php:292
+#: pro/fields/flexible-content.php:491 pro/fields/flexible-content.php:540
+#: pro/fields/repeater.php:459
 msgid "Layout"
 msgstr "Layout"
 
-#: core/input.php:218
+#: core/input.php:258
 msgid "Expand Details"
 msgstr "Toon details"
 
-#: core/input.php:219
+#: core/input.php:259
 msgid "Collapse Details"
 msgstr "Verberg details"
 
-#: core/input.php:220
+#: core/input.php:260
 msgid "Validation successful"
 msgstr "Validatie geslaagd"
 
-#: core/input.php:221
+#: core/input.php:261 core/validation.php:306 forms/widget.php:234
 msgid "Validation failed"
 msgstr "Validatie mislukt"
 
-#: core/input.php:222
+#: core/input.php:262
 msgid "1 field requires attention"
 msgstr "1 veld heeft aandacht nodig"
 
-#: core/input.php:223
+#: core/input.php:263
 #, php-format
 msgid "%d fields require attention"
 msgstr "%d velden hebben aandacht nodig"
 
-#: core/input.php:224
+#: core/input.php:264
 msgid "Restricted"
 msgstr "Verplicht"
 
-#: core/input.php:541
+#: core/media.php:54 fields/select.php:36 fields/select.php:230
+#: fields/taxonomy.php:759
+msgid "Select"
+msgstr "Selecteer"
+
+#: core/media.php:57 fields/file.php:49 fields/image.php:54
+#: pro/fields/gallery.php:56
+msgid "Uploaded to this post"
+msgstr "Geüpload naar deze post"
+
+#: core/validation.php:207
 #, php-format
 msgid "%s value is required"
 msgstr "%s waarde is verplicht"
 
-#: fields/checkbox.php:36 fields/taxonomy.php:790
+#: fields/checkbox.php:36 fields/taxonomy.php:754
 msgid "Checkbox"
 msgstr "Checkbox"
 
-#: fields/checkbox.php:144
+#: fields/checkbox.php:141
 msgid "Toggle All"
 msgstr "Selecteer alle"
 
-#: fields/checkbox.php:208 fields/radio.php:193 fields/select.php:354
+#: fields/checkbox.php:205 fields/radio.php:240 fields/select.php:417
 msgid "Choices"
 msgstr "Keuzes"
 
-#: fields/checkbox.php:209 fields/radio.php:194 fields/select.php:355
+#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
 msgid "Enter each choice on a new line."
 msgstr "Per regel een keuze"
 
-#: fields/checkbox.php:209 fields/radio.php:194 fields/select.php:355
+#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
 msgid "For more control, you may specify both a value and label like this:"
 msgstr ""
 "Om meer controle te krijgen over de keuzes, kun je de naam en het label van "
 "elkaar scheiden. Dit doe je op de volgende manier:"
 
-#: fields/checkbox.php:209 fields/radio.php:194 fields/select.php:355
+#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
 msgid "red : Red"
 msgstr "rood : Rood"
 
-#: fields/checkbox.php:217 fields/color_picker.php:155 fields/email.php:124
-#: fields/number.php:150 fields/radio.php:222 fields/select.php:363
+#: fields/checkbox.php:214 fields/color_picker.php:147 fields/email.php:124
+#: fields/number.php:150 fields/radio.php:283 fields/select.php:426
 #: fields/text.php:148 fields/textarea.php:145 fields/true_false.php:115
-#: fields/url.php:117 fields/wysiwyg.php:376
+#: fields/url.php:117 fields/wysiwyg.php:379
 msgid "Default Value"
 msgstr "Standaard waarde"
 
-#: fields/checkbox.php:218 fields/select.php:364
+#: fields/checkbox.php:215 fields/select.php:427
 msgid "Enter each default value on a new line"
 msgstr "Per regel de naam van een keuze"
 
-#: fields/checkbox.php:232 fields/radio.php:237
+#: fields/checkbox.php:229 fields/radio.php:298
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: fields/checkbox.php:233 fields/radio.php:238
+#: fields/checkbox.php:230 fields/radio.php:299
 msgid "Horizontal"
 msgstr "Horizontaal"
 
-#: fields/checkbox.php:240
+#: fields/checkbox.php:237
 msgid "Toggle"
 msgstr "Switch"
 
-#: fields/checkbox.php:241
+#: fields/checkbox.php:238
 msgid "Prepend an extra checkbox to toggle all choices"
 msgstr "Voeg een extra checkbox toe aan het begin om alle keuzes te selecteren"
 
@@ -1534,45 +1552,137 @@ msgstr "Huidige kleur"
 msgid "Date Picker"
 msgstr "Datumprikker"
 
-#: fields/date_picker.php:72
+#: fields/date_picker.php:44
+msgctxt "Date Picker JS closeText"
 msgid "Done"
 msgstr "Gereed"
 
-#: fields/date_picker.php:73
+#: fields/date_picker.php:45
+msgctxt "Date Picker JS currentText"
 msgid "Today"
 msgstr "Vandaag"
 
-#: fields/date_picker.php:76
-msgid "Show a different month"
-msgstr "Toon een andere maand"
+#: fields/date_picker.php:46
+msgctxt "Date Picker JS nextText"
+msgid "Next"
+msgstr "Volgende"
 
-#: fields/date_picker.php:174
+#: fields/date_picker.php:47
+msgctxt "Date Picker JS prevText"
+msgid "Prev"
+msgstr "Vorige"
+
+#: fields/date_picker.php:48
+msgctxt "Date Picker JS weekHeader"
+msgid "Wk"
+msgstr "Wk "
+
+#: fields/date_picker.php:201 fields/date_time_picker.php:245
+#: fields/time_picker.php:131
 msgid "Display Format"
 msgstr "Weergeven als"
 
-#: fields/date_picker.php:175
+#: fields/date_picker.php:202 fields/date_time_picker.php:246
+#: fields/time_picker.php:132
 msgid "The format displayed when editing a post"
 msgstr "De weergave tijdens het aanmaken/bewerken van een post"
 
-#: fields/date_picker.php:189
-msgid "Return format"
+#: fields/date_picker.php:216 fields/date_time_picker.php:261
+#: fields/post_object.php:426 fields/relationship.php:766
+#: fields/time_picker.php:145
+msgid "Return Format"
 msgstr "Output weergeven als"
 
-#: fields/date_picker.php:190
+#: fields/date_picker.php:217 fields/date_time_picker.php:262
+#: fields/time_picker.php:146
 msgid "The format returned via template functions"
 msgstr "De weergave in het thema"
 
-#: fields/date_picker.php:205
+#: fields/date_picker.php:232 fields/date_time_picker.php:277
 msgid "Week Starts On"
 msgstr "Week start op"
 
+#: fields/date_time_picker.php:36
+msgid "Date Time Picker"
+msgstr "Datum tijd picker"
+
+#: fields/date_time_picker.php:44
+msgctxt "Date Time Picker JS timeOnlyTitle"
+msgid "Choose Time"
+msgstr "Kies tijd"
+
+#: fields/date_time_picker.php:45
+msgctxt "Date Time Picker JS timeText"
+msgid "Time"
+msgstr "Tijd"
+
+#: fields/date_time_picker.php:46
+msgctxt "Date Time Picker JS hourText"
+msgid "Hour"
+msgstr "Uur"
+
+#: fields/date_time_picker.php:47
+msgctxt "Date Time Picker JS minuteText"
+msgid "Minute"
+msgstr "Minuut"
+
+#: fields/date_time_picker.php:48
+msgctxt "Date Time Picker JS secondText"
+msgid "Second"
+msgstr "Seconde"
+
+#: fields/date_time_picker.php:49
+msgctxt "Date Time Picker JS millisecText"
+msgid "Millisecond"
+msgstr "Milliseconde"
+
+#: fields/date_time_picker.php:50
+msgctxt "Date Time Picker JS microsecText"
+msgid "Microsecond"
+msgstr "Microseconde"
+
+#: fields/date_time_picker.php:51
+msgctxt "Date Time Picker JS timezoneText"
+msgid "Time Zone"
+msgstr "Tijdzone"
+
+#: fields/date_time_picker.php:52
+msgctxt "Date Time Picker JS currentText"
+msgid "Now"
+msgstr "Nu"
+
+#: fields/date_time_picker.php:53
+msgctxt "Date Time Picker JS closeText"
+msgid "Done"
+msgstr "Gereed"
+
+#: fields/date_time_picker.php:55
+msgctxt "Date Time Picker JS amText"
+msgid "AM"
+msgstr "AM"
+
+#: fields/date_time_picker.php:56
+msgctxt "Date Time Picker JS amTextShort"
+msgid "A"
+msgstr "A"
+
+#: fields/date_time_picker.php:59
+msgctxt "Date Time Picker JS pmText"
+msgid "PM"
+msgstr "PM"
+
+#: fields/date_time_picker.php:60
+msgctxt "Date Time Picker JS pmTextShort"
+msgid "P"
+msgstr "P"
+
 #: fields/email.php:36
 msgid "Email"
 msgstr "E-mail"
 
-#: fields/email.php:125 fields/number.php:151 fields/radio.php:223
+#: fields/email.php:125 fields/number.php:151 fields/radio.php:284
 #: fields/text.php:149 fields/textarea.php:146 fields/url.php:118
-#: fields/wysiwyg.php:377
+#: fields/wysiwyg.php:380
 msgid "Appears when creating a new post"
 msgstr ""
 "Vooraf ingevulde waarde die te zien is tijdens het aanmaken van een nieuwe "
@@ -1620,82 +1730,71 @@ msgstr "Bewerk bestand"
 msgid "Update File"
 msgstr "Update bestand"
 
-#: fields/file.php:49 pro/fields/gallery.php:55
-msgid "uploaded to this post"
-msgstr "geüpload naar deze post"
-
-#: fields/file.php:142
-msgid "File Name"
+#: fields/file.php:148
+msgid "File name"
 msgstr "Bestandsnaam"
 
-#: fields/file.php:146
-msgid "File Size"
-msgstr "Bestandsformaat"
+#: fields/file.php:152 fields/file.php:253 fields/file.php:264
+#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:715
+#: pro/fields/gallery.php:748
+msgid "File size"
+msgstr "Bestandsgrootte"
 
-#: fields/file.php:169
-msgid "No File selected"
-msgstr "Geen bestand geselecteerd"
-
-#: fields/file.php:169
+#: fields/file.php:175
 msgid "Add File"
 msgstr "Voeg bestand toe"
 
-#: fields/file.php:214 fields/image.php:200 fields/taxonomy.php:859
+#: fields/file.php:220 fields/image.php:206 fields/taxonomy.php:823
 msgid "Return Value"
 msgstr "Output weergeven als"
 
-#: fields/file.php:215 fields/image.php:201
+#: fields/file.php:221 fields/image.php:207
 msgid "Specify the returned value on front end"
 msgstr "Bepaal hier de output weergave"
 
-#: fields/file.php:220
+#: fields/file.php:226
 msgid "File Array"
 msgstr "Bestand Array"
 
-#: fields/file.php:221
+#: fields/file.php:227
 msgid "File URL"
 msgstr "Bestands-URL"
 
-#: fields/file.php:222
+#: fields/file.php:228
 msgid "File ID"
 msgstr "Bestands-ID"
 
-#: fields/file.php:229 fields/image.php:225 pro/fields/gallery.php:655
+#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:678
 msgid "Library"
 msgstr "Bibliotheek"
 
-#: fields/file.php:230 fields/image.php:226 pro/fields/gallery.php:656
+#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:679
 msgid "Limit the media library choice"
 msgstr ""
 "Limiteer de keuze van bestanden. Kies voor de gehele media bibliotheek, of "
 "alleen de bestanden die geüpload zijn naar de post."
 
-#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:662
+#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:685
 msgid "Uploaded to post"
 msgstr "Geüpload naar post"
 
-#: fields/file.php:243 fields/image.php:239 pro/fields/gallery.php:669
+#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:692
 msgid "Minimum"
 msgstr "Minimaal"
 
-#: fields/file.php:244 fields/file.php:255
+#: fields/file.php:250 fields/file.php:261
 msgid "Restrict which files can be uploaded"
 msgstr "Bepaal welke bestanden geüpload mogen worden"
 
-#: fields/file.php:247 fields/file.php:258 fields/image.php:262
-#: fields/image.php:295 pro/fields/gallery.php:692 pro/fields/gallery.php:725
-msgid "File size"
-msgstr "Bestandsgrootte"
-
-#: fields/file.php:254 fields/image.php:272 pro/fields/gallery.php:702
+#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:725
 msgid "Maximum"
 msgstr "Maximaal"
 
-#: fields/file.php:265 fields/image.php:305 pro/fields/gallery.php:735
+#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:758
 msgid "Allowed file types"
 msgstr "Toegestane bestandstypen"
 
-#: fields/file.php:266 fields/image.php:306 pro/fields/gallery.php:736
+#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:759
 msgid "Comma separated list. Leave blank for all types"
 msgstr "Met komma's gescheiden lijst. Laat leeg voor alle types."
 
@@ -1711,7 +1810,7 @@ msgstr "Locatie wordt gezocht..."
 msgid "Sorry, this browser does not support geolocation"
 msgstr "Excuses, deze browser ondersteund geen geolocatie"
 
-#: fields/google-map.php:133 fields/relationship.php:722
+#: fields/google-map.php:133 fields/relationship.php:725
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1743,8 +1842,8 @@ msgstr "Inzoomen"
 msgid "Set the initial zoom level"
 msgstr "Bepaal het zoom niveau van de kaart"
 
-#: fields/google-map.php:203 fields/image.php:251 fields/image.php:284
-#: fields/oembed.php:275 pro/fields/gallery.php:681 pro/fields/gallery.php:714
+#: fields/google-map.php:203 fields/image.php:257 fields/image.php:290
+#: fields/oembed.php:275 pro/fields/gallery.php:704 pro/fields/gallery.php:737
 msgid "Height"
 msgstr "Hoogte"
 
@@ -1760,57 +1859,57 @@ msgstr "Afbeelding"
 msgid "Select Image"
 msgstr "Selecteer afbeelding"
 
-#: fields/image.php:52 pro/fields/gallery.php:53
+#: fields/image.php:52 pro/fields/gallery.php:54
 msgid "Edit Image"
 msgstr "Bewerk afbeelding"
 
-#: fields/image.php:53 pro/fields/gallery.php:54
+#: fields/image.php:53 pro/fields/gallery.php:55
 msgid "Update Image"
 msgstr "Update afbeelding"
 
-#: fields/image.php:54
-msgid "Uploaded to this post"
-msgstr "Geüpload naar deze post"
-
 #: fields/image.php:55
 msgid "All images"
 msgstr "Alle afbeeldingen"
 
-#: fields/image.php:152
+#: fields/image.php:144 pro/fields/gallery.php:359 pro/fields/gallery.php:542
+msgid "Remove"
+msgstr "Verwijder"
+
+#: fields/image.php:158
 msgid "No image selected"
 msgstr "Geen afbeelding geselecteerd"
 
-#: fields/image.php:152
+#: fields/image.php:158
 msgid "Add Image"
 msgstr "Voeg afbeelding toe"
 
-#: fields/image.php:206
+#: fields/image.php:212
 msgid "Image Array"
 msgstr "Afbeelding Array"
 
-#: fields/image.php:207
+#: fields/image.php:213
 msgid "Image URL"
 msgstr "Afbeelding URL"
 
-#: fields/image.php:208
+#: fields/image.php:214
 msgid "Image ID"
 msgstr "Afbeelding ID"
 
-#: fields/image.php:215 pro/fields/gallery.php:645
+#: fields/image.php:221 pro/fields/gallery.php:655
 msgid "Preview Size"
 msgstr "Afmeting voorbeeld"
 
-#: fields/image.php:216 pro/fields/gallery.php:646
+#: fields/image.php:222 pro/fields/gallery.php:656
 msgid "Shown when entering data"
 msgstr "Voorbeeld wordt na het uploaden/selecteren getoond"
 
-#: fields/image.php:240 fields/image.php:273 pro/fields/gallery.php:670
-#: pro/fields/gallery.php:703
+#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:693
+#: pro/fields/gallery.php:726
 msgid "Restrict which images can be uploaded"
 msgstr "Bepaal welke afbeeldingen geüpload mogen worden"
 
-#: fields/image.php:243 fields/image.php:276 fields/oembed.php:264
-#: pro/fields/gallery.php:673 pro/fields/gallery.php:706
+#: fields/image.php:249 fields/image.php:282 fields/oembed.php:264
+#: pro/fields/gallery.php:696 pro/fields/gallery.php:729
 msgid "Width"
 msgstr "Breedte"
 
@@ -1896,33 +1995,33 @@ msgstr "Embed formaat"
 msgid "Archives"
 msgstr "Archieven"
 
-#: fields/page_link.php:520 fields/post_object.php:386
-#: fields/relationship.php:689
+#: fields/page_link.php:506 fields/post_object.php:370
+#: fields/relationship.php:692
 msgid "Filter by Post Type"
 msgstr "Filter op post type"
 
-#: fields/page_link.php:528 fields/post_object.php:394
-#: fields/relationship.php:697
+#: fields/page_link.php:514 fields/post_object.php:378
+#: fields/relationship.php:700
 msgid "All post types"
 msgstr "Alle post types"
 
-#: fields/page_link.php:534 fields/post_object.php:400
-#: fields/relationship.php:703
+#: fields/page_link.php:520 fields/post_object.php:384
+#: fields/relationship.php:706
 msgid "Filter by Taxonomy"
 msgstr "Filter op taxonomy"
 
-#: fields/page_link.php:542 fields/post_object.php:408
-#: fields/relationship.php:711
+#: fields/page_link.php:528 fields/post_object.php:392
+#: fields/relationship.php:714
 msgid "All taxonomies"
 msgstr "Alle taxonomieën"
 
-#: fields/page_link.php:548 fields/post_object.php:414 fields/select.php:372
-#: fields/taxonomy.php:803 fields/user.php:456
+#: fields/page_link.php:534 fields/post_object.php:398 fields/radio.php:249
+#: fields/select.php:435 fields/taxonomy.php:767 fields/user.php:411
 msgid "Allow Null?"
 msgstr "Mag leeg zijn?"
 
-#: fields/page_link.php:562 fields/post_object.php:428 fields/select.php:386
-#: fields/user.php:470
+#: fields/page_link.php:548 fields/post_object.php:412 fields/select.php:449
+#: fields/user.php:425
 msgid "Select multiple values?"
 msgstr "Meerdere selecties mogelijk?"
 
@@ -1930,16 +2029,12 @@ msgstr "Meerdere selecties mogelijk?"
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: fields/post_object.php:36 fields/post_object.php:447
-#: fields/relationship.php:768
+#: fields/post_object.php:36 fields/post_object.php:431
+#: fields/relationship.php:771
 msgid "Post Object"
 msgstr "Post object"
 
-#: fields/post_object.php:442 fields/relationship.php:763
-msgid "Return Format"
-msgstr "Output weergeven als"
-
-#: fields/post_object.php:448 fields/relationship.php:769
+#: fields/post_object.php:432 fields/relationship.php:772
 msgid "Post ID"
 msgstr "Post ID"
 
@@ -1947,19 +2042,19 @@ msgstr "Post ID"
 msgid "Radio Button"
 msgstr "Radio button"
 
-#: fields/radio.php:202
+#: fields/radio.php:263
 msgid "Other"
 msgstr "Anders namelijk"
 
-#: fields/radio.php:206
+#: fields/radio.php:267
 msgid "Add 'other' choice to allow for custom values"
 msgstr "Voeg de keuze \"anders namelijk\" toe voor eigen invulling"
 
-#: fields/radio.php:212
+#: fields/radio.php:273
 msgid "Save Other"
 msgstr "Anders namelijk waarde toevoegen aan keuzes?"
 
-#: fields/radio.php:216
+#: fields/radio.php:277
 msgid "Save 'other' values to the field's choices"
 msgstr ""
 "Voeg de ingevulde \"anders namelijk\" waarde toe aan de keuzelijst na het "
@@ -1985,54 +2080,115 @@ msgstr "Laden"
 msgid "No matches found"
 msgstr "Geen gelijkenis gevonden"
 
-#: fields/relationship.php:570
+#: fields/relationship.php:573
 msgid "Search..."
 msgstr "Zoeken..."
 
-#: fields/relationship.php:579
+#: fields/relationship.php:582
 msgid "Select post type"
 msgstr "Selecteer post type"
 
-#: fields/relationship.php:592
+#: fields/relationship.php:595
 msgid "Select taxonomy"
 msgstr "Selecteer taxonomy"
 
-#: fields/relationship.php:724 fields/taxonomy.php:36 fields/taxonomy.php:773
+#: fields/relationship.php:727 fields/taxonomy.php:36 fields/taxonomy.php:737
 msgid "Taxonomy"
 msgstr "Taxonomy"
 
-#: fields/relationship.php:731
+#: fields/relationship.php:734
 msgid "Elements"
 msgstr "Elementen"
 
-#: fields/relationship.php:732
+#: fields/relationship.php:735
 msgid "Selected elements will be displayed in each result"
 msgstr "Selecteer de elementen die moeten worden getoond in elk resultaat"
 
-#: fields/relationship.php:743
+#: fields/relationship.php:746
 msgid "Minimum posts"
 msgstr "Minimale berichten"
 
-#: fields/relationship.php:752
+#: fields/relationship.php:755
 msgid "Maximum posts"
 msgstr "Maximum aantal selecties"
 
-#: fields/relationship.php:856 pro/fields/gallery.php:817
+#: fields/relationship.php:859 pro/fields/gallery.php:831
 #, php-format
 msgid "%s requires at least %s selection"
 msgid_plural "%s requires at least %s selections"
 msgstr[0] "%s verplicht tenminste %s selectie"
 msgstr[1] "%s verplicht tenminste %s selecties"
 
-#: fields/select.php:36 fields/select.php:167 fields/taxonomy.php:795
-msgid "Select"
-msgstr "Selecteer"
+#: fields/select.php:50
+msgctxt "Select2 JS matches_1"
+msgid "One result is available, press enter to select it."
+msgstr "Eén resultaat beschikbaar, toets enter om te selecteren."
 
-#: fields/select.php:400
+#: fields/select.php:51
+#, php-format
+msgctxt "Select2 JS matches_n"
+msgid "%d results are available, use up and down arrow keys to navigate."
+msgstr ""
+"%d resultaten beschikbaar, gebruik de pijltjes toetsen om te navigeren."
+
+#: fields/select.php:52
+msgctxt "Select2 JS matches_0"
+msgid "No matches found"
+msgstr "Geen resultaten"
+
+#: fields/select.php:53
+msgctxt "Select2 JS input_too_short_1"
+msgid "Please enter 1 or more characters"
+msgstr "Vul 1 of meer tekens in"
+
+#: fields/select.php:54
+#, php-format
+msgctxt "Select2 JS input_too_short_n"
+msgid "Please enter %d or more characters"
+msgstr "Vul %d of meer tekens in"
+
+#: fields/select.php:55
+msgctxt "Select2 JS input_too_long_1"
+msgid "Please delete 1 character"
+msgstr "Verwijderd 1 teken"
+
+#: fields/select.php:56
+#, php-format
+msgctxt "Select2 JS input_too_long_n"
+msgid "Please delete %d characters"
+msgstr "Verwijder %d tekens"
+
+#: fields/select.php:57
+msgctxt "Select2 JS selection_too_long_1"
+msgid "You can only select 1 item"
+msgstr "Je kunt maar 1 item selecteren"
+
+#: fields/select.php:58
+#, php-format
+msgctxt "Select2 JS selection_too_long_n"
+msgid "You can only select %d items"
+msgstr "Je kunt maar %d items selecteren"
+
+#: fields/select.php:59
+msgctxt "Select2 JS load_more"
+msgid "Loading more results&hellip;"
+msgstr "Laad meer resultaten&hellip;"
+
+#: fields/select.php:60
+msgctxt "Select2 JS searching"
+msgid "Searching&hellip;"
+msgstr "Zoeken&hellip;"
+
+#: fields/select.php:61
+msgctxt "Select2 JS load_fail"
+msgid "Loading failed"
+msgstr "Laden mislukt"
+
+#: fields/select.php:463
 msgid "Stylised UI"
 msgstr "Uitgebreide weergave"
 
-#: fields/select.php:414
+#: fields/select.php:477
 msgid "Use AJAX to lazy load choices?"
 msgstr "AJAX gebruiken om keuzes te laden?"
 
@@ -2040,19 +2196,19 @@ msgstr "AJAX gebruiken om keuzes te laden?"
 msgid "Tab"
 msgstr "Tab"
 
-#: fields/tab.php:128
+#: fields/tab.php:97
 msgid ""
 "The tab field will display incorrectly when added to a Table style repeater "
 "field or flexible content field layout"
 msgstr "Deze tab zal niet correct worden weergegeven in een herhalende tabel"
 
-#: fields/tab.php:129
+#: fields/tab.php:98
 msgid ""
 "Use \"Tab Fields\" to better organize your edit screen by grouping fields "
 "together."
 msgstr "Gebruik tabbladen om velden in het edit screen te organiseren."
 
-#: fields/tab.php:130
+#: fields/tab.php:99
 msgid ""
 "All fields following this \"tab field\" (or until another \"tab field\" is "
 "defined) will be grouped together using this field's label as the tab "
@@ -2061,98 +2217,102 @@ msgstr ""
 "Alle velden onder dit \"Tab veld\" zullen worden toegevoegd aan deze tab. "
 "Het ingevulde \"Veld label\" dient als benaming van de tab."
 
-#: fields/tab.php:144
+#: fields/tab.php:113
 msgid "Placement"
 msgstr "Plaatsing"
 
-#: fields/tab.php:156
+#: fields/tab.php:125
 msgid "End-point"
 msgstr "Eindpunt"
 
-#: fields/tab.php:157
+#: fields/tab.php:126
 msgid "Use this field as an end-point and start a new group of tabs"
 msgstr "Gebruik dit veld als eindpunt en startpunt van een groep tabbladen"
 
-#: fields/taxonomy.php:742
+#: fields/taxonomy.php:706
 msgid "None"
 msgstr "Geen"
 
-#: fields/taxonomy.php:774
+#: fields/taxonomy.php:738
 msgid "Select the taxonomy to be displayed"
 msgstr "Selecteer de weer te geven taxonomie "
 
-#: fields/taxonomy.php:783
+#: fields/taxonomy.php:747
 msgid "Appearance"
 msgstr "Uiterlijk"
 
-#: fields/taxonomy.php:784
+#: fields/taxonomy.php:748
 msgid "Select the appearance of this field"
 msgstr "Selecteer het uiterlijk van dit veld"
 
-#: fields/taxonomy.php:789
+#: fields/taxonomy.php:753
 msgid "Multiple Values"
 msgstr "Meerdere waardes"
 
-#: fields/taxonomy.php:791
+#: fields/taxonomy.php:755
 msgid "Multi Select"
 msgstr "Multi-selecteer"
 
-#: fields/taxonomy.php:793
+#: fields/taxonomy.php:757
 msgid "Single Value"
 msgstr "Enkele waarde"
 
-#: fields/taxonomy.php:794
+#: fields/taxonomy.php:758
 msgid "Radio Buttons"
 msgstr "Radio buttons"
 
-#: fields/taxonomy.php:817
+#: fields/taxonomy.php:781
 msgid "Create Terms"
 msgstr "Voorwaarden toevoegen"
 
-#: fields/taxonomy.php:818
+#: fields/taxonomy.php:782
 msgid "Allow new terms to be created whilst editing"
 msgstr "Toestaan dat nieuwe voorwaarden worden aangemaakt terwijl je bewerkt"
 
-#: fields/taxonomy.php:831
+#: fields/taxonomy.php:795
 msgid "Save Terms"
 msgstr "Voorwaarden opslaan"
 
-#: fields/taxonomy.php:832
+#: fields/taxonomy.php:796
 msgid "Connect selected terms to the post"
 msgstr "Koppel geselecteerde terms aan een post"
 
-#: fields/taxonomy.php:845
+#: fields/taxonomy.php:809
 msgid "Load Terms"
 msgstr "Voorwaarden laden"
 
-#: fields/taxonomy.php:846
+#: fields/taxonomy.php:810
 msgid "Load value from posts terms"
 msgstr "Waarde ophalen van posts terms"
 
-#: fields/taxonomy.php:864
+#: fields/taxonomy.php:828
 msgid "Term Object"
 msgstr "Term object"
 
-#: fields/taxonomy.php:865
+#: fields/taxonomy.php:829
 msgid "Term ID"
 msgstr "Term ID"
 
-#: fields/taxonomy.php:924
+#: fields/taxonomy.php:888
 #, php-format
 msgid "User unable to add new %s"
 msgstr "Gebruiker is niet in staat om nieuwe %s toe te voegen"
 
-#: fields/taxonomy.php:937
+#: fields/taxonomy.php:901
 #, php-format
 msgid "%s already exists"
 msgstr "%s bestaat al"
 
-#: fields/taxonomy.php:978
+#: fields/taxonomy.php:942
 #, php-format
 msgid "%s added"
 msgstr "%s toegevoegd"
 
-#: fields/taxonomy.php:1023
+#: fields/taxonomy.php:976
+msgid "Parent"
+msgstr "Hoofd"
+
+#: fields/taxonomy.php:987
 msgid "Add"
 msgstr "Nieuwe"
 
@@ -2180,6 +2340,10 @@ msgstr "Rijen"
 msgid "Sets the textarea height"
 msgstr "Hoogte (in regels) voor dit tekstvlak"
 
+#: fields/time_picker.php:36
+msgid "Time Picker"
+msgstr "Tijd picker"
+
 #: fields/true_false.php:36
 msgid "True / False"
 msgstr "Waar / niet waar"
@@ -2196,11 +2360,11 @@ msgstr "URL"
 msgid "Value must be a valid URL"
 msgstr "Waarde moet een geldige URL zijn"
 
-#: fields/user.php:441
+#: fields/user.php:396
 msgid "Filter by role"
 msgstr "Filter op rol"
 
-#: fields/user.php:449
+#: fields/user.php:404
 msgid "All user roles"
 msgstr "Alle rollen"
 
@@ -2208,43 +2372,51 @@ msgstr "Alle rollen"
 msgid "Wysiwyg Editor"
 msgstr "Wysiwyg editor"
 
-#: fields/wysiwyg.php:328
+#: fields/wysiwyg.php:331
 msgid "Visual"
 msgstr "Visueel"
 
-#: fields/wysiwyg.php:329
+#: fields/wysiwyg.php:332
 msgctxt "Name for the Text editor tab (formerly HTML)"
 msgid "Text"
 msgstr "Tekst"
 
-#: fields/wysiwyg.php:385
+#: fields/wysiwyg.php:388
 msgid "Tabs"
 msgstr "Tabbladen"
 
-#: fields/wysiwyg.php:390
+#: fields/wysiwyg.php:393
 msgid "Visual & Text"
 msgstr "Visueel & tekst"
 
-#: fields/wysiwyg.php:391
+#: fields/wysiwyg.php:394
 msgid "Visual Only"
 msgstr "Alleen visueel"
 
-#: fields/wysiwyg.php:392
+#: fields/wysiwyg.php:395
 msgid "Text Only"
 msgstr "Alleen tekst"
 
-#: fields/wysiwyg.php:399
+#: fields/wysiwyg.php:402
 msgid "Toolbar"
 msgstr "Toolbar"
 
-#: fields/wysiwyg.php:409
+#: fields/wysiwyg.php:412
 msgid "Show Media Upload Buttons?"
 msgstr "Toon media upload buttons?"
 
-#: forms/post.php:294 pro/admin/options-page.php:352
+#: forms/comment.php:166 forms/post.php:295 pro/admin/options-page.php:416
 msgid "Edit field group"
 msgstr "Bewerk groep"
 
+#: forms/widget.php:235
+#, php-format
+msgid "1 field requires attention."
+msgid_plural "%d fields require attention."
+msgstr[0] "1 veld vraagt om aandacht"
+msgstr[1] "%d velden vragen om aandacht"
+
+#. Plugin Name of the plugin/theme
 #: pro/acf-pro.php:24
 msgid "Advanced Custom Fields PRO"
 msgstr "Advanced Custom Fields PRO"
@@ -2253,41 +2425,37 @@ msgstr "Advanced Custom Fields PRO"
 msgid "Flexible Content requires at least 1 layout"
 msgstr "Flexibele content vereist minimaal 1 layout"
 
-#: pro/admin/options-page.php:48
+#: pro/admin/options-page.php:49
 msgid "Options Page"
 msgstr "Opties pagina"
 
-#: pro/admin/options-page.php:83
+#: pro/admin/options-page.php:85
 msgid "No options pages exist"
 msgstr "Er zijn nog geen optie pagina's"
 
-#: pro/admin/options-page.php:276
+#: pro/admin/options-page.php:303
 msgid "Options Updated"
 msgstr "Opties bijgewerkt"
 
-#: pro/admin/options-page.php:282
-msgid "No Custom Field Groups found for this options page"
-msgstr "Er zijn geen groepen gevonden voor deze optie pagina"
-
-#: pro/admin/options-page.php:282
-msgid "Create a Custom Field Group"
-msgstr "Maak een extra velden groep"
-
-#: pro/admin/settings-updates.php:137
-msgid "<b>Error</b>. Could not connect to update server"
-msgstr "<b>Fout</b>. Kan niet verbinden met de update server"
-
-#: pro/admin/settings-updates.php:267 pro/admin/settings-updates.php:338
-msgid "<b>Connection Error</b>. Sorry, please try again"
-msgstr "<b>Verbindingsfout</b>. Onze excuses, probeer het later nog eens"
-
-#: pro/admin/views/options-page.php:48
+#: pro/admin/options-page.php:309
 msgid "Publish"
 msgstr "Publiceer"
 
-#: pro/admin/views/options-page.php:54
-msgid "Save Options"
-msgstr "Opties bijwerken"
+#: pro/admin/options-page.php:315
+msgid "No Custom Field Groups found for this options page"
+msgstr "Er zijn geen groepen gevonden voor deze optie pagina"
+
+#: pro/admin/options-page.php:315
+msgid "Create a Custom Field Group"
+msgstr "Maak een extra velden groep"
+
+#: pro/admin/settings-updates.php:125
+msgid "<b>Error</b>. Could not connect to update server"
+msgstr "<b>Fout</b>. Kan niet verbinden met de update server"
+
+#: pro/admin/settings-updates.php:203 pro/admin/settings-updates.php:274
+msgid "<b>Connection Error</b>. Sorry, please try again"
+msgstr "<b>Verbindingsfout</b>. Onze excuses, probeer het later nog eens"
 
 #: pro/admin/views/settings-updates.php:11
 msgid "Deactivate License"
@@ -2298,20 +2466,18 @@ msgid "Activate License"
 msgstr "Activeer licentiecode"
 
 #: pro/admin/views/settings-updates.php:21
-msgid "License"
-msgstr "Licentie"
+msgid "License Information"
+msgstr "Licentie informatie"
 
 #: pro/admin/views/settings-updates.php:24
+#, php-format
 msgid ""
 "To unlock updates, please enter your license key below. If you don't have a "
-"licence key, please see"
+"licence key, please see <a href=\"%s\" target=\"_blank\">details & pricing</"
+"a>."
 msgstr ""
-"Voor het verkrijgen van updates is een licentiesleutel vereist. Indien je "
-"niet beschikt over een licentiecode kun je deze aanschaffen, zie:"
-
-#: pro/admin/views/settings-updates.php:24
-msgid "details & pricing"
-msgstr "details & kosten"
+"Om updates te ontvangen vul je hieronder je licentiecode in. Nog geen "
+"licentiecode? Bekijk <a href=\"%s\" target=\"_blank\">details & prijzen</a>."
 
 #: pro/admin/views/settings-updates.php:33
 msgid "License Key"
@@ -2353,16 +2519,16 @@ msgstr "Upgrade opmerking"
 msgid "Options"
 msgstr "Opties"
 
-#: pro/core/updates.php:198
+#: pro/core/updates.php:206
 #, php-format
 msgid ""
 "To enable updates, please enter your license key on the <a href=\"%s"
 "\">Updates</a> page. If you don't have a licence key, please see <a href=\"%s"
-"\">details & pricing</a>"
+"\">details & pricing</a>."
 msgstr ""
-"Voor het verkrijgen van updates is een licentiesleutel vereist. Vul uw "
-"licentiecode in op de <a href=\"%s\">Updates</a> pagina, of schaf een "
-"licentiecode aan via <a href=\"%s\">details & prijzen</a>."
+"Om updates te ontvangen vul je op <a href=\"%s\">Updates</a> pagina je "
+"licentiecode in. Nog geen licentiecode? Bekijk <a href=\"%s\" target=\"_blank"
+"\">details & prijzen</a>."
 
 #: pro/fields/flexible-content.php:36
 msgid "Flexible Content"
@@ -2408,72 +2574,72 @@ msgstr "{available} {label} {identifier} beschikbaar (max {max})"
 msgid "{required} {label} {identifier} required (min {min})"
 msgstr "{required} {label} {identifier} verplicht (min {min})"
 
-#: pro/fields/flexible-content.php:211
+#: pro/fields/flexible-content.php:216
 #, php-format
 msgid "Click the \"%s\" button below to start creating your layout"
 msgstr "Klik op de \"%s\" button om een nieuwe lay-out te maken"
 
-#: pro/fields/flexible-content.php:357
+#: pro/fields/flexible-content.php:346
 msgid "Add layout"
 msgstr "Layout toevoegen"
 
-#: pro/fields/flexible-content.php:360
+#: pro/fields/flexible-content.php:349
 msgid "Remove layout"
 msgstr "Verwijder layout"
 
-#: pro/fields/flexible-content.php:363 pro/fields/repeater.php:312
+#: pro/fields/flexible-content.php:352 pro/fields/repeater.php:304
 msgid "Click to toggle"
 msgstr "Klik om in/uit te klappen"
 
-#: pro/fields/flexible-content.php:503
+#: pro/fields/flexible-content.php:493
 msgid "Reorder Layout"
 msgstr "Herorder layout"
 
-#: pro/fields/flexible-content.php:503
+#: pro/fields/flexible-content.php:493
 msgid "Reorder"
 msgstr "Herorder"
 
-#: pro/fields/flexible-content.php:504
+#: pro/fields/flexible-content.php:494
 msgid "Delete Layout"
 msgstr "Verwijder layout"
 
-#: pro/fields/flexible-content.php:505
+#: pro/fields/flexible-content.php:495
 msgid "Duplicate Layout"
 msgstr "Dupliceer layout"
 
-#: pro/fields/flexible-content.php:506
+#: pro/fields/flexible-content.php:496
 msgid "Add New Layout"
 msgstr "Nieuwe layout"
 
-#: pro/fields/flexible-content.php:560 pro/fields/repeater.php:474
+#: pro/fields/flexible-content.php:550 pro/fields/repeater.php:466
 msgid "Table"
 msgstr "Tabel"
 
-#: pro/fields/flexible-content.php:561 pro/fields/repeater.php:475
+#: pro/fields/flexible-content.php:551 pro/fields/repeater.php:467
 msgid "Block"
 msgstr "Blok"
 
-#: pro/fields/flexible-content.php:562 pro/fields/repeater.php:476
+#: pro/fields/flexible-content.php:552 pro/fields/repeater.php:468
 msgid "Row"
 msgstr "Rij"
 
-#: pro/fields/flexible-content.php:577
+#: pro/fields/flexible-content.php:567
 msgid "Min"
 msgstr "Min"
 
-#: pro/fields/flexible-content.php:590
+#: pro/fields/flexible-content.php:580
 msgid "Max"
 msgstr "Max"
 
-#: pro/fields/flexible-content.php:618 pro/fields/repeater.php:483
+#: pro/fields/flexible-content.php:608 pro/fields/repeater.php:475
 msgid "Button Label"
 msgstr "Button label"
 
-#: pro/fields/flexible-content.php:627
+#: pro/fields/flexible-content.php:617
 msgid "Minimum Layouts"
 msgstr "Minimale layouts"
 
-#: pro/fields/flexible-content.php:636
+#: pro/fields/flexible-content.php:626
 msgid "Maximum Layouts"
 msgstr "Maximale layouts"
 
@@ -2481,58 +2647,78 @@ msgstr "Maximale layouts"
 msgid "Gallery"
 msgstr "Galerij"
 
-#: pro/fields/gallery.php:52
+#: pro/fields/gallery.php:53
 msgid "Add Image to Gallery"
 msgstr "Voeg afbeelding toe aan galerij"
 
-#: pro/fields/gallery.php:56
+#: pro/fields/gallery.php:57
 msgid "Maximum selection reached"
 msgstr "Maximale selectie bereikt"
 
-#: pro/fields/gallery.php:343
+#: pro/fields/gallery.php:337
 msgid "Length"
 msgstr "Lengte"
 
-#: pro/fields/gallery.php:363
-msgid "Remove"
-msgstr "Verwijder"
+#: pro/fields/gallery.php:380
+msgid "Caption"
+msgstr "Onderschrift"
 
-#: pro/fields/gallery.php:543
+#: pro/fields/gallery.php:389
+msgid "Alt Text"
+msgstr "Alt tekst"
+
+#: pro/fields/gallery.php:557
 msgid "Add to gallery"
 msgstr "Afbeelding(en) toevoegen"
 
-#: pro/fields/gallery.php:547
+#: pro/fields/gallery.php:561
 msgid "Bulk actions"
 msgstr "Acties"
 
-#: pro/fields/gallery.php:548
+#: pro/fields/gallery.php:562
 msgid "Sort by date uploaded"
 msgstr "Sorteer op datum geüpload"
 
-#: pro/fields/gallery.php:549
+#: pro/fields/gallery.php:563
 msgid "Sort by date modified"
 msgstr "Sorteer op datum aangepast"
 
-#: pro/fields/gallery.php:550
+#: pro/fields/gallery.php:564
 msgid "Sort by title"
 msgstr "Sorteer op titel"
 
-#: pro/fields/gallery.php:551
+#: pro/fields/gallery.php:565
 msgid "Reverse current order"
 msgstr "Keer volgorde om"
 
-#: pro/fields/gallery.php:569
+#: pro/fields/gallery.php:583
 msgid "Close"
 msgstr "Sluiten"
 
-#: pro/fields/gallery.php:627
+#: pro/fields/gallery.php:637
 msgid "Minimum Selection"
 msgstr "Minimale selectie"
 
-#: pro/fields/gallery.php:636
+#: pro/fields/gallery.php:646
 msgid "Maximum Selection"
 msgstr "Maximale selectie"
 
+#: pro/fields/gallery.php:665
+msgid "Insert"
+msgstr "Invoegen"
+
+#: pro/fields/gallery.php:666
+msgid "Specify where new attachments are added"
+msgstr "Geef aan waar nieuwe bijlagen worden toegevoegd"
+
+#: pro/fields/gallery.php:670
+msgid "Append to the end"
+msgstr "Toevoegen aan het einde"
+
+#: pro/fields/gallery.php:671
+msgid "Prepend to the beginning"
+msgstr "Toevoegen aan het begin"
+
 #: pro/fields/repeater.php:36
 msgid "Repeater"
 msgstr "Herhalen"
@@ -2545,58 +2731,142 @@ msgstr "Minimum aantal rijen bereikt ({max} rijen)"
 msgid "Maximum rows reached ({max} rows)"
 msgstr "Maximum aantal rijen bereikt ({max} rijen)"
 
-#: pro/fields/repeater.php:310
-msgid "Drag to reorder"
-msgstr "Sleep om te sorteren"
-
-#: pro/fields/repeater.php:357
+#: pro/fields/repeater.php:349
 msgid "Add row"
 msgstr "Nieuwe regel"
 
-#: pro/fields/repeater.php:358
+#: pro/fields/repeater.php:350
 msgid "Remove row"
 msgstr "Verwijder regel"
 
-#: pro/fields/repeater.php:406
+#: pro/fields/repeater.php:398
 msgid "Sub Fields"
 msgstr "Sub-velden"
 
-#: pro/fields/repeater.php:436
+#: pro/fields/repeater.php:428
 msgid "Collapsed"
 msgstr "Ingeklapt"
 
-#: pro/fields/repeater.php:437
+#: pro/fields/repeater.php:429
 msgid "Select a sub field to show when row is collapsed"
 msgstr "Selecteer een sub-veld om te tonen wanneer rij dichtgeklapt is"
 
-#: pro/fields/repeater.php:447
+#: pro/fields/repeater.php:439
 msgid "Minimum Rows"
 msgstr "Minimum aantal rijen"
 
-#: pro/fields/repeater.php:457
+#: pro/fields/repeater.php:449
 msgid "Maximum Rows"
 msgstr "Maximum aantal rijen"
 
-#. Plugin Name of the plugin/theme
-msgid "Advanced Custom Fields Pro"
-msgstr "Advanced Custom Fields Pro"
-
 #. Plugin URI of the plugin/theme
-msgid "http://www.advancedcustomfields.com/"
-msgstr "http://www.advancedcustomfields.com/"
+msgid "https://www.advancedcustomfields.com/"
+msgstr "https://www.advancedcustomfields.com/"
 
 #. Description of the plugin/theme
 msgid "Customise WordPress with powerful, professional and intuitive fields"
 msgstr "Pas WordPress aan met krachtige, professionele en slimme velden"
 
 #. Author of the plugin/theme
-msgid "elliot condon"
-msgstr "elliot condon"
+msgid "Elliot Condon"
+msgstr "Elliot Condon"
 
 #. Author URI of the plugin/theme
 msgid "http://www.elliotcondon.com/"
 msgstr "http://www.elliotcondon.com/"
 
+#~ msgid "See what's new in"
+#~ msgstr "Bekijk alle vernieuwingen en verbeteringen van"
+
+#~ msgid "version"
+#~ msgstr "versie"
+
+#~ msgid "<b>Success</b>. Import tool added %s field groups: %s"
+#~ msgstr ""
+#~ "<b>Gelukt!</b>. De importeer tool heeft %s velden en %s groepen "
+#~ "geïmporteerd"
+
+#~ msgid ""
+#~ "<b>Warning</b>. Import tool detected %s field groups already exist and "
+#~ "have been ignored: %s"
+#~ msgstr ""
+#~ "<b>Waarschuwing</b>. De importeer functie heeft %s bestaande veldgroepen "
+#~ "gedetecteerd en heeft deze genegeerd: %s"
+
+#~ msgid "Upgrade ACF"
+#~ msgstr "Upgrade ACF"
+
+#~ msgid "Upgrade"
+#~ msgstr "Upgrade"
+
+#~ msgid ""
+#~ "The following sites require a DB upgrade. Check the ones you want to "
+#~ "update and then click “Upgrade Database”."
+#~ msgstr ""
+#~ "De volgende website vereist een DB upgrade. Selecteer degene die u wilt "
+#~ "updaten en klik op “Upgrade database”."
+
+#~ msgid "Upgrading data to"
+#~ msgstr "Upgraden van data naar "
+
+#~ msgid "Done"
+#~ msgstr "Gereed"
+
+#~ msgid "Today"
+#~ msgstr "Vandaag"
+
+#~ msgid "Show a different month"
+#~ msgstr "Toon een andere maand"
+
+#~ msgid "Return format"
+#~ msgstr "Output weergeven als"
+
+#~ msgid "uploaded to this post"
+#~ msgstr "geüpload naar deze post"
+
+#~ msgid "File Name"
+#~ msgstr "Bestandsnaam"
+
+#~ msgid "File Size"
+#~ msgstr "Bestandsformaat"
+
+#~ msgid "No File selected"
+#~ msgstr "Geen bestand geselecteerd"
+
+#~ msgid "Save Options"
+#~ msgstr "Opties bijwerken"
+
+#~ msgid "License"
+#~ msgstr "Licentie"
+
+#~ msgid ""
+#~ "To unlock updates, please enter your license key below. If you don't have "
+#~ "a licence key, please see"
+#~ msgstr ""
+#~ "Voor het verkrijgen van updates is een licentiesleutel vereist. Indien je "
+#~ "niet beschikt over een licentiecode kun je deze aanschaffen, zie:"
+
+#~ msgid "details & pricing"
+#~ msgstr "details & kosten"
+
+#~ msgid ""
+#~ "To enable updates, please enter your license key on the <a href=\"%s"
+#~ "\">Updates</a> page. If you don't have a licence key, please see <a href="
+#~ "\"%s\">details & pricing</a>"
+#~ msgstr ""
+#~ "Voor het verkrijgen van updates is een licentiesleutel vereist. Vul uw "
+#~ "licentiecode in op de <a href=\"%s\">Updates</a> pagina, of schaf een "
+#~ "licentiecode aan via <a href=\"%s\">details & prijzen</a>."
+
+#~ msgid "Advanced Custom Fields Pro"
+#~ msgstr "Advanced Custom Fields Pro"
+
+#~ msgid "http://www.advancedcustomfields.com/"
+#~ msgstr "http://www.advancedcustomfields.com/"
+
+#~ msgid "elliot condon"
+#~ msgstr "elliot condon"
+
 #~ msgid "Drag and drop to reorder"
 #~ msgstr "Sleep om te sorteren"
 
@@ -2972,9 +3242,6 @@ msgstr "http://www.elliotcondon.com/"
 #~ msgid "Alternate Text"
 #~ msgstr "Alternatieve tekst"
 
-#~ msgid "Caption"
-#~ msgstr "Onderschrift"
-
 #~ msgid "Thumbnail is advised"
 #~ msgstr "Thumbnail wordt geadviseerd"
 
diff --git a/lang/acf-pt_BR.mo b/lang/acf-pt_BR.mo
index 1f33b05..e04681a 100644
Binary files a/lang/acf-pt_BR.mo and b/lang/acf-pt_BR.mo differ
diff --git a/lang/acf-pt_BR.po b/lang/acf-pt_BR.po
index 8fa46e2..8e99f77 100644
--- a/lang/acf-pt_BR.po
+++ b/lang/acf-pt_BR.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Advanced Custom Fields PRO 5.3.9.1\n"
+"Project-Id-Version: Advanced Custom Fields PRO 5.4\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
-"POT-Creation-Date: 2016-06-20 11:23-0300\n"
-"PO-Revision-Date: 2016-06-20 11:25-0300\n"
+"POT-Creation-Date: 2016-08-04 15:51-0300\n"
+"PO-Revision-Date: 2016-08-04 16:22-0300\n"
 "Last-Translator: Augusto Simão <augusto@ams.art.br>\n"
 "Language-Team: Augusto Simão <augusto@ams.art.br>\n"
 "Language: pt_BR\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.5\n"
+"X-Generator: Poedit 1.7.4\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
 "esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
@@ -26,91 +26,91 @@ msgstr ""
 msgid "Advanced Custom Fields"
 msgstr "Advanced Custom Fields"
 
-#: acf.php:268 admin/admin.php:61
+#: acf.php:271 admin/admin.php:61
 msgid "Field Groups"
 msgstr "Grupos de Campos"
 
-#: acf.php:269
+#: acf.php:272
 msgid "Field Group"
 msgstr "Grupo de Campos"
 
-#: acf.php:270 acf.php:302 admin/admin.php:62
-#: pro/fields/flexible-content.php:496
+#: acf.php:273 acf.php:305 admin/admin.php:62
+#: pro/fields/flexible-content.php:500
 msgid "Add New"
 msgstr "Adicionar Novo"
 
-#: acf.php:271
+#: acf.php:274
 msgid "Add New Field Group"
 msgstr "Adicionar Novo Grupo de Campos"
 
-#: acf.php:272
+#: acf.php:275
 msgid "Edit Field Group"
 msgstr "Editar Grupo de Campos"
 
-#: acf.php:273
+#: acf.php:276
 msgid "New Field Group"
 msgstr "Novo Grupo de Campos"
 
-#: acf.php:274
+#: acf.php:277
 msgid "View Field Group"
 msgstr "Ver Grupo de Campos"
 
-#: acf.php:275
+#: acf.php:278
 msgid "Search Field Groups"
 msgstr "Pesquisar Grupos de Campos"
 
-#: acf.php:276
+#: acf.php:279
 msgid "No Field Groups found"
 msgstr "Nenhum Grupo de Campos encontrado"
 
-#: acf.php:277
+#: acf.php:280
 msgid "No Field Groups found in Trash"
 msgstr "Nenhum Grupo de Campos encontrado na Lixeira"
 
-#: acf.php:300 admin/field-group.php:182 admin/field-group.php:280
-#: admin/field-groups.php:528
+#: acf.php:303 admin/field-group.php:182 admin/field-group.php:280
+#: admin/field-groups.php:528 pro/fields/clone.php:679
 msgid "Fields"
 msgstr "Campos"
 
-#: acf.php:301
+#: acf.php:304
 msgid "Field"
 msgstr "Campo"
 
-#: acf.php:303
+#: acf.php:306
 msgid "Add New Field"
 msgstr "Adicionar Novo Campo"
 
-#: acf.php:304
+#: acf.php:307
 msgid "Edit Field"
 msgstr "Editar Campo"
 
-#: acf.php:305 admin/views/field-group-fields.php:18
+#: acf.php:308 admin/views/field-group-fields.php:54
 #: admin/views/settings-info.php:111
 msgid "New Field"
 msgstr "Novo Campo"
 
-#: acf.php:306
+#: acf.php:309
 msgid "View Field"
 msgstr "Ver Campo"
 
-#: acf.php:307
+#: acf.php:310
 msgid "Search Fields"
 msgstr "Pesquisar Campos"
 
-#: acf.php:308
+#: acf.php:311
 msgid "No Fields found"
 msgstr "Nenhum Campo encontrado"
 
-#: acf.php:309
+#: acf.php:312
 msgid "No Fields found in Trash"
 msgstr "Nenhum Campo encontrado na Lixeira"
 
-#: acf.php:348 admin/field-group.php:395 admin/field-groups.php:585
+#: acf.php:351 admin/field-group.php:395 admin/field-groups.php:585
 #: admin/views/field-group-options.php:13
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: acf.php:353
+#: acf.php:356
 #, php-format
 msgid "Disabled <span class=\"count\">(%s)</span>"
 msgid_plural "Disabled <span class=\"count\">(%s)</span>"
@@ -173,7 +173,7 @@ msgstr "Nenhum campo de opções disponível"
 msgid "Field group title is required"
 msgstr "O título do grupo de campos é obrigatório"
 
-#: admin/field-group.php:278 api/api-field-group.php:620
+#: admin/field-group.php:278 api/api-field-group.php:651
 msgid "copy"
 msgstr "copiar"
 
@@ -181,7 +181,7 @@ msgstr "copiar"
 #: admin/views/field-group-field-conditional-logic.php:62
 #: admin/views/field-group-field-conditional-logic.php:162
 #: admin/views/field-group-locations.php:59
-#: admin/views/field-group-locations.php:135 api/api-helpers.php:3684
+#: admin/views/field-group-locations.php:135 api/api-helpers.php:3952
 msgid "or"
 msgstr "ou"
 
@@ -221,79 +221,79 @@ msgstr "Chaves dos Campos"
 msgid "Active"
 msgstr "Ativo"
 
-#: admin/field-group.php:843
+#: admin/field-group.php:842
 msgid "Front Page"
 msgstr "Página Inicial"
 
-#: admin/field-group.php:844
+#: admin/field-group.php:843
 msgid "Posts Page"
 msgstr "Página de Posts"
 
-#: admin/field-group.php:845
+#: admin/field-group.php:844
 msgid "Top Level Page (no parent)"
 msgstr "Página de Nível mais Alto (sem mãe)"
 
-#: admin/field-group.php:846
+#: admin/field-group.php:845
 msgid "Parent Page (has children)"
 msgstr "Página Mãe (tem filhas)"
 
-#: admin/field-group.php:847
+#: admin/field-group.php:846
 msgid "Child Page (has parent)"
 msgstr "Página Filha (possui mãe)"
 
-#: admin/field-group.php:863
+#: admin/field-group.php:862
 msgid "Default Template"
 msgstr "Modelo Padrão"
 
-#: admin/field-group.php:886
+#: admin/field-group.php:885
 msgid "Logged in"
 msgstr "Logado"
 
-#: admin/field-group.php:887
+#: admin/field-group.php:886
 msgid "Viewing front end"
 msgstr "Visualizando a parte pública do site (front-end)"
 
-#: admin/field-group.php:888
+#: admin/field-group.php:887
 msgid "Viewing back end"
 msgstr "Visualizando a parte administrativa do site (back-end)"
 
-#: admin/field-group.php:907
+#: admin/field-group.php:906
 msgid "Super Admin"
 msgstr "Super Admin"
 
-#: admin/field-group.php:918 admin/field-group.php:926
-#: admin/field-group.php:940 admin/field-group.php:947
-#: admin/field-group.php:964 admin/field-group.php:981 fields/file.php:241
-#: fields/image.php:237 pro/fields/gallery.php:684
+#: admin/field-group.php:917 admin/field-group.php:925
+#: admin/field-group.php:939 admin/field-group.php:946
+#: admin/field-group.php:963 admin/field-group.php:980 fields/file.php:241
+#: fields/image.php:237 pro/fields/gallery.php:676
 msgid "All"
 msgstr "Todos"
 
-#: admin/field-group.php:927
+#: admin/field-group.php:926
 msgid "Add / Edit"
 msgstr "Adicionar / Editar"
 
-#: admin/field-group.php:928
+#: admin/field-group.php:927
 msgid "Register"
 msgstr "Registrar"
 
-#: admin/field-group.php:1168
+#: admin/field-group.php:1167
 msgid "Move Complete."
 msgstr "Movimentação realizada."
 
-#: admin/field-group.php:1169
+#: admin/field-group.php:1168
 #, php-format
 msgid "The %s field can now be found in the %s field group"
 msgstr "O campo %s pode agora ser encontrado no grupo de campos %s"
 
-#: admin/field-group.php:1171
+#: admin/field-group.php:1170
 msgid "Close Window"
 msgstr "Fechar Janela"
 
-#: admin/field-group.php:1206
+#: admin/field-group.php:1205
 msgid "Please select the destination for this field"
 msgstr "Selecione o destino para este campo"
 
-#: admin/field-group.php:1213
+#: admin/field-group.php:1212
 msgid "Move Field"
 msgstr "Mover Campo"
 
@@ -332,14 +332,14 @@ msgstr[1] "%s grupos de campos sincronizados."
 msgid "Sync available"
 msgstr "Sincronização disponível"
 
-#: admin/field-groups.php:525 api/api-template.php:1079
-#: api/api-template.php:1292 pro/fields/gallery.php:371
+#: admin/field-groups.php:525 api/api-template.php:1077
+#: api/api-template.php:1290 pro/fields/gallery.php:370
 msgid "Title"
 msgstr "Título"
 
 #: admin/field-groups.php:526 admin/views/field-group-options.php:93
 #: admin/views/update-network.php:25 admin/views/update-network.php:33
-#: pro/fields/gallery.php:398
+#: pro/fields/gallery.php:397
 msgid "Description"
 msgstr "Descrição"
 
@@ -365,7 +365,7 @@ msgstr "Recursos (em inglês)"
 msgid "Getting Started"
 msgstr "Primeiros Passos"
 
-#: admin/field-groups.php:629 pro/admin/settings-updates.php:61
+#: admin/field-groups.php:629 pro/admin/settings-updates.php:57
 #: pro/admin/views/settings-updates.php:17
 msgid "Updates"
 msgstr "Atualizações"
@@ -382,7 +382,7 @@ msgstr "Funções"
 msgid "Actions"
 msgstr "Ações"
 
-#: admin/field-groups.php:633 fields/relationship.php:720
+#: admin/field-groups.php:633 fields/relationship.php:737
 msgid "Filters"
 msgstr "Filtros"
 
@@ -407,7 +407,7 @@ msgid "Duplicate this item"
 msgstr "Duplicar este item"
 
 #: admin/field-groups.php:684 admin/field-groups.php:700
-#: admin/views/field-group-field.php:58 pro/fields/flexible-content.php:495
+#: admin/views/field-group-field.php:59 pro/fields/flexible-content.php:499
 msgid "Duplicate"
 msgstr "Duplicar"
 
@@ -497,26 +497,30 @@ msgid "Conditional Logic"
 msgstr "Condições para exibição"
 
 #: admin/views/field-group-field-conditional-logic.php:40
-#: admin/views/field-group-field.php:140 fields/checkbox.php:243
-#: fields/message.php:144 fields/page_link.php:539 fields/page_link.php:553
-#: fields/post_object.php:403 fields/post_object.php:417 fields/radio.php:254
-#: fields/select.php:448 fields/select.php:462 fields/select.php:476
-#: fields/select.php:490 fields/tab.php:130 fields/taxonomy.php:772
-#: fields/taxonomy.php:786 fields/taxonomy.php:800 fields/taxonomy.php:814
-#: fields/user.php:416 fields/user.php:430 fields/wysiwyg.php:418
-#: pro/admin/views/settings-updates.php:93
+#: admin/views/field-group-field.php:141 fields/checkbox.php:244
+#: fields/message.php:144 fields/page_link.php:533 fields/page_link.php:547
+#: fields/page_link.php:561 fields/post_object.php:432
+#: fields/post_object.php:446 fields/radio.php:255 fields/select.php:469
+#: fields/select.php:483 fields/select.php:497 fields/select.php:511
+#: fields/tab.php:130 fields/taxonomy.php:785 fields/taxonomy.php:799
+#: fields/taxonomy.php:813 fields/taxonomy.php:827 fields/user.php:399
+#: fields/user.php:413 fields/wysiwyg.php:418
+#: pro/admin/views/settings-updates.php:93 pro/fields/clone.php:733
+#: pro/fields/clone.php:751
 msgid "Yes"
 msgstr "Sim"
 
 #: admin/views/field-group-field-conditional-logic.php:41
-#: admin/views/field-group-field.php:141 fields/checkbox.php:244
-#: fields/message.php:145 fields/page_link.php:540 fields/page_link.php:554
-#: fields/post_object.php:404 fields/post_object.php:418 fields/radio.php:255
-#: fields/select.php:449 fields/select.php:463 fields/select.php:477
-#: fields/select.php:491 fields/tab.php:131 fields/taxonomy.php:687
-#: fields/taxonomy.php:773 fields/taxonomy.php:787 fields/taxonomy.php:801
-#: fields/taxonomy.php:815 fields/user.php:417 fields/user.php:431
-#: fields/wysiwyg.php:419 pro/admin/views/settings-updates.php:103
+#: admin/views/field-group-field.php:142 fields/checkbox.php:245
+#: fields/message.php:145 fields/page_link.php:534 fields/page_link.php:548
+#: fields/page_link.php:562 fields/post_object.php:433
+#: fields/post_object.php:447 fields/radio.php:256 fields/select.php:470
+#: fields/select.php:484 fields/select.php:498 fields/select.php:512
+#: fields/tab.php:131 fields/taxonomy.php:700 fields/taxonomy.php:786
+#: fields/taxonomy.php:800 fields/taxonomy.php:814 fields/taxonomy.php:828
+#: fields/user.php:400 fields/user.php:414 fields/wysiwyg.php:419
+#: pro/admin/views/settings-updates.php:103 pro/fields/clone.php:734
+#: pro/fields/clone.php:752
 msgid "No"
 msgstr "Não"
 
@@ -544,120 +548,122 @@ msgstr "e"
 msgid "Add rule group"
 msgstr "Adicionar grupo de regras"
 
-#: admin/views/field-group-field.php:49 pro/fields/flexible-content.php:342
+#: admin/views/field-group-field.php:50 pro/fields/flexible-content.php:346
 #: pro/fields/repeater.php:302
 msgid "Drag to reorder"
 msgstr "Arraste para reorganizar"
 
-#: admin/views/field-group-field.php:54 admin/views/field-group-field.php:57
+#: admin/views/field-group-field.php:55 admin/views/field-group-field.php:58
 msgid "Edit field"
 msgstr "Editar campo"
 
-#: admin/views/field-group-field.php:57 core/media.php:55 fields/image.php:142
-#: pro/fields/gallery.php:358
+#: admin/views/field-group-field.php:58 fields/image.php:142
+#: pro/fields/gallery.php:357
 msgid "Edit"
 msgstr "Editar"
 
-#: admin/views/field-group-field.php:58
+#: admin/views/field-group-field.php:59
 msgid "Duplicate field"
 msgstr "Duplicar campo"
 
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move field to another group"
 msgstr "Mover campo para outro grupo"
 
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move"
 msgstr "Mover"
 
-#: admin/views/field-group-field.php:60
+#: admin/views/field-group-field.php:61
 msgid "Delete field"
 msgstr "Excluir campo"
 
-#: admin/views/field-group-field.php:60 pro/fields/flexible-content.php:494
+#: admin/views/field-group-field.php:61 pro/fields/flexible-content.php:498
 msgid "Delete"
 msgstr "Excluir"
 
-#: admin/views/field-group-field.php:68 fields/oembed.php:225
-#: fields/taxonomy.php:888
+#: admin/views/field-group-field.php:69 fields/oembed.php:225
+#: fields/taxonomy.php:901
 msgid "Error"
 msgstr "Erro"
 
-#: admin/views/field-group-field.php:68
+#: admin/views/field-group-field.php:69
 msgid "Field type does not exist"
 msgstr "Tipo de campo não existe"
 
-#: admin/views/field-group-field.php:81
+#: admin/views/field-group-field.php:82
 msgid "Field Label"
 msgstr "Rótulo do Campo"
 
-#: admin/views/field-group-field.php:82
+#: admin/views/field-group-field.php:83
 msgid "This is the name which will appear on the EDIT page"
 msgstr "Este é o nome que irá aparecer na página de EDIÇÃO"
 
-#: admin/views/field-group-field.php:94
+#: admin/views/field-group-field.php:95
 msgid "Field Name"
 msgstr "Nome do Campo"
 
-#: admin/views/field-group-field.php:95
+#: admin/views/field-group-field.php:96
 msgid "Single word, no spaces. Underscores and dashes allowed"
 msgstr ""
 "Uma única palavra, sem espaços. Traço inferior (_) e traços (-) permitidos"
 
-#: admin/views/field-group-field.php:107
+#: admin/views/field-group-field.php:108
 msgid "Field Type"
 msgstr "Tipo de Campo"
 
-#: admin/views/field-group-field.php:121 fields/tab.php:103
+#: admin/views/field-group-field.php:122 fields/tab.php:103
 msgid "Instructions"
 msgstr "Instruções"
 
-#: admin/views/field-group-field.php:122
+#: admin/views/field-group-field.php:123
 msgid "Instructions for authors. Shown when submitting data"
 msgstr "Instrução para os autores. Exibido quando se está enviando dados"
 
-#: admin/views/field-group-field.php:133
+#: admin/views/field-group-field.php:134
 msgid "Required?"
 msgstr "Obrigatório?"
 
-#: admin/views/field-group-field.php:162
+#: admin/views/field-group-field.php:163
 msgid "Wrapper Attributes"
 msgstr "Atributos do Wrapper"
 
-#: admin/views/field-group-field.php:168
+#: admin/views/field-group-field.php:169
 msgid "width"
 msgstr "largura"
 
-#: admin/views/field-group-field.php:182
+#: admin/views/field-group-field.php:183
 msgid "class"
 msgstr "classe"
 
-#: admin/views/field-group-field.php:195
+#: admin/views/field-group-field.php:196
 msgid "id"
 msgstr "id"
 
-#: admin/views/field-group-field.php:207
+#: admin/views/field-group-field.php:208
 msgid "Close Field"
 msgstr "Fechar Campo"
 
-#: admin/views/field-group-fields.php:29
+#: admin/views/field-group-fields.php:17
 msgid "Order"
 msgstr "Ordem"
 
-#: admin/views/field-group-fields.php:30 pro/fields/flexible-content.php:521
+#: admin/views/field-group-fields.php:18 fields/checkbox.php:259
+#: fields/radio.php:314 fields/select.php:527
+#: pro/fields/flexible-content.php:525
 msgid "Label"
 msgstr "Rótulo"
 
-#: admin/views/field-group-fields.php:31 fields/taxonomy.php:954
-#: pro/fields/flexible-content.php:534
+#: admin/views/field-group-fields.php:19 fields/taxonomy.php:967
+#: pro/fields/flexible-content.php:538
 msgid "Name"
 msgstr "Nome"
 
-#: admin/views/field-group-fields.php:32
+#: admin/views/field-group-fields.php:20
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/views/field-group-fields.php:44
+#: admin/views/field-group-fields.php:38
 msgid ""
 "No fields. Click the <strong>+ Add Field</strong> button to create your "
 "first field."
@@ -665,7 +671,7 @@ msgstr ""
 "Nenhum campo. Clique no botão <strong>+ Adicionar Campo</strong> para criar "
 "seu primeiro campo."
 
-#: admin/views/field-group-fields.php:51
+#: admin/views/field-group-fields.php:44
 msgid "+ Add Field"
 msgstr "+ Adicionar Campo"
 
@@ -674,7 +680,7 @@ msgstr "+ Adicionar Campo"
 msgid "Post"
 msgstr "Post"
 
-#: admin/views/field-group-locations.php:6 fields/relationship.php:726
+#: admin/views/field-group-locations.php:6 fields/relationship.php:743
 msgid "Post Type"
 msgstr "Tipo de Post"
 
@@ -889,7 +895,7 @@ msgstr "Formato"
 msgid "Page Attributes"
 msgstr "Atributos da Página"
 
-#: admin/views/field-group-options.php:123 fields/relationship.php:739
+#: admin/views/field-group-options.php:123 fields/relationship.php:756
 msgid "Featured Image"
 msgstr "Imagem Destacada"
 
@@ -1343,79 +1349,84 @@ msgstr "Lendo as tarefas de atualização…"
 msgid "See what's new"
 msgstr "Veja o que há de novo"
 
-#: api/api-helpers.php:933
+#: api/api-helpers.php:944
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: api/api-helpers.php:934
+#: api/api-helpers.php:945
 msgid "Medium"
 msgstr "Média"
 
-#: api/api-helpers.php:935
+#: api/api-helpers.php:946
 msgid "Large"
 msgstr "Grande"
 
-#: api/api-helpers.php:984
+#: api/api-helpers.php:995
 msgid "Full Size"
 msgstr "Tamanho Original"
 
-#: api/api-helpers.php:1196 api/api-helpers.php:1759 fields/clone.php:298
+#: api/api-helpers.php:1207 api/api-helpers.php:1770 pro/fields/clone.php:866
 msgid "(no title)"
 msgstr "(sem título)"
 
-#: api/api-helpers.php:3605
+#: api/api-helpers.php:1807 fields/page_link.php:284
+#: fields/post_object.php:283 fields/taxonomy.php:989
+msgid "Parent"
+msgstr "Página de Nível mais Alto (sem mãe)"
+
+#: api/api-helpers.php:3873
 #, php-format
 msgid "Image width must be at least %dpx."
 msgstr "A largura da imagem deve ter pelo menos %dpx."
 
-#: api/api-helpers.php:3610
+#: api/api-helpers.php:3878
 #, php-format
 msgid "Image width must not exceed %dpx."
 msgstr "A largura da imagem não pode ser maior que %dpx."
 
-#: api/api-helpers.php:3626
+#: api/api-helpers.php:3894
 #, php-format
 msgid "Image height must be at least %dpx."
 msgstr "A altura da imagem deve ter pelo menos %dpx."
 
-#: api/api-helpers.php:3631
+#: api/api-helpers.php:3899
 #, php-format
 msgid "Image height must not exceed %dpx."
 msgstr "A altura da imagem não pode ser maior que %dpx."
 
-#: api/api-helpers.php:3649
+#: api/api-helpers.php:3917
 #, php-format
 msgid "File size must be at least %s."
 msgstr "O tamanho do arquivo deve ter pelo menos %s."
 
-#: api/api-helpers.php:3654
+#: api/api-helpers.php:3922
 #, php-format
 msgid "File size must must not exceed %s."
 msgstr "O tamanho do arquivo não pode ser maior que %s."
 
-#: api/api-helpers.php:3688
+#: api/api-helpers.php:3956
 #, php-format
 msgid "File type must be %s."
 msgstr "O tipo de arquivo deve ser %s."
 
-#: api/api-template.php:1094
+#: api/api-template.php:1092
 msgid "Spam Detected"
 msgstr "Spam Detectado"
 
-#: api/api-template.php:1237 core/media.php:56 pro/api/api-options-page.php:50
-#: pro/fields/gallery.php:586
+#: api/api-template.php:1235 pro/api/api-options-page.php:50
+#: pro/fields/gallery.php:588
 msgid "Update"
 msgstr "Atualizar"
 
-#: api/api-template.php:1238
+#: api/api-template.php:1236
 msgid "Post updated"
 msgstr "Post atualizado"
 
-#: api/api-template.php:1306 core/field.php:133
+#: api/api-template.php:1304 core/field.php:133
 msgid "Content"
 msgstr "Conteúdo"
 
-#: api/api-template.php:1371
+#: api/api-template.php:1369
 msgid "Validate Email"
 msgstr "Validar Email"
 
@@ -1435,9 +1446,9 @@ msgstr "Relacional"
 msgid "jQuery"
 msgstr "jQuery"
 
-#: core/field.php:137 fields/checkbox.php:223 fields/radio.php:292
-#: pro/fields/flexible-content.php:491 pro/fields/flexible-content.php:540
-#: pro/fields/repeater.php:459
+#: core/field.php:137 fields/checkbox.php:224 fields/radio.php:293
+#: pro/fields/clone.php:709 pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:544 pro/fields/repeater.php:459
 msgid "Layout"
 msgstr "Layout"
 
@@ -1470,13 +1481,23 @@ msgstr "%d campos requerem sua atenção"
 msgid "Restricted"
 msgstr "Restrito"
 
-#: core/media.php:54 fields/select.php:36 fields/select.php:230
-#: fields/taxonomy.php:759
+#: core/media.php:54 fields/select.php:249
+msgctxt "verb"
 msgid "Select"
-msgstr "Seleção"
+msgstr "Selecionar"
+
+#: core/media.php:55
+msgctxt "verb"
+msgid "Edit"
+msgstr "Editar"
+
+#: core/media.php:56
+msgctxt "verb"
+msgid "Update"
+msgstr "Atualizar"
 
 #: core/media.php:57 fields/file.php:49 fields/image.php:54
-#: pro/fields/gallery.php:56
+#: pro/fields/gallery.php:55
 msgid "Uploaded to this post"
 msgstr "Anexado ao post"
 
@@ -1485,77 +1506,76 @@ msgstr "Anexado ao post"
 msgid "%s value is required"
 msgstr "É necessário preencher o campo %s"
 
-#: fields/checkbox.php:36 fields/taxonomy.php:754
+#: fields/checkbox.php:36 fields/taxonomy.php:767
 msgid "Checkbox"
 msgstr "Checkbox"
 
-#: fields/checkbox.php:141
+#: fields/checkbox.php:142
 msgid "Toggle All"
 msgstr "Selecionar Tudo"
 
-#: fields/checkbox.php:205 fields/radio.php:240 fields/select.php:425
+#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:446
 msgid "Choices"
 msgstr "Escolhas"
 
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:426
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "Enter each choice on a new line."
 msgstr "Digite cada opção em uma nova linha."
 
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:426
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "For more control, you may specify both a value and label like this:"
 msgstr ""
 "Para mais controle, você pode especificar tanto os valores quanto os "
 "rótulos, como nos exemplos:"
 
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:426
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "red : Red"
 msgstr "vermelho : Vermelho"
 
-#: fields/checkbox.php:214 fields/color_picker.php:147 fields/email.php:124
-#: fields/number.php:150 fields/radio.php:283 fields/select.php:434
+#: fields/checkbox.php:215 fields/color_picker.php:147 fields/email.php:124
+#: fields/number.php:150 fields/radio.php:284 fields/select.php:455
 #: fields/text.php:148 fields/textarea.php:145 fields/true_false.php:115
 #: fields/url.php:117 fields/wysiwyg.php:379
 msgid "Default Value"
 msgstr "Valor Padrão"
 
-#: fields/checkbox.php:215 fields/select.php:435
+#: fields/checkbox.php:216 fields/select.php:456
 msgid "Enter each default value on a new line"
 msgstr "Digite cada valor padrão em uma nova linha"
 
-#: fields/checkbox.php:229 fields/radio.php:298
+#: fields/checkbox.php:230 fields/radio.php:299
 msgid "Vertical"
 msgstr "Vertical"
 
-#: fields/checkbox.php:230 fields/radio.php:299
+#: fields/checkbox.php:231 fields/radio.php:300
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: fields/checkbox.php:237
+#: fields/checkbox.php:238
 msgid "Toggle"
 msgstr "Selecionar Tudo"
 
-#: fields/checkbox.php:238
+#: fields/checkbox.php:239
 msgid "Prepend an extra checkbox to toggle all choices"
 msgstr "Incluir um checkbox adicional que marca (ou desmarca) todas as opções"
 
-#: fields/clone.php:36
-msgctxt "Field label"
-msgid "Clone"
-msgstr "Clone"
+#: fields/checkbox.php:252 fields/file.php:220 fields/image.php:206
+#: fields/radio.php:307 fields/taxonomy.php:836
+msgid "Return Value"
+msgstr "Valor Retornado"
 
-#: fields/clone.php:199
-msgctxt "Field instruction"
-msgid "Clone"
-msgstr "Clone"
+#: fields/checkbox.php:253 fields/file.php:221 fields/image.php:207
+#: fields/radio.php:308
+msgid "Specify the returned value on front end"
+msgstr "Especifique a forma como os valores serão retornados no front-end"
 
-#: fields/clone.php:200
-msgid "Select one or more fields you wish to clone"
-msgstr "Selecione um ou mais campos que deseja clonar"
+#: fields/checkbox.php:258 fields/radio.php:313 fields/select.php:526
+msgid "Value"
+msgstr "Valor"
 
-#: fields/clone.php:288
-#, php-format
-msgid "All fields from %s field group"
-msgstr "Todos os campos do grupo de campos %s"
+#: fields/checkbox.php:260 fields/radio.php:315 fields/select.php:528
+msgid "Both (Array)"
+msgstr "Ambos (Array)"
 
 #: fields/color_picker.php:36
 msgid "Color Picker"
@@ -1606,28 +1626,28 @@ msgctxt "Date Picker JS weekHeader"
 msgid "Wk"
 msgstr "Sem"
 
-#: fields/date_picker.php:195 fields/date_time_picker.php:240
+#: fields/date_picker.php:195 fields/date_time_picker.php:184
 #: fields/time_picker.php:126
 msgid "Display Format"
 msgstr "Formato de Exibição"
 
-#: fields/date_picker.php:196 fields/date_time_picker.php:241
+#: fields/date_picker.php:196 fields/date_time_picker.php:185
 #: fields/time_picker.php:127
 msgid "The format displayed when editing a post"
 msgstr "O formato que será exibido ao editar um post"
 
-#: fields/date_picker.php:210 fields/date_time_picker.php:256
-#: fields/post_object.php:426 fields/relationship.php:766
-#: fields/time_picker.php:140
+#: fields/date_picker.php:210 fields/date_time_picker.php:200
+#: fields/post_object.php:455 fields/relationship.php:783
+#: fields/select.php:520 fields/time_picker.php:140
 msgid "Return Format"
 msgstr "Formato dos Dados"
 
-#: fields/date_picker.php:211 fields/date_time_picker.php:257
+#: fields/date_picker.php:211 fields/date_time_picker.php:201
 #: fields/time_picker.php:141
 msgid "The format returned via template functions"
 msgstr "O formato que será retornado através das funções de template"
 
-#: fields/date_picker.php:226 fields/date_time_picker.php:272
+#: fields/date_picker.php:226 fields/date_time_picker.php:216
 msgid "Week Starts On"
 msgstr "Semana começa em"
 
@@ -1685,22 +1705,27 @@ msgctxt "Date Time Picker JS closeText"
 msgid "Done"
 msgstr "Pronto"
 
-#: fields/date_time_picker.php:55
+#: fields/date_time_picker.php:54
+msgctxt "Date Time Picker JS selectText"
+msgid "Select"
+msgstr "Selecionar"
+
+#: fields/date_time_picker.php:56
 msgctxt "Date Time Picker JS amText"
 msgid "AM"
 msgstr "AM"
 
-#: fields/date_time_picker.php:56
+#: fields/date_time_picker.php:57
 msgctxt "Date Time Picker JS amTextShort"
 msgid "A"
 msgstr "A"
 
-#: fields/date_time_picker.php:59
+#: fields/date_time_picker.php:60
 msgctxt "Date Time Picker JS pmText"
 msgid "PM"
 msgstr "PM"
 
-#: fields/date_time_picker.php:60
+#: fields/date_time_picker.php:61
 msgctxt "Date Time Picker JS pmTextShort"
 msgid "P"
 msgstr "P"
@@ -1709,7 +1734,7 @@ msgstr "P"
 msgid "Email"
 msgstr "Email"
 
-#: fields/email.php:125 fields/number.php:151 fields/radio.php:284
+#: fields/email.php:125 fields/number.php:151 fields/radio.php:285
 #: fields/text.php:149 fields/textarea.php:146 fields/url.php:118
 #: fields/wysiwyg.php:380
 msgid "Appears when creating a new post"
@@ -1762,8 +1787,8 @@ msgid "File name"
 msgstr "Nome do arquivo"
 
 #: fields/file.php:152 fields/file.php:253 fields/file.php:264
-#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:715
-#: pro/fields/gallery.php:748
+#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:707
+#: pro/fields/gallery.php:740
 msgid "File size"
 msgstr "Tamanho"
 
@@ -1771,14 +1796,6 @@ msgstr "Tamanho"
 msgid "Add File"
 msgstr "Adicionar Arquivo"
 
-#: fields/file.php:220 fields/image.php:206 fields/taxonomy.php:823
-msgid "Return Value"
-msgstr "Valor Retornado"
-
-#: fields/file.php:221 fields/image.php:207
-msgid "Specify the returned value on front end"
-msgstr "Especifique a forma como os valores serão retornados no front-end"
-
 #: fields/file.php:226
 msgid "File Array"
 msgstr "Array do arquivo"
@@ -1791,19 +1808,19 @@ msgstr "URL do Arquivo"
 msgid "File ID"
 msgstr "ID do Arquivo"
 
-#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:678
+#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:670
 msgid "Library"
 msgstr "Biblioteca"
 
-#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:679
+#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:671
 msgid "Limit the media library choice"
 msgstr "Limitar a escolha da biblioteca de mídia"
 
-#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:685
+#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:677
 msgid "Uploaded to post"
 msgstr "Anexado ao post"
 
-#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:692
+#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:684
 msgid "Minimum"
 msgstr "Mínimo"
 
@@ -1811,15 +1828,15 @@ msgstr "Mínimo"
 msgid "Restrict which files can be uploaded"
 msgstr "Limita o tamanho dos arquivos que poderão ser carregados"
 
-#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:725
+#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:717
 msgid "Maximum"
 msgstr "Máximo"
 
-#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:758
+#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:750
 msgid "Allowed file types"
 msgstr "Tipos de arquivos permitidos"
 
-#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:759
+#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:751
 msgid "Comma separated list. Leave blank for all types"
 msgstr ""
 "Lista separada por vírgulas. Deixe em branco para permitir todos os tipos"
@@ -1836,7 +1853,7 @@ msgstr "Localizando"
 msgid "Sorry, this browser does not support geolocation"
 msgstr "O seu navegador não suporta o recurso de geolocalização"
 
-#: fields/google-map.php:133 fields/relationship.php:725
+#: fields/google-map.php:133 fields/relationship.php:742
 msgid "Search"
 msgstr "Pesquisa"
 
@@ -1869,7 +1886,7 @@ msgid "Set the initial zoom level"
 msgstr "Definir o nível do zoom inicial"
 
 #: fields/google-map.php:203 fields/image.php:257 fields/image.php:290
-#: fields/oembed.php:275 pro/fields/gallery.php:704 pro/fields/gallery.php:737
+#: fields/oembed.php:275 pro/fields/gallery.php:696 pro/fields/gallery.php:729
 msgid "Height"
 msgstr "Altura"
 
@@ -1885,11 +1902,11 @@ msgstr "Imagem"
 msgid "Select Image"
 msgstr "Selecionar Imagem"
 
-#: fields/image.php:52 pro/fields/gallery.php:54
+#: fields/image.php:52 pro/fields/gallery.php:53
 msgid "Edit Image"
 msgstr "Editar Imagem"
 
-#: fields/image.php:53 pro/fields/gallery.php:55
+#: fields/image.php:53 pro/fields/gallery.php:54
 msgid "Update Image"
 msgstr "Atualizar Imagem"
 
@@ -1897,7 +1914,7 @@ msgstr "Atualizar Imagem"
 msgid "All images"
 msgstr "Todas as imagens"
 
-#: fields/image.php:144 pro/fields/gallery.php:359 pro/fields/gallery.php:542
+#: fields/image.php:144 pro/fields/gallery.php:358 pro/fields/gallery.php:546
 msgid "Remove"
 msgstr "Remover"
 
@@ -1921,21 +1938,21 @@ msgstr "URL da Imagem"
 msgid "Image ID"
 msgstr "ID da Imagem"
 
-#: fields/image.php:221 pro/fields/gallery.php:655
+#: fields/image.php:221
 msgid "Preview Size"
 msgstr "Tamanho da Pré-visualização"
 
-#: fields/image.php:222 pro/fields/gallery.php:656
+#: fields/image.php:222
 msgid "Shown when entering data"
 msgstr "Exibido ao inserir os dados"
 
-#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:693
-#: pro/fields/gallery.php:726
+#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:685
+#: pro/fields/gallery.php:718
 msgid "Restrict which images can be uploaded"
 msgstr "Limita as imagens que poderão ser carregadas"
 
 #: fields/image.php:249 fields/image.php:282 fields/oembed.php:264
-#: pro/fields/gallery.php:696 pro/fields/gallery.php:729
+#: pro/fields/gallery.php:688 pro/fields/gallery.php:721
 msgid "Width"
 msgstr "Largura"
 
@@ -2019,37 +2036,41 @@ msgstr "Nenhuma mídia incorporada encontrada na URL fornecida"
 msgid "Embed Size"
 msgstr "Tamanho da Mídia incorporada"
 
-#: fields/page_link.php:197
+#: fields/page_link.php:192
 msgid "Archives"
 msgstr "Arquivos"
 
-#: fields/page_link.php:506 fields/post_object.php:370
-#: fields/relationship.php:692
+#: fields/page_link.php:500 fields/post_object.php:399
+#: fields/relationship.php:709
 msgid "Filter by Post Type"
 msgstr "Filtrar por Tipo de Post"
 
-#: fields/page_link.php:514 fields/post_object.php:378
-#: fields/relationship.php:700
+#: fields/page_link.php:508 fields/post_object.php:407
+#: fields/relationship.php:717
 msgid "All post types"
 msgstr "Todos os tipos de posts"
 
-#: fields/page_link.php:520 fields/post_object.php:384
-#: fields/relationship.php:706
+#: fields/page_link.php:514 fields/post_object.php:413
+#: fields/relationship.php:723
 msgid "Filter by Taxonomy"
 msgstr "Filtrar por Taxonomia"
 
-#: fields/page_link.php:528 fields/post_object.php:392
-#: fields/relationship.php:714
+#: fields/page_link.php:522 fields/post_object.php:421
+#: fields/relationship.php:731
 msgid "All taxonomies"
 msgstr "Todas as taxonomias"
 
-#: fields/page_link.php:534 fields/post_object.php:398 fields/radio.php:249
-#: fields/select.php:443 fields/taxonomy.php:767 fields/user.php:411
+#: fields/page_link.php:528 fields/post_object.php:427 fields/radio.php:250
+#: fields/select.php:464 fields/taxonomy.php:780 fields/user.php:394
 msgid "Allow Null?"
 msgstr "Permitir Nulo?"
 
-#: fields/page_link.php:548 fields/post_object.php:412 fields/select.php:457
-#: fields/user.php:425
+#: fields/page_link.php:542
+msgid "Allow Archives URLs"
+msgstr "Permitir URLs do Arquivo"
+
+#: fields/page_link.php:556 fields/post_object.php:441 fields/select.php:478
+#: fields/user.php:408
 msgid "Select multiple values?"
 msgstr "Selecionar vários valores?"
 
@@ -2057,12 +2078,12 @@ msgstr "Selecionar vários valores?"
 msgid "Password"
 msgstr "Senha"
 
-#: fields/post_object.php:36 fields/post_object.php:431
-#: fields/relationship.php:771
+#: fields/post_object.php:36 fields/post_object.php:460
+#: fields/relationship.php:788
 msgid "Post Object"
 msgstr "Objeto do Post"
 
-#: fields/post_object.php:432 fields/relationship.php:772
+#: fields/post_object.php:461 fields/relationship.php:789
 msgid "Post ID"
 msgstr "ID do Post"
 
@@ -2070,21 +2091,21 @@ msgstr "ID do Post"
 msgid "Radio Button"
 msgstr "Botão de Rádio"
 
-#: fields/radio.php:263
+#: fields/radio.php:264
 msgid "Other"
 msgstr "Outro"
 
-#: fields/radio.php:267
+#: fields/radio.php:268
 msgid "Add 'other' choice to allow for custom values"
 msgstr ""
 "Adicionar uma opção ‘Outro’ para permitir a inserção de valores "
 "personalizados"
 
-#: fields/radio.php:273
+#: fields/radio.php:274
 msgid "Save Other"
 msgstr "Salvar Outro"
 
-#: fields/radio.php:277
+#: fields/radio.php:278
 msgid "Save 'other' values to the field's choices"
 msgstr ""
 "Salvar os valores personalizados inseridos na opção ‘Outros’ na lista de "
@@ -2110,118 +2131,127 @@ msgstr "Carregando"
 msgid "No matches found"
 msgstr "Nenhuma correspondência encontrada"
 
-#: fields/relationship.php:573
+#: fields/relationship.php:590
 msgid "Search..."
 msgstr "Pesquisar…"
 
-#: fields/relationship.php:582
+#: fields/relationship.php:599
 msgid "Select post type"
 msgstr "Selecione o tipo de post"
 
-#: fields/relationship.php:595
+#: fields/relationship.php:612
 msgid "Select taxonomy"
 msgstr "Selecione a taxonomia"
 
-#: fields/relationship.php:727 fields/taxonomy.php:36 fields/taxonomy.php:737
+#: fields/relationship.php:744 fields/taxonomy.php:36 fields/taxonomy.php:750
 msgid "Taxonomy"
 msgstr "Taxonomia"
 
-#: fields/relationship.php:734
+#: fields/relationship.php:751
 msgid "Elements"
 msgstr "Elementos"
 
-#: fields/relationship.php:735
+#: fields/relationship.php:752
 msgid "Selected elements will be displayed in each result"
 msgstr "Os elementos selecionados serão exibidos em cada resultado do filtro"
 
-#: fields/relationship.php:746
+#: fields/relationship.php:763
 msgid "Minimum posts"
 msgstr "Qtde. mínima de posts"
 
-#: fields/relationship.php:755
+#: fields/relationship.php:772
 msgid "Maximum posts"
 msgstr "Qtde. máxima de posts"
 
-#: fields/relationship.php:859 pro/fields/gallery.php:831
+#: fields/relationship.php:876 pro/fields/gallery.php:823
 #, php-format
 msgid "%s requires at least %s selection"
 msgid_plural "%s requires at least %s selections"
 msgstr[0] "%s requer a seleção de ao menos %s item"
 msgstr[1] "%s requer a seleção de ao menos %s itens"
 
-#: fields/select.php:50
+#: fields/select.php:36 fields/taxonomy.php:772
+msgctxt "noun"
+msgid "Select"
+msgstr "Seleção"
+
+#: fields/select.php:49
 msgctxt "Select2 JS matches_1"
 msgid "One result is available, press enter to select it."
 msgstr "Um resultado localizado, pressione Enter para selecioná-lo."
 
-#: fields/select.php:51
+#: fields/select.php:50
 #, php-format
 msgctxt "Select2 JS matches_n"
 msgid "%d results are available, use up and down arrow keys to navigate."
 msgstr ""
 "%d resultados localizados, utilize as setas para cima ou baixo para navegar."
 
-#: fields/select.php:52
+#: fields/select.php:51
 msgctxt "Select2 JS matches_0"
 msgid "No matches found"
 msgstr "Nenhuma correspondência encontrada"
 
-#: fields/select.php:53
+#: fields/select.php:52
 msgctxt "Select2 JS input_too_short_1"
 msgid "Please enter 1 or more characters"
 msgstr "Digite 1 ou mais caracteres"
 
-#: fields/select.php:54
+#: fields/select.php:53
 #, php-format
 msgctxt "Select2 JS input_too_short_n"
 msgid "Please enter %d or more characters"
 msgstr "Digite %d ou mais caracteres"
 
-#: fields/select.php:55
+#: fields/select.php:54
 msgctxt "Select2 JS input_too_long_1"
 msgid "Please delete 1 character"
 msgstr "Apague 1 caractere"
 
-#: fields/select.php:56
+#: fields/select.php:55
 #, php-format
 msgctxt "Select2 JS input_too_long_n"
 msgid "Please delete %d characters"
 msgstr "Apague %d caracteres"
 
-#: fields/select.php:57
+#: fields/select.php:56
 msgctxt "Select2 JS selection_too_long_1"
 msgid "You can only select 1 item"
 msgstr "Você pode selecionar apenas 1 item"
 
-#: fields/select.php:58
+#: fields/select.php:57
 #, php-format
 msgctxt "Select2 JS selection_too_long_n"
 msgid "You can only select %d items"
 msgstr "Você pode selecionar apenas %d itens"
 
-#: fields/select.php:59
+#: fields/select.php:58
 msgctxt "Select2 JS load_more"
 msgid "Loading more results&hellip;"
 msgstr "Carregando mais resultados&hellip;"
 
-#: fields/select.php:60
+#: fields/select.php:59
 msgctxt "Select2 JS searching"
 msgid "Searching&hellip;"
 msgstr "Pesquisando&hellip;"
 
-#: fields/select.php:61
+#: fields/select.php:60
 msgctxt "Select2 JS load_fail"
 msgid "Loading failed"
 msgstr "Falha ao carregar"
 
-#: fields/select.php:471
+#: fields/select.php:492
 msgid "Stylised UI"
 msgstr "Interface do campo aprimorada"
 
-#: fields/select.php:485
+#: fields/select.php:506
 msgid "Use AJAX to lazy load choices?"
 msgstr "Utilizar AJAX para carregar opções?"
 
+#: fields/select.php:521
+msgid "Specify the value returned"
+msgstr "Especifique a forma como os valores serão retornados"
+
 #: fields/tab.php:36
 msgid "Tab"
 msgstr "Aba"
@@ -2265,90 +2295,86 @@ msgid "Use this field as an end-point and start a new group of tabs"
 msgstr ""
 "Utilizar este campo como um ponto final e iniciar um novo grupo de abas"
 
-#: fields/taxonomy.php:706
+#: fields/taxonomy.php:719
 msgid "None"
 msgstr "Nenhuma"
 
-#: fields/taxonomy.php:738
+#: fields/taxonomy.php:751
 msgid "Select the taxonomy to be displayed"
 msgstr "Selecione a taxonomia que será exibida"
 
-#: fields/taxonomy.php:747
+#: fields/taxonomy.php:760
 msgid "Appearance"
 msgstr "Aparência"
 
-#: fields/taxonomy.php:748
+#: fields/taxonomy.php:761
 msgid "Select the appearance of this field"
 msgstr "Selecione a aparência deste campo"
 
-#: fields/taxonomy.php:753
+#: fields/taxonomy.php:766
 msgid "Multiple Values"
 msgstr "Vários valores"
 
-#: fields/taxonomy.php:755
+#: fields/taxonomy.php:768
 msgid "Multi Select"
 msgstr "Seleção Múltipla"
 
-#: fields/taxonomy.php:757
+#: fields/taxonomy.php:770
 msgid "Single Value"
 msgstr "Um único valor"
 
-#: fields/taxonomy.php:758
+#: fields/taxonomy.php:771
 msgid "Radio Buttons"
 msgstr "Botões de Rádio"
 
-#: fields/taxonomy.php:781
+#: fields/taxonomy.php:794
 msgid "Create Terms"
 msgstr "Criar Termos"
 
-#: fields/taxonomy.php:782
+#: fields/taxonomy.php:795
 msgid "Allow new terms to be created whilst editing"
 msgstr "Permite que novos termos sejam criados diretamente na tela de edição"
 
-#: fields/taxonomy.php:795
+#: fields/taxonomy.php:808
 msgid "Save Terms"
 msgstr "Salvar Termos"
 
-#: fields/taxonomy.php:796
+#: fields/taxonomy.php:809
 msgid "Connect selected terms to the post"
 msgstr "Atribui e conecta os termos selecionados ao post"
 
-#: fields/taxonomy.php:809
+#: fields/taxonomy.php:822
 msgid "Load Terms"
 msgstr "Carregar Termos"
 
-#: fields/taxonomy.php:810
+#: fields/taxonomy.php:823
 msgid "Load value from posts terms"
 msgstr "Carrega os termos que estão atribuídos ao post"
 
-#: fields/taxonomy.php:828
+#: fields/taxonomy.php:841
 msgid "Term Object"
 msgstr "Objeto do Termo"
 
-#: fields/taxonomy.php:829
+#: fields/taxonomy.php:842
 msgid "Term ID"
 msgstr "ID do Termo"
 
-#: fields/taxonomy.php:888
+#: fields/taxonomy.php:901
 #, php-format
 msgid "User unable to add new %s"
 msgstr "Usuário incapaz de adicionar novo(a) %s"
 
-#: fields/taxonomy.php:901
+#: fields/taxonomy.php:914
 #, php-format
 msgid "%s already exists"
 msgstr "%s já existe"
 
-#: fields/taxonomy.php:942
+#: fields/taxonomy.php:955
 #, php-format
 msgid "%s added"
 msgstr "%s adicionado(a)"
 
-#: fields/taxonomy.php:976
-msgid "Parent"
-msgstr "Página de Nível mais Alto (sem mãe)"
-
-#: fields/taxonomy.php:987
+#: fields/taxonomy.php:1000
 msgid "Add"
 msgstr "Adicionar"
 
@@ -2396,11 +2422,11 @@ msgstr "Url"
 msgid "Value must be a valid URL"
 msgstr "Você deve fornecer uma URL válida"
 
-#: fields/user.php:396
+#: fields/user.php:379
 msgid "Filter by role"
 msgstr "Filtrar por função"
 
-#: fields/user.php:404
+#: fields/user.php:387
 msgid "All user roles"
 msgstr "Todas as funções de usuários"
 
@@ -2452,12 +2478,11 @@ msgid_plural "%d fields require attention."
 msgstr[0] "1 campo requer a sua atenção."
 msgstr[1] "%d campos requerem sua atenção."
 
-#. Plugin Name of the plugin/theme
 #: pro/acf-pro.php:24
 msgid "Advanced Custom Fields PRO"
 msgstr "Advanced Custom Fields PRO"
 
-#: pro/acf-pro.php:191
+#: pro/acf-pro.php:192
 msgid "Flexible Content requires at least 1 layout"
 msgstr "O campo de Conteúdo Flexível requer pelo menos 1 layout"
 
@@ -2486,14 +2511,10 @@ msgstr ""
 msgid "Create a Custom Field Group"
 msgstr "Criar um Grupo de Campos Personalizado"
 
-#: pro/admin/settings-updates.php:125
+#: pro/admin/settings-updates.php:87
 msgid "<b>Error</b>. Could not connect to update server"
 msgstr "<b>Erro</b>. Não foi possível conectar ao servidor de atualização"
 
-#: pro/admin/settings-updates.php:203 pro/admin/settings-updates.php:274
-msgid "<b>Connection Error</b>. Sorry, please try again"
-msgstr "<b>Erro de Conexão</b>. Tente novamente"
-
 #: pro/admin/views/settings-updates.php:11
 msgid "Deactivate License"
 msgstr "Desativar Licença"
@@ -2568,6 +2589,73 @@ msgstr ""
 "href=“%s”>Atualizações</a>. Se você não possui uma licença, consulte os <a "
 "href=“%s”>detalhes e preços</a>."
 
+#: pro/fields/clone.php:36
+msgctxt "noun"
+msgid "Clone"
+msgstr "Clone"
+
+#: pro/fields/clone.php:680
+msgid "Select one or more fields you wish to clone"
+msgstr "Selecione um ou mais campos que deseja clonar"
+
+#: pro/fields/clone.php:695
+msgid "Display"
+msgstr "Exibição"
+
+#: pro/fields/clone.php:696
+msgid "Specify the style used to render the clone field"
+msgstr "Especifique o estilo utilizado para exibir o campo de clone"
+
+#: pro/fields/clone.php:701
+msgid "Group (displays selected fields in a group within this field)"
+msgstr "Grupo (mostra os campos selecionados em um grupo dentro deste campo)"
+
+#: pro/fields/clone.php:702
+msgid "Seamless (replaces this field with selected fields)"
+msgstr "Sem bordas (substitui este campo pelos campos selecionados)"
+
+#: pro/fields/clone.php:710
+msgid "Specify the style used to render the selected fields"
+msgstr "Especifique o estilo utilizado para exibir os campos selecionados"
+
+#: pro/fields/clone.php:715 pro/fields/flexible-content.php:555
+#: pro/fields/repeater.php:467
+msgid "Block"
+msgstr "Bloco"
+
+#: pro/fields/clone.php:716 pro/fields/flexible-content.php:554
+#: pro/fields/repeater.php:466
+msgid "Table"
+msgstr "Tabela"
+
+#: pro/fields/clone.php:717 pro/fields/flexible-content.php:556
+#: pro/fields/repeater.php:468
+msgid "Row"
+msgstr "Linha"
+
+#: pro/fields/clone.php:723
+#, php-format
+msgid "Labels will be displayed as %s"
+msgstr "Os rótulos serão exibidos como %s"
+
+#: pro/fields/clone.php:726
+msgid "Prefix Field Labels"
+msgstr "Prefixo dos Rótulos dos Campos"
+
+#: pro/fields/clone.php:741
+#, php-format
+msgid "Values will be saved as %s"
+msgstr "Valores serão salvos como %s"
+
+#: pro/fields/clone.php:744
+msgid "Prefix Field Names"
+msgstr "Prefixo dos Nomes dos Campos"
+
+#: pro/fields/clone.php:900
+#, php-format
+msgid "All fields from %s field group"
+msgstr "Todos os campos do grupo de campos %s"
+
 #: pro/fields/flexible-content.php:36
 msgid "Flexible Content"
 msgstr "Conteúdo Flexível"
@@ -2612,72 +2700,60 @@ msgstr "{available} {label} {identifier} disponível (máx {max})"
 msgid "{required} {label} {identifier} required (min {min})"
 msgstr "{required} {label} {identifier} obrigatório (mín {min})"
 
-#: pro/fields/flexible-content.php:216
+#: pro/fields/flexible-content.php:220
 #, php-format
 msgid "Click the \"%s\" button below to start creating your layout"
 msgstr "Clique no botão “%s” abaixo para iniciar a criação do seu layout"
 
-#: pro/fields/flexible-content.php:346
+#: pro/fields/flexible-content.php:350
 msgid "Add layout"
 msgstr "Adicionar layout"
 
-#: pro/fields/flexible-content.php:349
+#: pro/fields/flexible-content.php:353
 msgid "Remove layout"
 msgstr "Remover layout"
 
-#: pro/fields/flexible-content.php:352 pro/fields/repeater.php:304
+#: pro/fields/flexible-content.php:356 pro/fields/repeater.php:304
 msgid "Click to toggle"
 msgstr "Clique para alternar"
 
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder Layout"
 msgstr "Reordenar Layout"
 
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder"
 msgstr "Reordenar"
 
-#: pro/fields/flexible-content.php:494
+#: pro/fields/flexible-content.php:498
 msgid "Delete Layout"
 msgstr "Excluir Layout"
 
-#: pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:499
 msgid "Duplicate Layout"
 msgstr "Duplicar Layout"
 
-#: pro/fields/flexible-content.php:496
+#: pro/fields/flexible-content.php:500
 msgid "Add New Layout"
 msgstr "Adicionar Novo Layout"
 
-#: pro/fields/flexible-content.php:550 pro/fields/repeater.php:466
-msgid "Table"
-msgstr "Tabela"
-
-#: pro/fields/flexible-content.php:551 pro/fields/repeater.php:467
-msgid "Block"
-msgstr "Bloco"
-
-#: pro/fields/flexible-content.php:552 pro/fields/repeater.php:468
-msgid "Row"
-msgstr "Linha"
-
-#: pro/fields/flexible-content.php:567
+#: pro/fields/flexible-content.php:571
 msgid "Min"
 msgstr "Mín."
 
-#: pro/fields/flexible-content.php:580
+#: pro/fields/flexible-content.php:584
 msgid "Max"
 msgstr "Máx."
 
-#: pro/fields/flexible-content.php:608 pro/fields/repeater.php:475
+#: pro/fields/flexible-content.php:612 pro/fields/repeater.php:475
 msgid "Button Label"
 msgstr "Rótulo do Botão"
 
-#: pro/fields/flexible-content.php:617
+#: pro/fields/flexible-content.php:621
 msgid "Minimum Layouts"
 msgstr "Qtde. Mínima de Layouts"
 
-#: pro/fields/flexible-content.php:626
+#: pro/fields/flexible-content.php:630
 msgid "Maximum Layouts"
 msgstr "Qtde. Máxima de Layouts"
 
@@ -2685,75 +2761,75 @@ msgstr "Qtde. Máxima de Layouts"
 msgid "Gallery"
 msgstr "Galeria"
 
-#: pro/fields/gallery.php:53
+#: pro/fields/gallery.php:52
 msgid "Add Image to Gallery"
 msgstr "Adicionar Imagem à Galeria"
 
-#: pro/fields/gallery.php:57
+#: pro/fields/gallery.php:56
 msgid "Maximum selection reached"
 msgstr "A quantidade máxima de seleções foi atingida"
 
-#: pro/fields/gallery.php:337
+#: pro/fields/gallery.php:336
 msgid "Length"
 msgstr "Duração"
 
-#: pro/fields/gallery.php:380
+#: pro/fields/gallery.php:379
 msgid "Caption"
 msgstr "Legenda"
 
-#: pro/fields/gallery.php:389
+#: pro/fields/gallery.php:388
 msgid "Alt Text"
 msgstr "Texto Alternativo"
 
-#: pro/fields/gallery.php:557
+#: pro/fields/gallery.php:559
 msgid "Add to gallery"
 msgstr "Adicionar à galeria"
 
-#: pro/fields/gallery.php:561
+#: pro/fields/gallery.php:563
 msgid "Bulk actions"
 msgstr "Ações em massa"
 
-#: pro/fields/gallery.php:562
+#: pro/fields/gallery.php:564
 msgid "Sort by date uploaded"
 msgstr "Ordenar por data de envio"
 
-#: pro/fields/gallery.php:563
+#: pro/fields/gallery.php:565
 msgid "Sort by date modified"
 msgstr "Ordenar por data de modificação"
 
-#: pro/fields/gallery.php:564
+#: pro/fields/gallery.php:566
 msgid "Sort by title"
 msgstr "Ordenar por título"
 
-#: pro/fields/gallery.php:565
+#: pro/fields/gallery.php:567
 msgid "Reverse current order"
 msgstr "Inverter ordem atual"
 
-#: pro/fields/gallery.php:583
+#: pro/fields/gallery.php:585
 msgid "Close"
 msgstr "Fechar"
 
-#: pro/fields/gallery.php:637
+#: pro/fields/gallery.php:639
 msgid "Minimum Selection"
 msgstr "Qtde. Mínima de Seleções"
 
-#: pro/fields/gallery.php:646
+#: pro/fields/gallery.php:648
 msgid "Maximum Selection"
 msgstr "Qtde. Máxima de Seleções"
 
-#: pro/fields/gallery.php:665
+#: pro/fields/gallery.php:657
 msgid "Insert"
 msgstr "Inserir"
 
-#: pro/fields/gallery.php:666
+#: pro/fields/gallery.php:658
 msgid "Specify where new attachments are added"
 msgstr "Especifique onde os novos anexos serão adicionados"
 
-#: pro/fields/gallery.php:670
+#: pro/fields/gallery.php:662
 msgid "Append to the end"
 msgstr "Adicionar no final da galeria"
 
-#: pro/fields/gallery.php:671
+#: pro/fields/gallery.php:663
 msgid "Prepend to the beginning"
 msgstr "Adicionar no início da galeria"
 
@@ -2797,20 +2873,30 @@ msgstr "Qtde. Mínima de Linhas"
 msgid "Maximum Rows"
 msgstr "Qtde. Máxima de Linhas"
 
-#. Plugin URI of the plugin/theme
-msgid "https://www.advancedcustomfields.com/"
-msgstr "https://www.advancedcustomfields.com/"
+#~ msgid "Select"
+#~ msgstr "Seleção"
 
-#. Description of the plugin/theme
-msgid "Customise WordPress with powerful, professional and intuitive fields"
-msgstr ""
-"Personalize o WordPress com campos personalizados profissionais, poderosos e "
-"intuitivos"
+#~ msgctxt "Field label"
+#~ msgid "Clone"
+#~ msgstr "Clone"
 
-#. Author of the plugin/theme
-msgid "Elliot Condon"
-msgstr "Elliot Condon"
+#~ msgctxt "Field instruction"
+#~ msgid "Clone"
+#~ msgstr "Clone"
 
-#. Author URI of the plugin/theme
-msgid "http://www.elliotcondon.com/"
-msgstr "http://www.elliotcondon.com/"
+#~ msgid "<b>Connection Error</b>. Sorry, please try again"
+#~ msgstr "<b>Erro de Conexão</b>. Tente novamente"
+
+#~ msgid "https://www.advancedcustomfields.com/"
+#~ msgstr "https://www.advancedcustomfields.com/"
+
+#~ msgid "Customise WordPress with powerful, professional and intuitive fields"
+#~ msgstr ""
+#~ "Personalize o WordPress com campos personalizados profissionais, "
+#~ "poderosos e intuitivos"
+
+#~ msgid "Elliot Condon"
+#~ msgstr "Elliot Condon"
+
+#~ msgid "http://www.elliotcondon.com/"
+#~ msgstr "http://www.elliotcondon.com/"
diff --git a/lang/acf-pt_PT.mo b/lang/acf-pt_PT.mo
index 3e44dab..2b0cf1b 100644
Binary files a/lang/acf-pt_PT.mo and b/lang/acf-pt_PT.mo differ
diff --git a/lang/acf-pt_PT.po b/lang/acf-pt_PT.po
index 8ff688b..e6cbf0e 100644
--- a/lang/acf-pt_PT.po
+++ b/lang/acf-pt_PT.po
@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Advanced Custom Fields PRO 5.4.0\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
-"POT-Creation-Date: 2016-06-18 14:59+0100\n"
-"PO-Revision-Date: 2016-06-18 14:59+0100\n"
+"POT-Creation-Date: 2016-08-05 16:34+0100\n"
+"PO-Revision-Date: 2016-08-05 16:34+0100\n"
 "Last-Translator: Pedro Mendonça <ped.gaspar@gmail.com>\n"
 "Language-Team: Pedro Mendonça <ped.gaspar@gmail.com>\n"
 "Language: pt_PT\n"
@@ -28,91 +28,91 @@ msgstr ""
 msgid "Advanced Custom Fields"
 msgstr "Advanced Custom Fields"
 
-#: acf.php:268 admin/admin.php:61
+#: acf.php:271 admin/admin.php:61
 msgid "Field Groups"
 msgstr "Grupos de campos"
 
-#: acf.php:269
+#: acf.php:272
 msgid "Field Group"
 msgstr "Grupo de campos"
 
-#: acf.php:270 acf.php:302 admin/admin.php:62
-#: pro/fields/flexible-content.php:496
+#: acf.php:273 acf.php:305 admin/admin.php:62
+#: pro/fields/flexible-content.php:500
 msgid "Add New"
 msgstr "Adicionar novo"
 
-#: acf.php:271
+#: acf.php:274
 msgid "Add New Field Group"
 msgstr "Adicionar novo grupo de campos"
 
-#: acf.php:272
+#: acf.php:275
 msgid "Edit Field Group"
 msgstr "Editar grupo de campos"
 
-#: acf.php:273
+#: acf.php:276
 msgid "New Field Group"
 msgstr "Novo grupo de campos"
 
-#: acf.php:274
+#: acf.php:277
 msgid "View Field Group"
 msgstr "Ver grupo de campos"
 
-#: acf.php:275
+#: acf.php:278
 msgid "Search Field Groups"
 msgstr "Pesquisar grupos de campos"
 
-#: acf.php:276
+#: acf.php:279
 msgid "No Field Groups found"
 msgstr "Nenhum grupo de campos encontrado"
 
-#: acf.php:277
+#: acf.php:280
 msgid "No Field Groups found in Trash"
 msgstr "Nenhum grupo de campos encontrado no lixo"
 
-#: acf.php:300 admin/field-group.php:182 admin/field-group.php:280
-#: admin/field-groups.php:528
+#: acf.php:303 admin/field-group.php:182 admin/field-group.php:280
+#: admin/field-groups.php:528 pro/fields/clone.php:662
 msgid "Fields"
 msgstr "Campos"
 
-#: acf.php:301
+#: acf.php:304
 msgid "Field"
 msgstr "Campo"
 
-#: acf.php:303
+#: acf.php:306
 msgid "Add New Field"
 msgstr "Adicionar novo campo"
 
-#: acf.php:304
+#: acf.php:307
 msgid "Edit Field"
 msgstr "Editar campo"
 
-#: acf.php:305 admin/views/field-group-fields.php:18
+#: acf.php:308 admin/views/field-group-fields.php:54
 #: admin/views/settings-info.php:111
 msgid "New Field"
 msgstr "Novo campo"
 
-#: acf.php:306
+#: acf.php:309
 msgid "View Field"
 msgstr "Ver campo"
 
-#: acf.php:307
+#: acf.php:310
 msgid "Search Fields"
 msgstr "Pesquisar campos"
 
-#: acf.php:308
+#: acf.php:311
 msgid "No Fields found"
 msgstr "Nenhum campo encontrado"
 
-#: acf.php:309
+#: acf.php:312
 msgid "No Fields found in Trash"
 msgstr "Nenhum campo encontrado no Lixo"
 
-#: acf.php:348 admin/field-group.php:395 admin/field-groups.php:585
+#: acf.php:351 admin/field-group.php:395 admin/field-groups.php:585
 #: admin/views/field-group-options.php:13
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: acf.php:353
+#: acf.php:356
 #, php-format
 msgid "Disabled <span class=\"count\">(%s)</span>"
 msgid_plural "Disabled <span class=\"count\">(%s)</span>"
@@ -175,7 +175,7 @@ msgstr "Nenhum campo de opções disponível"
 msgid "Field group title is required"
 msgstr "O título do grupo de campos é obrigatório"
 
-#: admin/field-group.php:278 api/api-field-group.php:620
+#: admin/field-group.php:278 api/api-field-group.php:651
 msgid "copy"
 msgstr "cópia"
 
@@ -183,7 +183,7 @@ msgstr "cópia"
 #: admin/views/field-group-field-conditional-logic.php:62
 #: admin/views/field-group-field-conditional-logic.php:162
 #: admin/views/field-group-locations.php:59
-#: admin/views/field-group-locations.php:135 api/api-helpers.php:3684
+#: admin/views/field-group-locations.php:135 api/api-helpers.php:3952
 msgid "or"
 msgstr "ou"
 
@@ -226,79 +226,79 @@ msgstr "Chaves dos campos"
 msgid "Active"
 msgstr "Activo"
 
-#: admin/field-group.php:843
+#: admin/field-group.php:842
 msgid "Front Page"
 msgstr "Página inicial"
 
-#: admin/field-group.php:844
+#: admin/field-group.php:843
 msgid "Posts Page"
 msgstr "Página de artigos"
 
-#: admin/field-group.php:845
+#: admin/field-group.php:844
 msgid "Top Level Page (no parent)"
 msgstr "Página de topo (sem superior)"
 
-#: admin/field-group.php:846
+#: admin/field-group.php:845
 msgid "Parent Page (has children)"
 msgstr "Página superior (tem dependentes)"
 
-#: admin/field-group.php:847
+#: admin/field-group.php:846
 msgid "Child Page (has parent)"
 msgstr "Página dependente (tem superior)"
 
-#: admin/field-group.php:863
+#: admin/field-group.php:862
 msgid "Default Template"
 msgstr "Modelo por omissão"
 
-#: admin/field-group.php:886
+#: admin/field-group.php:885
 msgid "Logged in"
 msgstr "Sessão iniciada"
 
-#: admin/field-group.php:887
+#: admin/field-group.php:886
 msgid "Viewing front end"
 msgstr "A visualizar a frente do site"
 
-#: admin/field-group.php:888
+#: admin/field-group.php:887
 msgid "Viewing back end"
 msgstr "A visualizar a administração do site"
 
-#: admin/field-group.php:907
+#: admin/field-group.php:906
 msgid "Super Admin"
 msgstr "Super Administrador"
 
-#: admin/field-group.php:918 admin/field-group.php:926
-#: admin/field-group.php:940 admin/field-group.php:947
-#: admin/field-group.php:964 admin/field-group.php:981 fields/file.php:241
-#: fields/image.php:237 pro/fields/gallery.php:684
+#: admin/field-group.php:917 admin/field-group.php:925
+#: admin/field-group.php:939 admin/field-group.php:946
+#: admin/field-group.php:963 admin/field-group.php:980 fields/file.php:241
+#: fields/image.php:237 pro/fields/gallery.php:676
 msgid "All"
 msgstr "Todos"
 
-#: admin/field-group.php:927
+#: admin/field-group.php:926
 msgid "Add / Edit"
 msgstr "Adicionar / Editar"
 
-#: admin/field-group.php:928
+#: admin/field-group.php:927
 msgid "Register"
 msgstr "Registar"
 
-#: admin/field-group.php:1168
+#: admin/field-group.php:1167
 msgid "Move Complete."
 msgstr "Movido com sucesso."
 
-#: admin/field-group.php:1169
+#: admin/field-group.php:1168
 #, php-format
 msgid "The %s field can now be found in the %s field group"
 msgstr "O campo %s pode agora ser encontrado no grupo de campos %s"
 
-#: admin/field-group.php:1171
+#: admin/field-group.php:1170
 msgid "Close Window"
 msgstr "Fechar janela"
 
-#: admin/field-group.php:1206
+#: admin/field-group.php:1205
 msgid "Please select the destination for this field"
 msgstr "Por favor seleccione o destinho para este campo"
 
-#: admin/field-group.php:1213
+#: admin/field-group.php:1212
 msgid "Move Field"
 msgstr "Mover campo"
 
@@ -337,14 +337,14 @@ msgstr[1] "%s grupos de campos sincronizados."
 msgid "Sync available"
 msgstr "Sincronização disponível"
 
-#: admin/field-groups.php:525 api/api-template.php:1079
-#: api/api-template.php:1292 pro/fields/gallery.php:371
+#: admin/field-groups.php:525 api/api-template.php:1077
+#: api/api-template.php:1290 pro/fields/gallery.php:370
 msgid "Title"
 msgstr "Título"
 
 #: admin/field-groups.php:526 admin/views/field-group-options.php:93
 #: admin/views/update-network.php:25 admin/views/update-network.php:33
-#: pro/fields/gallery.php:398
+#: pro/fields/gallery.php:397
 msgid "Description"
 msgstr "Descrição"
 
@@ -370,7 +370,7 @@ msgstr "Recursos"
 msgid "Getting Started"
 msgstr "Primeiros passos"
 
-#: admin/field-groups.php:629 pro/admin/settings-updates.php:61
+#: admin/field-groups.php:629 pro/admin/settings-updates.php:57
 #: pro/admin/views/settings-updates.php:17
 msgid "Updates"
 msgstr "Actualizações"
@@ -387,7 +387,7 @@ msgstr "Funções"
 msgid "Actions"
 msgstr "Acções"
 
-#: admin/field-groups.php:633 fields/relationship.php:720
+#: admin/field-groups.php:633 fields/relationship.php:737
 msgid "Filters"
 msgstr "Filtros"
 
@@ -412,7 +412,7 @@ msgid "Duplicate this item"
 msgstr "Duplicar este item"
 
 #: admin/field-groups.php:684 admin/field-groups.php:700
-#: admin/views/field-group-field.php:58 pro/fields/flexible-content.php:495
+#: admin/views/field-group-field.php:59 pro/fields/flexible-content.php:499
 msgid "Duplicate"
 msgstr "Duplicar"
 
@@ -502,26 +502,30 @@ msgid "Conditional Logic"
 msgstr "Lógica condicional"
 
 #: admin/views/field-group-field-conditional-logic.php:40
-#: admin/views/field-group-field.php:140 fields/checkbox.php:243
-#: fields/message.php:144 fields/page_link.php:539 fields/page_link.php:553
-#: fields/post_object.php:403 fields/post_object.php:417 fields/radio.php:254
-#: fields/select.php:448 fields/select.php:462 fields/select.php:476
-#: fields/select.php:490 fields/tab.php:130 fields/taxonomy.php:772
-#: fields/taxonomy.php:786 fields/taxonomy.php:800 fields/taxonomy.php:814
-#: fields/user.php:416 fields/user.php:430 fields/wysiwyg.php:418
-#: pro/admin/views/settings-updates.php:93
+#: admin/views/field-group-field.php:141 fields/checkbox.php:244
+#: fields/message.php:144 fields/page_link.php:533 fields/page_link.php:547
+#: fields/page_link.php:561 fields/post_object.php:432
+#: fields/post_object.php:446 fields/radio.php:255 fields/select.php:469
+#: fields/select.php:483 fields/select.php:497 fields/select.php:511
+#: fields/tab.php:130 fields/taxonomy.php:785 fields/taxonomy.php:799
+#: fields/taxonomy.php:813 fields/taxonomy.php:827 fields/user.php:399
+#: fields/user.php:413 fields/wysiwyg.php:418
+#: pro/admin/views/settings-updates.php:93 pro/fields/clone.php:716
+#: pro/fields/clone.php:734
 msgid "Yes"
 msgstr "Sim"
 
 #: admin/views/field-group-field-conditional-logic.php:41
-#: admin/views/field-group-field.php:141 fields/checkbox.php:244
-#: fields/message.php:145 fields/page_link.php:540 fields/page_link.php:554
-#: fields/post_object.php:404 fields/post_object.php:418 fields/radio.php:255
-#: fields/select.php:449 fields/select.php:463 fields/select.php:477
-#: fields/select.php:491 fields/tab.php:131 fields/taxonomy.php:687
-#: fields/taxonomy.php:773 fields/taxonomy.php:787 fields/taxonomy.php:801
-#: fields/taxonomy.php:815 fields/user.php:417 fields/user.php:431
-#: fields/wysiwyg.php:419 pro/admin/views/settings-updates.php:103
+#: admin/views/field-group-field.php:142 fields/checkbox.php:245
+#: fields/message.php:145 fields/page_link.php:534 fields/page_link.php:548
+#: fields/page_link.php:562 fields/post_object.php:433
+#: fields/post_object.php:447 fields/radio.php:256 fields/select.php:470
+#: fields/select.php:484 fields/select.php:498 fields/select.php:512
+#: fields/tab.php:131 fields/taxonomy.php:700 fields/taxonomy.php:786
+#: fields/taxonomy.php:800 fields/taxonomy.php:814 fields/taxonomy.php:828
+#: fields/user.php:400 fields/user.php:414 fields/wysiwyg.php:419
+#: pro/admin/views/settings-updates.php:103 pro/fields/clone.php:717
+#: pro/fields/clone.php:735
 msgid "No"
 msgstr "Não"
 
@@ -549,120 +553,122 @@ msgstr "e"
 msgid "Add rule group"
 msgstr "Adicionar grupo de regras"
 
-#: admin/views/field-group-field.php:49 pro/fields/flexible-content.php:342
+#: admin/views/field-group-field.php:50 pro/fields/flexible-content.php:346
 #: pro/fields/repeater.php:302
 msgid "Drag to reorder"
 msgstr "Arraste para reordenar"
 
-#: admin/views/field-group-field.php:54 admin/views/field-group-field.php:57
+#: admin/views/field-group-field.php:55 admin/views/field-group-field.php:58
 msgid "Edit field"
 msgstr "Editar campo"
 
-#: admin/views/field-group-field.php:57 core/media.php:55 fields/image.php:142
-#: pro/fields/gallery.php:358
+#: admin/views/field-group-field.php:58 fields/image.php:142
+#: pro/fields/gallery.php:357
 msgid "Edit"
 msgstr "Editar"
 
-#: admin/views/field-group-field.php:58
+#: admin/views/field-group-field.php:59
 msgid "Duplicate field"
 msgstr "Duplicar campo"
 
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move field to another group"
 msgstr "Mover campo para outro grupo"
 
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move"
 msgstr "Mover"
 
-#: admin/views/field-group-field.php:60
+#: admin/views/field-group-field.php:61
 msgid "Delete field"
 msgstr "Eliminar campo"
 
-#: admin/views/field-group-field.php:60 pro/fields/flexible-content.php:494
+#: admin/views/field-group-field.php:61 pro/fields/flexible-content.php:498
 msgid "Delete"
 msgstr "Eliminar"
 
-#: admin/views/field-group-field.php:68 fields/oembed.php:225
-#: fields/taxonomy.php:888
+#: admin/views/field-group-field.php:69 fields/oembed.php:225
+#: fields/taxonomy.php:901
 msgid "Error"
 msgstr "Erro"
 
-#: admin/views/field-group-field.php:68
+#: admin/views/field-group-field.php:69
 msgid "Field type does not exist"
 msgstr "Tipo de campo não existe"
 
-#: admin/views/field-group-field.php:81
+#: admin/views/field-group-field.php:82
 msgid "Field Label"
 msgstr "Legenda do campo"
 
-#: admin/views/field-group-field.php:82
+#: admin/views/field-group-field.php:83
 msgid "This is the name which will appear on the EDIT page"
 msgstr "Este é o nome que irá aparecer na página EDITAR."
 
-#: admin/views/field-group-field.php:94
+#: admin/views/field-group-field.php:95
 msgid "Field Name"
 msgstr "Nome do campo"
 
-#: admin/views/field-group-field.php:95
+#: admin/views/field-group-field.php:96
 msgid "Single word, no spaces. Underscores and dashes allowed"
 msgstr ""
 "Uma única palavra, sem espaços. São permitidos underscores (_) e traços (-)."
 
-#: admin/views/field-group-field.php:107
+#: admin/views/field-group-field.php:108
 msgid "Field Type"
 msgstr "Tipo de campo"
 
-#: admin/views/field-group-field.php:121 fields/tab.php:103
+#: admin/views/field-group-field.php:122 fields/tab.php:103
 msgid "Instructions"
 msgstr "Instruções"
 
-#: admin/views/field-group-field.php:122
+#: admin/views/field-group-field.php:123
 msgid "Instructions for authors. Shown when submitting data"
 msgstr "Instruções para os autores. São mostradas quando submeter dados."
 
-#: admin/views/field-group-field.php:133
+#: admin/views/field-group-field.php:134
 msgid "Required?"
 msgstr "Obrigatório?"
 
-#: admin/views/field-group-field.php:162
+#: admin/views/field-group-field.php:163
 msgid "Wrapper Attributes"
 msgstr "Atributos do wrapper"
 
-#: admin/views/field-group-field.php:168
+#: admin/views/field-group-field.php:169
 msgid "width"
 msgstr "largura"
 
-#: admin/views/field-group-field.php:182
+#: admin/views/field-group-field.php:183
 msgid "class"
 msgstr "classe"
 
-#: admin/views/field-group-field.php:195
+#: admin/views/field-group-field.php:196
 msgid "id"
 msgstr "id"
 
-#: admin/views/field-group-field.php:207
+#: admin/views/field-group-field.php:208
 msgid "Close Field"
 msgstr "Fechar campo"
 
-#: admin/views/field-group-fields.php:29
+#: admin/views/field-group-fields.php:17
 msgid "Order"
 msgstr "Ordem"
 
-#: admin/views/field-group-fields.php:30 pro/fields/flexible-content.php:521
+#: admin/views/field-group-fields.php:18 fields/checkbox.php:259
+#: fields/radio.php:314 fields/select.php:527
+#: pro/fields/flexible-content.php:525
 msgid "Label"
 msgstr "Legenda"
 
-#: admin/views/field-group-fields.php:31 fields/taxonomy.php:954
-#: pro/fields/flexible-content.php:534
+#: admin/views/field-group-fields.php:19 fields/taxonomy.php:967
+#: pro/fields/flexible-content.php:538
 msgid "Name"
 msgstr "Nome"
 
-#: admin/views/field-group-fields.php:32
+#: admin/views/field-group-fields.php:20
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/views/field-group-fields.php:44
+#: admin/views/field-group-fields.php:38
 msgid ""
 "No fields. Click the <strong>+ Add Field</strong> button to create your "
 "first field."
@@ -670,7 +676,7 @@ msgstr ""
 "Nenhum campo. Clique no botão <strong>+ Adicionar campo</strong> para criar "
 "seu primeiro campo."
 
-#: admin/views/field-group-fields.php:51
+#: admin/views/field-group-fields.php:44
 msgid "+ Add Field"
 msgstr "+ Adicionar campo"
 
@@ -679,7 +685,7 @@ msgstr "+ Adicionar campo"
 msgid "Post"
 msgstr "Artigo"
 
-#: admin/views/field-group-locations.php:6 fields/relationship.php:726
+#: admin/views/field-group-locations.php:6 fields/relationship.php:743
 msgid "Post Type"
 msgstr "Tipo de conteúdo"
 
@@ -726,7 +732,7 @@ msgstr "Utilizador actual"
 
 #: admin/views/field-group-locations.php:21
 msgid "Current User Role"
-msgstr "Perfil de utilizador actual"
+msgstr "Papel do utilizador actual"
 
 #: admin/views/field-group-locations.php:22
 msgid "User Form"
@@ -734,7 +740,7 @@ msgstr "Formulário de utilizador"
 
 #: admin/views/field-group-locations.php:23
 msgid "User Role"
-msgstr "Perfil de utilizador"
+msgstr "Papel de utilizador"
 
 #: admin/views/field-group-locations.php:25 pro/admin/options-page.php:49
 msgid "Forms"
@@ -893,7 +899,7 @@ msgstr "Formato"
 msgid "Page Attributes"
 msgstr "Atributos da página"
 
-#: admin/views/field-group-options.php:123 fields/relationship.php:739
+#: admin/views/field-group-options.php:123 fields/relationship.php:756
 msgid "Featured Image"
 msgstr "Imagem de destaque"
 
@@ -1340,79 +1346,84 @@ msgstr "A ler tarefas de actualização..."
 msgid "See what's new"
 msgstr "Veja o que há de novo"
 
-#: api/api-helpers.php:933
+#: api/api-helpers.php:944
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: api/api-helpers.php:934
+#: api/api-helpers.php:945
 msgid "Medium"
 msgstr "Média"
 
-#: api/api-helpers.php:935
+#: api/api-helpers.php:946
 msgid "Large"
 msgstr "Grande"
 
-#: api/api-helpers.php:984
+#: api/api-helpers.php:995
 msgid "Full Size"
 msgstr "Tamanho original"
 
-#: api/api-helpers.php:1196 api/api-helpers.php:1759 fields/clone.php:298
+#: api/api-helpers.php:1207 api/api-helpers.php:1770 pro/fields/clone.php:849
 msgid "(no title)"
 msgstr "(sem título)"
 
-#: api/api-helpers.php:3605
+#: api/api-helpers.php:1807 fields/page_link.php:284 fields/post_object.php:283
+#: fields/taxonomy.php:989
+msgid "Parent"
+msgstr "Superior"
+
+#: api/api-helpers.php:3873
 #, php-format
 msgid "Image width must be at least %dpx."
 msgstr "A largura da imagem deve ser pelo menos de %dpx."
 
-#: api/api-helpers.php:3610
+#: api/api-helpers.php:3878
 #, php-format
 msgid "Image width must not exceed %dpx."
 msgstr "A largura da imagem não deve exceder os %dpx."
 
-#: api/api-helpers.php:3626
+#: api/api-helpers.php:3894
 #, php-format
 msgid "Image height must be at least %dpx."
 msgstr "A altura da imagem deve ser pelo menos de %dpx."
 
-#: api/api-helpers.php:3631
+#: api/api-helpers.php:3899
 #, php-format
 msgid "Image height must not exceed %dpx."
 msgstr "A altura da imagem não deve exceder os %dpx."
 
-#: api/api-helpers.php:3649
+#: api/api-helpers.php:3917
 #, php-format
 msgid "File size must be at least %s."
 msgstr "O tamanho do ficheiro deve ser pelo menos de %s."
 
-#: api/api-helpers.php:3654
+#: api/api-helpers.php:3922
 #, php-format
 msgid "File size must must not exceed %s."
 msgstr "O tamanho do ficheiro não deve exceder %s."
 
-#: api/api-helpers.php:3688
+#: api/api-helpers.php:3956
 #, php-format
 msgid "File type must be %s."
 msgstr "O tipo de ficheiro deve ser %s."
 
-#: api/api-template.php:1094
+#: api/api-template.php:1092
 msgid "Spam Detected"
 msgstr "Spam detectado"
 
-#: api/api-template.php:1237 core/media.php:56 pro/api/api-options-page.php:50
-#: pro/fields/gallery.php:586
+#: api/api-template.php:1235 pro/api/api-options-page.php:50
+#: pro/fields/gallery.php:588
 msgid "Update"
 msgstr "Actualizar"
 
-#: api/api-template.php:1238
+#: api/api-template.php:1236
 msgid "Post updated"
 msgstr "Artigo actualizado"
 
-#: api/api-template.php:1306 core/field.php:133
+#: api/api-template.php:1304 core/field.php:133
 msgid "Content"
 msgstr "Conteúdo"
 
-#: api/api-template.php:1371
+#: api/api-template.php:1369
 msgid "Validate Email"
 msgstr "Validar email"
 
@@ -1432,9 +1443,9 @@ msgstr "Relacional"
 msgid "jQuery"
 msgstr "jQuery"
 
-#: core/field.php:137 fields/checkbox.php:223 fields/radio.php:292
-#: pro/fields/flexible-content.php:491 pro/fields/flexible-content.php:540
-#: pro/fields/repeater.php:459
+#: core/field.php:137 fields/checkbox.php:224 fields/radio.php:293
+#: pro/fields/clone.php:692 pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:544 pro/fields/repeater.php:459
 msgid "Layout"
 msgstr "Layout"
 
@@ -1467,13 +1478,23 @@ msgstr "%d campos requerem a sua atenção."
 msgid "Restricted"
 msgstr "Restrito"
 
-#: core/media.php:54 fields/select.php:36 fields/select.php:230
-#: fields/taxonomy.php:759
+#: core/media.php:54 fields/select.php:249
+msgctxt "verb"
 msgid "Select"
-msgstr "Selecção"
+msgstr "Seleccionar"
+
+#: core/media.php:55
+msgctxt "verb"
+msgid "Edit"
+msgstr "Editar"
+
+#: core/media.php:56
+msgctxt "verb"
+msgid "Update"
+msgstr "Actualizar"
 
 #: core/media.php:57 fields/file.php:49 fields/image.php:54
-#: pro/fields/gallery.php:56
+#: pro/fields/gallery.php:55
 msgid "Uploaded to this post"
 msgstr "Carregados neste artigo"
 
@@ -1482,77 +1503,76 @@ msgstr "Carregados neste artigo"
 msgid "%s value is required"
 msgstr "O valor %s é obrigatório"
 
-#: fields/checkbox.php:36 fields/taxonomy.php:754
+#: fields/checkbox.php:36 fields/taxonomy.php:767
 msgid "Checkbox"
 msgstr "Caixa de selecção"
 
-#: fields/checkbox.php:141
+#: fields/checkbox.php:142
 msgid "Toggle All"
 msgstr "Seleccionar tudo"
 
-#: fields/checkbox.php:205 fields/radio.php:240 fields/select.php:425
+#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:446
 msgid "Choices"
 msgstr "Opções"
 
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:426
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "Enter each choice on a new line."
 msgstr "Introduza cada opção numa linha separada."
 
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:426
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "For more control, you may specify both a value and label like this:"
 msgstr ""
 "Para maior controlo, pode especificar tanto os valores como as legendas:"
 
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:426
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "red : Red"
 msgstr "vermelho : Vermelho"
 
-#: fields/checkbox.php:214 fields/color_picker.php:147 fields/email.php:124
-#: fields/number.php:150 fields/radio.php:283 fields/select.php:434
+#: fields/checkbox.php:215 fields/color_picker.php:147 fields/email.php:124
+#: fields/number.php:150 fields/radio.php:284 fields/select.php:455
 #: fields/text.php:148 fields/textarea.php:145 fields/true_false.php:115
 #: fields/url.php:117 fields/wysiwyg.php:379
 msgid "Default Value"
 msgstr "Valor por omissão"
 
-#: fields/checkbox.php:215 fields/select.php:435
+#: fields/checkbox.php:216 fields/select.php:456
 msgid "Enter each default value on a new line"
 msgstr "Introduza cada valor por omissão numa linha separada"
 
-#: fields/checkbox.php:229 fields/radio.php:298
+#: fields/checkbox.php:230 fields/radio.php:299
 msgid "Vertical"
 msgstr "Vertical"
 
-#: fields/checkbox.php:230 fields/radio.php:299
+#: fields/checkbox.php:231 fields/radio.php:300
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: fields/checkbox.php:237
+#: fields/checkbox.php:238
 msgid "Toggle"
 msgstr "Selecção"
 
-#: fields/checkbox.php:238
+#: fields/checkbox.php:239
 msgid "Prepend an extra checkbox to toggle all choices"
 msgstr ""
 "Preceder com caixa de selecção adicional para seleccionar todas as opções"
 
-#: fields/clone.php:36
-msgctxt "Field label"
-msgid "Clone"
-msgstr "Clone"
+#: fields/checkbox.php:252 fields/file.php:220 fields/image.php:206
+#: fields/radio.php:307 fields/taxonomy.php:836
+msgid "Return Value"
+msgstr "Valor devolvido"
 
-#: fields/clone.php:199
-msgctxt "Field instruction"
-msgid "Clone"
-msgstr "Clonar"
+#: fields/checkbox.php:253 fields/file.php:221 fields/image.php:207
+#: fields/radio.php:308
+msgid "Specify the returned value on front end"
+msgstr "Especifica o valor devolvido na frente do site."
 
-#: fields/clone.php:200
-msgid "Select one or more fields you wish to clone"
-msgstr "Seleccione um ou mais campos que deseja clonar"
+#: fields/checkbox.php:258 fields/radio.php:313 fields/select.php:526
+msgid "Value"
+msgstr "Valor"
 
-#: fields/clone.php:288
-#, php-format
-msgid "All fields from %s field group"
-msgstr "Todos os campos do grupo de campos %s"
+#: fields/checkbox.php:260 fields/radio.php:315 fields/select.php:528
+msgid "Both (Array)"
+msgstr "Ambos (Array)"
 
 #: fields/color_picker.php:36
 msgid "Color Picker"
@@ -1603,28 +1623,28 @@ msgctxt "Date Picker JS weekHeader"
 msgid "Wk"
 msgstr "Sem"
 
-#: fields/date_picker.php:195 fields/date_time_picker.php:240
+#: fields/date_picker.php:195 fields/date_time_picker.php:184
 #: fields/time_picker.php:126
 msgid "Display Format"
-msgstr "Formato de apresentação"
+msgstr "Formato de visualização"
 
-#: fields/date_picker.php:196 fields/date_time_picker.php:241
+#: fields/date_picker.php:196 fields/date_time_picker.php:185
 #: fields/time_picker.php:127
 msgid "The format displayed when editing a post"
-msgstr "O formato apresentado ao editar um conteúdo"
+msgstr "O formato de visualização ao editar um conteúdo"
 
-#: fields/date_picker.php:210 fields/date_time_picker.php:256
-#: fields/post_object.php:426 fields/relationship.php:766
+#: fields/date_picker.php:210 fields/date_time_picker.php:200
+#: fields/post_object.php:455 fields/relationship.php:783 fields/select.php:520
 #: fields/time_picker.php:140
 msgid "Return Format"
-msgstr "Formato a mostrar"
+msgstr "Formato devolvido"
 
-#: fields/date_picker.php:211 fields/date_time_picker.php:257
+#: fields/date_picker.php:211 fields/date_time_picker.php:201
 #: fields/time_picker.php:141
 msgid "The format returned via template functions"
-msgstr "O formato mostrado através das <em>template functions</em>"
+msgstr "O formato devolvido através das <em>template functions</em>"
 
-#: fields/date_picker.php:226 fields/date_time_picker.php:272
+#: fields/date_picker.php:226 fields/date_time_picker.php:216
 msgid "Week Starts On"
 msgstr "Semana começa em"
 
@@ -1682,22 +1702,27 @@ msgctxt "Date Time Picker JS closeText"
 msgid "Done"
 msgstr "Concluído"
 
-#: fields/date_time_picker.php:55
+#: fields/date_time_picker.php:54
+msgctxt "Date Time Picker JS selectText"
+msgid "Select"
+msgstr "Seleccionar"
+
+#: fields/date_time_picker.php:56
 msgctxt "Date Time Picker JS amText"
 msgid "AM"
 msgstr "AM"
 
-#: fields/date_time_picker.php:56
+#: fields/date_time_picker.php:57
 msgctxt "Date Time Picker JS amTextShort"
 msgid "A"
 msgstr "A"
 
-#: fields/date_time_picker.php:59
+#: fields/date_time_picker.php:60
 msgctxt "Date Time Picker JS pmText"
 msgid "PM"
 msgstr "PM"
 
-#: fields/date_time_picker.php:60
+#: fields/date_time_picker.php:61
 msgctxt "Date Time Picker JS pmTextShort"
 msgid "P"
 msgstr "P"
@@ -1706,7 +1731,7 @@ msgstr "P"
 msgid "Email"
 msgstr "Email"
 
-#: fields/email.php:125 fields/number.php:151 fields/radio.php:284
+#: fields/email.php:125 fields/number.php:151 fields/radio.php:285
 #: fields/text.php:149 fields/textarea.php:146 fields/url.php:118
 #: fields/wysiwyg.php:380
 msgid "Appears when creating a new post"
@@ -1759,8 +1784,8 @@ msgid "File name"
 msgstr "Nome do ficheiro"
 
 #: fields/file.php:152 fields/file.php:253 fields/file.php:264
-#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:715
-#: pro/fields/gallery.php:748
+#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:707
+#: pro/fields/gallery.php:740
 msgid "File size"
 msgstr "Tamanho do ficheiro"
 
@@ -1768,14 +1793,6 @@ msgstr "Tamanho do ficheiro"
 msgid "Add File"
 msgstr "Adicionar ficheiro"
 
-#: fields/file.php:220 fields/image.php:206 fields/taxonomy.php:823
-msgid "Return Value"
-msgstr "Valor a mostrar"
-
-#: fields/file.php:221 fields/image.php:207
-msgid "Specify the returned value on front end"
-msgstr "Especifica o valor a mostrar na frente do site."
-
 #: fields/file.php:226
 msgid "File Array"
 msgstr "Ficheiro"
@@ -1788,19 +1805,19 @@ msgstr "URL do ficheiro"
 msgid "File ID"
 msgstr "ID do ficheiro"
 
-#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:678
+#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:670
 msgid "Library"
 msgstr "Biblioteca"
 
-#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:679
+#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:671
 msgid "Limit the media library choice"
 msgstr "Limita a escolha da biblioteca de media."
 
-#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:685
+#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:677
 msgid "Uploaded to post"
 msgstr "Carregados no artigo"
 
-#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:692
+#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:684
 msgid "Minimum"
 msgstr "Mínimo"
 
@@ -1808,15 +1825,15 @@ msgstr "Mínimo"
 msgid "Restrict which files can be uploaded"
 msgstr "Restringe que ficheiros podem ser carregados."
 
-#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:725
+#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:717
 msgid "Maximum"
 msgstr "Máximo"
 
-#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:758
+#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:750
 msgid "Allowed file types"
 msgstr "Tipos de ficheiros permitidos"
 
-#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:759
+#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:751
 msgid "Comma separated list. Leave blank for all types"
 msgstr ""
 "Lista separada por vírgulas. Deixe em branco para permitir todos os tipos."
@@ -1833,7 +1850,7 @@ msgstr "A obter localização"
 msgid "Sorry, this browser does not support geolocation"
 msgstr "Desculpe, este navegador não suporta geolocalização."
 
-#: fields/google-map.php:133 fields/relationship.php:725
+#: fields/google-map.php:133 fields/relationship.php:742
 msgid "Search"
 msgstr "Pesquisa"
 
@@ -1866,7 +1883,7 @@ msgid "Set the initial zoom level"
 msgstr "Definir o nível de zoom inicial"
 
 #: fields/google-map.php:203 fields/image.php:257 fields/image.php:290
-#: fields/oembed.php:275 pro/fields/gallery.php:704 pro/fields/gallery.php:737
+#: fields/oembed.php:275 pro/fields/gallery.php:696 pro/fields/gallery.php:729
 msgid "Height"
 msgstr "Altura"
 
@@ -1882,11 +1899,11 @@ msgstr "Imagem"
 msgid "Select Image"
 msgstr "Seleccionar imagem"
 
-#: fields/image.php:52 pro/fields/gallery.php:54
+#: fields/image.php:52 pro/fields/gallery.php:53
 msgid "Edit Image"
 msgstr "Editar imagem"
 
-#: fields/image.php:53 pro/fields/gallery.php:55
+#: fields/image.php:53 pro/fields/gallery.php:54
 msgid "Update Image"
 msgstr "Actualizar imagem"
 
@@ -1894,7 +1911,7 @@ msgstr "Actualizar imagem"
 msgid "All images"
 msgstr "Todas as imagens"
 
-#: fields/image.php:144 pro/fields/gallery.php:359 pro/fields/gallery.php:542
+#: fields/image.php:144 pro/fields/gallery.php:358 pro/fields/gallery.php:546
 msgid "Remove"
 msgstr "Remover"
 
@@ -1918,21 +1935,21 @@ msgstr "URL da imagem"
 msgid "Image ID"
 msgstr "ID da imagem"
 
-#: fields/image.php:221 pro/fields/gallery.php:655
+#: fields/image.php:221
 msgid "Preview Size"
 msgstr "Tamanho da pré-visualização"
 
-#: fields/image.php:222 pro/fields/gallery.php:656
+#: fields/image.php:222
 msgid "Shown when entering data"
 msgstr "Mostrado ao introduzir dados"
 
-#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:693
-#: pro/fields/gallery.php:726
+#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:685
+#: pro/fields/gallery.php:718
 msgid "Restrict which images can be uploaded"
 msgstr "Restringir que imagens que ser carregadas"
 
 #: fields/image.php:249 fields/image.php:282 fields/oembed.php:264
-#: pro/fields/gallery.php:696 pro/fields/gallery.php:729
+#: pro/fields/gallery.php:688 pro/fields/gallery.php:721
 msgid "Width"
 msgstr "Largura"
 
@@ -1946,7 +1963,7 @@ msgstr "Novas linhas"
 
 #: fields/message.php:126 fields/textarea.php:183
 msgid "Controls how new lines are rendered"
-msgstr "Controla como serão apresentadas novas linhas."
+msgstr "Controla como serão visualizadas novas linhas."
 
 #: fields/message.php:130 fields/textarea.php:187
 msgid "Automatically add paragraphs"
@@ -1967,7 +1984,7 @@ msgstr "Mostrar HTML"
 #: fields/message.php:140
 msgid "Allow HTML markup to display as visible text instead of rendering"
 msgstr ""
-"Permite mostrar o código HTML como texto visível, em vez de o processar."
+"Permite visualizar o código HTML como texto visível, em vez de o processar."
 
 #: fields/number.php:36
 msgid "Number"
@@ -2015,37 +2032,41 @@ msgstr "Nenhuma incorporação encontrada para o URL introduzido"
 msgid "Embed Size"
 msgstr "Tamanho da incorporação"
 
-#: fields/page_link.php:197
+#: fields/page_link.php:192
 msgid "Archives"
 msgstr "Arquivo"
 
-#: fields/page_link.php:506 fields/post_object.php:370
-#: fields/relationship.php:692
+#: fields/page_link.php:500 fields/post_object.php:399
+#: fields/relationship.php:709
 msgid "Filter by Post Type"
 msgstr "Filtrar por tipo de conteúdo"
 
-#: fields/page_link.php:514 fields/post_object.php:378
-#: fields/relationship.php:700
+#: fields/page_link.php:508 fields/post_object.php:407
+#: fields/relationship.php:717
 msgid "All post types"
 msgstr "Todos os tipos de conteúdo"
 
-#: fields/page_link.php:520 fields/post_object.php:384
-#: fields/relationship.php:706
+#: fields/page_link.php:514 fields/post_object.php:413
+#: fields/relationship.php:723
 msgid "Filter by Taxonomy"
 msgstr "Filtrar por taxonomia"
 
-#: fields/page_link.php:528 fields/post_object.php:392
-#: fields/relationship.php:714
+#: fields/page_link.php:522 fields/post_object.php:421
+#: fields/relationship.php:731
 msgid "All taxonomies"
 msgstr "Todas as taxonomias"
 
-#: fields/page_link.php:534 fields/post_object.php:398 fields/radio.php:249
-#: fields/select.php:443 fields/taxonomy.php:767 fields/user.php:411
+#: fields/page_link.php:528 fields/post_object.php:427 fields/radio.php:250
+#: fields/select.php:464 fields/taxonomy.php:780 fields/user.php:394
 msgid "Allow Null?"
 msgstr "Permitir nulo?"
 
-#: fields/page_link.php:548 fields/post_object.php:412 fields/select.php:457
-#: fields/user.php:425
+#: fields/page_link.php:542
+msgid "Allow Archives URLs"
+msgstr "Permitir URL do arquivo"
+
+#: fields/page_link.php:556 fields/post_object.php:441 fields/select.php:478
+#: fields/user.php:408
 msgid "Select multiple values?"
 msgstr "Seleccionar valores múltiplos?"
 
@@ -2053,12 +2074,12 @@ msgstr "Seleccionar valores múltiplos?"
 msgid "Password"
 msgstr "Senha"
 
-#: fields/post_object.php:36 fields/post_object.php:431
-#: fields/relationship.php:771
+#: fields/post_object.php:36 fields/post_object.php:460
+#: fields/relationship.php:788
 msgid "Post Object"
 msgstr "Conteúdo"
 
-#: fields/post_object.php:432 fields/relationship.php:772
+#: fields/post_object.php:461 fields/relationship.php:789
 msgid "Post ID"
 msgstr "ID do conteúdo"
 
@@ -2066,20 +2087,20 @@ msgstr "ID do conteúdo"
 msgid "Radio Button"
 msgstr "Botão de opção"
 
-#: fields/radio.php:263
+#: fields/radio.php:264
 msgid "Other"
 msgstr "Outro"
 
-#: fields/radio.php:267
+#: fields/radio.php:268
 msgid "Add 'other' choice to allow for custom values"
 msgstr ""
 "Adicionar opção 'outros' para permitir a introdução de valores personalizados"
 
-#: fields/radio.php:273
+#: fields/radio.php:274
 msgid "Save Other"
 msgstr "Guardar outros"
 
-#: fields/radio.php:277
+#: fields/radio.php:278
 msgid "Save 'other' values to the field's choices"
 msgstr "Guardar 'outros' valores nas opções do campo"
 
@@ -2103,118 +2124,127 @@ msgstr "A carregar"
 msgid "No matches found"
 msgstr "Nenhuma correspondência encontrada"
 
-#: fields/relationship.php:573
+#: fields/relationship.php:590
 msgid "Search..."
 msgstr "Pesquisar..."
 
-#: fields/relationship.php:582
+#: fields/relationship.php:599
 msgid "Select post type"
 msgstr "Seleccione tipo de conteúdo"
 
-#: fields/relationship.php:595
+#: fields/relationship.php:612
 msgid "Select taxonomy"
 msgstr "Seleccione taxonomia"
 
-#: fields/relationship.php:727 fields/taxonomy.php:36 fields/taxonomy.php:737
+#: fields/relationship.php:744 fields/taxonomy.php:36 fields/taxonomy.php:750
 msgid "Taxonomy"
 msgstr "Taxonomia"
 
-#: fields/relationship.php:734
+#: fields/relationship.php:751
 msgid "Elements"
 msgstr "Elementos"
 
-#: fields/relationship.php:735
+#: fields/relationship.php:752
 msgid "Selected elements will be displayed in each result"
 msgstr "Os elementos seleccionados serão mostrados em cada resultado."
 
-#: fields/relationship.php:746
+#: fields/relationship.php:763
 msgid "Minimum posts"
 msgstr "Mínimo de conteúdos"
 
-#: fields/relationship.php:755
+#: fields/relationship.php:772
 msgid "Maximum posts"
 msgstr "Máximo de conteúdos"
 
-#: fields/relationship.php:859 pro/fields/gallery.php:831
+#: fields/relationship.php:876 pro/fields/gallery.php:823
 #, php-format
 msgid "%s requires at least %s selection"
 msgid_plural "%s requires at least %s selections"
 msgstr[0] "%s requer pelo menos %s selecção"
 msgstr[1] "%s requer pelo menos %s selecções"
 
-#: fields/select.php:50
+#: fields/select.php:36 fields/taxonomy.php:772
+msgctxt "noun"
+msgid "Select"
+msgstr "Selecção"
+
+#: fields/select.php:49
 msgctxt "Select2 JS matches_1"
 msgid "One result is available, press enter to select it."
 msgstr "Um resultado encontrado, prima Enter para seleccioná-lo."
 
-#: fields/select.php:51
+#: fields/select.php:50
 #, php-format
 msgctxt "Select2 JS matches_n"
 msgid "%d results are available, use up and down arrow keys to navigate."
 msgstr ""
 "%d resultados encontrados, use as setas para cima ou baixo para navegar."
 
-#: fields/select.php:52
+#: fields/select.php:51
 msgctxt "Select2 JS matches_0"
 msgid "No matches found"
 msgstr "Nenhuma correspondência encontrada"
 
-#: fields/select.php:53
+#: fields/select.php:52
 msgctxt "Select2 JS input_too_short_1"
 msgid "Please enter 1 or more characters"
 msgstr "Por favor insira 1 ou mais caracteres"
 
-#: fields/select.php:54
+#: fields/select.php:53
 #, php-format
 msgctxt "Select2 JS input_too_short_n"
 msgid "Please enter %d or more characters"
 msgstr "Por favor insira %d ou mais caracteres"
 
-#: fields/select.php:55
+#: fields/select.php:54
 msgctxt "Select2 JS input_too_long_1"
 msgid "Please delete 1 character"
 msgstr "Por favor elimine 1 caractere"
 
-#: fields/select.php:56
+#: fields/select.php:55
 #, php-format
 msgctxt "Select2 JS input_too_long_n"
 msgid "Please delete %d characters"
 msgstr "Por favor elimine %d caracteres"
 
-#: fields/select.php:57
+#: fields/select.php:56
 msgctxt "Select2 JS selection_too_long_1"
 msgid "You can only select 1 item"
 msgstr "Só pode seleccionar 1 item"
 
-#: fields/select.php:58
+#: fields/select.php:57
 #, php-format
 msgctxt "Select2 JS selection_too_long_n"
 msgid "You can only select %d items"
 msgstr "Só pode seleccionar %d itens"
 
-#: fields/select.php:59
+#: fields/select.php:58
 msgctxt "Select2 JS load_more"
 msgid "Loading more results&hellip;"
 msgstr "A carregar mais resultados&hellip;"
 
-#: fields/select.php:60
+#: fields/select.php:59
 msgctxt "Select2 JS searching"
 msgid "Searching&hellip;"
 msgstr "A procurar&hellip;"
 
-#: fields/select.php:61
+#: fields/select.php:60
 msgctxt "Select2 JS load_fail"
 msgid "Loading failed"
 msgstr "Falhou ao carregar"
 
-#: fields/select.php:471
+#: fields/select.php:492
 msgid "Stylised UI"
-msgstr "Interface estilizado"
+msgstr "Interface estilizada"
 
-#: fields/select.php:485
+#: fields/select.php:506
 msgid "Use AJAX to lazy load choices?"
 msgstr "Utilizar AJAX para carregar opções?"
 
+#: fields/select.php:521
+msgid "Specify the value returned"
+msgstr "Especifica o valor devolvido."
+
 #: fields/tab.php:36
 msgid "Tab"
 msgstr "Separador"
@@ -2258,90 +2288,86 @@ msgid "Use this field as an end-point and start a new group of tabs"
 msgstr ""
 "Utilize este campo para interromper e começar um novo grupo de separadores."
 
-#: fields/taxonomy.php:706
+#: fields/taxonomy.php:719
 msgid "None"
 msgstr "Nenhuma"
 
-#: fields/taxonomy.php:738
+#: fields/taxonomy.php:751
 msgid "Select the taxonomy to be displayed"
 msgstr "Seleccione a taxonomia que será mostrada."
 
-#: fields/taxonomy.php:747
+#: fields/taxonomy.php:760
 msgid "Appearance"
-msgstr "Apresentação"
+msgstr "Aparência"
 
-#: fields/taxonomy.php:748
+#: fields/taxonomy.php:761
 msgid "Select the appearance of this field"
 msgstr "Seleccione a aparência deste campo."
 
-#: fields/taxonomy.php:753
+#: fields/taxonomy.php:766
 msgid "Multiple Values"
 msgstr "Valores múltiplos"
 
-#: fields/taxonomy.php:755
+#: fields/taxonomy.php:768
 msgid "Multi Select"
 msgstr "Selecção múltipla"
 
-#: fields/taxonomy.php:757
+#: fields/taxonomy.php:770
 msgid "Single Value"
 msgstr "Valor único"
 
-#: fields/taxonomy.php:758
+#: fields/taxonomy.php:771
 msgid "Radio Buttons"
 msgstr "Botões de opções"
 
-#: fields/taxonomy.php:781
+#: fields/taxonomy.php:794
 msgid "Create Terms"
 msgstr "Criar termos"
 
-#: fields/taxonomy.php:782
+#: fields/taxonomy.php:795
 msgid "Allow new terms to be created whilst editing"
 msgstr "Permite a criação de novos termos durante a edição."
 
-#: fields/taxonomy.php:795
+#: fields/taxonomy.php:808
 msgid "Save Terms"
 msgstr "Guardar termos"
 
-#: fields/taxonomy.php:796
+#: fields/taxonomy.php:809
 msgid "Connect selected terms to the post"
 msgstr "Liga os termos seleccionados ao conteúdo."
 
-#: fields/taxonomy.php:809
+#: fields/taxonomy.php:822
 msgid "Load Terms"
 msgstr "Carregar termos"
 
-#: fields/taxonomy.php:810
+#: fields/taxonomy.php:823
 msgid "Load value from posts terms"
 msgstr "Carrega os termos a partir dos termos dos conteúdos."
 
-#: fields/taxonomy.php:828
+#: fields/taxonomy.php:841
 msgid "Term Object"
 msgstr "Termo"
 
-#: fields/taxonomy.php:829
+#: fields/taxonomy.php:842
 msgid "Term ID"
 msgstr "ID do termo"
 
-#: fields/taxonomy.php:888
+#: fields/taxonomy.php:901
 #, php-format
 msgid "User unable to add new %s"
 msgstr "O utilizador não pôde adicionar novo(a) %s"
 
-#: fields/taxonomy.php:901
+#: fields/taxonomy.php:914
 #, php-format
 msgid "%s already exists"
 msgstr "%s já existe"
 
-#: fields/taxonomy.php:942
+#: fields/taxonomy.php:955
 #, php-format
 msgid "%s added"
 msgstr "%s adicionado(a)"
 
-#: fields/taxonomy.php:976
-msgid "Parent"
-msgstr "Superior"
-
-#: fields/taxonomy.php:987
+#: fields/taxonomy.php:1000
 msgid "Add"
 msgstr "Adicionar"
 
@@ -2389,13 +2415,13 @@ msgstr "URL"
 msgid "Value must be a valid URL"
 msgstr "O valor deve ser um URL válido"
 
-#: fields/user.php:396
+#: fields/user.php:379
 msgid "Filter by role"
-msgstr "Filtrar por perfil"
+msgstr "Filtrar por papel"
 
-#: fields/user.php:404
+#: fields/user.php:387
 msgid "All user roles"
-msgstr "Todos os perfis de utilizador"
+msgstr "Todos os papéis de utilizador"
 
 #: fields/wysiwyg.php:37
 msgid "Wysiwyg Editor"
@@ -2450,7 +2476,7 @@ msgstr[1] "%d campos requerem a sua atenção."
 msgid "Advanced Custom Fields PRO"
 msgstr "Advanced Custom Fields PRO"
 
-#: pro/acf-pro.php:191
+#: pro/acf-pro.php:192
 msgid "Flexible Content requires at least 1 layout"
 msgstr "O conteúdo flexível requer pelo menos 1 layout"
 
@@ -2478,14 +2504,10 @@ msgstr "Nenhum grupo de campos personalizado encontrado na página de opções."
 msgid "Create a Custom Field Group"
 msgstr "Criar um grupo de campos personalizado"
 
-#: pro/admin/settings-updates.php:125
+#: pro/admin/settings-updates.php:87
 msgid "<b>Error</b>. Could not connect to update server"
 msgstr "<b>Erro</b>. Não foi possível ligar ao servidor de actualização."
 
-#: pro/admin/settings-updates.php:203 pro/admin/settings-updates.php:274
-msgid "<b>Connection Error</b>. Sorry, please try again"
-msgstr "<b>Erro de comunicação</b>. Por favor tente de novo."
-
 #: pro/admin/views/settings-updates.php:11
 msgid "Deactivate License"
 msgstr "Desactivar licença"
@@ -2562,6 +2584,73 @@ msgstr ""
 "página de <a href=\"%s\">Actualizações</a>. Se não tiver uma chave de "
 "licença, por favor veja os <a href=\"%s\">detalhes e preços</a>."
 
+#: pro/fields/clone.php:36
+msgctxt "noun"
+msgid "Clone"
+msgstr "Clone"
+
+#: pro/fields/clone.php:663
+msgid "Select one or more fields you wish to clone"
+msgstr "Seleccione um ou mais campos que deseje clonar."
+
+#: pro/fields/clone.php:678
+msgid "Display"
+msgstr "Visualização"
+
+#: pro/fields/clone.php:679
+msgid "Specify the style used to render the clone field"
+msgstr "Especifica o estilo usado para mostrar o campo de clone."
+
+#: pro/fields/clone.php:684
+msgid "Group (displays selected fields in a group within this field)"
+msgstr "Grupo (mostra os campos seleccionados num grupo dentro deste campo)"
+
+#: pro/fields/clone.php:685
+msgid "Seamless (replaces this field with selected fields)"
+msgstr "Simples (substitui este campo pelos campos seleccionados)"
+
+#: pro/fields/clone.php:693
+msgid "Specify the style used to render the selected fields"
+msgstr "Especifica o estilo usado para mostrar os campos seleccionados."
+
+#: pro/fields/clone.php:698 pro/fields/flexible-content.php:555
+#: pro/fields/repeater.php:467
+msgid "Block"
+msgstr "Bloco"
+
+#: pro/fields/clone.php:699 pro/fields/flexible-content.php:554
+#: pro/fields/repeater.php:466
+msgid "Table"
+msgstr "Tabela"
+
+#: pro/fields/clone.php:700 pro/fields/flexible-content.php:556
+#: pro/fields/repeater.php:468
+msgid "Row"
+msgstr "Linha"
+
+#: pro/fields/clone.php:706
+#, php-format
+msgid "Labels will be displayed as %s"
+msgstr "As legendas serão mostradas com %s"
+
+#: pro/fields/clone.php:709
+msgid "Prefix Field Labels"
+msgstr "Prefixo nas legendas dos campos"
+
+#: pro/fields/clone.php:724
+#, php-format
+msgid "Values will be saved as %s"
+msgstr "Os valores serão guardados como %s"
+
+#: pro/fields/clone.php:727
+msgid "Prefix Field Names"
+msgstr "Prefixos nos nomes dos campos"
+
+#: pro/fields/clone.php:883
+#, php-format
+msgid "All fields from %s field group"
+msgstr "Todos os campos do grupo de campos %s"
+
 #: pro/fields/flexible-content.php:36
 msgid "Flexible Content"
 msgstr "Conteúdo flexível"
@@ -2606,72 +2695,60 @@ msgstr "{available} {identifier} {label} à disposição (máx {max})"
 msgid "{required} {label} {identifier} required (min {min})"
 msgstr "{required} {identifier} {label} em falta (mín {min})"
 
-#: pro/fields/flexible-content.php:216
+#: pro/fields/flexible-content.php:220
 #, php-format
 msgid "Click the \"%s\" button below to start creating your layout"
 msgstr "Clique no botão \"%s\" abaixo para começar a criar o seu layout"
 
-#: pro/fields/flexible-content.php:346
+#: pro/fields/flexible-content.php:350
 msgid "Add layout"
 msgstr "Adicionar layout"
 
-#: pro/fields/flexible-content.php:349
+#: pro/fields/flexible-content.php:353
 msgid "Remove layout"
 msgstr "Remover layout"
 
-#: pro/fields/flexible-content.php:352 pro/fields/repeater.php:304
+#: pro/fields/flexible-content.php:356 pro/fields/repeater.php:304
 msgid "Click to toggle"
 msgstr "Clique para alternar"
 
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder Layout"
 msgstr "Reordenar layout"
 
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder"
 msgstr "Reordenar"
 
-#: pro/fields/flexible-content.php:494
+#: pro/fields/flexible-content.php:498
 msgid "Delete Layout"
 msgstr "Eliminar layout"
 
-#: pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:499
 msgid "Duplicate Layout"
 msgstr "Duplicar layout"
 
-#: pro/fields/flexible-content.php:496
+#: pro/fields/flexible-content.php:500
 msgid "Add New Layout"
 msgstr "Adicionar novo layout"
 
-#: pro/fields/flexible-content.php:550 pro/fields/repeater.php:466
-msgid "Table"
-msgstr "Tabela"
-
-#: pro/fields/flexible-content.php:551 pro/fields/repeater.php:467
-msgid "Block"
-msgstr "Bloco"
-
-#: pro/fields/flexible-content.php:552 pro/fields/repeater.php:468
-msgid "Row"
-msgstr "Linha"
-
-#: pro/fields/flexible-content.php:567
+#: pro/fields/flexible-content.php:571
 msgid "Min"
 msgstr "Mín"
 
-#: pro/fields/flexible-content.php:580
+#: pro/fields/flexible-content.php:584
 msgid "Max"
 msgstr "Máx"
 
-#: pro/fields/flexible-content.php:608 pro/fields/repeater.php:475
+#: pro/fields/flexible-content.php:612 pro/fields/repeater.php:475
 msgid "Button Label"
 msgstr "Legenda do botão"
 
-#: pro/fields/flexible-content.php:617
+#: pro/fields/flexible-content.php:621
 msgid "Minimum Layouts"
 msgstr "Mínimo de layouts"
 
-#: pro/fields/flexible-content.php:626
+#: pro/fields/flexible-content.php:630
 msgid "Maximum Layouts"
 msgstr "Máximo de layouts"
 
@@ -2679,75 +2756,75 @@ msgstr "Máximo de layouts"
 msgid "Gallery"
 msgstr "Galeria"
 
-#: pro/fields/gallery.php:53
+#: pro/fields/gallery.php:52
 msgid "Add Image to Gallery"
-msgstr "Adicionar imagem à Galeria"
+msgstr "Adicionar imagem à galeria"
 
-#: pro/fields/gallery.php:57
+#: pro/fields/gallery.php:56
 msgid "Maximum selection reached"
 msgstr "Máximo de selecção alcançado"
 
-#: pro/fields/gallery.php:337
+#: pro/fields/gallery.php:336
 msgid "Length"
 msgstr "Comprimento"
 
-#: pro/fields/gallery.php:380
+#: pro/fields/gallery.php:379
 msgid "Caption"
 msgstr "Legenda"
 
-#: pro/fields/gallery.php:389
+#: pro/fields/gallery.php:388
 msgid "Alt Text"
 msgstr "Texto alternativo"
 
-#: pro/fields/gallery.php:557
+#: pro/fields/gallery.php:559
 msgid "Add to gallery"
 msgstr "Adicionar à galeria"
 
-#: pro/fields/gallery.php:561
+#: pro/fields/gallery.php:563
 msgid "Bulk actions"
 msgstr "Acções por lotes"
 
-#: pro/fields/gallery.php:562
+#: pro/fields/gallery.php:564
 msgid "Sort by date uploaded"
 msgstr "Ordenar por data de carregamento"
 
-#: pro/fields/gallery.php:563
+#: pro/fields/gallery.php:565
 msgid "Sort by date modified"
 msgstr "Ordenar por data de modificação"
 
-#: pro/fields/gallery.php:564
+#: pro/fields/gallery.php:566
 msgid "Sort by title"
 msgstr "Ordenar por título"
 
-#: pro/fields/gallery.php:565
+#: pro/fields/gallery.php:567
 msgid "Reverse current order"
 msgstr "Inverter ordem actual"
 
-#: pro/fields/gallery.php:583
+#: pro/fields/gallery.php:585
 msgid "Close"
 msgstr "Fechar"
 
-#: pro/fields/gallery.php:637
+#: pro/fields/gallery.php:639
 msgid "Minimum Selection"
 msgstr "Selecção mínima"
 
-#: pro/fields/gallery.php:646
+#: pro/fields/gallery.php:648
 msgid "Maximum Selection"
 msgstr "Selecção máxima"
 
-#: pro/fields/gallery.php:665
+#: pro/fields/gallery.php:657
 msgid "Insert"
 msgstr "Inserir"
 
-#: pro/fields/gallery.php:666
+#: pro/fields/gallery.php:658
 msgid "Specify where new attachments are added"
 msgstr "Especifica onde serão adicionados os novos anexos."
 
-#: pro/fields/gallery.php:670
+#: pro/fields/gallery.php:662
 msgid "Append to the end"
 msgstr "No fim"
 
-#: pro/fields/gallery.php:671
+#: pro/fields/gallery.php:663
 msgid "Prepend to the beginning"
 msgstr "No início"
 
@@ -2808,6 +2885,37 @@ msgstr "Elliot Condon"
 msgid "http://www.elliotcondon.com/"
 msgstr "http://www.elliotcondon.com/"
 
+#~ msgid ""
+#~ "Labels will be displayed like <code class=\"prefix-label-code-1\"></code>"
+#~ msgstr ""
+#~ "As legendas serão mostradas com <code class=\"prefix-label-code-1\"></"
+#~ "code>"
+
+#~ msgid ""
+#~ "Values will be saved as <code class=\"prefix-name-code-1\"></code> <br /"
+#~ ">\n"
+#~ "\t\t\t<span class=\"prefix-name-line-2\">Load all values via <code class="
+#~ "\"prefix-name-code-2\"></code></span>"
+#~ msgstr ""
+#~ "Os valores serão guardados como <code class=\"prefix-name-code-1\"></"
+#~ "code> <br />\n"
+#~ "\t\t\t<span class=\"prefix-name-line-2\">Carregue todos os valores "
+#~ "através de <code class=\"prefix-name-code-2\"></code></span>"
+
+#~ msgid "<b>Connection Error</b>. Sorry, please try again"
+#~ msgstr "<b>Erro de comunicação</b>. Por favor tente de novo."
+
+#~ msgctxt "Field label"
+#~ msgid "Clone"
+#~ msgstr "Clone"
+
+#~ msgctxt "Field instruction"
+#~ msgid "Clone"
+#~ msgstr "Clonar"
+
+#~ msgid "Select"
+#~ msgstr "Selecção"
+
 #~ msgid "Upgrade ACF"
 #~ msgstr "Actualizar o ACF"
 
diff --git a/lang/acf.pot b/lang/acf.pot
index cfa31e9..98a71fc 100644
--- a/lang/acf.pot
+++ b/lang/acf.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Advanced Custom Fields\n"
 "Report-Msgid-Bugs-To: http://support.advancedcustomfields.com\n"
-"POT-Creation-Date: 2016-06-14 12:21+1000\n"
+"POT-Creation-Date: 2016-07-28 10:51+1000\n"
 "PO-Revision-Date: 2015-06-11 13:00+1000\n"
 "Last-Translator: Elliot Condon <e@elliotcondon.com>\n"
 "Language-Team: Elliot Condon <e@elliotcondon.com>\n"
@@ -26,91 +26,91 @@ msgstr ""
 msgid "Advanced Custom Fields"
 msgstr ""
 
-#: acf.php:267 admin/admin.php:61
+#: acf.php:271 admin/admin.php:61
 msgid "Field Groups"
 msgstr ""
 
-#: acf.php:268
+#: acf.php:272
 msgid "Field Group"
 msgstr ""
 
-#: acf.php:269 acf.php:301 admin/admin.php:62
-#: pro/fields/flexible-content.php:496
+#: acf.php:273 acf.php:305 admin/admin.php:62
+#: pro/fields/flexible-content.php:500
 msgid "Add New"
 msgstr ""
 
-#: acf.php:270
+#: acf.php:274
 msgid "Add New Field Group"
 msgstr ""
 
-#: acf.php:271
+#: acf.php:275
 msgid "Edit Field Group"
 msgstr ""
 
-#: acf.php:272
+#: acf.php:276
 msgid "New Field Group"
 msgstr ""
 
-#: acf.php:273
+#: acf.php:277
 msgid "View Field Group"
 msgstr ""
 
-#: acf.php:274
+#: acf.php:278
 msgid "Search Field Groups"
 msgstr ""
 
-#: acf.php:275
+#: acf.php:279
 msgid "No Field Groups found"
 msgstr ""
 
-#: acf.php:276
+#: acf.php:280
 msgid "No Field Groups found in Trash"
 msgstr ""
 
-#: acf.php:299 admin/field-group.php:182 admin/field-group.php:280
-#: admin/field-groups.php:528
+#: acf.php:303 admin/field-group.php:182 admin/field-group.php:280
+#: admin/field-groups.php:528 pro/fields/clone.php:662
 msgid "Fields"
 msgstr ""
 
-#: acf.php:300
+#: acf.php:304
 msgid "Field"
 msgstr ""
 
-#: acf.php:302
+#: acf.php:306
 msgid "Add New Field"
 msgstr ""
 
-#: acf.php:303
+#: acf.php:307
 msgid "Edit Field"
 msgstr ""
 
-#: acf.php:304 admin/views/field-group-fields.php:18
+#: acf.php:308 admin/views/field-group-fields.php:54
 #: admin/views/settings-info.php:111
 msgid "New Field"
 msgstr ""
 
-#: acf.php:305
+#: acf.php:309
 msgid "View Field"
 msgstr ""
 
-#: acf.php:306
+#: acf.php:310
 msgid "Search Fields"
 msgstr ""
 
-#: acf.php:307
+#: acf.php:311
 msgid "No Fields found"
 msgstr ""
 
-#: acf.php:308
+#: acf.php:312
 msgid "No Fields found in Trash"
 msgstr ""
 
-#: acf.php:347 admin/field-group.php:395 admin/field-groups.php:586
+#: acf.php:351 admin/field-group.php:395 admin/field-groups.php:585
 #: admin/views/field-group-options.php:13
 msgid "Disabled"
 msgstr ""
 
-#: acf.php:352
+#: acf.php:356
 #, php-format
 msgid "Disabled <span class=\"count\">(%s)</span>"
 msgid_plural "Disabled <span class=\"count\">(%s)</span>"
@@ -173,7 +173,7 @@ msgstr ""
 msgid "Field group title is required"
 msgstr ""
 
-#: admin/field-group.php:278 api/api-field-group.php:620
+#: admin/field-group.php:278 api/api-field-group.php:651
 msgid "copy"
 msgstr ""
 
@@ -181,7 +181,7 @@ msgstr ""
 #: admin/views/field-group-field-conditional-logic.php:62
 #: admin/views/field-group-field-conditional-logic.php:162
 #: admin/views/field-group-locations.php:59
-#: admin/views/field-group-locations.php:135 api/api-helpers.php:3684
+#: admin/views/field-group-locations.php:135 api/api-helpers.php:3952
 msgid "or"
 msgstr ""
 
@@ -221,79 +221,79 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: admin/field-group.php:843
+#: admin/field-group.php:842
 msgid "Front Page"
 msgstr ""
 
-#: admin/field-group.php:844
+#: admin/field-group.php:843
 msgid "Posts Page"
 msgstr ""
 
-#: admin/field-group.php:845
+#: admin/field-group.php:844
 msgid "Top Level Page (no parent)"
 msgstr ""
 
-#: admin/field-group.php:846
+#: admin/field-group.php:845
 msgid "Parent Page (has children)"
 msgstr ""
 
-#: admin/field-group.php:847
+#: admin/field-group.php:846
 msgid "Child Page (has parent)"
 msgstr ""
 
-#: admin/field-group.php:863
+#: admin/field-group.php:862
 msgid "Default Template"
 msgstr ""
 
-#: admin/field-group.php:886
+#: admin/field-group.php:885
 msgid "Logged in"
 msgstr ""
 
-#: admin/field-group.php:887
+#: admin/field-group.php:886
 msgid "Viewing front end"
 msgstr ""
 
-#: admin/field-group.php:888
+#: admin/field-group.php:887
 msgid "Viewing back end"
 msgstr ""
 
-#: admin/field-group.php:907
+#: admin/field-group.php:906
 msgid "Super Admin"
 msgstr ""
 
-#: admin/field-group.php:918 admin/field-group.php:926
-#: admin/field-group.php:940 admin/field-group.php:947
-#: admin/field-group.php:964 admin/field-group.php:981 fields/file.php:241
-#: fields/image.php:237 pro/fields/gallery.php:684
+#: admin/field-group.php:917 admin/field-group.php:925
+#: admin/field-group.php:939 admin/field-group.php:946
+#: admin/field-group.php:963 admin/field-group.php:980 fields/file.php:241
+#: fields/image.php:237 pro/fields/gallery.php:676
 msgid "All"
 msgstr ""
 
-#: admin/field-group.php:927
+#: admin/field-group.php:926
 msgid "Add / Edit"
 msgstr ""
 
-#: admin/field-group.php:928
+#: admin/field-group.php:927
 msgid "Register"
 msgstr ""
 
-#: admin/field-group.php:1168
+#: admin/field-group.php:1167
 msgid "Move Complete."
 msgstr ""
 
-#: admin/field-group.php:1169
+#: admin/field-group.php:1168
 #, php-format
 msgid "The %s field can now be found in the %s field group"
 msgstr ""
 
-#: admin/field-group.php:1171
+#: admin/field-group.php:1170
 msgid "Close Window"
 msgstr ""
 
-#: admin/field-group.php:1206
+#: admin/field-group.php:1205
 msgid "Please select the destination for this field"
 msgstr ""
 
-#: admin/field-group.php:1213
+#: admin/field-group.php:1212
 msgid "Move Field"
 msgstr ""
 
@@ -328,18 +328,18 @@ msgid_plural "%s field groups synchronised."
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/field-groups.php:412 admin/field-groups.php:576
+#: admin/field-groups.php:412 admin/field-groups.php:575
 msgid "Sync available"
 msgstr ""
 
-#: admin/field-groups.php:525 api/api-template.php:1079
-#: api/api-template.php:1292 pro/fields/gallery.php:371
+#: admin/field-groups.php:525 api/api-template.php:1077
+#: api/api-template.php:1290 pro/fields/gallery.php:370
 msgid "Title"
 msgstr ""
 
 #: admin/field-groups.php:526 admin/views/field-group-options.php:93
 #: admin/views/update-network.php:25 admin/views/update-network.php:33
-#: pro/fields/gallery.php:398
+#: pro/fields/gallery.php:397
 msgid "Description"
 msgstr ""
 
@@ -347,80 +347,80 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: admin/field-groups.php:624 admin/settings-info.php:76
+#: admin/field-groups.php:623 admin/settings-info.php:76
 #: pro/admin/views/settings-updates.php:111
 msgid "Changelog"
 msgstr ""
 
-#: admin/field-groups.php:625
+#: admin/field-groups.php:624
 #, php-format
 msgid "See what's new in <a href=\"%s\">version %s</a>."
 msgstr ""
 
-#: admin/field-groups.php:627
+#: admin/field-groups.php:626
 msgid "Resources"
 msgstr ""
 
-#: admin/field-groups.php:629
+#: admin/field-groups.php:628
 msgid "Getting Started"
 msgstr ""
 
-#: admin/field-groups.php:630 pro/admin/settings-updates.php:61
+#: admin/field-groups.php:629 pro/admin/settings-updates.php:57
 #: pro/admin/views/settings-updates.php:17
 msgid "Updates"
 msgstr ""
 
-#: admin/field-groups.php:631
+#: admin/field-groups.php:630
 msgid "Field Types"
 msgstr ""
 
-#: admin/field-groups.php:632
+#: admin/field-groups.php:631
 msgid "Functions"
 msgstr ""
 
-#: admin/field-groups.php:633
+#: admin/field-groups.php:632
 msgid "Actions"
 msgstr ""
 
-#: admin/field-groups.php:634 fields/relationship.php:720
+#: admin/field-groups.php:633 fields/relationship.php:737
 msgid "Filters"
 msgstr ""
 
-#: admin/field-groups.php:635
+#: admin/field-groups.php:634
 msgid "'How to' guides"
 msgstr ""
 
-#: admin/field-groups.php:636
+#: admin/field-groups.php:635
 msgid "Tutorials"
 msgstr ""
 
-#: admin/field-groups.php:637
+#: admin/field-groups.php:636
 msgid "FAQ"
 msgstr ""
 
-#: admin/field-groups.php:642
+#: admin/field-groups.php:641
 msgid "Created by"
 msgstr ""
 
-#: admin/field-groups.php:685
+#: admin/field-groups.php:684
 msgid "Duplicate this item"
 msgstr ""
 
-#: admin/field-groups.php:685 admin/field-groups.php:701
-#: admin/views/field-group-field.php:58 pro/fields/flexible-content.php:495
+#: admin/field-groups.php:684 admin/field-groups.php:700
+#: admin/views/field-group-field.php:59 pro/fields/flexible-content.php:499
 msgid "Duplicate"
 msgstr ""
 
-#: admin/field-groups.php:747
+#: admin/field-groups.php:751
 #, php-format
 msgid "Select %s"
 msgstr ""
 
-#: admin/field-groups.php:755
+#: admin/field-groups.php:759
 msgid "Synchronise field group"
 msgstr ""
 
-#: admin/field-groups.php:755 admin/field-groups.php:772
+#: admin/field-groups.php:759 admin/field-groups.php:776
 msgid "Sync"
 msgstr ""
 
@@ -497,26 +497,30 @@ msgid "Conditional Logic"
 msgstr ""
 
 #: admin/views/field-group-field-conditional-logic.php:40
-#: admin/views/field-group-field.php:140 fields/checkbox.php:243
-#: fields/message.php:144 fields/page_link.php:539 fields/page_link.php:553
-#: fields/post_object.php:403 fields/post_object.php:417 fields/radio.php:254
-#: fields/select.php:440 fields/select.php:454 fields/select.php:468
-#: fields/select.php:482 fields/tab.php:130 fields/taxonomy.php:772
-#: fields/taxonomy.php:786 fields/taxonomy.php:800 fields/taxonomy.php:814
-#: fields/user.php:416 fields/user.php:430 fields/wysiwyg.php:418
-#: pro/admin/views/settings-updates.php:93
+#: admin/views/field-group-field.php:141 fields/checkbox.php:244
+#: fields/message.php:144 fields/page_link.php:533 fields/page_link.php:547
+#: fields/page_link.php:561 fields/post_object.php:432
+#: fields/post_object.php:446 fields/radio.php:255 fields/select.php:469
+#: fields/select.php:483 fields/select.php:497 fields/select.php:511
+#: fields/tab.php:130 fields/taxonomy.php:785 fields/taxonomy.php:799
+#: fields/taxonomy.php:813 fields/taxonomy.php:827 fields/user.php:399
+#: fields/user.php:413 fields/wysiwyg.php:418
+#: pro/admin/views/settings-updates.php:93 pro/fields/clone.php:716
+#: pro/fields/clone.php:734
 msgid "Yes"
 msgstr ""
 
 #: admin/views/field-group-field-conditional-logic.php:41
-#: admin/views/field-group-field.php:141 fields/checkbox.php:244
-#: fields/message.php:145 fields/page_link.php:540 fields/page_link.php:554
-#: fields/post_object.php:404 fields/post_object.php:418 fields/radio.php:255
-#: fields/select.php:441 fields/select.php:455 fields/select.php:469
-#: fields/select.php:483 fields/tab.php:131 fields/taxonomy.php:687
-#: fields/taxonomy.php:773 fields/taxonomy.php:787 fields/taxonomy.php:801
-#: fields/taxonomy.php:815 fields/user.php:417 fields/user.php:431
-#: fields/wysiwyg.php:419 pro/admin/views/settings-updates.php:103
+#: admin/views/field-group-field.php:142 fields/checkbox.php:245
+#: fields/message.php:145 fields/page_link.php:534 fields/page_link.php:548
+#: fields/page_link.php:562 fields/post_object.php:433
+#: fields/post_object.php:447 fields/radio.php:256 fields/select.php:470
+#: fields/select.php:484 fields/select.php:498 fields/select.php:512
+#: fields/tab.php:131 fields/taxonomy.php:700 fields/taxonomy.php:786
+#: fields/taxonomy.php:800 fields/taxonomy.php:814 fields/taxonomy.php:828
+#: fields/user.php:400 fields/user.php:414 fields/wysiwyg.php:419
+#: pro/admin/views/settings-updates.php:103 pro/fields/clone.php:717
+#: pro/fields/clone.php:735
 msgid "No"
 msgstr ""
 
@@ -544,125 +548,127 @@ msgstr ""
 msgid "Add rule group"
 msgstr ""
 
-#: admin/views/field-group-field.php:49 pro/fields/flexible-content.php:342
+#: admin/views/field-group-field.php:50 pro/fields/flexible-content.php:346
 #: pro/fields/repeater.php:302
 msgid "Drag to reorder"
 msgstr ""
 
-#: admin/views/field-group-field.php:54 admin/views/field-group-field.php:57
+#: admin/views/field-group-field.php:55 admin/views/field-group-field.php:58
 msgid "Edit field"
 msgstr ""
 
-#: admin/views/field-group-field.php:57 core/media.php:55 fields/image.php:142
-#: pro/fields/gallery.php:358
+#: admin/views/field-group-field.php:58 fields/image.php:142
+#: pro/fields/gallery.php:357
 msgid "Edit"
 msgstr ""
 
-#: admin/views/field-group-field.php:58
+#: admin/views/field-group-field.php:59
 msgid "Duplicate field"
 msgstr ""
 
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move field to another group"
 msgstr ""
 
-#: admin/views/field-group-field.php:59
+#: admin/views/field-group-field.php:60
 msgid "Move"
 msgstr ""
 
-#: admin/views/field-group-field.php:60
+#: admin/views/field-group-field.php:61
 msgid "Delete field"
 msgstr ""
 
-#: admin/views/field-group-field.php:60 pro/fields/flexible-content.php:494
+#: admin/views/field-group-field.php:61 pro/fields/flexible-content.php:498
 msgid "Delete"
 msgstr ""
 
-#: admin/views/field-group-field.php:68 fields/oembed.php:225
-#: fields/taxonomy.php:888
+#: admin/views/field-group-field.php:69 fields/oembed.php:225
+#: fields/taxonomy.php:901
 msgid "Error"
 msgstr ""
 
-#: admin/views/field-group-field.php:68
+#: admin/views/field-group-field.php:69
 msgid "Field type does not exist"
 msgstr ""
 
-#: admin/views/field-group-field.php:81
+#: admin/views/field-group-field.php:82
 msgid "Field Label"
 msgstr ""
 
-#: admin/views/field-group-field.php:82
+#: admin/views/field-group-field.php:83
 msgid "This is the name which will appear on the EDIT page"
 msgstr ""
 
-#: admin/views/field-group-field.php:94
+#: admin/views/field-group-field.php:95
 msgid "Field Name"
 msgstr ""
 
-#: admin/views/field-group-field.php:95
+#: admin/views/field-group-field.php:96
 msgid "Single word, no spaces. Underscores and dashes allowed"
 msgstr ""
 
-#: admin/views/field-group-field.php:107
+#: admin/views/field-group-field.php:108
 msgid "Field Type"
 msgstr ""
 
-#: admin/views/field-group-field.php:121 fields/tab.php:103
+#: admin/views/field-group-field.php:122 fields/tab.php:103
 msgid "Instructions"
 msgstr ""
 
-#: admin/views/field-group-field.php:122
+#: admin/views/field-group-field.php:123
 msgid "Instructions for authors. Shown when submitting data"
 msgstr ""
 
-#: admin/views/field-group-field.php:133
+#: admin/views/field-group-field.php:134
 msgid "Required?"
 msgstr ""
 
-#: admin/views/field-group-field.php:162
+#: admin/views/field-group-field.php:163
 msgid "Wrapper Attributes"
 msgstr ""
 
-#: admin/views/field-group-field.php:168
+#: admin/views/field-group-field.php:169
 msgid "width"
 msgstr ""
 
-#: admin/views/field-group-field.php:182
+#: admin/views/field-group-field.php:183
 msgid "class"
 msgstr ""
 
-#: admin/views/field-group-field.php:195
+#: admin/views/field-group-field.php:196
 msgid "id"
 msgstr ""
 
-#: admin/views/field-group-field.php:207
+#: admin/views/field-group-field.php:208
 msgid "Close Field"
 msgstr ""
 
-#: admin/views/field-group-fields.php:29
+#: admin/views/field-group-fields.php:17
 msgid "Order"
 msgstr ""
 
-#: admin/views/field-group-fields.php:30 pro/fields/flexible-content.php:521
+#: admin/views/field-group-fields.php:18 fields/checkbox.php:259
+#: fields/radio.php:314 fields/select.php:527
+#: pro/fields/flexible-content.php:525
 msgid "Label"
 msgstr ""
 
-#: admin/views/field-group-fields.php:31 fields/taxonomy.php:954
-#: pro/fields/flexible-content.php:534
+#: admin/views/field-group-fields.php:19 fields/taxonomy.php:967
+#: pro/fields/flexible-content.php:538
 msgid "Name"
 msgstr ""
 
-#: admin/views/field-group-fields.php:32
+#: admin/views/field-group-fields.php:20
 msgid "Type"
 msgstr ""
 
-#: admin/views/field-group-fields.php:44
+#: admin/views/field-group-fields.php:38
 msgid ""
 "No fields. Click the <strong>+ Add Field</strong> button to create your "
 "first field."
 msgstr ""
 
-#: admin/views/field-group-fields.php:51
+#: admin/views/field-group-fields.php:44
 msgid "+ Add Field"
 msgstr ""
 
@@ -671,7 +677,7 @@ msgstr ""
 msgid "Post"
 msgstr ""
 
-#: admin/views/field-group-locations.php:6 fields/relationship.php:726
+#: admin/views/field-group-locations.php:6 fields/relationship.php:743
 msgid "Post Type"
 msgstr ""
 
@@ -880,7 +886,7 @@ msgstr ""
 msgid "Page Attributes"
 msgstr ""
 
-#: admin/views/field-group-options.php:123 fields/relationship.php:739
+#: admin/views/field-group-options.php:123 fields/relationship.php:756
 msgid "Featured Image"
 msgstr ""
 
@@ -1271,79 +1277,84 @@ msgstr ""
 msgid "See what's new"
 msgstr ""
 
-#: api/api-helpers.php:933
+#: api/api-helpers.php:944
 msgid "Thumbnail"
 msgstr ""
 
-#: api/api-helpers.php:934
+#: api/api-helpers.php:945
 msgid "Medium"
 msgstr ""
 
-#: api/api-helpers.php:935
+#: api/api-helpers.php:946
 msgid "Large"
 msgstr ""
 
-#: api/api-helpers.php:984
+#: api/api-helpers.php:995
 msgid "Full Size"
 msgstr ""
 
-#: api/api-helpers.php:1196 api/api-helpers.php:1759
+#: api/api-helpers.php:1207 api/api-helpers.php:1770 pro/fields/clone.php:849
 msgid "(no title)"
 msgstr ""
 
-#: api/api-helpers.php:3605
+#: api/api-helpers.php:1807 fields/page_link.php:284
+#: fields/post_object.php:283 fields/taxonomy.php:989
+msgid "Parent"
+msgstr ""
+
+#: api/api-helpers.php:3873
 #, php-format
 msgid "Image width must be at least %dpx."
 msgstr ""
 
-#: api/api-helpers.php:3610
+#: api/api-helpers.php:3878
 #, php-format
 msgid "Image width must not exceed %dpx."
 msgstr ""
 
-#: api/api-helpers.php:3626
+#: api/api-helpers.php:3894
 #, php-format
 msgid "Image height must be at least %dpx."
 msgstr ""
 
-#: api/api-helpers.php:3631
+#: api/api-helpers.php:3899
 #, php-format
 msgid "Image height must not exceed %dpx."
 msgstr ""
 
-#: api/api-helpers.php:3649
+#: api/api-helpers.php:3917
 #, php-format
 msgid "File size must be at least %s."
 msgstr ""
 
-#: api/api-helpers.php:3654
+#: api/api-helpers.php:3922
 #, php-format
 msgid "File size must must not exceed %s."
 msgstr ""
 
-#: api/api-helpers.php:3688
+#: api/api-helpers.php:3956
 #, php-format
 msgid "File type must be %s."
 msgstr ""
 
-#: api/api-template.php:1094
+#: api/api-template.php:1092
 msgid "Spam Detected"
 msgstr ""
 
-#: api/api-template.php:1237 core/media.php:56 pro/api/api-options-page.php:50
-#: pro/fields/gallery.php:586
+#: api/api-template.php:1235 pro/api/api-options-page.php:50
+#: pro/fields/gallery.php:588
 msgid "Update"
 msgstr ""
 
-#: api/api-template.php:1238
+#: api/api-template.php:1236
 msgid "Post updated"
 msgstr ""
 
-#: api/api-template.php:1306 core/field.php:133
+#: api/api-template.php:1304 core/field.php:133
 msgid "Content"
 msgstr ""
 
-#: api/api-template.php:1371
+#: api/api-template.php:1369
 msgid "Validate Email"
 msgstr ""
 
@@ -1363,9 +1374,9 @@ msgstr ""
 msgid "jQuery"
 msgstr ""
 
-#: core/field.php:137 fields/checkbox.php:223 fields/radio.php:292
-#: pro/fields/flexible-content.php:491 pro/fields/flexible-content.php:540
-#: pro/fields/repeater.php:459
+#: core/field.php:137 fields/checkbox.php:224 fields/radio.php:293
+#: pro/fields/clone.php:692 pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:544 pro/fields/repeater.php:459
 msgid "Layout"
 msgstr ""
 
@@ -1398,13 +1409,23 @@ msgstr ""
 msgid "Restricted"
 msgstr ""
 
-#: core/media.php:54 fields/select.php:36 fields/select.php:230
-#: fields/taxonomy.php:759
+#: core/media.php:54 fields/select.php:249
+msgctxt "verb"
 msgid "Select"
 msgstr ""
 
+#: core/media.php:55
+msgctxt "verb"
+msgid "Edit"
+msgstr ""
+
+#: core/media.php:56
+msgctxt "verb"
+msgid "Update"
+msgstr ""
+
 #: core/media.php:57 fields/file.php:49 fields/image.php:54
-#: pro/fields/gallery.php:56
+#: pro/fields/gallery.php:55
 msgid "Uploaded to this post"
 msgstr ""
 
@@ -1413,57 +1434,75 @@ msgstr ""
 msgid "%s value is required"
 msgstr ""
 
-#: fields/checkbox.php:36 fields/taxonomy.php:754
+#: fields/checkbox.php:36 fields/taxonomy.php:767
 msgid "Checkbox"
 msgstr ""
 
-#: fields/checkbox.php:141
+#: fields/checkbox.php:142
 msgid "Toggle All"
 msgstr ""
 
-#: fields/checkbox.php:205 fields/radio.php:240 fields/select.php:417
+#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:446
 msgid "Choices"
 msgstr ""
 
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "Enter each choice on a new line."
 msgstr ""
 
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "For more control, you may specify both a value and label like this:"
 msgstr ""
 
-#: fields/checkbox.php:206 fields/radio.php:241 fields/select.php:418
+#: fields/checkbox.php:207 fields/radio.php:242 fields/select.php:447
 msgid "red : Red"
 msgstr ""
 
-#: fields/checkbox.php:214 fields/color_picker.php:147 fields/email.php:124
-#: fields/number.php:150 fields/radio.php:283 fields/select.php:426
+#: fields/checkbox.php:215 fields/color_picker.php:147 fields/email.php:124
+#: fields/number.php:150 fields/radio.php:284 fields/select.php:455
 #: fields/text.php:148 fields/textarea.php:145 fields/true_false.php:115
 #: fields/url.php:117 fields/wysiwyg.php:379
 msgid "Default Value"
 msgstr ""
 
-#: fields/checkbox.php:215 fields/select.php:427
+#: fields/checkbox.php:216 fields/select.php:456
 msgid "Enter each default value on a new line"
 msgstr ""
 
-#: fields/checkbox.php:229 fields/radio.php:298
+#: fields/checkbox.php:230 fields/radio.php:299
 msgid "Vertical"
 msgstr ""
 
-#: fields/checkbox.php:230 fields/radio.php:299
+#: fields/checkbox.php:231 fields/radio.php:300
 msgid "Horizontal"
 msgstr ""
 
-#: fields/checkbox.php:237
+#: fields/checkbox.php:238
 msgid "Toggle"
 msgstr ""
 
-#: fields/checkbox.php:238
+#: fields/checkbox.php:239
 msgid "Prepend an extra checkbox to toggle all choices"
 msgstr ""
 
+#: fields/checkbox.php:252 fields/file.php:220 fields/image.php:206
+#: fields/radio.php:307 fields/taxonomy.php:836
+msgid "Return Value"
+msgstr ""
+
+#: fields/checkbox.php:253 fields/file.php:221 fields/image.php:207
+#: fields/radio.php:308
+msgid "Specify the returned value on front end"
+msgstr ""
+
+#: fields/checkbox.php:258 fields/radio.php:313 fields/select.php:526
+msgid "Value"
+msgstr ""
+
+#: fields/checkbox.php:260 fields/radio.php:315 fields/select.php:528
+msgid "Both (Array)"
+msgstr ""
+
 #: fields/color_picker.php:36
 msgid "Color Picker"
 msgstr ""
@@ -1513,28 +1552,28 @@ msgctxt "Date Picker JS weekHeader"
 msgid "Wk"
 msgstr ""
 
-#: fields/date_picker.php:201 fields/date_time_picker.php:245
-#: fields/time_picker.php:131
+#: fields/date_picker.php:195 fields/date_time_picker.php:184
+#: fields/time_picker.php:126
 msgid "Display Format"
 msgstr ""
 
-#: fields/date_picker.php:202 fields/date_time_picker.php:246
-#: fields/time_picker.php:132
+#: fields/date_picker.php:196 fields/date_time_picker.php:185
+#: fields/time_picker.php:127
 msgid "The format displayed when editing a post"
 msgstr ""
 
-#: fields/date_picker.php:216 fields/date_time_picker.php:261
-#: fields/post_object.php:426 fields/relationship.php:766
-#: fields/time_picker.php:145
+#: fields/date_picker.php:210 fields/date_time_picker.php:200
+#: fields/post_object.php:455 fields/relationship.php:783
+#: fields/select.php:520 fields/time_picker.php:140
 msgid "Return Format"
 msgstr ""
 
-#: fields/date_picker.php:217 fields/date_time_picker.php:262
-#: fields/time_picker.php:146
+#: fields/date_picker.php:211 fields/date_time_picker.php:201
+#: fields/time_picker.php:141
 msgid "The format returned via template functions"
 msgstr ""
 
-#: fields/date_picker.php:232 fields/date_time_picker.php:277
+#: fields/date_picker.php:226 fields/date_time_picker.php:216
 msgid "Week Starts On"
 msgstr ""
 
@@ -1592,22 +1631,27 @@ msgctxt "Date Time Picker JS closeText"
 msgid "Done"
 msgstr ""
 
-#: fields/date_time_picker.php:55
+#: fields/date_time_picker.php:54
+msgctxt "Date Time Picker JS selectText"
+msgid "Select"
+msgstr ""
+
+#: fields/date_time_picker.php:56
 msgctxt "Date Time Picker JS amText"
 msgid "AM"
 msgstr ""
 
-#: fields/date_time_picker.php:56
+#: fields/date_time_picker.php:57
 msgctxt "Date Time Picker JS amTextShort"
 msgid "A"
 msgstr ""
 
-#: fields/date_time_picker.php:59
+#: fields/date_time_picker.php:60
 msgctxt "Date Time Picker JS pmText"
 msgid "PM"
 msgstr ""
 
-#: fields/date_time_picker.php:60
+#: fields/date_time_picker.php:61
 msgctxt "Date Time Picker JS pmTextShort"
 msgid "P"
 msgstr ""
@@ -1616,7 +1660,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: fields/email.php:125 fields/number.php:151 fields/radio.php:284
+#: fields/email.php:125 fields/number.php:151 fields/radio.php:285
 #: fields/text.php:149 fields/textarea.php:146 fields/url.php:118
 #: fields/wysiwyg.php:380
 msgid "Appears when creating a new post"
@@ -1669,8 +1713,8 @@ msgid "File name"
 msgstr ""
 
 #: fields/file.php:152 fields/file.php:253 fields/file.php:264
-#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:715
-#: pro/fields/gallery.php:748
+#: fields/image.php:268 fields/image.php:301 pro/fields/gallery.php:707
+#: pro/fields/gallery.php:740
 msgid "File size"
 msgstr ""
 
@@ -1678,14 +1722,6 @@ msgstr ""
 msgid "Add File"
 msgstr ""
 
-#: fields/file.php:220 fields/image.php:206 fields/taxonomy.php:823
-msgid "Return Value"
-msgstr ""
-
-#: fields/file.php:221 fields/image.php:207
-msgid "Specify the returned value on front end"
-msgstr ""
-
 #: fields/file.php:226
 msgid "File Array"
 msgstr ""
@@ -1698,19 +1734,19 @@ msgstr ""
 msgid "File ID"
 msgstr ""
 
-#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:678
+#: fields/file.php:235 fields/image.php:231 pro/fields/gallery.php:670
 msgid "Library"
 msgstr ""
 
-#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:679
+#: fields/file.php:236 fields/image.php:232 pro/fields/gallery.php:671
 msgid "Limit the media library choice"
 msgstr ""
 
-#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:685
+#: fields/file.php:242 fields/image.php:238 pro/fields/gallery.php:677
 msgid "Uploaded to post"
 msgstr ""
 
-#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:692
+#: fields/file.php:249 fields/image.php:245 pro/fields/gallery.php:684
 msgid "Minimum"
 msgstr ""
 
@@ -1718,15 +1754,15 @@ msgstr ""
 msgid "Restrict which files can be uploaded"
 msgstr ""
 
-#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:725
+#: fields/file.php:260 fields/image.php:278 pro/fields/gallery.php:717
 msgid "Maximum"
 msgstr ""
 
-#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:758
+#: fields/file.php:271 fields/image.php:311 pro/fields/gallery.php:750
 msgid "Allowed file types"
 msgstr ""
 
-#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:759
+#: fields/file.php:272 fields/image.php:312 pro/fields/gallery.php:751
 msgid "Comma separated list. Leave blank for all types"
 msgstr ""
 
@@ -1742,7 +1778,7 @@ msgstr ""
 msgid "Sorry, this browser does not support geolocation"
 msgstr ""
 
-#: fields/google-map.php:133 fields/relationship.php:725
+#: fields/google-map.php:133 fields/relationship.php:742
 msgid "Search"
 msgstr ""
 
@@ -1775,7 +1811,7 @@ msgid "Set the initial zoom level"
 msgstr ""
 
 #: fields/google-map.php:203 fields/image.php:257 fields/image.php:290
-#: fields/oembed.php:275 pro/fields/gallery.php:704 pro/fields/gallery.php:737
+#: fields/oembed.php:275 pro/fields/gallery.php:696 pro/fields/gallery.php:729
 msgid "Height"
 msgstr ""
 
@@ -1791,11 +1827,11 @@ msgstr ""
 msgid "Select Image"
 msgstr ""
 
-#: fields/image.php:52 pro/fields/gallery.php:54
+#: fields/image.php:52 pro/fields/gallery.php:53
 msgid "Edit Image"
 msgstr ""
 
-#: fields/image.php:53 pro/fields/gallery.php:55
+#: fields/image.php:53 pro/fields/gallery.php:54
 msgid "Update Image"
 msgstr ""
 
@@ -1803,7 +1839,7 @@ msgstr ""
 msgid "All images"
 msgstr ""
 
-#: fields/image.php:144 pro/fields/gallery.php:359 pro/fields/gallery.php:542
+#: fields/image.php:144 pro/fields/gallery.php:358 pro/fields/gallery.php:546
 msgid "Remove"
 msgstr ""
 
@@ -1827,21 +1863,21 @@ msgstr ""
 msgid "Image ID"
 msgstr ""
 
-#: fields/image.php:221 pro/fields/gallery.php:655
+#: fields/image.php:221
 msgid "Preview Size"
 msgstr ""
 
-#: fields/image.php:222 pro/fields/gallery.php:656
+#: fields/image.php:222
 msgid "Shown when entering data"
 msgstr ""
 
-#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:693
-#: pro/fields/gallery.php:726
+#: fields/image.php:246 fields/image.php:279 pro/fields/gallery.php:685
+#: pro/fields/gallery.php:718
 msgid "Restrict which images can be uploaded"
 msgstr ""
 
 #: fields/image.php:249 fields/image.php:282 fields/oembed.php:264
-#: pro/fields/gallery.php:696 pro/fields/gallery.php:729
+#: pro/fields/gallery.php:688 pro/fields/gallery.php:721
 msgid "Width"
 msgstr ""
 
@@ -1923,37 +1959,41 @@ msgstr ""
 msgid "Embed Size"
 msgstr ""
 
-#: fields/page_link.php:197
+#: fields/page_link.php:192
 msgid "Archives"
 msgstr ""
 
-#: fields/page_link.php:506 fields/post_object.php:370
-#: fields/relationship.php:692
+#: fields/page_link.php:500 fields/post_object.php:399
+#: fields/relationship.php:709
 msgid "Filter by Post Type"
 msgstr ""
 
-#: fields/page_link.php:514 fields/post_object.php:378
-#: fields/relationship.php:700
+#: fields/page_link.php:508 fields/post_object.php:407
+#: fields/relationship.php:717
 msgid "All post types"
 msgstr ""
 
-#: fields/page_link.php:520 fields/post_object.php:384
-#: fields/relationship.php:706
+#: fields/page_link.php:514 fields/post_object.php:413
+#: fields/relationship.php:723
 msgid "Filter by Taxonomy"
 msgstr ""
 
-#: fields/page_link.php:528 fields/post_object.php:392
-#: fields/relationship.php:714
+#: fields/page_link.php:522 fields/post_object.php:421
+#: fields/relationship.php:731
 msgid "All taxonomies"
 msgstr ""
 
-#: fields/page_link.php:534 fields/post_object.php:398 fields/radio.php:249
-#: fields/select.php:435 fields/taxonomy.php:767 fields/user.php:411
+#: fields/page_link.php:528 fields/post_object.php:427 fields/radio.php:250
+#: fields/select.php:464 fields/taxonomy.php:780 fields/user.php:394
 msgid "Allow Null?"
 msgstr ""
 
-#: fields/page_link.php:548 fields/post_object.php:412 fields/select.php:449
-#: fields/user.php:425
+#: fields/page_link.php:542
+msgid "Allow Archives URLs"
+msgstr ""
+
+#: fields/page_link.php:556 fields/post_object.php:441 fields/select.php:478
+#: fields/user.php:408
 msgid "Select multiple values?"
 msgstr ""
 
@@ -1961,12 +2001,12 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: fields/post_object.php:36 fields/post_object.php:431
-#: fields/relationship.php:771
+#: fields/post_object.php:36 fields/post_object.php:460
+#: fields/relationship.php:788
 msgid "Post Object"
 msgstr ""
 
-#: fields/post_object.php:432 fields/relationship.php:772
+#: fields/post_object.php:461 fields/relationship.php:789
 msgid "Post ID"
 msgstr ""
 
@@ -1974,19 +2014,19 @@ msgstr ""
 msgid "Radio Button"
 msgstr ""
 
-#: fields/radio.php:263
+#: fields/radio.php:264
 msgid "Other"
 msgstr ""
 
-#: fields/radio.php:267
+#: fields/radio.php:268
 msgid "Add 'other' choice to allow for custom values"
 msgstr ""
 
-#: fields/radio.php:273
+#: fields/radio.php:274
 msgid "Save Other"
 msgstr ""
 
-#: fields/radio.php:277
+#: fields/radio.php:278
 msgid "Save 'other' values to the field's choices"
 msgstr ""
 
@@ -2010,117 +2050,126 @@ msgstr ""
 msgid "No matches found"
 msgstr ""
 
-#: fields/relationship.php:573
+#: fields/relationship.php:590
 msgid "Search..."
 msgstr ""
 
-#: fields/relationship.php:582
+#: fields/relationship.php:599
 msgid "Select post type"
 msgstr ""
 
-#: fields/relationship.php:595
+#: fields/relationship.php:612
 msgid "Select taxonomy"
 msgstr ""
 
-#: fields/relationship.php:727 fields/taxonomy.php:36 fields/taxonomy.php:737
+#: fields/relationship.php:744 fields/taxonomy.php:36 fields/taxonomy.php:750
 msgid "Taxonomy"
 msgstr ""
 
-#: fields/relationship.php:734
+#: fields/relationship.php:751
 msgid "Elements"
 msgstr ""
 
-#: fields/relationship.php:735
+#: fields/relationship.php:752
 msgid "Selected elements will be displayed in each result"
 msgstr ""
 
-#: fields/relationship.php:746
+#: fields/relationship.php:763
 msgid "Minimum posts"
 msgstr ""
 
-#: fields/relationship.php:755
+#: fields/relationship.php:772
 msgid "Maximum posts"
 msgstr ""
 
-#: fields/relationship.php:859 pro/fields/gallery.php:831
+#: fields/relationship.php:876 pro/fields/gallery.php:823
 #, php-format
 msgid "%s requires at least %s selection"
 msgid_plural "%s requires at least %s selections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fields/select.php:50
+#: fields/select.php:36 fields/taxonomy.php:772
+msgctxt "noun"
+msgid "Select"
+msgstr ""
+
+#: fields/select.php:49
 msgctxt "Select2 JS matches_1"
 msgid "One result is available, press enter to select it."
 msgstr ""
 
-#: fields/select.php:51
+#: fields/select.php:50
 #, php-format
 msgctxt "Select2 JS matches_n"
 msgid "%d results are available, use up and down arrow keys to navigate."
 msgstr ""
 
-#: fields/select.php:52
+#: fields/select.php:51
 msgctxt "Select2 JS matches_0"
 msgid "No matches found"
 msgstr ""
 
-#: fields/select.php:53
+#: fields/select.php:52
 msgctxt "Select2 JS input_too_short_1"
 msgid "Please enter 1 or more characters"
 msgstr ""
 
-#: fields/select.php:54
+#: fields/select.php:53
 #, php-format
 msgctxt "Select2 JS input_too_short_n"
 msgid "Please enter %d or more characters"
 msgstr ""
 
-#: fields/select.php:55
+#: fields/select.php:54
 msgctxt "Select2 JS input_too_long_1"
 msgid "Please delete 1 character"
 msgstr ""
 
-#: fields/select.php:56
+#: fields/select.php:55
 #, php-format
 msgctxt "Select2 JS input_too_long_n"
 msgid "Please delete %d characters"
 msgstr ""
 
-#: fields/select.php:57
+#: fields/select.php:56
 msgctxt "Select2 JS selection_too_long_1"
 msgid "You can only select 1 item"
 msgstr ""
 
-#: fields/select.php:58
+#: fields/select.php:57
 #, php-format
 msgctxt "Select2 JS selection_too_long_n"
 msgid "You can only select %d items"
 msgstr ""
 
-#: fields/select.php:59
+#: fields/select.php:58
 msgctxt "Select2 JS load_more"
 msgid "Loading more results&hellip;"
 msgstr ""
 
-#: fields/select.php:60
+#: fields/select.php:59
 msgctxt "Select2 JS searching"
 msgid "Searching&hellip;"
 msgstr ""
 
-#: fields/select.php:61
+#: fields/select.php:60
 msgctxt "Select2 JS load_fail"
 msgid "Loading failed"
 msgstr ""
 
-#: fields/select.php:463
+#: fields/select.php:492
 msgid "Stylised UI"
 msgstr ""
 
-#: fields/select.php:477
+#: fields/select.php:506
 msgid "Use AJAX to lazy load choices?"
 msgstr ""
 
+#: fields/select.php:521
+msgid "Specify the value returned"
+msgstr ""
+
 #: fields/tab.php:36
 msgid "Tab"
 msgstr ""
@@ -2156,90 +2205,86 @@ msgstr ""
 msgid "Use this field as an end-point and start a new group of tabs"
 msgstr ""
 
-#: fields/taxonomy.php:706
+#: fields/taxonomy.php:719
 msgid "None"
 msgstr ""
 
-#: fields/taxonomy.php:738
+#: fields/taxonomy.php:751
 msgid "Select the taxonomy to be displayed"
 msgstr ""
 
-#: fields/taxonomy.php:747
+#: fields/taxonomy.php:760
 msgid "Appearance"
 msgstr ""
 
-#: fields/taxonomy.php:748
+#: fields/taxonomy.php:761
 msgid "Select the appearance of this field"
 msgstr ""
 
-#: fields/taxonomy.php:753
+#: fields/taxonomy.php:766
 msgid "Multiple Values"
 msgstr ""
 
-#: fields/taxonomy.php:755
+#: fields/taxonomy.php:768
 msgid "Multi Select"
 msgstr ""
 
-#: fields/taxonomy.php:757
+#: fields/taxonomy.php:770
 msgid "Single Value"
 msgstr ""
 
-#: fields/taxonomy.php:758
+#: fields/taxonomy.php:771
 msgid "Radio Buttons"
 msgstr ""
 
-#: fields/taxonomy.php:781
+#: fields/taxonomy.php:794
 msgid "Create Terms"
 msgstr ""
 
-#: fields/taxonomy.php:782
+#: fields/taxonomy.php:795
 msgid "Allow new terms to be created whilst editing"
 msgstr ""
 
-#: fields/taxonomy.php:795
+#: fields/taxonomy.php:808
 msgid "Save Terms"
 msgstr ""
 
-#: fields/taxonomy.php:796
+#: fields/taxonomy.php:809
 msgid "Connect selected terms to the post"
 msgstr ""
 
-#: fields/taxonomy.php:809
+#: fields/taxonomy.php:822
 msgid "Load Terms"
 msgstr ""
 
-#: fields/taxonomy.php:810
+#: fields/taxonomy.php:823
 msgid "Load value from posts terms"
 msgstr ""
 
-#: fields/taxonomy.php:828
+#: fields/taxonomy.php:841
 msgid "Term Object"
 msgstr ""
 
-#: fields/taxonomy.php:829
+#: fields/taxonomy.php:842
 msgid "Term ID"
 msgstr ""
 
-#: fields/taxonomy.php:888
-#, php-format
-msgid "User unable to add new %s"
-msgstr ""
-
 #: fields/taxonomy.php:901
 #, php-format
+msgid "User unable to add new %s"
+msgstr ""
+
+#: fields/taxonomy.php:914
+#, php-format
 msgid "%s already exists"
 msgstr ""
 
-#: fields/taxonomy.php:942
+#: fields/taxonomy.php:955
 #, php-format
 msgid "%s added"
 msgstr ""
 
-#: fields/taxonomy.php:976
-msgid "Parent"
-msgstr ""
-
-#: fields/taxonomy.php:987
+#: fields/taxonomy.php:1000
 msgid "Add"
 msgstr ""
 
@@ -2287,11 +2332,11 @@ msgstr ""
 msgid "Value must be a valid URL"
 msgstr ""
 
-#: fields/user.php:396
+#: fields/user.php:379
 msgid "Filter by role"
 msgstr ""
 
-#: fields/user.php:404
+#: fields/user.php:387
 msgid "All user roles"
 msgstr ""
 
@@ -2348,7 +2393,7 @@ msgstr[1] ""
 msgid "Advanced Custom Fields PRO"
 msgstr ""
 
-#: pro/acf-pro.php:191
+#: pro/acf-pro.php:192
 msgid "Flexible Content requires at least 1 layout"
 msgstr ""
 
@@ -2376,14 +2421,10 @@ msgstr ""
 msgid "Create a Custom Field Group"
 msgstr ""
 
-#: pro/admin/settings-updates.php:125
+#: pro/admin/settings-updates.php:87
 msgid "<b>Error</b>. Could not connect to update server"
 msgstr ""
 
-#: pro/admin/settings-updates.php:203 pro/admin/settings-updates.php:274
-msgid "<b>Connection Error</b>. Sorry, please try again"
-msgstr ""
-
 #: pro/admin/views/settings-updates.php:11
 msgid "Deactivate License"
 msgstr ""
@@ -2452,6 +2493,73 @@ msgid ""
 "\">details & pricing</a>."
 msgstr ""
 
+#: pro/fields/clone.php:36
+msgctxt "noun"
+msgid "Clone"
+msgstr ""
+
+#: pro/fields/clone.php:663
+msgid "Select one or more fields you wish to clone"
+msgstr ""
+
+#: pro/fields/clone.php:678
+msgid "Display"
+msgstr ""
+
+#: pro/fields/clone.php:679
+msgid "Specify the style used to render the clone field"
+msgstr ""
+
+#: pro/fields/clone.php:684
+msgid "Group (displays selected fields in a group within this field)"
+msgstr ""
+
+#: pro/fields/clone.php:685
+msgid "Seamless (replaces this field with selected fields)"
+msgstr ""
+
+#: pro/fields/clone.php:693
+msgid "Specify the style used to render the selected fields"
+msgstr ""
+
+#: pro/fields/clone.php:698 pro/fields/flexible-content.php:555
+#: pro/fields/repeater.php:467
+msgid "Block"
+msgstr ""
+
+#: pro/fields/clone.php:699 pro/fields/flexible-content.php:554
+#: pro/fields/repeater.php:466
+msgid "Table"
+msgstr ""
+
+#: pro/fields/clone.php:700 pro/fields/flexible-content.php:556
+#: pro/fields/repeater.php:468
+msgid "Row"
+msgstr ""
+
+#: pro/fields/clone.php:706
+#, php-format
+msgid "Labels will be displayed as %s"
+msgstr ""
+
+#: pro/fields/clone.php:709
+msgid "Prefix Field Labels"
+msgstr ""
+
+#: pro/fields/clone.php:724
+#, php-format
+msgid "Values will be saved as %s"
+msgstr ""
+
+#: pro/fields/clone.php:727
+msgid "Prefix Field Names"
+msgstr ""
+
+#: pro/fields/clone.php:883
+#, php-format
+msgid "All fields from %s field group"
+msgstr ""
+
 #: pro/fields/flexible-content.php:36
 msgid "Flexible Content"
 msgstr ""
@@ -2496,72 +2604,60 @@ msgstr ""
 msgid "{required} {label} {identifier} required (min {min})"
 msgstr ""
 
-#: pro/fields/flexible-content.php:216
+#: pro/fields/flexible-content.php:220
 #, php-format
 msgid "Click the \"%s\" button below to start creating your layout"
 msgstr ""
 
-#: pro/fields/flexible-content.php:346
+#: pro/fields/flexible-content.php:350
 msgid "Add layout"
 msgstr ""
 
-#: pro/fields/flexible-content.php:349
+#: pro/fields/flexible-content.php:353
 msgid "Remove layout"
 msgstr ""
 
-#: pro/fields/flexible-content.php:352 pro/fields/repeater.php:304
+#: pro/fields/flexible-content.php:356 pro/fields/repeater.php:304
 msgid "Click to toggle"
 msgstr ""
 
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder Layout"
 msgstr ""
 
-#: pro/fields/flexible-content.php:493
+#: pro/fields/flexible-content.php:497
 msgid "Reorder"
 msgstr ""
 
-#: pro/fields/flexible-content.php:494
+#: pro/fields/flexible-content.php:498
 msgid "Delete Layout"
 msgstr ""
 
-#: pro/fields/flexible-content.php:495
+#: pro/fields/flexible-content.php:499
 msgid "Duplicate Layout"
 msgstr ""
 
-#: pro/fields/flexible-content.php:496
+#: pro/fields/flexible-content.php:500
 msgid "Add New Layout"
 msgstr ""
 
-#: pro/fields/flexible-content.php:550 pro/fields/repeater.php:466
-msgid "Table"
-msgstr ""
-
-#: pro/fields/flexible-content.php:551 pro/fields/repeater.php:467
-msgid "Block"
-msgstr ""
-
-#: pro/fields/flexible-content.php:552 pro/fields/repeater.php:468
-msgid "Row"
-msgstr ""
-
-#: pro/fields/flexible-content.php:567
+#: pro/fields/flexible-content.php:571
 msgid "Min"
 msgstr ""
 
-#: pro/fields/flexible-content.php:580
+#: pro/fields/flexible-content.php:584
 msgid "Max"
 msgstr ""
 
-#: pro/fields/flexible-content.php:608 pro/fields/repeater.php:475
+#: pro/fields/flexible-content.php:612 pro/fields/repeater.php:475
 msgid "Button Label"
 msgstr ""
 
-#: pro/fields/flexible-content.php:617
+#: pro/fields/flexible-content.php:621
 msgid "Minimum Layouts"
 msgstr ""
 
-#: pro/fields/flexible-content.php:626
+#: pro/fields/flexible-content.php:630
 msgid "Maximum Layouts"
 msgstr ""
 
@@ -2569,75 +2665,75 @@ msgstr ""
 msgid "Gallery"
 msgstr ""
 
-#: pro/fields/gallery.php:53
+#: pro/fields/gallery.php:52
 msgid "Add Image to Gallery"
 msgstr ""
 
-#: pro/fields/gallery.php:57
+#: pro/fields/gallery.php:56
 msgid "Maximum selection reached"
 msgstr ""
 
-#: pro/fields/gallery.php:337
+#: pro/fields/gallery.php:336
 msgid "Length"
 msgstr ""
 
-#: pro/fields/gallery.php:380
+#: pro/fields/gallery.php:379
 msgid "Caption"
 msgstr ""
 
-#: pro/fields/gallery.php:389
+#: pro/fields/gallery.php:388
 msgid "Alt Text"
 msgstr ""
 
-#: pro/fields/gallery.php:557
+#: pro/fields/gallery.php:559
 msgid "Add to gallery"
 msgstr ""
 
-#: pro/fields/gallery.php:561
+#: pro/fields/gallery.php:563
 msgid "Bulk actions"
 msgstr ""
 
-#: pro/fields/gallery.php:562
+#: pro/fields/gallery.php:564
 msgid "Sort by date uploaded"
 msgstr ""
 
-#: pro/fields/gallery.php:563
+#: pro/fields/gallery.php:565
 msgid "Sort by date modified"
 msgstr ""
 
-#: pro/fields/gallery.php:564
+#: pro/fields/gallery.php:566
 msgid "Sort by title"
 msgstr ""
 
-#: pro/fields/gallery.php:565
+#: pro/fields/gallery.php:567
 msgid "Reverse current order"
 msgstr ""
 
-#: pro/fields/gallery.php:583
+#: pro/fields/gallery.php:585
 msgid "Close"
 msgstr ""
 
-#: pro/fields/gallery.php:637
+#: pro/fields/gallery.php:639
 msgid "Minimum Selection"
 msgstr ""
 
-#: pro/fields/gallery.php:646
+#: pro/fields/gallery.php:648
 msgid "Maximum Selection"
 msgstr ""
 
-#: pro/fields/gallery.php:665
+#: pro/fields/gallery.php:657
 msgid "Insert"
 msgstr ""
 
-#: pro/fields/gallery.php:666
+#: pro/fields/gallery.php:658
 msgid "Specify where new attachments are added"
 msgstr ""
 
-#: pro/fields/gallery.php:670
+#: pro/fields/gallery.php:662
 msgid "Append to the end"
 msgstr ""
 
-#: pro/fields/gallery.php:671
+#: pro/fields/gallery.php:663
 msgid "Prepend to the beginning"
 msgstr ""
 
diff --git a/pro/acf-pro.php b/pro/acf-pro.php
index 0638520..d4eb78a 100644
--- a/pro/acf-pro.php
+++ b/pro/acf-pro.php
@@ -79,6 +79,7 @@ class acf_pro {
 		acf_include('pro/fields/repeater.php');
 		acf_include('pro/fields/flexible-content.php');
 		acf_include('pro/fields/gallery.php');
+		acf_include('pro/fields/clone.php');
 		
 	}
 	
diff --git a/pro/admin/settings-updates.php b/pro/admin/settings-updates.php
index 8f3e30a..305a2bd 100644
--- a/pro/admin/settings-updates.php
+++ b/pro/admin/settings-updates.php
@@ -41,10 +41,6 @@ class acf_settings_updates {
 	
 	function admin_menu() {
 		
-		// vars
-		$basename = acf_get_setting('basename');
-		
-		
 		// bail early if no show_admin
 		if( !acf_get_setting('show_admin') ) return;
 		
@@ -54,7 +50,7 @@ class acf_settings_updates {
 		
 		
 		// bail early if not a plugin (included in theme)
-		if( !is_plugin_active($basename) ) return;
+		if( !acf_is_plugin_active() ) return;
 				
 		
 		// add page
@@ -67,6 +63,48 @@ class acf_settings_updates {
 	}
 	
 	
+	/*
+	*  show_remote_response_error
+	*
+	*  This function will show an admin notice if server connection fails
+	*
+	*  @type	function
+	*  @date	25/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	n/a
+	*  @return	n/a
+	*/
+	
+	function show_remote_response_error() {
+		
+		// only run once
+		if( acf_has_done('show_remote_response_error') ) return false;
+		
+		
+		// vars
+    	$error = acf_get_setting('remote_response_error');
+    	$notice = __('<b>Error</b>. Could not connect to update server', 'acf');
+    	
+    	
+    	// append error
+    	if( $error ) {
+        	
+        	$notice .= ' <span class="description">(' . $error . ')</span>';
+        	
+    	}
+    	
+    	
+    	// add notice
+    	acf_add_admin_notice( $notice, 'error' );
+		
+		
+		// return
+		return false;
+		
+	}
+	
+	
 	/*
 	*  load
 	*
@@ -121,9 +159,8 @@ class acf_settings_updates {
 		
 		// validate
         if( empty($info) ) {
-        
-        	acf_add_admin_notice( __('<b>Error</b>. Could not connect to update server', 'acf'), 'error');
-        	return;
+        	
+        	return $this->show_remote_response_error();
         	
         }
         
@@ -141,6 +178,10 @@ class acf_settings_updates {
         	
         }
 		
+		
+		// update transient
+		acf_refresh_plugin_updates_transient();	
+	
 	}
 	
 	
@@ -200,8 +241,7 @@ class acf_settings_updates {
 		// validate
 		if( empty($response) ) {
 			
-			acf_add_admin_notice( __('<b>Connection Error</b>. Sorry, please try again', 'acf'), 'error');
-			return;
+			return $this->show_remote_response_error();
 			
 		}
 		
@@ -271,8 +311,7 @@ class acf_settings_updates {
 		// validate
 		if( empty($response) ) {
 		
-			acf_add_admin_notice(__('<b>Connection Error</b>. Sorry, please try again', 'acf'), 'error');
-			return;
+			return $this->show_remote_response_error();
 			
 		}
 		
diff --git a/pro/api/api-options-page.php b/pro/api/api-options-page.php
index 28146a4..8f7a65b 100644
--- a/pro/api/api-options-page.php
+++ b/pro/api/api-options-page.php
@@ -36,7 +36,7 @@ function acf_get_valid_options_page( $page = '' ) {
 	
 	
 	// defaults
-	$page = acf_parse_args($page, array(
+	$page = wp_parse_args($page, array(
 		'page_title' 	=> '',
 		'menu_title'	=> '',
 		'menu_slug' 	=> '',
diff --git a/pro/api/api-pro.php b/pro/api/api-pro.php
index 985b205..cf30caa 100644
--- a/pro/api/api-pro.php
+++ b/pro/api/api-pro.php
@@ -84,8 +84,27 @@ function acf_pro_get_remote_response( $action = '', $post = array() ) {
 	));
 	
 	
-	// return body
-    if( !is_wp_error($request) || wp_remote_retrieve_response_code($request) === 200) {
+	// error
+	if( is_wp_error($request) ) {
+		
+	    // loop
+	    foreach( $request->errors as $k => $v ) {
+		    
+			// bail early if no error
+		    if( empty($v[0]) ) continue;
+		    
+		    
+		    // save
+			acf_update_setting('remote_response_error', $k . ': ' . $v[0]);
+			
+		    
+		    // only run once
+		    break;
+		    
+	    }
+	    
+	// success
+	} elseif( wp_remote_retrieve_response_code($request) === 200) {
     	
         return $request['body'];
     
diff --git a/pro/assets/css/acf-pro-input.css b/pro/assets/css/acf-pro-input.css
index e1f5de3..b5bb9b0 100644
--- a/pro/assets/css/acf-pro-input.css
+++ b/pro/assets/css/acf-pro-input.css
@@ -348,13 +348,11 @@ html[dir="rtl"] .acf-flexible-content .layout .acf-fc-layout-controlls {
   /* main */
   /* attachments */
   /* attachment */
-  /* hide attachment actions when sidebar is open */
   /* toolbar */
   /* sidebar */
   /* side info */
   /* side data */
   /* column widths */
-  /* column widths clear */
   /* resizable */
 }
 .acf-gallery .acf-gallery-main {
@@ -374,16 +372,15 @@ html[dir="rtl"] .acf-flexible-content .layout .acf-fc-layout-controlls {
   left: 0;
   padding: 5px;
   overflow: auto;
+  overflow-x: hidden;
 }
 .acf-gallery .acf-gallery-attachment {
   width: 25%;
   float: left;
   cursor: pointer;
   position: relative;
-  background: #fff;
   /* sortable */
   /* active */
-  /* audio, video */
   /* icon */
   /* rtl */
 }
@@ -392,16 +389,27 @@ html[dir="rtl"] .acf-flexible-content .layout .acf-fc-layout-controlls {
   border: #DFDFDF solid 1px;
   position: relative;
   overflow: hidden;
+  background: #eee;
 }
-.acf-gallery .acf-gallery-attachment img {
+.acf-gallery .acf-gallery-attachment .margin:before {
+  content: "";
+  display: block;
+  padding-top: 100%;
+}
+.acf-gallery .acf-gallery-attachment .thumbnail {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  transform: translate(50%, 50%);
+}
+.acf-gallery .acf-gallery-attachment .thumbnail img {
   display: block;
   height: auto;
+  max-height: 100%;
   width: auto;
-  max-width: 100%;
-  margin: 0 auto;
-}
-.acf-gallery .acf-gallery-attachment img[src$="svg"] {
-  background: #f9f9f9;
+  transform: translate(-50%, -50%);
 }
 .acf-gallery .acf-gallery-attachment .filename {
   position: absolute;
@@ -417,50 +425,42 @@ html[dir="rtl"] .acf-flexible-content .layout .acf-fc-layout-controlls {
   word-wrap: break-word;
   max-height: 90%;
   overflow: hidden;
-  display: none;
 }
 .acf-gallery .acf-gallery-attachment .actions {
   position: absolute;
   top: 0;
   right: 0;
 }
-.acf-gallery .acf-gallery-attachment.ui-sortable-placeholder {
-  visibility: visible !important;
-  background: #F1F1F1;
+.acf-gallery .acf-gallery-attachment.ui-sortable-helper .margin {
+  border: none;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
 }
 .acf-gallery .acf-gallery-attachment.ui-sortable-placeholder .margin {
-  visibility: hidden !important;
+  background: #F1F1F1;
+  border: none;
+}
+.acf-gallery .acf-gallery-attachment.ui-sortable-placeholder .margin * {
+  display: none !important;
 }
 .acf-gallery .acf-gallery-attachment.active .margin {
   box-shadow: 0 0 0 1px #FFFFFF, 0 0 0 5px #1E8CBE;
 }
-.acf-gallery .acf-gallery-attachment.-audio .filename,
-.acf-gallery .acf-gallery-attachment.-video .filename {
-  display: block;
-}
-.acf-gallery .acf-gallery-attachment.-icon .margin:before {
-  content: "";
-  display: block;
-  padding-top: 100%;
-}
-.acf-gallery .acf-gallery-attachment.-icon .thumbnail {
-  position: absolute;
-  top: 35%;
-  left: 50%;
-  max-width: 40%;
-}
-.acf-gallery .acf-gallery-attachment.-icon img {
-  margin: -50% 0 0 -50%;
-}
-.acf-gallery .acf-gallery-attachment.-icon .filename {
-  display: block;
+.acf-gallery .acf-gallery-attachment.-icon .thumbnail img {
+  transform: translate(-50%, -70%);
 }
 html[dir="rtl"] .acf-gallery .acf-gallery-attachment {
   float: right;
 }
+.acf-gallery.sidebar-open {
+  /* hide attachment actions when sidebar is open */
+  /* allow sidebar to move over main for small widths (widget edit box) */
+}
 .acf-gallery.sidebar-open .acf-gallery-attachment .actions {
   display: none;
 }
+.acf-gallery.sidebar-open .acf-gallery-side {
+  z-index: 2;
+}
 .acf-gallery .acf-gallery-toolbar {
   position: absolute;
   right: 0;
@@ -608,15 +608,6 @@ html[dir="rtl"] .acf-gallery .acf-gallery-side-data th.label {
 .acf-gallery[data-columns="8"] .acf-gallery-attachment {
   width: 12.5%;
 }
-.acf-gallery[data-columns="2"] .acf-gallery-attachment:nth-child(2n+1),
-.acf-gallery[data-columns="3"] .acf-gallery-attachment:nth-child(3n+1),
-.acf-gallery[data-columns="4"] .acf-gallery-attachment:nth-child(4n+1),
-.acf-gallery[data-columns="5"] .acf-gallery-attachment:nth-child(5n+1),
-.acf-gallery[data-columns="6"] .acf-gallery-attachment:nth-child(6n+1),
-.acf-gallery[data-columns="7"] .acf-gallery-attachment:nth-child(7n+1),
-.acf-gallery[data-columns="8"] .acf-gallery-attachment:nth-child(8n+1) {
-  clear: both;
-}
 .acf-gallery .ui-resizable-handle {
   display: block;
   position: absolute;
diff --git a/pro/assets/js/acf-pro-input.js b/pro/assets/js/acf-pro-input.js
index c530b47..ce6fc66 100644
--- a/pro/assets/js/acf-pro-input.js
+++ b/pro/assets/js/acf-pro-input.js
@@ -1191,6 +1191,7 @@
 		$main: null,
 		$side: null,
 		$attachments: null,
+		$input: null,
 		//$attachment: null,
 		
 		actions: {
@@ -1235,6 +1236,7 @@
 			this.$main = this.$el.children('.acf-gallery-main');
 			this.$side = this.$el.children('.acf-gallery-side');
 			this.$attachments = this.$main.children('.acf-gallery-attachments');
+			this.$input = this.$el.find('input:first');
 			
 			
 			// get options
@@ -1610,14 +1612,14 @@
 		*  @return	$post_id (int)
 		*/
 		
-		render_attachment: function( id, data ){
+		render_attachment: function( data ){
 			
 			// prepare
 			data = this.prepare(data);
 			
 			
 			// vars
-			var $attachment = this.get_attachment(id),
+			var $attachment = this.get_attachment(data.id),
 				$margin = $attachment.find('.margin'),
 				$img = $attachment.find('img'),
 				$filename = $attachment.find('.filename'),
@@ -1628,11 +1630,29 @@
 			var thumbnail = data.url;
 			
 			
-			// icon
-			if( data.type !== 'image' ) {
+			// image
+			if( data.type == 'image' ) {
+				
+				// remove filename	
+				$filename.remove();
+			
+			// other (video)	
+			} else {	
+				
+				// attempt to find attachment thumbnail
+				thumbnail = acf.maybe_get(data, 'thumb.src');
+				
+				
+				// update filenmae text
+				$filename.text( data.filename );
+				
+			}
+			
+			
+			// default icon
+			if( !thumbnail ) {
 				
 				thumbnail = acf._e('media', 'default_icon');
-				
 				$attachment.addClass('-icon');
 				
 			}
@@ -1644,23 +1664,10 @@
 			 	'alt': data.alt,
 			 	'title': data.title
 			});
-		 	$filename.text(data.filename);
 		 	
 		 	
-			// vars
-			var val = '';
-			
-			
-			// WP attachment
-			if( data.id ) {
-				
-				val = data.id;
-			
-			}
-			
-			
 			// update val
-		 	acf.val( $input, val );
+		 	acf.val( $input, data.id );
 		 				
 		},
 		
@@ -1792,12 +1799,16 @@
 						
 			
 			// render data
-			this.render_attachment( data.id, data );
+			this.render_attachment( data );
 			
 			
 			// render
 			this.render();	
 			
+			
+			// trigger change
+			this.$input.trigger('change');
+			
 		},
 		
 		
@@ -1910,7 +1921,7 @@
 				
 				
 				// maybe get preview size
-				data.url = acf.maybe_get(data, 'sizes.'+this.o.preview_size+'.url', data.url);
+				data.url = acf.maybe_get(data, 'sizes.medium.url', data.url);
 				
 			}
 			
@@ -2226,6 +2237,10 @@
 			// render (update classes)
 			this.render();
 			
+			
+			// trigger change
+			this.$input.trigger('change');
+			
 		},
 		
 		
@@ -2274,21 +2289,16 @@
 				$field = this.$field;
 			
 			
-			// vars
-			var attachment = id,
-				$attachment = this.get_attachment(id);
-			
-			
 			// popup
 			var frame = acf.media.popup({
 				mode:		'edit',
 				title:		acf._e('image', 'edit'),
 				button:		acf._e('image', 'update'),
-				attachment:	attachment,
+				attachment:	id,
 				select:		function( attachment ){
 					
 					// render attachment
-					self.set('$field', $field).render_attachment( id, attachment );
+					self.set('$field', $field).render_attachment( attachment );
 					
 				 	
 				 	// render sidebar
diff --git a/pro/assets/js/acf-pro-input.min.js b/pro/assets/js/acf-pro-input.min.js
index b9e916d..09f4424 100644
--- a/pro/assets/js/acf-pro-input.min.js
+++ b/pro/assets/js/acf-pro-input.min.js
@@ -1 +1 @@
-!function($){acf.pro=acf.model.extend({actions:{refresh:"refresh"},filters:{get_fields:"get_fields"},get_fields:function(t){return t=t.not(".acf-clone .acf-field")},refresh:function(t){var e=this;return t=t||!1,t&&t.is("tr")?void e.render_table(t.closest("table")):void $(".acf-table",t).each(function(){e.render_table($(this))})},render_table:function(t){var e=t.find("> thead th.acf-th"),a=1,i=100;e.exists()&&(e.each(function(){var e=$(this),a=e.attr("data-key"),i=t.find('td[data-key="'+a+'"]');i.removeClass("appear-empty"),e.removeClass("hidden-by-conditional-logic"),i.exists()&&(0==i.not(".hidden-by-conditional-logic").length?e.addClass("hidden-by-conditional-logic"):i.filter(".hidden-by-conditional-logic").addClass("appear-empty"))}),e.css("width","auto"),e=e.not(".hidden-by-conditional-logic"),a=e.length,e.filter("[data-width]").each(function(){var t=parseInt($(this).attr("data-width"));i-=t,$(this).css("width",t+"%")}),e=e.not("[data-width]"),e.each(function(){var t=i/e.length;$(this).css("width",t+"%")}),t.find(".acf-row .acf-field.-collapsed-target").removeAttr("colspan"),t.find(".acf-row.-collapsed .acf-field.-collapsed-target").attr("colspan",a))}})}(jQuery),function($){acf.fields.repeater=acf.field.extend({type:"repeater",$el:null,$input:null,$table:null,$tbody:null,$clone:null,actions:{ready:"initialize",append:"initialize",show:"show"},events:{'click a[data-event="add-row"]':"_add",'click a[data-event="remove-row"]':"_remove",'click a[data-event="collapse-row"]':"_collapse","mouseenter td.order":"_mouseenter"},focus:function(){this.$el=this.$field.find(".acf-repeater:first"),this.$input=this.$field.find("input:first"),this.$table=this.$field.find("table:first"),this.$tbody=this.$table.children("tbody"),this.$clone=this.$tbody.children("tr.acf-clone"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},initialize:function(){this.$clone.find("input, textarea, select").attr("disabled","disabled"),this.render()},show:function(){this.$tbody.find(".acf-field:visible").each(function(){acf.do_action("show_field",$(this))})},count:function(){return this.$tbody.children().length-1},render:function(){this.$tbody.children().each(function(t){$(this).find("> td.order > span").html(t+1)}),0==this.count()?this.$el.addClass("-empty"):this.$el.removeClass("-empty"),this.o.max>0&&this.count()>=this.o.max?this.$el.find("> .acf-actions .button").addClass("disabled"):this.$el.find("> .acf-actions .button").removeClass("disabled")},add:function(t){if(t=t||this.$clone,this.o.max>0&&this.count()>=this.o.max)return alert(acf._e("repeater","max").replace("{max}",this.o.max)),!1;var e=this.$field;return $el=acf.duplicate(this.$clone),$el.removeClass("acf-clone"),$el.find("input, textarea, select").not(".acf-disabled").removeAttr("disabled"),t.before($el),this.doFocus(e),this.render(),acf.validation.remove_error(this.$field),this.sync(),$el},remove:function(t){var e=this;return this.count()<=this.o.min?(alert(acf._e("repeater","min").replace("{min}",this.o.min)),!1):(acf.do_action("remove",t),void acf.remove_tr(t,function(){e.$input.trigger("change"),e.render(),e.sync(),acf.do_action("refresh",e.$field)}))},sync:function(){var t="collapsed_"+this.$field.data("key"),e=[];this.$tbody.children().each(function(t){$(this).hasClass("-collapsed")&&e.push(t)}),acf.update_user_setting(t,e.join(","))},_mouseenter:function(t){if(!this.$tbody.hasClass("ui-sortable")&&1!=this.o.max){var e=this;this.$tbody.sortable({items:"> tr",handle:"> td.order",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,a){e.render(),acf.do_action("sortstop",a.item,a.placeholder)},update:function(t,a){e.$input.trigger("change")}})}},_add:function(t){$row=!1,t.$el.hasClass("acf-icon")&&($row=t.$el.closest(".acf-row")),this.add($row)},_remove:function(t){this.remove(t.$el.closest(".acf-row"))},_collapse:function(t){var e=t.$el.closest(".acf-row"),a=this.$field;e.hasClass("-collapsed")?(e.removeClass("-collapsed"),acf.do_action("show",e,"collapse")):(e.addClass("-collapsed"),acf.do_action("hide",e,"collapse")),this.set("$field",a).sync(),acf.do_action("refresh",this.$field)}})}(jQuery),function($){acf.fields.flexible_content=acf.field.extend({type:"flexible_content",$el:null,$input:null,$values:null,$clones:null,actions:{ready:"initialize",append:"initialize",show:"show"},events:{'click [data-event="add-layout"]':"_open",'click [data-event="remove-layout"]':"_remove",'click [data-event="collapse-layout"]':"_collapse","click .acf-fc-layout-handle":"_collapse","click .acf-fc-popup a":"_add","blur .acf-fc-popup .focus":"_close","mouseenter .acf-fc-layout-handle":"_mouseenter"},focus:function(){this.$el=this.$field.find(".acf-flexible-content:first"),this.$input=this.$el.siblings("input"),this.$values=this.$el.children(".values"),this.$clones=this.$el.children(".clones"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},count:function(){return this.$values.children(".layout").length},initialize:function(){this.$clones.find("input, textarea, select").attr("disabled","disabled"),this.render()},show:function(){this.$values.find(".acf-field:visible").each(function(){acf.do_action("show_field",$(this))})},render:function(){var t=this;this.$values.children(".layout").each(function(t){$(this).find("> .acf-fc-layout-handle .acf-fc-layout-order").html(t+1)}),0==this.count()?this.$el.addClass("empty"):this.$el.removeClass("empty"),this.o.max>0&&this.count()>=this.o.max?this.$el.find("> .acf-actions .button").addClass("disabled"):this.$el.find("> .acf-actions .button").removeClass("disabled")},render_layout:function(t){},validate_add:function(t){if(this.o.max>0&&this.count()>=this.o.max){var e=1==this.o.max?"layout":"layouts",a=acf._e("flexible_content","max");return a=a.replace("{max}",this.o.max),a=a.replace("{identifier}",acf._e("flexible_content",e)),alert(a),!1}var i=$(this.$el.children(".tmpl-popup").html()),l=i.find('[data-layout="'+t+'"]'),s=parseInt(l.attr("data-max")),n=this.$values.children('.layout[data-layout="'+t+'"]').length;if(s>0&&n>=s){var e=1==s?"layout":"layouts",a=acf._e("flexible_content","max_layout");return a=a.replace("{max}",n),a=a.replace("{label}",'"'+l.text()+'"'),a=a.replace("{identifier}",acf._e("flexible_content",e)),alert(a),!1}return!0},validate_remove:function(t){if(this.o.min>0&&this.count()<=this.o.min){var e=1==this.o.min?"layout":"layouts",a=acf._e("flexible_content","min")+", "+acf._e("flexible_content","remove");return a=a.replace("{min}",this.o.min),a=a.replace("{identifier}",acf._e("flexible_content",e)),a=a.replace("{layout}",acf._e("flexible_content","layout")),confirm(a)}var i=$(this.$el.children(".tmpl-popup").html()),l=i.find('[data-layout="'+t+'"]'),s=parseInt(l.attr("data-min")),n=this.$values.children('.layout[data-layout="'+t+'"]').length;if(s>0&&s>=n){var e=1==s?"layout":"layouts",a=acf._e("flexible_content","min_layout")+", "+acf._e("flexible_content","remove");return a=a.replace("{min}",n),a=a.replace("{label}",'"'+l.text()+'"'),a=a.replace("{identifier}",acf._e("flexible_content",e)),a=a.replace("{layout}",acf._e("flexible_content","layout")),confirm(a)}return!0},sync:function(){var t="collapsed_"+this.$field.data("key"),e=[];this.$values.children(".layout").each(function(t){$(this).hasClass("-collapsed")&&e.push(t)}),acf.update_user_setting(t,e.join(","))},add:function(t,e){if(e=e||!1,!this.validate_add(t))return!1;var a=this.$field,i=this.$clones.children('.layout[data-layout="'+t+'"]');$el=acf.duplicate(i),$el.find("input, textarea, select").not(".acf-disabled").removeAttr("disabled"),this.$el.children(".no-value-message").hide(),e?e.before($el):this.$values.append($el),this.doFocus(a),this.render(),acf.validation.remove_error(this.$field),this.sync()},_mouseenter:function(t){if(!this.$values.hasClass("ui-sortable")&&1!=this.o.max){var e=this;this.$values.sortable({items:"> .layout",handle:"> .acf-fc-layout-handle",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,a){e.render(),acf.do_action("sortstop",a.item,a.placeholder)},update:function(t,a){e.$input.trigger("change")}})}},_open:function(t){var e=this.$values,a=$(this.$el.children(".tmpl-popup").html());a.find("a").each(function(){var t=parseInt($(this).attr("data-min")),a=parseInt($(this).attr("data-max")),i=$(this).attr("data-layout"),l=$(this).text(),s=e.children('.layout[data-layout="'+i+'"]').length,n=$(this).children(".status");if(a>0){var c=a-s,o=acf._e("flexible_content","available"),d=1==c?"layout":"layouts",o=o.replace("{available}",c);o=o.replace("{max}",a),o=o.replace("{label}",'"'+l+'"'),o=o.replace("{identifier}",acf._e("flexible_content",d)),n.show().text(c).attr("title",o),0==c&&n.addClass("warning")}if(t>0){var r=t-s,o=acf._e("flexible_content","required"),d=1==r?"layout":"layouts",o=o.replace("{required}",r);o=o.replace("{min}",t),o=o.replace("{label}",'"'+l+'"'),o=o.replace("{identifier}",acf._e("flexible_content",d)),r>0&&n.addClass("warning").show().text(r).attr("title",o)}}),t.$el.after(a),t.$el.closest(".acf-fc-layout-controlls").exists()&&a.closest(".layout").addClass("-open"),a.css({"margin-top":0-a.height()-t.$el.outerHeight()-14,"margin-left":(t.$el.outerWidth()-a.width())/2});var i=a.offset().top;30>i&&(a.css({"margin-top":15}),a.find(".bit").addClass("top")),a.children(".focus").trigger("focus")},_close:function(t){var e=t.$el.parent(),a=e.closest(".layout");a.removeClass("-open"),setTimeout(function(){e.remove()},200)},_add:function(t){var e=t.$el.closest(".acf-fc-popup"),a=t.$el.attr("data-layout"),i=!1;e.closest(".acf-fc-layout-controlls").exists()&&(i=e.closest(".layout")),this.add(a,i)},_remove:function(t){var e=this,a=t.$el.closest(".layout");if(this.validate_remove(a.attr("data-layout"))){var i=0,l=this.$el.children(".no-value-message");0==a.siblings(".layout").length&&(i=l.outerHeight()),acf.do_action("remove",a),acf.remove_el(a,function(){e.render(),e.$input.trigger("change"),i>0&&l.show(),e.sync()},i)}},_collapse:function(t){var e=t.$el.closest(".layout");e.hasClass("-collapsed")?(e.removeClass("-collapsed"),acf.do_action("refresh",e)):e.addClass("-collapsed"),this.sync();var a=acf.serialize(e);$.extend(a,{action:"acf/fields/flexible_content/layout_title",field_key:this.$field.data("key"),post_id:acf.get("post_id"),i:e.index(),layout:e.data("layout")}),$.ajax({url:acf.get("ajaxurl"),dataType:"html",type:"post",data:a,success:function(t){t&&e.find("> .acf-fc-layout-handle").html(t)}})}})}(jQuery),function($){acf.fields.gallery=acf.field.extend({type:"gallery",$el:null,$main:null,$side:null,$attachments:null,actions:{ready:"initialize",append:"initialize",submit:"close_sidebar",show:"resize"},events:{"click .acf-gallery-attachment":"_select","click .acf-gallery-add":"_add","click .acf-gallery-remove":"_remove","click .acf-gallery-close":"_close","change .acf-gallery-sort":"_sort","click .acf-gallery-edit":"_edit","click .acf-gallery-update":"_update","change .acf-gallery-side input":"_update","change .acf-gallery-side textarea":"_update","change .acf-gallery-side select":"_update"},focus:function(){this.$el=this.$field.find(".acf-gallery:first"),this.$main=this.$el.children(".acf-gallery-main"),this.$side=this.$el.children(".acf-gallery-side"),this.$attachments=this.$main.children(".acf-gallery-attachments"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},initialize:function(){var t=this,e=this.$field;this.$attachments.unbind("sortable").sortable({items:".acf-gallery-attachment",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){e.placeholder.html(e.item.html()),e.placeholder.removeAttr("style"),acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,e){acf.do_action("sortstop",e.item,e.placeholder)}}),this.$el.unbind("resizable").resizable({handles:"s",minHeight:200,stop:function(t,e){acf.update_user_setting("gallery_height",e.size.height)}}),$(window).on("resize",function(){t.set("$field",e).resize()}),this.render(),this.resize()},resize:function(){for(var t=100,e=175,a=4,i=this.$el.width(),l=4;20>l;l++){var s=i/l;if(s>t&&e>s){a=l;break}}a=Math.min(a,8),this.$el.attr("data-columns",a)},render:function(){var t=this.$main.find(".acf-gallery-sort"),e=this.$main.find(".acf-gallery-add");this.o.max>0&&this.count()>=this.o.max?e.addClass("disabled"):e.removeClass("disabled"),this.count()?t.removeClass("disabled"):t.addClass("disabled")},open_sidebar:function(){this.$el.addClass("sidebar-open"),this.$main.find(".acf-gallery-sort").hide();var t=this.$el.width()/3;t=parseInt(t),t=Math.max(t,350),this.$side.children(".acf-gallery-side-inner").css({width:t-1}),this.$side.animate({width:t-1},250),this.$main.animate({right:t},250)},_close:function(t){this.close_sidebar()},close_sidebar:function(){this.$el.removeClass("sidebar-open");var t=this.$el.find(".acf-gallery-sort");this.get_attachment("active").removeClass("active"),this.$side.find("input, textarea, select").attr("disabled","disabled"),this.$main.animate({right:0},250),this.$side.animate({width:0},250,function(){t.show(),$(this).find(".acf-gallery-side-data").html("")})},count:function(){return this.get_attachments().length},get_attachments:function(){return this.$attachments.children(".acf-gallery-attachment")},get_attachment:function(t){return t=t||0,t="active"===t?".active":'[data-id="'+t+'"]',this.$attachments.children(".acf-gallery-attachment"+t)},render_attachment:function(t,e){e=this.prepare(e);var a=this.get_attachment(t),i=a.find(".margin"),l=a.find("img"),s=a.find(".filename"),n=a.find('input[type="hidden"]'),c=e.url;"image"!==e.type&&(c=acf._e("media","default_icon"),a.addClass("-icon")),l.attr({src:c,alt:e.alt,title:e.title}),s.text(e.filename);var o="";e.id&&(o=e.id),acf.val(n,o)},_add:function(t){if(this.o.max>0&&this.count()>=this.o.max)return void acf.validation.add_warning(this.$field,acf._e("gallery","max"));var e=this,a=this.$field,i=acf.media.popup({title:acf._e("gallery","select"),mode:"select",type:"",field:this.$field.data("key"),multiple:"add",library:this.o.library,mime_types:this.o.mime_types,select:function(t,i){e.set("$field",a).add_attachment(t,i)}});i.on("content:activate:browse",function(){e.render_collection(i),i.content.get().collection.on("reset add",function(){e.render_collection(i)})})},add_attachment:function(t,e){if(e=e||0,t=this.prepare(t),!(this.o.max>0&&this.count()>=this.o.max||this.get_attachment(t.id).exists())){var a=this.$el.find('input[type="hidden"]:first').attr("name"),i=['<div class="acf-gallery-attachment acf-soh" data-id="'+t.id+'">','<input type="hidden" value="'+t.id+'" name="'+a+'[]">','<div class="margin" title="">','<div class="thumbnail">','<img src="" alt="">',"</div>",'<div class="filename"></div>',"</div>",'<div class="actions acf-soh-target">','<a href="#" class="acf-icon -cancel dark acf-gallery-remove" data-id="'+t.id+'"></a>',"</div>","</div>"].join(""),l=$(i);if(this.$attachments.append(l),"prepend"===this.o.insert){var s=this.$attachments.children(":eq("+e+")");s.exists()&&s.before(l)}this.render_attachment(t.id,t),this.render()}},_select:function(t){var e=t.$el.data("id");this.select_attachment(e)},select_attachment:function(t){var e=this.get_attachment(t);e.hasClass("active")||(this.get_attachment("active").removeClass("active"),e.addClass("active"),this.fetch(t),this.open_sidebar())},prepare:function(t){if(t=t||{},t._valid)return t;var e={id:"",url:"",alt:"",title:"",filename:""};return t.id&&(e=t.attributes,e.url=acf.maybe_get(e,"sizes."+this.o.preview_size+".url",e.url)),e._valid=!0,e},fetch:function(t){var e=acf.prepare_for_ajax({action:"acf/fields/gallery/get_attachment",field_key:this.$field.data("key"),nonce:acf.get("nonce"),post_id:acf.get("post_id"),id:t});if(this.$el.data("xhr")&&this.$el.data("xhr").abort(),"string"==typeof t&&0===t.indexOf("_")){var a=this.get_attachment(t).find('input[type="hidden"]').val();a=$.parseJSON(a),e.attachment=a}var i=$.ajax({url:acf.get("ajaxurl"),dataType:"html",type:"post",cache:!1,data:e,context:this,success:this.fetch_success});this.$el.data("xhr",i)},fetch_success:function(t){if(t){var e=this.$side.find(".acf-gallery-side-data");e.html(t),e.find(".compat-field-acf-form-data").remove();var a=e.find("> .compat-attachment-fields > tbody > tr").detach();e.find("> table.form-table > tbody").append(a),e.find("> .compat-attachment-fields").remove(),acf.do_action("append",e)}},_sort:function(t){var e=t.$el.val();if(e){var a=acf.prepare_for_ajax({action:"acf/fields/gallery/get_sort_order",field_key:this.$field.data("key"),post_id:acf.get("post_id"),ids:[],sort:e});this.get_attachments().each(function(){var t=$(this).attr("data-id");t&&a.ids.push(t)});var i=$.ajax({url:acf.get("ajaxurl"),dataType:"json",type:"post",cache:!1,data:a,context:this,success:this._sort_success})}},_sort_success:function(t){if(acf.is_ajax_success(t)){t.data.reverse();for(i in t.data){var e=t.data[i],a=this.get_attachment(e);this.$attachments.prepend(a)}}},_update:function(){var t=this.$side.find(".acf-gallery-update"),e=this.$side.find(".acf-gallery-edit"),a=this.$side.find(".acf-gallery-side-data"),i=e.data("id"),l=acf.serialize_form(a);return t.attr("disabled")?!1:(t.attr("disabled","disabled"),t.before('<i class="acf-loading"></i>'),l.action="acf/fields/gallery/update_attachment",acf.prepare_for_ajax(l),void $.ajax({url:acf.get("ajaxurl"),data:l,type:"post",dataType:"json",complete:function(e){t.removeAttr("disabled"),t.prev(".acf-loading").remove()}}))},_remove:function(t){t.stopPropagation();var e=t.$el.data("id");this.remove_attachment(e)},remove_attachment:function(t){this.close_sidebar(),this.get_attachment(t).remove(),this.render()},_edit:function(t){var e=t.$el.data("id");this.edit_attachment(e)},edit_attachment:function(t){var e=this,a=this.$field,i=t,l=this.get_attachment(t),s=acf.media.popup({mode:"edit",title:acf._e("image","edit"),button:acf._e("image","update"),attachment:i,select:function(i){e.set("$field",a).render_attachment(t,i),e.fetch(t)}})},render_collection:function(t){var e=this;setTimeout(function(){var a=t.content.get().$el;if(collection=t.content.get().collection||null,collection){var i=-1;collection.each(function(t){i++;var l=a.find(".attachments > .attachment:eq("+i+")");e.get_attachment(t.id).exists()&&(t.off("selection:single"),l.addClass("acf-selected"))})}},10)}})}(jQuery);
+!function($){acf.pro=acf.model.extend({actions:{refresh:"refresh"},filters:{get_fields:"get_fields"},get_fields:function(t){return t=t.not(".acf-clone .acf-field")},refresh:function(t){var e=this;return t=t||!1,t&&t.is("tr")?void e.render_table(t.closest("table")):void $(".acf-table",t).each(function(){e.render_table($(this))})},render_table:function(t){var e=t.find("> thead th.acf-th"),a=1,i=100;e.exists()&&(e.each(function(){var e=$(this),a=e.attr("data-key"),i=t.find('td[data-key="'+a+'"]');i.removeClass("appear-empty"),e.removeClass("hidden-by-conditional-logic"),i.exists()&&(0==i.not(".hidden-by-conditional-logic").length?e.addClass("hidden-by-conditional-logic"):i.filter(".hidden-by-conditional-logic").addClass("appear-empty"))}),e.css("width","auto"),e=e.not(".hidden-by-conditional-logic"),a=e.length,e.filter("[data-width]").each(function(){var t=parseInt($(this).attr("data-width"));i-=t,$(this).css("width",t+"%")}),e=e.not("[data-width]"),e.each(function(){var t=i/e.length;$(this).css("width",t+"%")}),t.find(".acf-row .acf-field.-collapsed-target").removeAttr("colspan"),t.find(".acf-row.-collapsed .acf-field.-collapsed-target").attr("colspan",a))}})}(jQuery),function($){acf.fields.repeater=acf.field.extend({type:"repeater",$el:null,$input:null,$table:null,$tbody:null,$clone:null,actions:{ready:"initialize",append:"initialize",show:"show"},events:{'click a[data-event="add-row"]':"_add",'click a[data-event="remove-row"]':"_remove",'click a[data-event="collapse-row"]':"_collapse","mouseenter td.order":"_mouseenter"},focus:function(){this.$el=this.$field.find(".acf-repeater:first"),this.$input=this.$field.find("input:first"),this.$table=this.$field.find("table:first"),this.$tbody=this.$table.children("tbody"),this.$clone=this.$tbody.children("tr.acf-clone"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},initialize:function(){this.$clone.find("input, textarea, select").attr("disabled","disabled"),this.render()},show:function(){this.$tbody.find(".acf-field:visible").each(function(){acf.do_action("show_field",$(this))})},count:function(){return this.$tbody.children().length-1},render:function(){this.$tbody.children().each(function(t){$(this).find("> td.order > span").html(t+1)}),0==this.count()?this.$el.addClass("-empty"):this.$el.removeClass("-empty"),this.o.max>0&&this.count()>=this.o.max?this.$el.find("> .acf-actions .button").addClass("disabled"):this.$el.find("> .acf-actions .button").removeClass("disabled")},add:function(t){if(t=t||this.$clone,this.o.max>0&&this.count()>=this.o.max)return alert(acf._e("repeater","max").replace("{max}",this.o.max)),!1;var e=this.$field;return $el=acf.duplicate(this.$clone),$el.removeClass("acf-clone"),$el.find("input, textarea, select").not(".acf-disabled").removeAttr("disabled"),t.before($el),this.doFocus(e),this.render(),acf.validation.remove_error(this.$field),this.sync(),$el},remove:function(t){var e=this;return this.count()<=this.o.min?(alert(acf._e("repeater","min").replace("{min}",this.o.min)),!1):(acf.do_action("remove",t),void acf.remove_tr(t,function(){e.$input.trigger("change"),e.render(),e.sync(),acf.do_action("refresh",e.$field)}))},sync:function(){var t="collapsed_"+this.$field.data("key"),e=[];this.$tbody.children().each(function(t){$(this).hasClass("-collapsed")&&e.push(t)}),acf.update_user_setting(t,e.join(","))},_mouseenter:function(t){if(!this.$tbody.hasClass("ui-sortable")&&1!=this.o.max){var e=this;this.$tbody.sortable({items:"> tr",handle:"> td.order",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,a){e.render(),acf.do_action("sortstop",a.item,a.placeholder)},update:function(t,a){e.$input.trigger("change")}})}},_add:function(t){$row=!1,t.$el.hasClass("acf-icon")&&($row=t.$el.closest(".acf-row")),this.add($row)},_remove:function(t){this.remove(t.$el.closest(".acf-row"))},_collapse:function(t){var e=t.$el.closest(".acf-row"),a=this.$field;e.hasClass("-collapsed")?(e.removeClass("-collapsed"),acf.do_action("show",e,"collapse")):(e.addClass("-collapsed"),acf.do_action("hide",e,"collapse")),this.set("$field",a).sync(),acf.do_action("refresh",this.$field)}})}(jQuery),function($){acf.fields.flexible_content=acf.field.extend({type:"flexible_content",$el:null,$input:null,$values:null,$clones:null,actions:{ready:"initialize",append:"initialize",show:"show"},events:{'click [data-event="add-layout"]':"_open",'click [data-event="remove-layout"]':"_remove",'click [data-event="collapse-layout"]':"_collapse","click .acf-fc-layout-handle":"_collapse","click .acf-fc-popup a":"_add","blur .acf-fc-popup .focus":"_close","mouseenter .acf-fc-layout-handle":"_mouseenter"},focus:function(){this.$el=this.$field.find(".acf-flexible-content:first"),this.$input=this.$el.siblings("input"),this.$values=this.$el.children(".values"),this.$clones=this.$el.children(".clones"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},count:function(){return this.$values.children(".layout").length},initialize:function(){this.$clones.find("input, textarea, select").attr("disabled","disabled"),this.render()},show:function(){this.$values.find(".acf-field:visible").each(function(){acf.do_action("show_field",$(this))})},render:function(){var t=this;this.$values.children(".layout").each(function(t){$(this).find("> .acf-fc-layout-handle .acf-fc-layout-order").html(t+1)}),0==this.count()?this.$el.addClass("empty"):this.$el.removeClass("empty"),this.o.max>0&&this.count()>=this.o.max?this.$el.find("> .acf-actions .button").addClass("disabled"):this.$el.find("> .acf-actions .button").removeClass("disabled")},render_layout:function(t){},validate_add:function(t){if(this.o.max>0&&this.count()>=this.o.max){var e=1==this.o.max?"layout":"layouts",a=acf._e("flexible_content","max");return a=a.replace("{max}",this.o.max),a=a.replace("{identifier}",acf._e("flexible_content",e)),alert(a),!1}var i=$(this.$el.children(".tmpl-popup").html()),l=i.find('[data-layout="'+t+'"]'),s=parseInt(l.attr("data-max")),n=this.$values.children('.layout[data-layout="'+t+'"]').length;if(s>0&&n>=s){var e=1==s?"layout":"layouts",a=acf._e("flexible_content","max_layout");return a=a.replace("{max}",n),a=a.replace("{label}",'"'+l.text()+'"'),a=a.replace("{identifier}",acf._e("flexible_content",e)),alert(a),!1}return!0},validate_remove:function(t){if(this.o.min>0&&this.count()<=this.o.min){var e=1==this.o.min?"layout":"layouts",a=acf._e("flexible_content","min")+", "+acf._e("flexible_content","remove");return a=a.replace("{min}",this.o.min),a=a.replace("{identifier}",acf._e("flexible_content",e)),a=a.replace("{layout}",acf._e("flexible_content","layout")),confirm(a)}var i=$(this.$el.children(".tmpl-popup").html()),l=i.find('[data-layout="'+t+'"]'),s=parseInt(l.attr("data-min")),n=this.$values.children('.layout[data-layout="'+t+'"]').length;if(s>0&&s>=n){var e=1==s?"layout":"layouts",a=acf._e("flexible_content","min_layout")+", "+acf._e("flexible_content","remove");return a=a.replace("{min}",n),a=a.replace("{label}",'"'+l.text()+'"'),a=a.replace("{identifier}",acf._e("flexible_content",e)),a=a.replace("{layout}",acf._e("flexible_content","layout")),confirm(a)}return!0},sync:function(){var t="collapsed_"+this.$field.data("key"),e=[];this.$values.children(".layout").each(function(t){$(this).hasClass("-collapsed")&&e.push(t)}),acf.update_user_setting(t,e.join(","))},add:function(t,e){if(e=e||!1,!this.validate_add(t))return!1;var a=this.$field,i=this.$clones.children('.layout[data-layout="'+t+'"]');$el=acf.duplicate(i),$el.find("input, textarea, select").not(".acf-disabled").removeAttr("disabled"),this.$el.children(".no-value-message").hide(),e?e.before($el):this.$values.append($el),this.doFocus(a),this.render(),acf.validation.remove_error(this.$field),this.sync()},_mouseenter:function(t){if(!this.$values.hasClass("ui-sortable")&&1!=this.o.max){var e=this;this.$values.sortable({items:"> .layout",handle:"> .acf-fc-layout-handle",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,a){e.render(),acf.do_action("sortstop",a.item,a.placeholder)},update:function(t,a){e.$input.trigger("change")}})}},_open:function(t){var e=this.$values,a=$(this.$el.children(".tmpl-popup").html());a.find("a").each(function(){var t=parseInt($(this).attr("data-min")),a=parseInt($(this).attr("data-max")),i=$(this).attr("data-layout"),l=$(this).text(),s=e.children('.layout[data-layout="'+i+'"]').length,n=$(this).children(".status");if(a>0){var c=a-s,o=acf._e("flexible_content","available"),r=1==c?"layout":"layouts",o=o.replace("{available}",c);o=o.replace("{max}",a),o=o.replace("{label}",'"'+l+'"'),o=o.replace("{identifier}",acf._e("flexible_content",r)),n.show().text(c).attr("title",o),0==c&&n.addClass("warning")}if(t>0){var d=t-s,o=acf._e("flexible_content","required"),r=1==d?"layout":"layouts",o=o.replace("{required}",d);o=o.replace("{min}",t),o=o.replace("{label}",'"'+l+'"'),o=o.replace("{identifier}",acf._e("flexible_content",r)),d>0&&n.addClass("warning").show().text(d).attr("title",o)}}),t.$el.after(a),t.$el.closest(".acf-fc-layout-controlls").exists()&&a.closest(".layout").addClass("-open"),a.css({"margin-top":0-a.height()-t.$el.outerHeight()-14,"margin-left":(t.$el.outerWidth()-a.width())/2});var i=a.offset().top;30>i&&(a.css({"margin-top":15}),a.find(".bit").addClass("top")),a.children(".focus").trigger("focus")},_close:function(t){var e=t.$el.parent(),a=e.closest(".layout");a.removeClass("-open"),setTimeout(function(){e.remove()},200)},_add:function(t){var e=t.$el.closest(".acf-fc-popup"),a=t.$el.attr("data-layout"),i=!1;e.closest(".acf-fc-layout-controlls").exists()&&(i=e.closest(".layout")),this.add(a,i)},_remove:function(t){var e=this,a=t.$el.closest(".layout");if(this.validate_remove(a.attr("data-layout"))){var i=0,l=this.$el.children(".no-value-message");0==a.siblings(".layout").length&&(i=l.outerHeight()),acf.do_action("remove",a),acf.remove_el(a,function(){e.render(),e.$input.trigger("change"),i>0&&l.show(),e.sync()},i)}},_collapse:function(t){var e=t.$el.closest(".layout");e.hasClass("-collapsed")?(e.removeClass("-collapsed"),acf.do_action("refresh",e)):e.addClass("-collapsed"),this.sync();var a=acf.serialize(e);$.extend(a,{action:"acf/fields/flexible_content/layout_title",field_key:this.$field.data("key"),post_id:acf.get("post_id"),i:e.index(),layout:e.data("layout")}),$.ajax({url:acf.get("ajaxurl"),dataType:"html",type:"post",data:a,success:function(t){t&&e.find("> .acf-fc-layout-handle").html(t)}})}})}(jQuery),function($){acf.fields.gallery=acf.field.extend({type:"gallery",$el:null,$main:null,$side:null,$attachments:null,$input:null,actions:{ready:"initialize",append:"initialize",submit:"close_sidebar",show:"resize"},events:{"click .acf-gallery-attachment":"_select","click .acf-gallery-add":"_add","click .acf-gallery-remove":"_remove","click .acf-gallery-close":"_close","change .acf-gallery-sort":"_sort","click .acf-gallery-edit":"_edit","click .acf-gallery-update":"_update","change .acf-gallery-side input":"_update","change .acf-gallery-side textarea":"_update","change .acf-gallery-side select":"_update"},focus:function(){this.$el=this.$field.find(".acf-gallery:first"),this.$main=this.$el.children(".acf-gallery-main"),this.$side=this.$el.children(".acf-gallery-side"),this.$attachments=this.$main.children(".acf-gallery-attachments"),this.$input=this.$el.find("input:first"),this.o=acf.get_data(this.$el),this.o.min=this.o.min||0,this.o.max=this.o.max||0},initialize:function(){var t=this,e=this.$field;this.$attachments.unbind("sortable").sortable({items:".acf-gallery-attachment",forceHelperSize:!0,forcePlaceholderSize:!0,scroll:!0,start:function(t,e){e.placeholder.html(e.item.html()),e.placeholder.removeAttr("style"),acf.do_action("sortstart",e.item,e.placeholder)},stop:function(t,e){acf.do_action("sortstop",e.item,e.placeholder)}}),this.$el.unbind("resizable").resizable({handles:"s",minHeight:200,stop:function(t,e){acf.update_user_setting("gallery_height",e.size.height)}}),$(window).on("resize",function(){t.set("$field",e).resize()}),this.render(),this.resize()},resize:function(){for(var t=100,e=175,a=4,i=this.$el.width(),l=4;20>l;l++){var s=i/l;if(s>t&&e>s){a=l;break}}a=Math.min(a,8),this.$el.attr("data-columns",a)},render:function(){var t=this.$main.find(".acf-gallery-sort"),e=this.$main.find(".acf-gallery-add");this.o.max>0&&this.count()>=this.o.max?e.addClass("disabled"):e.removeClass("disabled"),this.count()?t.removeClass("disabled"):t.addClass("disabled")},open_sidebar:function(){this.$el.addClass("sidebar-open"),this.$main.find(".acf-gallery-sort").hide();var t=this.$el.width()/3;t=parseInt(t),t=Math.max(t,350),this.$side.children(".acf-gallery-side-inner").css({width:t-1}),this.$side.animate({width:t-1},250),this.$main.animate({right:t},250)},_close:function(t){this.close_sidebar()},close_sidebar:function(){this.$el.removeClass("sidebar-open");var t=this.$el.find(".acf-gallery-sort");this.get_attachment("active").removeClass("active"),this.$side.find("input, textarea, select").attr("disabled","disabled"),this.$main.animate({right:0},250),this.$side.animate({width:0},250,function(){t.show(),$(this).find(".acf-gallery-side-data").html("")})},count:function(){return this.get_attachments().length},get_attachments:function(){return this.$attachments.children(".acf-gallery-attachment")},get_attachment:function(t){return t=t||0,t="active"===t?".active":'[data-id="'+t+'"]',this.$attachments.children(".acf-gallery-attachment"+t)},render_attachment:function(t){t=this.prepare(t);var e=this.get_attachment(t.id),a=e.find(".margin"),i=e.find("img"),l=e.find(".filename"),s=e.find('input[type="hidden"]'),n=t.url;"image"==t.type?l.remove():(n=acf.maybe_get(t,"thumb.src"),l.text(t.filename)),n||(n=acf._e("media","default_icon"),e.addClass("-icon")),i.attr({src:n,alt:t.alt,title:t.title}),acf.val(s,t.id)},_add:function(t){if(this.o.max>0&&this.count()>=this.o.max)return void acf.validation.add_warning(this.$field,acf._e("gallery","max"));var e=this,a=this.$field,i=acf.media.popup({title:acf._e("gallery","select"),mode:"select",type:"",field:this.$field.data("key"),multiple:"add",library:this.o.library,mime_types:this.o.mime_types,select:function(t,i){e.set("$field",a).add_attachment(t,i)}});i.on("content:activate:browse",function(){e.render_collection(i),i.content.get().collection.on("reset add",function(){e.render_collection(i)})})},add_attachment:function(t,e){if(e=e||0,t=this.prepare(t),!(this.o.max>0&&this.count()>=this.o.max||this.get_attachment(t.id).exists())){var a=this.$el.find('input[type="hidden"]:first').attr("name"),i=['<div class="acf-gallery-attachment acf-soh" data-id="'+t.id+'">','<input type="hidden" value="'+t.id+'" name="'+a+'[]">','<div class="margin" title="">','<div class="thumbnail">','<img src="" alt="">',"</div>",'<div class="filename"></div>',"</div>",'<div class="actions acf-soh-target">','<a href="#" class="acf-icon -cancel dark acf-gallery-remove" data-id="'+t.id+'"></a>',"</div>","</div>"].join(""),l=$(i);if(this.$attachments.append(l),"prepend"===this.o.insert){var s=this.$attachments.children(":eq("+e+")");s.exists()&&s.before(l)}this.render_attachment(t),this.render(),this.$input.trigger("change")}},_select:function(t){var e=t.$el.data("id");this.select_attachment(e)},select_attachment:function(t){var e=this.get_attachment(t);e.hasClass("active")||(this.get_attachment("active").removeClass("active"),e.addClass("active"),this.fetch(t),this.open_sidebar())},prepare:function(t){if(t=t||{},t._valid)return t;var e={id:"",url:"",alt:"",title:"",filename:""};return t.id&&(e=t.attributes,e.url=acf.maybe_get(e,"sizes.medium.url",e.url)),e._valid=!0,e},fetch:function(t){var e=acf.prepare_for_ajax({action:"acf/fields/gallery/get_attachment",field_key:this.$field.data("key"),nonce:acf.get("nonce"),post_id:acf.get("post_id"),id:t});if(this.$el.data("xhr")&&this.$el.data("xhr").abort(),"string"==typeof t&&0===t.indexOf("_")){var a=this.get_attachment(t).find('input[type="hidden"]').val();a=$.parseJSON(a),e.attachment=a}var i=$.ajax({url:acf.get("ajaxurl"),dataType:"html",type:"post",cache:!1,data:e,context:this,success:this.fetch_success});this.$el.data("xhr",i)},fetch_success:function(t){if(t){var e=this.$side.find(".acf-gallery-side-data");e.html(t),e.find(".compat-field-acf-form-data").remove();var a=e.find("> .compat-attachment-fields > tbody > tr").detach();e.find("> table.form-table > tbody").append(a),e.find("> .compat-attachment-fields").remove(),acf.do_action("append",e)}},_sort:function(t){var e=t.$el.val();if(e){var a=acf.prepare_for_ajax({action:"acf/fields/gallery/get_sort_order",field_key:this.$field.data("key"),post_id:acf.get("post_id"),ids:[],sort:e});this.get_attachments().each(function(){var t=$(this).attr("data-id");t&&a.ids.push(t)});var i=$.ajax({url:acf.get("ajaxurl"),dataType:"json",type:"post",cache:!1,data:a,context:this,success:this._sort_success})}},_sort_success:function(t){if(acf.is_ajax_success(t)){t.data.reverse();for(i in t.data){var e=t.data[i],a=this.get_attachment(e);this.$attachments.prepend(a)}}},_update:function(){var t=this.$side.find(".acf-gallery-update"),e=this.$side.find(".acf-gallery-edit"),a=this.$side.find(".acf-gallery-side-data"),i=e.data("id"),l=acf.serialize_form(a);return t.attr("disabled")?!1:(t.attr("disabled","disabled"),t.before('<i class="acf-loading"></i>'),l.action="acf/fields/gallery/update_attachment",acf.prepare_for_ajax(l),void $.ajax({url:acf.get("ajaxurl"),data:l,type:"post",dataType:"json",complete:function(e){t.removeAttr("disabled"),t.prev(".acf-loading").remove()}}))},_remove:function(t){t.stopPropagation();var e=t.$el.data("id");this.remove_attachment(e)},remove_attachment:function(t){this.close_sidebar(),this.get_attachment(t).remove(),this.render(),this.$input.trigger("change")},_edit:function(t){var e=t.$el.data("id");this.edit_attachment(e)},edit_attachment:function(t){var e=this,a=this.$field,i=acf.media.popup({mode:"edit",title:acf._e("image","edit"),button:acf._e("image","update"),attachment:t,select:function(i){e.set("$field",a).render_attachment(i),e.fetch(t)}})},render_collection:function(t){var e=this;setTimeout(function(){var a=t.content.get().$el;if(collection=t.content.get().collection||null,collection){var i=-1;collection.each(function(t){i++;var l=a.find(".attachments > .attachment:eq("+i+")");e.get_attachment(t.id).exists()&&(t.off("selection:single"),l.addClass("acf-selected"))})}},10)}})}(jQuery);
diff --git a/pro/fields/clone.php b/pro/fields/clone.php
new file mode 100644
index 0000000..58f3387
--- /dev/null
+++ b/pro/fields/clone.php
@@ -0,0 +1,1275 @@
+<?php
+
+/*
+*  ACF Clone Field Class
+*
+*  All the logic for this field type
+*
+*  @class 		acf_field_clone
+*  @extends		acf_field
+*  @package		ACF
+*  @subpackage	Fields
+*/
+
+if( ! class_exists('acf_field_clone') ) :
+
+class acf_field_clone extends acf_field {
+	
+	
+	/*
+	*  __construct
+	*
+	*  This function will setup the field type data
+	*
+	*  @type	function
+	*  @date	5/03/2014
+	*  @since	5.0.0
+	*
+	*  @param	n/a
+	*  @return	n/a
+	*/
+	
+	function __construct() {
+		
+		// vars
+		$this->name = 'clone';
+		$this->label = _x('Clone', 'noun', 'acf');
+		$this->category = 'layout';
+		$this->defaults = array(
+			'clone' 		=> '',
+			'prefix_label'	=> 0,
+			'prefix_name'	=> 0,
+			'display'		=> 'seamless',
+			'layout'		=> 'block'
+		);
+		$this->cloning = array();
+		$this->replace = array();
+		
+		
+		// register filter
+		acf_enable_filter('clone');
+		
+		
+		// ajax
+		add_action('wp_ajax_acf/fields/clone/query', array($this, 'ajax_query'));
+		
+		
+		// filters
+		add_filter('acf/get_fields', array($this, 'acf_get_fields'), 5, 2);
+		add_filter('acf/clone_field/type=clone', array($this, 'acf_clone_field'), 10, 2);
+		
+		
+		// do not delete!
+    	parent::__construct();
+    	
+	}
+	
+	
+	/*
+	*  is_enabled
+	*
+	*  This function will return true if acf_local functionality is enabled
+	*
+	*  @type	function
+	*  @date	14/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	n/a
+	*  @return	n/a
+	*/
+	
+	function is_enabled() {
+		
+		return acf_is_filter_enabled('clone');
+		
+	}
+	
+	
+	/*
+	*  load_field()
+	*
+	*  This filter is appied to the $field after it is loaded from the database
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$field - the field array holding all the field options
+	*
+	*  @return	$field - the field array holding all the field options
+	*/
+	
+	function load_field( $field ) {
+		
+		// bail early if not enabled
+		if( !$this->is_enabled() ) return $field;
+		
+		
+		// load sub fields
+		$field['sub_fields'] = $this->get_cloned_fields( $field );
+		
+		
+		// append to replace list
+		if( $field['display'] == 'seamless' ) {
+			
+			$this->replace[ $field['key'] ] = 1;
+			
+		}
+		
+		
+		// return
+		return $field;
+		
+	}
+	
+	
+	/*
+	*  acf_get_fields
+	*
+	*  This function will replace clone fields
+	*
+	*  @type	function
+	*  @date	17/06/2016
+	*  @since	5.3.8
+	*
+	*  @param	$fields (array)
+	*  @param	$parent (array)
+	*  @return	$fields
+	*/
+	
+	function acf_get_fields( $fields, $parent ) {
+		
+		// bail early if not enabled
+		if( !$this->is_enabled() ) return $fields;
+		
+		
+		// vars
+		$i = 0;
+		
+		
+		// loop
+		while( $i < count($fields) ) {
+			
+			// vars
+			$field = $fields[ $i ];
+			
+			
+			// check if can replace
+			if( isset($this->replace[ $field['key'] ]) ) {
+				
+				// merge in $field (1 or more fields)
+				array_splice($fields, $i, 1, $field['sub_fields']);
+				
+				
+				// this clone field has been replaced, allow loop to see replacement field
+				$i--;
+				
+			}
+			
+			
+			// $i
+			$i++;
+			
+		}
+		
+		
+		// return
+		return $fields;
+		
+	}
+	
+	
+	
+	/*
+	*  get_cloned_fields
+	*
+	*  This function will return an array of fields for a given clone field
+	*
+	*  @type	function
+	*  @date	28/06/2016
+	*  @since	5.3.8
+	*
+	*  @param	$field (array)
+	*  @param	$parent (array)
+	*  @return	(array)
+	*/
+	
+	function get_cloned_fields( $field ) {
+		
+		// vars
+		$fields = array();
+		
+		
+		// bail early if no clone setting
+		if( empty($field['clone']) ) return $fields;
+		
+		
+		// bail ealry if already cloning this field (avoid infinite looping)
+		if( isset($this->cloning[ $field['key'] ]) ) return $fields;
+		
+		
+		// update local ref
+		$this->cloning[ $field['key'] ] = 1;
+		
+		
+		// loop
+		foreach( $field['clone'] as $selector ) {
+			
+			// field group
+			if( acf_is_field_group_key($selector) ) {
+				
+				// vars
+				$field_group = acf_get_field_group($selector);
+				$field_group_fields = acf_get_fields($field_group);
+				
+				
+				// append
+				$fields = array_merge($fields, $field_group_fields);
+				
+			// field
+			} elseif( acf_is_field_key($selector) ) {
+				
+				// append
+				$fields[] = acf_get_field($selector);
+				
+			}
+			
+		}
+		
+		
+		// modify
+		$fields = $this->modify_cloned_fields( $fields, $field );
+		
+		
+		// field has ve been loaded for this $parent, time to remove cloning ref
+		unset( $this->cloning[ $field['key'] ] );
+		
+		
+		// return
+		return $fields;
+		
+	}
+	
+	
+	/*
+	*  modify_cloned_fields
+	*
+	*  This function will modify an array of cloned fields
+	*  - used for the clone field to pass on it's name / label / prefix to sub fields
+	*
+	*  @type	function
+	*  @date	27/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function modify_cloned_fields( $sub_fields, $clone_field ) {
+		
+		// bail early if no sub fields
+		if( empty($sub_fields) ) return $sub_fields;
+		
+		
+		// loop
+		foreach( array_keys($sub_fields) as $i ) {
+			
+			// get sub field
+			$sub_field = $sub_fields[ $i ];
+			
+			
+			// label_format
+			if( $clone_field['prefix_label'] ) {
+				
+				$sub_field['label'] = $clone_field['label'] . ' ' . $sub_field['label'];
+				
+			}
+			
+			
+			// name_format
+			if( $clone_field['prefix_name'] ) {
+				
+				$sub_field['name'] = $clone_field['name'] . '_' . $sub_field['name'];
+				
+				
+			}
+			
+			
+			// required
+			if( $clone_field['required'] ) {
+				
+				$sub_field['required'] = 1;
+				
+			}
+				
+			
+			// modify prefix allowing clone field to save sub fields
+			$sub_field['prefix'] .= '[' . $clone_field['key'] . ']';
+			
+			
+			// clone
+			$sub_field = acf_clone_field( $sub_field, $clone_field );
+			
+			
+			// update
+			$sub_fields[ $i ] = $sub_field;
+			
+		}
+		
+		
+		// return
+		return $sub_fields;
+
+	}
+	
+	
+	/*
+	*  load_value()
+	*
+	*  This filter is applied to the $value after it is loaded from the db
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$value (mixed) the value found in the database
+	*  @param	$post_id (mixed) the $post_id from which the value was loaded
+	*  @param	$field (array) the field array holding all the field options
+	*  @return	$value
+	*/
+	
+	function load_value( $value, $post_id, $field ) {
+		
+		// bail early if no sub fields
+		if( empty($field['sub_fields']) ) return $value;
+		
+		
+		// modify
+		$field = $this->prepare_field_for_save( $field );
+		
+		
+		// load sub fields
+		$value = array();
+		
+		
+		// loop
+		foreach( array_keys($field['sub_fields']) as $i ) {
+			
+			// get sub field
+			$sub_field = $field['sub_fields'][ $i ];
+			
+			
+			// get value
+			$sub_value = acf_get_value( $post_id, $sub_field );
+			
+			
+			// add value
+			$value[ $sub_field['key'] ] = $sub_value;
+			
+		}
+		
+		
+		// return
+		return $value;
+		
+	}
+	
+	
+	/*
+	*  format_value()
+	*
+	*  This filter is appied to the $value after it is loaded from the db and before it is returned to the template
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$value (mixed) the value which was loaded from the database
+	*  @param	$post_id (mixed) the $post_id from which the value was loaded
+	*  @param	$field (array) the field array holding all the field options
+	*
+	*  @return	$value (mixed) the modified value
+	*/
+	
+	function format_value( $value, $post_id, $field ) {
+		
+		// bail early if no value
+		if( empty($value) ) return false;
+		
+		
+		// modify
+		$field = $this->prepare_field_for_save( $field );
+		
+		
+		// loop over rows
+		foreach( array_keys($field['sub_fields']) as $i ) {
+			
+			// get sub field
+			$sub_field = $field['sub_fields'][ $i ];
+			
+			
+			// extract value
+			$sub_value = acf_extract_var( $value, $sub_field['key'] );
+			
+			
+			// format value
+			$sub_value = acf_format_value( $sub_value, $post_id, $sub_field );
+			
+			
+			// append to $row
+			$value[ $sub_field['_name'] ] = $sub_value;
+			
+		}
+		
+		
+		// return
+		return $value;
+		
+	}
+	
+	
+	/*
+	*  update_value()
+	*
+	*  This filter is appied to the $value before it is updated in the db
+	*
+	*  @type	filter
+	*  @since	3.6
+	*  @date	23/01/13
+	*
+	*  @param	$value - the value which will be saved in the database
+	*  @param	$field - the field array holding all the field options
+	*  @param	$post_id - the $post_id of which the value will be saved
+	*
+	*  @return	$value - the modified value
+	*/
+	
+	function update_value( $value, $post_id, $field ) {
+		
+		// bail early if no value
+		if( !acf_is_array($value) || !acf_is_array($field['sub_fields'])) return null;
+		
+		
+		// modify
+		$field = $this->prepare_field_for_save( $field );
+		
+		
+		// loop
+		foreach( array_keys($field['sub_fields']) as $i ) {
+			
+			// vars
+			$sub_field = $field['sub_fields'][ $i ];
+			$v = false;
+			
+			
+			// key (backend)
+			if( isset($value[ $sub_field['key'] ]) ) {
+				
+				$v = $value[ $sub_field['key'] ];
+			
+			// name (frontend)
+			} elseif( isset($value[ $sub_field['_name'] ]) ) {
+				
+				$v = $value[ $sub_field['_name'] ];
+			
+			// empty
+			} else {
+				
+				// input is not set (hidden by conditioanl logic)
+				continue;
+				
+			}
+			
+			
+			// update value
+			acf_update_value( $v, $post_id, $sub_field );
+			
+		}
+		
+		
+		// return
+		return '';
+		
+	}
+	
+	
+	/*
+	*  render_field()
+	*
+	*  Create the HTML interface for your field
+	*
+	*  @param	$field - an array holding all the field's data
+	*
+	*  @type	action
+	*  @since	3.6
+	*  @date	23/01/13
+	*/
+	
+	function render_field( $field ) {
+		
+		// bail early if no sub fields
+		if( empty($field['sub_fields']) ) return;
+		
+		
+		// load values
+		foreach( array_keys($field['sub_fields']) as $i ) {
+			
+			// vars
+			$sub_field = $field['sub_fields'][ $i ];
+			
+			
+			// add value
+			if( isset($field['value'][ $sub_field['key'] ]) ) {
+				
+				// this is a normal value
+				$sub_field['value'] = $field['value'][ $sub_field['key'] ];
+				
+			} elseif( isset($sub_field['default_value']) ) {
+				
+				// no value, but this sub field has a default value
+				$sub_field['value'] = $sub_field['default_value'];
+				
+			}
+			
+			
+			// update prefix to allow for nested values
+			$sub_field['prefix'] = $field['name'];
+			
+			
+			// if clone field is requird, no need to show '*' on sub field labels
+			if( $field['required'] ) {
+				
+				$sub_field['required'] = 0;
+				
+			}
+				
+			
+			// append
+			$field['sub_fields'][ $i ] = $sub_field;
+		
+		}
+		
+		
+		// render
+		if( $field['layout'] == 'table' ) {
+			
+			$this->render_field_table( $field );
+			
+		} else {
+			
+			$this->render_field_block( $field );
+			
+		}
+		
+	}
+	
+	
+	/*
+	*  render_field_block
+	*
+	*  description
+	*
+	*  @type	function
+	*  @date	12/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function render_field_block( $field ) {
+		
+		// vars
+		$label_placement = $field['layout'] == 'block' ? 'top' : 'left';
+		
+		
+		// html
+		echo '<div class="acf-clone-fields acf-fields -'.$label_placement.'">';
+			
+		foreach( $field['sub_fields'] as $sub_field ) {
+			
+			acf_render_field_wrap( $sub_field );
+			
+		}
+		
+		echo '</div>';
+		
+	}
+	
+	
+	/*
+	*  render_field_table
+	*
+	*  description
+	*
+	*  @type	function
+	*  @date	12/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function render_field_table( $field ) {
+		
+?>
+<table class="acf-table">
+	<thead>
+		<tr>
+		<?php foreach( $field['sub_fields'] as $sub_field ): 
+			
+			$atts = array(
+				'class'		=> 'acf-th',
+				'data-key'	=> $sub_field['key'],
+			);
+			
+			
+			// add type
+			$atts['class'] .= ' acf-th-' . $sub_field['type'];
+			
+			
+			// Add custom width
+			if( $sub_field['wrapper']['width'] ) {
+			
+				$atts['data-width'] = $sub_field['wrapper']['width'];
+				
+			}
+				
+			?>
+			<th <?php acf_esc_attr_e( $atts ); ?>>
+				<?php echo acf_get_field_label( $sub_field ); ?>
+				<?php if( $sub_field['instructions'] ): ?>
+					<p class="description"><?php echo $sub_field['instructions']; ?></p>
+				<?php endif; ?>
+			</th>
+		<?php endforeach; ?>
+		</tr>
+	</thead>
+	<tbody>
+		<tr class="acf-row">
+		<?php 
+		
+		foreach( $field['sub_fields'] as $sub_field ) {
+			
+			acf_render_field_wrap( $sub_field, 'td' );
+			
+		}
+				
+		?>
+		</tr>
+	</tbody>
+</table>
+<?php
+		
+	}
+	
+	
+	/*
+	*  render_field_settings()
+	*
+	*  Create extra options for your field. This is rendered when editing a field.
+	*  The value of $field['name'] can be used (like bellow) to save extra data to the $field
+	*
+	*  @param	$field	- an array holding all the field's data
+	*
+	*  @type	action
+	*  @since	3.6
+	*  @date	23/01/13
+	*/
+	
+	function render_field_settings( $field ) {
+		
+		// default_value
+		acf_render_field_setting( $field, array(
+			'label'			=> __('Fields', 'acf'),
+			'instructions'	=> __('Select one or more fields you wish to clone','acf'),
+			'type'			=> 'select',
+			'name'			=> 'clone',
+			'multiple' 		=> 1,
+			'allow_null' 	=> 1,
+			'choices'		=> $this->get_clone_setting_choices( $field['clone'] ),
+			'ui'			=> 1,
+			'ajax'			=> 1,
+			'ajax_action'	=> 'acf/fields/clone/query',
+			'placeholder'	=> '',
+		));
+		
+		
+		// display
+		acf_render_field_setting( $field, array(
+			'label'			=> __('Display','acf'),
+			'instructions'	=> __('Specify the style used to render the clone field', 'acf'),
+			'type'			=> 'select',
+			'name'			=> 'display',
+			'class'			=> 'setting-display',
+			'choices'		=> array(
+				'group'			=> __('Group (displays selected fields in a group within this field)','acf'),
+				'seamless'		=> __('Seamless (replaces this field with selected fields)','acf'),
+			),
+		));
+		
+		
+		// layout
+		acf_render_field_setting( $field, array(
+			'label'			=> __('Layout','acf'),
+			'instructions'	=> __('Specify the style used to render the selected fields', 'acf'),
+			'type'			=> 'radio',
+			'name'			=> 'layout',
+			'layout'		=> 'horizontal',
+			'choices'		=> array(
+				'block'			=> __('Block','acf'),
+				'table'			=> __('Table','acf'),
+				'row'			=> __('Row','acf')
+			)
+		));
+		
+		
+		// prefix_label
+		$instructions = __('Labels will be displayed as %s', 'acf');
+		$instructions = sprintf($instructions, '<code class="prefix-label-code-1"></code>');
+		acf_render_field_setting( $field, array(
+			'label'			=> __('Prefix Field Labels','acf'),
+			'instructions'	=> $instructions,
+			'instructions_placement'	=> 'field',
+			'type'			=> 'radio',
+			'name'			=> 'prefix_label',
+			'class'			=> 'setting-prefix-label',
+			'choices'		=> array(
+				1				=> __("Yes",'acf'),
+				0				=> __("No",'acf'),
+			),
+			'layout'		=> 'horizontal',
+		));
+		
+		
+		// prefix_name
+		$instructions = __('Values will be saved as %s', 'acf');
+		$instructions = sprintf($instructions, '<code class="prefix-name-code-1"></code>');
+		acf_render_field_setting( $field, array(
+			'label'			=> __('Prefix Field Names','acf'),
+			'instructions'	=> $instructions,
+			'instructions_placement'	=> 'field',
+			'type'			=> 'radio',
+			'name'			=> 'prefix_name',
+			'class'			=> 'setting-prefix-name',
+			'choices'		=> array(
+				1				=> __("Yes",'acf'),
+				0				=> __("No",'acf'),
+			),
+			'layout'		=> 'horizontal',
+		));
+		
+	}
+	
+	
+	/*
+	*  get_clone_setting_choices
+	*
+	*  This function will return an array of choices data for Select2
+	*
+	*  @type	function
+	*  @date	17/06/2016
+	*  @since	5.3.8
+	*
+	*  @param	$value (mixed)
+	*  @return	(array)
+	*/
+	
+	function get_clone_setting_choices( $value ) {
+		
+		// vars
+		$choices = array();
+		
+		
+		// bail early if no $value
+		if( empty($value) ) return $choices;
+		
+		
+		// force value to array
+		$value = acf_get_array( $value );
+			
+			
+		// loop
+		foreach( $value as $v ) {
+			
+			$choices[ $v ] = $this->get_clone_setting_choice( $v );
+			
+		}
+		
+		
+		// return
+		return $choices;
+		
+	}
+	
+	
+	/*
+	*  get_clone_setting_choice
+	*
+	*  This function will return the label for a given clone choice
+	*
+	*  @type	function
+	*  @date	17/06/2016
+	*  @since	5.3.8
+	*
+	*  @param	$selector (mixed)
+	*  @return	(string)
+	*/
+	
+	function get_clone_setting_choice( $selector = '' ) {
+		
+		// bail early no selector
+		if( !$selector ) return '';
+		
+		
+		// ajax_fields
+		if( isset($_POST['fields'][ $selector ]) ) {
+			
+			return $this->get_clone_setting_field_choice( $_POST['fields'][ $selector ] );
+						
+		}
+		
+		
+		// field
+		if( acf_is_field_key($selector) ) {
+			
+			return $this->get_clone_setting_field_choice( acf_get_field($selector) );
+			
+		}
+		
+		
+		// group
+		if( acf_is_field_group_key($selector) ) {
+			
+			return $this->get_clone_setting_group_choice( acf_get_field_group($selector) );
+			
+		} 
+		
+		
+		// return
+		return $selector;
+		
+	}
+	
+	
+	/*
+	*  get_clone_setting_field_choice
+	*
+	*  This function will return the text for a field choice
+	*
+	*  @type	function
+	*  @date	20/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$field (array)
+	*  @return	(string)
+	*/
+	
+	function get_clone_setting_field_choice( $field ) {
+		
+		// title
+		$title = $field['label'] ? $field['label'] : __('(no title)', 'acf');
+					
+		
+		// append type
+		$title .= ' (' . $field['type'] . ')';
+		
+		
+		// ancestors
+		// - allow for AJAX to send through ancestors count
+		$ancestors = isset($field['ancestors']) ? $field['ancestors'] : count(acf_get_field_ancestors($field));
+		$title = str_repeat('- ', $ancestors) . $title;
+		
+		
+		// return
+		return $title;
+		
+	}
+	
+	
+	/*
+	*  get_clone_setting_group_choice
+	*
+	*  This function will return the text for a group choice
+	*
+	*  @type	function
+	*  @date	20/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$field_group (array)
+	*  @return	(string)
+	*/
+	
+	function get_clone_setting_group_choice( $field_group ) {
+		
+		return sprintf( __('All fields from %s field group', 'acf'), $field_group['title'] );
+		
+	}
+	
+	
+	/*
+	*  ajax_query
+	*
+	*  description
+	*
+	*  @type	function
+	*  @date	17/06/2016
+	*  @since	5.3.8
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function ajax_query() {
+		
+		// validate
+		if( !acf_verify_ajax() ) die();
+		
+		
+		// disable field to allow clone fields to appear selectable
+		acf_disable_filter('clone');
+		
+		
+   		// options
+   		$options = acf_parse_args($_POST, array(
+			'post_id'	=> 0,
+			'paged'		=> 0,
+			's'			=> '',
+			'title'		=> '',
+			'fields'	=> array()
+		));
+		
+		
+		// vars
+		$results = array();
+		$s = false;
+		$i = -1;
+		$limit = 20;
+		$range_start = $limit * ($options['paged']-1); 	//	0,	20,	40
+		$range_end = $range_start + ($limit-1);			//	19,	39,	59
+		
+		
+		// search
+		if( $options['s'] !== '' ) {
+			
+			// strip slashes (search may be integer)
+			$s = wp_unslash( strval($options['s']) );
+			
+		}		
+		
+		
+		// load groups
+		$field_groups = acf_get_field_groups();
+		$field_group = false;
+		
+		
+		// bail early if no field groups
+		if( empty($field_groups) ) die();
+		
+		
+		// move current field group to start
+		foreach( array_keys($field_groups) as $j ) {
+			
+			// check ID
+			if( $field_groups[ $j ]['ID'] !== $options['post_id'] ) continue;
+			
+			
+			// extract field group and move to start
+			$field_group = acf_extract_var($field_groups, $j);
+			
+			
+			// field group found, stop looking
+			break;
+			
+		}
+		
+		
+		// if field group was not found, this is a new field group (not yet saved)
+		if( !$field_group ) {
+			
+			$field_group = array(
+				'ID'	=> $options['post_id'],
+				'title'	=> $options['title'],
+				'key'	=> '',
+			);
+			
+		}
+		
+		
+		// move current field group to start of list
+		array_unshift($field_groups, $field_group);
+		
+		
+		// loop
+		foreach( $field_groups as $field_group ) {
+			
+			// vars
+			$fields = false;
+			$data = array(
+				'text'		=> $field_group['title'],
+				'children'	=> array()
+			);
+			
+			
+			// get fields
+			if( $field_group['ID'] == $options['post_id'] ) {
+				
+				$fields = $options['fields'];
+				
+			} else {
+				
+				$fields = acf_get_fields( $field_group );
+				$fields = acf_prepare_fields_for_import( $fields );
+			
+			}
+			
+			
+			// bail early if no fields
+			if( !$fields ) continue;
+			
+			
+			// populate children
+			$children = array();
+			$children[] = $field_group['key'];
+			foreach( $fields as $field ) { $children[] = $field['key']; }
+			
+			
+			// loop
+			foreach( $children as $child ) {
+				
+				// bail ealry if no key (fake field group or corrupt field)
+				if( !$child ) continue;
+				
+				
+				// vars
+				$text = false;
+				
+				
+				// bail early if is search, and $text does not contain $s
+				if( $s !== false ) {
+					
+					// get early
+					$text = $this->get_clone_setting_choice( $child );
+					
+					
+					// search
+					if( stripos($text, $s) === false ) continue;
+					
+				}
+				
+				
+				// $i
+				$i++;
+				
+				
+				// bail early if $i is out of bounds
+				if( $i < $range_start || $i > $range_end ) continue;
+				
+				
+				
+				// load text
+				if( $text === false ) $text = $this->get_clone_setting_choice( $child );
+				
+				
+				// append
+				$data['children'][] = array(
+					'id'	=> $child,
+					'text'	=> $text
+				);
+				
+			}
+			
+			
+			// bail early if no children
+			// - this group contained fields, but none shown on this page
+			if( empty($data['children']) ) continue;
+			
+			
+			// append
+			$results[] = $data;
+			
+			
+			// end loop if $i is out of bounds
+			// - no need to look further
+			if( $i > $range_end ) break;
+				
+		}
+		
+		
+		// return
+		acf_send_ajax_results(array(
+			'results'	=> $results,
+			'limit'		=> $limit
+		));
+		
+	}
+	
+	
+	/*
+	*  prepare_field_for_save
+	*
+	*  description
+	*
+	*  @type	function
+	*  @date	27/07/2016
+	*  @since	5.4.0
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function prepare_field_for_save( $field ) {
+		
+		// bail early if no sub fields
+		if( empty($field['sub_fields']) ) return $field;
+		
+		
+		// calculate save name prefix
+		// during save, a field's name may be modified (by a parent field)
+		// - normal: 'cloneName'
+		// - sub field: 'repeaterName_1_cloneName'
+		$save_prefix = $field['name'];
+		
+		
+		// if no prefix, remove the origional field name from it's name.
+		// - this sounds strange, but will allow cloned fields to save correctly when clone is a sub field
+		// - normal: ''
+		// - sub field: 'repeaterName_1_'
+		if( $field['prefix_name'] ) {
+			
+			$save_prefix .= '_';
+			
+		} else {
+			
+			$length = strlen($field['_name']);
+			$save_prefix = substr($save_prefix, 0, -$length);
+			
+		}
+		
+		
+		// bail ealry if no $save_prefix
+		// - when clone is a parent field with no prefix setting
+		if( !$save_prefix ) return $field;
+		
+		
+		// loop
+		foreach( array_keys($field['sub_fields']) as $i ) {
+			
+			// get sub field
+			$sub_field = $field['sub_fields'][ $i ];
+			
+			
+			$sub_field['name'] = $save_prefix . $sub_field['_name'];
+			
+			
+			// update
+			$field['sub_fields'][ $i ] = $sub_field;
+			
+		}
+		
+		
+		// return
+		return $field;
+
+	}
+	
+	
+	/*
+	*  acf_clone_field
+	*
+	*  This function is run when cloning a clone field
+	*  Important to run the acf_clone_field function on sub fields to pass on settings such as 'parent_layout' 
+	*
+	*  @type	function
+	*  @date	28/06/2016
+	*  @since	5.3.8
+	*
+	*  @param	$field (array)
+	*  @param	$clone_field (array)
+	*  @return	$field
+	*/
+	
+	function acf_clone_field( $field, $clone_field ) {
+		
+		// bail early if no sub fields
+		if( empty($field['sub_fields']) ) return $field;
+		
+		
+		// loop
+		foreach( array_keys($field['sub_fields']) as $i ) {
+			
+			// get sub field
+			$sub_field = $field['sub_fields'][ $i ];
+			
+			
+			// clone
+			$sub_field = acf_clone_field( $sub_field, $clone_field );
+			
+			
+			// update
+			$field['sub_fields'][ $i ] = $sub_field;
+			
+		}
+		
+		
+		// return
+		return $field;
+		
+	}
+	
+	
+	/*
+	*  validate_value
+	*
+	*  description
+	*
+	*  @type	function
+	*  @date	11/02/2014
+	*  @since	5.0.0
+	*
+	*  @param	$post_id (int)
+	*  @return	$post_id (int)
+	*/
+	
+	function validate_value( $valid, $value, $field, $input ){
+		
+		// bail early if no $value
+		if( empty($value) ) return $valid;
+		
+		
+		// bail early if no sub fields
+		if( empty($field['sub_fields']) ) return $valid;
+		
+		
+		// loop
+		foreach( array_keys($field['sub_fields']) as $i ) {
+			
+			// get sub field
+			$sub_field = $field['sub_fields'][ $i ];
+			$k = $sub_field['key'];
+			
+			
+			// bail early if valu enot set (conditional logic?)
+			if( !isset($value[ $k ]) ) continue;
+			
+			
+			// validate
+			acf_validate_value( $value[ $k ], $sub_field, "{$input}[{$k}]" );
+			
+		}
+		
+		
+		// return
+		return $valid;
+		
+	}
+	
+}
+
+
+// initialize
+acf_register_field_type( new acf_field_clone() );
+
+endif; // class_exists check
+
+?>
diff --git a/pro/fields/flexible-content.php b/pro/fields/flexible-content.php
index 62340c0..43d46df 100644
--- a/pro/fields/flexible-content.php
+++ b/pro/fields/flexible-content.php
@@ -59,6 +59,10 @@ class acf_field_flexible_content extends acf_field {
 		add_action('wp_ajax_nopriv_acf/fields/flexible_content/layout_title',	array($this, 'ajax_layout_title'));
 		
 		
+		// filters
+		add_filter('acf/clone_field', array($this, 'acf_clone_field'), 10, 2);
+		
+		
 		// do not delete!
     	parent::__construct();
 		
@@ -707,6 +711,10 @@ class acf_field_flexible_content extends acf_field {
 				$sub_field = $layout[ $j ];
 				
 				
+				// bail ealry if no name (tab)
+				if( acf_is_empty($sub_field['name']) ) continue;
+				
+				
 				// update full name
 				$sub_field['name'] = "{$field['name']}_{$i}_{$sub_field['name']}";
 				
@@ -795,14 +803,18 @@ class acf_field_flexible_content extends acf_field {
 				$sub_field = $layout[ $j ];
 				
 				
-				// update $sub_field name
-				$sub_field['name'] = "{$field['name']}_{$i}_{$sub_field['name']}";
-					
-					
+				// bail ealry if no name (tab)
+				if( acf_is_empty($sub_field['name']) ) continue;
+				
+				
 				// extract value
 				$sub_value = acf_extract_var( $value[ $i ], $sub_field['key'] );
 				
 				
+				// update $sub_field name
+				$sub_field['name'] = "{$field['name']}_{$i}_{$sub_field['name']}";
+					
+				
 				// format value
 				$sub_value = acf_format_value( $sub_value, $post_id, $sub_field );
 				
@@ -1058,7 +1070,7 @@ class acf_field_flexible_content extends acf_field {
 		// save false for empty value
 		if( empty($order) ) {
 			
-			$order = false;
+			$order = '';
 		
 		}
 		
@@ -1291,10 +1303,10 @@ class acf_field_flexible_content extends acf_field {
 		
 		// options
    		$options = acf_parse_args( $_POST, array(
-			'post_id'		=>	0,
-			'i'				=>	0,
-			'field_key'		=>	'',
-			'nonce'			=>	'',
+			'post_id'		=> 0,
+			'i'				=> 0,
+			'field_key'		=> '',
+			'nonce'			=> '',
 			'layout'		=> '',
 			'acf'			=> array()
 		));
@@ -1393,10 +1405,47 @@ class acf_field_flexible_content extends acf_field {
 		
 	}
 	
+	
+	/*
+	*  acf_clone_field
+	*
+	*  This function will update clone field settings based on the origional field
+	*
+	*  @type	function
+	*  @date	28/06/2016
+	*  @since	5.3.8
+	*
+	*  @param	$clone (array)
+	*  @param	$field (array)
+	*  @return	$clone
+	*/
+	
+	function acf_clone_field( $field, $clone_field ) {
+		
+		// remove parent_layout
+		// - allows a sub field to be rendered as a normal field
+		unset($field['parent_layout']);
+		
+		
+		// attempt to merger parent_layout
+		if( isset($clone_field['parent_layout']) ) {
+			
+			$field['parent_layout'] = $clone_field['parent_layout'];
+			
+		}
+		
+		
+		// return
+		return $field;
+		
+	}
+	
 }
 
-new acf_field_flexible_content();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_flexible_content() );
+
+endif; // class_exists check
 
 ?>
diff --git a/pro/fields/gallery.php b/pro/fields/gallery.php
index d9f84c7..fe6a9eb 100644
--- a/pro/fields/gallery.php
+++ b/pro/fields/gallery.php
@@ -36,7 +36,6 @@ class acf_field_gallery extends acf_field {
 		$this->label = __("Gallery",'acf');
 		$this->category = 'content';
 		$this->defaults = array(
-			'preview_size'	=> 'thumbnail',
 			'library'		=> 'all',
 			'min'			=> 0,
 			'max'			=> 0,
@@ -225,10 +224,10 @@ class acf_field_gallery extends acf_field {
 		$r = array();
 		$order = 'DESC';
    		$args = acf_parse_args( $_POST, array(
-			'ids'			=>	0,
-			'sort'			=>	'date',
-			'field_key'		=>	'',
-			'nonce'			=>	'',
+			'ids'			=> 0,
+			'sort'			=> 'date',
+			'field_key'		=> '',
+			'nonce'			=> '',
 		));
 		
 		
@@ -467,7 +466,6 @@ class acf_field_gallery extends acf_field {
 		$atts = array(
 			'id'				=> $field['id'],
 			'class'				=> "acf-gallery {$field['class']}",
-			'data-preview_size'	=> $field['preview_size'],
 			'data-library'		=> $field['library'],
 			'data-min'			=> $field['min'],
 			'data-max'			=> $field['max'],
@@ -516,10 +514,14 @@ class acf_field_gallery extends acf_field {
 					
 					
 					// thumbnail
-					$thumbnail = acf_get_post_thumbnail($a['ID'], $field['preview_size']);
+					$thumbnail = acf_get_post_thumbnail($a['ID'], 'medium');
 					
 					
-					// icon
+					// remove filename if is image
+					if( $a['type'] == 'image' ) $a['filename'] = '';
+					
+					
+					// class
 					$a['class'] .= ' -' . $a['type'];
 					
 					if( $thumbnail['type'] == 'icon' ) {
@@ -536,18 +538,18 @@ class acf_field_gallery extends acf_field {
 							<div class="thumbnail">
 								<img src="<?php echo $thumbnail['url']; ?>" alt="" title="<?php echo $a['title']; ?>"/>
 							</div>
-							<div class="filename"><?php echo acf_get_truncated($a['filename'], 30); ?></div>
+							<?php if( $a['filename'] ): ?>
+							<div class="filename"><?php echo acf_get_truncated($a['filename'], 30); ?></div>	
+							<?php endif; ?>
 						</div>
 						<div class="actions acf-soh-target">
 							<a class="acf-icon -cancel dark acf-gallery-remove" href="#" data-id="<?php echo $a['ID']; ?>" title="<?php _e('Remove', 'acf'); ?>"></a>
 						</div>
 					</div>
-					
 				<?php endforeach; ?>
 				
 			<?php endif; ?>
 			
-			
 		</div>
 		
 		<div class="acf-gallery-toolbar">
@@ -650,16 +652,6 @@ class acf_field_gallery extends acf_field {
 		));
 		
 		
-		// preview_size
-		acf_render_field_setting( $field, array(
-			'label'			=> __('Preview Size','acf'),
-			'instructions'	=> __('Shown when entering data','acf'),
-			'type'			=> 'select',
-			'name'			=> 'preview_size',
-			'choices'		=> acf_get_image_sizes()
-		));
-		
-		
 		// insert
 		acf_render_field_setting( $field, array(
 			'label'			=> __('Insert','acf'),
@@ -913,8 +905,10 @@ class acf_field_gallery extends acf_field {
 	
 }
 
-new acf_field_gallery();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_gallery() );
+
+endif; // class_exists check
 
 ?>
diff --git a/pro/fields/repeater.php b/pro/fields/repeater.php
index 2e5e702..bd71e67 100644
--- a/pro/fields/repeater.php
+++ b/pro/fields/repeater.php
@@ -70,9 +70,18 @@ class acf_field_repeater extends acf_field {
 	
 	function load_field( $field ) {
 		
-		$field['sub_fields'] = acf_get_fields( $field );
+		// vars
+		$sub_fields = acf_get_fields( $field );
 		
 		
+		// append
+		if( $sub_fields ) {
+			
+			$field['sub_fields'] = $sub_fields;
+			
+		}
+				
+		
 		// return
 		return $field;
 	}
@@ -531,6 +540,10 @@ class acf_field_repeater extends acf_field {
 					$sub_field = $field['sub_fields'][ $j ];
 					
 					
+					// bail ealry if no name (tab)
+					if( acf_is_empty($sub_field['name']) ) continue;
+					
+					
 					// update $sub_field name
 					$sub_field['name'] = "{$field['name']}_{$i}_{$sub_field['name']}";
 					
@@ -594,14 +607,18 @@ class acf_field_repeater extends acf_field {
 				$sub_field = $field['sub_fields'][ $j ];
 				
 				
-				// update $sub_field name
-				$sub_field['name'] = "{$field['name']}_{$i}_{$sub_field['name']}";
+				// bail ealry if no name (tab)
+				if( acf_is_empty($sub_field['name']) ) continue;
 				
 				
 				// extract value
 				$sub_value = acf_extract_var( $value[ $i ], $sub_field['key'] );
 				
 				
+				// update $sub_field name
+				$sub_field['name'] = "{$field['name']}_{$i}_{$sub_field['name']}";
+				
+				
 				// format value
 				$sub_value = acf_format_value( $sub_value, $post_id, $sub_field );
 				
@@ -707,6 +724,10 @@ class acf_field_repeater extends acf_field {
 		$total = 0;
 		
 		
+		// bail early if no sub fields
+		if( empty($field['sub_fields']) ) return $value;
+		
+		
 		// remove acfcloneindex
 		if( isset($value['acfcloneindex']) ) {
 		
@@ -733,14 +754,6 @@ class acf_field_repeater extends acf_field {
 				$total++;
 				
 				
-				// continue if no sub fields
-				if( !$field['sub_fields'] ) {
-					
-					continue;
-					
-				}
-					
-					
 				// loop through sub fields
 				foreach( $field['sub_fields'] as $sub_field ) {
 					
@@ -812,6 +825,14 @@ class acf_field_repeater extends acf_field {
 		$value = $total;
 		
 		
+		// save false for empty value
+		if( empty($value) ) {
+			
+			$value = '';
+		
+		}
+		
+		
 		// return
 		return $value;
 	}
@@ -837,7 +858,7 @@ class acf_field_repeater extends acf_field {
 		
 		
 		// bail early if no rows or no sub fields
-		if( !$old_total || !$field['sub_fields'] ) {
+		if( !$old_total || empty($field['sub_fields']) ) {
 			
 			return;
 			
@@ -878,14 +899,14 @@ class acf_field_repeater extends acf_field {
 	
 	function delete_field( $field ) {
 		
-		// loop through sub fields
-		if( !empty($field['sub_fields']) ) {
+		// bail early if no sub fields
+		if( empty($field['sub_fields']) ) return;
 		
-			foreach( $field['sub_fields'] as $sub_field ) {
-			
-				acf_delete_field( $sub_field['ID'] );
-				
-			}
+		
+		// loop through sub fields
+		foreach( $field['sub_fields'] as $sub_field ) {
+		
+			acf_delete_field( $sub_field['ID'] );
 			
 		}
 		
@@ -952,8 +973,10 @@ class acf_field_repeater extends acf_field {
 
 }
 
-new acf_field_repeater();
 
-endif;
+// initialize
+acf_register_field_type( new acf_field_repeater() );
+
+endif; // class_exists check
 
 ?>
diff --git a/readme.txt b/readme.txt
index 13587db..6edd607 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: elliotcondon
 Tags: acf, advanced, custom, field, fields, custom field, custom fields, simple fields, magic fields, more fields, repeater, edit
 Requires at least: 3.6.0
-Tested up to: 4.5.2
+Tested up to: 4.6.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -106,6 +106,42 @@ http://support.advancedcustomfields.com/
 
 == Changelog ==
 
+= 5.4.4 =
+* WYSIWYG field: Fixed JS error when 'Disable the visual editor when writing' is checked
+
+= 5.4.3 =
+* WYSIWYG field: Fixed JS bug (since WP 4.6) causing conflicts with editor plugins
+* Google Maps field: Fixed JS error conflict with Divi theme
+* Radio field: Fixed bug (Chrome only) ignoring default values in cloned sub fields
+* Core: Fixed `wp_get_sites()` deprecated error (since WP 4.6) shown in network admin
+
+= 5.4.2 =
+* API: Fixed bug preventing post_title and post_content values saving in `acf_form()`
+
+= 5.4.1 =
+* API: Fixed bug causing `get_fields('options')` to return false
+* Core: Fixed bug causing `get_current_screen()` to throw PHP error
+* Core: Fixed bug causing 'Preview Post' to load empty field values
+
+= 5.4.0 =
+* Clone field: Added new field type (https://www.advancedcustomfields.com/resources/clone/)
+* Gallery field: Removed 'Preview Size' setting and improved UI
+* Taxonomy field: Added compatibility to save/load terms to user object
+* Select field: Added new 'Return Format' setting
+* Radio field: Added new 'Return Format' setting
+* Checkbox field: Added new 'Return Format' setting
+* Page link field: Added new 'Allow Archives URLs' setting
+* Core: Fixed plugin update bug delaying updates
+* Core: Fixed bug when editing field settings in Chrome causing required setting to self toggle
+* Core: Improved speed and fixed bugs when creating and restoring revisions
+* Core: Minor fixes and improvements
+* Language: Updated Portuguese translation - thanks to Pedro Mendonca
+* Language: Updated Brazilian Portuguese translation - thanks to Augusto Simão
+* Language: Updated Dutch translation - thanks to Derk Oosterveld
+* Language: Updated Persian translation - thanks to Kamel
+* Language: Updated German translation - thanks to Ralf Koller
+* Language: Updated Swiss German translation - thanks to Raphael Hüni
+
 = 5.3.10 =
 * Core: Added new 'google_api_key' and 'google_api_client' global settings
 * Google Map: Added new 'acf/fields/google_map/api' filter