brasero r1505 - in trunk: . data src src/plugins/local-track



Author: philippr
Date: Sun Nov  9 21:51:02 2008
New Revision: 1505
URL: http://svn.gnome.org/viewvc/brasero?rev=1505&view=rev

Log:
	Fix #558852 â translation issues

	* data/brasero.schemas.in:
	* src/brasero-audio-disc.c (brasero_audio_disc_short_track_dialog),
	(brasero_audio_disc_file_type_error_dialog),
	(brasero_audio_disc_video_file_dialog),
	(brasero_audio_disc_inotify_removal_warning):
	* src/brasero-blank-dialog.c (brasero_blank_dialog_activate),
	(brasero_blank_dialog_init):
	* src/brasero-burn-dialog.c (brasero_burn_dialog_insert_disc_cb),
	(brasero_burn_dialog_previous_session_loss_cb),
	(brasero_burn_dialog_audio_to_appendable_cb),
	(brasero_burn_dialog_rewritable_cb),
	(brasero_burn_dialog_disable_joliet_cb),
	(brasero_burn_dialog_show_log), (brasero_burn_dialog_notify_error):
	* src/brasero-burn-options.c (brasero_burn_options_init):
	* src/brasero-data-disc.c
	(brasero_data_disc_import_failure_dialog),
	(brasero_data_disc_unreadable_uri_cb),
	(brasero_data_disc_recursive_uri_cb),
	(brasero_data_disc_unknown_uri_cb),
	(brasero_data_disc_name_collision_cb),
	(brasero_data_disc_2G_file_cb),
	(brasero_data_disc_deep_directory_cb),
	(brasero_data_disc_rename_activated):
	* src/brasero-disc-option-dialog.c
	(brasero_disc_option_dialog_joliet_toggled_cb),
	(brasero_disc_option_dialog_add_audio_options):
	* src/brasero-jacket-view.c (brasero_jacket_view_set_image):
	* src/brasero-playlist.c (brasero_playlist_dialog_error):
	* src/brasero-project-manager.c (brasero_project_manager_open_uri):
	* src/brasero-project.c (brasero_project_check_status),
	(brasero_project_invalid_project_dialog),
	(brasero_project_open_project_xml),
	(brasero_project_not_saved_dialog),
	(brasero_project_save_audio_project_plain_text):
	* src/brasero-search-beagle.c (brasero_search_beagle_error_dialog):
	* src/brasero-split-dialog.c
	(brasero_split_dialog_no_silence_message),
	(brasero_split_dialog_metadata_finished_cb):
	* src/brasero-sum-dialog.c (brasero_sum_dialog_message_error),
	(brasero_sum_dialog_success), (brasero_sum_dialog_check_md5_file):
	* src/brasero-time-button.c (brasero_time_button_init):
	* src/brasero-tool-dialog.c (brasero_tool_dialog_media_error),
	(brasero_tool_dialog_media_busy), (brasero_tool_dialog_no_media):
	* src/brasero-tray.c (brasero_tray_icon_init):
	* src/brasero-utils.c (brasero_utils_launch_app):
	* src/burn.c (brasero_burn_run_eraser), (brasero_burn_run_imager),
	(brasero_burn_run_recorder), (brasero_burn_check_real):
	* src/main.c (brasero_app_parse_options):
	* src/plugins/local-track/burn-uri.c
	(brasero_burn_uri_explore_directory):
	* src/scsi-error.c:


Modified:
   trunk/ChangeLog
   trunk/data/brasero.schemas.in
   trunk/src/brasero-audio-disc.c
   trunk/src/brasero-blank-dialog.c
   trunk/src/brasero-burn-dialog.c
   trunk/src/brasero-burn-options.c
   trunk/src/brasero-data-disc.c
   trunk/src/brasero-disc-option-dialog.c
   trunk/src/brasero-jacket-view.c
   trunk/src/brasero-playlist.c
   trunk/src/brasero-project-manager.c
   trunk/src/brasero-project.c
   trunk/src/brasero-search-beagle.c
   trunk/src/brasero-split-dialog.c
   trunk/src/brasero-sum-dialog.c
   trunk/src/brasero-time-button.c
   trunk/src/brasero-tool-dialog.c
   trunk/src/brasero-tray.c
   trunk/src/brasero-utils.c
   trunk/src/burn.c
   trunk/src/main.c
   trunk/src/plugins/local-track/burn-uri.c
   trunk/src/scsi-error.c

Modified: trunk/data/brasero.schemas.in
==============================================================================
--- trunk/data/brasero.schemas.in	(original)
+++ trunk/data/brasero.schemas.in	Sun Nov  9 21:51:02 2008
@@ -65,8 +65,8 @@
 	<type>bool</type>
 	<default>false</default>
 	<locale name="C">
-	  <short>Enable immed flag with cdrecord</short>
-	  <long>Whether to use -immed flag with cdrecord. Use with caution (set to true) as it's only a workaround for some drives/setups.</long>
+	  <short>Enable "-immed" flag with cdrecord</short>
+	  <long>Whether to use "-immed" flag with cdrecord. Use with caution (set to true) as it's only a workaround for some drives/setups.</long>
 	</locale>
        </schema>
 
