Update plugins and themes to the latest versions.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>

9 files changed, 162 insertions, 100 deletions

diff --git a/themes/mantra/admin/admin-functions.php b/themes/mantra/admin/admin-functions.php
index b361652c..890426d1 100644
--- a/themes/mantra/admin/admin-functions.php
+++ b/themes/mantra/admin/admin-functions.php
@@ -5,7 +5,7 @@
 

 function mantra_export_options(){

 

-    ob_clean();

+    if (ob_get_contents()) ob_clean();

 	

 	/* Check authorisation */

 	$authorised = true;

@@ -189,4 +189,18 @@ function mantra_truncate_words($string,$words=20, $ellipsis=' ...') {
  $new = preg_replace('/((\w+\W+\'*){'.($words-1).'}(\w+))(.*)/', '${1}', $string);

  return $new.$ellipsis;

 }

+

+// Synchronizing the tinymce width with the content width

+add_filter('tiny_mce_before_init', 'mantra_dynamic_editor_styles', 10);

+function mantra_dynamic_editor_styles($settings){

+    $settings['content_css'] .= ",".admin_url('admin-ajax.php') ."/?action=dynamic_styles";

+    return $settings;

+}

+

+// add wp_ajax callback

+add_action('wp_ajax_dynamic_styles', 'mantra_dynamic_styles_callback');

+function mantra_dynamic_styles_callback(){

+	global $mantra_options;

+    echo "html .mceContentBody , .mceContentBody img {max-width:".$mantra_options['mantra_sidewidth']."px;}";

+}

 ?>
\ No newline at end of file
diff --git a/themes/mantra/admin/css/admin.css b/themes/mantra/admin/css/admin.css
index 1be4cb73..e278867f 100644
--- a/themes/mantra/admin/css/admin.css
+++ b/themes/mantra/admin/css/admin.css
@@ -26,6 +26,10 @@ border:1px solid #CCC;
 

 /* end of Farbtastic overwrites  */

 

+.form-table, .form-table td, .form-table th, .form-table td p, .form-wrap label {

+font-size:13px;

+}

+

 

 #lefty  {

 clear:left;

@@ -47,7 +51,6 @@ border-radius:5px;
 -webkit-border-radius:5px;

 */

 padding-top:10px;

-background:#FFF;

 font-family:  Segoe UI !important;

 font-size: 12px;

 margin-bottom:10px;

@@ -90,11 +93,14 @@ margin-bottom:5px;
 }

 

 #accordion {

-width:95% ;

 margin:0px auto;

 font-family:Segoe UI,Calibri, Arial !important;

 display:block;

 float:none;

+border:10px solid #FFF;

+-moz-box-sizing:border-box;

+-webkit-box-sizing:border-box;

+box-sizing:border-box;

 }

 

 #submitDiv {

@@ -117,7 +123,7 @@ color:#666;
 #accordion h3 {

 border:none;

 background-image:none;

-background:#2C5353;

+background:#F5F5F5;

 margin:0;

 padding:8px;

 clear:both;

@@ -127,18 +133,18 @@ font-size: 17px ;
 padding-left:30px ;

 font-weight:normal;

 text-transform:uppercase;

-color:#F5F5F5;

-border-top:1px solid #4C7373;

-border-bottom:1px solid #0C3333;

+color:#555;

+border-top:1px solid #FFF;

+border-bottom:1px solid #E5E5E5;

 line-height: 1.3;

 -moz-border-radius:0;

 -webkit-border-radius:0;

 border-radius:0;

-transition:background ease-in-out .2s;

+transition:background ease .3s;

 }

 

 #accordion h3:hover {

-background:#3C6363;

+background:#FFF;

 }

 

 #accordion select option {

@@ -146,13 +152,21 @@ font-size:1.1em;
 }

 

 .form-table th, .form-wrap label {

- color: #222 !important;

-font-size: 16px;

+ color: #444 !important;

+font-size: 15px;

 font-weight:normal;

+text-transform:uppercase;

+background:#F7F7F7;

+border-bottom:1px solid #FFF;

+padding:10px;

 }

 

 .form-table tr {

-border-bottom:1px dashed #DDD;

+border-bottom:1px solid #F7F7F7;

+}

+

