summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2012-08-29 23:27:47 +0000
committerJohn Smith <john.smith7545@yahoo.com>2012-08-29 23:27:47 +0000
commitba7bc9962c95a891aab90b5665d813867d72a4c4 (patch)
treefeb8fa67ea8df258e701a9caf5dce09d296fc768 /src
parentFix for 928205 : Preference to not save doc viewport metadata (diff)
downloadinkscape-ba7bc9962c95a891aab90b5665d813867d72a4c4.tar.gz
inkscape-ba7bc9962c95a891aab90b5665d813867d72a4c4.zip
Fix for 980520 : Conflicting accelerator keys
(bzr r11631)
Diffstat (limited to 'src')
-rw-r--r--src/interface.cpp4
-rw-r--r--src/menus-skeleton.h2
-rw-r--r--src/ui/dialog/find.cpp10
-rw-r--r--src/verbs.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/interface.cpp b/src/interface.cpp
index ac624f0e1..4b40d0bdd 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -1811,7 +1811,7 @@ void ContextMenu::MakeItemMenu (void)
select_same_submenu->append(*mi);
/* Create link */
- mi = manage(new Gtk::MenuItem(_("_Create Link"),1));
+ mi = manage(new Gtk::MenuItem(_("Create _Link"),1));
mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ItemCreateLink));
mi->set_sensitive(!SP_IS_ANCHOR(_item));
mi->show();
@@ -1856,7 +1856,7 @@ void ContextMenu::MakeItemMenu (void)
append(*mi);
/* Set Clip */
- mi = manage(new Gtk::MenuItem(_("Set _Clip"),1));
+ mi = manage(new Gtk::MenuItem(_("Set Cl_ip"),1));
mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::SetClip));
if (ClipRefOK || MaskRefOK) {
mi->set_sensitive(FALSE);
diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index 7ea720419..999fb52fc 100644
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -76,7 +76,7 @@ static char const menus_skeleton[] =
" <separator/>\n"
" <verb verb-id=\"EditSelectAll\" />\n"
" <verb verb-id=\"EditSelectAllInAllLayers\" />\n"
-" <submenu name=\"" N_("Selec_t Same") "\">\n"
+" <submenu name=\"" N_("Select Sa_me") "\">\n"
" <verb verb-id=\"EditSelectSameFillStroke\" />\n"
" <verb verb-id=\"EditSelectSameFillColor\" />\n"
" <verb verb-id=\"EditSelectSameStrokeColor\" />\n"
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index ec75304a5..d3ce99b00 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -65,12 +65,12 @@ Find::Find()
: UI::Widget::Panel("", "/dialogs/find", SP_VERB_DIALOG_FIND),
entry_find(_("F_ind:"), _("Find objects by their content or properties (exact or partial match)")),
- entry_replace(_("Re_place:"), _("Replace match with this value")),
+ entry_replace(_("R_eplace:"), _("Replace match with this value")),
check_scope_all(_("_All"), _("Search in all layers")),
check_scope_layer(_("Current _layer"), _("Limit search to the current layer")),
- check_scope_selection(_("S_election"), _("Limit search to the current selection")),
- check_searchin_text(_("Te_xt"), _("Search in text objects")),
+ check_scope_selection(_("Sele_ction"), _("Limit search to the current selection")),
+ check_searchin_text(_("_Text"), _("Search in text objects")),
check_searchin_property(_("_Properties"), _("Search in object properties, styles, attributes and IDs")),
vbox_searchin(0, false),
frame_searchin(_("Search in")),
@@ -85,9 +85,9 @@ Find::Find()
check_ids(_("_ID"), _("Search id name"), true),
check_attributename(_("Attribute _name"), _("Search attribute name"), false),
- check_attributevalue(_("Attribute _value"), _("Search attribute value"), true),
+ check_attributevalue(_("Attri_bute value"), _("Search attribute value"), true),
check_style(_("_Style"), _("Search style"), true),
- check_font(_("_Font"), _("Search fonts"), false),
+ check_font(_("F_ont"), _("Search fonts"), false),
frame_properties(_("Properties")),
check_alltypes(_("All types"), _("Search all object types"), true),
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 2c24ef36a..d02472383 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -2442,7 +2442,7 @@ Verb *Verb::_base_verbs[] = {
// TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize)
new SelectionVerb(SP_VERB_SELECTION_TRACE, "SelectionTrace", N_("_Trace Bitmap..."),
N_("Create one or more paths from a bitmap by tracing it"), INKSCAPE_ICON("bitmap-trace")),
- new SelectionVerb(SP_VERB_SELECTION_CREATE_BITMAP, "SelectionCreateBitmap", N_("_Make a Bitmap Copy"),
+ new SelectionVerb(SP_VERB_SELECTION_CREATE_BITMAP, "SelectionCreateBitmap", N_("Make a _Bitmap Copy"),
N_("Export selection to a bitmap and insert it into document"), INKSCAPE_ICON("selection-make-bitmap-copy") ),
new SelectionVerb(SP_VERB_SELECTION_COMBINE, "SelectionCombine", N_("_Combine"),
N_("Combine several paths into one"), INKSCAPE_ICON("path-combine")),