Commit 236d21ff authored by Darin Adler's avatar Darin Adler

reviewed by: John Sullivan <sullivan@eazel.com>

	Found and fixed as many untranslated things as possible. John
	Sullivan found them and I fixed them. This takes care of much of
	bug 6977.

	* check-strings-functions:
	* check-strings-patterns:
	More things to ignore and fixes to bad patterns done while John
	and I did our pass over all the code.

	* check-strings.pl: Fix comment.

	* applets/preferences-applet/nautilus-preferences-applet.c: (main):
	* components/hardware/nautilus-hardware-view.c: (setup_CPU_form),
	(setup_RAM_form), (setup_IDE_form):
	* components/rpmview/nautilus-rpm-verify-window.c:
	(nautilus_rpm_verify_window_initialize):
	* components/services/inventory-view/nautilus-inventory-config-page.c:
	(nautilus_inventory_config_page_initialize),
	(nautilus_inventory_config_page_destroy):
	* components/services/inventory-view/nautilus-inventory-disable-page.c:
	(nautilus_inventory_disable_page_initialize):
	* helper-utilities/authenticate/nautilus-authenticate.c: (main):
	* libnautilus-extensions/nautilus-password-dialog.c:
	(nautilus_password_dialog_new):
	* libnautilus-extensions/nautilus-program-chooser.c:
	(nautilus_program_chooser_show_no_choices_message):
	Mark additional strings for translation.

	* components/adapter/nautilus-adapter-embed-strategy.c:
	(nautilus_adapter_embed_strategy_initialize_class): Fix misspelling
	of signal names.

	* components/services/install/lib/eazel-package-system-rpm3.c:
	(rpmmonitorpiggybag_new): Fix a typo.
	* components/services/install/lib/eazel-softcat.c:
	(eazel_softcat_error_string): Write comment about why these strings
	don't need translation.

	* libnautilus-extensions/nautilus-gtk-extensions.c: Tweak formatting.

	* libnautilus-extensions/nautilus-preferences-dialog.c:
	(nautilus_preferences_dialog_construct): Use stock button instead of
	hard-coded OK for translation purposes.
