From d4636713870c4ae916ef3c49389f8d7fd06b85ac Mon Sep 17 00:00:00 2001 From: Ricardo Mones Date: Tue, 22 Sep 2015 19:55:14 +0200 Subject: [PATCH] Do not translate g_warning() strings They aren't for end user error reporting. Also, remove needless line breaks inside. --- src/addressadd.c | 2 +- src/avatars.c | 2 +- src/headerview.c | 2 +- src/imap.c | 4 ++-- src/main.c | 4 ++-- src/mh.c | 2 +- src/plugins/fetchinfo/fetchinfo_plugin.c | 2 +- src/plugins/gdata/gdata_plugin.c | 2 +- src/plugins/notification/notification_prefs.c | 4 ++-- src/plugins/pgpcore/sgpgme.c | 2 +- src/plugins/pgpmime/pgpmime.c | 2 +- src/textview.c | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/addressadd.c b/src/addressadd.c index 868dd9f98..c78aafeca 100644 --- a/src/addressadd.c +++ b/src/addressadd.c @@ -482,7 +482,7 @@ gboolean addressadd_selection(const gchar *name, const gchar *address, ADDRITEM_ID(person), ".png", NULL ); gdk_pixbuf_save(picture, name, "png", &error, NULL); if (error) { - g_warning(_("Failed to save image: \n%s"), + g_warning("Failed to save image: %s", error->message); g_error_free(error); } diff --git a/src/avatars.c b/src/avatars.c index e940b4322..2a167e950 100644 --- a/src/avatars.c +++ b/src/avatars.c @@ -99,7 +99,7 @@ void avatars_init(void) } avatar_render_hook_id = hooks_register_hook(AVATAR_IMAGE_RENDER_HOOKLIST, avatars_internal_rendering_hook, NULL); if (avatar_render_hook_id == -1) { - g_warning(_("Failed to register avatars internal rendering hook")); + g_warning("Failed to register avatars internal rendering hook"); } } diff --git a/src/headerview.c b/src/headerview.c index 6ac0959a3..f24dbb043 100644 --- a/src/headerview.c +++ b/src/headerview.c @@ -277,7 +277,7 @@ static void headerview_save_contact_pic (HeaderView *headerview, MsgInfo *msginf if (!is_file_exist(filename)) { gdk_pixbuf_save(picture, filename, "png", &error, NULL); if (error) { - g_warning(_("Failed to save image: \n%s"), + g_warning("Failed to save image: %s", error->message); g_error_free(error); } diff --git a/src/imap.c b/src/imap.c index 22be043aa..e5fb2af65 100644 --- a/src/imap.c +++ b/src/imap.c @@ -3286,8 +3286,8 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item, if (strchr(name, imap_get_path_separator(session, IMAP_FOLDER(folder), item->path, &ok)) != NULL || is_fatal(ok)) { - g_warning(_("New folder name must not contain the namespace " - "path separator")); + g_warning("New folder name must not contain the namespace " + "path separator"); return -1; } diff --git a/src/main.c b/src/main.c index 3605ad411..5ae9c8c57 100644 --- a/src/main.c +++ b/src/main.c @@ -934,14 +934,14 @@ static void install_dbus_status_handler(void) "com.google.code.Awn"); dbus_item_hook_id = hooks_register_hook (FOLDER_ITEM_UPDATE_HOOKLIST, dbus_status_update_item_hook, NULL); if (dbus_item_hook_id == -1) { - g_warning(_("Failed to register folder item update hook")); + g_warning("Failed to register folder item update hook"); uninstall_dbus_status_handler(); return; } dbus_folder_hook_id = hooks_register_hook (FOLDER_UPDATE_HOOKLIST, dbus_status_update_folder_hook, NULL); if (dbus_folder_hook_id == -1) { - g_warning(_("Failed to register folder update hook")); + g_warning("Failed to register folder update hook"); uninstall_dbus_status_handler(); return; } diff --git a/src/mh.c b/src/mh.c index f40bd870f..8a307c387 100644 --- a/src/mh.c +++ b/src/mh.c @@ -441,7 +441,7 @@ static gint mh_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list, if (link(fileinfo->file, destfile) < 0) { #endif if (copy_file(fileinfo->file, destfile, TRUE) < 0) { - g_warning(_("can't copy message %s to %s\n"), + g_warning("can't copy message %s to %s", fileinfo->file, destfile); g_free(destfile); return -1; diff --git a/src/plugins/fetchinfo/fetchinfo_plugin.c b/src/plugins/fetchinfo/fetchinfo_plugin.c index 57de92224..d5e374e58 100644 --- a/src/plugins/fetchinfo/fetchinfo_plugin.c +++ b/src/plugins/fetchinfo/fetchinfo_plugin.c @@ -148,7 +148,7 @@ void fetchinfo_save_config(void) if (prefs_write_param(param, pfile->fp) < 0) { /* i18n: Possible error message during plugin load */ - g_warning(_("failed to write Fetchinfo configuration to file\n")); + g_warning("failed to write Fetchinfo configuration to file"); prefs_file_close_revert(pfile); return; } diff --git a/src/plugins/gdata/gdata_plugin.c b/src/plugins/gdata/gdata_plugin.c index b3e6a39f0..f7f40d806 100644 --- a/src/plugins/gdata/gdata_plugin.c +++ b/src/plugins/gdata/gdata_plugin.c @@ -72,7 +72,7 @@ static void cm_gdata_save_config(void) if (prefs_write_param(cm_gdata_param, pfile->fp) < 0) { debug_print("failed!\n"); - g_warning(_("\nGData Plugin: Failed to write plugin configuration to file\n")); + g_warning("GData Plugin: Failed to write plugin configuration to file"); prefs_file_close_revert(pfile); return; } diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c index ab08bafbc..4ad8f3921 100644 --- a/src/plugins/notification/notification_prefs.c +++ b/src/plugins/notification/notification_prefs.c @@ -578,8 +578,8 @@ void notify_save_config(void) if (prefs_write_param(notify_param, pfile->fp) < 0) { debug_print("failed!\n"); - g_warning(_("\nNotification Plugin: Failed to write plugin configuration " - "to file\n")); + g_warning("Notification Plugin: Failed to write plugin configuration " + "to file"); prefs_file_close_revert(pfile); return; } diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c index 2cc5a2fda..7b081115a 100644 --- a/src/plugins/pgpcore/sgpgme.c +++ b/src/plugins/pgpcore/sgpgme.c @@ -213,7 +213,7 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status) if (!warned) alertpanel_error(_("PGP Core: Can't get key - no gpg-agent running.")); else - g_warning(_("PGP Core: Can't get key - no gpg-agent running.")); + g_warning("PGP Core: Can't get key - no gpg-agent running."); warned = TRUE; } else if (gpg_err_code(err) != GPG_ERR_NO_ERROR && gpg_err_code(err) != GPG_ERR_EOF) { return g_strdup_printf(_("The signature can't be checked - %s"), diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c index 05cef5c6a..a8f38eced 100644 --- a/src/plugins/pgpmime/pgpmime.c +++ b/src/plugins/pgpmime/pgpmime.c @@ -71,7 +71,7 @@ static PrivacyDataPGP *pgpmime_new_privacydata() data->is_signed = FALSE; data->sigstatus = NULL; if ((err = gpgme_new(&data->ctx)) != GPG_ERR_NO_ERROR) { - g_warning(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err)); + g_warning("Couldn't initialize GPG context: %s", gpgme_strerror(err)); return NULL; } diff --git a/src/textview.c b/src/textview.c index 0a39b7a9d..dc103be7d 100644 --- a/src/textview.c +++ b/src/textview.c @@ -2054,7 +2054,7 @@ static void textview_save_contact_pic(TextView *textview) if (!is_file_exist(filename)) { gdk_pixbuf_save(picture, filename, "png", &error, NULL); if (error) { - g_warning(_("Failed to save image: \n%s"), + g_warning("Failed to save image: %s", error->message); g_error_free(error); } -- 2.25.1