diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-09-13 16:49:55 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-09-13 16:49:55 +0000 |
| commit | 5cc64f7a695dbde56a8b1ee3ca57ebd1ff671968 (patch) | |
| tree | 1a67fe228c45674d6fc3753c84c4e66912c8e174 /src | |
| parent | update resources for DMG (draft for new background image); (diff) | |
| parent | i18n. Adding context to the "Group" verb (undo history). (diff) | |
| download | inkscape-5cc64f7a695dbde56a8b1ee3ca57ebd1ff671968.tar.gz inkscape-5cc64f7a695dbde56a8b1ee3ca57ebd1ff671968.zip | |
update to trunk (r13554)
(bzr r13506.1.91)
Diffstat (limited to 'src')
| -rw-r--r-- | src/selection-chemistry.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index 01ce20509..83ae5a954 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -762,7 +762,7 @@ void sp_selection_group(Inkscape::Selection *selection, SPDesktop *desktop) sp_selection_group_impl(p, group, xml_doc, doc); DocumentUndo::done(doc, SP_VERB_SELECTION_GROUP, - _("Group")); + C_("Verb", "Group")); selection->set(group); Inkscape::GC::release(group); diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 5d065dc60..e04748759 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -2054,7 +2054,8 @@ void InkscapePreferences::on_pagelist_selection_changed() if (!_init) { prefs->setInt("/dialogs/preferences/page", row[_page_list_columns._col_id]); } - _page_title.set_markup("<span size='large'><b>" + row[_page_list_columns._col_name] + "</b></span>"); + Glib::ustring col_name_escaped = Glib::Markup::escape_text( row[_page_list_columns._col_name] ); + _page_title.set_markup("<span size='large'><b>" + col_name_escaped + "</b></span>"); _page_frame.add(*_current_page); _current_page->show(); while (Gtk::Main::events_pending()) |