diff --git a/draw.js b/draw.js index 626a273..de707c5 100644 --- a/draw.js +++ b/draw.js @@ -453,17 +453,17 @@ var DrawingArea = new Lang.Class({ incrementLineWidth: function(increment) { this.currentLineWidth = Math.max(this.currentLineWidth + increment, 1); - this.emitter.emit('show-osd', this.currentLineWidth + "px", this.currentLineWidth); + this.emitter.emit('show-osd', this.currentLineWidth + " " + _("px"), this.currentLineWidth); }, toggleLineJoin: function() { this.currentLineJoin = this.currentLineJoin == 2 ? 0 : this.currentLineJoin + 1; - this.emitter.emit('show-osd', LineJoinNames[this.currentLineJoin], null); + this.emitter.emit('show-osd', _(LineJoinNames[this.currentLineJoin]), null); }, toggleLineCap: function() { this.currentLineCap = this.currentLineCap == 2 ? 0 : this.currentLineCap + 1; - this.emitter.emit('show-osd', LineCapNames[this.currentLineCap], null); + this.emitter.emit('show-osd', _(LineCapNames[this.currentLineCap]), null); }, toggleFontWeight: function() { @@ -472,7 +472,7 @@ var DrawingArea = new Lang.Class({ this.currentElement.font.weight = this.currentFontWeight; this._redisplay(); } - this.emitter.emit('show-osd', `${FontWeightNames[this.currentFontWeight]}`, null); + this.emitter.emit('show-osd', `${_(FontWeightNames[this.currentFontWeight])}`, null); }, toggleFontStyle: function() { @@ -481,7 +481,7 @@ var DrawingArea = new Lang.Class({ this.currentElement.font.style = this.currentFontStyle; this._redisplay(); } - this.emitter.emit('show-osd', `${FontStyleNames[this.currentFontStyle]}`, null); + this.emitter.emit('show-osd', `${_(FontStyleNames[this.currentFontStyle])}`, null); }, toggleFontFamily: function() { @@ -491,7 +491,7 @@ var DrawingArea = new Lang.Class({ this.currentElement.font.family = currentFontFamily; this._redisplay(); } - this.emitter.emit('show-osd', `${currentFontFamily}`, null); + this.emitter.emit('show-osd', `${_(currentFontFamily)}`, null); }, toggleHelp: function() { @@ -1075,6 +1075,7 @@ var DrawingMenu = new Lang.Class({ this._addSwitchItem(lineSection, _("Dashed"), dashedLineIcon, this.area, 'dashedLine'); this._addSeparator(lineSection); this.menu.addMenuItem(lineSection); + lineSection.itemActivated = () => {}; this.lineSection = lineSection; let fontSection = new PopupMenu.PopupMenuSection(); @@ -1140,7 +1141,7 @@ var DrawingMenu = new Lang.Class({ _addSliderItem: function(menu, target, targetProperty) { let item = new PopupMenu.PopupBaseMenuItem({ activate: false }); - let label = new St.Label({ text: target[targetProperty] + " px", style_class: 'draw-on-your-screen-menu-slider-label' }); + let label = new St.Label({ text: target[targetProperty] + " " + _("px"), style_class: 'draw-on-your-screen-menu-slider-label' }); let slider = new Slider.Slider(target[targetProperty] / 50); slider.connect('value-changed', (slider, value, property) => { diff --git a/locale/draw-on-your-screen.pot b/locale/draw-on-your-screen.pot index 5a5fee2..eb1d9ae 100644 --- a/locale/draw-on-your-screen.pot +++ b/locale/draw-on-your-screen.pot @@ -309,3 +309,51 @@ msgid "" msgstr "" +# The following words refer to SVG attributes. +# You have the choice to translate or not + +#msgid "Butt" +#msgstr "" + +#msgid "Round" +#msgstr "" + +#msgid "Square" +#msgstr "" + +#msgid "Miter" +#msgstr "" + +#msgid "Bevel" +#msgstr "" + +#msgid "Normal" +#msgstr "" + +#msgid "Bold" +#msgstr "" + +#msgid "Italic" +#msgstr "" + +#msgid "Oblique" +#msgstr "" + +#msgid "Sans-Serif" +#msgstr "" + +#msgid "Serif" +#msgstr "" + +#msgid "Monospace" +#msgstr "" + +#msgid "Cursive" +#msgstr "" + +#msgid "Fantasy" +#msgstr "" + +#msgid "px" +#msgstr "" +