Merge lp:~mc-return/unity/unity.merge-fix-typos into lp:unity

[MC Return]

Fixed several minor typos

Fixes several minor typos

[lp:~mc-return/unity/unity.merge-fix-typos]

2482. By MC Return on 2012-07-09

Fixed wording and typos

2483. By MC Return on 2012-07-09

Fixed more typos

2484. By MC Return on 2012-07-12

Rebased to latest lp:unity

[Tim Penhey (thumper)]

Thanks for this.

Just one point:

s/the objects destruction/the object's destruction/

review: Needs Fixing

[lp:~mc-return/unity/unity.merge-fix-typos]

2485. By MC Return on 2012-07-23

Rebased on latest lp:unity

2486. By MC Return on 2012-07-23

Fixed 'the objects destruction' -> 'the object's destruction' typo

2487. By MC Return on 2012-07-24

Fixed typo in all instances of UBUS_LAUNCHER_START_KEY_SWTICHER

2488. By MC Return on 2012-07-24

Rebased on latest lp:unity

2489. By MC Return on 2012-08-14

Hopefully fixed remaining UBUS_LAUNCHER_END_KEY_SWTICHER -> UBUS_LAUNCHER_END_KEY_SWITCHER typos

2490. By MC Return on 2012-08-15

Merged latest lp:unity

2491. By MC Return on 2012-08-17

Merged lp:unity

Unmerged revisions

=== modified file 'plugins/unityshell/src/nux-area-accessible.cpp'
--- plugins/unityshell/src/nux-area-accessible.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/nux-area-accessible.cpp	2012-07-23 08:18:21 +0000
@@ -26,26 +26,26 @@
  * nux::Area, exposing the common elements on each basic individual
  * element (position, extents, etc)
  *
- * In this object is also implemented the main support for the focused
- * object. This is complex due several reasons:
- *
- *  * We need to ensure the proper order when the objects gets the focus
- *
- * * It doesn't make too sense to give the focus to an object that it
- *    is inside a inactive window, so it is also convenient to emit
+ * In this object the main support for the focused object is also
+ * implemented. This is complex due to several reasons:
+ *
+ *  * We need to ensure the proper order when the objects get the focus
+ *
+ * * It doesn't make sense to give the focus to an object that is
+ *    inside an inactive window too, so it is also convenient to emit
  *    the window:active event before the focus change.
  *
- * => this is the reason there is implemented a system to delay the
- *    focus notification until the top level window became active
+ * => this is the reason why there is a system to delay the focus
+ *    notification, until the top level window becomes active, implemented
  *
  * * But the main complexity comes from the fact that not all the
- *   objects on unity are implementing key nav in the same way.
- *
- *     * Launcher uses exclusively InputArea methods like
- *       SetKeyboardFocus, OnStartKeyboardReceiver, etc. This is the
- *       key focus at a low level abstraction
- *
- *     * Dash objects uses the events from Focusable. But in the same
+ *   objects of Unity are implementing key nav the same way.
+ *
+ *     * The Launcher uses InputArea methods like
+ *       SetKeyboardFocus, OnStartKeyboardReceiver, etc exclusively.
+ *       This is the key focus at a low level abstraction
+ *
+ *     * Dash objects use the events from Focusable. But in the same
  *       way, they require the low level key focus (OnStartFocus) and
  *       so on
  *
@@ -179,10 +179,10 @@
   atk_component_add_focus_handler(ATK_COMPONENT(accessible),
                                   nux_area_accessible_focus_handler);
 
-  /* NOTE: we can't search for the parent window on initilization as a
-     general rule, or we could enter on a infinite loop. At area this
+  /* NOTE: we can't search for the parent window on initialization as a
+     general rule, or we could enter an infinite loop. At area this
      is done on the focus event. On the Switcher this is done on their
-     initialize itself */
+     initialization itself */
 }
 
 static AtkObject*
@@ -210,7 +210,7 @@
 }
 
 /*
- * Checks if the parent actor, and his parent, etc is all visible
+ * Checks if the parent actor, and his parent, etc are all visible
  * Used to check the showing state
  */
 static gboolean
