summaryrefslogtreecommitdiffstats
path: root/src/ui/widget
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-10-06 00:18:46 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-10-06 00:18:46 +0000
commit7d38f876e8a4c5ab60261f61452fa2bf8baf13f3 (patch)
tree8d93f93ef7634ca78637b55edb9de4401669b2bb /src/ui/widget
parentAdd missing file to CMakeLists (diff)
parentRemove unused functions. (diff)
downloadinkscape-7d38f876e8a4c5ab60261f61452fa2bf8baf13f3.tar.gz
inkscape-7d38f876e8a4c5ab60261f61452fa2bf8baf13f3.zip
Update to trunk r13580
(bzr r13341.1.255)
Diffstat (limited to 'src/ui/widget')
-rw-r--r--src/ui/widget/selected-style.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index a0a163286..d3adb6307 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -180,7 +180,11 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
_na[i].show_all();
__na[i] = (_("Nothing selected"));
- _none[i].set_markup (C_("Fill and stroke", "<i>None</i>"));
+ if (i == SS_FILL) {
+ _none[i].set_markup (C_("Fill", "<i>None</i>"));
+ } else {
+ _none[i].set_markup (C_("Stroke", "<i>None</i>"));
+ }
sp_set_font_size_smaller (GTK_WIDGET(_none[i].gobj()));
_none[i].show_all();
__none[i] = (i == SS_FILL)? (C_("Fill and stroke", "No fill")) : (C_("Fill and stroke", "No stroke"));