GNOME.org
 

[easytag/wip/unstable: 30/56] Remove many trailing ellipses in strings

commit c9b8ea4c7fc0a97cff16d269cbf65fa776244ebc
Author: David King <amigadave amigadave com>
Date:   Tue Apr 9 22:24:18 2013 +0100

    Remove many trailing ellipses in strings

 src/bar.c     |    2 +-
 src/browser.c |    6 +++---
 src/cddb.c    |   14 +++++++++-----
 src/easytag.c |   44 ++++++++++++++++++++++----------------------
 src/misc.c    |    8 +++++---
 src/picture.c |   12 ++++++------
 src/prefs.c   |    2 +-
 src/prefs.h   |    4 ----
 src/scan.c    |    8 ++++----
 9 files changed, 51 insertions(+), 49 deletions(-)
---
diff --git a/src/bar.c b/src/bar.c
index a7c5604..3bcb80a 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -416,7 +416,7 @@ GtkWidget *Create_Status_Bar (void)
     /* Create serie */
     StatusBarContext = gtk_statusbar_get_context_id(GTK_STATUSBAR(StatusBar),"Messages");
 
-    Statusbar_Message(_("Ready to start…"),TRUE);
+    Statusbar_Message (_("Ready to start"), TRUE);
 
     gtk_widget_show(StatusBar);
     return StatusBar;
diff --git a/src/browser.c b/src/browser.c
index 17331a0..520e3c9 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -3561,7 +3561,7 @@ void Browser_Open_Rename_Directory_Window (void)
         G_CALLBACK(Scan_Check_Rename_File_Mask),G_OBJECT(RenameDirectoryMaskStatusIconBox));
 
     // Preview label
-    RenameDirectoryPreviewLabel = gtk_label_new(_("Rename directory preview…"));
+    RenameDirectoryPreviewLabel = gtk_label_new (_("Rename directory preview"));
     gtk_label_set_line_wrap(GTK_LABEL(RenameDirectoryPreviewLabel),TRUE);
     ////gtk_widget_show(FillTagPreviewLabel);
     gtk_box_pack_start(GTK_BOX(VBox),RenameDirectoryPreviewLabel,TRUE,TRUE,0);
@@ -3744,7 +3744,7 @@ Rename_Directory (void)
     //        // The same directory already exists. So we ask if we want to move the files
     //        msg = g_strdup_printf(_("The directory already exists!\n(%s)\nDo you want "
     //            "to move the files?"),new_path_utf8);
-    //        msgbox = msg_box_new(_("Confirm…"),
+    //        msgbox = msg_box_new(_("Confirm"),
     //                             GTK_WINDOW(MainWindow),
     //                             NULL,
     //                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -4414,7 +4414,7 @@ Run_Program (const gchar *program_name, GList *args_list)
             // Execution ...
             execvp(argv[0],argv);
 
-            msg = g_strdup_printf(_("Executed command: '%s %s'"),program_name,"…");
+            msg = g_strdup_printf (_("Executed command: %s"), program_name);
             Statusbar_Message(msg,TRUE);
             g_free(msg);
             //_exit(-1);
diff --git a/src/cddb.c b/src/cddb.c
index 0b11259..a0d4a79 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -302,7 +302,8 @@ void Open_Cddb_Window (void)
     gtk_button_set_relief(GTK_BUTTON(CddbStopSearchAutoButton),GTK_RELIEF_NONE);
     gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchAutoButton),FALSE);
     g_signal_connect(G_OBJECT(CddbStopSearchAutoButton), "clicked", G_CALLBACK(Cddb_Stop_Search), NULL);
-    gtk_widget_set_tooltip_text(CddbStopSearchAutoButton,_("Stop the search…"));
+    gtk_widget_set_tooltip_text (CddbStopSearchAutoButton,
+                                 _("Stop the search"));
 
     // Separator line
     Separator = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
@@ -385,7 +386,7 @@ void Open_Cddb_Window (void)
     gtk_button_set_relief(GTK_BUTTON(CddbStopSearchButton),GTK_RELIEF_NONE);
     gtk_widget_set_sensitive(GTK_WIDGET(CddbStopSearchButton),FALSE);
     g_signal_connect(G_OBJECT(CddbStopSearchButton), "clicked", G_CALLBACK(Cddb_Stop_Search), NULL);
