[gnac/devel] Cleaned the strings



commit 80d63e0a837aa8ad8e8bd1d0773db57fdaba5b6c
Author: Benoît Dupasquier <bdupasqu src gnome org>
Date:   Thu Jun 10 02:30:16 2010 +0100

    Cleaned the strings

 data/profiles/ui/gnac-profiles-base-advanced.xml |    2 +-
 data/ui/gnac-pref-window.xml                     |    4 +-
 data/ui/gnac-properties-window.xml               |    4 +-
 libgnac/libgnac-converter.c                      |    3 +-
 libgnac/libgnac-debug.c                          |   16 +++++-----
 libgnac/libgnac-metadata.c                       |    3 +-
 libgnac/libgnac-output.h                         |    6 ++++
 src/gnac-gconf.c                                 |    4 ++-
 src/gnac-main.c                                  |   26 +++++++++--------
 src/gnac-options.c                               |    4 ++-
 src/gnac-prefs.c                                 |    1 +
 src/gnac-properties.c                            |    7 +++-
 src/gnac-ui.c                                    |   34 +++++++++++----------
 src/gnac-utils.c                                 |   16 ++++++++--
 src/profiles/gnac-profiles-manager.c             |   15 ++++-----
 src/profiles/gnac-profiles-properties.c          |   12 ++++----
 16 files changed, 91 insertions(+), 66 deletions(-)
---
diff --git a/data/profiles/ui/gnac-profiles-base-advanced.xml b/data/profiles/ui/gnac-profiles-base-advanced.xml
index 6c1f34f..e9c8069 100755
--- a/data/profiles/ui/gnac-profiles-base-advanced.xml
+++ b/data/profiles/ui/gnac-profiles-base-advanced.xml
@@ -56,7 +56,7 @@
       <object class="GtkLabel" id="label-sample-rate">
         <property name="visible">True</property>
         <property name="xalign">0</property>
-        <property name="label" translatable="yes">Sample Rate</property>
+        <property name="label" translatable="yes">Sample rate</property>
       </object>
       <packing>
         <property name="top_attach">1</property>
diff --git a/data/ui/gnac-pref-window.xml b/data/ui/gnac-pref-window.xml
index dc30aaa..c68b27e 100644
--- a/data/ui/gnac-pref-window.xml
+++ b/data/ui/gnac-pref-window.xml
@@ -33,7 +33,7 @@
         <col id="0" translatable="yes">Artist - Number - Title</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Custom</col>
+        <col id="0" translatable="yes" comments="Translators: this translation is problematic as gtkbuilder's translation contexts are not yet supported by intltool. The problem should be fixed in intltool 0.41.1. See https://bugs.launchpad.net/intltool/+bug/409781 for more details. In-between the contexts for this translation are 'Folder hierarchy: Custom' and 'Output filename: Custom'">Custom</col>
       </row>
     </data>
   </object>
@@ -44,7 +44,7 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">None</col>
+        <col id="0" translatable="yes" comments="Translators: Folder hierarchy: None">None</col>
       </row>
       <row>
         <col id="0" translatable="yes">Artist</col>
diff --git a/data/ui/gnac-properties-window.xml b/data/ui/gnac-properties-window.xml
index 337e583..57c5196 100644
--- a/data/ui/gnac-properties-window.xml
+++ b/data/ui/gnac-properties-window.xml
@@ -259,7 +259,7 @@
                             <child>
                               <object class="GtkLabel" id="label26">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes" comments="To translators: track 1 of 6">of</property>
+                                <property name="label" translatable="yes" comments="Translators: track 1 of 6">of</property>
                               </object>
                               <packing>
                                 <property name="position">1</property>