+.form-table tr:last-child {

+border-bottom:none;

 }

 

 .form-table td {

@@ -174,6 +188,7 @@ margin-right:20px;
  #accordion select  {

 min-width:120px;

 max-width:200px;

+padding:3px 5px;

 }

 

  #accordion textarea, #mantra_favicon  {

@@ -316,6 +331,7 @@ opacity:1;
 #accordion input[type="text"] {

 font-family:"Lucida Console", Monaco, monospace !important;

 font-size:12px;

+padding:6px;

 }

 

 #accordion > * {

@@ -327,19 +343,19 @@ display:block;
 }

 

 .ui-accordion-content {

-border-color:#EEE !important;

 background:#FFF !important;

 margin-bottom:10px !important;

-border:1px solid #DDD !important;

-border-top:none !important;

+border:none !important;

 overflow: hidden;

 padding:1em !important;

 }

-.ui-accordion .ui-accordion-content { overflow: hidden !important; }

+.ui-accordion .ui-accordion-content { overflow: hidden !important;padding:0 !important; }

 .ui-accordion .ui-accordion-content-overflow { overflow: visible !important; }

 

 .ui-state-active {

-	background:#0C3333 !important;

+	background:#444 !important;

+	color:#FFF !important;

+	border:none !important;

 }

 

 .darkbg{

@@ -383,19 +399,22 @@ margin-top:20px;}
 .slmini, #cdimensions  {

 display:block;

 float:none;

-margin:10px;

 }

 

 .slmini {

 background:#F9F9F9;

-border:1px dashed #CCC;

-padding:5px;

+border-bottom:1px solid #E7E7E7;

+padding:15px 5px 15px 10px;

 }

 

 .slmini b {

 width:130px;

 display:inline-block;

-float:left;}

+float:left;

+text-transform:uppercase;

+font-weight:normal;

+font-style:italic;

+}

 

 .slidebox {

 background:#F7F7F7;

@@ -468,7 +487,6 @@ color:#444;
 #sliderCustomSlides {margin-top:10px;}

 

 a.upload_image_button {

-color:#C67828 !important;

 text-decoration:none;

 clear:both;

 padding:2px 4px;

@@ -476,10 +494,26 @@ display:block;
 float:none;

 }

 

+

+.wp-core-ui .button, .wp-core-ui .button-secondary {

+background:#FFF;

+text-transform:uppercase;

+-moz-border-radius:0;

+-webkit-border-radius:0;

+border-radius:0;

+border-bottom:1px solid #555;

+}

+

+.wp-core-ui .button:hover, .wp-core-ui .button-secondary:hover {

+border-bottom:1px solid #000;

+}

+

 #submitDiv input.button {

 font-size:13px !important;

 padding:4px 10px !important;

 height:auto;

+text-transform:uppercase;

+border-bottom:3px solid #555;

 }

 

 .header_upload_inputs {

@@ -552,8 +586,8 @@ z-index:3;
 	float:left;

 	clear:both;

 	text-align:left;

-	margin-left:90px;

-	margin-top:-18px;

+	margin-left:97px;

+	margin-top:-17px;

 	}

 

 #admin_links a {

@@ -564,7 +598,7 @@ margin-right:9px;
 text-decoration:none;

 font-family:Segoe UI, Arial;

 font-size:11px;

-color:#3F5F5F;

+color:#000000;

 text-transform:uppercase;

 }

 

@@ -576,3 +610,10 @@ color:#C47D09;
 margin-left: 15px; margin-right: 15px; 

 margin-top: 20px; }

 

+#jsAlert {

+margin: 0 15px 10px;

+background-color: #F4F8FA;

+border-color: #BCE8F1; border-style: solid; border-radius: 0; border-width: 0 0 0 3px; 

+padding:5px 10px;

+}

+

