Correct load order of user icons.svg icons with legacy names.

[inkscape.git] / src / selection-describer.cpp

diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp
index 78cf9be33b537e48f0b3462d7ce5b935ccad77ea..7bc6adf38e454da21c871e2f9f283015919b9d6f 100644 (file)
--- a/src/selection-describer.cpp
+++ b/src/selection-describer.cpp
@@ -4,6 +4,7 @@
  * Authors:
  *   MenTaLguY <mental@rydia.net>
  *   bulia byak <buliabyak@users.sf.net>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2004-2006 Authors
  *
@@ -39,10 +40,8 @@ const gchar *
 type2term(GType type)
 {
     if (type == SP_TYPE_ANCHOR)
-        //TRANSLATORS: only translate "string" in "context|string".
-        // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
-       // "Link" means internet link (anchor)
-        { return Q_("web|Link"); }
+        //TRANSLATORS: "Link" means internet link (anchor)
+        { return C_("Web", "Link"); }
     if (type == SP_TYPE_CIRCLE)
         { return _("Circle"); }
     if (type == SP_TYPE_ELLIPSE)
@@ -68,10 +67,8 @@ type2term(GType type)
     if (type == SP_TYPE_TEXT)
         { return _("Text"); }
     if (type == SP_TYPE_USE)
-        // TRANSLATORS: only translate "string" in "context|string".
-        // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
-        // "Clone" is a noun, type of object
-        { return Q_("object|Clone"); }
+        // TRANSLATORS: "Clone" is a noun, type of object
+        { return C_("Object", "Clone"); }
     if (type == SP_TYPE_ARC)
         { return _("Ellipse"); }
     if (type == SP_TYPE_OFFSET)
@@ -158,7 +155,7 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
 
         // Parent name
         SPObject *parent = SP_OBJECT_PARENT (item);
-        gchar *parent_label = SP_OBJECT_ID(parent);
+        gchar const *parent_label = parent->getId();
         char *quoted_parent_label = xml_quote_strdup(parent_label);
         gchar *parent_name = g_strdup_printf(_("<i>%s</i>"), quoted_parent_label);
         g_free(quoted_parent_label);
@@ -182,7 +179,7 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
         g_free (parent_name);
 
         if (!items->next) { // one item
-            char *item_desc = sp_item_description(item);
+            char *item_desc = item->description();
             if (SP_IS_USE(item) || (SP_IS_OFFSET(item) && SP_OFFSET (item)->sourceHref)) {
                 _context.setF(Inkscape::NORMAL_MESSAGE, "%s%s. %s. %s.",
                               item_desc, in_phrase,
@@ -255,4 +252,4 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :