aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-02-02 23:24:04 -0800
committerFriendika <info@friendika.com>2011-02-02 23:24:04 -0800
commit33b2490a91d844300bff1bade8bb21d1978442fd (patch)
tree257d0313039bfb8a31e460030a054052e5f6e373
parent2a4d1fa858bcab0c7e54c1c0a847537cacbed168 (diff)
parent2f6ef7b5eb312a9267ece2eb5aa571d857b6effb (diff)
downloadvolse-hubzilla-33b2490a91d844300bff1bade8bb21d1978442fd.tar.gz
volse-hubzilla-33b2490a91d844300bff1bade8bb21d1978442fd.tar.bz2
volse-hubzilla-33b2490a91d844300bff1bade8bb21d1978442fd.zip
Merge branch 'fabrixxm-master'
-rw-r--r--view/de/jot-header.tpl16
-rw-r--r--view/fr/jot-header.tpl16
-rw-r--r--view/it/jot-header.tpl16
-rw-r--r--view/it/strings.php19
4 files changed, 55 insertions, 12 deletions
diff --git a/view/de/jot-header.tpl b/view/de/jot-header.tpl
index 508715dca..41abdf0f3 100644
--- a/view/de/jot-header.tpl
+++ b/view/de/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-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/it/jot-header.tpl b/view/it/jot-header.tpl
index bf655ab37..e55a357e8 100644
--- a/view/it/jot-header.tpl
+++ b/view/it/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/it/strings.php b/view/it/strings.php
index d0f62543f..aa5359dbf 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -1032,4 +1032,23 @@ $a->strings['Normal View'] = 'Vista normale';
$a->strings['New Item View'] = 'Vista Nuovi Elementi';
$a->strings[' Cannot change to that email.'] = 'Non puoi cambiare a quella email.';
$a->strings['Birthday:'] = 'Compleanno:';
+$a->strings['Update now'] = 'Aggiorna adesso';
+$a->strings['This message was sent to you by '] = 'Questo messaggio è ti è stato inviato da ';
+$a->strings[', a member of the Friendika social network.'] = ', un membro del social network Friendika';
+$a->strings['You may visit them online at'] = 'Puoi visitarli online a ';
+$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Contatta il mittente rispondendo a questo post se non vuoi ricevere questi messaggi.';
+$a->strings['posted an update.'] = 'ha inviato un aggiornamento.';
+$a->strings['CC: email addresses'] = 'CC: indirizzi email';
+$a->strings['Example: bob@example.com, mary@example.com'] = 'Esempio: bob@example.com, mary@example.com';
+$a->strings['Embedding disabled'] = 'Inclusione disabilitata';
+$a->strings['Upload a file'] = 'Carica un file';
+$a->strings['Drop files here to upload'] = 'Trascina un file qui per caricarlo';
+$a->strings['Failed'] = 'Fallito';
+$a->strings['No files were uploaded.'] = 'Nessun file è stato caricato.';
+$a->strings['Uploaded file is empty'] = 'Il file caricato è vuoto';
+$a->strings['Uploaded file is too large'] = 'Il file caricato è troppo grande';
+$a->strings['File has an invalid extension, it should be one of '] = 'Il file ha una estensione non valida, dovrebbe essere una di ';
+$a->strings['Upload was cancelled, or server error encountered'] = 'Il caricamento è stato cancellato, o si è verificato un errore sul server';
+$a->strings['Randplace Settings'] = 'Impostazioni Randplace';
+$a->strings['Enable Randplace Plugin'] = 'Abilita il plugin Randplace';
?>