-    gtk_widget_set_tooltip_text(CddbStopSearchButton,_("Stop the search…"));
+    gtk_widget_set_tooltip_text (CddbStopSearchButton, _("Stop the search"));
 
     // Button to quit
     Button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
@@ -805,7 +806,8 @@ void Open_Cddb_Window (void)
     gtk_box_pack_start(GTK_BOX(MainVBox),CddbStatusBar,FALSE,TRUE,0);
     gtk_widget_set_size_request(CddbStatusBar, 300, -1);
     CddbStatusBarContext = gtk_statusbar_get_context_id(GTK_STATUSBAR(CddbStatusBar),"Messages");
-    gtk_statusbar_push(GTK_STATUSBAR(CddbStatusBar),CddbStatusBarContext,_("Ready to search…"));
+    gtk_statusbar_push (GTK_STATUSBAR (CddbStatusBar), CddbStatusBarContext,
+                        _("Ready to search"));
 
 
     g_signal_emit_by_name(G_OBJECT(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(CddbSearchStringCombo)))),"changed");
@@ -2963,7 +2965,8 @@ Cddb_Search_Album_From_Selected_Files (void)
                 /* Translators: 'it' in this sentence refers to the local CD
                  * database path. */
                 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msgdialog), "%s", _("Enter it in 
the preferences window before using this search."));
-                gtk_window_set_title(GTK_WINDOW(msgdialog),_("Local CD search…"));
+                gtk_window_set_title (GTK_WINDOW (msgdialog),
+                                      _("Local CD search"));
 
                 gtk_dialog_run(GTK_DIALOG(msgdialog));
                 gtk_widget_destroy(msgdialog);
@@ -3867,7 +3870,8 @@ Cddb_Set_Track_Infos_To_File_List (void)
                                            _("The number of CDDB results does not match the number of 
selected files"));
         
gtk_dialog_add_buttons(GTK_DIALOG(msgdialog),GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,GTK_STOCK_APPLY,GTK_RESPONSE_APPLY,
 NULL);
         gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msgdialog),"%s","Do you want to 
continue?");
-        gtk_window_set_title(GTK_WINDOW(msgdialog),_("Write Tag from CDDB…"));
+        gtk_window_set_title (GTK_WINDOW (msgdialog),
+                              _("Write Tag from CDDB"));
         response = gtk_dialog_run(GTK_DIALOG(msgdialog));
         gtk_widget_destroy(msgdialog);
 
diff --git a/src/easytag.c b/src/easytag.c
index a17ca6c..dbcbd57 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -307,12 +307,11 @@ activate (GApplication *application, gpointer user_data)
     /* Starting messages */
     Log_Print(LOG_OK,_("Starting EasyTAG version %s (PID: %d)…"),PACKAGE_VERSION,getpid());
 #ifdef ENABLE_MP3
-    Log_Print(LOG_OK,_("Currently using libid3tag version %s…"), ID3_VERSION);
+    Log_Print(LOG_OK,_("Using libid3tag version %s"), ID3_VERSION);
 #endif
 #if defined ENABLE_MP3 && defined ENABLE_ID3LIB
-    Log_Print(LOG_OK,_("Currently using id3lib version %d.%d.%d…"),ID3LIB_MAJOR_VERSION,
-                                                               ID3LIB_MINOR_VERSION,
-                                                               ID3LIB_PATCH_VERSION);
+    Log_Print (LOG_OK, _("Using id3lib version %d.%d.%d"), ID3LIB_MAJOR_VERSION,
+               ID3LIB_MINOR_VERSION, ID3LIB_PATCH_VERSION);
 #endif
 
 #ifdef G_OS_WIN32
@@ -323,8 +322,9 @@ activate (GApplication *application, gpointer user_data)
 #endif /* G_OS_WIN32 */
 
     if (get_locale())
-        Log_Print(LOG_OK,_("Currently using locale '%s' (and eventually '%s')…"),
-                get_locale(),get_encoding_from_locale(get_locale()));
+        Log_Print (LOG_OK,
+                   _("Currently using locale '%s' (and eventually '%s')"),
+                   get_locale (), get_encoding_from_locale (get_locale ()));
 
 
     /* Create all config files. */
@@ -2385,7 +2385,7 @@ Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files)
                 /* Stop saving files + reinit progress bar */
                 gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), "");
                 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), 0.0);