@@ -77,8 +77,8 @@
 	<type>int</type>
 	<default>0</default>
 	<locale name="C">
-	  <short>Used in conjunction with -immed flag with cdrecord</short>
-	  <long>Used in conjunction with -immed flag with cdrecord</long>
+	  <short>Used in conjunction with "-immed" flag with cdrecord</short>
+	  <long>Used in conjunction with "-immed" flag with cdrecord</long>
 	</locale>
        </schema>
 
@@ -90,7 +90,7 @@
 	<default>Chooser</default>
 	<locale name="C">
 	  <short>Pane to display for audio projects</short>
-	  <long>The pane to display with audio projects. It should be one of the following: Chooser/Search/Playlist/EmptyView.</long>
+	  <long>The pane to display with audio projects. It should be one of the following: "Chooser", "Search" or "Playlist".</long>
 	</locale>
        </schema>
 
@@ -102,7 +102,7 @@
 	<default>Chooser</default>
 	<locale name="C">
 	  <short>Pane to display for data projects</short>
-	  <long>The pane to display with data projects. It should be one of the following: Chooser/Search/EmptyView.</long>
+	  <long>The pane to display with data projects. It should be one of the following: "Chooser", "Search" or "Playlist".</long>
 	</locale>
        </schema>
 

Modified: trunk/src/brasero-audio-disc.c
==============================================================================
--- trunk/src/brasero-audio-disc.c	(original)
+++ trunk/src/brasero-audio-disc.c	Sun Nov  9 21:51:02 2008
@@ -1145,8 +1145,8 @@
 brasero_audio_disc_short_track_dialog (BraseroAudioDisc *disc)
 {
 	brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (disc)),
-				      _("The track will be padded at its end:"),
-				      ("the track is shorter than 6 seconds."),
+				      _("The track will be padded at its end."),
+				      ("The track is shorter than 6 seconds."),
 				      GTK_MESSAGE_WARNING);
 }
 
@@ -1325,7 +1325,7 @@
 	}
 
     	BRASERO_GET_BASENAME_FOR_DISPLAY (uri, name);
-	primary = g_strdup_printf (_("\"%s\" can't be handled by gstreamer:"), name);
+	primary = g_strdup_printf (_("\"%s\" can't be handled by gstreamer."), name);
 	brasero_utils_message_dialog (toplevel,
 				      primary,
 				      _("Make sure the appropriate codec is installed."),
@@ -1354,7 +1354,7 @@
 					 GTK_DIALOG_MODAL,
 					 GTK_MESSAGE_QUESTION,
 					 GTK_BUTTONS_NONE,
-					 _("Do you want to add a \"%s\" which is a video file?"),
+					 _("Do you want to add \"%s\" which is a video file?"),
 					 name);
 	g_free (name);
 
@@ -3631,10 +3631,10 @@
 
 	BRASERO_GET_BASENAME_FOR_DISPLAY (uri, name);
 
-	primary = g_strdup_printf (_("File \"%s\" was removed from the file system:"), name);
+	primary = g_strdup_printf (_("\"%s\" was removed from the file system."), name);
 	brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (disc)),
 				      primary,
-				      _("it will be removed from the project."),
+				      _("It will be removed from the project."),
 				      GTK_MESSAGE_WARNING);
 	g_free (primary);
 	g_free (name);

Modified: trunk/src/brasero-blank-dialog.c
==============================================================================
--- trunk/src/brasero-blank-dialog.c	(original)
+++ trunk/src/brasero-blank-dialog.c	Sun Nov  9 21:51:02 2008
@@ -222,7 +222,7 @@
 						   GTK_DIALOG_MODAL,
 						   GTK_MESSAGE_ERROR,
 						   GTK_BUTTONS_CLOSE,
-						   _("Error Blanking:"));
+						   _("Error Blanking."));
 
 		gtk_window_set_title (GTK_WINDOW (self), _("Blanking Finished"));
 
@@ -243,7 +243,7 @@
 		}
 		else
 			gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
-								  _("Unexpected error"));
+								  _("Unexpected error."));
 
 		answer = gtk_dialog_run (GTK_DIALOG (message));
 		gtk_widget_destroy (message);
@@ -263,12 +263,12 @@
 						  GTK_DIALOG_MODAL,
 						  GTK_MESSAGE_INFO,
 						  GTK_BUTTONS_NONE,
-						  _("The disc was successfully blanked:"));
+						  _("The disc was successfully blanked."));
 
 		gtk_window_set_title (GTK_WINDOW (self), _("Blanking Finished"));
 
 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
-							  _("the disc is ready for use."));
+							  _("The disc is ready for use."));
 
 		button = brasero_utils_make_button (_("Blank _Again"),
 						    NULL,
@@ -400,7 +400,7 @@
 					   G_CALLBACK (brasero_blank_dialog_caps_changed),
 					   obj);
 