@@ -418,7 +418,7 @@
             <child type="tab">
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Basic</property>
+                <property name="label" translatable="yes" comments="Translators: Basic properties">Basic</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
diff --git a/libgnac/libgnac-converter.c b/libgnac/libgnac-converter.c
index f4c21a6..bef4d6b 100644
--- a/libgnac/libgnac-converter.c
+++ b/libgnac/libgnac-converter.c
@@ -812,7 +812,8 @@ libgnac_converter_start(LibgnacConverter  *self,
 
   g_signal_emit(self, signals[STARTED], 0);
 
-  dbg_msg = g_strdup_printf(_("Encoding pipeline: %s"), priv->profile->audio_desc);
+  dbg_msg = g_strdup_printf(_("Encoding pipeline: %s"),
+      priv->profile->audio_desc);
   libgnac_info(dbg_msg);
   g_free(dbg_msg);
 
diff --git a/libgnac/libgnac-debug.c b/libgnac/libgnac-debug.c
index cc1cdc5..63a56ab 100644
--- a/libgnac/libgnac-debug.c
+++ b/libgnac/libgnac-debug.c
@@ -58,10 +58,10 @@ libgnac_debug_real(const gchar *func,
 
 void
 libgnac_critical_real(const gchar *func,
-                const gchar *file,
-                const gint   line,
-                const gchar *format, 
-                ...)
+                      const gchar *file,
+                      const gint   line,
+                      const gchar *format,
+                      ...)
 {
 	va_list args;
 	char buffer[1025];
@@ -76,10 +76,10 @@ libgnac_critical_real(const gchar *func,
 
 void
 libgnac_warning_real(const gchar *func,
-                const gchar *file,
-                const gint   line,
-                const gchar *format, 
-                ...)
+                     const gchar *file,
+                     const gint   line,
+                     const gchar *format,
+                     ...)
 {
 	va_list args;
 	char buffer[1025];
diff --git a/libgnac/libgnac-metadata.c b/libgnac/libgnac-metadata.c
index c69e12d..2ccf30e 100644
--- a/libgnac/libgnac-metadata.c
+++ b/libgnac/libgnac-metadata.c
@@ -786,8 +786,7 @@ libgnac_metadata_get_dummy_tags(void)
     GValue *filename_value;
     filename_value = g_new0(GValue, 1);
     g_value_init(filename_value, G_TYPE_STRING);
-    /* To translators: example filename used in the preview label (do not 
-       remove the extension) */
+    /* Translators: example filename used in the preview label (do not remove the extension) */
     g_value_set_static_string(filename_value, _("filename.oga"));
     g_hash_table_insert(dummy_tags, GNAC_TAG_FILENAME, filename_value);
 
diff --git a/libgnac/libgnac-output.h b/libgnac/libgnac-output.h
index 615a227..306924e 100644
--- a/libgnac/libgnac-output.h
+++ b/libgnac/libgnac-output.h
@@ -26,8 +26,13 @@
 #ifndef __LIBGNAC_OUTPUT_H__
 #define __LIBGNAC_OUTPUT_H__
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include <gio/gio.h>
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #define RENAME_PATTERN_SEPARATOR '%'
 
@@ -49,6 +54,7 @@
 #define RENAME_PATTERN_DEFAULT_ALBUM      N_("Unknown Album")
 #define RENAME_PATTERN_DEFAULT_COMMENT    N_("No Comments")
 #define RENAME_PATTERN_DEFAULT_FILENAME   N_("Unknown Filename")
+/* Translators: Unknown genre */
 #define RENAME_PATTERN_DEFAULT_GENRE      N_("Unknown")
 #define RENAME_PATTERN_DEFAULT_TITLE      N_("Unknown Title")
 /* "numerical" values */
diff --git a/src/gnac-gconf.c b/src/gnac-gconf.c
index e084222..8ae7b50 100644
--- a/src/gnac-gconf.c
+++ b/src/gnac-gconf.c
@@ -55,7 +55,7 @@ gnac_gconf_init(void)
   gconf_client = gconf_client_get_default();
 
   if (gconf_client == NULL) {
-    g_critical(_("Could not create GConf client.\n"));
+    g_critical(_("Could not create GConf client."));
     exit(EXIT_FAILURE);
   }
 
@@ -84,6 +84,7 @@ gnac_gconf_get_boolean(GnacGConfParam param)
 
   if (err != NULL)
   {
+    /* Translators: key is referring to a GConf key */
     g_printerr("%s: %s\n", _("Unable to read key"), err->message);
     g_error_free(err);
   }
@@ -101,6 +102,7 @@ gnac_gconf_set_boolean(GnacGConfParam param, gboolean value)
 
   if (err != NULL)
   {
+    /* Translators: key is referring to a GConf key */
     g_printerr("%s: %s\n", _("Unable to set key"), err->message);
     g_error_free(err);
   }
diff --git a/src/gnac-main.c b/src/gnac-main.c
index 304792c..57ab095 100644
--- a/src/gnac-main.c
+++ b/src/gnac-main.c
@@ -330,11 +330,12 @@ gnac_add_files(GSList *files)
   GError *error = NULL;
   continue_files_action = TRUE;
   gnac_change_state(GNAC_AUDIO_FILE_ACTION_STATE);
-  file_action_thread = g_thread_create((GThreadFunc) gnac_add_files_thread_entry,
-    files, TRUE, &error);
+  file_action_thread = g_thread_create(
+      (GThreadFunc)gnac_add_files_thread_entry,
+      files, TRUE, &error);
   if (error) {
-    libgnac_warning(_("Impossible to launch thread to add files: %s\n"),
-      error->message);
+    libgnac_debug("Failed to create thread");
+    libgnac_warning(_("Failed to add files: %s"), error->message);
     g_error_free(error); 
     gnac_return_prev_state();
   }
@@ -472,14 +473,16 @@ gnac_on_converter_overwrite_cb(LibgnacConverter *converter,
 
     checkbox = gtk_check_button_new_with_label(_("Remember my decision"));
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), FALSE);
-    gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->vbox), checkbox, FALSE, FALSE, 0);
+    gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->vbox), checkbox,
+        FALSE, FALSE, 0);
     gtk_widget_show(checkbox);
 
     gdk_threads_enter();
     response = gtk_dialog_run(GTK_DIALOG(dialog));
     gdk_threads_leave();
 