@@ -349,7 +349,7 @@
 
   //area = dynamic_cast<nux::Area*>(nux_object);
 
-  /* FIXME: SetFocused doesn't return if the force was succesful or
+  /* FIXME: SetFocused doesn't return if the force was successful or
      not, we suppose that this is the case like in cally and gail */
 
   return TRUE;
@@ -494,7 +494,7 @@
  * This method checks if there is any pending notification, and emits
  * it if it is possible
  *
- * Returns: TRUE if a atk notification was emitted, FALSE otherwise
+ * Returns: TRUE if an atk notification was emitted, FALSE otherwise
  */
 gboolean
 nux_area_accessible_check_pending_notification(NuxAreaAccessible* self)
@@ -582,7 +582,7 @@
 {
   g_return_val_if_fail(NUX_IS_AREA_ACCESSIBLE(self), NULL);
 
-  /* Ensures that at least whe made a search for it */
+  /* At least ensure that we made a search for it */
   check_parent_window_connected(self);
 
   return self->priv->parent_window;

=== modified file 'plugins/unityshell/src/nux-area-accessible.h'
--- plugins/unityshell/src/nux-area-accessible.h	2011-09-22 13:08:52 +0000
+++ plugins/unityshell/src/nux-area-accessible.h	2012-07-23 08:18:21 +0000
@@ -49,9 +49,9 @@
   NuxObjectAccessibleClass parent_class;
 
   /*
-   * Usually objects shouldn emit events like focus or selection
+   * Usually objects shouldn't emit events like focus or selection
    * changes until the toplevel window is active. This method is
-   * called when the toplevel window became active. Redefine it if you
+   * called when the toplevel window becomes active. Redefine it if you
    * need to check any pending state change notification.
    */
   gboolean(*check_pending_notification)(NuxAreaAccessible* self);

=== modified file 'plugins/unityshell/src/nux-base-window-accessible.cpp'
--- plugins/unityshell/src/nux-base-window-accessible.cpp	2011-09-22 18:54:58 +0000
+++ plugins/unityshell/src/nux-base-window-accessible.cpp	2012-07-23 08:18:21 +0000
@@ -26,11 +26,11 @@
  *  * Expose the child of BaseWindow (the layout)
  *  * Window event notification (activate, deactivate, and so on)
  *
- * BTW: we consider that one window is active if it has directly the
- * keyboard focus, or if one of his child has the keyboard focus (ie:
+ * BTW: we consider that one window is active, if it directly has
+ * keyboard focus, or if one of its children has keyboard focus (ie:
  * the Launcher via GrabKeyboardFocus)
  *
- * HasKeyboardFocus is not a reliable to check that:
+ * HasKeyboardFocus is not reliable to check that:
  *  see bug https://bugs.launchpad.net/nux/+bug/745049
  *
  * So we need to update the state of the objects using the information
@@ -147,7 +147,7 @@
 
   atk_state_set_add_state(state_set, ATK_STATE_FOCUSABLE);
 
-  /* HasKeyboardFocus is not a reliable here:
+  /* HasKeyboardFocus is not reliable here:
      see bug https://bugs.launchpad.net/nux/+bug/745049 */
   if (self->priv->active)
   {
@@ -162,7 +162,7 @@
 static void
 atk_window_interface_init(AtkWindowIface* iface)
 {
-  /* AtkWindow just define signals at this moment */
+  /* AtkWindow just defines signals at this moment */
 }
 
 /* public */

=== modified file 'plugins/unityshell/src/nux-layout-accessible.cpp'
--- plugins/unityshell/src/nux-layout-accessible.cpp	2011-08-01 17:08:48 +0000
+++ plugins/unityshell/src/nux-layout-accessible.cpp	2012-07-23 08:18:21 +0000
@@ -24,7 +24,7 @@
  *
  * #NuxLayoutAccessible implements the required ATK interfaces of
  * nux::Layout, implementing the container related methods on
- * AtkObject, in order to expose his objects
+ * AtkObject, in order to expose its objects
  *
  */
 

=== modified file 'plugins/unityshell/src/nux-object-accessible.cpp'
--- plugins/unityshell/src/nux-object-accessible.cpp	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/nux-object-accessible.cpp	2012-07-23 08:18:21 +0000
@@ -23,7 +23,7 @@
  * @see_also: nux::Object
  *
  * #NuxObjectAccessible implements the required ATK interfaces of
- * nux::Object, exposing the common elements on each basic individual
+ * nux::Object, exposing the common elements of each basic individual
  * element (position, extents, etc)
  *
  */
@@ -129,11 +129,11 @@
 /**
  * nux_object_accessible_get_object:
  *
- * Returns the nux::Object this object is providing accessibility support.
+ * Returns the nux::Object this object is providing accessibility support for.
  *
  * Note that there isn't a _set method. This is because setting that
- * should only be done during initilization, and it doesn't make sense
- * to change that during the life of the object.
+ * should only be done during initialization, and it doesn't make sense
+ * to change that during the lifetime of the object.
  *
  */
 nux::Object*

=== modified file 'plugins/unityshell/src/nux-view-accessible.cpp'
--- plugins/unityshell/src/nux-view-accessible.cpp	2011-09-22 13:08:52 +0000
+++ plugins/unityshell/src/nux-view-accessible.cpp	2012-07-23 08:18:21 +0000
@@ -165,7 +165,7 @@
   if (nux_object == NULL) /* defunct */
     return state_set;
 
-  /* HasKeyboardFocus is not a reliable here:
+  /* HasKeyboardFocus is not reliable here:
      see bug https://bugs.launchpad.net/nux/+bug/745049 */
   if (self->priv->key_focused)
     atk_state_set_add_state(state_set, ATK_STATE_FOCUSED);
@@ -262,7 +262,7 @@
   {
     self->priv->key_focused = focus_in;
 
-    /* we always led the focus notification to
+    /* we always lead the focus notification to
        _check_pending_notification, in order to allow the proper
        window_activate -> focus_change order */
     self->priv->pending_notification = TRUE;
@@ -275,7 +275,7 @@
   NuxViewAccessible* self = NULL;
   nux::Object* nux_object = NULL;
 
-  /* We also call parent implementation, as we are not totally
+  /* We also call the parent implementation, as we are not totally
      overriding check_pending_notification, just adding extra
      functionality*/
   NUX_AREA_ACCESSIBLE_CLASS(nux_view_accessible_parent_class)->check_pending_notification(area_accessible);

=== modified file 'plugins/unityshell/src/unitya11y.cpp'
--- plugins/unityshell/src/unitya11y.cpp	2012-05-17 19:34:56 +0000
+++ plugins/unityshell/src/unitya11y.cpp	2012-07-23 08:18:21 +0000
@@ -82,7 +82,7 @@
   g_type_class_unref(g_type_class_ref(UNITY_TYPE_UTIL_ACCESSIBLE));
 }
 
-/* This method is required because g_setting_new abort if the schema
+/* This method is required because g_setting_new aborts if the schema
    is not present. */
 static gboolean
 has_gsettings_schema(const gchar* schema)
@@ -224,17 +224,17 @@
 
   g_free(bridge_path);
 
-// NOTE: we run manually the unit tests while developing by
-// uncommenting this. Take a look to the explanation on
+// NOTE: we run the unit tests manually while developing by
+// uncommenting this. Take a look at the explanation in the
 // unitya11ytests.h header for more information
 
 //  unity_run_a11y_unit_tests ();
 }
 
 /*
- * Finalize the related issues related with the accessibility.
+ * Finalize the issues related with accessibility.
  *
- * It mainly clean the resources related with the accessibility
+ * It mainly cleans the resources related with accessibility
  */
 void
 unity_a11y_finalize(void)
@@ -259,9 +259,9 @@
  * that would be add a ->get_accessible method on the nux::View
  * subclasses itself.
  *
- * WARNING: as a reason the previous comment it is true. Take into
- * account that you should be careful with the order you add those
- * defines. The order will be from more specific classes to more
+ * WARNING: as a reason the previous comment is true. Take into
+ * account that you should be careful with the order in which you add
+ * those defines. The order will be from more specific classes to more
  * abstracted classes.
  *
  */
@@ -327,7 +327,7 @@
                      AtkObject* accessible_object)
 {
   /* NOTE: the pair key:value (base_object:accessible_object) could be
-     already removed on on_accessible_destroy_cb. That just mean that
+     already removed on on_accessible_destroy_cb. That just means that
      g_hash_table_remove would return FALSE. We don't add a
      debug/warning message to avoid being too verbose */
 
@@ -339,7 +339,7 @@
                          GObject* where_the_object_was)
 {
   /* NOTE: the pair key:value (base_object:accessible_object) could be
-     already removed on on_object_destroy_cb. That just mean that
+     already removed on on_object_destroy_cb. That just means that
      g_hash_table_remove would return FALSE. We don't add a
      debug/warning message to avoid being too verbose */
 
@@ -350,9 +350,9 @@
  * Returns the accessible object of a nux::View object
  *
  * This method tries to:
- *   * Check if area has already a accessibility object
- *   * If this is the case, returns that
- *   * If not, creates it and return the object
+ *   * Check if area already has a accessibility object
+ *   * If this is the case, return that
+ *   * If not, create it and return the object
  *
  * FIXME: this should be a temporal method. The best way to implement
  * that would be add a ->get_accessible method on the nux::View
@@ -379,7 +379,7 @@
     g_hash_table_insert(accessible_table, object, accessible_object);
 
     /* there are two reasons the object should be removed from the
-     * table: base object destroyed, or accessible object
+     * table: base object destroyed or accessible object
      * destroyed
      */
     g_object_weak_ref(G_OBJECT(accessible_object),

=== modified file 'plugins/unityshell/src/unitya11ytests.cpp'
--- plugins/unityshell/src/unitya11ytests.cpp	2012-07-12 19:01:51 +0000
+++ plugins/unityshell/src/unitya11ytests.cpp	2012-07-23 08:18:21 +0000
@@ -48,7 +48,7 @@
  * This unit test checks if the destroy management is working:
  *
  * - If the state of a accessibility object is properly updated after
- *   the object destruction
+ *   the object's destruction
  *
  */
 static gboolean

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-07-16 11:28:24 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-07-23 08:18:21 +0000
@@ -344,13 +344,13 @@
      ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV,
                    sigc::mem_fun(this, &UnityScreen::OnLauncherStartKeyNav));
 
-     ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWTICHER,
+     ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWITCHER,
                    sigc::mem_fun(this, &UnityScreen::OnLauncherStartKeyNav));
 
      ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_NAV,
                    sigc::mem_fun(this, &UnityScreen::OnLauncherEndKeyNav));
 