-	priv->fast = gtk_check_button_new_with_mnemonic (_("_fast blanking"));
+	priv->fast = gtk_check_button_new_with_mnemonic (_("_Fast blanking"));
 	gtk_widget_set_tooltip_text (priv->fast, _("Activate fast blanking by opposition to a longer thorough blanking"));
 	g_signal_connect (priv->fast,
 			  "clicked",

Modified: trunk/src/brasero-burn-dialog.c
==============================================================================
--- trunk/src/brasero-burn-dialog.c	(original)
+++ trunk/src/brasero-burn-dialog.c	Sun Nov  9 21:51:02 2008
@@ -516,8 +516,9 @@
 		main_message = brasero_burn_dialog_get_media_type_string (burn, type, TRUE);
 	}
 	else if (error == BRASERO_BURN_ERROR_MEDIA_BUSY) {
-		main_message = g_strdup_printf (_("The disc in \"%s\" is busy."), drive_name);
-		secondary_message = g_strdup (_("make sure another application is not using it."));
+		/* Translators: %s is the name of a drive */
+		main_message = g_strdup_printf (_("\"%s\" is busy."), drive_name);
+		secondary_message = g_strdup (_("Make sure another application is not using it."));
 	} 
 	else if (error == BRASERO_BURN_ERROR_MEDIA_NONE) {
 		secondary_message = g_strdup_printf (_("There is no disc in \"%s\"."), drive_name);
@@ -716,36 +717,63 @@
 brasero_burn_dialog_previous_session_loss_cb (BraseroBurn *burn,
 					      GtkDialog *dialog)
 {
-	return brasero_burn_dialog_loss_warnings_cb (dialog,
-						     _("Multisession Disc"),
-						     _("Appending new files to a multisession disc is not advised:"),
-						     _("already burnt files will be invisible (though still readable).\nDo you want to continue anyway?"),
-						     _("Continue"),
-						     "media-optical-burn");
+	gchar *secondary;
+	BraseroBurnResult result;
+
+	secondary = g_strdup_printf ("%s\n%s",
+				     _("Already burnt files will be invisible (though still readable)."),
+				     _("Do you want to continue anyway?"));
+				     
+	result = brasero_burn_dialog_loss_warnings_cb (dialog,
+						       _("Multisession Disc"),
+						       _("Appending new files to a multisession disc is not advised."),
+						       secondary,
+						       _("Continue"),
+						       "media-optical-burn");
+	g_free (secondary);
+	return result;
 }
 
 static BraseroBurnResult
 brasero_burn_dialog_audio_to_appendable_cb (BraseroBurn *burn,
 					    GtkDialog *dialog)
 {
-	return brasero_burn_dialog_loss_warnings_cb (dialog,
-						     _("Multisession Disc"),
-						     _("Appending audio tracks to a CD is not advised:"),
-						     _("you might not be able to listen to them with stereos and CD-TEXT won't be written.\nDo you want to continue anyway?"),
-						     _("Continue"),
-						     "media-optical-burn");
+	gchar *secondary;
+	BraseroBurnResult result;
+
+	secondary = g_strdup_printf ("%s\n%s",
+				     _("You might not be able to listen to them with stereos and CD-TEXT won't be written."),
+				     _("Do you want to continue anyway?"));
+
+	result = brasero_burn_dialog_loss_warnings_cb (dialog,
+						       _("Multisession Disc"),
+						       _("Appending audio tracks to a CD is not advised."),
+						       secondary,
+						       _("Continue"),
+						       "media-optical-burn");
+	g_free (secondary);
+	return result;
 }
 
 static BraseroBurnResult
 brasero_burn_dialog_rewritable_cb (BraseroBurn *burn,
 				   GtkDialog *dialog)
 {
-	return brasero_burn_dialog_loss_warnings_cb (dialog,
-						     _("Rewritable Disc"),
-						     _("Recording audio tracks on a rewritable disc is not advised:"),
-						     _("you might not be able to listen to it with stereos.\nDo you want to continue anyway?"),
-						     _("Continue"),
-						     "media-optical-burn");
+	gchar *secondary;
+	BraseroBurnResult result;
+
+	secondary = g_strdup_printf ("%s\n%s",
+				     _("You might not be able to listen to it with stereos."),
+				     _("Do you want to continue anyway?"));
+
+	result = brasero_burn_dialog_loss_warnings_cb (dialog,
+						       _("Rewritable Disc"),
+						       _("Recording audio tracks on a rewritable disc is not advised."),
+						       secondary,
+						       _("Continue"),
+						       "media-optical-burn");
+	g_free (secondary);
+	return result;
 }
 
 static BraseroBurnResult
@@ -774,7 +802,7 @@
 					  _("Do you want to continue with Windows compatibility disabled?"));
 
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
-						  _("Some files don't have a suitable name for a Windows-compatible CD:"));
+						  _("Some files don't have a suitable name for a Windows-compatible CD."));
 
 	gtk_window_set_title (GTK_WINDOW (message), _("Windows Compatibility"));
 	gtk_dialog_add_buttons (GTK_DIALOG (message),
@@ -1434,8 +1462,8 @@
 	logfile = brasero_burn_session_get_log_path (dialog->priv->session);
 	if (g_stat (logfile, &stats) == -1) {
 		brasero_utils_message_dialog (GTK_WIDGET (dialog),
-					      _("The session log cannot be displayed:"),
-					      _("the log file could not be found."),
+					      _("The session log cannot be displayed."),
+					      _("The log file could not be found."),
 					      GTK_MESSAGE_ERROR);
 		gtk_widget_destroy (message);
 		return;
@@ -1458,7 +1486,7 @@
 			int errsv = errno;
 
 			brasero_utils_message_dialog (GTK_WIDGET (dialog),
-						      _("The session log cannot be displayed:"),
+						      _("The session log cannot be displayed."),
 						      g_strerror (errsv),
 						      GTK_MESSAGE_ERROR);
 			gtk_widget_destroy (message);
@@ -1469,7 +1497,7 @@
 			int errsv = errno;
 
 			brasero_utils_message_dialog (GTK_WIDGET (dialog),
-						      _("The session log cannot be displayed:"),
+						      _("The session log cannot be displayed."),
 						      g_strerror (errsv),
 						      GTK_MESSAGE_ERROR);
 			gtk_widget_destroy (message);
@@ -1538,7 +1566,7 @@
 		g_error_free (error);
 	}
 	else
-		secondary = g_strdup (_("An unknown error occured. Check your disc"));
+		secondary = g_strdup (_("An unknown error occured. Check your disc."));
 
 	if (!GTK_WIDGET_VISIBLE (dialog))
 		gtk_widget_show (GTK_WIDGET (dialog));
@@ -1548,11 +1576,11 @@
 					  GTK_DIALOG_MODAL,
 					  GTK_MESSAGE_ERROR,
 					  GTK_BUTTONS_NONE,
-					  _("Error while burning:"));
+					  _("Error while burning."));
 
 	gtk_window_set_title (GTK_WINDOW (message), _("Burning Error"));
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
-						  "%s.",
+						  "%s",
 						  secondary);
 	g_free (secondary);
 