-    remember_overwrite = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox));
+    remember_overwrite = gtk_toggle_button_get_active(
+        GTK_TOGGLE_BUTTON(checkbox));
 
     gtk_widget_destroy(dialog);
 
@@ -504,7 +507,7 @@ gnac_on_converter_progress_cb(LibgnacConverter *converter,
 
     g_object_get(G_OBJECT(converter), "nb-files", &total, NULL);
     gnac_ui_push_status(g_strdup_printf(_("Converting file %d of %d"), 
-                            nb_converted, total));
+        nb_converted, total));
     gnac_ui_set_progress_fraction(fraction);
 
     if (prev_time_left != -1) 
@@ -521,7 +524,7 @@ gnac_on_converter_progress_cb(LibgnacConverter *converter,
 
       time_str = gnac_utils_format_duration_for_display(
                       gnac_utils_moving_avg_add_sample(left));
-      /* To translators: time left (the format for time is minutes:seconds) */
+      /* Translators: time left (the format for time is hours:minutes:seconds) */
       time_str_label = g_strdup_printf(_("%s left"), time_str);
 
       gnac_ui_set_progress_text(time_str_label);
@@ -667,7 +670,7 @@ gnac_on_converter_completion_cb(LibgnacConverter *converter)
   if (conversion_errors) {
     gnac_ui_push_status(_("Conversion completed with errors"));
   } else {
-    gnac_ui_push_status(_("Conversion completed!"));
+    gnac_ui_push_status(_("Conversion completed"));
   }
 }
 