-     ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWTICHER,
+     ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWITCHER,
                    sigc::mem_fun(this, &UnityScreen::OnLauncherEndKeyNav));
 
      ubus_manager_.RegisterInterest(UBUS_SWITCHER_START,
@@ -2319,7 +2319,7 @@
   auto id = value->id();
 
   // iterate loop by hand rather than use std::find as this is considerably faster
-  // we care about performance here becuase of the high frequency in which this function is
+  // we care about performance here because of the high frequency in which this function is
   // called (nearly every frame)
   unsigned int size = xwns.size();
   for (unsigned int i = 0; i < size; ++i)

=== modified file 'shortcuts/StandaloneShortcuts.cpp'
--- shortcuts/StandaloneShortcuts.cpp	2012-05-07 22:28:17 +0000
+++ shortcuts/StandaloneShortcuts.cpp	2012-07-23 08:18:21 +0000
@@ -65,7 +65,7 @@
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Switch between applications."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_forward")));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Switch windows of current application."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_next_window")));
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Close window switch, return to app switch."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_detail_stop")));
-  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Moves the foucs."), shortcut::HARDCODED_OPTION, _("Cursor Left & Right"))));
+  hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Moves the focus."), shortcut::HARDCODED_OPTION, _("Cursor Left & Right"))));
 
   // Workspaces
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Workspaces"), "", "", _("Spread workspaces."), shortcut::COMPIZ_KEY_OPTION, "expo", "expo_key")));