Modified: trunk/src/brasero-burn-options.c
==============================================================================
--- trunk/src/brasero-burn-options.c	(original)
+++ trunk/src/brasero-burn-options.c	Sun Nov  9 21:51:02 2008
@@ -462,7 +462,7 @@
 	priv->copies_box = gtk_hbox_new (FALSE, 0);
 	gtk_widget_show (priv->copies_box);
 
-	label = gtk_label_new (_("Number of copies "));
+	label = gtk_label_new (_("Number of copies"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (priv->copies_box), label, FALSE, FALSE, 0);
 

Modified: trunk/src/brasero-data-disc.c
==============================================================================
--- trunk/src/brasero-data-disc.c	(original)
+++ trunk/src/brasero-data-disc.c	Sun Nov  9 21:51:02 2008
@@ -215,8 +215,8 @@
 					 GError *error)
 {
 	brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (disc)),
-				      _("The session couldn't be imported:"),
-				      error?error->message:_("unknown error"),
+				      _("The session couldn't be imported."),
+				      error?error->message:_("Unknown error."),
 				      GTK_MESSAGE_WARNING);
 }
 
@@ -894,7 +894,7 @@
 		return;
 	}
 
-	primary = g_strdup_printf (_("\"%s\" cannot be added to the selection:"), name);
+	primary = g_strdup_printf (_("\"%s\" cannot be added to the selection."), name);
 	brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (self)),
 				      primary,
 				      error->message,
@@ -925,10 +925,10 @@
 		return;
 	}
 
-	primary = g_strdup_printf (_("\"%s\" cannot be added to the selection:"), name);
+	primary = g_strdup_printf (_("\"%s\" cannot be added to the selection."), name);
 	brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (self)),
 				      primary,
-				      _("it is a recursive symlink."),
+				      _("It is a recursive symlink."),
 				      GTK_MESSAGE_ERROR);
 	g_free (primary);
 	g_free (name);
@@ -956,10 +956,10 @@
 		return;
 	}
 
-	primary = g_strdup_printf (_("\"%s\" cannot be added to the selection:"), name);
+	primary = g_strdup_printf (_("\"%s\" cannot be added to the selection."), name);
 	brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (self)),
 				      primary,
-				      _("it doesn't exist at the specified location."),
+				      _("It doesn't exist at the specified location."),
 				      GTK_MESSAGE_ERROR);
 	g_free (primary);
 	g_free (name);
@@ -988,16 +988,16 @@
 					 GTK_DIALOG_MODAL,
 					 GTK_MESSAGE_WARNING,
 					 GTK_BUTTONS_NONE,
-					 _("\"%s\" already exists in the directory:"),
+					 _("Do you really want to replace \"%s\"?"),
 					 name);
 
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Already Existing File"));
-
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						  _("do you really want to replace it?"));
+						  _("It already exists in the directory."));
 