parent 2c01bca7
2001-02-28 Darin Adler <darin@eazel.com>
reviewed by: John Sullivan <sullivan@eazel.com>
Found and fixed as many untranslated things as possible. John
Sullivan found them and I fixed them. This takes care of much of
bug 6977.
* check-strings-functions:
* check-strings-patterns:
More things to ignore and fixes to bad patterns done while John
and I did our pass over all the code.
* check-strings.pl: Fix comment.
* applets/preferences-applet/nautilus-preferences-applet.c: (main):
* components/hardware/nautilus-hardware-view.c: (setup_CPU_form),
(setup_RAM_form), (setup_IDE_form):
* components/rpmview/nautilus-rpm-verify-window.c:
(nautilus_rpm_verify_window_initialize):
* components/services/inventory-view/nautilus-inventory-config-page.c:
(nautilus_inventory_config_page_initialize),
(nautilus_inventory_config_page_destroy):
* components/services/inventory-view/nautilus-inventory-disable-page.c:
(nautilus_inventory_disable_page_initialize):
* helper-utilities/authenticate/nautilus-authenticate.c: (main):
* libnautilus-extensions/nautilus-password-dialog.c:
(nautilus_password_dialog_new):
* libnautilus-extensions/nautilus-program-chooser.c:
(nautilus_program_chooser_show_no_choices_message):
Mark additional strings for translation.
* components/adapter/nautilus-adapter-embed-strategy.c:
(nautilus_adapter_embed_strategy_initialize_class): Fix misspelling
of signal names.
* components/services/install/lib/eazel-package-system-rpm3.c:
(rpmmonitorpiggybag_new): Fix a typo.
* components/services/install/lib/eazel-softcat.c:
(eazel_softcat_error_string): Write comment about why these strings
don't need translation.
* libnautilus-extensions/nautilus-gtk-extensions.c: Tweak formatting.
* libnautilus-extensions/nautilus-preferences-dialog.c:
(nautilus_preferences_dialog_construct): Use stock button instead of
hard-coded OK for translation purposes.
2001-02-28 Michael Engber <engber@eazel.com>
reviewed by: Darin Adler <darin@eazel.com>
......
......@@ -223,11 +223,11 @@ main (int argc, char **argv)
gtk_box_pack_start (GTK_BOX (main_hbox), command_hbox, TRUE, TRUE, 1);
show_desktop_button = boolean_toggle_button_new (NAUTILUS_PREFERENCES_SHOW_DESKTOP,
"Show Desktop");
_("Show Desktop"));
gtk_box_pack_start (GTK_BOX (preference_vbox), show_desktop_button, TRUE, TRUE, 1);
smooth_graphics_button = boolean_toggle_button_new (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE,
"Smooth Graphics");
_("Smooth Graphics"));
gtk_box_pack_start (GTK_BOX (preference_vbox), smooth_graphics_button, TRUE, TRUE, 1);
nautilus_preferences_add_callback ("user_level",
......@@ -240,7 +240,7 @@ main (int argc, char **argv)
smooth_graphics_button);
user_level_changed_callback (smooth_graphics_button);
quit_button = gtk_button_new_with_label ("Quit");
quit_button = gtk_button_new_with_label (_("Quit"));
nautilus_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (quit_button)->child), 4);
gtk_box_pack_start (GTK_BOX (command_hbox), quit_button, TRUE, TRUE, 1);
gtk_signal_connect (GTK_OBJECT (quit_button),
......@@ -248,7 +248,7 @@ main (int argc, char **argv)
GTK_SIGNAL_FUNC (quit_nautilus_button_clicked_callback),
NULL);
start_button = gtk_button_new_with_label ("Start");
start_button = gtk_button_new_with_label (_("Start"));
nautilus_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (start_button)->child), 4);
gtk_box_pack_start (GTK_BOX (command_hbox), start_button, TRUE, TRUE, 1);
gtk_signal_connect (GTK_OBJECT (start_button),
......@@ -256,7 +256,7 @@ main (int argc, char **argv)
GTK_SIGNAL_FUNC (start_nautilus_button_clicked_callback),
NULL);
restart_button = gtk_button_new_with_label ("Restart");
restart_button = gtk_button_new_with_label (_("Restart"));
nautilus_gtk_label_make_smaller (GTK_LABEL (GTK_BIN (restart_button)->child), 4);
gtk_box_pack_start (GTK_BOX (command_hbox), restart_button, TRUE, TRUE, 1);
gtk_signal_connect (GTK_OBJECT (restart_button),
......
BONOBO_UI_VERB
N_
_
execlp
fopen
g_error
g_message
g_warning
gtk_signal_connect
get_zoom_offset
gtk_object_get_data
gtk_signal_connect.*
gtk_signal_new
gtk_widget_new
gtk_window_set_wmclass
info
nautilus_file_get_string_attribute
nautilus_gtk_signal_connect_free_data
nautilus_make_warnings_and_criticals_stop_in_debugger
nautilus_scalable_font_new
nautilus_theme_get_theme_data
puts
set_up_standard_bonobo_button
setmntent
trilobite_debug
xml.+
%s %s # common simple printf format
^%s %s$ # common simple printf format
. ||| -skels # CORBA-generated
. ||| -stubs # CORBA-generated
\\n # common simple string
^\\n+$ # common simple string
^Ali Abdin$
^Andy Hertzfeld$
^Arlo Rose$
......@@ -32,7 +32,7 @@ OAFIID # strings with oaf IIDs
^Seth Nickell$
^Susan Kare$
^\/ # paths
^[-\w/]+\.(png|xml) # recognizable file names
^[-\w/]+\.(png|xml)$ # recognizable file names
^bookmark$ ||| nautilus-bookmark-list
^http:
^rgb: # color specs
......@@ -64,3 +64,5 @@ network\.proxy
^_SAWFISH # keys for WM
^TRUE$
^FALSE$
. ||| components/help/converters
. ||| components/music/pixmaps\.h$
......@@ -70,7 +70,6 @@ while (<STRINGS>)
}
close STRINGS;
# look for strings that are not quoted
FILE: foreach my $file (@ARGV)
{
chomp $file;
......
......@@ -69,29 +69,29 @@ nautilus_adapter_embed_strategy_initialize_class (NautilusAdapterEmbedStrategyCl
object_class->destroy = nautilus_adapter_embed_strategy_destroy;
signals[ACTIVATE] =
gtk_signal_new ("avtivate",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusAdapterEmbedStrategyClass, activate),
gtk_marshal_NONE__POINTER,
GTK_TYPE_POINTER, 0);
gtk_signal_new ("activate",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusAdapterEmbedStrategyClass, activate),
gtk_marshal_NONE__POINTER,
GTK_TYPE_POINTER, 0);
signals[DEACTIVATE] =
gtk_signal_new ("deavtivate",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusAdapterEmbedStrategyClass, deactivate),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_signal_new ("deactivate",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusAdapterEmbedStrategyClass, deactivate),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[OPEN_LOCATION] =
gtk_signal_new ("open_location",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusAdapterEmbedStrategyClass, open_location),
gtk_marshal_NONE__STRING,
GTK_TYPE_STRING, 0);
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusAdapterEmbedStrategyClass, open_location),
gtk_marshal_NONE__STRING,
GTK_TYPE_STRING, 0);
gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_widget);
NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_zoomable);
}
......
......@@ -504,7 +504,7 @@ setup_overview_form (NautilusHardwareView *view)
/* set up the widgetry for the CPU page */
static void
setup_CPU_form(NautilusHardwareView *view)
setup_CPU_form (NautilusHardwareView *view)
{
char *message;
GtkWidget *temp_widget;
......@@ -517,7 +517,7 @@ setup_CPU_form(NautilusHardwareView *view)
/* set up the title */
setup_form_title (view, NULL, "CPU");
message = "This is a placeholder for the CPU page.";
message = _("This is a placeholder for the CPU page.");
temp_widget = nautilus_label_new (message);
nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
nautilus_label_set_wrap(NAUTILUS_LABEL(temp_widget), TRUE);
......@@ -529,7 +529,7 @@ setup_CPU_form(NautilusHardwareView *view)
/* set up the widgetry for the RAM page */
static void
setup_RAM_form(NautilusHardwareView *view)
setup_RAM_form (NautilusHardwareView *view)
{
char *message;
GtkWidget *temp_widget;
......@@ -542,7 +542,7 @@ setup_RAM_form(NautilusHardwareView *view)
/* set up the title */
setup_form_title (view, NULL, "RAM");
message = "This is a placeholder for the RAM page.";
message = _("This is a placeholder for the RAM page.");
temp_widget = nautilus_label_new (message);
nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
nautilus_label_set_wrap(NAUTILUS_LABEL(temp_widget), TRUE);
......@@ -554,7 +554,7 @@ setup_RAM_form(NautilusHardwareView *view)
/* set up the widgetry for the IDE page */
static void
setup_IDE_form(NautilusHardwareView *view)
setup_IDE_form (NautilusHardwareView *view)
{
char *message;
GtkWidget *temp_widget;
......@@ -567,7 +567,7 @@ setup_IDE_form(NautilusHardwareView *view)
/* set up the title */
setup_form_title (view, NULL, "IDE");
message = "This is a placeholder for the IDE page.";
message = _("This is a placeholder for the IDE page.");
temp_widget = nautilus_label_new (message);
nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
nautilus_label_set_wrap(NAUTILUS_LABEL(temp_widget), TRUE);
......
......@@ -152,13 +152,15 @@ nautilus_rpm_verify_window_initialize (NautilusRPMVerifyWindow *rpm_verify_windo
gtk_widget_show (button_box);
gtk_box_pack_start (GTK_BOX (window_contents), button_box, FALSE, FALSE, 8);
rpm_verify_window->details->continue_button = gtk_button_new_with_label ("Continue");
rpm_verify_window->details->continue_button = gtk_button_new_with_label (_("Continue"));
gtk_box_pack_start (GTK_BOX (button_box), rpm_verify_window->details->continue_button, FALSE, FALSE, 4);
gtk_signal_connect(GTK_OBJECT (rpm_verify_window->details->continue_button), "clicked", GTK_SIGNAL_FUNC (continue_button_callback), rpm_verify_window);
gtk_signal_connect (GTK_OBJECT (rpm_verify_window->details->continue_button), "clicked",
GTK_SIGNAL_FUNC (continue_button_callback), rpm_verify_window);
rpm_verify_window->details->cancel_button = gtk_button_new_with_label ("Cancel");
rpm_verify_window->details->cancel_button = gtk_button_new_with_label (_("Cancel"));
gtk_box_pack_start (GTK_BOX (button_box), rpm_verify_window->details->cancel_button, FALSE, FALSE, 4);
gtk_signal_connect(GTK_OBJECT (rpm_verify_window->details->cancel_button), "clicked", GTK_SIGNAL_FUNC (cancel_button_callback), rpm_verify_window);
gtk_signal_connect (GTK_OBJECT (rpm_verify_window->details->cancel_button), "clicked",
GTK_SIGNAL_FUNC (cancel_button_callback), rpm_verify_window);
/* configure the dialog */
gtk_widget_set_usize (GTK_WIDGET (rpm_verify_window), 420, 180);
......
......@@ -133,7 +133,7 @@ rpmmonitorpiggybag_new (EazelPackageSystemRpm3 *system,
#ifdef USE_PERCENT
lc = localeconv ();
pig.separator = *(lc->decimal_point);
info (system, "decimal seperator is '%c'", pig.separator);
info (system, "decimal separator is '%c'", pig.separator);
pig.state = 1;
pig.bytes_read_in_line = 0;
pig.line[0] = '\0';
......
......@@ -302,6 +302,9 @@ eazel_softcat_reset_server_update_flag (EazelSoftCat *softcat)
const char *
eazel_softcat_error_string (EazelSoftCatError err)
{
/* No need to translate these strings, since this is only used
* in test code.
*/
switch (err) {
case EAZEL_SOFTCAT_SUCCESS:
return "(no error)";
......
......@@ -113,11 +113,11 @@ nautilus_inventory_config_page_initialize (NautilusInventoryConfigPage *config_p
bonobo_object_unref (BONOBO_OBJECT (object));
label = gtk_label_new ("Eazel Inventory Configuration");
label = gtk_label_new (_("Eazel Inventory Configuration"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (config_page), label, FALSE, FALSE, 0);
label = gtk_label_new ("blah blah blah");
label = gtk_label_new (_("blah blah blah"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (config_page), label, FALSE, FALSE, 0);
......@@ -125,7 +125,7 @@ nautilus_inventory_config_page_initialize (NautilusInventoryConfigPage *config_p
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (config_page), hbox, FALSE, FALSE, 0);
label = gtk_label_new ("Machine Name:");
label = gtk_label_new (_("Machine Name:"));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
......@@ -151,14 +151,14 @@ nautilus_inventory_config_page_initialize (NautilusInventoryConfigPage *config_p
gtk_widget_show (config_page->details->machine_entry);
gtk_box_pack_start (GTK_BOX (hbox), config_page->details->machine_entry, FALSE, FALSE, 0);
config_page->details->warn_check_button = gtk_check_button_new_with_label ("Warn me before upload");
config_page->details->warn_check_button = gtk_check_button_new_with_label (_("Warn me before upload"));
initial_warn = Trilobite_Eazel_Inventory__get_warn_before_upload
(config_page->details->inventory_service, &ev);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (config_page->details->warn_check_button), initial_warn);
gtk_widget_show (config_page->details->warn_check_button);
gtk_box_pack_start (GTK_BOX (config_page), config_page->details->warn_check_button, FALSE, FALSE, 0);
button = gtk_button_new_with_label ("Next");
button = gtk_button_new_with_label (_("Next"));
gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (config_page), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked", next_button_callback, config_page);
......@@ -188,10 +188,3 @@ nautilus_inventory_config_page_destroy (GtkObject *object)
NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
......@@ -107,11 +107,11 @@ nautilus_inventory_disable_page_initialize (NautilusInventoryDisablePage *disabl
disable_page->details->inventory = eazel_inventory_get ();
header = eazel_services_header_title_new ("Disable Inventory [FIXME]");
header = eazel_services_header_title_new (_("Disable Inventory [FIXME]"));
gtk_widget_show (header);
gtk_box_pack_start (GTK_BOX (vbox), header, FALSE, FALSE, 0);
disable_page->details->label = gtk_label_new ("An explanation of how why and what we're doing here.");
disable_page->details->label = gtk_label_new (_("An explanation of how why and what we're doing here."));
gtk_widget_show (disable_page->details->label);
gtk_box_pack_start (GTK_BOX (vbox), disable_page->details->label, FALSE, FALSE, 0);
......
......@@ -27,11 +27,10 @@
#include <config.h>
#include "nautilus-authenticate.h"
#include <libnautilus-extensions/nautilus-password-dialog.h>
#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-init.h>
#include <libnautilus-extensions/nautilus-password-dialog.h>
#include <stdio.h>
#include <unistd.h>
......@@ -70,7 +69,7 @@ int main (int argc, char *argv[])
if (!command)
command = g_strdup("");
password_dialog = nautilus_password_dialog_new ("Privileged Command Execution",
password_dialog = nautilus_password_dialog_new (_("Privileged Command Execution"),
NULL,
"root",
"",
......@@ -105,7 +104,7 @@ int main (int argc, char *argv[])
}
else {
fprintf (stderr,
"Authentication for user '%s' failed.\n\n",
_("Authentication for user '%s' failed.\n\n"),
username);
}
......
......@@ -85,8 +85,8 @@ finish_button_activation (gpointer data)
gtk_button_released (button);
}
/* this was ref'd in nautilus_gtk_button_auto_click */
gtk_object_unref (GTK_OBJECT(button));
/* This was ref'd in nautilus_gtk_button_auto_click */
gtk_object_unref (GTK_OBJECT (button));
return FALSE;
}
......@@ -121,7 +121,7 @@ nautilus_gtk_button_auto_click (GtkButton *button)
*/
/* This is unref'ed in finish_button_activation */
gtk_object_ref (GTK_OBJECT(button));
gtk_object_ref (GTK_OBJECT (button));
g_timeout_add (BUTTON_AUTO_HIGHLIGHT_MILLISECONDS,
finish_button_activation, button);
......@@ -299,10 +299,11 @@ guint nautilus_gtk_signal_connect_free_data_custom (GtkObject *object,
* @data: the user data associated with the function. g_free() will be called on
* this user data when the signal is disconnected.
**/
guint nautilus_gtk_signal_connect_free_data (GtkObject *object,
const gchar *name,
GtkSignalFunc func,
gpointer data)
guint
nautilus_gtk_signal_connect_free_data (GtkObject *object,
const gchar *name,
GtkSignalFunc func,
gpointer data)
{
return nautilus_gtk_signal_connect_free_data_custom
(object, name, func, data, g_free);
......
......@@ -24,14 +24,15 @@
#include <config.h>
#include "nautilus-password-dialog.h"
#include "nautilus-caption-table.h"
#include <libgnomeui/gnome-stock.h>
#include "nautilus-caption-table.h"
#include "nautilus-gtk-macros.h"
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtksignal.h>
#include "nautilus-gtk-macros.h"
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-stock.h>
struct _NautilusPasswordDialogDetails
{
......@@ -259,20 +260,20 @@ nautilus_password_dialog_new (const char *dialog_title,
password_dialog->details->table = nautilus_caption_table_new (2);
gtk_signal_connect (GTK_OBJECT (password_dialog->details->table),
"activate",
GTK_SIGNAL_FUNC (caption_table_activate_callback),
(gpointer) password_dialog);
"activate",
GTK_SIGNAL_FUNC (caption_table_activate_callback),
password_dialog);
nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
CAPTION_TABLE_USERNAME_ROW,
"Username:",
_("Username:"),
"",
TRUE,
TRUE);
nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
CAPTION_TABLE_PASSWORD_ROW,
"Password:",
_("Password:"),
"",
FALSE,
FALSE);
......@@ -300,9 +301,9 @@ nautilus_password_dialog_new (const char *dialog_title,
TRUE, /* expand */
TRUE, /* fill */
0); /* padding */
#if 0 /* disabled for PR2 */
#if 0 /* FIXME: disabled for PR2 originally, when will we re-enable */
password_dialog->details->remember_button =
gtk_check_button_new_with_label ("Remember this password");
gtk_check_button_new_with_label (_("Remember this password"));
gtk_box_pack_end (GTK_BOX (GNOME_DIALOG (password_dialog)->vbox),
password_dialog->details->remember_button,
......
......@@ -2,7 +2,7 @@
/* nautilus-preferences-dialog.c - Implementation for preferences dialog.
Copyright (C) 1999, 2000 Eazel, Inc.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
The Gnome Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
......@@ -24,16 +24,13 @@
#include <config.h>
#include "nautilus-preferences-dialog.h"
#include "nautilus-gtk-extensions.h"
#include "nautilus-gtk-macros.h"
/* #include "caption-table.h" */
#include <libgnomeui/gnome-stock.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <gnome.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-stock.h>
enum
{
......@@ -48,7 +45,7 @@ struct _NautilusPreferencesDialogDetails
static const gchar * stock_buttons[] =
{
"OK",
GNOME_STOCK_BUTTON_OK,
NULL
};
......@@ -147,7 +144,7 @@ dialog_destroy (GtkWidget * widget, gpointer data)
static void
nautilus_preferences_dialog_construct (NautilusPreferencesDialog *prefs_dialog,
const gchar *dialog_title)
const gchar *dialog_title)
{
GnomeDialog *gnome_dialog;
......
......@@ -1482,23 +1482,24 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_
file_name = get_file_name_for_display (file);
if (action_type == GNOME_VFS_MIME_ACTION_TYPE_COMPONENT) {
unavailable_message = g_strdup_printf ("No viewers are available for \"%s\".", file_name);
dialog_title = g_strdup ("No Viewers Available");
unavailable_message = g_strdup_printf (_("No viewers are available for \"%s\"."), file_name);
dialog_title = g_strdup (_("No Viewers Available"));
} else {
g_assert (action_type == GNOME_VFS_MIME_ACTION_TYPE_APPLICATION);
unavailable_message = g_strdup_printf ("No applications are available for \"%s\".", file_name);
dialog_title = g_strdup ("No Applications Available");
unavailable_message = g_strdup_printf (_("No applications are available for \"%s\"."), file_name);
dialog_title = g_strdup (_("No Applications Available"));
}
/* Note: This might be misleading in the components case, since the
* user can't add components to the complete list even from the capplet.
* (They can add applications though.)
*/
prompt = g_strdup_printf ("%s\n\n"
"You can configure which programs are offered "
"for which file types with the \"File Types and "
"Programs\" part of the GNOME Control Center. Do "
"you want to go there now?", unavailable_message);
prompt = g_strdup_printf (_("%s\n\n"
"You can configure which programs are offered "
"for which file types with the \"File Types and "
"Programs\" part of the GNOME Control Center. Do "
"you want to go there now?"),
unavailable_message);
dialog = nautilus_show_yes_no_dialog
(prompt, dialog_title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, parent_window);
......
......@@ -85,8 +85,8 @@ finish_button_activation (gpointer data)
gtk_button_released (button);
}
/* this was ref'd in nautilus_gtk_button_auto_click */
gtk_object_unref (GTK_OBJECT(button));
/* This was ref'd in nautilus_gtk_button_auto_click */
gtk_object_unref (GTK_OBJECT (button));
return FALSE;
}
......@@ -121,7 +121,7 @@ nautilus_gtk_button_auto_click (GtkButton *button)
*/
/* This is unref'ed in finish_button_activation */
gtk_object_ref (GTK_OBJECT(button));
gtk_object_ref (GTK_OBJECT (button));
g_timeout_add (BUTTON_AUTO_HIGHLIGHT_MILLISECONDS,
finish_button_activation, button);
......@@ -299,10 +299,11 @@ guint nautilus_gtk_signal_connect_free_data_custom (GtkObject *object,
* @data: the user data associated with the function. g_free() will be called on
* this user data when the signal is disconnected.
**/
guint nautilus_gtk_signal_connect_free_data (GtkObject *object,
const gchar *name,
GtkSignalFunc func,
gpointer data)
guint
nautilus_gtk_signal_connect_free_data (GtkObject *object,
const gchar *name,
GtkSignalFunc func,
gpointer data)
{
return nautilus_gtk_signal_connect_free_data_custom
(object, name, func, data, g_free);
......
......@@ -24,14 +24,15 @@
#include <config.h>
#include "nautilus-password-dialog.h"
#include "nautilus-caption-table.h"
#include <libgnomeui/gnome-stock.h>
#include "nautilus-caption-table.h"
#include "nautilus-gtk-macros.h"
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtksignal.h>
#include "nautilus-gtk-macros.h"
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-stock.h>
struct _NautilusPasswordDialogDetails
{
......@@ -259,20 +260,20 @@ nautilus_password_dialog_new (const char *dialog_title,
password_dialog->details->table = nautilus_caption_table_new (2);
gtk_signal_connect (GTK_OBJECT (password_dialog->details->table),
"activate",
GTK_SIGNAL_FUNC (caption_table_activate_callback),
(gpointer) password_dialog);
"activate",
GTK_SIGNAL_FUNC (caption_table_activate_callback),
password_dialog);
nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
CAPTION_TABLE_USERNAME_ROW,
"Username:",
_("Username:"),
"",
TRUE,
TRUE);
nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (password_dialog->details->table),
CAPTION_TABLE_PASSWORD_ROW,
"Password:",
_("Password:"),
"",
FALSE,
FALSE);
......@@ -300,9 +301,9 @@ nautilus_password_dialog_new (const char *dialog_title,
TRUE, /* expand */
TRUE, /* fill */
0); /* padding */
#if 0 /* disabled for PR2 */
#if 0 /* FIXME: disabled for PR2 originally, when will we re-enable */
password_dialog->details->remember_button =
gtk_check_button_new_with_label ("Remember this password");
gtk_check_button_new_with_label (_("Remember this password"));
gtk_box_pack_end (GTK_BOX (GNOME_DIALOG (password_dialog)->vbox),
password_dialog->details->remember_button,
......
......@@ -2,7 +2,7 @@
/* nautilus-preferences-dialog.c - Implementation for preferences dialog.
Copyright (C) 1999, 2000 Eazel, Inc.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
The Gnome Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
......@@ -24,16 +24,13 @@
#include <config.h>
#include "nautilus-preferences-dialog.h"
#include "nautilus-gtk-extensions.h"
#include "nautilus-gtk-macros.h"
/* #include "caption-table.h" */
#include <libgnomeui/gnome-stock.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <gnome.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-stock.h>
enum
{
......@@ -48,7 +45,7 @@ struct _NautilusPreferencesDialogDetails
static const gchar * stock_buttons[] =
{
"OK",
GNOME_STOCK_BUTTON_OK,
NULL
};
......@@ -147,7 +144,7 @@ dialog_destroy (GtkWidget * widget, gpointer data)
static void
nautilus_preferences_dialog_construct (NautilusPreferencesDialog *prefs_dialog,
const gchar *dialog_title)
const gchar *dialog_title)
{
GnomeDialog *gnome_dialog;
......
......@@ -1482,23 +1482,24 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_
file_name = get_file_name_for_display (file);
if (action_type == GNOME_VFS_MIME_ACTION_TYPE_COMPONENT) {
unavailable_message = g_strdup_printf ("No viewers are available for \"%s\".", file_name);
dialog_title = g_strdup ("No Viewers Available");
unavailable_message = g_strdup_printf (_("No viewers are available for \"%s\"."), file_name);
dialog_title = g_strdup (_("No Viewers Available"));
} else {
g_assert (action_type == GNOME_VFS_MIME_ACTION_TYPE_APPLICATION);
unavailable_message = g_strdup_printf ("No applications are available for \"%s\".", file_name);
dialog_title = g_strdup ("No Applications Available");
unavailable_message = g_strdup_printf (_("No applications are available for \"%s\"."), file_name);
dialog_title = g_strdup (_("No Applications Available"));