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
1=== modified file 'forum/skins/default/media/js/wmd/wmd.js'
2--- forum/skins/default/media/js/wmd/wmd.js 2012-06-22 20:37:14 +0000
3+++ forum/skins/default/media/js/wmd/wmd.js 2012-07-02 19:49:21 +0000
4@@ -102,7 +102,7 @@
5
6 // The link and title for the help button
7 var helpLink = "http://daringfireball.net/projects/markdown/syntax";
8- var helpHoverTitle = "MarkDown Syntax";
9+ var helpHoverTitle = "Sintassi MarkDown";
10 var helpTarget = "_blank";
11
12 // -------------------------------------------------------------------
13@@ -985,7 +985,7 @@
14 var boldButton = document.createElement("li");
15 boldButton.className = "wmd-button";
16 boldButton.id = "wmd-bold-button";
17- boldButton.title = "Strong <strong> Ctrl+B";
18+ boldButton.title = "Grassetto <strong> Ctrl+B";
19 boldButton.XShift = "0px";
20 boldButton.textOp = command.doBold;
21 setupButton(boldButton, true);
22@@ -994,7 +994,7 @@
23 var italicButton = document.createElement("li");
24 italicButton.className = "wmd-button";
25 italicButton.id = "wmd-italic-button";
26- italicButton.title = "Emphasis <em> Ctrl+I";
27+ italicButton.title = "Corsivo <em> Ctrl+I";
28 italicButton.XShift = "-20px";
29 italicButton.textOp = command.doItalic;
30 setupButton(italicButton, true);
31@@ -1008,7 +1008,7 @@
32 var linkButton = document.createElement("li");
33 linkButton.className = "wmd-button";
34 linkButton.id = "wmd-link-button";
35- linkButton.title = "Hyperlink <a> Ctrl+L";
36+ linkButton.title = "Collegamento <a> Ctrl+L";
37 linkButton.XShift = "-40px";
38 linkButton.textOp = function(chunk, postProcessing, useDefaultText){
39 return command.doLinkOrImage(chunk, postProcessing, false);
40@@ -1019,7 +1019,7 @@
41 var quoteButton = document.createElement("li");
42 quoteButton.className = "wmd-button";
43 quoteButton.id = "wmd-quote-button";
44- quoteButton.title = "Blockquote <blockquote> Ctrl+Q";
45+ quoteButton.title = "Citazione <blockquote> Ctrl+Q";
46 quoteButton.XShift = "-60px";
47 quoteButton.textOp = command.doBlockquote;
48 setupButton(quoteButton, true);
49@@ -1028,7 +1028,7 @@
50 var codeButton = document.createElement("li");
51 codeButton.className = "wmd-button";
52 codeButton.id = "wmd-code-button";
53- codeButton.title = "Code Sample <pre><code> Ctrl+K";
54+ codeButton.title = "Codice sorgente <pre><code> Ctrl+K";
55 codeButton.XShift = "-80px";
56 codeButton.textOp = command.doCode;
57 setupButton(codeButton, true);
58@@ -1037,7 +1037,7 @@
59 var imageButton = document.createElement("li");
60 imageButton.className = "wmd-button";
61 imageButton.id = "wmd-image-button";
62- imageButton.title = "Image <img> Ctrl+G";
63+ imageButton.title = "Immagine <img> Ctrl+G";
64 imageButton.XShift = "-100px";
65 imageButton.textOp = function(chunk, postProcessing, useDefaultText){
66 return command.doLinkOrImage(chunk, postProcessing, true);
67@@ -1053,7 +1053,7 @@
68 var olistButton = document.createElement("li");
69 olistButton.className = "wmd-button";
70 olistButton.id = "wmd-olist-button";
71- olistButton.title = "Numbered List <ol> Ctrl+O";
72+ olistButton.title = "Elenco numerato <ol> Ctrl+O";
73 olistButton.XShift = "-120px";
74 olistButton.textOp = function(chunk, postProcessing, useDefaultText){
75 command.doList(chunk, postProcessing, true, useDefaultText);
76@@ -1064,7 +1064,7 @@
77 var ulistButton = document.createElement("li");
78 ulistButton.className = "wmd-button";
79 ulistButton.id = "wmd-ulist-button";
80- ulistButton.title = "Bulleted List <ul> Ctrl+U";
81+ ulistButton.title = "Elenco puntato <ul> Ctrl+U";
82 ulistButton.XShift = "-140px";
83 ulistButton.textOp = function(chunk, postProcessing, useDefaultText){
84 command.doList(chunk, postProcessing, false, useDefaultText);
85@@ -1075,7 +1075,7 @@
86 var headingButton = document.createElement("li");
87 headingButton.className = "wmd-button";
88 headingButton.id = "wmd-heading-button";
89- headingButton.title = "Heading <h1>/<h2> Ctrl+H";
90+ headingButton.title = "Titolo <h1>/<h2> Ctrl+H";
91 headingButton.XShift = "-160px";
92 headingButton.textOp = command.doHeading;
93 setupButton(headingButton, true);
94@@ -1084,7 +1084,7 @@
95 var hrButton = document.createElement("li");
96 hrButton.className = "wmd-button";
97 hrButton.id = "wmd-hr-button";
98- hrButton.title = "Horizontal Rule <hr> Ctrl+R";
99+ hrButton.title = "Linea orizzontale <hr> Ctrl+R";
100 hrButton.XShift = "-180px";
101 hrButton.textOp = command.doHorizontalRule;
102 setupButton(hrButton, true);
103@@ -1098,7 +1098,7 @@
104 var undoButton = document.createElement("li");
105 undoButton.className = "wmd-button";
106 undoButton.id = "wmd-undo-button";
107- undoButton.title = "Undo - Ctrl+Z";
108+ undoButton.title = "Annulla - Ctrl+Z";
109 undoButton.XShift = "-200px";
110 undoButton.execute = function(manager){
111 manager.undo();
112@@ -1109,13 +1109,13 @@
113 var redoButton = document.createElement("li");
114 redoButton.className = "wmd-button";
115 redoButton.id = "wmd-redo-button";
116- redoButton.title = "Redo - Ctrl+Y";
117+ redoButton.title = "Ripeti - Ctrl+Y";
118 if (/win/.test(nav.platform.toLowerCase())) {
119- redoButton.title = "Redo - Ctrl+Y";
120+ redoButton.title = "Ripeti - Ctrl+Y";
121 }
122 else {
123 // mac and other non-Windows platforms
124- redoButton.title = "Redo - Ctrl+Shift+Z";
125+ redoButton.title = "Ripeti - Ctrl+Shift+Z";
126 }
127 redoButton.XShift = "-220px";
128 redoButton.execute = function(manager){

Subscribers

People subscribed via source and target branches