Attachment 617385 Details for Bug 847816 – Updated patch with more fixes

[patch] Updated patch with more fixes

0001-Fix-typos.patch (text/plain), 9.81 KB, created by Yuri Chornoivan on 2012-09-26 04:48:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Chornoivan

Created: 2012-09-26 04:48:37 UTC

Size: 9.81 KB

patch

obsolete

>From 17b6da934708031f4f94302a0e4658a7004a76a6 Mon Sep 17 00:00:00 2001
>From: Yuri Chornoivan <yurchor@ukr.net>
>Date: Wed, 26 Sep 2012 07:44:06 +0300
>Subject: [PATCH] Fix typos.
>
>---
> doc/report-cli.txt             |    2 +-
> doc/reporter-kerneloops.txt    |    2 +-
> doc/reporter-mailx.txt         |    2 +-
> doc/reporter-upload.txt        |    4 ++--
> src/cli/cli-report.c           |    2 +-
> src/client-python/debuginfo.py |    4 ++--
> src/gtk-helpers/secrets.c      |   22 +++++++++++-----------
> 7 files changed, 19 insertions(+), 19 deletions(-)
>
>diff --git a/doc/report-cli.txt b/doc/report-cli.txt
>index 9e4fc74..414c7e6 100644
>--- a/doc/report-cli.txt
>+++ b/doc/report-cli.txt
>@@ -20,7 +20,7 @@ SYNOPSIS
> DESCRIPTION
> -----------
> 'report-cli' is a command line tool that manages application crashes and other problems
>-catched by abrtd daemon, or created by other programs using libreport.
>+caught by abrtd daemon, or created by other programs using libreport.
> It enables access to, manipulation of problem data, and reporting.
> 
> OPTIONS
>diff --git a/doc/reporter-kerneloops.txt b/doc/reporter-kerneloops.txt
>index f6e361a..57b0983 100644
>--- a/doc/reporter-kerneloops.txt
>+++ b/doc/reporter-kerneloops.txt
>@@ -51,7 +51,7 @@ OPTIONS
>    Path to problem directory.
> 
> -c CONFFILE::
>-   Path to configration file. When used in ABRT event system, the file
>+   Path to configuration file. When used in ABRT event system, the file
>    contains site-wide configuration. Users can change the values via
>    environment variables.
> 
>diff --git a/doc/reporter-mailx.txt b/doc/reporter-mailx.txt
>index 5771c00..f946653 100644
>--- a/doc/reporter-mailx.txt
>+++ b/doc/reporter-mailx.txt
>@@ -62,7 +62,7 @@ OPTIONS
>    Path to problem directory.
> 
> -c CONFFILE::
>-   Path to configration file. When used in ABRT event system, the file
>+   Path to configuration file. When used in ABRT event system, the file
>    contains site-wide configuration. Users can change the values via
>    environment variables.
> 
>diff --git a/doc/reporter-upload.txt b/doc/reporter-upload.txt
>index 436ebae..1464054 100644
>--- a/doc/reporter-upload.txt
>+++ b/doc/reporter-upload.txt
>@@ -27,7 +27,7 @@ The options are:
> Integration with ABRT events
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 'reporter-upload' can be used as a reporter, to allow users to upload
>-compressed tarballs of problem directiories to a configured URL. This usage can be
>+compressed tarballs of problem directories to a configured URL. This usage can be
> configured in /etc/libreport/report_event.conf:
> 
> ------------
>@@ -47,7 +47,7 @@ OPTIONS
>    Path to problem directory.
> 
> -c CONFFILE::
>-   Path to configration file. When used in ABRT event system, the file
>+   Path to configuration file. When used in ABRT event system, the file
>    contains site-wide configuration. Users can change the values via
>    environment variables.
> 
>diff --git a/src/cli/cli-report.c b/src/cli/cli-report.c
>index 2f988fa..f256e25 100644
>--- a/src/cli/cli-report.c
>+++ b/src/cli/cli-report.c
>@@ -1005,7 +1005,7 @@ int run_events_chain(const char *dump_dir_name, GList *chain)
>         {
>             if (config->ec_sending_sensitive_data)
>             {
>-                char *msg = xasprintf(_("Event '%s' requires permision to send possibly sensitive data."
>+                char *msg = xasprintf(_("Event '%s' requires permission to send possibly sensitive data."
>                                         " Do you want to continue?"),
>                             config->screen_name ? config->screen_name : event);
>                 const bool response = ask_yesno(msg);
>diff --git a/src/client-python/debuginfo.py b/src/client-python/debuginfo.py
>index ea8cff1..98dbec6 100644
>--- a/src/client-python/debuginfo.py
>+++ b/src/client-python/debuginfo.py
>@@ -205,12 +205,12 @@ class DebugInfoDownload(YumBase):
>                 setattr(r, "skip_if_unavailable", True)
>                 # yes, we want async download otherwise our progressCallback
>                 # is not called and the interanl yum is used, which cause
>-                # artefacts in output
>+                # artifacts in output
>                 try:
>                     setattr(r, "_async", False)
>                 except Exception, ex:
>                     print ex
>-                    print _("Can't disable async download, the output might contain artefacts!")
>+                    print _("Can't disable async download, the output might contain artifacts!")
>             except Exception, ex:
>                 print _("Can't setup {0}: {1}, disabling").format(r.id, ex)
>                 self.repos.disableRepo(r.id)
>diff --git a/src/gtk-helpers/secrets.c b/src/gtk-helpers/secrets.c
>index 87a957d..5279ac2 100644
>--- a/src/gtk-helpers/secrets.c
>+++ b/src/gtk-helpers/secrets.c
>@@ -153,7 +153,7 @@ static GDBusProxy *get_dbus_proxy(const gchar *path, const gchar *interface)
> 
>     if (error)
>     {
>-        error_msg(_("Can't connect over DBus to name '%s' path '%s'" "interface '%s': %s"),
>+        error_msg(_("Can't connect over DBus to name '%s' path '%s' interface '%s': %s"),
>                     SECRETS_SERVICE_BUS, path, interface, error->message);
>         g_error_free(error);
>         /* proxy is NULL in this case */
>@@ -445,7 +445,7 @@ static bool is_prompt_required(const char *prompt_path)
>  * @param prompt_path An object path pointing to a prompt
>  * @param result A prompt result (can be NULL)
>  * @param dismissed A dismissed flag (can't be NULL)
>- * @return returns TRUE if no errors occured; otherwise false
>+ * @return returns TRUE if no errors occurred; otherwise false
>  */
> static GVariant *secrets_prompt(const char *prompt_path,
>                                 bool *dismissed)
>@@ -658,7 +658,7 @@ static bool secrets_service_find_collection(const char *alias, struct secrets_ob
>     g_variant_unref(prop);
> 
>     /* If coolection is not found no error could occure */
>-    /* If coolection is found and variable is null then error occured */
>+    /* If coolection is found and variable is null then error occurred */
>     return !found || *collection;
> }
> 
>@@ -672,7 +672,7 @@ static bool secrets_service_read_alias(const char *alias, struct secrets_object
>     /* ReadAlias (IN String name, OUT ObjectPath collection); */
>     /*   Get the collection with the given alias. */
>     /*   name       : An alias, such as 'default'. */
>-    /*   collection : The collection or the the path '/' if no such collection exists. */
>+    /*   collection : The collection or the path '/' if no such collection exists. */
>     GVariant *const resp =
>         g_dbus_proxy_call_sync(g_service_object->proxy, "ReadAlias", g_variant_new("(s)", alias),
>                                G_DBUS_PROXY_FLAGS_NONE, SECRETS_CALL_DEFAULT_TIMEOUT,
>@@ -947,7 +947,7 @@ static bool secrets_collection_create_text_item(struct secrets_object *collectio
>             }
> 
>             /* if the error wasn't about invalid properties we have an another problem */
>-            error_msg(_("Can't create an secret item for event '%s': %s"), event_name, error->message);
>+            error_msg(_("Can't create a secret item for event '%s': %s"), event_name, error->message);
>             g_error_free(error);
>             break;
>         }
>@@ -1029,7 +1029,7 @@ static bool secrets_collection_search_one_item(const struct secrets_object *coll
>     g_variant_unref(resp);
> 
>     /* If item is not found no error could occure */
>-    /* If item is found and variable is null then error occured */
>+    /* If item is found and variable is null then error occurred */
>     return !found || *item;
> }
> 
>@@ -1040,7 +1040,7 @@ static bool secrets_collection_search_one_item(const struct secrets_object *coll
> /*
>  * Gets an unlocked default collection if it exists
>  *
>- * Collection is null when error occured or when user dismissed unlocking
>+ * Collection is null when error occurred or when user dismissed unlocking
>  *
>  * @return on error false
>  */
>@@ -1077,7 +1077,7 @@ static bool get_default_collection(struct secrets_object **collection,
> 
>         /* create collection function succeded if a collection is not NULL */
>         /* or if the call was dismissed */
>-        /* if dismissed is false and collection is null then an error occured */
>+        /* if dismissed is false and collection is null then an error occurred */
>         succ = *collection || *dismissed;
>     }
> 
>@@ -1126,7 +1126,7 @@ static void load_event_options_from_item(GDBusProxy *session,
>         if (error)
>         {   /* if the error is NOT the known error produced by the gnome-keyring */
>             /* when no secret value is assigned to an item */
>-            /* then let you user known that the error occured */
>+            /* then let you user known that the error occurred */
>             if(strcmp(GNOME_KEYRING_NOT_HAVING_SECRET_ERROR, g_dbus_error_get_remote_error(error)) != 0)
>                 error_msg(_("can't get secret value: %s"), error->message);
>             else
>@@ -1313,7 +1313,7 @@ static void save_event_config(const char *event_name,
>      *      dismissed is TRUE - USER DISMISSED A PROMPT, he don't want to unlock the default collection !!
>      *      We the set service state to unavailable in order to not bother user with prompts anymore
>      *
>-     *   4. An error occured
>+     *   4. An error occurred
>      *      collection is NULL
>      *      succ is TRUE - call was NOT successful
>      *      dismissed variable holds FALSE - no prompt no dismissed
>@@ -1376,7 +1376,7 @@ void load_event_config_data_from_user_storage(GHashTable *event_config_list)
>          *      dismissed is TRUE - USER DISMISSED A PROMPT, he don't want to unlock the default collection !!
>          *      We the set service state to unavailable in order to not bother user with prompts anymore
>          *
>-         *   4. An error occured
>+         *   4. An error occurred
>          *      collection is NULL
>          *      succ is TRUE - call was NOT successful
>          *      dismissed variable holds FALSE - no prompt no dismissed
>-- 
>1.7.10
>

Actions: View | Diff

Attachments on bug 847816: 604036 | 617385