nautilus r14017 - in trunk: . libnautilus-private src src/file-manager
- From: cosimoc svn gnome org
- To: svn-commits-list gnome org
- Subject: nautilus r14017 - in trunk: . libnautilus-private src src/file-manager
- Date: Tue, 1 Apr 2008 11:01:23 +0100 (BST)
Author: cosimoc
Date: Tue Apr 1 11:01:22 2008
New Revision: 14017
URL: http://svn.gnome.org/viewvc/nautilus?rev=14017&view=rev
Log:
2008-04-01 Cosimo Cecchi <cosimoc gnome org>
* libnautilus-private/nautilus-file-operations.c: (delete_dir),
(prompt_empty_trash), (verify_destination), (copy_move_directory),
(remove_target_recursively), (copy_move_file):
* libnautilus-private/nautilus-mime-actions.c:
(report_broken_symbolic_link), (activate_files):
* libnautilus-private/nautilus-program-choosing.c:
(application_cannot_open_location), (nautilus_launch_application),
(nautilus_launch_desktop_file):
* src/file-manager/fm-error-reporting.c:
(fm_report_error_loading_directory),
(fm_report_error_renaming_file), (fm_report_error_setting_group),
(fm_report_error_setting_owner),
(fm_report_error_setting_permissions):
* src/file-manager/fm-properties-window.c:
(fm_properties_window_drag_data_received),
(create_permissions_page):
* src/nautilus-application.c: (nautilus_application_startup):
* src/nautilus-connect-server-dialog-main.c:
(display_error_dialog):
* src/nautilus-connect-server-dialog.c: (connect_to_server):
* src/nautilus-emblem-sidebar.c:
(nautilus_emblem_sidebar_delete_cb), (rename_dialog_response_cb):
* src/nautilus-information-panel.c: (receive_dropped_uri_list):
* src/nautilus-property-browser.c: (remove_pattern),
(remove_emblem), (add_pattern_to_browser):
* src/nautilus-window-manage-views.c:
(display_view_selection_failure):
Do not use contractions in strings. (#145356).
Modified:
trunk/ChangeLog
trunk/libnautilus-private/nautilus-file-operations.c
trunk/libnautilus-private/nautilus-mime-actions.c
trunk/libnautilus-private/nautilus-program-choosing.c
trunk/src/file-manager/fm-error-reporting.c
trunk/src/file-manager/fm-properties-window.c
trunk/src/nautilus-application.c
trunk/src/nautilus-connect-server-dialog-main.c
trunk/src/nautilus-connect-server-dialog.c
trunk/src/nautilus-emblem-sidebar.c
trunk/src/nautilus-information-panel.c
trunk/src/nautilus-property-browser.c
trunk/src/nautilus-window-manage-views.c
Modified: trunk/libnautilus-private/nautilus-file-operations.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file-operations.c (original)
+++ trunk/libnautilus-private/nautilus-file-operations.c Tue Apr 1 11:01:22 2008
@@ -1353,7 +1353,7 @@
goto skip;
}
primary = f (_("Error while deleting."));
- secondary = f (_("Couldn't remove the folder %B."), dir);
+ secondary = f (_("Could not remove the folder %B."), dir);
details = error->message;
response = run_warning (job,
@@ -1937,7 +1937,7 @@
"All trashed items on the volume "
"will be permanently lost."));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- _("Don't Empty Trash"), GTK_RESPONSE_REJECT,
+ _("Do not Empty Trash"), GTK_RESPONSE_REJECT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("Empty Trash"), GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
@@ -2381,7 +2381,7 @@
details = NULL;
if (IS_IO_ERROR (error, PERMISSION_DENIED)) {
- secondary = f (_("You don't have permissions to access the destination folder."));
+ secondary = f (_("You do not have permissions to access the destination folder."));
} else {
secondary = f (_("There was an error getting information about the destination."));
details = error->message;
@@ -3025,7 +3025,7 @@
goto skip;
}
primary = f (_("Error while moving \"%B\"."), src);
- secondary = f (_("Couldn't remove the source folder."));
+ secondary = f (_("Could not remove the source folder."));
details = error->message;
response = run_warning (job,
@@ -3107,7 +3107,7 @@
}
primary = f (_("Error while copying \"%B\"."), src);
- secondary = f (_("Couldn't remove files from the already existing folder %F."), file);
+ secondary = f (_("Could not remove files from the already existing folder %F."), file);
details = error->message;
response = run_warning (job,
@@ -3144,7 +3144,7 @@
goto skip2;
}
primary = f (_("Error while copying \"%B\"."), src);
- secondary = f (_("Couldn't remove the already existing file %F."), file);
+ secondary = f (_("Could not remove the already existing file %F."), file);
details = error->message;
response = run_warning (job,
@@ -3420,7 +3420,7 @@
} else {
primary = f (_("Error while copying \"%B\"."), src);
}
- secondary = f (_("Couldn't remove the already existing file with the same name in %F."), dest_dir);
+ secondary = f (_("Could not remove the already existing file with the same name in %F."), dest_dir);
details = error->message;
response = run_warning (job,
Modified: trunk/libnautilus-private/nautilus-mime-actions.c
==============================================================================
--- trunk/libnautilus-private/nautilus-mime-actions.c (original)
+++ trunk/libnautilus-private/nautilus-mime-actions.c Tue Apr 1 11:01:22 2008
@@ -598,9 +598,9 @@
target_path = nautilus_file_get_symbolic_link_target_path (file);
if (target_path == NULL) {
- detail = g_strdup (_("This link can't be used, because it has no target."));
+ detail = g_strdup (_("This link cannot be used, because it has no target."));
} else {
- detail = g_strdup_printf (_("This link can't be used, because its target "
+ detail = g_strdup_printf (_("This link cannot be used, because its target "
"\"%s\" doesn't exist."), target_path);
}
@@ -1196,7 +1196,7 @@
(full_uri_for_display, MAX_URI_IN_DIALOG_LENGTH);
g_free (full_uri_for_display);
- error_message = g_strdup_printf (_("Couldn't display \"%s\"."),
+ error_message = g_strdup_printf (_("Could not display \"%s\"."),
uri_for_display);
g_free (uri_for_display);
Modified: trunk/libnautilus-private/nautilus-program-choosing.c
==============================================================================
--- trunk/libnautilus-private/nautilus-program-choosing.c (original)
+++ trunk/libnautilus-private/nautilus-program-choosing.c Tue Apr 1 11:01:22 2008
@@ -79,13 +79,13 @@
if (nautilus_mime_has_any_applications_for_file (file)) {
if (application != NULL) {
prompt = _("Open Failed, would you like to choose another application?");
- message = g_strdup_printf (_("\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+ message = g_strdup_printf (_("\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" "
"locations."),
g_app_info_get_name (application), file_name,
g_app_info_get_name (application), uri_scheme);
} else {
prompt = _("Open Failed, would you like to choose another action?");
- message = g_strdup_printf (_("The default action can't open \"%s\" because it can't access files at \"%s\" "
+ message = g_strdup_printf (_("The default action cannot open \"%s\" because it cannot access files at \"%s\" "
"locations."),
file_name, uri_scheme);
}
@@ -110,14 +110,14 @@
g_free (message);
} else {
if (application != NULL) {
- prompt = g_strdup_printf (_("\"%s\" can't open \"%s\" because \"%s\" can't access files at \"%s\" "
+ prompt = g_strdup_printf (_("\"%s\" cannot open \"%s\" because \"%s\" cannot access files at \"%s\" "
"locations."), g_app_info_get_name (application), file_name,
g_app_info_get_name (application), uri_scheme);
message = _("No other applications are available to view this file. "
"If you copy this file onto your computer, you may be able to open "
"it.");
} else {
- prompt = g_strdup_printf (_("The default action can't open \"%s\" because it can't access files at \"%s\" "
+ prompt = g_strdup_printf (_("The default action cannot open \"%s\" because it cannot access files at \"%s\" "
"locations."), file_name, uri_scheme);
message = _("No other actions are available to view this file. "
"If you copy this file onto your computer, you may be able to open "
@@ -203,7 +203,7 @@
nautilus_program_chooser_show_invalid_message
(GNOME_VFS_MIME_ACTION_TYPE_APPLICATION, file, parent_window);
#else
- g_warning ("Can't open app: %s\n", error->message);
+ g_warning ("Cannot open app: %s\n", error->message);
#endif
}
} else {
@@ -279,7 +279,7 @@
g_free (desktop_file_path);
g_object_unref (desktop_file);
eel_show_error_dialog
- (_("Sorry, but you can't execute commands from "
+ (_("Sorry, but you cannot execute commands from "
"a remote site."),
_("This is disabled due to security considerations."),
parent_window);
Modified: trunk/src/file-manager/fm-error-reporting.c
==============================================================================
--- trunk/src/file-manager/fm-error-reporting.c (original)
+++ trunk/src/file-manager/fm-error-reporting.c Tue Apr 1 11:01:22 2008
@@ -60,11 +60,11 @@
file_name);
break;
case G_IO_ERROR_NOT_FOUND:
- message = g_strdup_printf (_("\"%s\" couldn't be found. Perhaps it has recently been deleted."),
+ message = g_strdup_printf (_("\"%s\" could not be found. Perhaps it has recently been deleted."),
file_name);
break;
default:
- message = g_strdup_printf (_("Sorry, couldn't display all the contents of \"%s\": %s"), file_name,
+ message = g_strdup_printf (_("Sorry, could not display all the contents of \"%s\": %s"), file_name,
error->message);
}
} else {
@@ -134,7 +134,7 @@
g_warning ("Hit unhandled case %s:%d in fm_report_error_renaming_file",
g_quark_to_string (error->domain), error->code);
/* fall through */
- message = g_strdup_printf (_("Sorry, couldn't rename \"%s\" to \"%s\": %s"),
+ message = g_strdup_printf (_("Sorry, could not rename \"%s\" to \"%s\": %s"),
original_name_truncated, new_name_truncated,
error->message);
}
@@ -177,7 +177,7 @@
g_warning ("Hit unhandled case %s:%d in fm_report_error_setting_group",
g_quark_to_string (error->domain), error->code);
/* fall through */
- message = g_strdup_printf (_("Sorry, couldn't change the group of \"%s\": %s"), file_name,
+ message = g_strdup_printf (_("Sorry, could not change the group of \"%s\": %s"), file_name,
error->message);
}
@@ -202,7 +202,7 @@
file_name = nautilus_file_get_display_name (file);
- message = g_strdup_printf (_("Sorry, couldn't change the owner of \"%s\": %s"), file_name, error->message);
+ message = g_strdup_printf (_("Sorry, could not change the owner of \"%s\": %s"), file_name, error->message);
eel_show_error_dialog (_("The owner could not be changed."), message, parent_window);
@@ -224,7 +224,7 @@
file_name = nautilus_file_get_display_name (file);
- message = g_strdup_printf (_("Sorry, couldn't change the permissions of \"%s\": %s"), file_name, error->message);
+ message = g_strdup_printf (_("Sorry, could not change the permissions of \"%s\": %s"), file_name, error->message);
eel_show_error_dialog (_("The permissions could not be changed."), message, parent_window);
Modified: trunk/src/file-manager/fm-properties-window.c
==============================================================================
--- trunk/src/file-manager/fm-properties-window.c (original)
+++ trunk/src/file-manager/fm-properties-window.c Tue Apr 1 11:01:22 2008
@@ -533,7 +533,7 @@
if (!exactly_one) {
eel_show_error_dialog
- (_("You can't assign more than one custom icon at a time!"),
+ (_("You cannot assign more than one custom icon at a time!"),
_("Please drag just one image to set a custom icon."),
window);
} else {
@@ -4710,7 +4710,7 @@
if (!all_can_set_permissions (file_list)) {
add_prompt_and_separator (
GTK_VBOX (vbox),
- _("You are not the owner, so you can't change these permissions."));
+ _("You are not the owner, so you cannot change these permissions."));
}
page_table = GTK_TABLE (gtk_table_new (1, COLUMN_COUNT, FALSE));
Modified: trunk/src/nautilus-application.c
==============================================================================
--- trunk/src/nautilus-application.c (original)
+++ trunk/src/nautilus-application.c Tue Apr 1 11:01:22 2008
@@ -586,18 +586,18 @@
* this problem but we don't exactly understand why,
* since neither of the above causes explain it.
*/
- message = _("Nautilus can't be used now. "
+ message = _("Nautilus cannot be used now. "
"Running the command \"bonobo-slay\""
" from the console may fix the problem. If not,"
" you can try rebooting the computer or"
" installing Nautilus again.");
/* FIXME bugzilla.gnome.org 42536: The guesses and stuff here are lame. */
- detailed_message = _("Nautilus can't be used now. "
+ detailed_message = _("Nautilus cannot be used now. "
"Running the command \"bonobo-slay\" "
"from the console may fix the problem. If not, "
"you can try rebooting the computer or "
"installing Nautilus again.\n\n"
- "Bonobo couldn't locate the Nautilus_shell.server file. "
+ "Bonobo could not locate the Nautilus_shell.server file. "
"One cause of this seems to be an LD_LIBRARY_PATH "
"that does not include the bonobo-activation library's directory. "
"Another possible cause would be bad install "
@@ -606,7 +606,7 @@
"Bonobo Activation and GConf processes, which may be needed by "
"other applications.\n\n"
"Sometimes killing bonobo-activation-server and gconfd fixes "
- "the problem, but we don't know why.\n\n"
+ "the problem, but we do not know why.\n\n"
"We have also seen this error when a faulty "
"version of bonobo-activation was installed.");
break;
@@ -622,8 +622,8 @@
* current OAF. I guess I read the code wrong. Need to figure out when and make a
* good message.
*/
- message = _("Nautilus can't be used now, due to an unexpected error.");
- detailed_message = _("Nautilus can't be used now, due to an unexpected error "
+ message = _("Nautilus cannot be used now, due to an unexpected error.");
+ detailed_message = _("Nautilus cannot be used now, due to an unexpected error "
"from Bonobo when attempting to register the file manager view server.");
break;
}
@@ -640,15 +640,15 @@
*/
if (result == Bonobo_ACTIVATION_REG_SUCCESS) {
/* FIXME bugzilla.gnome.org 42538: When can this happen? */
- message = _("Nautilus can't be used now, due to an unexpected error.");
- detailed_message = _("Nautilus can't be used now, due to an unexpected error "
+ message = _("Nautilus cannot be used now, due to an unexpected error.");
+ detailed_message = _("Nautilus cannot be used now, due to an unexpected error "
"from Bonobo when attempting to locate the factory. "
"Killing bonobo-activation-server and restarting Nautilus may help fix the problem.");
} else {
num_failures++;
if (num_failures > 20) {
- message = _("Nautilus can't be used now, due to an unexpected error.");
- detailed_message = _("Nautilus can't be used now, due to an unexpected error "
+ message = _("Nautilus cannot be used now, due to an unexpected error.");
+ detailed_message = _("Nautilus cannot be used now, due to an unexpected error "
"from Bonobo when attempting to locate the shell object. "
"Killing bonobo-activation-server and restarting Nautilus may help fix the problem.");
Modified: trunk/src/nautilus-connect-server-dialog-main.c
==============================================================================
--- trunk/src/nautilus-connect-server-dialog-main.c (original)
+++ trunk/src/nautilus-connect-server-dialog-main.c Tue Apr 1 11:01:22 2008
@@ -73,7 +73,7 @@
GtkDialog *error_dialog;
char *error_message;
- error_message = g_strdup_printf (_("Can't display location \"%s\""),
+ error_message = g_strdup_printf (_("Cannot display location \"%s\""),
uri);
error_dialog = eel_show_error_dialog (error_message,
error->message,
Modified: trunk/src/nautilus-connect-server-dialog.c
==============================================================================
--- trunk/src/nautilus-connect-server-dialog.c (original)
+++ trunk/src/nautilus-connect-server-dialog.c Tue Apr 1 11:01:22 2008
@@ -201,7 +201,7 @@
server = gtk_editable_get_chars (GTK_EDITABLE (dialog->details->server_entry), 0, -1);
if (strlen (server) == 0) {
- eel_show_error_dialog (_("Can't Connect to Server. You must enter a name for the server."),
+ eel_show_error_dialog (_("Cannot Connect to Server. You must enter a name for the server."),
_("Please enter a name and try again."),
GTK_WINDOW (dialog));
g_free (server);
Modified: trunk/src/nautilus-emblem-sidebar.c
==============================================================================
--- trunk/src/nautilus-emblem-sidebar.c (original)
+++ trunk/src/nautilus-emblem-sidebar.c Tue Apr 1 11:01:22 2008
@@ -235,7 +235,7 @@
if (nautilus_emblem_remove_emblem (emblem_sidebar->details->popup_emblem_keyword)) {
send_emblems_changed ();
} else {
- error = g_strdup_printf (_("Couldn't remove emblem with name '%s'."), emblem_sidebar->details->popup_emblem_display_name);
+ error = g_strdup_printf (_("Could not remove emblem with name '%s'."), emblem_sidebar->details->popup_emblem_display_name);
eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one that you added yourself."),
NULL);
g_free (error);
@@ -269,7 +269,7 @@
if (nautilus_emblem_rename_emblem (keyword, name)) {
send_emblems_changed ();
} else {
- error = g_strdup_printf (_("Couldn't rename emblem with name '%s'."), name);
+ error = g_strdup_printf (_("Could not rename emblem with name '%s'."), name);
eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one that you added yourself."),
NULL);
g_free (error);
Modified: trunk/src/nautilus-information-panel.c
==============================================================================
--- trunk/src/nautilus-information-panel.c (original)
+++ trunk/src/nautilus-information-panel.c Tue Apr 1 11:01:22 2008
@@ -492,7 +492,7 @@
if (!exactly_one) {
eel_show_error_dialog (
- _("You can't assign more than one custom icon at a time."),
+ _("You cannot assign more than one custom icon at a time."),
_("Please drag just one image to set a custom icon."),
window);
break;
Modified: trunk/src/nautilus-property-browser.c
==============================================================================
--- trunk/src/nautilus-property-browser.c (original)
+++ trunk/src/nautilus-property-browser.c Tue Apr 1 11:01:22 2008
@@ -973,7 +973,7 @@
/* delete the pattern from the pattern directory */
if (g_unlink (pattern_path) != 0) {
- char *message = g_strdup_printf (_("Sorry, but pattern %s couldn't be deleted."), pattern_name);
+ char *message = g_strdup_printf (_("Sorry, but pattern %s could not be deleted."), pattern_name);
char *detail = _("Check that you have permission to delete the pattern.");
eel_show_error_dialog (message, detail, GTK_WINDOW (property_browser));
g_free (message);
@@ -1002,7 +1002,7 @@
/* delete the emblem from the emblem directory */
if (g_unlink (emblem_path) != 0) {
- char *message = g_strdup_printf (_("Sorry, but emblem %s couldn't be deleted."), emblem_name);
+ char *message = g_strdup_printf (_("Sorry, but emblem %s could not be deleted."), emblem_name);
char *detail = _("Check that you have permission to delete the emblem.");
eel_show_error_dialog (message, detail, GTK_WINDOW (property_browser));
g_free (message);
@@ -1201,7 +1201,7 @@
/* don't allow the user to change the reset image */
basename = g_path_get_basename (path_name);
if (basename && eel_strcmp (basename, RESET_IMAGE_NAME) == 0) {
- eel_show_error_dialog (_("Sorry, but you can't replace the reset image."),
+ eel_show_error_dialog (_("Sorry, but you cannot replace the reset image."),
_("Reset is a special image that cannot be deleted."),
NULL);
g_free (path_uri);
@@ -1232,7 +1232,7 @@
if (!g_file_copy (src, dest,
0,
NULL, NULL, NULL, NULL)) {
- char *message = g_strdup_printf (_("Sorry, but the pattern %s couldn't be installed."), path_name);
+ char *message = g_strdup_printf (_("Sorry, but the pattern %s could not be installed."), path_name);
eel_show_error_dialog (message, NULL, GTK_WINDOW (property_browser));
g_free (message);
}
Modified: trunk/src/nautilus-window-manage-views.c
==============================================================================
--- trunk/src/nautilus-window-manage-views.c (original)
+++ trunk/src/nautilus-window-manage-views.c Tue Apr 1 11:01:22 2008
@@ -1689,13 +1689,13 @@
if (error == NULL) {
if (nautilus_file_is_directory (file)) {
error_message = g_strdup_printf
- (_("Couldn't display \"%s\"."),
+ (_("Could not display \"%s\"."),
uri_for_display);
detail_message = g_strdup
(_("Nautilus has no installed viewer capable of displaying the folder."));
} else {
error_message = g_strdup_printf
- (_("Couldn't display \"%s\"."),
+ (_("Could not display \"%s\"."),
uri_for_display);
detail_message = g_strdup
(_("The location is not a folder."));
@@ -1704,7 +1704,7 @@
switch (error->code) {
case G_IO_ERROR_NOT_FOUND:
error_message = g_strdup_printf
- (_("Couldn't find \"%s\"."),
+ (_("Could not find \"%s\"."),
uri_for_display);
detail_message = g_strdup
(_("Please check the spelling and try again."));
@@ -1712,7 +1712,7 @@
case G_IO_ERROR_NOT_SUPPORTED:
scheme_string = g_file_get_uri_scheme (location);
- error_message = g_strdup_printf (_("Couldn't display \"%s\"."),
+ error_message = g_strdup_printf (_("Could not display \"%s\"."),
uri_for_display);
if (scheme_string != NULL) {
detail_message = g_strdup_printf (_("Nautilus cannot handle %s: locations."),
@@ -1723,13 +1723,13 @@
g_free (scheme_string);
break;
case G_IO_ERROR_NOT_MOUNTED:
- error_message = g_strdup_printf (_("Couldn't display \"%s\"."),
+ error_message = g_strdup_printf (_("Could not display \"%s\"."),
uri_for_display);
detail_message = g_strdup (_("Unable to mount the location."));
break;
case G_IO_ERROR_PERMISSION_DENIED:
- error_message = g_strdup_printf (_("Couldn't display \"%s\"."),
+ error_message = g_strdup_printf (_("Could not display \"%s\"."),
uri_for_display);
detail_message = g_strdup (_("Access was denied."));
break;
@@ -1740,7 +1740,7 @@
* But this case is also hit for legitimate web addresses when
* the proxy is set up wrong.
*/
- error_message = g_strdup_printf (_("Couldn't display \"%s\", because the host couldn't be found."),
+ error_message = g_strdup_printf (_("Could not display \"%s\", because the host could not be found."),
uri_for_display);
detail_message = g_strdup (_("Check that the spelling is correct and that your proxy settings are correct."));
break;
@@ -1754,7 +1754,7 @@
}
if (error_message == NULL) {
- error_message = g_strdup_printf (_("Couldn't display \"%s\"."),
+ error_message = g_strdup_printf (_("Could not display \"%s\"."),
uri_for_display);
detail_message = g_strdup_printf (_("Error: %s\nPlease select another viewer and try again."), error->message);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]