-	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Don't replace"), GTK_RESPONSE_NO);
-	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Replace"), GTK_RESPONSE_YES);
+	/* Translators: Keep means we're keeping the files that already existed
+	 * Replace means we're replacing it with a new one with the same name */
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Keep Project File"), GTK_RESPONSE_NO);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Replace Project File"), GTK_RESPONSE_YES);
 
 	gtk_widget_show_all (dialog);
 	answer = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -1036,15 +1036,13 @@
 					 _("Do you really want to add \"%s\" to the selection and use the third version of ISO9660 standard to support it?"),
 					 name);
 
-	gtk_window_set_title (GTK_WINDOW (dialog), _("File Over 2 GiB"));
-
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 						  _("The size of the file is over 2 GiB. This isn't supported by ISO9660 standard in his first and second versions (the most widespread ones)."
 						    "\nIt is recommended to use the third version of ISO9660 standard which is supported by most of the operating systems including Linux and all versions of Windows Â."
 						    "\nA known exception is MacOS X that can't read images created with version 3 of ISO9660 standard."));
 
-	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Don't add"), GTK_RESPONSE_NO);
-	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Add"), GTK_RESPONSE_YES);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Add File"), GTK_RESPONSE_YES);
 
 	gtk_widget_show_all (dialog);
 	answer = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -1084,15 +1082,13 @@
 					 _("Do you really want to add \"%s\" to the selection?"),
 					 name);
 
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Deep Directory"));
-
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 						  _("The children of this directory will have 6 parent directories. This is a violation of the ISO9660 standard which only allows 6."
 						    "\nBrasero can create an image of such a file hierarchy and burn it; but the media may not be readable on all operating systems."
-						    "\nNOTE: such a file hierarchy is known to work on linux."));
+						    "\nNOTE: Such a file hierarchy is known to work on linux."));
 
-	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Don't add"), GTK_RESPONSE_NO);
-	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Add"), GTK_RESPONSE_YES);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Add File"), GTK_RESPONSE_YES);
 
 	gtk_widget_show_all (dialog);
 	answer = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -1946,7 +1942,7 @@
 		dialog = gtk_dialog_new_with_buttons (_("File Renaming"),
 						      GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (disc))),
 						      GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-						      _("_Don't rename"), GTK_RESPONSE_CANCEL,
+						      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 						      _("_Rename"), GTK_RESPONSE_APPLY,
 						      NULL);
 		gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);

Modified: trunk/src/brasero-disc-option-dialog.c
==============================================================================
--- trunk/src/brasero-disc-option-dialog.c	(original)
+++ trunk/src/brasero-disc-option-dialog.c	Sun Nov  9 21:51:02 2008
@@ -352,18 +352,16 @@
 					  GTK_DIALOG_MODAL,
 					  GTK_MESSAGE_INFO,
 					  GTK_BUTTONS_NONE,
-					  _("Should files be renamed to be windows-compatible?"));
+					  _("Should files be renamed to be fully Windows-compatible?"));
 
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
-						  _("Some files don't have a suitable name for a Windows-compatible CD. Those names will be changed and truncated to 64 characters."));
-
-	gtk_window_set_title (GTK_WINDOW (message), _("Windows Compatibility"));
+						  _("Some files don't have a suitable name for a fully Windows-compatible CD. Those names should be changed and truncated to 64 characters."));
 
 	gtk_dialog_add_button (GTK_DIALOG (message),
-			       _("_Don't rename"),
+			       _("_Disable Full Windows Compatibility"),
 			       GTK_RESPONSE_CANCEL);
 	gtk_dialog_add_button (GTK_DIALOG (message),
-			       _("_Rename"),
+			       _("_Rename for Full Windows Compatibility"),
 			       GTK_RESPONSE_YES);
 
 	answer = gtk_dialog_run (GTK_DIALOG (message));
@@ -483,7 +481,7 @@
 			  G_CALLBACK (brasero_disc_option_dialog_multi_toggled),
 			  dialog);
 	gtk_widget_set_tooltip_text (priv->multi_toggle,
-				     _("Allow create what is called an enhanced CD or CD+"));
+				     _("Allow creating an enhanced CD or CD+"));
 
 	string = g_strdup_printf ("<b>%s</b>", _("Disc options"));
 	options = brasero_utils_pack_properties (string,

Modified: trunk/src/brasero-jacket-view.c
==============================================================================
--- trunk/src/brasero-jacket-view.c	(original)
+++ trunk/src/brasero-jacket-view.c	Sun Nov  9 21:51:02 2008
@@ -1092,7 +1092,7 @@
 	image = gdk_pixbuf_new_from_file (path, &error);
 	if (error) {
 		brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (self)),
-					      _("The image couldn't be loaded:"),
+					      _("The image couldn't be loaded."),
 					      error->message,
 					      GTK_MESSAGE_ERROR);
 		g_error_free (error);

Modified: trunk/src/brasero-playlist.c
==============================================================================
--- trunk/src/brasero-playlist.c	(original)
+++ trunk/src/brasero-playlist.c	Sun Nov  9 21:51:02 2008
@@ -825,10 +825,10 @@
 
 	BRASERO_GET_BASENAME_FOR_DISPLAY (uri, name);
 
