diff options
| author | Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es> | 2017-11-10 18:57:54 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es> | 2017-11-10 18:57:54 +0000 |
| commit | dc6c4dc337aa2ad766cada2eb06fe4c186a89d14 (patch) | |
| tree | 3fc8d3fd109b7c89751183b8be880e856be5ff34 /src/widgets/text-toolbar.cpp | |
| parent | Merge branch 'master' into powerpencil (diff) | |
| parent | Removing regects (diff) | |
| download | inkscape-dc6c4dc337aa2ad766cada2eb06fe4c186a89d14.tar.gz inkscape-dc6c4dc337aa2ad766cada2eb06fe4c186a89d14.zip | |
Merge branch 'master' into powerpencil
Diffstat (limited to 'src/widgets/text-toolbar.cpp')
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 8c7bec75b..3ca5bf2dc 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1654,7 +1654,7 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ // If unit is set to 'px', use the preferred display unit (if absolute). line_height_unit = prefs->getInt("/tools/text/lineheight/display_unit", SP_CSS_UNIT_PT); - // But not if prefered unit is relative + // But not if preferred unit is relative if (line_height_unit != SP_CSS_UNIT_NONE && line_height_unit != SP_CSS_UNIT_EM && line_height_unit != SP_CSS_UNIT_EX && @@ -2359,7 +2359,7 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje InkSelectOneAction* act = InkSelectOneAction::create( "TextLineSpacingAction", // Name _("Line Spacing Mode"), // Label - _("How should multiple baselines be spaced?\n Adapative: Line spacing adapts to font size.\n Minimum: Like Adaptive but with a set minimum.\n Even: Evenly spaced.\n Adjustable: No restrictions."), // Tooltip + _("How should multiple baselines be spaced?\n Adaptive: Line spacing adapts to font size.\n Minimum: Like Adaptive, but with a set minimum.\n Even: Evenly spaced.\n Adjustable: No restrictions."), // Tooltip "Not Used", // Icon store ); // Tree store act->use_radio( false ); |