@@ -705,7 +708,7 @@ gnac_on_converter_error_cb(LibgnacConverter *converter,
   if (g_error_matches(error, LIBGNAC_ERROR, LIBGNAC_ERROR_FILE_EXISTS))
   {
     gchar *text;
-    text = g_strdup_printf(_("File not converted (%s)"), msg);
+    text = g_strdup_printf("%s (%s)", _("File not converted"), msg);
     gnac_file_list_visual_error(uri, text, GTK_STOCK_DIALOG_INFO);
     g_free(text);
   }
@@ -821,7 +824,6 @@ gnac_on_ui_remove_cb(GtkAction *action,
                      gpointer   data)
 {
   GList *rows;
-
   rows = gnac_file_list_get_selected_rows();
   /* References are freed by gnac_remove_track*/
   g_list_foreach(rows, (GFunc) gnac_remove_track, NULL);
@@ -855,7 +857,7 @@ gnac_on_ui_help_cb(GtkAction *action,
       "ghelp:gnac", gtk_get_current_event_time(), &error);
 
   if (!ret && error) {
-    g_printerr(_("Could not display help: %s\n"), error->message);
+    g_printerr("%s: %s\n", _("Could not display help"), error->message);
     g_error_free(error);
   }
 }
diff --git a/src/gnac-options.c b/src/gnac-options.c
index a8793d4..8b481d4 100644
--- a/src/gnac-options.c
+++ b/src/gnac-options.c
@@ -134,6 +134,7 @@ gnac_options_init(gint    argc,
   GError *error = NULL;
   GOptionContext *context;
 
+  /* Translators: message shown in the 'Usage' section when running 'gnac --help' */
   context = g_option_context_new(_("[URI...] - Convert your audio files"));
   g_option_context_add_main_entries(context, all_options, GETTEXT_PACKAGE);
   g_option_context_add_group(context, gst_init_get_option_group());
@@ -146,8 +147,9 @@ gnac_options_init(gint    argc,
       g_clear_error(&error);
     }
     g_print(_("Run '%s --help' to see a full list "
-              "of available command line options.\n"), 
+              "of available command line options."),
               argv[0]);
+    g_print("\n");
     exit(EXIT_FAILURE);
   }
 