-	primary = g_strdup_printf (_("Error parsing playlist \"%s\":"), name);
+	primary = g_strdup_printf (_("Error parsing playlist \"%s\"."), name);
 	brasero_utils_message_dialog (GTK_WIDGET (toplevel),
 				      primary,
-				      _("an unknown error occured."),
+				      _("An unknown error occured."),
 				      GTK_MESSAGE_ERROR);
 	g_free (primary);
 	g_free (name);

Modified: trunk/src/brasero-project-manager.c
==============================================================================
--- trunk/src/brasero-project-manager.c	(original)
+++ trunk/src/brasero-project-manager.c	Sun Nov  9 21:51:02 2008
@@ -1065,7 +1065,7 @@
 
 		string = g_strdup_printf (_("The project '%s' does not exist."), uri);
 		brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (manager)),
-					      _("Error while loading the project:"),
+					      _("Error while loading the project."),
 					      string,
 					      GTK_MESSAGE_ERROR);
 		g_free (string);

Modified: trunk/src/brasero-project.c
==============================================================================
--- trunk/src/brasero-project.c	(original)
+++ trunk/src/brasero-project.c	Sun Nov  9 21:51:02 2008
@@ -749,12 +749,10 @@
 					 GTK_DIALOG_MODAL,
 					 GTK_MESSAGE_INFO,
 					 GTK_BUTTONS_CLOSE,
-					 _("Please wait:"));
-
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Please Wait"));
+					 _("Please wait."));
 
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-						  _("some tasks are not completed yet."));
+						  _("Some tasks are not completed yet."));
 
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Ongoing Tasks"));
 
@@ -1616,7 +1614,7 @@
 					const char *reason)
 {
 	brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (project)),
-				      _("Error while loading the project:"),
+				      _("Error while loading the project."),
 				      reason,
 				      GTK_MESSAGE_ERROR);
 }
@@ -1913,7 +1911,7 @@
 
 	if (!project) {
 	    	if (warn_user)
-			brasero_project_invalid_project_dialog (proj, _("the project could not be opened."));
+			brasero_project_invalid_project_dialog (proj, _("The project could not be opened."));
 
 		return FALSE;
 	}
@@ -1922,7 +1920,7 @@
 	item = xmlDocGetRootElement (project);
 	if (!item) {
 	    	if (warn_user)
-			brasero_project_invalid_project_dialog (proj, _("the file is empty."));
+			brasero_project_invalid_project_dialog (proj, _("The file is empty."));
 
 		xmlFreeDoc (project);
 		return FALSE;
@@ -1960,7 +1958,7 @@
 	xmlFreeDoc (project);
 
 	if (!retval && warn_user)
-		brasero_project_invalid_project_dialog (proj, _("it doesn't seem to be a valid Brasero project."));
+		brasero_project_invalid_project_dialog (proj, _("It doesn't seem to be a valid Brasero project."));
 
 	return retval;
 
@@ -1968,7 +1966,7 @@
 
 	xmlFreeDoc (project);
     	if (warn_user)
-		brasero_project_invalid_project_dialog (proj, _("it doesn't seem to be a valid Brasero project."));
+		brasero_project_invalid_project_dialog (proj, _("It doesn't seem to be a valid Brasero project."));
 
 	return FALSE;
 }
@@ -2184,7 +2182,7 @@
 
 	error = xmlGetLastError ();
 	brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (project)),
-				      _("Your project has not been saved:"),
+				      _("Your project has not been saved."),
 				      error?error->message:_("Unknown error."),
 				      GTK_MESSAGE_ERROR);
 	xmlResetLastError ();
@@ -2551,7 +2549,7 @@
 				goto error;
 
 			/* Translators: %s is an artist */
-			string = g_strdup_printf (_(" by %s"), info->artist);
+			string = g_strdup_printf (" by %s", info->artist);
 			written = fwrite (string, 1, strlen (string), file);
 			if (written != strlen (string)) {
 				g_free (string);

Modified: trunk/src/brasero-search-beagle.c
==============================================================================
--- trunk/src/brasero-search-beagle.c	(original)
+++ trunk/src/brasero-search-beagle.c	Sun Nov  9 21:51:02 2008
@@ -1053,7 +1053,7 @@
 	}
 
 	brasero_utils_message_dialog (toplevel,
-				      _("Error querying beagle:"),
+				      _("Error querying beagle."),
 				      error->message,
 				      GTK_MESSAGE_ERROR);
 }

Modified: trunk/src/brasero-split-dialog.c
==============================================================================
--- trunk/src/brasero-split-dialog.c	(original)
+++ trunk/src/brasero-split-dialog.c	Sun Nov  9 21:51:02 2008
@@ -608,8 +608,8 @@
 brasero_split_dialog_no_silence_message (BraseroSplitDialog *self)
 {
 	brasero_utils_message_dialog (GTK_WIDGET (self),
-				      _("The track wasn't split:"),
-				      _("no silence could be retrieved."),
+				      _("The track wasn't split."),
+				      _("No silence could be detected."),
 				      GTK_MESSAGE_WARNING);
 }
 
