4 files changed, 19 insertions, 9 deletions
diff --git a/view/fr/jot-header.tpl b/view/fr/jot-header.tpl
index b687f65a6..d0c956a02 100644
--- a/view/fr/jot-header.tpl
+++ b/view/fr/jot-header.tpl
@@ -2,17 +2,20 @@
 <script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
+var editor;
+
 tinyMCE.init({
 	theme : "advanced",
 	mode : "specific_textareas",
 	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect",
+	plugins : "bbcode,paste",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location : "top",
 	theme_advanced_toolbar_align : "center",
 	theme_advanced_blockformats : "blockquote,code",
+	paste_text_sticky : true,
 	entity_encoding : "raw",
 	add_unload_trigger : false,
 	remove_linebreaks : false,
@@ -43,8 +46,13 @@ tinyMCE.init({
 				$('#character-counter').addClass('red');
 			}
 			$('#character-counter').text(text);
-    		});
-     	}
+    	});
+
+		ed.onInit.add(function(ed) {
+			ed.pasteAsPlainText = true;
+		});
+
+	}
 });
 
 </script>
diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl
index 7c49d771d..720cb0d1b 100644
--- a/view/fr/jot.tpl
+++ b/view/fr/jot.tpl
@@ -15,10 +15,6 @@
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
-<div id="profile-jot-plugin-wrapper" >
-  $jotplugins
-</div>
-<div id="profile-jot-plugin-end"></div>
 
 
 <div id="profile-jot-submit-wrapper" >
@@ -38,6 +34,11 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
 	</div> 
+
+	<div id="profile-jot-plugin-wrapper" >
+  	$jotplugins
+	</div>
+
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
 	</div> 
diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl
index 5e1bfabf4..97d67cbf6 100644
--- a/view/fr/settings.tpl
+++ b/view/fr/settings.tpl
@@ -5,7 +5,7 @@
 $nickname_block
 
 
-<form action="settings" id="settings-form" method="post" autocomplete="false" >
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
 
 
 <h3 class="settings-heading">Basic Settings</h3>
diff --git a/view/fr/strings.php b/view/fr/strings.php
index c64bba1b7..39e15eccf 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -293,6 +293,7 @@ $a->strings['Edit Album'] = 'Éditer l\'album';
 $a->strings['View Photo'] = 'Voir la photo';
 $a->strings['Photo not available'] = 'Photo indisponible';
 $a->strings['Edit photo'] = 'Éditer la photo';
+$a->strings['New album name] = 'Nom du nuovel album';
 $a->strings['View Full Size'] = 'Voir en taille réelle';
 $a->strings['Tags: '] = 'Étiquettes: ';
 $a->strings['[Remove any tag]'] = '[Retirer toutes les étiquettes]';