diff --git a/src/gnac-prefs.c b/src/gnac-prefs.c
index b1a0703..641c19b 100644
--- a/src/gnac-prefs.c
+++ b/src/gnac-prefs.c
@@ -74,6 +74,7 @@ gnac_prefs_get_tooltip_patterns(void)
 {
   if (!tooltip_patterns)
   {
+    /* Translators: patterns refers to rename patterns, e.g., %a -> artist */
     tooltip_patterns = g_strconcat(_("Patterns available:"),
         "\n  <b>\%a:</b> ", _("Artist"),
         "\n  <b>\%b:</b> ", _("Album"),
diff --git a/src/gnac-properties.c b/src/gnac-properties.c
index d3c4382..7d73801 100644
--- a/src/gnac-properties.c
+++ b/src/gnac-properties.c
@@ -35,6 +35,7 @@
 #include "gnac-ui.h"
 #include "gnac-utils.h"
 
+#include "libgnac-debug.h"
 #include "libgnac-metadata.h"
 
 
@@ -104,7 +105,9 @@ static const gchar *nice_properties[] = {
   N_("Duration"),
   N_("File size"),
   N_("Channels"),
+  /* Translators: Audio mode, e.g.,  mono or stereo */
   N_("Mode"),
+  /* Translators: sample rate */
   N_("Rate"),
   N_("Codec"),
   N_("Bitrate"),
@@ -336,8 +339,8 @@ gnac_properties_set_entry(const gchar  *entry_name,
     default:
       gtk_entry_set_text(GTK_ENTRY(entry), 
                       g_strdup_value_contents(entry_value));
-      g_printerr(_("%s had an unknown type: %s\n"), 
-                      entry_name, g_type_name(type));
+      libgnac_debug("%s has an unknown type: %s\n",
+          entry_name, g_type_name(type));
       return;
   }
 }
diff --git a/src/gnac-ui.c b/src/gnac-ui.c
index 68cc922..e474413 100644
--- a/src/gnac-ui.c
+++ b/src/gnac-ui.c
@@ -85,7 +85,7 @@ gnac_about_url_hook(GtkAboutDialog *dialog,
   if (!gtk_show_uri(gtk_widget_get_screen(GTK_WIDGET(dialog)),
                     url, gtk_get_current_event_time(), &error))
   {
-    g_printerr(_("Could not open link %s: %s\n"), url, error->message);
+    g_warning(_("Could not open link %s: %s"), url, error->message);
     g_error_free(error);
   }
 }
@@ -529,10 +529,12 @@ gnac_ui_new(void)
 
   file_list = gnac_file_list_new();
 
-  audio_profile_hbox = GTK_WIDGET(gtk_builder_get_object(gnac_main_builder, "audio_profile_hbox"));
+  audio_profile_hbox = GTK_WIDGET(gtk_builder_get_object(gnac_main_builder,
+      "audio_profile_hbox"));
 
   /* Add audio profile combo box */
-  audio_profile_chooser_combo = gnac_profiles_get_widget(gnac_ui_get_widget("main_window"));
+  audio_profile_chooser_combo = gnac_profiles_get_widget(
+      gnac_ui_get_widget("main_window"));
 
   g_signal_connect(G_OBJECT(audio_profile_chooser_combo), 
       "changed",
@@ -634,7 +636,8 @@ gnac_ui_pulse_progress(void)
     
     gtk_progress_bar_pulse(GTK_PROGRESS_BAR(progress_bar));
     progress_text = g_strdup_printf(
-      ngettext("%u file added", "%u files added", nb_files_added), nb_files_added);
+        ngettext("%u file added", "%u files added", nb_files_added),
+        nb_files_added);
     gnac_ui_set_progress_text(progress_text);
     g_free(progress_text);
     
@@ -658,9 +661,6 @@ gnac_ui_show_pause(gboolean show)
 }
 
 
-/*
- * This function can be completed to have different contexts, libgnac, main-app.. 
- */
 void
 gnac_ui_push_status(const gchar *message)
 {
@@ -694,12 +694,12 @@ gnac_ui_show_popup_menu(GtkWidget      *treeview,
 {
   GtkWidget * popup_menu;
 
-  popup_menu = GTK_WIDGET(gtk_builder_get_object(gnac_main_builder, 
-                                                "main_popup"));
+  popup_menu = GTK_WIDGET(
+      gtk_builder_get_object(gnac_main_builder, "main_popup"));
 
   gtk_menu_popup(GTK_MENU(popup_menu), NULL, NULL, NULL, NULL, 
-        (event != NULL) ? event->button : 0,
-        gdk_event_get_time((GdkEvent*) event));
+      (event != NULL) ? event->button : 0,
+      gdk_event_get_time((GdkEvent*) event));
 }
 
 
@@ -708,8 +708,8 @@ gnac_ui_show_about_dialog(void)
 {
   GtkWidget *about_dialog;
 
-  about_dialog = GTK_WIDGET(gtk_builder_get_object(gnac_main_builder, 
-                                                   "aboutdialog"));
+  about_dialog = GTK_WIDGET(
+      gtk_builder_get_object(gnac_main_builder, "aboutdialog"));
   gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about_dialog), PACKAGE_VERSION);
   gtk_widget_show_all(about_dialog);
 }
@@ -930,8 +930,9 @@ gnac_ui_query_tooltip_cb(GtkStatusIcon *status_icon,
         "  <span color=\"#888\">%s</span> %s  \n"
         "  <span color=\"#888\">%s</span> %s  ",
         title,
-        /* To translators: title by artist from album */
+        /* Translators: title by artist from album */
         _("by"), artist ? artist : _("Unknown Artist"),
+        /* Translators: title by artist from album */
         _("from"), album ? album : _("Unknown Album"));
   }
   else