@@ -632,7 +632,7 @@
 
 	if (error) {
 		brasero_utils_message_dialog (GTK_WIDGET (self),
-					      _("An error occured while retrieving silences:"),
+					      _("An error occured while detecting silences."),
 					      error->message,
 					      GTK_MESSAGE_ERROR);
 		return;

Modified: trunk/src/brasero-sum-dialog.c
==============================================================================
--- trunk/src/brasero-sum-dialog.c	(original)
+++ trunk/src/brasero-sum-dialog.c	Sun Nov  9 21:51:02 2008
@@ -152,8 +152,8 @@
 
 	return brasero_sum_dialog_message (self,
 					   _("File Integrity Check Error"),
-					   _("The file integrity check cannot be performed:"),
-					   error ? error->message:_("unknown error"),
+					   _("The file integrity check cannot be performed."),
+					   error ? error->message:_("Unknown error."),
 					   GTK_MESSAGE_ERROR);
 }
 
@@ -166,8 +166,8 @@
 
 	return brasero_sum_dialog_message (self,
 					   _("File Integrity Check Success"),
-					   _("The file integrity was performed successfully:"),
-					   _("there seems to be no corrupted file on the disc."),
+					   _("The file integrity was performed successfully."),
+					   _("There seems to be no corrupted file on the disc."),
 					   GTK_MESSAGE_INFO);
 }
 
@@ -479,8 +479,8 @@
 	if (!uri) {
 		retval = brasero_sum_dialog_message (self,
 						     _("File Integrity Check Error"),
-						     _("The file integrity check cannot be performed:"),
-						     error ? error->message:_("no md5 file was given."),
+						     _("The file integrity check cannot be performed."),
+						     error ? error->message:_("No md5 file was given."),
 						     GTK_MESSAGE_ERROR);
 		return retval;
 	}

Modified: trunk/src/brasero-time-button.c
==============================================================================
--- trunk/src/brasero-time-button.c	(original)
+++ trunk/src/brasero-time-button.c	Sun Nov  9 21:51:02 2008
@@ -290,6 +290,7 @@
 	gtk_widget_show (priv->hrs);
 	gtk_box_pack_start (GTK_BOX (object), priv->hrs, FALSE, FALSE, 0);
 
+	/* Translators: separating hours and minutes */
 	label = gtk_label_new (_(":"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (object), label, FALSE, FALSE, 0);
@@ -299,6 +300,7 @@
 	gtk_widget_show (priv->min);
 	gtk_box_pack_start (GTK_BOX (object), priv->min, FALSE, FALSE, 0);
 
+	/* Translators: separating minutes and seconds */
 	label = gtk_label_new (_(":"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (object), label, FALSE, FALSE, 0);
@@ -308,6 +310,7 @@
 	gtk_widget_show (priv->sec);
 	gtk_box_pack_start (GTK_BOX (object), priv->sec, FALSE, FALSE, 0);
 
+	/* Translators: separating seconds and frames */
 	label = gtk_label_new (_(":"));
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (object), label, FALSE, FALSE, 0);

Modified: trunk/src/brasero-tool-dialog.c
==============================================================================
--- trunk/src/brasero-tool-dialog.c	(original)
+++ trunk/src/brasero-tool-dialog.c	Sun Nov  9 21:51:02 2008
@@ -74,8 +74,8 @@
 brasero_tool_dialog_media_error (BraseroToolDialog *self)
 {
 	brasero_utils_message_dialog (GTK_WIDGET (self),
-				     _("The operation cannot be performed:"),
-				     _("the inserted media is busy."),
+				     _("The operation cannot be performed."),
+				     _("The inserted media is busy."),
 				     GTK_MESSAGE_ERROR);
 }
 
@@ -83,8 +83,8 @@
 brasero_tool_dialog_media_busy (BraseroToolDialog *self)
 {
 	brasero_utils_message_dialog (GTK_WIDGET (self),
-				     _("The operation cannot be performed:"),
-				     _("the inserted media is not supported."),
+				     _("The operation cannot be performed."),
+				     _("The inserted media is not supported."),
 				     GTK_MESSAGE_ERROR);
 }
 
@@ -92,8 +92,8 @@
 brasero_tool_dialog_no_media (BraseroToolDialog *self)
 {
 	brasero_utils_message_dialog (GTK_WIDGET (self),
-				     _("The operation cannot be performed:"),
-				     _("the drive is empty."),
+				     _("The operation cannot be performed."),
+				     _("The drive is empty."),
 				     GTK_MESSAGE_ERROR);
 }
 

Modified: trunk/src/brasero-tray.c
==============================================================================
--- trunk/src/brasero-tray.c	(original)
+++ trunk/src/brasero-tray.c	Sun Nov  9 21:51:02 2008
@@ -219,7 +219,6 @@
 			  NULL);
 
 	gtk_status_icon_set_from_icon_name (GTK_STATUS_ICON (obj), "brasero-disc-00");
