GNOME.org
 

[folks] all: Fix various typos and incorrect terminology

commit d4022286253c4fe9b1e1bd4ca5cf01eee1adcbc0
Author: Philip Withnall <withnall endlessm com>
Date:   Thu Jun 18 13:41:21 2020 +0100

    all: Fix various typos and incorrect terminology
    
    Done using:
    ```
    codespell \
        --builtin clear,rare,usage \
        --skip './po/*' --skip './.git/*' --skip './NEWS*' \
        --write-changes .
    ```
    and then some manual checking and editing.
    
    Signed-off-by: Philip Withnall <withnall endlessm com>

 README.md                                       | 2 +-
 backends/eds/lib/edsf-persona.vala              | 4 ++--
 backends/tracker/lib/trf-persona-store.vala     | 8 ++++----
 folks/backend-store.vala                        | 2 +-
 folks/individual-aggregator.vala                | 2 +-
 folks/potential-match.vala                      | 4 ++--
 folks/utils.vala                                | 2 +-
 tests/eds/set-properties-race.vala              | 2 +-
 tests/lib/bluez/test-case.vala                  | 2 +-
 tests/lib/telepathy/contactlist/backend.c       | 4 ++--
 tests/lib/telepathy/contactlist/textchan-null.c | 2 +-
 tests/telepathy/individual-retrieval.vala       | 4 ++--
 tests/tools/manager-file.py                     | 2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/README.md b/README.md
index 5b0bdd6f..9c3180ab 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ separate translation infrastructure instead. More info can be found at the
 ## More information
 libfolks has its own web page on https://wiki.gnome.org/Projects/Folks.
 
-The latest version of the documentation is alo published online by our CI to
+The latest version of the documentation is also published online by our CI to
 the GitLab Pages of our repository. You can find the documentation for both the
 [Vala API] as well as the [C API].
 
diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala
index 563dbcee..7c467a04 100644
--- a/backends/eds/lib/edsf-persona.vala
+++ b/backends/eds/lib/edsf-persona.vala
@@ -712,7 +712,7 @@ public class Edsf.Persona : Folks.Persona,
    * the localized version of those groups, and may change the value of
    * {@link Edsf.Persona.in_google_personal_group}.
    *
-   * Attempting to call this method on a persona beloging to a PersonaStore which
+   * Attempting to call this method on a persona belonging to a PersonaStore which
    * is not Google will throw a PropertyError.
    *
    * It's preferred to call this rather than setting {@link Persona.system_groups}
@@ -2027,7 +2027,7 @@ public class Edsf.Persona : Folks.Persona,
           new_phone_numbers.add (phone_fd);
         }
 
-      // Does not use phone comparation because this will try to match only
+      // Does not use phone comparison because this will try to match only
       // numbers and will remove the prefix, and that could cause a wrong result
       // since the the phone number is stored as string
       if (!Utils.set_string_afd_equal (this._phone_numbers, new_phone_numbers))
