[easytag/wip/application-window: 54/54] Review many translatable strings



commit eba31aab0b6c021d453b96496a63908a10173e0d
Author: David King <amigadave amigadave com>
Date:   Thu Sep 4 18:33:10 2014 +0100

    Review many translatable strings

 data/menus.ui                      |    2 +-
 data/org.gnome.EasyTAG.gschema.xml |    8 +-
 data/playlist_dialog.ui            |    2 +-
 data/preferences_dialog.ui         |   20 ++--
 data/toolbar.ui                    |   10 +-
 src/application.c                  |   16 +++-
 src/application_window.c           |    8 +-
 src/browser.c                      |   12 ++-
 src/cddb_dialog.c                  |   90 +++++++++++--------
 src/charset.c                      |   18 +++--
 src/easytag.c                      |   31 ++++---
 src/et_core.c                      |   21 +++--
 src/file_area.c                    |    2 +-
 src/load_files_dialog.c            |   14 ++--
 src/misc.c                         |    6 +-
 src/picture.c                      |    4 +-
 src/playlist_dialog.c              |    5 +-
 src/preferences_dialog.c           |    4 +-
 src/scan_dialog.c                  |   50 ++++++-----
 src/setting.c                      |   23 +++---
 src/tag_area.c                     |  176 +++++++++++++++++++++++++-----------
 src/tags/ape_tag.c                 |    5 +-
 src/tags/flac_tag.c                |   25 ++++--
 src/tags/id3_tag.c                 |   53 ++++++++---
 src/tags/id3v24_tag.c              |   10 ++-
 src/tags/mp4_header.cc             |    8 +-
 src/tags/mp4_tag.cc                |   16 ++--
 src/tags/ogg_header.c              |   32 +++++--
 src/tags/ogg_tag.c                 |   23 ++++--
 29 files changed, 436 insertions(+), 258 deletions(-)
---
diff --git a/data/menus.ui b/data/menus.ui
index d0f428c..365e7fd 100644
--- a/data/menus.ui
+++ b/data/menus.ui
@@ -139,7 +139,7 @@
             <section>
                 <item>
                     <attribute name="action">win.file-artist-view</attribute>
-                    <attribute name="label" translatable="yes">Tree Browser</attribute>
+                    <attribute name="label" translatable="yes">Directory Tree</attribute>
                     <attribute name="target">file</attribute>
                 </item>
                 <item>
diff --git a/data/org.gnome.EasyTAG.gschema.xml b/data/org.gnome.EasyTAG.gschema.xml
index 9340650..91da89b 100644
--- a/data/org.gnome.EasyTAG.gschema.xml
+++ b/data/org.gnome.EasyTAG.gschema.xml
@@ -16,18 +16,18 @@
 
     <key name="browse-subdir" type="b">
       <summary>Browse subdirectories</summary>
-      <description>Whether to search subdirectories for audio files when reading a path in the 
browser</description>
+      <description>Whether to search subdirectories for audio files when reading a directory in the 
browser</description>
       <default>true</default>
     </key>
 
     <key name="browse-show-hidden" type="b">
       <summary>Show hidden directories while browsing</summary>
-      <description>Whether to show hidden directories when showing a path in the browser</description>
+      <description>Whether to show hidden directories when showing a directory in the browser</description>
       <default>false</default>
     </key>
 
     <key name="browse-expand-children" type="b">
-      <summary>Expand the subdirectories of the selected path</summary>
+      <summary>Expand the subdirectories of the selected directory</summary>
       <description>Whether to expand the subdirectories of a node in the directory browser when selecting 
it</description>
       <default>true</default>
     </key>
@@ -540,7 +540,7 @@
 
     <key name="playlist-dos-separator" type="b">
       <summary>Use DOS separators for playlists</summary>
-      <description>Whether to use backslash as path separator when generating playlists</description>
+      <description>Whether to use backslash as directory separator when generating playlists</description>
       <default>false</default>
     </key>
 
diff --git a/data/playlist_dialog.ui b/data/playlist_dialog.ui
index 355b87f..6695465 100644
--- a/data/playlist_dialog.ui
+++ b/data/playlist_dialog.ui
@@ -87,7 +87,7 @@
             <object class="GtkCheckButton" id="playlist_dos_check">
                 <property name="label" translatable="yes">Use DOS directory separator</property>
                 <property name="margin-left">12</property>
-                <property name="tooltip-text" translatable="yes">Whether to use backslash as path separator 
when generating playlists</property>
+                <property name="tooltip-text" translatable="yes">Whether to use backslash as directory 
separator when generating playlists</property>
                 <property name="visible">True</property>
             </object>
         </child>
diff --git a/data/preferences_dialog.ui b/data/preferences_dialog.ui
index 89ab77d..5e2a372 100644
--- a/data/preferences_dialog.ui
+++ b/data/preferences_dialog.ui
@@ -88,13 +88,13 @@
                     <object class="GtkCheckButton" id="browser_subdirs_check">
                         <property name="label" translatable="yes">Browse subdirectories</property>
                         <property name="margin-left">12</property>
-                        <property name="tooltip-text" translatable="yes">Whether to search subdirectories 
for audio files when reading a path in the browser</property>
+                        <property name="tooltip-text" translatable="yes">Whether to search subdirectories 
for audio files when reading a directory in the browser</property>
                         <property name="visible">True</property>
                     </object>
                 </child>
                 <child>
                     <object class="GtkCheckButton" id="browser_expand_subdirs_check">
-                        <property name="label" translatable="yes">Expand the subdirectories of the selected 
path</property>
+                        <property name="label" translatable="yes">Expand the subdirectories of the selected 
directory</property>
                         <property name="margin-left">12</property>
                         <property name="tooltip-text" translatable="yes">Whether to expand the 
subdirectories of a node in the directory browser when selecting it</property>
                         <property name="visible">True</property>
@@ -104,7 +104,7 @@
                     <object class="GtkCheckButton" id="browser_hidden_check">
                         <property name="label" translatable="yes">Search hidden directories</property>
                         <property name="margin-left">12</property>
-                        <property name="tooltip-text" translatable="yes">Whether to show hidden directories 
when showing a path in the browser</property>
+                        <property name="tooltip-text" translatable="yes">Whether to show hidden directories 
when showing a directory in the browser</property>
                         <property name="visible">True</property>
                     </object>
                 </child>
@@ -628,8 +628,8 @@
                                     <item id="id3v2.4">ID3v2.4</item>
                                 </items>
                                 <property name="tooltip-text" translatable="yes">Select the ID3v2 tag 
version to write:
-        • ID3v2.3 is written using id3lib,
-        • ID3v2.4 is written using libid3tag (recommended)</property>
+ • ID3v2.3 is written using id3lib,
+ • ID3v2.4 is written using libid3tag (recommended)</property>
                                 <property name="visible">True</property>
                             </object>
                             <packing>
@@ -762,7 +762,7 @@
                         </child>
                         <child>
                             <object class="GtkCheckButton" id="id3_v2_crc32_check">
-                                <property name="label" translatable="yes">Use CRC32</property>
+                                <property name="label" translatable="yes">Use CRC-32</property>
                                 <property name="tooltip-text" translatable="yes">Whether to embed a CRC-32 
checksum of the audio file data in ID3v2 tags</property>
                                 <property name="visible">True</property>
                             </object>
@@ -1049,7 +1049,7 @@
                 </child>
                 <child>
                     <object class="GtkCheckButton" id="crc32_default_check">
-                        <property name="label" translatable="yes">Use CRC32 as the default comment (for 
files with ID3 tags only)</property>
+                        <property name="label" translatable="yes">Use CRC-32 as the default comment (for 
files with ID3 tags only)</property>
                         <property name="margin-left">12</property>
                         <property name="tooltip-text" translatable="yes">Whether to use the CRC-32 of the 
audio file data as the default comment, for files with ID3 tags only</property>
                         <property name="visible">True</property>
@@ -1177,7 +1177,7 @@
                                 <property name="has-entry">True</property>
                                 <property name="visible">True</property>
                                 <items>
-                                    <item translatable="yes" 
id="host_musicbrainz">freedb.musicbrainz.org</item>
+                                    <item id="host_musicbrainz">freedb.musicbrainz.org</item>
                                 </items>
                             </object>
                             <packing>
@@ -1256,8 +1256,8 @@
                                 <property name="has-entry">True</property>
                                 <property name="visible">True</property>
                                 <items>
-                                    <item translatable="yes" id="host_freedb">www.freedb.org</item>
-                                    <item translatable="yes" id="host_gnudb">www.gnudb.org</item>
+                                    <item id="host_freedb">www.freedb.org</item>
+                                    <item id="host_gnudb">www.gnudb.org</item>
                                 </items>
                             </object>
                             <packing>
diff --git a/data/toolbar.ui b/data/toolbar.ui
index 8d8cc31..6adb884 100644
--- a/data/toolbar.ui
+++ b/data/toolbar.ui
@@ -66,7 +66,7 @@
                 <property name="action-name">win.undo-file-changes</property>
                 <property name="icon-name">edit-undo</property>
                 <property name="label" translatable="yes">_Undo</property>
-                <property name="tooltip-text" translatable="yes">Undo last file changes</property>
+                <property name="tooltip-text" translatable="yes">Undo for file</property>
                 <property name="visible">True</property>
             </object>
         </child>
@@ -75,7 +75,7 @@
                 <property name="action-name">win.redo-file-changes</property>
                 <property name="icon-name">edit-redo</property>
                 <property name="label" translatable="yes">R_edo</property>
-                <property name="tooltip-text" translatable="yes">Redo last file changes</property>
+                <property name="tooltip-text" translatable="yes">Redo for file</property>
                 <property name="visible">True</property>
             </object>
         </child>
@@ -96,7 +96,7 @@
                 <property name="action-name">win.file-artist-view</property>
                 <property name="action-target">'file'</property>
                 <property name="icon-name">audio-x-generic</property>
-                <property name="label" translatable="yes">Tree Browser</property>
+                <property name="label" translatable="yes">Directory Tree</property>
                 <property name="tooltip-text" translatable="yes">Browse directory tree</property>
                 <property name="visible">True</property>
             </object>
@@ -105,9 +105,9 @@
             <object class="GtkToggleToolButton" id="artist_view_button">
                 <property name="action-name">win.file-artist-view</property>
                 <property name="action-target">'artist'</property>
-                <property name="label" translatable="yes">Artist and Album</property>
+                <property name="label" translatable="yes">Artists and Albums</property>
                 <!--<property name="icon-widget">artist_view_image</property>-->
-                <property name="tooltip-text" translatable="yes">Browse artist and album</property>
+                <property name="tooltip-text" translatable="yes">Browse artists and albums</property>
                 <property name="visible">True</property>
             </object>
         </child>
diff --git a/src/application.c b/src/application.c
index 041717c..d34a289 100644
--- a/src/application.c
+++ b/src/application.c
@@ -178,14 +178,20 @@ common_init (EtApplication *self)
                PACKAGE_VERSION, getpid ());
 #ifdef G_OS_WIN32
     if (g_getenv("EASYTAGLANG"))
-        Log_Print(LOG_OK,_("Variable EASYTAGLANG defined. Setting locale: '%s'"),g_getenv("EASYTAGLANG"));
+    {
+        Log_Print (LOG_OK,
+                   _("Variable EASYTAGLANG defined, setting locale ‘%s’"),
+                   g_getenv ("EASYTAGLANG"));
+    }
     else
-        Log_Print(LOG_OK,_("Setting locale: '%s'"),g_getenv("LANG"));
+    {
+        Log_Print (LOG_OK, _("Setting locale: ‘%s’"), g_getenv ("LANG"));
+    }
 #endif /* G_OS_WIN32 */
 
     if (get_locale ())
         Log_Print (LOG_OK,
-                   _("System locale is '%s', using '%s'"),
+                   _("System locale is ‘%s’, using ‘%s’"),
                    get_locale (), get_encoding_from_locale (get_locale ()));
 
     if (settings_warning)