-	gtk_status_icon_set_tooltip (GTK_STATUS_ICON (obj), _("waiting"));
 	obj->priv->first_burning_percent = -1;
 }
 

Modified: trunk/src/brasero-utils.c
==============================================================================
--- trunk/src/brasero-utils.c	(original)
+++ trunk/src/brasero-utils.c	Sun Nov  9 21:51:02 2008
@@ -469,7 +469,7 @@
 
 		if (!g_app_info_launch_default_for_uri (uri, NULL, &error)) {
 			brasero_utils_message_dialog (gtk_widget_get_toplevel (GTK_WIDGET (widget)),
-						      _("This file can't be opened:"),
+						      _("This file can't be opened."),
 						      error->message,
 						      GTK_MESSAGE_ERROR);
 			g_error_free (error);

Modified: trunk/src/burn.c
==============================================================================
--- trunk/src/burn.c	(original)
+++ trunk/src/burn.c	Sun Nov  9 21:51:02 2008
@@ -1314,7 +1314,9 @@
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_BUSY_DRIVE,
-			     _("the drive seems to be busy"));
+			     "%s %s",
+			     _("The drive is busy."),
+			     _("Make sure another application is not using it."));
 		return BRASERO_BURN_ERR;
 	}
 
@@ -1346,7 +1348,9 @@
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_BUSY_DRIVE,
-			     _("the drive seems to be busy"));
+			     "%s %s",
+			     _("The drive is busy."),
+			     _("Make sure another application is not using it."));
 		return BRASERO_BURN_ERR;
 	}
 
@@ -1483,7 +1487,9 @@
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_BUSY_DRIVE,
-			     _("the drive seems to be busy"));
+			     "%s %s",
+			     _("The drive is busy."),
+			     _("Make sure another application is not using it."));
 		return BRASERO_BURN_ERR;
 	}
 
@@ -1492,7 +1498,9 @@
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_BUSY_DRIVE,
-			     _("the drive seems to be busy"));
+			     "%s %s",
+			     _("The drive is busy."),
+			     _("Make sure another application is not using it."));
 		return BRASERO_BURN_ERR;
 	}
 
@@ -1814,7 +1822,9 @@
 			g_set_error (error,
 				     BRASERO_BURN_ERROR,
 				     BRASERO_BURN_ERROR_BUSY_DRIVE,
-				     _("the drive seems to be busy"));
+				     "%s %s",
+				     _("The drive is busy"),
+				     _("Make sure another application is not using it."));
 			return BRASERO_BURN_ERR;
 		}
 

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Sun Nov  9 21:51:02 2008
@@ -197,8 +197,8 @@
 
 	if (nb > 1) {
 		brasero_utils_message_dialog (NULL,
-					      _("Incompatible command line options used:"),
-					      _("only one option can be given at a time."),
+					      _("Incompatible command line options used."),
+					      _("Only one option can be given at a time."),
 					      GTK_MESSAGE_ERROR);
 
 		brasero_project_manager_empty (BRASERO_PROJECT_MANAGER (manager));

Modified: trunk/src/plugins/local-track/burn-uri.c
==============================================================================
--- trunk/src/plugins/local-track/burn-uri.c	(original)
+++ trunk/src/plugins/local-track/burn-uri.c	Sun Nov  9 21:51:02 2008
@@ -156,7 +156,7 @@
 				g_set_error (error,
 					     BRASERO_BURN_ERROR,
 					     BRASERO_BURN_ERROR_GENERAL,
-					     _("impossible to retrieve local file path"));
+					     _("Impossible to retrieve local file path."));
 
 				g_slist_foreach (grafts, (GFunc) brasero_graft_point_free, NULL);
 				g_slist_free (grafts);

Modified: trunk/src/scsi-error.c
==============================================================================
--- trunk/src/scsi-error.c	(original)
+++ trunk/src/scsi-error.c	Sun Nov  9 21:51:02 2008
@@ -29,19 +29,19 @@
 #include "burn-basics.h"
 #include "scsi-error.h"
 
-static const gchar *error_string [] = {	N_("unknown error"),
-					N_("size mismatch"),
-					N_("type mismatch"),
-					N_("bad argument"),
-					N_("the device is not ready"),
-					N_("outrange address"),
-					N_("invalid address"),
-					N_("invalid command"),
-					N_("invalid parameter in command"),
-					N_("invalid field in command"),
-					N_("the device timed out"),
-					N_("key not established"),
-					N_("invalid track mode"),
+static const gchar *error_string [] = {	N_("Unknown error."),
+					N_("Size mismatch."),
+					N_("Type mismatch."),
+					N_("Bad argument."),
+					N_("The drive is busy."),
+					N_("Outrange address."),
+					N_("Invalid address."),
+					N_("Invalid command."),
+					N_("Invalid parameter in command."),
+					N_("Invalid field in command."),
+					N_("The device timed out."),
+					N_("Key not established."),
+					N_("Invalid track mode."),
 					NULL	};	/* errno */
 
 const gchar *



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