index 4f8e2459aa1554dd645733e79bf14b307dcb33a4..bd84030543fb2a6a62b45046a16fe464c1d28613 100644 (file)
#include "sp-flowtext.h"
#include "sp-use.h"
#include "sp-rect.h"
+#include "box3d.h"
#include "sp-ellipse.h"
#include "sp-star.h"
#include "sp-anchor.h"
type2term(GType type)
{
if (type == SP_TYPE_ANCHOR)
- { return _("Link"); }
+ // TRANSLATORS: only translate and put "Link" in the translation. It means internet link (anchor)
+ { return Q_("web|Link"); }
if (type == SP_TYPE_CIRCLE)
{ return _("Circle"); }
if (type == SP_TYPE_ELLIPSE)
{ return _("Polyline"); }
if (type == SP_TYPE_RECT)
{ return _("Rectangle"); }
+ if (type == SP_TYPE_BOX3D)
+ { return _("3D Box"); }
if (type == SP_TYPE_TEXT)
{ return _("Text"); }
+ // 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
if (type == SP_TYPE_USE)
- { return _("Clone"); }
+ { return Q_("object|Clone"); }
if (type == SP_TYPE_ARC)
{ return _("Ellipse"); }
if (type == SP_TYPE_OFFSET)
SelectionDescriber::SelectionDescriber(Inkscape::Selection *selection, MessageStack *stack)
: _context(stack)
{
- selection->connectChanged(sigc::mem_fun(*this, &SelectionDescriber::_updateMessageFromSelection));
+ _selection_changed_connection = new sigc::connection (
+ selection->connectChanged(
+ sigc::mem_fun(*this, &SelectionDescriber::_updateMessageFromSelection)));
_updateMessageFromSelection(selection);
}
+SelectionDescriber::~SelectionDescriber()
+{
+ _selection_changed_connection->disconnect();
+ delete _selection_changed_connection;
+}
+
void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *selection) {
GSList const *items = selection->itemList();
@@ -145,10 +159,10 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
else
in_phrase = g_strdup_printf(_(" in group %s (%s)"), parent_name, layer_name);
} else {
- in_phrase = g_strdup_printf(_(" in <b>%i</b> parents (%s)"), num_parents, layer_name);
+ in_phrase = g_strdup_printf(ngettext(" in <b>%i</b> parents (%s)", " in <b>%i</b> parents (%s)", num_parents), num_parents, layer_name);
}
} else {
- in_phrase = g_strdup_printf(_(" in <b>%i</b> layers"), num_layers);
+ in_phrase = g_strdup_printf(ngettext(" in <b>%i</b> layers", " in <b>%i</b> layers", num_layers), num_layers);
}
g_free (layer_name);
g_free (parent_name);
@@ -181,27 +195,27 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
if (n_terms == 0) {
objects_str = g_strdup_printf (
// this is only used with 2 or more objects
- ngettext("", "<b>%i</b> objects selected", object_count),
+ ngettext("<b>%i</b> object selected", "<b>%i</b> objects selected", object_count),
object_count);
} else if (n_terms == 1) {
objects_str = g_strdup_printf (
// this is only used with 2 or more objects
- ngettext("", "<b>%i</b> objects of type <b>%s</b>", object_count),
+ ngettext("<b>%i</b> object of type <b>%s</b>", "<b>%i</b> objects of type <b>%s</b>", object_count),
object_count, (gchar *) terms->data);
} else if (n_terms == 2) {
objects_str = g_strdup_printf (
// this is only used with 2 or more objects
- ngettext("", "<b>%i</b> objects of types <b>%s</b>, <b>%s</b>", object_count),
+ ngettext("<b>%i</b> object of types <b>%s</b>, <b>%s</b>", "<b>%i</b> objects of types <b>%s</b>, <b>%s</b>", object_count),
object_count, (gchar *) terms->data, (gchar *) terms->next->data);
} else if (n_terms == 3) {
objects_str = g_strdup_printf (
// this is only used with 2 or more objects
- ngettext("", "<b>%i</b> objects of types <b>%s</b>, <b>%s</b>, <b>%s</b>", object_count),
+ ngettext("<b>%i</b> object of types <b>%s</b>, <b>%s</b>, <b>%s</b>", "<b>%i</b> objects of types <b>%s</b>, <b>%s</b>, <b>%s</b>", object_count),
object_count, (gchar *) terms->data, (gchar *) terms->next->data, (gchar *) terms->next->next->data);
} else {
objects_str = g_strdup_printf (
// this is only used with 2 or more objects
- ngettext("", "<b>%i</b> objects of <b>%i</b> types", object_count),
+ ngettext("<b>%i</b> object of <b>%i</b> types", "<b>%i</b> objects of <b>%i</b> types", object_count),
object_count, n_terms);
}
g_slist_free (terms);