[folks] Bug 658161 â Consistently use âcontactâ in translatable strings

[Philip Withnall <pwithnall src gnome org>]

commit a07b8e0ed7d259455b35ff7f4cb819696cf8fa49
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Sep 17 12:27:10 2011 +0100

    Bug 658161 â Consistently use âcontactâ in translatable strings
    
    Use âcontactâ and âTelepathy contactâ where appropriate instead of âpersonaâ,
    to try and reduce the amount of technical vocabulary in the translatable
    strings.
    
    Closes: bgo#658161

 NEWS                                          |    2 +
 backends/telepathy/lib/tpf-persona-store.vala |   76 +++++++++++++------------
 tools/import-pidgin.vala                      |    6 +-
 tools/import.vala                             |    3 +-
 4 files changed, 46 insertions(+), 41 deletions(-)
---
diff --git a/NEWS b/NEWS
index 70074fc..dcdc62e 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ Bugs fixed:
   as appropriate
 * Bug 646847 â We should rename _update () in Trf.Persona to something more less
   misleading
+* Bug 658161 â Consistently use âcontactâ in translatable strings instead of
+  âpersonaâ
 
 API changes:
 * Individual.avatar is now settable using Individual.change_avatar() (not new
diff --git a/backends/telepathy/lib/tpf-persona-store.vala b/backends/telepathy/lib/tpf-persona-store.vala
index 5f32e37..691dfc1 100644
--- a/backends/telepathy/lib/tpf-persona-store.vala
+++ b/backends/telepathy/lib/tpf-persona-store.vala
@@ -693,7 +693,8 @@ public class Tpf.PersonaStore : Folks.PersonaStore
                     this._handle_persona_map.size > 1)))
             {
               /* Translators: the parameter is an identifier. */
-              warning (_("Unknown persona '%s' in favorites list."), ids[i]);
+              warning (_("Unknown Telepathy contact â%sâ in favorites list."),
+                  ids[i]);
               continue;
             }
 
@@ -1127,16 +1128,16 @@ public class Tpf.PersonaStore : Folks.PersonaStore
                     {
                       /* Translators: the parameter is a persona identifier and
                        * the second parameter is a group name. */
-                      warning (_("Failed to add persona '%s' to group '%s'."),
-                          persona.uid, group);
+                      warning (_("Failed to add Telepathy contact â%sâ to group â%sâ."),
+                          persona.contact.identifier, group);
                     }
                   else
                     {
                       warning (
                           /* Translators: the parameter is a persona identifier
                            * and the second parameter is a group name. */
-                          _("Failed to remove persona '%s' from group '%s'."),
-                          persona.uid, group);
+                          _("Failed to remove Telepathy contact â%sâ from group â%sâ."),
+                          persona.contact.identifier, group);
                     }
                 }
             }
@@ -1489,7 +1490,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
           tp_persona.is_in_contact_list == false)
         {
           throw new PersonaStoreError.UNSUPPORTED_ON_USER (
-              _("Personas representing the local user may not be removed."));
+              _("Telepathy contacts representing the local user may not be removed."));
         }
 
       try
@@ -1500,12 +1501,11 @@ public class Tpf.PersonaStore : Folks.PersonaStore
       catch (GLib.Error e1)
         {
           warning (
-              /* Translators: The first parameter is an identifier, the second
-               * is the persona's alias and the third is an error message.
-               * "stored" is the name of a program object, and shouldn't be
-               * translated. */
-              _("Failed to remove persona '%s' (%s) from 'stored' list: %s"),
-              tp_persona.uid, tp_persona.alias, e1.message);
+              /* Translators: The first parameter is a contact identifier, the
+               * second is a contact list identifier and the third is an error
+               * message. */
+              _("Failed to remove Telepathy contact â%sâ from â%sâ list: %s"),
+              tp_persona.contact.identifier, "stored", e1.message);
         }
 
       try
@@ -1516,12 +1516,11 @@ public class Tpf.PersonaStore : Folks.PersonaStore
       catch (GLib.Error e2)
         {
           warning (
-              /* Translators: The first parameter is an identifier, the second
-               * is the persona's alias and the third is an error message.
-               * "subscribe" is the name of a program object, and shouldn't be
-               * translated. */
-              _("Failed to remove persona '%s' (%s) from 'subscribe' list: %s"),
-              tp_persona.uid, tp_persona.alias, e2.message);
+              /* Translators: The first parameter is a contact identifier, the
+               * second is a contact list identifier and the third is an error
+               * message. */
+              _("Failed to remove Telepathy contact â%sâ from â%sâ list: %s"),
+              tp_persona.contact.identifier, "subscribe", e2.message);
         }
 
       try