@@ -1058,6 +1059,7 @@ gnac_ui_on_trayicon_popup(GtkStatusIcon *trayicon,
   trayicon_menu = gnac_ui_get_widget("tray_popup");
 
   g_object_get(main_window, "visible", &window_displayed, NULL);
+  /* Translators: Show/Hide main window */
   label_text = g_strdup(window_displayed ? _("Hide") : _("Show"));
 
   /* update the menu and then display it */
@@ -1128,11 +1130,11 @@ gnac_ui_show_error_trash(const gchar *filename)
       GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
       GTK_MESSAGE_QUESTION,
       GTK_BUTTONS_CANCEL,
-      _("Cannot trash the file. Do you want to delete it immediately?"));
+      _("Failed to move the file to the Trash. Delete it permanently?"));
   gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_DELETE, 1);
 
   gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
-   _("Cannot trash file %s"), filename);
+      _("Cannot move file %s to the Trash"), filename);
   response = gtk_dialog_run(GTK_DIALOG(dialog));
   gtk_widget_destroy(dialog);
 
diff --git a/src/gnac-utils.c b/src/gnac-utils.c
index 1ad36e2..5249f9c 100644
--- a/src/gnac-utils.c
+++ b/src/gnac-utils.c
@@ -23,8 +23,13 @@
  * Boston, MA  02110-1301  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include <gio/gio.h>
 #include <glib.h>
+#include <glib/gi18n.h>
 
 #include "gnac-utils.h"
 
@@ -72,12 +77,14 @@ gnac_utils_format_duration_for_display(guint64 duration)
 
   if (duration >= 3600) 
   {
-    return g_strdup_printf("%d:%02d:%02d", 
-                    (gint) (duration / 3600), minutes, seconds);
+    /* Translators: time remaining hours:minutes:seconds. You may change ":" to the separator that your local uses or use "%Id" instead of "%d" if your locale uses localized digits. */
+    return g_strdup_printf(_("%d:%02d:%02d"),
+        (gint) (duration / 3600), minutes, seconds);
   } 
   else
   {
-    return g_strdup_printf("%d:%02d", minutes, seconds);
+    /* Translators: time remaining minutes:seconds. You may change ":" to the separator that your local uses or use "%Id" instead of "%d" if your locale uses localized digits. */
+    return g_strdup_printf(_("%d:%02d"), minutes, seconds);
   } 
 
   return NULL;
@@ -156,7 +163,8 @@ gnac_utils_scale_pixbuf(GdkPixbuf *pixbuf,
     n_width = n_height * width / height;
   }
 
-  return gdk_pixbuf_scale_simple(pixbuf, n_width, n_height, GDK_INTERP_BILINEAR);
+  return gdk_pixbuf_scale_simple(pixbuf, n_width, n_height,
+      GDK_INTERP_BILINEAR);
 }
 
 
diff --git a/src/profiles/gnac-profiles-manager.c b/src/profiles/gnac-profiles-manager.c
index 0495b87..33acc3d 100644
--- a/src/profiles/gnac-profiles-manager.c
+++ b/src/profiles/gnac-profiles-manager.c
@@ -35,6 +35,7 @@
 #include "gnac-profiles-manager.h"
 #include "libgnac-debug.h"
 