diff --git a/themes/mantra/admin/custom-styles.php b/themes/mantra/admin/custom-styles.php
index c8a7439e..b54415f0 100644
--- a/themes/mantra/admin/custom-styles.php
+++ b/themes/mantra/admin/custom-styles.php
@@ -34,7 +34,6 @@ ob_start(); ?>
 

 if ($mantra_dimselect=="Absolute") { ?>

 #wrapper, #access, #colophon, #branding, #main { width:<?php echo ($totalwidth) ?>px ;}

-#access .menu-header, div.menu {width:<?php echo ($totalwidth-12) ?>px ;}

 <?php if (is_page_template() && !is_page_template('template-blog.php') && !is_page_template('template-onecolumn.php') && !is_page_template('template-page-with-intro.php')) {

 

  if (is_page_template("template-twocolumns-right.php") ) { ?>

@@ -245,7 +244,7 @@ $mantra_googlefontsubheader = str_replace('+',' ',preg_replace('/:.*/i','',$mant
 

 switch ($mantra_menualign):

     case "center": ?> #access ul { display: table; margin: 0 auto; } <?php break;

-	case "right": ?> #access ul li { float: right; } <?php break;

+	case "right": ?> #access .menu-header, div.menu { float: right; } <?php break;

 	default: break;

 endswitch;

 

@@ -258,13 +257,13 @@ endswitch;
 ?><?php if ($mantra_postdate == "Hide") { ?>.entry-meta span.entry-date,.entry-meta span.onDate {display:none;} <?php }

 ?><?php if ($mantra_postcomlink == "Hide") { ?>.entry-meta .comments-link,.entry-meta2 .comments-link{display:none;} <?php }

 ?><?php if ($mantra_postauthor == "Hide") { ?>.entry-meta .author {display:none;} <?php }

-?><?php if ($mantra_postcateg == "Hide") { ?>.entry-meta span.bl_categ {display:none;} <?php }

+?><?php if ($mantra_postcateg == "Hide") { ?>.entry-meta span.bl_categ, .entry-meta2 span.bl_categ {display:none;} <?php }

 ?><?php if ($mantra_posttag == "Hide") { ?> .entry-utility span.bl_posted, .entry-meta2 span.bl_tagg,.entry-meta3 span.bl_tagg {display:none;} <?php }

 ?><?php if ($mantra_postbook == "Hide") { ?> .entry-utility span.bl_bookmark {display:none;} <?php }

 ?><?php if ($mantra_parmargin) { ?> #content p, .entry-content ul, .entry-summary ul , .entry-content ol, .entry-summary ol { margin-bottom:<?php echo $mantra_parmargin; ?>;} <?php } 

 ?><?php if ($mantra_parindent != "0px") { ?>  p {text-indent:<?php echo $mantra_parindent;?> ;} <?php }

 ?><?php if ($mantra_posttime == "Hide") { ?> .entry-meta .entry-time {display:none;} <?php }

-?><?php if ($mantra_postmetas == "Hide") { ?> #content .entry-meta {display:none;} <?php }

+?><?php if ($mantra_postmetas == "Hide") { ?> #content .entry-meta, #content .entry-header div.entry-meta2 > * {display:none;} <?php }

 ?><?php if (($mantra_mobile == "Enable") &&  $mantra_hcontain) { ?> #branding{ -webkit-background-size:contain !important;-moz-background-size:contain !important;background-size:contain !important; } <?php } ?>

 #branding { height:<?php echo HEADER_IMAGE_HEIGHT; ?>px ;}

 <?php if ($mantra_hratio) { ?> @media (max-width: 800px) {#branding, #bg_image { min-height:inherit !important; } }	<?php } ?>

diff --git a/themes/mantra/admin/defaults.php b/themes/mantra/admin/defaults.php
index 44927d29..086189cd 100644
--- a/themes/mantra/admin/defaults.php
+++ b/themes/mantra/admin/defaults.php
@@ -41,7 +41,7 @@ $mantra_defaults = array(
 "mantra_sliderlink1" => "",

 "mantra_sliderimg2" => get_template_directory_uri()."/images/slider/mantra-slide2.jpg",

 "mantra_slidertitle2" => "This is yet another caption title",

-"mantra_slidertext2" => "And some more text to give you as an example. You can use <a href='http://www.riotreaction.com' >links</a> and other type of <b>HTML</b> <i>formats</i>.",

+"mantra_slidertext2" => "And some more text to give you as an example. You can use <a href='http://www.cryoutcreations.eu' >links</a> and other type of <b>HTML</b> <i>formats</i>.",

 "mantra_sliderlink2" => "",

 "mantra_sliderimg3" => "",

 "mantra_slidertitle3" => "",

@@ -66,7 +66,7 @@ $mantra_defaults = array(
 "mantra_columnlink1" => "",

 "mantra_columnimg2" => get_template_directory_uri()."/images/slider/mantra-column.jpg",

 "mantra_columntitle2" => " HTML tags",

-"mantra_columntext2" => "You can also have <a href='http://www.riotreactions.com'>links</a> here as well as some <strong>HTML tags</strong>.",

+"mantra_columntext2" => "You can also have <a href='http://www.cryoutcreations.eu'>links</a> here as well as some <strong>HTML tags</strong>.",

 "mantra_columnlink2" => "",

 "mantra_columnimg3" => get_template_directory_uri()."/images/slider/mantra-column.jpg",

 "mantra_columntitle3" => "",

@@ -95,7 +95,7 @@ $mantra_defaults = array(
 "mantra_hratio" => "",

 "mantra_menurounded" => "Enable",

 "mantra_logoupload" => "",

-"mantra_favicon" => "", 

+"mantra_favicon" => "",

 "mantra_siteheader" => "Site Title and Description",

 "mantra_headermargintop" => "20",

 "mantra_headermarginleft" => "40",

@@ -190,20 +190,20 @@ $mantra_defaults = array(
 "mantra_fcrop" => "",

 "mantra_fheader" => "Disable",

 

-"mantra_social1" => "",

-"mantra_social2" => "",

-"mantra_social3" => "",

-"mantra_social4" => "",

-"mantra_social5" => "",

-"mantra_social6" => "",

+"mantra_social1" => "Facebook",

+"mantra_social2" => "#",

+"mantra_social3" => "Twitter",

+"mantra_social4" => "#",

+"mantra_social5" => "RSS",

+"mantra_social6" => "#",

 "mantra_social7" => "",

 "mantra_social8" => "",

 "mantra_social9" => "",

 "mantra_social10" => "",

-"mantra_socialsdisplay0" => "",

+"mantra_socialsdisplay0" => "1",

 "mantra_socialsdisplay1" => "",

 "mantra_socialsdisplay2" => "",

-"mantra_socialsdisplay3" => "",

+"mantra_socialsdisplay3" => "1",

 

 "mantra_copyright" => "",

 "mantra_customcss" => "/* Mantra Custom CSS */  ",

diff --git a/themes/mantra/admin/images/mantra-logo.png b/themes/mantra/admin/images/mantra-logo.png
index 68d6c88f..4e861909 100644
--- a/themes/mantra/admin/images/mantra-logo.png
+++ b/themes/mantra/admin/images/mantra-logo.png
diff --git a/themes/mantra/admin/js/admin.js b/themes/mantra/admin/js/admin.js
index 6ee51806..3978f7da 100644
--- a/themes/mantra/admin/js/admin.js
+++ b/themes/mantra/admin/js/admin.js
@@ -4,34 +4,34 @@
 

 jQuery(document).ready(function() {

 

-// WP image uploader for custom use in the admin section

-		var uploadparent = 0;

-		var old_send_to_editor = window.send_to_editor;

-		var old_tb_remove = window.tb_remove;

-

-		jQuery('.upload_image_button').click(function(){

-			uploadparent = jQuery(this).closest('div');

-			//Change "insert into post" to "Use this Button"

-     		tbframe_interval = setInterval( function() {jQuery('#TB_iframeContent').contents().find('.savesend .button').val('Use This Image');}, 2000);

-			tb_show('Select File', 'media-upload.php?post_id=0&amp;type=file&amp;TB_iframe=true');

-			return false;

-		});

-

-		window.tb_remove = function() {

-			uploadparent = 0;

-			old_tb_remove();

-		}

-

-		window.send_to_editor = function(html) {

-			if(uploadparent){

-				imgurl = jQuery('img',html).attr('src');

-				uploadparent.find('.slideimages').attr('value', imgurl);

-				uploadparent.find('.imagebox').attr('src', imgurl);

-				tb_remove();

-			} else {

-				old_send_to_editor();

-			}

-			}			

+var uploadparent = 0;

+ function media_upload( button_class) {

+    var _custom_media = true,

+    _orig_send_attachment = wp.media.editor.send.attachment;

+    jQuery('body').on('click',button_class, function(e) {

+	uploadparent = jQuery(this).closest('div');

+        var button_id ='#'+jQuery(this).attr('id');

+        /* console.log(button_id); */

+        var self = jQuery(button_id);

+        var send_attachment_bkp = wp.media.editor.send.attachment;

+        var button = jQuery(button_id);

+       // var id = button.attr('id').replace('_button', '');

+        _custom_media = true;

+        wp.media.editor.send.attachment = function(props, attachment){

+            if ( _custom_media  ) {

+              // jQuery('.custom_media_id').val(attachment.id); 		  

+               uploadparent.find('.slideimages').val(attachment.url);

+			   uploadparent.find('.imagebox').attr('src',attachment.url);

+              // jQuery('.custom_media_image').attr('src',attachment.url).css('display','block');   

+            } else {

+                return _orig_send_attachment.apply( button_id, [props, attachment] );

+            }

+        }

+        wp.media.editor.open(button);

+        return false;

+    });

+}

+media_upload( '.upload_image_button');			

 			

 			

 // Show/hide slides

diff --git a/themes/mantra/admin/main.php b/themes/mantra/admin/main.php
index 379303e0..ebc6fecb 100644
--- a/themes/mantra/admin/main.php
+++ b/themes/mantra/admin/main.php
@@ -78,10 +78,15 @@ function mantra_admin_scripts() {
 		wp_register_script('cryout_accordion',get_template_directory_uri() . '/admin/js/accordion-slider.js', array('jquery') );

 		wp_enqueue_script('cryout_accordion');

 		}

-// For the WP uploader

-	wp_enqueue_script('media-upload');

-	wp_enqueue_script('thickbox');

-	wp_enqueue_style('thickbox');

+	// For the WP uploader

+    if(function_exists('wp_enqueue_media')) {

+         wp_enqueue_media();

+      }

+      else {

+         wp_enqueue_script('media-upload');

+         wp_enqueue_script('thickbox');

+         wp_enqueue_style('thickbox');

+      }

 // The js used in the admin

 	wp_register_script('cryout-admin-js',get_template_directory_uri() . '/admin/js/admin.js' );

 	wp_enqueue_script('cryout-admin-js');

@@ -257,13 +262,16 @@ function mantra_page_fn() {
 </div>

 	<div style="clear: both;"></div>

 </div>

-<div id="jsAlert" class="error" style="padding:5px 10px;">If this message remains visible after the page has loaded then there is a problem with your WordPress jQuery library. This can have several causes, including incompatible plugins.<br> The Mantra Settings page cannot function without jQuery. You need to fix this issue before you can configure Mantra.</div>

+

 <?php if ( isset( $_GET['settings-updated'] ) ) {

     echo "<div class='updated fade' style='clear:left;'><p>";

 	echo _e('Mantra settings updated successfully.','mantra');

 	echo "</p></div>";

 } ?>

 

+<div id="jsAlert" class=""><b>Checking jQuery functionality...</b><br/><em>If this message remains visible after the page has loaded then there is a problem with your WordPress jQuery library. This can have several causes, including incompatible plugins.

+The Parabola Settings page cannot function without jQuery. </em></div>

+

 	<div id="main-options">

 		<form name="mantra_form" action="options.php" method="post" enctype="multipart/form-data">

 			<div id="accordion">

diff --git a/themes/mantra/admin/sanitize.php b/themes/mantra/admin/sanitize.php
index 30ed0b67..709d10c7 100644
--- a/themes/mantra/admin/sanitize.php
+++ b/themes/mantra/admin/sanitize.php
@@ -51,7 +51,7 @@
 

 	$socialNetworks = array ("Amazon", "Delicious", "DeviantArt", "Digg", "Etsy", "Facebook", "Flickr", "Google", "GoodReads", "GooglePlus",

                               "IMDb", "Instagram", "LastFM", "LinkedIn", "Mail", "MySpace", "Picasa", "Pinterest", "Reddit", "RSS", "Skype",

-                              "SoundCloud", "StumbleUpon", "Technorati", "Tumblr", "Twitch", "Twitter", "Vimeo", "VK", "WordPress",

+                              "Steam", "SoundCloud", "StumbleUpon", "Technorati", "Tumblr", "Twitch", "Twitter", "Vimeo", "VK", "WordPress",

                               "Xing", "Yahoo", "Yelp", "YouTube" );

 

 

@@ -113,7 +113,6 @@ global $mantra_defaults;
 	$cryout_special_keys = array('Mail', 'Skype');

 	for ($i=1;$i<10;$i+=2) {

 		$j=$i+1;

-

 		if (in_array($input['mantra_social'.$i],$cryout_special_keys)) :

 			$input['mantra_social'.$j]	= wp_kses_data(str_replace($cryout_special_terms,'',$input['mantra_social'.$j]));

 			if ($input['mantra_social'.$i]=='Mail') {$input['mantra_social'.$j]='mailto:'.$input['mantra_social'.$j];};

@@ -121,8 +120,10 @@ global $mantra_defaults;
 		else :

 			$input['mantra_social'.$j] = esc_url_raw($input['mantra_social'.$j]);

 		endif;

-

 	}

+	for ($i=0;$i<=5;$i++) {

+		if (!isset($input['mantra_socialsdisplay'.$i])) {$input['mantra_socialsdisplay'.$i] = "0";}

+		}

 

 	$input['mantra_favicon'] =  esc_url_raw($input['mantra_favicon']);

 	$input['mantra_logoupload'] =  esc_url_raw($input['mantra_logoupload']);

@@ -141,29 +142,29 @@ global $mantra_defaults;
 	if($input['mantra_googlefont']) {

 	$mantra_googlefont2 = $input['mantra_googlefont'];

 	$mantra_googlefont2=  preg_replace( '/\s+/', '+', $mantra_googlefont2 );

-	$mantra_googlefont2= "http://fonts.googleapis.com/css?family=".$mantra_googlefont2;

-							}

+	$mantra_googlefont2= "//fonts.googleapis.com/css?family=".$mantra_googlefont2;

+	$input['mantra_googlefont2'] = $mantra_googlefont2;

+     } else $input['mantra_googlefont2'] = '';

 	if($input['mantra_googlefonttitle']) {

 	$mantra_googlefonttitle2 = $input['mantra_googlefonttitle'];

 	$mantra_googlefonttitle2=  preg_replace( '/\s+/', '+', $mantra_googlefonttitle2 );

-	$mantra_googlefonttitle2= "http://fonts.googleapis.com/css?family=".$mantra_googlefonttitle2;

-							}

+	$mantra_googlefonttitle2= "//fonts.googleapis.com/css?family=".$mantra_googlefonttitle2;

+	$input['mantra_googlefonttitle2'] = $mantra_googlefonttitle2;

+     } else $input['mantra_googlefonttitle2'] = '';

 	if($input['mantra_googlefontside']) {

 	$mantra_googlefontside2 = $input['mantra_googlefontside'];

 	$mantra_googlefontside2=  preg_replace( '/\s+/', '+', $mantra_googlefontside2 );

-	$mantra_googlefontside2= "http://fonts.googleapis.com/css?family=".$mantra_googlefontside2;

-							}

+	$mantra_googlefontside2= "//fonts.googleapis.com/css?family=".$mantra_googlefontside2;

+	$input['mantra_googlefontside2'] = $mantra_googlefontside2;

+     } else $input['mantra_googlefontside2'] = '';

 	if($input['mantra_googlefontsubheader']) {

 	$mantra_googlefontsubheader2 = $input['mantra_googlefontsubheader'];

 	$mantra_googlefontsubheader2=  preg_replace( '/\s+/', '+', $mantra_googlefontsubheader2 );

-	$mantra_googlefontsubheader2= "http://fonts.googleapis.com/css?family=".$mantra_googlefontsubheader2;

-							}

-

-	$input['mantra_googlefont2'] = 	$mantra_googlefont2;

-	$input['mantra_googlefonttitle2'] = $mantra_googlefonttitle2;

-	$input['mantra_googlefontside2'] = $mantra_googlefontside2;

+	$mantra_googlefontsubheader2= "//fonts.googleapis.com/css?family=".$mantra_googlefontsubheader2;

 	$input['mantra_googlefontsubheader2'] = $mantra_googlefontsubheader2;

-	

+     } else $input['mantra_googlefontsubheader2'] = '';

+

+

 	$input['mantra_frontpostscount'] =  intval(wp_kses_data($input['mantra_frontpostscount']));

 

 	$input['mantra_fpsliderborderwidth'] =  intval(wp_kses_data($input['mantra_fpsliderborderwidth']));

diff --git a/themes/mantra/admin/settings.php b/themes/mantra/admin/settings.php
index 6d9d0fe2..96230225 100644
--- a/themes/mantra/admin/settings.php
+++ b/themes/mantra/admin/settings.php
@@ -400,7 +400,7 @@ function cryout_setting_frontslider2_fn() {
 <?php

 $items = array("Custom Slides", "Latest Posts", "Random Posts", "Sticky Posts", "Latest Posts from Category" , "Random Posts from Category", "Specific Posts");

 	$itemsare = array( __("Custom Slides","mantra"), __("Latest Posts","mantra"), __("Random Posts","mantra"),__("Sticky Posts","mantra"), __("Latest Posts from Category","mantra"), __("Random Posts from Category","mantra"), __("Specific Posts","mantra"));

-	echo "<strong> Select the content you want to load in your slides: </strong> ";

+	echo "<em>".__("Select the content you want to load in your slides:","mantra")." </em> ";

 	echo "<select id='mantra_slideType' name='ma_options[mantra_slideType]'>";

 foreach($items as $id=>$item) {

 	echo "<option value='$item'";

@@ -2059,12 +2059,12 @@ foreach($items as $id=>$item) {
 }

 	echo "</select>";

 	echo "<div><small>".__("Enable Mantra's Search Engine Optimization. This is enabled by default and should only be disabled if you are using a SEO plugin.","mantra")."</small></div>";

-	echo "<br><small> All title tags are handled automatically by Mantra. </small>";

+	echo "<br><small>".__("All title tags are handled automatically by Mantra.","mantra")."</small>";

 

 	echo "<div class='slmini'>";

-		echo "<b> Homepage Meta Description </b>";

+		echo "<b>".__("Homepage Meta Description","mantra")."</b>";

 		echo "<textarea id='mantra_seo_home_desc' name='ma_options[mantra_seo_home_desc]' rows='2' cols=50' type='textarea' >{$mantra_options['mantra_seo_home_desc']}  </textarea>";

-		echo "<small> This is unique and you should fill this in. Describe your site the best you can and try not to go over 160 characters. </small>";

+		echo "<small>".__("This is unique and you should fill this in. Describe your site the best you can and try not to go over 160 characters.","mantra")."</small>";

 	echo "</div>";

 

 	echo "<div class='slmini'>";

@@ -2078,17 +2078,16 @@ foreach($items as $id=>$item) {
 			echo ">$moreitemsare[$id]</option>";

 				}

 		echo "</select>";

-		echo "<small>  <u>Auto</u> - Mantra will automatically add post expcerpts to 'page' and 'post'	meta descriptions.<br>

-					   <u>Manual</u> - you will enable a new custom field in your post/page admin section where you can type the exact description you want for every post and page.</small>";

+		echo "<small>".__("<u>Auto</u> - Mantra will automatically add post expcerpts to 'page' and 'post'	meta descriptions.<br>

+					   <u>Manual</u> - you will enable a new custom field in your post/page admin section where you can type the exact description you want for every post and page.<br>

+					   For category pages, the actual category descriptions will be used. Go to Posts > Categories and you can fill in a description for every category you have.","mantra")."</small>";

 	echo "</div>";

 

-	echo "<small>For category pages, the actual category descriptions will be used. Go to Posts > Categories and you can fill in a description for every category you have. </small>";

-

 	echo "<div class='slmini'>";

-		echo "<b>Post Author</b>";

+		echo "<b>".__("Post Author","mantra")."</b>";

 	$authors=wp_list_authors (array("echo"=>false,"html"=> false));

 	$authors_array = explode ("," , $authors);

-	array_unshift($authors_array,"Do not use");

+	array_unshift($authors_array,__("Do not use","mantra"));

 	echo "<select id='mantra_seo_author' name='ma_options[mantra_seo_author]'>";

 		foreach($authors_array as $item) {

 	echo "<option value='$item'";

@@ -2098,7 +2097,7 @@ foreach($items as $id=>$item) {
 	echo "</select>";

 

 

-		echo "<small> If you want to show an author in the meta tags. </small>";

+		echo "<small>".__("If you want to show an author in the meta tags.","mantra")."</small>";

 	echo "</div>";

 

 }