@@ -424,7 +430,7 @@ et_application_open (GApplication *self,
     {
         if (activated)
         {
-            Log_Print (LOG_ERROR, _("Error while querying information for file '%s': %s"),
+            Log_Print (LOG_ERROR, _("Error while querying information for file ‘%s’: %s"),
                        path_utf8, err->message);
 
         }
@@ -488,7 +494,7 @@ et_application_open (GApplication *self,
             }
             /* Fall through on error. */
         default:
-            Log_Print (LOG_WARNING, _("Cannot open path '%s'"), path_utf8);
+            Log_Print (LOG_WARNING, _("Cannot open path ‘%s’"), path_utf8);
             g_free (path);
             g_free (path_utf8);
             return;
diff --git a/src/application_window.c b/src/application_window.c
index e5f053e..836ac28 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -333,7 +333,7 @@ delete_file (ET_File *ETFile, gboolean multiple_files, GError **error)
                                                GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                                GTK_MESSAGE_QUESTION,
                                                GTK_BUTTONS_NONE,
-                                               _("Do you really want to delete the file '%s'?"),
+                                               _("Do you really want to delete the file ‘%s’?"),
                                                basename_utf8);
             message_area = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(msgdialog));
             msgdialog_check_button = gtk_check_button_new_with_label(_("Repeat action for the remaining 
files"));
@@ -350,7 +350,7 @@ delete_file (ET_File *ETFile, gboolean multiple_files, GError **error)
                                                GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                                GTK_MESSAGE_QUESTION,
                                                GTK_BUTTONS_NONE,
-                                               _("Do you really want to delete the file '%s'?"),
+                                               _("Do you really want to delete the file ‘%s’?"),
                                                basename_utf8);
             gtk_window_set_title(GTK_WINDOW(msgdialog),_("Delete File"));
             gtk_dialog_add_buttons (GTK_DIALOG (msgdialog), _("_Cancel"),
@@ -379,7 +379,7 @@ delete_file (ET_File *ETFile, gboolean multiple_files, GError **error)
 
             if (g_file_delete (cur_file, NULL, error))
             {
-                gchar *msg = g_strdup_printf(_("File '%s' deleted"), basename_utf8);
+                gchar *msg = g_strdup_printf(_("File ‘%s’ deleted"), basename_utf8);
                 et_application_window_status_bar_message (ET_APPLICATION_WINDOW (MainWindow),
                                                           msg, FALSE);
                 g_free(msg);
@@ -2596,7 +2596,7 @@ quit_confirmed (EtApplicationWindow *self)
     et_application_window_apply_changes (self);
     
     /* Quit EasyTAG. */
-    Log_Print (LOG_OK, _("EasyTAG: Normal exit."));
+    Log_Print (LOG_OK, _("Normal exit"));
 
     gtk_widget_destroy (GTK_WIDGET (self));
 }
diff --git a/src/browser.c b/src/browser.c
index fe46ca2..8a02d56 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -550,7 +550,7 @@ et_browser_set_current_path_default (EtBrowser *self)
                           g_variant_new_bytestring (priv->current_path));
 
     et_application_window_status_bar_message (ET_APPLICATION_WINDOW (MainWindow),
-                                              _("New default path selected for browser"),
+                                              _("New default directory selected for browser"),
                                               TRUE);
 }
 
@@ -3841,7 +3841,7 @@ create_browser (EtBrowser *self)
                               G_CALLBACK (File_Selection_Window_For_Directory),
                               gtk_bin_get_child (GTK_BIN (priv->entry_combo)));
     gtk_widget_set_tooltip_text (priv->button,
-                                 _("Select a directory to browse."));
+                                 _("Select a directory to browse"));
 
 
     /*
@@ -4541,9 +4541,10 @@ Rename_Directory (EtBrowser *self)
                                            GTK_DIALOG_MODAL  | GTK_DIALOG_DESTROY_WITH_PARENT,
                                            GTK_MESSAGE_ERROR,
                                            GTK_BUTTONS_CLOSE,
-                                           _("Could not convert '%s' into filename encoding."),
+                                           _("Could not convert ‘%s’ into filename encoding"),
                                            directory_new_name);
-        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msgdialog),_("Please use another name"));
+        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
+                                                  _("Please use another name."));
         gtk_window_set_title(GTK_WINDOW(msgdialog),_("Directory Name Error"));
 
         gtk_dialog_run(GTK_DIALOG(msgdialog));
@@ -4613,7 +4614,8 @@ Rename_Directory (EtBrowser *self)
                                                GTK_BUTTONS_CLOSE,
                                                "%s",
                                                "Cannot rename file");
-            gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msgdialog),_("The directory name 
'%s' already exists"),new_path_utf8);
+            gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
+                                                      _("The directory name ‘%s’ already 
exists."),new_path_utf8);
             gtk_window_set_title(GTK_WINDOW(msgdialog),_("Rename File Error"));
 
             gtk_dialog_run(GTK_DIALOG(msgdialog));
diff --git a/src/cddb_dialog.c b/src/cddb_dialog.c
index 4c64a13..ab40ef5 100644
--- a/src/cddb_dialog.c
+++ b/src/cddb_dialog.c
@@ -308,12 +308,12 @@ show_album_info (EtCDDBDialog *self, GtkTreeSelection *selection)
         return;
 
     duration_str = Convert_Duration((gulong)cddbalbum->duration);
-    msg = g_strdup_printf(_("Album: '%s', "
-                            "artist: '%s', "
-                            "length: '%s', "
-                            "year: '%s', "
-                            "genre: '%s', "
-                            "ID: '%s'"),
+    msg = g_strdup_printf(_("Album: ‘%s’, "
+                            "artist: ‘%s’, "
+                            "length: ‘%s’, "
+                            "year: ‘%s’, "
+                            "genre: ‘%s’, "
+                            "disc ID: ‘%s’"),
                             cddbalbum->album ? cddbalbum->album : "",
                             cddbalbum->artist ? cddbalbum->artist : "",
                             duration_str,
@@ -668,7 +668,7 @@ Cddb_Open_Connection (EtCDDBDialog *self, const gchar *host, gint port)
         /* Create socket. */
         if ((socket_id = socket (AF_INET, SOCK_STREAM, 0)) < 0)
         {
-            msg = g_strdup_printf (_("Cannot create a new socket (%s)"),
+            msg = g_strdup_printf (_("Cannot create a new socket ‘%s’"),
                                    g_strerror (errno));
             gtk_statusbar_push (GTK_STATUSBAR (priv->status_bar),
                                 priv->status_bar_context, msg);
@@ -686,7 +686,7 @@ Cddb_Open_Connection (EtCDDBDialog *self, const gchar *host, gint port)
         }
 
         /* Open connection to the server. */
-        msg = g_strdup_printf (_("Connecting to host '%s', port '%d'…"), host,
+        msg = g_strdup_printf (_("Connecting to host ‘%s’, port ‘%d’…"), host,
                                port);
         gtk_statusbar_push (GTK_STATUSBAR (priv->status_bar),
                             priv->status_bar_context, msg);
@@ -699,7 +699,7 @@ Cddb_Open_Connection (EtCDDBDialog *self, const gchar *host, gint port)
 
         if (connect (socket_id, &sockaddr_in, sizeof (struct sockaddr)) < 0)
         {
-            msg = g_strdup_printf (_("Cannot connect to host '%s' (%s)"), host,
+            msg = g_strdup_printf (_("Cannot connect to host ‘%s’: %s"), host,
                                    g_strerror (errno));
             gtk_statusbar_push (GTK_STATUSBAR (priv->status_bar),
                                 priv->status_bar_context, msg);
@@ -723,7 +723,7 @@ Cddb_Open_Connection (EtCDDBDialog *self, const gchar *host, gint port)
 
     if (error)
     {
-        msg = g_strdup_printf (_("Cannot resolve host '%s' (%s)"), host,
+        msg = g_strdup_printf (_("Cannot resolve host ‘%s’: %s"), host,
                                error->message);
         gtk_statusbar_push (GTK_STATUSBAR (priv->status_bar),
                             priv->status_bar_context, msg);
@@ -736,7 +736,7 @@ Cddb_Open_Connection (EtCDDBDialog *self, const gchar *host, gint port)
     g_object_unref (enumerator);
     g_object_unref (cancellable);
 
-    msg = g_strdup_printf (_("Connected to host '%s'"), host);
+    msg = g_strdup_printf (_("Connected to host ‘%s’"), host);
     gtk_statusbar_push (GTK_STATUSBAR (priv->status_bar), priv->status_bar_context,
                         msg);
     g_free (msg);
@@ -823,7 +823,7 @@ Cddb_Write_Result_To_File (EtCDDBDialog *self,
             if (fwrite (&cddb_out, bytes_read, 1, file) != 1)
             {
                  Log_Print (LOG_ERROR,
-                            _("Error while writing CDDB results to file '%s'"),
+                            _("Error while writing CDDB results to file ‘%s’"),
                             file_path);
                  break;
             }
@@ -847,14 +847,14 @@ Cddb_Write_Result_To_File (EtCDDBDialog *self,
 
         if (bytes_read < 0)
         {
-            Log_Print (LOG_ERROR, _("Error when reading CDDB response (%s)"),
+            Log_Print (LOG_ERROR, _("Error when reading CDDB response ‘%s’"),
                       g_strerror(errno));
             return -1; // Error!
         }
 
     } else
     {
-        Log_Print (LOG_ERROR, _("Cannot create file '%s' (%s)"), file_path,
+        Log_Print (LOG_ERROR, _("Cannot create file ‘%s’: %s"), file_path,
                   g_strerror(errno));
     }
     g_free(file_path);
@@ -916,7 +916,8 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
         // Local access
         if ( (file=fopen(cddb_server_cgi_path,"r"))==0 )
         {
-            Log_Print(LOG_ERROR,_("Can't load file: '%s' (%s)."),cddb_server_cgi_path,g_strerror(errno));
+            Log_Print (LOG_ERROR, _("Cannot load file ‘%s’: %s"),
+                       cddb_server_cgi_path, g_strerror (errno));
             return FALSE;
         }
 
@@ -990,7 +991,8 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
         while (gtk_events_pending()) gtk_main_iteration();
         if ( (bytes_written=send(socket_id,cddb_in,strlen(cddb_in)+1,0)) < 0)
         {
-            Log_Print(LOG_ERROR,_("Cannot send the request (%s)"),g_strerror(errno));
+            Log_Print (LOG_ERROR, _("Cannot send the request ‘%s’"),
+                       g_strerror (errno));
             Cddb_Close_Connection (self, socket_id);
             g_free(cddb_in);
             g_free (proxy_hostname);
@@ -1025,7 +1027,8 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
                        // For gnudb (don't check CDDB header)
                        if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0 )
                    {
-                       gchar *msg = g_strdup_printf(_("The server returned a bad response: %s"),cddb_out);
+                       gchar *msg = g_strdup_printf (_("The server returned a bad response ‘%s’"),
+                                                      cddb_out);
                        gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
                        Log_Print(LOG_ERROR,"%s",msg);
                        g_free(msg);
@@ -1040,7 +1043,8 @@ Cddb_Get_Album_Tracks_List (EtCDDBDialog *self, GtkTreeSelection* selection)
                        if ( Cddb_Read_Http_Header(&file,&cddb_out) <= 0
                      || Cddb_Read_Cddb_Header(&file,&cddb_out) <= 0 )
                    {
-                       gchar *msg = g_strdup_printf(_("The server returned a bad response: %s"),cddb_out);
+                       gchar *msg = g_strdup_printf (_("The server returned a bad response ‘%s’"),
+                                                      cddb_out);
                        gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
                        Log_Print(LOG_ERROR,"%s",msg);
                        g_free(msg);
@@ -1613,7 +1617,8 @@ Cddb_Search_Album_List_From_String_Freedb (EtCDDBDialog *self)
     while (gtk_events_pending()) gtk_main_iteration();
     if ( (bytes_written=send(socket_id,cddb_in,strlen(cddb_in)+1,0)) < 0)
     {
-        Log_Print(LOG_ERROR,_("Cannot send the request (%s)"),g_strerror(errno));
+        Log_Print (LOG_ERROR, _("Cannot send the request ‘%s’"),
+                   g_strerror (errno));
         Cddb_Close_Connection (self, socket_id);
         g_free(cddb_in);
         g_free(string);
@@ -1662,7 +1667,8 @@ Cddb_Search_Album_List_From_String_Freedb (EtCDDBDialog *self)
     // Parse server answer : Check returned code in the first line
     if (Cddb_Read_Http_Header(&file,&cddb_out) <= 0 || !cddb_out) // Order is important!
     {
-        msg = g_strdup_printf(_("The server returned a bad response: %s"),cddb_out);
+        msg = g_strdup_printf (_("The server returned a bad response ‘%s’"),
+                               cddb_out);
         gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
         Log_Print(LOG_ERROR,"%s",msg);
         g_free(msg);
@@ -1962,7 +1968,8 @@ Cddb_Search_Album_List_From_String_Gnudb (EtCDDBDialog *self)
         while (gtk_events_pending()) gtk_main_iteration();
         if ( (bytes_written=send(socket_id,cddb_in,strlen(cddb_in)+1,0)) < 0)
         {
-            Log_Print(LOG_ERROR,_("Cannot send the request (%s)"),g_strerror(errno));
+            Log_Print (LOG_ERROR, _("Cannot send the request ‘%s’"),
+                       g_strerror (errno));
             Cddb_Close_Connection (self, socket_id);
             g_free (cddb_in);
             g_free (string);
@@ -2011,7 +2018,8 @@ Cddb_Search_Album_List_From_String_Gnudb (EtCDDBDialog *self)
         file = NULL;
         if (Cddb_Read_Http_Header(&file,&cddb_out) <= 0 || !cddb_out) // Order is important!
         {
-            msg = g_strdup_printf(_("The server returned a bad response: %s"),cddb_out);
+            msg = g_strdup_printf (_("The server returned a bad response ‘%s’"),
+                                   cddb_out);
             gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
             Log_Print(LOG_ERROR,"%s",msg);
             g_free(msg);
@@ -2799,8 +2807,8 @@ create_cddb_dialog (EtCDDBDialog *self)
     g_signal_connect_swapped (Button, "clicked",
                               G_CALLBACK (et_cddb_dialog_search_from_selection),
                               self);
-    gtk_widget_set_tooltip_text(Button,
-                                _("Request automatically the CDDB using the selected files (the order is 
important) to generate the CddbID"));
+    gtk_widget_set_tooltip_text (Button,
+                                _("Generate the CDDB disc ID using the selected files (the order is 
important)"));
 
     // Button to stop the search
     priv->stop_auto_search_button = gtk_button_new ();
@@ -2854,8 +2862,8 @@ create_cddb_dialog (EtCDDBDialog *self)
                                          MISC_COMBO_TEXT);
     gtk_widget_set_size_request (combo, 220, -1);
     gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, TRUE, 0);
-    gtk_widget_set_tooltip_text(combo,
-                                _("Enter the words to search (separated by a space or '+')"));
+    gtk_widget_set_tooltip_text (combo,
+                                 _("Enter the words to search (separated by a space or ‘+’)"));
     /* History List. */
     Load_Cddb_Search_String_List (priv->search_string_model, MISC_COMBO_TEXT);
 
@@ -2998,7 +3006,7 @@ create_cddb_dialog (EtCDDBDialog *self)
             /* Translators: This option is for the previous 'search in' option.
              * For instance, translate this as "Search in:" "Rock". */
             { N_("Rock"),
-              N_("included: funk, soul, rap, pop, industrial, metal, etc.") },
+              N_("includes: funk, soul, rap, pop, industrial, metal and so on") },
             /* Translators: This option is for the previous 'search in' option.
              * For instance, translate this as "Search in:" "Soundtrack". */
             { N_("Soundtrack"), N_("movies, shows") }
@@ -3061,7 +3069,8 @@ create_cddb_dialog (EtCDDBDialog *self)
     gtk_container_add(GTK_CONTAINER(priv->display_red_lines_toggle),Icon);
     gtk_box_pack_start(GTK_BOX(hbox),priv->display_red_lines_toggle,FALSE,FALSE,0);
     gtk_button_set_relief(GTK_BUTTON(priv->display_red_lines_toggle),GTK_RELIEF_NONE);
-    gtk_widget_set_tooltip_text(priv->display_red_lines_toggle,_("Show only red lines (or show all lines) in 
the 'Artist / Album' list"));
+    gtk_widget_set_tooltip_text (priv->display_red_lines_toggle,
+                                 _("Show only red lines (or show all lines) in the ‘Artist / Album’ list"));
     g_signal_connect_swapped (priv->display_red_lines_toggle, "toggled",
                               G_CALLBACK (Cddb_Display_Red_Lines_In_Result),
                               self);
@@ -3216,9 +3225,10 @@ create_cddb_dialog (EtCDDBDialog *self)
     g_signal_connect_swapped (priv->track_list_view, "button-press-event",
                               G_CALLBACK (on_track_list_button_press_event),
                               self);
-    gtk_widget_set_tooltip_text(priv->track_list_view, _("Select lines to 'apply' to "
+    gtk_widget_set_tooltip_text (priv->track_list_view,
+      _("Select lines from which tags will be applied to "
         "your files list. All lines will be processed if no line is selected.\n"
-        "You can also reorder lines in this list before using 'apply' button."));
+        "You can also reorder lines in this list before using the ‘apply’ button"));
 
     /*
      * Apply results to fields...
@@ -3304,7 +3314,8 @@ create_cddb_dialog (EtCDDBDialog *self)
     g_signal_connect_swapped (priv->apply_button, "clicked",
                               G_CALLBACK (Cddb_Set_Track_Infos_To_File_List),
                               self);
-    gtk_widget_set_tooltip_text(priv->apply_button,_("Load the selected lines or all lines (if no line 
selected)."));
+    gtk_widget_set_tooltip_text (priv->apply_button,
+                                 _("Load the selected lines or all lines (if no lines are selected)"));
 
     /*
      * Status bar
@@ -3419,8 +3430,8 @@ Cddb_Read_Line (FILE **file, gchar **cddb_out)
 
         if ((*file = fopen (file_path, "r")) == 0)
         {
-            Log_Print (LOG_ERROR, _("Cannot open file '%s' (%s)"), file_path,
-                       g_strerror(errno));
+            Log_Print (LOG_ERROR, _("Cannot open file ‘%s’: %s"), file_path,
+                       g_strerror (errno));
             g_free (file_path);
             return -1; // Error!
         }
@@ -3795,7 +3806,7 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
             g_free(proxy_auth);
             //g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
 
-            msg = g_strdup_printf(_("Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"),
+            msg = g_strdup_printf(_("Sending request (disc ID: %s, #tracks: %d, Disc length: %d)…"),
                                 cddb_discid,num_tracks,disc_length);
             gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
             g_free(msg);
@@ -3805,7 +3816,8 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
 
             if ( (bytes_written=send(socket_id,cddb_in,strlen(cddb_in)+1,0)) < 0)
             {
-                Log_Print(LOG_ERROR,_("Cannot send the request (%s)"),g_strerror(errno));
+                Log_Print (LOG_ERROR, _("Cannot send the request ‘%s’"),
+                           g_strerror (errno));
                 Cddb_Close_Connection (self, socket_id);
                 g_free (cddb_in);
                 g_free (cddb_server_name);
@@ -3843,7 +3855,8 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
             file = NULL;
             if (Cddb_Read_Http_Header(&file,&cddb_out) <= 0 || !cddb_out) // Order is important!
             {
-                msg = g_strdup_printf(_("The server returned a bad response: %s"),cddb_out);
+                msg = g_strdup_printf (_("The server returned a bad response ‘%s’"),
+                                       cddb_out);
                 gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
                 Log_Print(LOG_ERROR,"%s",msg);
                 g_free(msg);
@@ -3956,7 +3969,10 @@ et_cddb_dialog_search_from_selection (EtCDDBDialog *self)
 
     }
 
-    msg = g_strdup_printf(ngettext("DiscID '%s' gave one matching album","DiscID '%s' gave %d matching 
albums",g_list_length(priv->album_list)),cddb_discid,g_list_length(priv->album_list));
+    msg = g_strdup_printf (ngettext ("DiscID ‘%s’ gave one matching album",
+                                     "DiscID ‘%s’ gave %d matching albums",
+                                     g_list_length (priv->album_list)),
+                           cddb_discid, g_list_length (priv->album_list));
     gtk_statusbar_push(GTK_STATUSBAR(priv->status_bar),priv->status_bar_context,msg);
     g_free(msg);
 
diff --git a/src/charset.c b/src/charset.c
index 93fa925..06a7b44 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -511,8 +511,10 @@ filename_to_display (const gchar *string)
         if (!ret)
         {
             gchar *escaped_str = g_strescape(string, NULL);
-            Log_Print(LOG_ERROR,_("The filename '%s' couldn't be converted into UTF-8 (%s)."),
-                        escaped_str, error && error->message ? error->message : _("Invalid UTF-8"));
+            Log_Print (LOG_ERROR,
+                       _("The filename ‘%s’ could not be converted into UTF-8: %s"),
+                        escaped_str,
+                        error && error->message ? error->message : _("Invalid UTF-8"));
             g_clear_error(&error);
 
             ret = escaped_str;
@@ -622,8 +624,10 @@ gchar *filename_from_display (const gchar *string)
     {
         // Conversion KO!
         gchar *escaped_str = g_strescape(string, NULL);
-        Log_Print(LOG_ERROR,_("The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."),
-                    escaped_str, error && error->message ? error->message : _("Invalid UTF-8"));
+        Log_Print (LOG_ERROR,
+                   _("The UTF-8 string ‘%s’ could not be converted into filename encoding: %s"),
+                    escaped_str,
+                    error && error->message ? error->message : _("Invalid UTF-8"));
         g_clear_error(&error);
 
         ret = escaped_str;
@@ -685,8 +689,10 @@ gchar *Try_To_Validate_Utf8_String (const gchar *string)
         if (!ret)
         {
             gchar *escaped_str = g_strescape(string, NULL);
-            Log_Print(LOG_ERROR,_("The string '%s' couldn't be converted into UTF-8 (%s)."),
-                        escaped_str, error && error->message ? error->message : _("Invalid UTF-8"));
+            Log_Print (LOG_ERROR,
+                       _("The string ‘%s’ could not be converted into UTF-8: %s"),
+                        escaped_str,
+                        error && error->message ? error->message : _("Invalid UTF-8"));
             g_clear_error(&error);
 
             ret = escaped_str;
diff --git a/src/easytag.c b/src/easytag.c
index ac1393f..6d38a5a 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -287,7 +287,9 @@ Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files)
                                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                            GTK_MESSAGE_WARNING,
                                            GTK_BUTTONS_NONE,
-                                           ngettext("A file was changed by an external program","%d files 
were changed by an external program.",nb_files_changed_by_ext_program),
+                                           ngettext ("A file was changed by an external program",
+                                                     "%d files were changed by an external program",
+                                                     nb_files_changed_by_ext_program),
                                            nb_files_changed_by_ext_program);
         gtk_dialog_add_buttons (GTK_DIALOG (msgdialog), _("_Discard"),
                                 GTK_RESPONSE_NO, _("_Save"), GTK_RESPONSE_YES,
@@ -499,7 +501,7 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
                                                GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                                GTK_MESSAGE_QUESTION,
                                                GTK_BUTTONS_NONE,
-                                               _("Do you want to write the tag of file '%s'?"),
+                                               _("Do you want to write the tag of file ‘%s’?"),
                                                basename_cur_utf8);
             gtk_window_set_title(GTK_WINDOW(msgdialog),_("Confirm Tag Writing"));
             if (multiple_files)
@@ -596,22 +598,23 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
                     // Directories and filename changed
                     msgdialog_title = g_strdup (_("Rename File and Directory"));
                     msg = g_strdup(_("File and directory rename confirmation required"));
-                    msg1 = g_strdup_printf(_("Do you want to rename the file and directory '%s' to '%s'?"),
+                    msg1 = g_strdup_printf (_("Do you want to rename the file and directory ‘%s’ to ‘%s’?"),
                                            filename_cur_utf8, filename_new_utf8);
                 }else
                 {
                     // Only directories changed
                     msgdialog_title = g_strdup (_("Rename Directory"));
                     msg = g_strdup(_("Directory rename confirmation required"));
-                    msg1 = g_strdup_printf(_("Do you want to rename the directory '%s' to '%s'?"),
-                                           dirname_cur_utf8, dirname_new_utf8);
+                    msg1 = g_strdup_printf (_("Do you want to rename the directory ‘%s’ to ‘%s’?"),
+                                            dirname_cur_utf8,
+                                            dirname_new_utf8);
                 }
             }else
             {
                 // Only filename changed
                 msgdialog_title = g_strdup (_("Rename File"));
                 msg = g_strdup(_("File rename confirmation required"));
-                msg1 = g_strdup_printf(_("Do you want to rename the file '%s' to '%s'?"),
+                msg1 = g_strdup_printf (_("Do you want to rename the file ‘%s’ to ‘%s’?"),
                                        basename_cur_utf8, basename_new_utf8);
             }
 
@@ -683,7 +686,7 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
                                                             GTK_DIALOG_MODAL | 
GTK_DIALOG_DESTROY_WITH_PARENT,
                                                             GTK_MESSAGE_ERROR,
                                                             GTK_BUTTONS_CLOSE,
-                                                            _("Cannot rename file '%s' to '%s'"),
+                                                            _("Cannot rename file ‘%s’ to ‘%s’"),
                                                             filename_cur_utf8,
                                                             filename_new_utf8);
                         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
@@ -697,7 +700,7 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
                     }
 
                     Log_Print (LOG_ERROR,
-                               _("Cannot rename file '%s' to '%s': %s"),
+                               _("Cannot rename file ‘%s’ to ‘%s’: %s"),
                                filename_cur_utf8, filename_new_utf8,
                                error->message);
 
@@ -815,7 +818,7 @@ Write_File_Tag (ET_File *ETFile, gboolean hide_msgbox)
     GtkWidget *msgdialog;
 
     basename_utf8 = g_path_get_basename(cur_filename_utf8);
-    msg = g_strdup_printf(_("Writing tag of '%s'"),basename_utf8);
+    msg = g_strdup_printf (_("Writing tag of ‘%s’"),basename_utf8);
     et_application_window_status_bar_message (ET_APPLICATION_WINDOW (MainWindow),
                                               msg, TRUE);
     g_free(msg);
@@ -837,7 +840,7 @@ Write_File_Tag (ET_File *ETFile, gboolean hide_msgbox)
                              GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                              GTK_MESSAGE_ERROR,
                              GTK_BUTTONS_CLOSE,
-                             _("Cannot write tag in file '%s'"),
+                             _("Cannot write tag in file ‘%s’"),
                              basename_utf8);
         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
                                                   "%s", error->message);
@@ -915,7 +918,7 @@ gboolean Read_Directory (gchar *path_real)
                                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                            GTK_MESSAGE_ERROR,
                                            GTK_BUTTONS_CLOSE,
-                                           _("Cannot read directory '%s'"),
+                                           _("Cannot read directory ‘%s’"),
                                            path_utf8);
         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
                                                   "%s", error->message);
@@ -964,7 +967,7 @@ gboolean Read_Directory (gchar *path_real)
         gchar *filename_real = l->data; /* Contains real filenames. */
         gchar *filename_utf8 = filename_to_display(filename_real);
 
-        msg = g_strdup_printf(_("File: '%s'"),filename_utf8);
+        msg = g_strdup_printf (_("File: ‘%s’"), filename_utf8);
         et_application_window_status_bar_message (window, msg, FALSE);
         g_free(msg);
         g_free(filename_utf8);
@@ -1107,7 +1110,7 @@ read_directory_recursively (GList *file_list, GFileEnumerator *dir_enumerator,
                     if (!childdir_enumerator)
                     {
                         Log_Print (LOG_ERROR,
-                                   _("Error opening directory '%s' (%s)"),
+                                   _("Error opening directory ‘%s’: %s"),
                                    file_name, child_error->message);
                         g_error_free (child_error);
                         g_object_unref (child_dir);
@@ -1143,7 +1146,7 @@ read_directory_recursively (GList *file_list, GFileEnumerator *dir_enumerator,
 
     if (error)
     {
-        Log_Print (LOG_ERROR, _("Cannot read directory (%s)"), error->message);
+        Log_Print (LOG_ERROR, _("Cannot read directory ‘%s’"), error->message);
         g_error_free (error);
     }
 
diff --git a/src/et_core.c b/src/et_core.c
index 94c2614..0381bd7 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -538,7 +538,7 @@ GList *ET_Add_File_To_File_List (gchar *filename)
             if (!ogg_tag_read_file_tag (filename, FileTag, &error))
             {
                 Log_Print (LOG_ERROR,
-                           _("Error reading tag from ogg file (%s)"),
+                           _("Error reading tag from Ogg file ‘%s’"),
                            error->message);
                 g_clear_error (&error);
             }
@@ -567,7 +567,7 @@ GList *ET_Add_File_To_File_List (gchar *filename)
             if (!et_opus_tag_read_file_tag (file, FileTag, &error))
             {
                 Log_Print (LOG_ERROR,
-                           _("Error reading tag from Opus file (%s)"),
+                           _("Error reading tag from Opus file ‘%s’"),
                            error->message);
                 g_clear_error (&error);
             }
@@ -575,6 +575,7 @@ GList *ET_Add_File_To_File_List (gchar *filename)
 #endif
         case UNKNOWN_TAG:
         default:
+            /* FIXME: Translatable string. */
             Log_Print(LOG_ERROR,"FileTag: Undefined tag type (%d) for file 
%s",ETFileDescription->TagType,filename_utf8);
             break;
     }
@@ -625,7 +626,8 @@ GList *ET_Add_File_To_File_List (gchar *filename)
         case OPUS_FILE:
             if (!et_opus_read_file_info (file, ETFileInfo, &error))
             {
-                Log_Print (LOG_ERROR, _("Error while querying information for file '%s': %s"),
+                Log_Print (LOG_ERROR,
+                           _("Error while querying information for file ‘%s’: %s"),
                            filename_utf8, error->message);
                 g_error_free (error);
             }
@@ -633,11 +635,13 @@ GList *ET_Add_File_To_File_List (gchar *filename)
 #endif
         case UNKNOWN_FILE:
         default:
+            /* FIXME: Translatable string. */
             Log_Print(LOG_ERROR,"ETFileInfo: Undefined file type (%d) for file 
%s",ETFileDescription->FileType,filename_utf8);
             /* To get at least the file size. */
             if (!et_core_read_file_info (filename, ETFileInfo, &error))
             {
-                Log_Print (LOG_ERROR, _("Error while querying information for file '%s': %s"),
+                Log_Print (LOG_ERROR,
+                           _("Error while querying information for file ‘%s’: %s"),
                            filename_utf8, error->message);
                 g_error_free (error);
             }
@@ -710,7 +714,8 @@ GList *ET_Add_File_To_File_List (gchar *filename)
     FileName = (File_Name *)ETFile->FileNameNew->data;
     if ( (FileName && FileName->saved==FALSE) || (FileTag && FileTag->saved==FALSE) )
     {
-        Log_Print(LOG_INFO,_("Automatic corrections applied for file '%s'."), filename_utf8);
+        Log_Print (LOG_INFO, _("Automatic corrections applied for file ‘%s’"),
+                   filename_utf8);
     }
 
     /* Add the item to the ArtistAlbum list (placed here to take advantage of previous changes) */
@@ -2855,7 +2860,7 @@ void ET_Display_File_Data_To_UI (ET_File *ETFile)
             break;
     }
 
-    msg = g_strdup_printf(_("File: '%s'"), cur_filename_utf8);
+    msg = g_strdup_printf (_("File: ‘%s’"), cur_filename_utf8);
     et_application_window_status_bar_message (window, msg, FALSE);
     g_free (msg);
 }
@@ -3044,7 +3049,7 @@ ET_Save_File_Name_From_UI (ET_File *ETFile, File_Name *FileName)
                                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                            GTK_MESSAGE_ERROR,
                                            GTK_BUTTONS_CLOSE,
-                                           _("Could not convert filename '%s' into system filename 
encoding"),
+                                           _("Could not convert filename ‘%s’ to system filename encoding"),
                                            filename_escaped_utf8);
         gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msgdialog),_("Try setting the 
environment variable G_FILENAME_ENCODING."));
         gtk_window_set_title(GTK_WINDOW(msgdialog), _("Filename translation"));
@@ -3504,7 +3509,7 @@ ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error)
         if (*error == NULL)
         {
             g_set_error (error, G_IO_ERROR, G_IO_ERROR_UNKNOWN,
-                         _("Error writing tag type %d to file %s (%s)"),
+                         _("Error writing tag type ‘%d’ to file ‘%s’: %s"),
                          ETFileDescription->TagType, cur_filename_utf8,
                          g_strerror (EIO));
         }
diff --git a/src/file_area.c b/src/file_area.c
index 3853282..80ca5c1 100644
--- a/src/file_area.c
+++ b/src/file_area.c
@@ -309,7 +309,7 @@ et_file_area_set_file_fields (EtFileArea *self,
         }
         else
         {
-            Log_Print (LOG_ERROR, _("Cannot query file information (%s)"),
+            Log_Print (LOG_ERROR, _("Cannot query file information ‘%s’"),
                        error->message);
             g_error_free (error);
             g_object_unref (file);
diff --git a/src/load_files_dialog.c b/src/load_files_dialog.c
index 6a3b8d4..7cf192d 100644
--- a/src/load_files_dialog.c
+++ b/src/load_files_dialog.c
@@ -218,7 +218,7 @@ set_load_button_sensitivity (GtkWidget *button, GtkWidget *chooser)
 
         if (!info)
         {
-            Log_Print (LOG_ERROR, _("Cannot retrieve file info (%s)"),
+            Log_Print (LOG_ERROR, _("Cannot query file information ‘%s’"),
                        error->message);
             g_error_free (error);
             return;
@@ -258,7 +258,7 @@ Load_File_Content (G_GNUC_UNUSED GtkButton *button, gpointer user_data)
 
     if (!istream)
     {
-        Log_Print (LOG_ERROR, _("Can't open file '%s' (%s)"), filename_utf8,
+        Log_Print (LOG_ERROR, _("Cannot open file ‘%s’: %s"), filename_utf8,
                    error->message);
         g_error_free (error);
         g_object_unref (file);
@@ -288,7 +288,7 @@ Load_File_Content (G_GNUC_UNUSED GtkButton *button, gpointer user_data)
 
     if (error)
     {
-        Log_Print (LOG_ERROR, _("Error reading file (%s)"), error->message);
+        Log_Print (LOG_ERROR, _("Error reading file ‘%s’"), error->message);
         g_error_free (error);
     }
 
@@ -640,11 +640,11 @@ create_load_file_content_view_popup (EtLoadFilesDialog *self)
     MenuItem = gtk_menu_item_new();
     gtk_menu_shell_append(GTK_MENU_SHELL(BrowserPopupMenu),MenuItem);
 
-    MenuItem = gtk_menu_item_new_with_label(_("Move up this line"));
+    MenuItem = gtk_menu_item_new_with_label (_("Move this line up"));
     gtk_menu_shell_append(GTK_MENU_SHELL(BrowserPopupMenu),MenuItem);
     g_signal_connect_swapped(G_OBJECT(MenuItem),"activate", 
G_CALLBACK(Load_Filename_List_Move_Up),G_OBJECT(list));
 
-    MenuItem = gtk_menu_item_new_with_label(_("Move down this line"));
+    MenuItem = gtk_menu_item_new_with_label (_("Move this line down"));
     gtk_menu_shell_append(GTK_MENU_SHELL(BrowserPopupMenu),MenuItem);
     g_signal_connect_swapped(G_OBJECT(MenuItem),"activate", 
G_CALLBACK(Load_Filename_List_Move_Down),G_OBJECT(list));
 
@@ -743,11 +743,11 @@ create_load_file_name_view_popup (EtLoadFilesDialog *self)
     MenuItem = gtk_menu_item_new();
     gtk_menu_shell_append(GTK_MENU_SHELL(BrowserPopupMenu),MenuItem);
 
-    MenuItem = gtk_menu_item_new_with_label (_("Move up this line"));
+    MenuItem = gtk_menu_item_new_with_label (_("Move this line up"));
     gtk_menu_shell_append(GTK_MENU_SHELL(BrowserPopupMenu),MenuItem);
     g_signal_connect_swapped(G_OBJECT(MenuItem),"activate", 
G_CALLBACK(Load_Filename_List_Move_Up),G_OBJECT(list));
 
-    MenuItem = gtk_menu_item_new_with_label (_("Move down this line"));
+    MenuItem = gtk_menu_item_new_with_label (_("Move this line down"));
     gtk_menu_shell_append(GTK_MENU_SHELL(BrowserPopupMenu),MenuItem);
     g_signal_connect_swapped(G_OBJECT(MenuItem),"activate", 
G_CALLBACK(Load_Filename_List_Move_Down),G_OBJECT(list));
 
diff --git a/src/misc.c b/src/misc.c
index 984a17d..2f0f05f 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -333,7 +333,7 @@ et_run_program (const gchar *program_name, GList *args_list)
     {
         g_child_watch_add (pid, et_on_child_exited, NULL);
 
-        msg = g_strdup_printf (_("Executed command: %s"), program_name);
+        msg = g_strdup_printf (_("Executed command ‘%s’"), program_name);
         et_application_window_status_bar_message (ET_APPLICATION_WINDOW (MainWindow),
                                                   msg, TRUE);
         g_free (msg);
@@ -341,7 +341,7 @@ et_run_program (const gchar *program_name, GList *args_list)
     }
     else
     {
-        Log_Print (LOG_ERROR, _("Failed to launch program: %s"),
+        Log_Print (LOG_ERROR, _("Failed to launch program ‘%s’"),
                    error->message);
         g_clear_error (&error);
     }
@@ -452,7 +452,7 @@ et_run_audio_player (GList *files)
     if (!g_app_info_launch (app_info, files, G_APP_LAUNCH_CONTEXT (context),
                             &error))
     {
-        Log_Print (LOG_ERROR, _("Failed to launch program: %s"),
+        Log_Print (LOG_ERROR, _("Failed to launch program ‘%s’"),
                    error->message);
         g_error_free (error);
     }
diff --git a/src/picture.c b/src/picture.c
index a743b5a..0c3d040 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -200,7 +200,7 @@ Picture_Type_String (EtPictureType type)
         case ET_PICTURE_TYPE_OTHER:
             return _("Other");
         case ET_PICTURE_TYPE_FILE_ICON:
-            return _("32x32 pixel PNG file icon");
+            return _("32×32 pixel PNG file icon");
         case ET_PICTURE_TYPE_OTHER_FILE_ICON:
             return _("Other file icon");
         case ET_PICTURE_TYPE_FRONT_COVER:
@@ -210,7 +210,7 @@ Picture_Type_String (EtPictureType type)
         case ET_PICTURE_TYPE_LEAFLET_PAGE:
             return _("Leaflet page");
         case ET_PICTURE_TYPE_MEDIA:
-            return _("Media (e.g. label side of CD)");
+            return _("Media (such as label side of CD)");
         case ET_PICTURE_TYPE_LEAD_ARTIST_LEAD_PERFORMER_SOLOIST:
             return _("Lead artist/lead performer/soloist");
         case ET_PICTURE_TYPE_ARTIST_PERFORMER:
diff --git a/src/playlist_dialog.c b/src/playlist_dialog.c
index 5ad2058..0bfd973 100644
--- a/src/playlist_dialog.c
+++ b/src/playlist_dialog.c
@@ -525,7 +525,7 @@ write_button_clicked (EtPlaylistDialog *self)
                                                GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                                GTK_MESSAGE_ERROR,
                                                GTK_BUTTONS_CLOSE,
-                                               _("Cannot write playlist file '%s'"),
+                                               _("Cannot write playlist file ‘%s’"),
                                                playlist_name_utf8);
             gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
                                                       "%s", error->message);
@@ -537,7 +537,8 @@ write_button_clicked (EtPlaylistDialog *self)
         }else
         {
             gchar *msg;
-            msg = g_strdup_printf(_("Written playlist file '%s'"),playlist_name_utf8);
+            msg = g_strdup_printf (_("Wrote playlist file ‘%s’"),
+                                   playlist_name_utf8);
             et_application_window_status_bar_message (ET_APPLICATION_WINDOW (MainWindow),
                                                       msg, TRUE);
             g_free (msg);
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index 6269a9c..2ee43b7 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -1118,9 +1118,9 @@ Check_DefaultPathToMp3 (EtPreferencesDialog *self)
                                                 GTK_MESSAGE_ERROR,
                                                 GTK_BUTTONS_CLOSE,
                                                 "%s",
-                                                _("The selected path for 'Default path to files' is 
invalid"));
+                                                _("The selected default path is invalid"));
             gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
-                                                      _("Path: '%s'\nError: %s"),
+                                                      _("Path: ‘%s’\nError: %s"),
                                                       path_utf8,
                                                       g_strerror (errno));
             gtk_window_set_title (GTK_WINDOW (msgdialog),
diff --git a/src/scan_dialog.c b/src/scan_dialog.c
index 714c04a..5c12ccf 100644
--- a/src/scan_dialog.c
+++ b/src/scan_dialog.c
@@ -307,7 +307,7 @@ Scan_Tag_With_Mask (EtScanDialog *self, ET_File *ETFile)
                 else
                 {
                     Log_Print (LOG_ERROR,
-                               _("Cannot calculate CRC value of file (%s)"),
+                               _("Cannot calculate CRC value of file ‘%s’"),
                                error->message);
                     g_error_free (error);
                 }
@@ -326,7 +326,7 @@ Scan_Tag_With_Mask (EtScanDialog *self, ET_File *ETFile)
                                               _("Tag successfully scanned"),
                                               TRUE);
     filename_utf8 = g_path_get_basename( ((File_Name *)ETFile->FileNameNew->data)->value_utf8 );
-    Log_Print(LOG_OK,_("Tag successfully scanned: %s"),filename_utf8);
+    Log_Print (LOG_OK, _("Tag successfully scanned ‘%s’"), filename_utf8);
     g_free(filename_utf8);
 }
 
@@ -368,7 +368,9 @@ Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
     if (i==ET_FILE_DESCRIPTION_SIZE)
     {
         gchar *tmp1 = g_path_get_basename(filename_utf8);
-        Log_Print(LOG_ERROR,_("Tag scanner: strange… the extension '%s' was not found in filename 
'%s'"),tmp,tmp1);
+        Log_Print (LOG_ERROR,
+                   _("The extension ‘%s’ was not found in filename ‘%s’"), tmp,
+                   tmp1);
         g_free(tmp1);
     }
 
@@ -456,7 +458,9 @@ Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
                     file_seq = file_seq + len; // We remove it
                 }else
                 {
-                    Log_Print(LOG_ERROR,_("Scan Error: can't find separator '%s' within 
'%s'"),buf,file_seq_utf8);
+                    Log_Print (LOG_ERROR,
+                               _("Cannot find separator ‘%s’ within ‘%s’"),
+                               buf, file_seq_utf8);
                 }
                 g_free(buf);
             }
@@ -485,7 +489,9 @@ Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
                 // Try to find the separator in 'file_seq'
                 if ( (tmp=strstr(file_seq,separator)) == NULL )
                 {
-                    Log_Print(LOG_ERROR,_("Scan Error: can't find separator '%s' within 
'%s'"),separator,file_seq_utf8);
+                    Log_Print (LOG_ERROR,
+                               _("Cannot find separator ‘%s’ within ‘%s’"),
+                               separator, file_seq_utf8);
                     separator[0] = 0; // Needed to avoid error when calculting 'len' below
                 }
 
@@ -708,7 +714,7 @@ Scan_Rename_File_With_Mask (EtScanDialog *self, ET_File *ETFile)
                              GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                              GTK_MESSAGE_ERROR,
                              GTK_BUTTONS_CLOSE,
-                             _("Could not convert filename '%s' into system filename encoding"),
+                             _("Could not convert filename ‘%s’ into system filename encoding"),
                              filename_generated_utf8);
         gtk_window_set_title(GTK_WINDOW(msgdialog),_("Filename translation"));
 
@@ -737,7 +743,7 @@ Scan_Rename_File_With_Mask (EtScanDialog *self, ET_File *ETFile)
                                               TRUE);
 
     filename_new_utf8 = g_path_get_basename(((File_Name *)ETFile->FileNameNew->data)->value_utf8);
-    Log_Print (LOG_OK, _("New filename successfully scanned: %s"),
+    Log_Print (LOG_OK, _("New filename successfully scanned ‘%s’"),
                filename_new_utf8);
     g_free(filename_new_utf8);
 
@@ -1093,7 +1099,7 @@ out:
     return;
 
 handle_error:
-    Log_Print (LOG_ERROR, _("Error while processing fields: %s"),
+    Log_Print (LOG_ERROR, _("Error while processing fields ‘%s’"),
                regex_error->message);
 
     g_error_free (regex_error);
@@ -2200,7 +2206,7 @@ Mask_Editor_List_Remove (EtScanDialog *self)
     treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(priv->mask_editor_view));
 
     if (gtk_tree_selection_count_selected_rows(selection) == 0) {
-        Log_Print(LOG_ERROR,_("Remove: No row selected"));
+        g_critical ("%s", "Remove: No row selected");
         return;
     }
 
@@ -2300,7 +2306,7 @@ Mask_Editor_List_Move_Up (EtScanDialog *self)
 
     if (!selectedRows)
     {
-        Log_Print(LOG_ERROR,_("Move Up: No row selected"));
+        g_critical ("%s", "Move Up: No row selected");
         return;
     }
 
@@ -2345,7 +2351,7 @@ Mask_Editor_List_Move_Down (EtScanDialog *self)
 
     if (!selectedRows)
     {
-        Log_Print(LOG_ERROR,_("Move Down: No row selected"));
+        g_critical ("%s", "Move Down: No row selected");
         return;
     }
 
@@ -2410,7 +2416,7 @@ Mask_Editor_List_Duplicate (EtScanDialog *self)
 
     if (!selectedRows)
     {
-        Log_Print(LOG_ERROR,_("Copy: No row selected"));
+        g_critical ("%s", "Copy: No row selected");
         return;
     }
 
@@ -2635,7 +2641,7 @@ create_scan_dialog (EtScanDialog *self)
     gtk_box_pack_start(GTK_BOX(HBox2),priv->scan_tag_mask_combo,TRUE,TRUE,2);
     gtk_widget_set_tooltip_text(GTK_WIDGET(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(priv->scan_tag_mask_combo)))),
         _("Select or type in a mask using codes (see Legend) to parse "
-        "filename and path. Used to fill in tag fields"));
+        "filename and directory. Used to fill in tag fields"));
     /* Signal to generate preview (preview of the new tag values). */
     g_signal_connect_swapped (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->scan_tag_mask_combo))),
                               "changed",
@@ -2689,7 +2695,7 @@ create_scan_dialog (EtScanDialog *self)
     gtk_button_set_relief (GTK_BUTTON (Button), GTK_RELIEF_NONE);
     g_signal_connect_swapped (Button, "clicked",
                               G_CALLBACK (Scan_Rename_File_Prefix_Path), self);
-    gtk_widget_set_tooltip_text (Button, _("Prefix mask with current path"));
+    gtk_widget_set_tooltip_text (Button, _("Prefix mask with current directory"));
 
     // Set up list model which is used both by the combobox and the editor
     priv->rename_masks_model = gtk_list_store_new(MASK_EDITOR_COUNT, G_TYPE_STRING);
@@ -2704,8 +2710,8 @@ create_scan_dialog (EtScanDialog *self)
     gtk_container_set_border_width(GTK_CONTAINER(HBox4), 2);
     
gtk_widget_set_tooltip_text(GTK_WIDGET(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(priv->rename_file_mask_combo)))),
         _("Select or type in a mask using codes (see Legend) to parse tag fields. "
-        "Used to rename the file.\nUse / to make directories. If the first character "
-        "is /, it's a absolute path, otherwise is relative to the old path."));
+        "Used to rename the file.\nUse ‘/’ to make directories. If the first character "
+        "is ‘/’, it is an absolute path, otherwise is relative to the old path"));
     // Signal to generate preview (preview of the new filename)
     g_signal_connect_swapped (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (priv->rename_file_mask_combo))),
                               "changed",
@@ -2838,10 +2844,10 @@ create_scan_dialog (EtScanDialog *self)
     /* Group: character conversion */
     group = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_box_pack_start (GTK_BOX (VBox), group, FALSE, FALSE, 0);
-    priv->process_convert_to_space_toggle = gtk_radio_button_new_with_label_from_widget (NULL, _("Convert 
'_' and '%20' to spaces"));
+    priv->process_convert_to_space_toggle = gtk_radio_button_new_with_label_from_widget (NULL, _("Convert 
‘_’ and ‘%20’ to spaces"));
     gtk_widget_set_name (priv->process_convert_to_space_toggle, "spaces");
     priv->process_convert_to_underscores_toggle = gtk_radio_button_new_with_label_from_widget 
(GTK_RADIO_BUTTON (priv->process_convert_to_space_toggle),
-                                                                             _("Convert ' ' to '_'"));
+                                                                             _("Convert ‘ ’ to ‘_’"));
     gtk_widget_set_name (priv->process_convert_to_underscores_toggle,
                          "underscores");
     gtk_box_pack_start (GTK_BOX (group), priv->process_convert_to_space_toggle, FALSE,
@@ -2912,13 +2918,13 @@ create_scan_dialog (EtScanDialog *self)
 
     /* Tooltips */
     gtk_widget_set_tooltip_text(priv->process_convert_to_space_toggle,
-        _("The underscore character or the string '%20' are replaced by one space. "
-          "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."));
+        _("The underscore character or the string ‘%20’ is replaced by one space. "
+          "Example, before: ‘Text%20In%20An_Entry‘, after: ‘Text In An Entry’"));
     gtk_widget_set_tooltip_text(priv->process_convert_to_underscores_toggle,
         _("The space character is replaced by one underscore character. "
-          "Example, before: 'Text In An Entry', after: 'Text_In_An_Entry'."));
+          "Example, before: ‘Text In An Entry’, after: ‘Text_In_An_Entry’"));
     gtk_widget_set_tooltip_text(priv->process_convert_toggle,
-        _("Replace a string by another one. Note that the search is case sensitive."));
+        _("Replace a string by another one. Note that the search is case sensitive"));
 
     hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
     
diff --git a/src/setting.c b/src/setting.c
index 2e3e24f..54e807d 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -143,7 +143,7 @@ static void check_or_create_file (const gchar *filename)
     }
     else
     {
-        Log_Print (LOG_ERROR, _("Cannot create or open file '%s' (%s)"),
+        Log_Print (LOG_ERROR, _("Cannot create or open file ‘%s’: %s"),
                    CONFIG_FILE, g_strerror (errno));
     }
 
@@ -194,7 +194,7 @@ Save_List_Store_To_File (const gchar *filename, GtkListStore *liststore, gint co
 
     if (!Create_Easytag_Directory () || (file = fopen (file_path, "w+")) == NULL)
     {
-        Log_Print (LOG_ERROR, _("Error: Cannot write list to file: %s (%s)"),
+        Log_Print (LOG_ERROR, _("Cannot write list to file ‘%s’: %s"),
                    file_path, g_strerror (errno));
     }else
     {
@@ -212,7 +212,7 @@ Save_List_Store_To_File (const gchar *filename, GtkListStore *liststore, gint co
             {
                 if (fwrite (data->str, data->len, 1, file) != 1)
                 {
-                    Log_Print (LOG_ERROR, _("Error while writing list file: %s"),
+                    Log_Print (LOG_ERROR, _("Error while writing list file ‘%s’"),
                                file_path);
                     fclose (file);
                     g_string_free (data, TRUE);
@@ -247,7 +247,7 @@ Populate_List_Store_From_File (const gchar *filename, GtkListStore *liststore, g
 
     if ((file = fopen (file_path, "r")) == NULL)
     {
-        Log_Print (LOG_ERROR, _("Cannot open file '%s' (%s)"), file_path,
+        Log_Print (LOG_ERROR, _("Cannot open file ‘%s’: %s"), file_path,
                    g_strerror (errno));
     }else
     {
@@ -291,8 +291,8 @@ Load_Scan_Tag_Masks_List (GtkListStore *liststore, gint colnum,
 
     if (!Populate_List_Store_From_File(SCAN_TAG_MASKS_FILE, liststore, colnum))
     {
-        // Fall back to defaults
-        Log_Print(LOG_OK,_("Loading default 'Fill Tag' masks…"));
+        /* Fall back to defaults. */
+        Log_Print (LOG_OK, _("Loading default ‘Fill Tag’ masks…"));
 
         while(fallback[i])
         {
@@ -321,8 +321,8 @@ Load_Rename_File_Masks_List (GtkListStore *liststore, gint colnum,
 
     if (!Populate_List_Store_From_File(RENAME_FILE_MASKS_FILE, liststore, colnum))
     {
-        // Fall back to defaults
-        Log_Print(LOG_OK,_("Loading default 'Rename File' masks…"));
+        /* Fall back to defaults. */
+        Log_Print (LOG_OK, _("Loading default ‘Rename File’ masks…"));
 
         while(fallback[i])
         {
@@ -421,7 +421,8 @@ migrate_config_file_dir (const gchar *old_path, const gchar *new_path)
                                         NULL
     };
 
-    Log_Print (LOG_OK, _("Migrating configuration from directory '%s' to '%s'"),
+    Log_Print (LOG_OK,
+               _("Migrating configuration from directory ‘%s’ to ‘%s’"),
                old_path, new_path);
 
     for (i = 0; filenames[i]; i++)
@@ -445,7 +446,7 @@ migrate_config_file_dir (const gchar *old_path, const gchar *new_path)
                           NULL, NULL))
         {
             Log_Print (LOG_ERROR,
-                       _("Failed to migrate configuration file '%s'"),
+                       _("Failed to migrate configuration file ‘%s’"),
                        filenames[i]);
         }
 
@@ -482,7 +483,7 @@ Create_Easytag_Directory (void)
 
     if (result == -1)
     {
-        Log_Print (LOG_ERROR,_("Error: Cannot create directory '%s' (%s)"),
+        Log_Print (LOG_ERROR, _("Cannot create directory ‘%s’: %s"),
                   easytag_path, g_strerror (errno));
         g_free (easytag_path);
         return FALSE;
diff --git a/src/tag_area.c b/src/tag_area.c
index 9bbdbec..721e6fa 100644
--- a/src/tag_area.c
+++ b/src/tag_area.c
@@ -183,9 +183,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with title '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with title ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed title from selected files."));
+        {
+            msg = g_strdup (_("Removed title from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->artist_entry))
     {
@@ -200,9 +205,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with artist '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with artist ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed artist from selected files."));
+        {
+            msg = g_strdup (_("Removed artist from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->album_artist_entry))
     {
@@ -216,9 +226,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with album artist '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with album artist ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed album artist from selected files."));
+        {
+            msg = g_strdup (_("Removed album artist from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->album_entry))
     {
@@ -233,9 +248,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with album '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with album ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed album name from selected files."));
+        {
+            msg = g_strdup (_("Removed album name from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->disc_number_entry))
     {
@@ -272,17 +292,17 @@ on_apply_to_selection (GObject *object,
             if (string_to_set1 != NULL
                 && g_utf8_strlen (string_to_set1, -1) > 0)
             {
-                msg = g_strdup_printf (_("Selected files tagged with disc number '%s/%s'."),
+                msg = g_strdup_printf (_("Selected files tagged with disc number ‘%s/%s’"),
                                        string_to_set, string_to_set1);
             }
             else
             {
-                msg = g_strdup_printf (_("Selected files tagged with disc number like 'xx'."));
+                msg = g_strdup_printf (_("Selected files tagged with disc number like ‘xx’"));
             }
         }
         else
         {
-            msg = g_strdup (_("Removed disc number from selected files."));
+            msg = g_strdup (_("Removed disc number from selected files"));
         }
     }
     else if (object == G_OBJECT (priv->year_entry))
@@ -298,9 +318,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with year '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with year ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed year from selected files."));
+        {
+            msg = g_strdup (_("Removed year from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->track_total_entry))
     {
@@ -326,14 +351,16 @@ on_apply_to_selection (GObject *object,
         {
             if ( string_to_set1 != NULL && g_utf8_strlen(string_to_set1, -1)>0 ) //&& atoi(string_to_set1)>0 
)
             {
-                msg = g_strdup_printf(_("Selected files tagged with track like 'xx/%s'."),string_to_set1);
+                msg = g_strdup_printf (_("Selected files tagged with track like ‘xx/%s’"),
+                                       string_to_set1);
             }else
             {
-                msg = g_strdup_printf(_("Selected files tagged with track like 'xx'."));
+                msg = g_strdup_printf (_("Selected files tagged with track like ‘xx’"));
             }
-        }else
+        }
+        else
         {
-            msg = g_strdup(_("Removed track number from selected files."));
+            msg = g_strdup (_("Removed track number from selected files"));
         }
     }
     else if (object == G_OBJECT (priv->track_sequence_button))
@@ -391,7 +418,7 @@ on_apply_to_selection (GObject *object,
         g_free(path);
         g_free(path1);
         //msg = g_strdup_printf(_("All %d tracks numbered sequentially."), 
ETCore->ETFileSelectionList_Length);
-        msg = g_strdup_printf(_("Selected tracks numbered sequentially."));
+        msg = g_strdup_printf (_("Selected tracks numbered sequentially"));
     }
     else if (object==G_OBJECT(priv->track_number_button))
     {
@@ -418,10 +445,12 @@ on_apply_to_selection (GObject *object,
 
         if ( string_to_set1 != NULL && g_utf8_strlen(string_to_set1, -1)>0 ) //&& atoi(string_to_set1)>0 )
         {
-            msg = g_strdup_printf(_("Selected files tagged with track like 'xx/%s'."),string_to_set1);
-        }else
+            msg = g_strdup_printf (_("Selected files tagged with track like ‘xx/%s’"),
+                                   string_to_set1);
+        }
+        else
         {
-            msg = g_strdup(_("Removed track number from selected files."));
+            msg = g_strdup (_("Removed track number from selected files"));
         }
     }
     else if (object == G_OBJECT (gtk_bin_get_child (GTK_BIN (priv->genre_combo_entry))))
@@ -437,9 +466,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with genre '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with genre ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed genre from selected files."));
+        {
+            msg = g_strdup (_("Removed genre from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->comment_entry))
     {
@@ -461,9 +495,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with comment '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with comment ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed comment from selected files."));
+        {
+            msg = g_strdup (_("Removed comment from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->composer_entry))
     {
@@ -477,9 +516,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with composer '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with composer ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed composer from selected files."));
+        {
+            msg = g_strdup (_("Removed composer from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->orig_artist_entry))
     {
@@ -494,9 +538,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with original artist '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with original artist ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed original artist from selected files."));
+        {
+            msg = g_strdup (_("Removed original artist from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->copyright_entry))
     {
@@ -511,9 +560,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with copyright '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with copyright ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed copyright from selected files."));
+        {
+            msg = g_strdup (_("Removed copyright from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->url_entry))
     {
@@ -528,9 +582,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with URL '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with URL ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed URL from selected files."));
+        {
+            msg = g_strdup (_("Removed URL from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->encoded_by_entry))
     {
@@ -545,9 +604,14 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (string_to_set != NULL && g_utf8_strlen(string_to_set, -1)>0)
-            msg = g_strdup_printf(_("Selected files tagged with encoder name '%s'."),string_to_set);
+        {
+            msg = g_strdup_printf (_("Selected files tagged with encoder name ‘%s’"),
+                                   string_to_set);
+        }
         else
-            msg = g_strdup(_("Removed encoder name from selected files."));
+        {
+            msg = g_strdup (_("Removed encoder name from selected files"));
+        }
     }
     else if (object == G_OBJECT (priv->apply_image_toolitem))
     {
@@ -579,10 +643,15 @@ on_apply_to_selection (GObject *object,
             ET_Manage_Changes_Of_File_Data(etfile,NULL,FileTag);
         }
         if (res)
-            msg = g_strdup (_("Selected files tagged with images."));
+        {
+            msg = g_strdup (_("Selected files tagged with images"));
+        }
         else
-            msg = g_strdup (_("Removed images from selected files."));
-        Picture_Free(res);
+        {
+            msg = g_strdup (_("Removed images from selected files"));
+        }
+
+        Picture_Free (res);
     }
 
     g_list_free(etfilelist);
@@ -745,13 +814,13 @@ on_entry_populate_popup (GtkEntry *entry,
     menu_item = gtk_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
-    menu_item = gtk_menu_item_new_with_label (_("Convert '_' and '%20' to spaces"));
+    menu_item = gtk_menu_item_new_with_label (_("Convert ‘_’ and ‘%20’ to spaces"));
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
     g_signal_connect_swapped (menu_item, "activate",
                               G_CALLBACK (Convert_P20_And_Underscore_Into_Spaces),
                               G_OBJECT (entry));
 
-    menu_item = gtk_menu_item_new_with_label (_("Convert ' ' to '_'"));
+    menu_item = gtk_menu_item_new_with_label (_("Convert ‘ ’ to ‘_’"));
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
     g_signal_connect_swapped (menu_item, "activate",
                               G_CALLBACK (Convert_Space_Into_Underscore),
@@ -1183,8 +1252,9 @@ PictureEntry_Update (EtTagArea *self,
 
             if (!gdk_pixbuf_loader_close(loader, &error))
             {
-                Log_Print(LOG_ERROR,_("Error with 'loader_close': %s"), error->message);
-                g_error_free(error);
+                Log_Print (LOG_ERROR, _("Error parsing image data ‘%s’"),
+                           error->message);
+                g_error_free (error);
             }
 
             selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->picture_entry_view));
@@ -1241,7 +1311,7 @@ PictureEntry_Update (EtTagArea *self,
                 g_object_unref(loader);
                 
                 Log_Print (LOG_ERROR, "%s",
-                           _("Cannot display the image because not enough data has been read to determine 
how to create the image buffer."));
+                           _("Cannot display the image because not enough data has been read to determine 
how to create the image buffer"));
 
                 msgdialog = gtk_message_dialog_new(GTK_WINDOW(MainWindow),
                                                    GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1256,10 +1326,12 @@ PictureEntry_Update (EtTagArea *self,
                 gtk_dialog_run(GTK_DIALOG(msgdialog));
                 gtk_widget_destroy(msgdialog);
             }
-        }else
+        }
+        else
         {
-            Log_Print(LOG_ERROR,_("Error with 'loader_write': %s"), error->message);
-            g_error_free(error);
+            Log_Print (LOG_ERROR, _("Error parsing image data ‘%s’"),
+                       error->message);
+            g_error_free (error);
         }
     }
 
@@ -1294,7 +1366,7 @@ load_picture_from_file (GFile *file,
 
     if (!info)
     {
-        Log_Print (LOG_ERROR, _("Image file not loaded: %s"), error->message);
+        Log_Print (LOG_ERROR, _("Image file not loaded ‘%s’"), error->message);
         g_error_free (error);
         return;
     }
@@ -1311,7 +1383,7 @@ load_picture_from_file (GFile *file,
                                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                             GTK_MESSAGE_ERROR,
                                             GTK_BUTTONS_CLOSE,
-                                            _("Cannot open file: '%s'"),
+                                            _("Cannot open file ‘%s’"),
                                             filename_utf8);
         gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(msgdialog),
                                                   "%s", error->message);
@@ -1319,7 +1391,7 @@ load_picture_from_file (GFile *file,
         gtk_dialog_run (GTK_DIALOG (msgdialog));
         gtk_widget_destroy (msgdialog);
 
-        Log_Print (LOG_ERROR, _("Image file not loaded: %s"),
+        Log_Print (LOG_ERROR, _("Image file not loaded ‘%s’"),
                    error->message);
         g_error_free (error);
         return;
@@ -1826,7 +1898,7 @@ on_picture_save_button_clicked (GObject *object,
 
             if (!et_picture_save_file_data (pic, file, &error))
             {
-                 Log_Print (LOG_ERROR, _("Image file not saved: %s"),
+                 Log_Print (LOG_ERROR, _("Image file not saved ‘%s’"),
                             error->message);
                  g_error_free (error);
             }
@@ -2196,7 +2268,7 @@ create_tag_area (EtTagArea *self)
                       G_CALLBACK (on_apply_to_selection), self);
     gtk_widget_set_tooltip_text (priv->track_sequence_button,
                                  _("Number selected tracks sequentially. "
-                                   "Starts at 01 in each subdirectory."));
+                                   "Starts at 01 in each subdirectory"));
     /* Pixmap into priv->track_sequence_button button. */
     image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/sequence-track.png");
     gtk_container_add (GTK_CONTAINER (priv->track_sequence_button), image);
@@ -2244,7 +2316,7 @@ create_tag_area (EtTagArea *self)
     g_signal_connect (priv->track_number_button, "clicked",
                       G_CALLBACK (on_apply_to_selection), self);
     gtk_widget_set_tooltip_text (priv->track_number_button,
-                                 _("Set the number of files, in the same directory of the displayed file, to 
the selected tracks."));
+                                 _("Set the number of files, in the same directory of the displayed file, to 
the selected tracks"));
     /* Pixmap into priv->track_number_button button. */
     image = gtk_image_new_from_resource ("/org/gnome/EasyTAG/images/sequence-track.png");
     gtk_container_add (GTK_CONTAINER (priv->track_number_button), image);
diff --git a/src/tags/ape_tag.c b/src/tags/ape_tag.c
index f089165..c944725 100644
--- a/src/tags/ape_tag.c
+++ b/src/tags/ape_tag.c
@@ -2,7 +2,7 @@
 /*
  *  EasyTAG - Tag editor for MP3, Ogg Vorbis and MPC files
  *  Copyright (C) 2001-2003  Jerome Couderc <easytag gmail com>
- *  Copyright (C) 2002-2003  Artur Polaczy�ski <artii o2 pl>
+ *  Copyright (C) 2002-2003  Artur Polaczyñski <artii o2 pl>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -58,7 +58,8 @@ gboolean Ape_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     if ((file = fopen(filename, "rb")) == NULL)
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print(LOG_ERROR,_("Error while opening file: '%s' (%s)."),filename_utf8, g_strerror(errno));
+        Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
+                   filename_utf8, g_strerror (errno));
         g_free(filename_utf8);
         return FALSE;
     }
diff --git a/src/tags/flac_tag.c b/src/tags/flac_tag.c
index ebae5c0..c2a3b8f 100644
--- a/src/tags/flac_tag.c
+++ b/src/tags/flac_tag.c
@@ -128,7 +128,8 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
             FLAC__metadata_simple_iterator_delete(iter);
         }
 
-        Log_Print(LOG_ERROR,_("Error while opening file: '%s' as FLAC (%s)."),filename_utf8,flac_error_msg);
+        Log_Print (LOG_ERROR, _("Error while opening file ‘%s’ as FLAC: %s"),
+                   filename_utf8, flac_error_msg);
         g_free(filename_utf8);
         return FALSE;
     }
@@ -348,8 +349,12 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
                             field_value = Try_To_Validate_Utf8_String(field_value_tmp);
                             g_free(field_value_tmp);
                             FileTag->year = field_value;
-                            if (g_utf8_strlen(FileTag->year, -1) > 4)
-                                Log_Print(LOG_WARNING,_("The year value '%s' seems to be invalid in file 
'%s'. The information will be lost while saving tag."),FileTag->year,filename_utf8);
+                            if (g_utf8_strlen (FileTag->year, -1) > 4)
+                            {
+                                Log_Print (LOG_WARNING,
+                                           _("The year value ‘%s’ seems to be invalid in file ‘%s’. The 
information will be lost when saving"),
+                                           FileTag->year, filename_utf8);
+                            }
                         }
                     }
                 }
@@ -847,7 +852,8 @@ gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile)
             FLAC__metadata_chain_delete(chain);
         }
         
-        Log_Print(LOG_ERROR,_("Error while opening file: '%s' as FLAC (%s)."),filename_utf8,flac_error_msg);
+        Log_Print (LOG_ERROR, _("Error while opening file ‘%s’ as FLAC: %s"),
+                   filename_utf8, flac_error_msg);
         return FALSE;
     }
     
@@ -857,7 +863,8 @@ gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile)
     {
         flac_error_msg = 
FLAC__Metadata_ChainStatusString[FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR];
 
-        Log_Print(LOG_ERROR,_("Error while opening file: '%s' as FLAC (%s)."),filename_utf8,flac_error_msg);
+        Log_Print (LOG_ERROR, _("Error while opening file ‘%s’ as FLAC: %s"),
+                   filename_utf8, flac_error_msg);
         return FALSE;
     }
     
@@ -1076,7 +1083,8 @@ gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile)
                 
                 if (!FLAC__metadata_object_picture_is_legal(picture_block, &violation))
                 {
-                    Log_Print(LOG_ERROR,_("Picture block isn't valid: '%s'"),violation);
+                    Log_Print (LOG_ERROR, _("Picture block is invalid ‘%s’"),
+                               violation);
                     FLAC__metadata_object_delete(picture_block);
                 }else
                 {
@@ -1111,12 +1119,13 @@ gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile)
 
         FLAC__metadata_chain_delete(chain);
         
-        Log_Print(LOG_ERROR,_("Error: Failed to write comments to file '%s' 
(%s)."),filename_utf8,flac_error_msg);
+        Log_Print (LOG_ERROR, _("Failed to write comments to file ‘%s’: %s"),
+                   filename_utf8, flac_error_msg);
         return FALSE;
     }else
     {
         basename_utf8 = g_path_get_basename(filename_utf8);
-        Log_Print(LOG_OK,_("Written tag of '%s'"),basename_utf8);
+        Log_Print (LOG_OK, _("Wrote tag of ‘%s’"), basename_utf8);
         g_free(basename_utf8);
     }
     
diff --git a/src/tags/id3_tag.c b/src/tags/id3_tag.c
index 3762ecd..b4e071c 100644
--- a/src/tags/id3_tag.c
+++ b/src/tags/id3_tag.c
@@ -202,7 +202,7 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
 
         if (gerror)
         {
-            Log_Print (LOG_ERROR, _("Error while reading file: '%s' (%s)"),
+            Log_Print (LOG_ERROR, _("Error while reading file ‘%s’: %s"),
                        filename_utf8, gerror->message);
             g_error_free (gerror);
         }
@@ -214,7 +214,7 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
                                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                             GTK_MESSAGE_ERROR,
                                             GTK_BUTTONS_CLOSE,
-                                            _("As the following corrupted file '%s' will cause an error in 
id3lib, it will not be processed"),
+                                            _("As the following corrupted file ‘%s’ will cause an error in 
id3lib, it will not be processed"),
                                             basename_utf8);
         gtk_window_set_title (GTK_WINDOW (msgdialog), _("Corrupted file"));
 
@@ -594,13 +594,26 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
         /* Check error messages */
         if (error_strip_id3v1 == ID3E_NoError && error_strip_id3v2 == ID3E_NoError)
         {
-            Log_Print(LOG_OK,_("Removed tag of '%s'"),basename_utf8);
-        }else
+            Log_Print (LOG_OK, _("Removed tag of ‘%s’"), basename_utf8);
+        }
+        else
         {
             if (error_strip_id3v1 != ID3E_NoError)
-                Log_Print(LOG_ERROR,_("Error while removing ID3v1 tag of '%s' 
(%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v1));
+            {
+                Log_Print (LOG_ERROR,
+                           _("Error while removing ID3v1 tag of ‘%s’: %s"),
+                           basename_utf8,
+                           Id3tag_Get_Error_Message (error_strip_id3v1));
+            }
+
             if (error_strip_id3v2 != ID3E_NoError)
-                Log_Print(LOG_ERROR,_("Error while removing ID3v2 tag of '%s' 
(%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v2));
+            {
+                Log_Print (LOG_ERROR,
+                           _("Error while removing ID3v2 tag of ‘%s’: %s"),
+                           basename_utf8,
+                           Id3tag_Get_Error_Message (error_strip_id3v2));
+            }
+
             error++;
         }
 
@@ -620,7 +633,10 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
             error_update_id3v2 = ID3Tag_UpdateByTagType(id3_tag,ID3TT_ID3V2);
             if (error_update_id3v2 != ID3E_NoError)
             {
-                Log_Print(LOG_ERROR,_("Error while updating ID3v2 tag of '%s' 
(%s)"),basename_utf8,Id3tag_Get_Error_Message(error_update_id3v2));
+                Log_Print (LOG_ERROR,
+                           _("Error while updating ID3v2 tag of ‘%s’: %s"),
+                           basename_utf8,
+                           Id3tag_Get_Error_Message (error_update_id3v2));
                 error++;
             }else
             {
@@ -672,7 +688,10 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
             error_strip_id3v2 = ID3Tag_Strip(id3_tag,ID3TT_ID3V2);
             if (error_strip_id3v2 != ID3E_NoError)
             {
-                Log_Print(LOG_ERROR,_("Error while removing ID3v2 tag of '%s' 
(%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v2));
+                Log_Print (LOG_ERROR,
+                           _("Error while removing ID3v2 tag of ‘%s’: %s"),
+                           basename_utf8,
+                           Id3tag_Get_Error_Message (error_strip_id3v2));
                 error++;
             }
         }
@@ -693,7 +712,10 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
             error_update_id3v1 = ID3Tag_UpdateByTagType(id3_tag,ID3TT_ID3V1);
             if (error_update_id3v1 != ID3E_NoError)
             {
-                Log_Print(LOG_ERROR,_("Error while updating ID3v1 tag of '%s' 
(%s)"),basename_utf8,Id3tag_Get_Error_Message(error_update_id3v1));
+                Log_Print (LOG_ERROR,
+                           _("Error while updating ID3v1 tag of ‘%s’: %s"),
+                           basename_utf8,
+                           Id3tag_Get_Error_Message (error_update_id3v1));
                 error++;
             }
         }else
@@ -701,13 +723,18 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
             error_strip_id3v1 = ID3Tag_Strip(id3_tag,ID3TT_ID3V1);
             if (error_strip_id3v1 != ID3E_NoError)
             {
-                Log_Print(LOG_ERROR,_("Error while removing ID3v1 tag of '%s' 
(%s)"),basename_utf8,Id3tag_Get_Error_Message(error_strip_id3v1));
+                Log_Print (LOG_ERROR,
+                           _("Error while removing ID3v1 tag of ‘%s’: %s"),
+                           basename_utf8,
+                           Id3tag_Get_Error_Message (error_strip_id3v1));
                 error++;
             }
         }
 
         if (error == 0)
-            Log_Print(LOG_OK,_("Updated tag of '%s'"),basename_utf8);
+        {
+            Log_Print (LOG_OK, _("Updated tag of ‘%s’"), basename_utf8);
+        }
 
     }
 
@@ -1424,7 +1451,7 @@ gboolean Id3tag_Check_If_Id3lib_Is_Bugged (void)
         if (error)
         {
             Log_Print (LOG_ERROR,
-                       _("Error while creating temporary file: '%s'"),
+                       _("Error while creating temporary file ‘%s’"),
                        error->message);
             g_clear_error (&error);
         }
@@ -1451,7 +1478,7 @@ gboolean Id3tag_Check_If_Id3lib_Is_Bugged (void)
 
         filename = g_file_get_path (file);
         filename_utf8 = filename_to_display (filename);
-        Log_Print (LOG_ERROR, _("Error while writing to file: '%s' (%s)"),
+        Log_Print (LOG_ERROR, _("Error while writing to file ‘%s’: %s"),
                    filename_utf8, error->message);
 
         g_free (filename);
diff --git a/src/tags/id3v24_tag.c b/src/tags/id3v24_tag.c
index 07bbd4c..a7b0fc6 100644
--- a/src/tags/id3v24_tag.c
+++ b/src/tags/id3v24_tag.c
@@ -109,7 +109,7 @@ gboolean Id3tag_Read_File_Tag (const gchar *filename, File_Tag *FileTag)
     if ( (tmpfile=open(filename,O_RDONLY)) < 0 )
     {
         gchar *filename_utf8 = filename_to_display(filename);
-        Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+        Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
                    filename_utf8, g_strerror (errno));
         g_free(filename_utf8);
         return FALSE;
@@ -1143,7 +1143,7 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
     if (error == 0)
     {
         basename_utf8 = g_path_get_basename(filename_utf8);
-        Log_Print(LOG_OK,_("Updated tag of '%s'"),basename_utf8);
+        Log_Print (LOG_OK, _("Updated tag of ‘%s’"), basename_utf8);
         g_free(basename_utf8);
     }
 
@@ -1654,7 +1654,7 @@ etag_write_tags (const gchar *filename,
             {
                 gchar *filename_utf8 = filename_to_display (filename);
                 gchar *basename_utf8 = g_path_get_basename (filename_utf8);
-                Log_Print (LOG_ERROR, _("Cannot save tag of file '%s'"),
+                Log_Print (LOG_ERROR, _("Cannot save tag of file ‘%s’"),
                            basename_utf8);
                 g_free (basename_utf8);
                 goto out;
@@ -1665,7 +1665,9 @@ etag_write_tags (const gchar *filename,
         {
             gchar *filename_utf8 = filename_to_display(filename);
             gchar *basename_utf8 = g_path_get_basename(filename_utf8);
-            Log_Print(LOG_ERROR,_("Size error while saving tag of '%s'"),basename_utf8);
+            Log_Print (LOG_ERROR,
+                       _("Size error while saving tag of ‘%s’"),
+                       basename_utf8);
             g_free(filename_utf8);
             g_free(basename_utf8);
             goto out;
diff --git a/src/tags/mp4_header.cc b/src/tags/mp4_header.cc
index 88a39ce..73af747 100644
--- a/src/tags/mp4_header.cc
+++ b/src/tags/mp4_header.cc
@@ -42,7 +42,7 @@ gboolean Mp4_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     {
         gchar *filename_utf8 = filename_to_display (filename);
         const GError *error = stream.getError ();
-        Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+        Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
                    filename_utf8, error->message);
         g_free (filename_utf8);
         return FALSE;
@@ -55,8 +55,8 @@ gboolean Mp4_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     if (!mp4file.isOpen ())
     {
         gchar *filename_utf8 = filename_to_display (filename);
-        Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
-                   filename_utf8,_("MP4 format invalid"));
+        Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
+                   filename_utf8, _("MP4 format invalid"));
         g_free (filename_utf8);
         return FALSE;
     }
@@ -66,7 +66,7 @@ gboolean Mp4_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     if (properties == NULL)
     {
         gchar *filename_utf8 = filename_to_display (filename);
-        Log_Print (LOG_ERROR, _("Error reading properties from file: '%s'"),
+        Log_Print (LOG_ERROR, _("Error reading properties from file ‘%s’"),
                    filename_utf8);
         g_free (filename_utf8);
         return FALSE;
diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
index efeaebd..00b5b9f 100644
--- a/src/tags/mp4_tag.cc
+++ b/src/tags/mp4_tag.cc
@@ -66,7 +66,7 @@ gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     {
         gchar *filename_utf8 = filename_to_display (filename);
         const GError *error = stream.getError ();
-        Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+        Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
                    filename_utf8, error->message);
         g_free (filename_utf8);
         return FALSE;
@@ -82,12 +82,12 @@ gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
 
         if (error)
         {
-            Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+            Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
                        filename_utf8, error->message);
         }
         else
         {
-            Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+            Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
                        filename_utf8, _("MP4 format invalid"));
         }
 
@@ -98,7 +98,7 @@ gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     if (!(tag = mp4file.tag ()))
     {
         gchar *filename_utf8 = filename_to_display (filename);
-        Log_Print (LOG_ERROR, _("Error reading tags from file: '%s'"),
+        Log_Print (LOG_ERROR, _("Error reading tags from file ‘%s’"),
                    filename_utf8);
         g_free (filename_utf8);
         return FALSE;
@@ -259,7 +259,7 @@ gboolean Mp4tag_Write_File_Tag (ET_File *ETFile)
     {
         gchar *filename_utf8 = filename_to_display (filename);
         const GError *error = stream.getError ();
-        Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+        Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
                    filename_utf8, error->message);
         g_free (filename_utf8);
         return FALSE;
@@ -275,12 +275,12 @@ gboolean Mp4tag_Write_File_Tag (ET_File *ETFile)
 
         if (error)
         {
-            Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+            Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
                        filename_utf8, error->message);
         }
         else
         {
-            Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)."),
+            Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
                        filename_utf8, _("MP4 format invalid"));
         }
 
@@ -290,7 +290,7 @@ gboolean Mp4tag_Write_File_Tag (ET_File *ETFile)
     if (!(tag = mp4file.tag ()))
     {
         gchar *filename_utf8 = filename_to_display (filename);
-        Log_Print (LOG_ERROR, _("Error reading tags from file: '%s'"),
+        Log_Print (LOG_ERROR, _("Error reading tags from file ‘%s’"),
                    filename_utf8);
         g_free (filename_utf8);
         return FALSE;
diff --git a/src/tags/ogg_header.c b/src/tags/ogg_header.c
index 15563f9..c13ee7c 100644
--- a/src/tags/ogg_header.c
+++ b/src/tags/ogg_header.c
@@ -223,7 +223,7 @@ Ogg_Header_Read_File_Info (const gchar *filename, ET_File_Info *ETFileInfo)
     if (!state.istream)
     {
         /* FIXME: Pass error back to calling function. */
-        Log_Print (LOG_ERROR, _("Error while opening file: '%s' (%s)"),
+        Log_Print (LOG_ERROR, _("Error while opening file ‘%s’: %s"),
                    filename_utf8, state.error->message);
         g_free (filename_utf8);
         return FALSE;
@@ -239,8 +239,10 @@ Ogg_Header_Read_File_Info (const gchar *filename, ET_File_Info *ETFileInfo)
             bitrate_nominal = vi->bitrate_nominal; // (b/s) Specifies the average bitrate for a VBR 
bitstream.
         }else
         {
-            Log_Print(LOG_ERROR,_("Ogg Vorbis: The specified bitstream does not exist or the "
-                        "file has been initialized improperly (file: '%s')."),filename_utf8);
+            Log_Print (LOG_ERROR,
+                       _("The specified bitstream does not exist or the "
+                         "file has been initialized improperly (file: ‘%s’)"),
+                       filename_utf8);
         }
 
         duration        = ov_time_total(&vf,-1); // (s) Total time.
@@ -266,7 +268,7 @@ Ogg_Header_Read_File_Info (const gchar *filename, ET_File_Info *ETFileInfo)
         /* On error. */
         if (state.error)
         {
-            g_debug ("Ogg Vorbis: error reading header information (%s)",
+            g_debug ("Ogg Vorbis: error reading header information ‘%s’",
                      state.error->message);
         }
 
@@ -275,19 +277,29 @@ Ogg_Header_Read_File_Info (const gchar *filename, ET_File_Info *ETFileInfo)
         switch (res)
         {
             case OV_EREAD:
-                Log_Print(LOG_ERROR,_("Ogg Vorbis: Read from media returned an error (file: 
'%s')."),filename_utf8);
+                Log_Print (LOG_ERROR,
+                           _("Read from media returned an error (file: ‘%s’)"),
+                           filename_utf8);
                 break;
             case OV_ENOTVORBIS:
-                Log_Print(LOG_ERROR,_("Ogg Vorbis: Bitstream is not Vorbis data (file: 
'%s')."),filename_utf8);
+                Log_Print (LOG_ERROR,
+                           _("Bitstream is not Vorbis data (file: ‘%s’)"),
+                           filename_utf8);
                 break;
             case OV_EVERSION:
-                Log_Print(LOG_ERROR,_("Ogg Vorbis: Vorbis version mismatch (file: '%s')."),filename_utf8);
+                Log_Print (LOG_ERROR,
+                           _("Vorbis version mismatch (file: ‘%s’)"),
+                           filename_utf8);
                 break;
             case OV_EBADHEADER:
-                Log_Print(LOG_ERROR,_("Ogg Vorbis: Invalid Vorbis bitstream header (file: 
'%s')."),filename_utf8);
+                Log_Print (LOG_ERROR,
+                           _("Invalid Vorbis bitstream header (file: ‘%s’)"),
+                           filename_utf8);
                 break;
             case OV_EFAULT:
-                Log_Print(LOG_ERROR,_("Ogg Vorbis: Internal logic fault, indicates a bug or heap/stack 
corruption (file: '%s')."),filename_utf8);
+                Log_Print (LOG_ERROR,
+                           _("Internal logic fault, indicates a bug or heap/stack corruption (file: ‘%s’)"),
+                           filename_utf8);
                 break;
             default:
                 break;
@@ -333,7 +345,7 @@ gboolean Speex_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     if (!vcedit_open (state, gfile, &error))
     {
         Log_Print (LOG_ERROR,
-                   _("Error: Failed to open file: '%s' as Vorbis (%s)."),
+                   _("Failed to open file ‘%s’ as Vorbis: %s"),
                    filename_utf8, error->message);
         g_error_free (error);
         g_object_unref (gfile);
diff --git a/src/tags/ogg_tag.c b/src/tags/ogg_tag.c
index 15f19b9..54ee33e 100644
--- a/src/tags/ogg_tag.c
+++ b/src/tags/ogg_tag.c
@@ -299,8 +299,13 @@ et_add_file_tags_from_vorbis_comments (vorbis_comment *vc, File_Tag *FileTag,
     if ( (string = vorbis_comment_query(vc,"DATE",0)) != NULL && g_utf8_strlen(string, -1) > 0 )
     {
         FileTag->year = g_strdup(string);
-        if (g_utf8_strlen(FileTag->year, -1) > 4)
-            Log_Print(LOG_WARNING,_("The year value '%s' seems to be invalid in file '%s'. The information 
will be lost while saving tag."),FileTag->year,filename_utf8);
+
+        if (g_utf8_strlen (FileTag->year, -1) > 4)
+        {
+            Log_Print (LOG_WARNING,
+                       _("The year value ‘%s’ seems to be invalid in file ‘%s’. The information will be lost 
when saving"),
+                       FileTag->year, filename_utf8);
+        }
     }
 
     /*************************
@@ -702,7 +707,9 @@ ogg_tag_read_file_tag (gchar *filename, File_Tag *FileTag, GError **error)
                     goto err;
                 }
 
-                Log_Print(LOG_ERROR,_("Warning: The Ogg Vorbis file '%s' contains an ID3v2 
tag."),filename_utf8);
+                Log_Print (LOG_ERROR,
+                           _("The Ogg Vorbis file ‘%s’ contains an ID3v2 tag"),
+                           filename_utf8);
             }
             else if (!g_seekable_seek (G_SEEKABLE (istream), 0L, G_SEEK_SET,
                                        NULL, error))
@@ -877,7 +884,9 @@ ogg_tag_write_file_tag (ET_File *ETFile, GError **error)
                     goto err;
                 }
 
-                Log_Print(LOG_ERROR,_("Warning: The Ogg Vorbis file '%s' contains an ID3v2 
tag."),filename_utf8);
+                Log_Print (LOG_ERROR,
+                           _("The Ogg Vorbis file ‘%s’ contains an ID3v2 tag"),
+                           filename_utf8);
             }
             else
             {
@@ -1035,7 +1044,7 @@ ogg_tag_write_file_tag (ET_File *ETFile, GError **error)
                 if (!gdk_pixbuf_loader_write (loader, pic->data, pic->size,
                                               &error))
                 {
-                    Log_Print (LOG_ERROR, _("Error with 'loader_write': %s"),
+                    Log_Print (LOG_ERROR, _("Error parsing image data ‘%s’"),
                                error->message);
                     g_error_free (error);
                     g_object_unref (loader);
@@ -1050,7 +1059,7 @@ ogg_tag_write_file_tag (ET_File *ETFile, GError **error)
                     if (!gdk_pixbuf_loader_close (loader, &error))
                     {
                         Log_Print (LOG_ERROR,
-                                   _("Error with 'loader_close': %s"),
+                                   _("Error parsing image data ‘%s’"),
                                    error->message);
                         g_error_free (error);
                         g_object_unref (loader);
@@ -1166,7 +1175,7 @@ ogg_tag_write_file_tag (ET_File *ETFile, GError **error)
     else
     {
         basename_utf8 = g_path_get_basename(filename_utf8);
-        Log_Print(LOG_OK,_("Written tag of '%s'"),basename_utf8);
+        Log_Print (LOG_OK, _("Wrote tag of ‘%s’"), basename_utf8);
         g_free (basename_utf8);
 
         vcedit_clear(state);


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