-                Statusbar_Message(_("Saving files was stopped…"),TRUE);
+                Statusbar_Message (_("Saving files was stopped"), TRUE);
                 /* To update state of command buttons */
                 Update_Command_Buttons_Sensivity();
                 Browser_Area_Set_Sensitive(TRUE);
@@ -2406,9 +2406,9 @@ Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files)
         gtk_tree_path_free(currentPath);
 
     if (Main_Stop_Button_Pressed)
-        msg = g_strdup(_("Saving files was stopped…"));
+        msg = g_strdup (_("Saving files was stopped"));
     else
-        msg = g_strdup(_("All files have been saved…"));
+        msg = g_strdup (_("All files have been saved"));
 
     Main_Stop_Button_Pressed = FALSE;
     uiaction = gtk_ui_manager_get_action(UIManager, "/ToolBar/Stop");
@@ -2559,9 +2559,9 @@ Delete_Selected_Files_With_Answer (void)
     g_list_free(rowreflist);
 
     if (nb_files_deleted < nb_files_to_delete)
-        msg = g_strdup(_("Files have been partially deleted…"));
+        msg = g_strdup (_("Files have been partially deleted"));
     else
-        msg = g_strdup(_("All files have been deleted…"));
+        msg = g_strdup (_("All files have been deleted"));
 
     // It's important to displayed the new item, as it'll check the changes in 
Browser_Display_Tree_Or_Artist_Album_List
     if (ETCore->ETFileDisplayed)
