Merge lp:~milo/ubuntu-it-ask/bug1020256 into lp:ubuntu-it-ask

Proposed by Milo Casagrande
Status: Merged
Merge reported by: Giuseppe Terrasi
Merged at revision: not available
Proposed branch: lp:~milo/ubuntu-it-ask/bug1020256
Merge into: lp:ubuntu-it-ask
Diff against target: 128 lines (+15/-15)
1 file modified
forum/skins/default/media/js/wmd/wmd.js (+15/-15)
To merge this branch: bzr merge lp:~milo/ubuntu-it-ask/bug1020256
Reviewer Review Type Date Requested Status
Giuseppe Terrasi (community) Approve
Review via email: mp+113104@code.launchpad.net

Description of the change

Il branch qui linkato traduce le varie parti visibili dell'editor JS.

To post a comment you must log in.
Revision history for this message
Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount) wrote :

approvato!

review: Approve
Revision history for this message
Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount) wrote :

In accordo con ultimi cambiamenti, necessario modificare questo merge affinche tali modifiche finiscano in

forum/skins/light/media/js/wmd/wmd.js

anziché

forum/skins/default/media/js/wmd/wmd.js

Revision history for this message
Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount) wrote :

Applicate le modifiche (rev 31)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'forum/skins/default/media/js/wmd/wmd.js'
--- forum/skins/default/media/js/wmd/wmd.js 2012-06-22 20:37:14 +0000
+++ forum/skins/default/media/js/wmd/wmd.js 2012-07-02 19:49:21 +0000
@@ -102,7 +102,7 @@
102 102
103 // The link and title for the help button103 // The link and title for the help button
104 var helpLink = "http://daringfireball.net/projects/markdown/syntax";104 var helpLink = "http://daringfireball.net/projects/markdown/syntax";
105 var helpHoverTitle = "MarkDown Syntax";105 var helpHoverTitle = "Sintassi MarkDown";
106 var helpTarget = "_blank";106 var helpTarget = "_blank";
107 107
108 // -------------------------------------------------------------------108 // -------------------------------------------------------------------
@@ -985,7 +985,7 @@
985 var boldButton = document.createElement("li");985 var boldButton = document.createElement("li");
986 boldButton.className = "wmd-button";986 boldButton.className = "wmd-button";
987 boldButton.id = "wmd-bold-button";987 boldButton.id = "wmd-bold-button";
988 boldButton.title = "Strong <strong> Ctrl+B";988 boldButton.title = "Grassetto <strong> Ctrl+B";
989 boldButton.XShift = "0px";989 boldButton.XShift = "0px";
990 boldButton.textOp = command.doBold;990 boldButton.textOp = command.doBold;
991 setupButton(boldButton, true);991 setupButton(boldButton, true);
@@ -994,7 +994,7 @@
994 var italicButton = document.createElement("li");994 var italicButton = document.createElement("li");
995 italicButton.className = "wmd-button";995 italicButton.className = "wmd-button";
996 italicButton.id = "wmd-italic-button";996 italicButton.id = "wmd-italic-button";
997 italicButton.title = "Emphasis <em> Ctrl+I";997 italicButton.title = "Corsivo <em> Ctrl+I";
998 italicButton.XShift = "-20px";998 italicButton.XShift = "-20px";
999 italicButton.textOp = command.doItalic;999 italicButton.textOp = command.doItalic;
1000 setupButton(italicButton, true);1000 setupButton(italicButton, true);
@@ -1008,7 +1008,7 @@
1008 var linkButton = document.createElement("li");1008 var linkButton = document.createElement("li");
1009 linkButton.className = "wmd-button";1009 linkButton.className = "wmd-button";
1010 linkButton.id = "wmd-link-button";1010 linkButton.id = "wmd-link-button";
1011 linkButton.title = "Hyperlink <a> Ctrl+L";1011 linkButton.title = "Collegamento <a> Ctrl+L";
1012 linkButton.XShift = "-40px";1012 linkButton.XShift = "-40px";
1013 linkButton.textOp = function(chunk, postProcessing, useDefaultText){1013 linkButton.textOp = function(chunk, postProcessing, useDefaultText){
1014 return command.doLinkOrImage(chunk, postProcessing, false);1014 return command.doLinkOrImage(chunk, postProcessing, false);
@@ -1019,7 +1019,7 @@
1019 var quoteButton = document.createElement("li");1019 var quoteButton = document.createElement("li");
1020 quoteButton.className = "wmd-button";1020 quoteButton.className = "wmd-button";
1021 quoteButton.id = "wmd-quote-button";1021 quoteButton.id = "wmd-quote-button";
1022 quoteButton.title = "Blockquote <blockquote> Ctrl+Q";1022 quoteButton.title = "Citazione <blockquote> Ctrl+Q";
1023 quoteButton.XShift = "-60px";1023 quoteButton.XShift = "-60px";
1024 quoteButton.textOp = command.doBlockquote;1024 quoteButton.textOp = command.doBlockquote;
1025 setupButton(quoteButton, true);1025 setupButton(quoteButton, true);
@@ -1028,7 +1028,7 @@
1028 var codeButton = document.createElement("li");1028 var codeButton = document.createElement("li");
1029 codeButton.className = "wmd-button";1029 codeButton.className = "wmd-button";
1030 codeButton.id = "wmd-code-button";1030 codeButton.id = "wmd-code-button";
1031 codeButton.title = "Code Sample <pre><code> Ctrl+K";1031 codeButton.title = "Codice sorgente <pre><code> Ctrl+K";
1032 codeButton.XShift = "-80px";1032 codeButton.XShift = "-80px";
1033 codeButton.textOp = command.doCode;1033 codeButton.textOp = command.doCode;
1034 setupButton(codeButton, true);1034 setupButton(codeButton, true);
@@ -1037,7 +1037,7 @@
1037 var imageButton = document.createElement("li");1037 var imageButton = document.createElement("li");
1038 imageButton.className = "wmd-button";1038 imageButton.className = "wmd-button";
1039 imageButton.id = "wmd-image-button";1039 imageButton.id = "wmd-image-button";
1040 imageButton.title = "Image <img> Ctrl+G";1040 imageButton.title = "Immagine <img> Ctrl+G";
1041 imageButton.XShift = "-100px";1041 imageButton.XShift = "-100px";
1042 imageButton.textOp = function(chunk, postProcessing, useDefaultText){1042 imageButton.textOp = function(chunk, postProcessing, useDefaultText){
1043 return command.doLinkOrImage(chunk, postProcessing, true);1043 return command.doLinkOrImage(chunk, postProcessing, true);
@@ -1053,7 +1053,7 @@
1053 var olistButton = document.createElement("li");1053 var olistButton = document.createElement("li");
1054 olistButton.className = "wmd-button";1054 olistButton.className = "wmd-button";
1055 olistButton.id = "wmd-olist-button";1055 olistButton.id = "wmd-olist-button";
1056 olistButton.title = "Numbered List <ol> Ctrl+O";1056 olistButton.title = "Elenco numerato <ol> Ctrl+O";
1057 olistButton.XShift = "-120px";1057 olistButton.XShift = "-120px";
1058 olistButton.textOp = function(chunk, postProcessing, useDefaultText){1058 olistButton.textOp = function(chunk, postProcessing, useDefaultText){
1059 command.doList(chunk, postProcessing, true, useDefaultText);1059 command.doList(chunk, postProcessing, true, useDefaultText);
@@ -1064,7 +1064,7 @@
1064 var ulistButton = document.createElement("li");1064 var ulistButton = document.createElement("li");
1065 ulistButton.className = "wmd-button";1065 ulistButton.className = "wmd-button";
1066 ulistButton.id = "wmd-ulist-button";1066 ulistButton.id = "wmd-ulist-button";
1067 ulistButton.title = "Bulleted List <ul> Ctrl+U";1067 ulistButton.title = "Elenco puntato <ul> Ctrl+U";
1068 ulistButton.XShift = "-140px";1068 ulistButton.XShift = "-140px";
1069 ulistButton.textOp = function(chunk, postProcessing, useDefaultText){1069 ulistButton.textOp = function(chunk, postProcessing, useDefaultText){
1070 command.doList(chunk, postProcessing, false, useDefaultText);1070 command.doList(chunk, postProcessing, false, useDefaultText);
@@ -1075,7 +1075,7 @@
1075 var headingButton = document.createElement("li");1075 var headingButton = document.createElement("li");
1076 headingButton.className = "wmd-button";1076 headingButton.className = "wmd-button";
1077 headingButton.id = "wmd-heading-button";1077 headingButton.id = "wmd-heading-button";
1078 headingButton.title = "Heading <h1>/<h2> Ctrl+H";1078 headingButton.title = "Titolo <h1>/<h2> Ctrl+H";
1079 headingButton.XShift = "-160px";1079 headingButton.XShift = "-160px";
1080 headingButton.textOp = command.doHeading;1080 headingButton.textOp = command.doHeading;
1081 setupButton(headingButton, true);1081 setupButton(headingButton, true);
@@ -1084,7 +1084,7 @@
1084 var hrButton = document.createElement("li");1084 var hrButton = document.createElement("li");
1085 hrButton.className = "wmd-button";1085 hrButton.className = "wmd-button";
1086 hrButton.id = "wmd-hr-button";1086 hrButton.id = "wmd-hr-button";
1087 hrButton.title = "Horizontal Rule <hr> Ctrl+R";1087 hrButton.title = "Linea orizzontale <hr> Ctrl+R";
1088 hrButton.XShift = "-180px";1088 hrButton.XShift = "-180px";
1089 hrButton.textOp = command.doHorizontalRule;1089 hrButton.textOp = command.doHorizontalRule;
1090 setupButton(hrButton, true);1090 setupButton(hrButton, true);
@@ -1098,7 +1098,7 @@
1098 var undoButton = document.createElement("li");1098 var undoButton = document.createElement("li");
1099 undoButton.className = "wmd-button";1099 undoButton.className = "wmd-button";
1100 undoButton.id = "wmd-undo-button";1100 undoButton.id = "wmd-undo-button";
1101 undoButton.title = "Undo - Ctrl+Z";1101 undoButton.title = "Annulla - Ctrl+Z";
1102 undoButton.XShift = "-200px";1102 undoButton.XShift = "-200px";
1103 undoButton.execute = function(manager){1103 undoButton.execute = function(manager){
1104 manager.undo();1104 manager.undo();
@@ -1109,13 +1109,13 @@
1109 var redoButton = document.createElement("li");1109 var redoButton = document.createElement("li");
1110 redoButton.className = "wmd-button";1110 redoButton.className = "wmd-button";
1111 redoButton.id = "wmd-redo-button";1111 redoButton.id = "wmd-redo-button";
1112 redoButton.title = "Redo - Ctrl+Y";1112 redoButton.title = "Ripeti - Ctrl+Y";
1113 if (/win/.test(nav.platform.toLowerCase())) {1113 if (/win/.test(nav.platform.toLowerCase())) {
1114 redoButton.title = "Redo - Ctrl+Y";1114 redoButton.title = "Ripeti - Ctrl+Y";
1115 }1115 }
1116 else {1116 else {
1117 // mac and other non-Windows platforms1117 // mac and other non-Windows platforms
1118 redoButton.title = "Redo - Ctrl+Shift+Z";1118 redoButton.title = "Ripeti - Ctrl+Shift+Z";
1119 }1119 }
1120 redoButton.XShift = "-220px";1120 redoButton.XShift = "-220px";
1121 redoButton.execute = function(manager){1121 redoButton.execute = function(manager){

Subscribers

People subscribed via source and target branches