@@ -1532,12 +1531,11 @@ public class Tpf.PersonaStore : Folks.PersonaStore
       catch (GLib.Error e3)
         {
           warning (
-              /* Translators: The first parameter is an identifier, the second
-               * is the persona's alias and the third is an error message.
-               * "publish" is the name of a program object, and shouldn't be
-               * translated. */
-              _("Failed to remove persona '%s' (%s) from 'publish' list: %s"),
-              tp_persona.uid, tp_persona.alias, e3.message);
+              /* Translators: The first parameter is a contact identifier, the
+               * second is a contact list identifier and the third is an error
+               * message. */
+              _("Failed to remove Telepathy contact â%sâ from â%sâ list: %s"),
+              tp_persona.contact.identifier, "publish", e3.message);
         }
 
       /* the contact will be actually removed (and signaled) when we hear back
@@ -1697,20 +1695,22 @@ public class Tpf.PersonaStore : Folks.PersonaStore
           if (is_member == true)
             {
               warning (
-                  /* Translators: the first parameter is a persona identifier,
-                   * the second is a contact list identifier and the third is
-                   * an error message. */
-                  _("Failed to add persona '%s' to contact list '%s': %s"),
-                  persona.uid, channel.get_identifier (), e.message);
+                  /* Translators: The first parameter is a contact identifier,
+                   * the second is a contact list identifier and the third is an
+                   * error message. */
+                  _("Failed to add Telepathy contact â%sâ to â%sâ list: %s"),
+                  tp_persona.contact.identifier, channel.get_identifier (),
+                  e.message);
             }
           else
             {
               warning (
-                  /* Translators: the first parameter is a persona identifier,
-                   * the second is a contact list identifier and the third is
-                   * an error message. */
-                  _("Failed to remove persona '%s' from contact list '%s': %s"),
-                  persona.uid, channel.get_identifier (), e.message);
+                  /* Translators: The first parameter is a contact identifier,
+                   * the second is a contact list identifier and the third is an
+                   * error message. */
+                  _("Failed to remove Telepathy contact â%sâ from â%sâ list: %s"),
+                  tp_persona.contact.identifier, channel.get_identifier (),
+                  e.message);
             }
         }
     }
@@ -1810,7 +1810,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
           warning (
               /* Translators: the first parameter is a channel identifier and
                * the second is an error message.. */
-              _("Failed to create personas from incoming contacts in channel '%s': %s"),
+              _("Failed to create incoming Telepathy contacts from channel â%sâ: %s"),
               channel.get_identifier (), e.message);
         }
     }
@@ -2006,7 +2006,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
           this._conn == null)
         {
           throw new PersonaStoreError.STORE_OFFLINE (
-              _("Cannot create a new persona while offline."));
+              _("Cannot create a new Telepathy contact while offline."));
         }
 
       var contact_ids = new string[1];
@@ -2106,7 +2106,9 @@ public class Tpf.PersonaStore : Folks.PersonaStore
       catch (GLib.Error e)
         {
           throw new PropertyError.UNKNOWN_ERROR (
-              _("Failed to change a persona's favorite status."));
+              /* Translators: the parameter is a contact identifier. */
+              _("Failed to change favorite status for Telepathy contact â%sâ."),
+              ((Tpf.Persona) persona).contact.identifier);
         }
     }
 
diff --git a/tools/import-pidgin.vala b/tools/import-pidgin.vala
index 97978f4..061e7b8 100644
--- a/tools/import-pidgin.vala
+++ b/tools/import-pidgin.vala
@@ -160,7 +160,7 @@ public class Folks.Importers.Pidgin : Folks.Importer
               stderr.printf (
                   /* Translators: the first parameter is a persona identifier,
                    * and the second is an error message. */
-                  _("Error changing group of Pidgin.Persona '%s': %s\n"),
+                  _("Error changing group of contact â%sâ: %s") + "\n",
                   persona.iid, e.message);
             }
         }
@@ -240,7 +240,7 @@ public class Folks.Importers.Pidgin : Folks.Importer
            * of IM addresses each on a new line, and the third is an error
            * message. */
           stderr.printf (
-              _("Failed to create new persona for buddy with alias '%s' and IM addresses:\n%s\nError: %s\n"),
+              _("Failed to create new contact for buddy with alias â%sâ and IM addresses:\n%s\nError: %s\n"),
               alias, im_address_string, e.message);
           return null;
         }
@@ -254,7 +254,7 @@ public class Folks.Importers.Pidgin : Folks.Importer
           /* Translators: the first parameter is a persona identifier, the
            * second is an alias for the persona, and the third is a set of IM
            * addresses each on a new line. */
-          _("Created persona '%s' for buddy with alias '%s' and IM addresses:\n%s"),
+          _("Created contact â%sâ for buddy with alias â%sâ and IM addresses:\n%s"),
           persona.uid, alias, im_address_string);
       this.persona_count++;
 
diff --git a/tools/import.vala b/tools/import.vala
index d29dc6c..ca53947 100644
--- a/tools/import.vala
+++ b/tools/import.vala
@@ -172,7 +172,8 @@ public class Folks.ImportTool : Object
           catch (ImportError e)
             {
               /* Translators: the parameter is an error message. */
-              stderr.printf (_("Error importing personas: %s\n"), e.message);
+              stderr.printf (_("Error importing contacts: %s") + "\n",
+                  e.message);
               return false;
             }