diff --git a/backends/tracker/lib/trf-persona-store.vala b/backends/tracker/lib/trf-persona-store.vala
index fc39ea23..9b34c47c 100644
--- a/backends/tracker/lib/trf-persona-store.vala
+++ b/backends/tracker/lib/trf-persona-store.vala
@@ -1065,7 +1065,7 @@ public class Trf.PersonaStore : Folks.PersonaStore
   /**
    * Prepare the PersonaStore for use.
    *
-   * TODO: we should throw different errors dependening on what went wrong
+   * TODO: we should throw different errors depending on what went wrong
    * when we were trying to setup the PersonaStore.
    *
    * See {@link Folks.PersonaStore.prepare}.
@@ -1106,7 +1106,7 @@ public class Trf.PersonaStore : Folks.PersonaStore
 
               /* Don't add a match rule for all signals from Tracker but
                * only for GraphUpdated with the specific class we need. We
-               * don't want to be woken up for irrelevent updates on the
+               * don't want to be woken up for irrelevant updates on the
                * graph.
                */
               this._resources_object = yield GLib.Bus.get_proxy<Resources> (
@@ -2694,11 +2694,11 @@ public class Trf.PersonaStore : Folks.PersonaStore
   /*
    * NOTE:
    *
-   * We asume that the caller is holding a link to the resource,
+   * We assume that the caller is holding a link to the resource,
    * so if _resource_usage_count () == 1 it means no one else
    * (beside the caller) is linking to the resource.
    *
-   * This means that _delete_resource shold be called before
+   * This means that _delete_resource should be called before
    * removing the resources that hold a link to it (which also
    * makes sense from the signaling perspective).
    *
diff --git a/folks/backend-store.vala b/folks/backend-store.vala
index 4d2b3f5a..e3f97177 100644
--- a/folks/backend-store.vala
+++ b/folks/backend-store.vala
@@ -665,7 +665,7 @@ public class Folks.BackendStore : Object {
         {
           var file = dir.get_child (info.get_name ());
 
-          /* Handle symlinks by derefencing them. If we look at two symlinks
+          /* Handle symlinks by dereferencing them. If we look at two symlinks
            * with the same target, we don’t end up loading that backend twice
            * due to hashing the backend’s absolute path in @modules_final.
            *
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index 5e5f386d..df1f58d4 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -2309,7 +2309,7 @@ public class Folks.IndividualAggregator : Object
 
       var key_file_personas = new SmallSet<Persona> ();
 
-      /* Remove personas form the key-file store since they arn't need anymore */
+      /* Remove personas from the key-file store since they aren't need anymore */
       foreach (var p in individual_personas) {
         if (p.store.type_id == "key-file") {
           debug ("Remove linking persona from key-file store");
diff --git a/folks/potential-match.vala b/folks/potential-match.vala
index 9e21407f..3ddf976c 100644
--- a/folks/potential-match.vala
+++ b/folks/potential-match.vala
@@ -379,7 +379,7 @@ public class Folks.PotentialMatch : Object
                     {
                       result = MatchResult.MEDIUM;
                     }
-                  /* So we have splitted the user part of the e-mail
+                  /* So we have split the user part of the e-mail
                    * address into tokens. Lets see if there is some
                    * matches between tokens.
                    * As in: first.middle.last@ ~= [first,middle,..]@  */
@@ -655,7 +655,7 @@ public class Folks.PotentialMatch : Object
     }
 
   /* If haystack contains c in pos return 0, if it contains
-   * it withing the bounds of max_dist return abs(pos-pos_found).
+   * it within the bounds of max_dist return abs(pos-pos_found).
    * If its not found, return -1.
    *
    * pos and max_dist are both in unichars.
diff --git a/folks/utils.vala b/folks/utils.vala
index 81c49786..2339e273 100644
--- a/folks/utils.vala
+++ b/folks/utils.vala
@@ -223,7 +223,7 @@ public class Folks.Utils : Object
    * Check whether a set of AbstractFieldDetails with string values are equal.
    *
    * This performs a deep check for equality, checking whether both sets are of
-   * the same size, and that each set has the same values using string compation
+   * the same size, and that each set has the same values using string compaction
    * instead of AbstractFieldDetails equal function
    *
    * @param a a set to compare
diff --git a/tests/eds/set-properties-race.vala b/tests/eds/set-properties-race.vala
index 68457e7a..0a3737ab 100644
--- a/tests/eds/set-properties-race.vala
+++ b/tests/eds/set-properties-race.vala
@@ -34,7 +34,7 @@ public class SetPropertiesRaceTests : EdsTest.TestCase
     {
       base ("SetPropertiesRace");
 
-      this.add_test ("setting postal addresss on e-d-s persona",
+      this.add_test ("setting postal address on e-d-s persona",
           this.test_set_postal_addresses);
     }
 
diff --git a/tests/lib/bluez/test-case.vala b/tests/lib/bluez/test-case.vala
index d11f7b0d..a931f37d 100644
--- a/tests/lib/bluez/test-case.vala
+++ b/tests/lib/bluez/test-case.vala
@@ -102,7 +102,7 @@ public class BluezTest.TestCase : Folks.TestCase
     {
       this.bluez_backend = new BluezTest.Backend ();
 
-      /* Whitelist any mock BlueZ devices we will create. */
+      /* Allow any mock BlueZ devices we will create. */
       var devices_file_name =
           Path.build_filename (this.transient_dir, ".local", "share", "folks",
               "bluez-persona-stores.ini");
diff --git a/tests/lib/telepathy/contactlist/backend.c b/tests/lib/telepathy/contactlist/backend.c
index 5d7d0c03..ff291dc3 100644
--- a/tests/lib/telepathy/contactlist/backend.c
+++ b/tests/lib/telepathy/contactlist/backend.c
@@ -322,7 +322,7 @@ tp_tests_backend_remove_account (TpTestsBackend *self,
   self->accounts = g_list_remove (self->accounts, handle);
   data = (AccountData *) handle;
 
-  /* Make sure all dbus trafic with account's connection is done */
+  /* Make sure all D-Bus traffic with account's connection is done */
   tp_tests_proxy_run_until_dbus_queue_processed (data->client_conn);
 
   /* Remove the account from the account manager */
@@ -353,7 +353,7 @@ tp_tests_backend_tear_down (TpTestsBackend *self)
       return;
     }
 
-  /* Make sure all dbus trafic with AM is done */
+  /* Make sure all D-Bus traffic with AM is done */
   tp_tests_proxy_run_until_dbus_queue_processed (self->client_am);
   g_clear_object (&self->client_am);
 
diff --git a/tests/lib/telepathy/contactlist/textchan-null.c b/tests/lib/telepathy/contactlist/textchan-null.c
index bbeb0c71..acb60d3d 100644
--- a/tests/lib/telepathy/contactlist/textchan-null.c
+++ b/tests/lib/telepathy/contactlist/textchan-null.c
@@ -202,7 +202,7 @@ set_property (GObject *object,
     case PROP_HANDLE_TYPE:
     case PROP_CHANNEL_TYPE:
       /* these properties are writable in the interface, but not actually
-       * meaningfully changable on this channel, so we do nothing */
+       * meaningfully changeable on this channel, so we do nothing */
       break;
     case PROP_CONNECTION:
       self->priv->conn = g_value_get_object (value);
diff --git a/tests/telepathy/individual-retrieval.vala b/tests/telepathy/individual-retrieval.vala
index ec32fae5..1e63b587 100644
--- a/tests/telepathy/individual-retrieval.vala
+++ b/tests/telepathy/individual-retrieval.vala
@@ -128,7 +128,7 @@ public class IndividualRetrievalTests : TpfTest.TestCase
       var main_loop = new GLib.MainLoop (null, false);
 
       HashSet<string> added_individuals = new HashSet<string> ();
-      added_individuals.add ("master shake example com");
+      added_individuals.add ("mister shake example com");
       added_individuals.add ("2wycked example com");
       added_individuals.add ("carl-brutananadilewski example com");
 
@@ -147,7 +147,7 @@ public class IndividualRetrievalTests : TpfTest.TestCase
               assert (i != null);
 
               /* If the Individual contains a Persona with an ID we provided,
-               * mark it as recieved.
+               * mark it as received.
                * This intentionally avoids assuming that the Individual's ID is
                * necessarily related to the ID of any of its Persona(s) */
               foreach (Folks.Persona p in i.personas)
diff --git a/tests/tools/manager-file.py b/tests/tools/manager-file.py
index d56331f6..31e14997 100755
--- a/tests/tools/manager-file.py
+++ b/tests/tools/manager-file.py
@@ -4,7 +4,7 @@
 # same data (should be suitable for all connection managers that don't have
 # plugins)
 #
-# The master copy of this program is in the telepathy-glib repository -
+# The upstream copy of this program is in the telepathy-glib repository -
 # please make any changes there.
 #
 # Copyright (c) Collabora Ltd. <http://www.collabora.co.uk/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]