Bug 631096 — Should not mention "meta contacts" in UI

Change all occurrences of “meta-contacts” in translatable strings to use the
phrase “linked contacts” instead. Closes: bgo#631096

diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 863ce021e31e764f6827592960ad8289ff8d6cd1..138b70db92aa0d55f34f90ba0200b28e67ca171b 100644 (file)
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -1646,8 +1646,12 @@ individual_table_set_up (EmpathyIndividualWidget *self)
             num_personas++;
         }
 
-      message = g_strdup_printf (ngettext ("Meta-contact containing %u contact",
-          "Meta-contact containing %u contacts", num_personas), num_personas);
+      /* Translators: the plurality applies to both instances of the word
+       * "contact" */
+      message = g_strdup_printf (
+          ngettext ("Linked contact containing %u contact",
+              "Linked contacts containing %u contacts", num_personas),
+          num_personas);
       label = gtk_label_new (message);
       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
       g_free (message);

diff --git a/libempathy-gtk/empathy-linking-dialog.c b/libempathy-gtk/empathy-linking-dialog.c
index 323ec4e036f0f7baca25b6db6806eb27707426db..e6d408fb454e7666a265cabbe1ae741168334423 100644 (file)
--- a/libempathy-gtk/empathy-linking-dialog.c
+++ b/libempathy-gtk/empathy-linking-dialog.c
@@ -119,7 +119,7 @@ empathy_linking_dialog_init (EmpathyLinkingDialog *self)
   button = gtk_button_new_with_mnemonic (
       C_("Unlink individual (button)", "_Unlink…"));
   gtk_widget_set_tooltip_text (button, _("Completely split the displayed "
-      "meta-contact into the contacts it contains."));
+      "linked contacts into the separate contacts."));
   gtk_dialog_add_action_widget (dialog, button, RESPONSE_UNLINK);
   gtk_widget_show (button);
 
@@ -179,12 +179,12 @@ linking_response_cb (EmpathyLinkingDialog *self,
 
       /* Show a confirmation dialogue first */
       dialog = gtk_message_dialog_new (GTK_WINDOW (self), GTK_DIALOG_MODAL,
-          GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("Unlink meta-contact '%s'?"),
+          GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+          _("Unlink linked contacts '%s'?"),
           folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)));
       gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-          _("Are you sure you want to unlink this meta-contact? This will "
-            "completely split the meta-contact into the contacts it "
-            "contains."));
+          _("Are you sure you want to unlink these linked contacts? This will "
+            "completely split the linked contacts into separate contacts."));
       gtk_dialog_add_buttons (GTK_DIALOG (dialog),
           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
           C_("Unlink individual (button)", "_Unlink"), GTK_RESPONSE_OK,