@@ -2631,7 +2631,7 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
         gint response;
 
         msg = g_strdup_printf(_("The file '%s' was changed by an external program.\nDo you want to 
continue?"),basename_cur_utf8);
-        msgbox = msg_box_new(_("Write File…"),
+        msgbox = msg_box_new(_("Write File"),
                              GTK_WINDOW(MainWindow),
                              NULL,
                              GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -2760,14 +2760,14 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
                 if (g_utf8_collate(basename_cur_utf8,basename_new_utf8) != 0)
                 {
                     // Directories and filename changed
-                    msgdialog_title = g_strdup(_("Rename File and Directory…"));
+                    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'?"),
                                            filename_cur_utf8, filename_new_utf8);
                 }else
                 {
                     // Only directories changed
-                    msgdialog_title = g_strdup(_("Rename Directory…"));
+                    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);
@@ -2775,7 +2775,7 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
             }else
             {
                 // Only filename changed
-                msgdialog_title = g_strdup(_("Rename File…"));
+                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'?"),
                                        basename_cur_utf8, basename_new_utf8);
@@ -3082,7 +3082,7 @@ Rename_File (ET_File *ETFile, gboolean hide_msgbox)
         Log_Print(LOG_ERROR,"%s", msg);
         g_free(msg);
 
-        Statusbar_Message(_("File(s) not renamed…"),TRUE);
+        Statusbar_Message (_("File(s) not renamed"), TRUE);
         g_free(tmp_filename);
         g_free(cur_basename_utf8);
         g_free(new_basename_utf8);
@@ -3126,7 +3126,7 @@ Rename_File (ET_File *ETFile, gboolean hide_msgbox)
             Log_Print(LOG_ERROR,"%s", msg);
             g_free(msg);
 
-            Statusbar_Message(_("File(s) not renamed…"),TRUE);
+            Statusbar_Message (_("File(s) not renamed"), TRUE);
             g_free(tmp_filename);
             g_free(cur_basename_utf8);
             g_free(new_basename_utf8);
@@ -3152,7 +3152,7 @@ Rename_File (ET_File *ETFile, gboolean hide_msgbox)
         Log_Print(LOG_ERROR,"%s", msg);
         g_free(msg);
 
-        Statusbar_Message(_("File(s) not renamed…"),TRUE);
+        Statusbar_Message (_("File(s) not renamed"), TRUE);
 
         g_free (tmp_filename);
         g_free(new_basename_utf8);
@@ -3215,7 +3215,7 @@ Rename_File (ET_File *ETFile, gboolean hide_msgbox)
         /* Now the file was renamed, so mark his state */
         ET_Mark_File_Name_As_Saved(ETFile);
 
-        Statusbar_Message(_("File(s) renamed…"),TRUE);
+        Statusbar_Message (_("File(s) renamed"), TRUE);
 
         /* Remove the of directory (check automatically if it is empty) */
         if (!Remove_Dir(dirname_cur,dirname_new))
@@ -3273,7 +3273,7 @@ Rename_File (ET_File *ETFile, gboolean hide_msgbox)
             /* Now the file was renamed, so mark his state */
             ET_Mark_File_Name_As_Saved(ETFile);
 
-            Statusbar_Message(_("File(s) moved…"),TRUE);
+            Statusbar_Message (_("File(s) moved"), TRUE);
 
             /* Remove the of directory (check automatically if it is empty) */
             if (!Remove_Dir(dirname_cur,dirname_new))
@@ -3338,7 +3338,7 @@ Rename_File (ET_File *ETFile, gboolean hide_msgbox)
             Log_Print(LOG_ERROR,"%s", msg);
             g_free(msg);
 
-            Statusbar_Message(_("File(s) not moved…"),TRUE);
+            Statusbar_Message (_("File(s) not moved"), TRUE);
 
             g_free(tmp_filename);
             g_free(cur_basename_utf8);
@@ -3374,7 +3374,7 @@ Rename_File (ET_File *ETFile, gboolean hide_msgbox)
                               cur_basename_utf8, new_basename_utf8,
                               g_strerror (errno));
 
-        Statusbar_Message(_("File(s) not renamed…"),TRUE);
+        Statusbar_Message (_("File(s) not renamed"), TRUE);
 
         g_free(tmp_filename);
         g_free(cur_basename_utf8);
diff --git a/src/misc.c b/src/misc.c
index db056b1..130d60d 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -775,12 +775,14 @@ gint Combo_Alphabetic_Sort (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,
  *************************/
 void File_Selection_Window_For_File (GtkWidget *entry)
 {
-    Open_File_Selection_Window(entry, _("Select file…"), GTK_FILE_CHOOSER_ACTION_OPEN);
+    Open_File_Selection_Window (entry, _("Select File"),
+                                GTK_FILE_CHOOSER_ACTION_OPEN);
 }
 
 void File_Selection_Window_For_Directory (GtkWidget *entry)
 {
-    Open_File_Selection_Window(entry, _("Select directory…"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+    Open_File_Selection_Window (entry, _("Select Directory"),
+                                GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
 }
 
 /*
@@ -1682,7 +1684,7 @@ Playlist_Write_Button_Pressed (void)
         {
             gchar *msg;
             msg = g_strdup_printf(_("Written playlist file '%s'"),playlist_name_utf8);
-            /*msgbox = msg_box_new(_("Information…"),
+            /*msgbox = msg_box_new(_("Information"),
                                    GTK_WINDOW(WritePlaylistWindow),
                                    NULL,
                                    GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
diff --git a/src/picture.c b/src/picture.c
index a49fb8d..a159b86 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -1104,7 +1104,7 @@ Picture_Load_File_Data (const gchar *filename)
 
     if (stat(filename, &st)==-1)
     {
-        Log_Print (LOG_ERROR, _("Image file not loaded (%s)…"),
+        Log_Print (LOG_ERROR, _("Image file not loaded: %s"),
                    g_strerror(errno));
 #ifdef G_OS_WIN32
         g_free(filename);
@@ -1134,7 +1134,7 @@ Picture_Load_File_Data (const gchar *filename)
         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"),
                    g_strerror(errno));
         g_free (buffer);
         g_free(filename_utf8);
@@ -1155,7 +1155,7 @@ Picture_Load_File_Data (const gchar *filename)
         if (buffer)
             g_free(buffer);
         
-        Log_Print (LOG_ERROR, _("Image file not loaded (%s)…"),
+        Log_Print (LOG_ERROR, _("Image file not loaded: %s"),
                    g_strerror(errno));
 
         return NULL;
@@ -1168,7 +1168,7 @@ Picture_Load_File_Data (const gchar *filename)
         pic->size = size;
         pic->data = (guchar *)buffer;
 
-        Log_Print (LOG_OK, _("Image file loaded…"));
+        Log_Print (LOG_OK, _("Image file loaded"));
 
         return pic;
     }
@@ -1185,7 +1185,7 @@ Picture_Save_File_Data (const Picture *pic, const gchar *filename)
     fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0666);
     if (fd == -1)
     {
-        Log_Print (LOG_ERROR, _("Image file cannot be saved (%s)…"),
+        Log_Print (LOG_ERROR, _("Image file cannot be saved: %s"),
                    g_strerror(errno));
         return FALSE;
     }
@@ -1193,7 +1193,7 @@ Picture_Save_File_Data (const Picture *pic, const gchar *filename)
     if (write(fd, pic->data, pic->size) != pic->size)
     {
         close(fd);
-        Log_Print (LOG_ERROR, _("Image file cannot be saved (%s)…"),
+        Log_Print (LOG_ERROR, _("Image file cannot be saved: %s"),
                    g_strerror(errno));
         return FALSE;
     }
diff --git a/src/prefs.c b/src/prefs.c
index d3b4ef2..a53a77c 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -111,7 +111,7 @@ void Open_OptionsWindow (void)
     gtk_container_set_border_width(GTK_CONTAINER(OptionsWindow), 5);
     gtk_window_set_default_size(GTK_WINDOW(OptionsWindow),OPTIONS_WINDOW_WIDTH,OPTIONS_WINDOW_HEIGHT);
     /* Title */
-    gtk_window_set_title(GTK_WINDOW(OptionsWindow),_("Preferences…"));
+    gtk_window_set_title (GTK_WINDOW (OptionsWindow), _("Preferences"));
 
     /* Signals connection */
     g_signal_connect(G_OBJECT(OptionsWindow),"destroy", G_CALLBACK(OptionsWindow_Quit),NULL);
diff --git a/src/prefs.h b/src/prefs.h
index dc1805e..36ad8d9 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -185,8 +185,4 @@ void Init_OptionsWindow (void);
 void Open_OptionsWindow (void);
 void OptionsWindow_Apply_Changes (void);
 
-void File_Selection_Window_For_File      (GtkWidget *widget);
-void File_Selection_Window_For_Directory (GtkWidget *widget);
-
-
 #endif /* __PREFS_H__ */
diff --git a/src/scan.c b/src/scan.c
index e77b186..f2be0a9 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -365,9 +365,9 @@ Scan_Tag_With_Mask (ET_File *ETFile)
     ET_Manage_Changes_Of_File_Data(ETFile,NULL,FileTag);
 
     g_free(mask);
-    Statusbar_Message(_("Tag successfully scanned…"),TRUE);
+    Statusbar_Message(_("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);
 }
 
@@ -2489,7 +2489,7 @@ void Open_ScannerWindow (gint scanner_type)
         G_CALLBACK(Scan_Check_Scan_Tag_Mask),G_OBJECT(MaskStatusIconBox));
 
     // Preview label
-    FillTagPreviewLabel = gtk_label_new(_("Fill tag preview…"));
+    FillTagPreviewLabel = gtk_label_new (_("Fill tag preview"));
     gtk_label_set_line_wrap(GTK_LABEL(FillTagPreviewLabel),TRUE);
     gtk_widget_show(FillTagPreviewLabel);
     gtk_box_pack_start(GTK_BOX(vbox),FillTagPreviewLabel,TRUE,TRUE,0);
@@ -2559,7 +2559,7 @@ void Open_ScannerWindow (gint scanner_type)
         G_CALLBACK(Scan_Check_Rename_File_Mask),G_OBJECT(MaskStatusIconBox));
 
     /* Preview label */
-    RenameFilePreviewLabel = gtk_label_new(_("Rename file preview…"));
+    RenameFilePreviewLabel = gtk_label_new (_("Rename file preview"));
     gtk_label_set_line_wrap(GTK_LABEL(RenameFilePreviewLabel),TRUE);
     gtk_widget_show(RenameFilePreviewLabel);
     gtk_box_pack_start(GTK_BOX(vbox),RenameFilePreviewLabel,TRUE,TRUE,0);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]