+/* Translators: Suffix added to a copied profile: 'profile (copy).xml' */
 #define GNAC_COPY_SUFFIX N_(" (copy)")
 
 enum {
@@ -242,7 +243,7 @@ gnac_profiles_mgr_populate(void)
   dir = g_file_new_for_path(saved_profiles_dir);
   if (!g_file_query_exists(dir, NULL)) {
     if (!g_file_make_directory_with_parents(dir, NULL, &error)) {
-      const gchar *msg = N_("Unable to create directory for saved profiles.");
+      const gchar *msg = N_("Unable to create the profiles directory");
       libgnac_warning("%s %s: %s\n",
           msg,
           _("You may not be able to save your profiles"),
@@ -321,7 +322,7 @@ gnac_profiles_mgr_import_default_profiles(void)
   dir = g_file_new_for_path(PKGDATADIR "/profiles/default");
   if (!g_file_query_exists(dir, NULL)) {
     libgnac_warning("%s: %s\n",
-        _("Unable to find directory containing default profiles"),
+        _("Unable to find the default profiles directory"),
         error->message);
     g_error_free(error);
     return;
@@ -754,9 +755,7 @@ gnac_profiles_mgr_on_drag_data_received(GtkWidget        *widget,
   g_thread_create((GThreadFunc) gnac_profiles_mgr_copy_and_load_files,
       tcopy_data, TRUE, &error);
   if (error) {
-    libgnac_warning(
-        _("Impossible to launch thread for collecting files to import: %s\n"),
-        error->message);
+    libgnac_debug("Failed to create thread: %s", error->message);
     gnac_profiles_mgr_display_status_message(NULL,
         _("Impossible to import file(s)"));
     g_error_free(error); 
@@ -829,8 +828,8 @@ gnac_profiles_mgr_copy_and_load_files(gpointer data)
         if (gnac_profiles_properties_saved_profiles_contain_name(name, FALSE))
         {
           libgnac_warning(
-              _("Impossible to load file \"%s\": a profile with same file "
-                "name already exists.\n"), uri);
+             _("Impossible to load file \"%s\": "
+               "a profile with the same name already exists."), uri);
           ++profiles_error;
         } else {
           gchar    *path;
@@ -864,7 +863,7 @@ gnac_profiles_mgr_copy_and_load_files(gpointer data)
         }
       } else {
         libgnac_warning(
-            _("Impossible to import the file \"%s\". File type not supported\n"),
+            _("Impossible to import file \"%s\". File type not supported."),
             uri);
         ++profiles_error;
       }
diff --git a/src/profiles/gnac-profiles-properties.c b/src/profiles/gnac-profiles-properties.c
index 794e62d..c204822 100644
--- a/src/profiles/gnac-profiles-properties.c
+++ b/src/profiles/gnac-profiles-properties.c
@@ -515,7 +515,7 @@ gnac_profiles_properties_show(gpointer     profile,
     p = ((AudioProfileGeneric*)profile)->generic;
     format_module = g_hash_table_lookup(formats, p->format_id);
     if (format_module == NULL) {
-      libgnac_warning(_("Format not supported\n"));
+      libgnac_warning(_("Format not supported"));
     } else {
       model = gtk_combo_box_get_model(GTK_COMBO_BOX(format_combo_box));
       gnac_profiles_properties_name_description_set_text(p->name,
@@ -541,7 +541,7 @@ gnac_profiles_properties_free_audio_profile(gpointer profile)
   p = ((AudioProfileGeneric*)profile)->generic;
   format_module = g_hash_table_lookup(formats, p->format_id);
   if (format_module == NULL) {
-    libgnac_warning(_("Format not supported\n"));
+    libgnac_warning(_("Format not supported"));
   } else {
     format_module->funcs.free_audio_profile(profile); 
   }
@@ -750,8 +750,8 @@ gnac_profiles_properties_on_save(GtkWidget *widget,
       gchar *message;
 
       message = g_strconcat(
-          _("Profile name cannot contain the following characters: "), 
-          forbidden_chars_string, NULL);
+          _("The profile name cannot contain the following characters:"),
+          " ", forbidden_chars_string, NULL);
       gnac_profiles_properties_display_status_message(message);
       g_free(message);
     } else if (g_strcmp0(current_profile_name, name)
@@ -800,8 +800,8 @@ gnac_profiles_properties_on_name_entry_key_pressed(GtkWidget   *widget,
     gchar *message;
     
     message = g_strconcat(
-        _("Profile name cannot contain the following characters: "), 
-        forbidden_chars_string, NULL);
+        _("Profile name cannot contain the following characters:"),
+        " ", forbidden_chars_string, NULL);
     gnac_profiles_properties_display_status_message(message);
     g_free(message);
     return TRUE;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]