diff options
56 files changed, 74 insertions, 56 deletions
@@ -1,3 +1,19 @@ +2006-03-18 Martin Wehner <martin.wehner@gmail.com> + + * libnautilus-private/*.c: + * src/file-manager/*.c: + * src/*.c: + Use gi18n.h instead of deprecated gnome-i18n.h header. + + * libnautilus-private/nautilus-query.c: + (nautilus_query_to_readable_string): + Mark string for translation. + + * po/POTFILES.in: + Add nautilus-query.c + + Patch from Wouter Bolsterlee <uws+gnome@xs4all.nl> + 2006-03-17 Vladimer Sichinava <alinux@siena.linux.it> * configure.in: Added "ka" Georgian to diff --git a/libnautilus-private/nautilus-clipboard.c b/libnautilus-private/nautilus-clipboard.c index afcc70289..66ee4f4ff 100644 --- a/libnautilus-private/nautilus-clipboard.c +++ b/libnautilus-private/nautilus-clipboard.c @@ -31,7 +31,7 @@ #include "nautilus-clipboard.h" #include "nautilus-file-utilities.h" -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <gtk/gtkclipboard.h> #include <gtk/gtkstock.h> #include <gtk/gtkinvisible.h> diff --git a/libnautilus-private/nautilus-column-chooser.c b/libnautilus-private/nautilus-column-chooser.c index 16046a3b3..383e89d1c 100644 --- a/libnautilus-private/nautilus-column-chooser.c +++ b/libnautilus-private/nautilus-column-chooser.c @@ -41,7 +41,7 @@ #include <gtk/gtktreeselection.h> #include <gtk/gtktreeview.h> #include <gtk/gtkvbox.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include "nautilus-column-utilities.h" diff --git a/libnautilus-private/nautilus-column-utilities.c b/libnautilus-private/nautilus-column-utilities.c index ccb394a8c..642f99451 100644 --- a/libnautilus-private/nautilus-column-utilities.c +++ b/libnautilus-private/nautilus-column-utilities.c @@ -27,7 +27,7 @@ #include <string.h> #include <eel/eel-glib-extensions.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libnautilus-extension/nautilus-column-provider.h> #include <libnautilus-private/nautilus-module.h> diff --git a/libnautilus-private/nautilus-customization-data.c b/libnautilus-private/nautilus-customization-data.c index cf662a859..11996ab09 100644 --- a/libnautilus-private/nautilus-customization-data.c +++ b/libnautilus-private/nautilus-customization-data.c @@ -41,7 +41,7 @@ #include <glib.h> #include <gtk/gtk.h> #include <librsvg/rsvg.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnomevfs/gnome-vfs-directory.h> #include <libgnomevfs/gnome-vfs-utils.h> diff --git a/libnautilus-private/nautilus-desktop-directory-file.c b/libnautilus-private/nautilus-desktop-directory-file.c index 398565902..e0c4db81d 100644 --- a/libnautilus-private/nautilus-desktop-directory-file.c +++ b/libnautilus-private/nautilus-desktop-directory-file.c @@ -35,7 +35,7 @@ #include <eel/eel-gtk-macros.h> #include "nautilus-desktop-directory.h" #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <string.h> struct NautilusDesktopDirectoryFileDetails { diff --git a/libnautilus-private/nautilus-desktop-icon-file.c b/libnautilus-private/nautilus-desktop-icon-file.c index 84d052974..6886e9c2e 100644 --- a/libnautilus-private/nautilus-desktop-icon-file.c +++ b/libnautilus-private/nautilus-desktop-icon-file.c @@ -35,7 +35,7 @@ #include <eel/eel-gtk-macros.h> #include "nautilus-desktop-directory.h" #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs.h> #include <string.h> diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c b/libnautilus-private/nautilus-desktop-link-monitor.c index 640d04ddd..6469c6a85 100644 --- a/libnautilus-private/nautilus-desktop-link-monitor.c +++ b/libnautilus-private/nautilus-desktop-link-monitor.c @@ -38,7 +38,7 @@ #include <gtk/gtkmessagedialog.h> #include <gtk/gtksignal.h> #include <gtk/gtkstock.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs.h> #include <libgnomevfs/gnome-vfs-volume-monitor.h> #include <libnautilus-private/nautilus-trash-monitor.h> diff --git a/libnautilus-private/nautilus-desktop-link.c b/libnautilus-private/nautilus-desktop-link.c index efd56cbdf..41ecf2ba1 100644 --- a/libnautilus-private/nautilus-desktop-link.c +++ b/libnautilus-private/nautilus-desktop-link.c @@ -32,7 +32,7 @@ #include <eel/eel-gtk-macros.h> #include <eel/eel-vfs-extensions.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs.h> #include <libnautilus-private/nautilus-trash-monitor.h> #include <libnautilus-private/nautilus-global-preferences.h> diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c index 8ed36f77a..3342fe114 100644 --- a/libnautilus-private/nautilus-dnd.c +++ b/libnautilus-private/nautilus-dnd.c @@ -37,7 +37,7 @@ #include <gtk/gtkmain.h> #include <gtk/gtkmenu.h> #include <gtk/gtkseparatormenuitem.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-uidefs.h> #include <libgnomevfs/gnome-vfs-find-directory.h> #include <libgnomevfs/gnome-vfs-ops.h> diff --git a/libnautilus-private/nautilus-emblem-utils.c b/libnautilus-private/nautilus-emblem-utils.c index 081487aec..c3f9e8e8b 100644 --- a/libnautilus-private/nautilus-emblem-utils.c +++ b/libnautilus-private/nautilus-emblem-utils.c @@ -34,7 +34,7 @@ #include <eel/eel-gdk-pixbuf-extensions.h> #include <eel/eel-stock-dialogs.h> #include <eel/eel-vfs-extensions.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-icon-theme.h> #include <libgnomevfs/gnome-vfs-utils.h> #include "nautilus-emblem-utils.h" diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c index 7e098af6b..a665f4547 100644 --- a/libnautilus-private/nautilus-entry.c +++ b/libnautilus-private/nautilus-entry.c @@ -35,7 +35,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> struct NautilusEntryDetails { gboolean user_edit; diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c index 6b808622f..675a5576f 100644 --- a/libnautilus-private/nautilus-file-operations-progress.c +++ b/libnautilus-private/nautilus-file-operations-progress.c @@ -40,7 +40,7 @@ #include <gtk/gtkstock.h> #include <gtk/gtktable.h> #include <gtk/gtkvbox.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs-utils.h> #include "nautilus-file-operations-progress-icons.h" diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index 0f4fbc74f..67fb6dda1 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -35,7 +35,7 @@ #include <eel/eel-string.h> #include <eel/eel-vfs-extensions.h> #include <libgnome/gnome-util.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs-ops.h> #include <libgnomevfs/gnome-vfs-uri.h> #include <libgnomevfs/gnome-vfs-utils.h> diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index b11f8ee8e..d296241ad 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -56,7 +56,7 @@ #include <eel/eel-string.h> #include <grp.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-macros.h> #include <libgnomevfs/gnome-vfs-file-info.h> #include <libgnomevfs/gnome-vfs-mime-handlers.h> diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c index 886d92ae1..4baf35bb2 100644 --- a/libnautilus-private/nautilus-global-preferences.c +++ b/libnautilus-private/nautilus-global-preferences.c @@ -34,7 +34,7 @@ #include <eel/eel-gtk-extensions.h> #include <eel/eel-stock-dialogs.h> #include <eel/eel-string.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnomevfs/gnome-vfs-mime-handlers.h> #include <libgnomevfs/gnome-vfs-utils.h> diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index 8fabdd958..bb6493d88 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -26,7 +26,7 @@ #include <math.h> #include "nautilus-icon-canvas-item.h" -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include "nautilus-file-utilities.h" #include "nautilus-global-preferences.h" @@ -50,7 +50,7 @@ #include <libart_lgpl/art_rgb_rgba_affine.h> #include <libart_lgpl/art_svp_vpath.h> #include <librsvg/rsvg.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <eel/eel-canvas-util.h> #include <atk/atkimage.h> #include <atk/atkcomponent.h> diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index 4035ad3e6..f9630a7d1 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -50,7 +50,7 @@ #include <gtk/gtklayout.h> #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-macros.h> #include <stdio.h> #include <string.h> diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index 9f7e9c915..0d611a3fe 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -50,7 +50,7 @@ #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> #include <gtk/gtkstock.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <eel/eel-canvas-rect-ellipse.h> #include <libgnomeui/gnome-stock-icons.h> #include <libgnomeui/gnome-uidefs.h> diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index 50ab74175..6aa7a2224 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -50,7 +50,7 @@ #include <gtk/gtksignal.h> #include <gtk/gtkiconfactory.h> #include <gtk/gtkicontheme.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnome/gnome-macros.h> #include <libgnomeui/gnome-icon-lookup.h> diff --git a/libnautilus-private/nautilus-link-desktop-file.c b/libnautilus-private/nautilus-link-desktop-file.c index f03c1ce86..d5c7e3b79 100644 --- a/libnautilus-private/nautilus-link-desktop-file.c +++ b/libnautilus-private/nautilus-link-desktop-file.c @@ -40,7 +40,7 @@ #include <eel/eel-string.h> #include <eel/eel-xml-extensions.h> #include <eel/eel-vfs-extensions.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnomevfs/gnome-vfs-utils.h> #include <libxml/parser.h> diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c index 521c40499..70f31b39e 100644 --- a/libnautilus-private/nautilus-link.c +++ b/libnautilus-private/nautilus-link.c @@ -40,7 +40,7 @@ #include <eel/eel-vfs-extensions.h> #include <eel/eel-xml-extensions.h> #include <libxml/parser.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnomevfs/gnome-vfs-ops.h> #include <libgnomevfs/gnome-vfs-mime-utils.h> diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c index fbe7e1c8b..956f23ca8 100644 --- a/libnautilus-private/nautilus-program-choosing.c +++ b/libnautilus-private/nautilus-program-choosing.c @@ -37,7 +37,7 @@ #include <eel/eel-string.h> #include <gtk/gtk.h> #include <libgnome/gnome-config.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnome/gnome-desktop-item.h> #include <libgnome/gnome-url.h> diff --git a/libnautilus-private/nautilus-query.c b/libnautilus-private/nautilus-query.c index b8e761a63..2775657e5 100644 --- a/libnautilus-private/nautilus-query.c +++ b/libnautilus-private/nautilus-query.c @@ -28,6 +28,7 @@ #include <libgnomevfs/gnome-vfs-utils.h> #include <eel/eel-gtk-macros.h> #include <eel/eel-glib-extensions.h> +#include <glib/gi18n.h> struct NautilusQueryDetails { char *text; @@ -131,10 +132,10 @@ char * nautilus_query_to_readable_string (NautilusQuery *query) { if (!query || !query->details->text) { - return g_strdup ("Search"); + return g_strdup (_("Search")); } - return g_strdup_printf ("Search for \"%s\"", query->details->text); + return g_strdup_printf (_("Search for \"%s\""), query->details->text); } static char * diff --git a/libnautilus-private/nautilus-search-directory-file.c b/libnautilus-private/nautilus-search-directory-file.c index 86c077a94..93e070efa 100644 --- a/libnautilus-private/nautilus-search-directory-file.c +++ b/libnautilus-private/nautilus-search-directory-file.c @@ -35,7 +35,7 @@ #include <eel/eel-gtk-macros.h> #include "nautilus-search-directory.h" #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <string.h> static void nautilus_search_directory_file_init (gpointer object, diff --git a/libnautilus-private/nautilus-theme.c b/libnautilus-private/nautilus-theme.c index 7354b9027..a2cc5d56e 100644 --- a/libnautilus-private/nautilus-theme.c +++ b/libnautilus-private/nautilus-theme.c @@ -37,7 +37,7 @@ #include <eel/eel-vfs-extensions.h> #include <eel/eel-xml-extensions.h> #include <libxml/parser.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnome/gnome-util.h> #include <libgnomevfs/gnome-vfs.h> diff --git a/libnautilus-private/nautilus-trash-directory.c b/libnautilus-private/nautilus-trash-directory.c index b254ef961..153049306 100644 --- a/libnautilus-private/nautilus-trash-directory.c +++ b/libnautilus-private/nautilus-trash-directory.c @@ -32,7 +32,7 @@ #include <eel/eel-stock-dialogs.h> #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-macros.h> #include <libgnomevfs/gnome-vfs-utils.h> #include <libgnomevfs/gnome-vfs-volume-monitor.h> diff --git a/libnautilus-private/nautilus-trash-file.c b/libnautilus-private/nautilus-trash-file.c index 07fe30484..d93d10f7d 100644 --- a/libnautilus-private/nautilus-trash-file.c +++ b/libnautilus-private/nautilus-trash-file.c @@ -35,7 +35,7 @@ #include <eel/eel-gtk-macros.h> #include "nautilus-trash-directory.h" #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <string.h> struct NautilusTrashFileDetails { diff --git a/libnautilus-private/nautilus-undo-signal-handlers.c b/libnautilus-private/nautilus-undo-signal-handlers.c index 9741f77ee..c20d2b2c9 100644 --- a/libnautilus-private/nautilus-undo-signal-handlers.c +++ b/libnautilus-private/nautilus-undo-signal-handlers.c @@ -26,7 +26,7 @@ #include <config.h> #include <gtk/gtk.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libnautilus-private/nautilus-undo.h> #include <eel/eel-gtk-macros.h> diff --git a/po/POTFILES.in b/po/POTFILES.in index 1da4fac86..fbd8c39c9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -28,6 +28,7 @@ libnautilus-private/nautilus-icon-container.c libnautilus-private/nautilus-icon-dnd.c libnautilus-private/nautilus-icon-factory.c libnautilus-private/nautilus-program-choosing.c +libnautilus-private/nautilus-query.c libnautilus-private/nautilus-search-directory-file.c libnautilus-private/nautilus-trash-directory.c libnautilus-private/nautilus-trash-file.c diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 3c320ab12..9c07290c8 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -65,7 +65,7 @@ #include <gtk/gtksignal.h> #include <gtk/gtkwindow.h> #include <libgnome/gnome-config.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-authentication-manager.h> #include <libgnomeui/gnome-client.h> diff --git a/src/nautilus-emblem-sidebar.c b/src/nautilus-emblem-sidebar.c index 6339b5fd2..c52c839b1 100644 --- a/src/nautilus-emblem-sidebar.c +++ b/src/nautilus-emblem-sidebar.c @@ -57,7 +57,7 @@ #include <gtk/gtkmenu.h> #include <gtk/gtkmenushell.h> #include <librsvg/rsvg.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-uidefs.h> #include <libgnomeui/gnome-popup-menu.h> #include <libgnomevfs/gnome-vfs-utils.h> diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c index da5dc38d0..1d47ecc87 100644 --- a/src/nautilus-file-management-properties.c +++ b/src/nautilus-file-management-properties.c @@ -37,7 +37,7 @@ #include <gtk/gtksizegroup.h> #include <libgnome/gnome-help.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <glade/glade.h> diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c index 369e625ba..42d6114dc 100644 --- a/src/nautilus-first-time-druid.c +++ b/src/nautilus-first-time-druid.c @@ -26,7 +26,7 @@ #include <config.h> #include "nautilus-first-time-druid.h" -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libnautilus-private/nautilus-file-utilities.h> #include <stdio.h> #include <string.h> diff --git a/src/nautilus-history-sidebar.c b/src/nautilus-history-sidebar.c index 7b34fe4f5..8f6a1066a 100644 --- a/src/nautilus-history-sidebar.c +++ b/src/nautilus-history-sidebar.c @@ -38,7 +38,7 @@ #include <gtk/gtktreemodel.h> #include <gtk/gtktreeselection.h> #include <libgnome/gnome-macros.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libnautilus-private/nautilus-bookmark.h> #include <libnautilus-private/nautilus-global-preferences.h> #include <libnautilus-private/nautilus-sidebar-provider.h> diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c index 82933dfbe..3f8faad00 100644 --- a/src/nautilus-image-properties-page.c +++ b/src/nautilus-image-properties-page.c @@ -27,7 +27,7 @@ #include <gtk/gtkvbox.h> #include <gtk/gtklabel.h> #include <libgnome/gnome-macros.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs-async-ops.h> #include <eel/eel-gnome-extensions.h> #include <libnautilus-extension/nautilus-property-page-provider.h> diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index 7e173d07e..e4254dad3 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -43,7 +43,7 @@ #include <gtk/gtkpaned.h> #include <gtk/gtknotebook.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-uidefs.h> #include <libgnomevfs/gnome-vfs-mime-handlers.h> #include <libgnomevfs/gnome-vfs-types.h> diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c index 71914e6cb..8c736e29c 100644 --- a/src/nautilus-location-bar.c +++ b/src/nautilus-location-bar.c @@ -44,7 +44,7 @@ #include <eel/eel-vfs-extensions.h> #include <gtk/gtkdnd.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-stock-icons.h> #include <libgnomeui/gnome-uidefs.h> #include <libgnomevfs/gnome-vfs.h> diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c index b0d967c22..c5e5053a1 100644 --- a/src/nautilus-location-entry.c +++ b/src/nautilus-location-entry.c @@ -42,7 +42,7 @@ #include <eel/eel-vfs-extensions.h> #include <gtk/gtkdnd.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-stock-icons.h> #include <libgnomeui/gnome-uidefs.h> #include <libgnomevfs/gnome-vfs.h> diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 59de798dc..9151f257f 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -45,7 +45,7 @@ #include <gtk/gtkiconfactory.h> #include <gtk/gtksignal.h> #include <gdk/gdk.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-init.h> #include <libgnomeui/gnome-ui-init.h> #include <libgnomevfs/gnome-vfs-init.h> diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c index 63d14f9c4..6a1b9def5 100644 --- a/src/nautilus-navigation-window-menus.c +++ b/src/nautilus-navigation-window-menus.c @@ -49,7 +49,7 @@ #include <libxml/parser.h> #include <gtk/gtkmain.h> #include <libgnome/gnome-help.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-about.h> #include <libgnomeui/gnome-uidefs.h> diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index 58fb13201..8af998f19 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -62,7 +62,7 @@ #include <gtk/gtkvbox.h> #include <gtk/gtktreemodel.h> #include <gtk/gtkliststore.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-macros.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-messagebox.h> diff --git a/src/nautilus-notes-viewer.c b/src/nautilus-notes-viewer.c index c59c0c6ea..b4bb2f4b0 100644 --- a/src/nautilus-notes-viewer.c +++ b/src/nautilus-notes-viewer.c @@ -38,7 +38,7 @@ #include <gtk/gtktextview.h> #include <gtk/gtkvbox.h> #include <gtk/gtkscrolledwindow.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libnautilus-private/nautilus-file-attributes.h> #include <libnautilus-private/nautilus-file.h> #include <libnautilus-private/nautilus-file-utilities.h> diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c index 4ce8494ad..bb4a2e134 100644 --- a/src/nautilus-pathbar.c +++ b/src/nautilus-pathbar.c @@ -32,7 +32,7 @@ #include <gtk/gtklabel.h> #include <gtk/gtkhbox.h> #include <gtk/gtkmain.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs-utils.h> #include <libgnomevfs/gnome-vfs-volume-monitor.h> #include <libnautilus-private/nautilus-icon-factory.h> diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c index d8edbbd42..af21913e6 100644 --- a/src/nautilus-places-sidebar.c +++ b/src/nautilus-places-sidebar.c @@ -42,7 +42,7 @@ #include <gtk/gtktreeselection.h> #include <gtk/gtkimagemenuitem.h> #include <libgnome/gnome-macros.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-popup-menu.h> #include <libnautilus-private/nautilus-dnd.h> #include <libnautilus-private/nautilus-bookmark.h> diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c index 919d682a3..2c949e954 100644 --- a/src/nautilus-property-browser.c +++ b/src/nautilus-property-browser.c @@ -67,7 +67,7 @@ #include <gtk/gtkradiobutton.h> #include <gtk/gtkvbox.h> #include <gtk/gtkviewport.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnome/gnome-help.h> #include <libgnomeui/gnome-color-picker.h> diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c index 154434456..61fdedd35 100644 --- a/src/nautilus-shell.c +++ b/src/nautilus-shell.c @@ -42,7 +42,7 @@ #include <gtk/gtklabel.h> #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-stock-icons.h> #include <libgnomeui/gnome-uidefs.h> #include <libgnomevfs/gnome-vfs-utils.h> diff --git a/src/nautilus-side-pane.c b/src/nautilus-side-pane.c index 863fdf69f..16051f86c 100644 --- a/src/nautilus-side-pane.c +++ b/src/nautilus-side-pane.c @@ -38,7 +38,7 @@ #include <gtk/gtkstock.h> #include <gtk/gtktooltips.h> #include <gtk/gtktogglebutton.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> typedef struct { char *title; diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c index d9719525d..d85081557 100644 --- a/src/nautilus-sidebar-title.c +++ b/src/nautilus-sidebar-title.c @@ -43,7 +43,7 @@ #include <gtk/gtklabel.h> #include <gtk/gtksignal.h> #include <gtk/gtkwidget.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs-types.h> #include <libgnomevfs/gnome-vfs-uri.h> #include <libnautilus-private/nautilus-file-attributes.h> diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index 7aad6f111..13a021907 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -59,7 +59,7 @@ #include <gtk/gtktogglebutton.h> #include <gtk/gtkvbox.h> #include <gtk/gtkuimanager.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-macros.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-messagebox.h> diff --git a/src/nautilus-throbber.c b/src/nautilus-throbber.c index a71cb74de..7d5dfdcec 100644 --- a/src/nautilus-throbber.c +++ b/src/nautilus-throbber.c @@ -36,7 +36,7 @@ #include <eel/eel-accessibility.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-macros.h> #include <libgnome/gnome-util.h> #include <gtk/gtkicontheme.h> diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index f7404aa8f..406080e5b 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -47,7 +47,7 @@ #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> #include <gdk/gdkx.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-dialog-util.h> #include <libgnomeui/gnome-icon-theme.h> #include <libgnomevfs/gnome-vfs-async-ops.h> diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index 8aa6260f4..9459f4764 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -53,7 +53,7 @@ #include <gtk/gtkaboutdialog.h> #include <gtk/gtkenums.h> #include <libgnome/gnome-help.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-help.h> #include <libgnomeui/gnome-uidefs.h> diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c index 6d2483060..561e9d720 100644 --- a/src/nautilus-window-toolbars.c +++ b/src/nautilus-window-toolbars.c @@ -40,7 +40,7 @@ #include <gtk/gtklabel.h> #include <gtk/gtktogglebutton.h> #include <gdk/gdkkeysyms.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnomeui/gnome-popup-menu.h> #include <libnautilus-extension/nautilus-menu-provider.h> #include <libnautilus-private/nautilus-bookmark.h> diff --git a/src/nautilus-window.c b/src/nautilus-window.c index 1c4015837..16ec1560c 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -59,7 +59,7 @@ #include <gtk/gtkoptionmenu.h> #include <gtk/gtktogglebutton.h> #include <gtk/gtkvbox.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <libgnome/gnome-macros.h> #include <libgnome/gnome-util.h> #include <libgnomeui/gnome-messagebox.h> diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c index c4207131b..7ea1b5dcb 100644 --- a/src/nautilus-zoom-control.c +++ b/src/nautilus-zoom-control.c @@ -31,7 +31,7 @@ #include "nautilus-zoom-control.h" #include <atk/atkaction.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include <eel/eel-accessibility.h> #include <eel/eel-glib-extensions.h> #include <eel/eel-graphic-effects.h> |