Index: Makefile.am =================================================================== RCS file: /cvs/gnome/tracker/Makefile.am,v retrieving revision 1.6 diff -n -u -r1.6 Makefile.am --- Makefile.am 1 Nov 2006 15:18:22 -0000 1.6 +++ Makefile.am 6 Nov 2006 11:23:07 -0000 @@ -1,4 +1,4 @@ -SUBDIRS = data src filters thumbnailers docs +SUBDIRS = data src filters thumbnailers docs po pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = tracker.pc Index: configure.in =================================================================== RCS file: /cvs/gnome/tracker/configure.in,v retrieving revision 1.32 diff -n -u -r1.32 configure.in --- configure.in 6 Nov 2006 00:25:39 -0000 1.32 +++ configure.in 6 Nov 2006 11:23:07 -0000 @@ -9,6 +9,8 @@ AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/Software/Tracker]) +AM_CONFIG_HEADER(config.h) + CFLAGS="$CFLAGS" # Checks for programs. @@ -79,6 +81,23 @@ fi +#################################################################### +# gettext/intltool support +#################################################################### + +ALL_LINGUAS="it" +AC_SUBST(ALL_LINGUAS) + +GETTEXT_PACKAGE=AC_PACKAGE_NAME +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", + [The gettext translation domain]) + +AM_GLIB_GNU_GETTEXT +AC_PROG_INTLTOOL([0.22]) + +AM_GLIB_DEFINE_LOCALEDIR(TRACKER_LOCALEDIR) + #################################################################### # check for GStreamer or Xine. Otherwise, call an external video @@ -114,7 +133,9 @@ if test "$use_gstreamer" = "yes"; then - PKG_CHECK_MODULES(GSTREAMER, [ gstreamer-0.10 >= 0.10.0 ], [have_libgstreamer=yes] , [have_libgstreamer=no]) + PKG_CHECK_MODULES(GSTREAMER, [ + gstreamer-0.10 >= 0.10.0], + [have_libgstreamer=yes] , [have_libgstreamer=no]) if test "$have_libgstreamer" = "yes"; then @@ -130,7 +151,9 @@ elif test "$use_libxine" = "yes"; then - PKG_CHECK_MODULES(XINE, [ libxine >= 1.0 ], [have_libxine=yes] , [have_libxine=no]) + PKG_CHECK_MODULES(XINE, [ + libxine >= 1.0 ], + [have_libxine=yes] , [have_libxine=no]) if test "$have_libxine" = "yes"; then @@ -327,7 +350,9 @@ if test "$disable_fam" = "no" then - PKG_CHECK_MODULES(GAMIN, gamin, have_fam=yes, have_fam=no) + PKG_CHECK_MODULES(GAMIN, + gamin, + [have_fam=yes] , [have_fam=no]) if test x"$have_fam" = "xyes" then @@ -356,13 +381,10 @@ AC_SUBST(FAM_LIBS) - - ################################################################## # check for GNOME/GTK dependencies to build tracker search tool (Gnome client) ################################################################## - GTK_REQUIRED=2.8.0 LIBGNOME_DESKTOP_REQUIRED=2.9.91 LIBGNOME_REQUIRED=2.13.2 @@ -370,76 +392,35 @@ LIBGLADE_REQUIRED=2.5.0 GNOMEVFS_REQUIRED=2.8.4 -have_gnome=yes - -PKG_CHECK_MODULES(GNOME_UTILS, [gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED], [] , [have_gnome=no]) - -PKG_CHECK_MODULES(GNOMEVFS, [gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED], [] , [have_gnome=no]) - -PKG_CHECK_MODULES(GNOMEDESKTOP, [gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED], [] , [have_gnome=no]) +PKG_CHECK_MODULES(GNOME_UTILS, [ + gtk+-2.0 >= $GTK_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED], + [have_gnome=yes] , [have_gnome=no]) + +PKG_CHECK_MODULES(GNOMEVFS, [ + gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED + gnome-vfs-module-2.0 >= $GNOMEVFS_REQUIRED], + [have_gnome=yes] , [have_gnome=no]) + +PKG_CHECK_MODULES(GNOMEDESKTOP, [ + gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED], + [have_gnome=yes] , [have_gnome=no]) AM_CONDITIONAL(HAVE_GNOME, test "$have_gnome" = "yes") AC_SUBST(GNOME_UTILS_CFLAGS) AC_SUBST(GNOME_UTILS_LIBS) -AC_SUBST(GNOMEDESKTOP_CFLAGS) -AC_SUBST(GNOMEDESKTOP_LIBS) AC_SUBST(GNOMEVFS_CFLAGS) AC_SUBST(GNOMEVFS_LIBS) +AC_SUBST(GNOMEDESKTOP_CFLAGS) +AC_SUBST(GNOMEDESKTOP_LIBS) -if test "$have_gnome" = "yes"; -then - -GNOME_COMMON_INIT - -# if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -# GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -# else -# GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -# fi - -# AC_ARG_WITH(gconf-source, -# [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) - -# AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -# AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) - -# if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -# GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' -# fi - -# AC_ARG_WITH(gconf-schema-file-dir, -# [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) - -# AC_SUBST(GCONF_SCHEMA_FILE_DIR) -# AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) - -# AC_ARG_ENABLE(schemas-install, -# [ --disable-schemas-install Disable the schemas installation], -# [case ${enableval} in -# yes|no) ;; -# *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; -# esac]) -# AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) - - -GETTEXT_PACKAGE=gnome-utils-2.0 -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Define the gettext -package to use]) -AC_SUBST(GETTEXT_PACKAGE) -AM_GLIB_GNU_GETTEXT - -# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME -# this is the directory where the *.{mo,gmo} files are installed -gnomeutilslocaledir='${prefix}/${DATADIRNAME}/locale' -AC_SUBST(gnomeutilslocaledir) - - +if test "$have_gnome" = "yes"; then + GNOME_COMMON_INIT fi - - ################################################################## # check for poppler's glib bingings ################################################################## @@ -448,7 +429,11 @@ CAIRO_REQUIRED=1.0 GDK_REQUIRED=1.0 -PKG_CHECK_MODULES(POPPLER_GLIB, [poppler-glib >= $POPPLER_GLIB_REQUIRED cairo >= $CAIRO_REQUIRED gdk-2.0 >= $GDK_REQUIRED], [have_poppler=yes] , [have_poppler=no]) +PKG_CHECK_MODULES(POPPLER_GLIB, [ + poppler-glib >= $POPPLER_GLIB_REQUIRED + cairo >= $CAIRO_REQUIRED + gdk-2.0 >= $GDK_REQUIRED], + [have_poppler=yes] , [have_poppler=no]) AM_CONDITIONAL(HAVE_POPPLER_GLIB, test "$have_poppler" = "yes") AC_SUBST(POPPLER_GLIB_CFLAGS) @@ -462,7 +447,9 @@ LIBPNG_REQUIRED=1.2 -PKG_CHECK_MODULES(LIBPNG, [libpng >= $LIBPNG_REQUIRED], [have_libpng=yes] , [have_png=no]) +PKG_CHECK_MODULES(LIBPNG, [ + libpng >= $LIBPNG_REQUIRED], + [have_libpng=yes] , [have_png=no]) AM_CONDITIONAL(HAVE_LIBPNG, test "$have_libpng" = "yes") AC_SUBST(LIBPNG_CFLAGS) @@ -476,7 +463,9 @@ LIBEXIF_REQUIRED=0.6 -PKG_CHECK_MODULES(LIBEXIF, [libexif >= $LIBEXIF_REQUIRED], [have_libexif=yes] , [have_libexif=no]) +PKG_CHECK_MODULES(LIBEXIF, [ + libexif >= $LIBEXIF_REQUIRED], + [have_libexif=yes] , [have_libexif=no]) AM_CONDITIONAL(HAVE_LIBEXIF, test "$have_libexif" = "yes") AC_SUBST(LIBEXIF_CFLAGS) @@ -489,7 +478,9 @@ LIBGSF_REQUIRED=1.13 -PKG_CHECK_MODULES(LIBGSF, [libgsf-1 >= $LIBGSF_REQUIRED], [have_libgsf=yes] , [have_libgsf=no]) +PKG_CHECK_MODULES(LIBGSF, [ + libgsf-1 >= $LIBGSF_REQUIRED], + [have_libgsf=yes] , [have_libgsf=no]) AM_CONDITIONAL(HAVE_LIBGSF, test "$have_libgsf" = "yes") AC_SUBST(LIBGSF_CFLAGS) @@ -543,8 +534,8 @@ src/trackerd/Makefile src/libtracker/Makefile src/tracker-search-tool/Makefile + po/Makefile.in ]) - AC_OUTPUT Index: src/libtracker/tracker-search.c =================================================================== RCS file: /cvs/gnome/tracker/src/libtracker/tracker-search.c,v retrieving revision 1.15 diff -n -u -r1.15 tracker-search.c --- src/libtracker/tracker-search.c 5 Nov 2006 23:31:39 -0000 1.15 +++ src/libtracker/tracker-search.c 6 Nov 2006 11:23:07 -0000 @@ -17,8 +17,10 @@ * Boston, MA 02111-1307, USA. */ -#include +#include + #include +#include #include "../libtracker/tracker.h" @@ -28,9 +30,9 @@ static gboolean detailed; static GOptionEntry entries[] = { - {"limit", 'l', 0, G_OPTION_ARG_INT, &limit, "limit the number of results showed", "limit"}, - {"service", 's', 0, G_OPTION_ARG_STRING, &service, "search from a specific service", "service"}, - {"detailed", 'd', 0, G_OPTION_ARG_NONE, &detailed, "Show more detailed results with service and mime type as well", NULL}, + {"limit", 'l', 0, G_OPTION_ARG_INT, &limit, N_("Limit the number of results showed"), N_("LIMIT")}, + {"service", 's', 0, G_OPTION_ARG_STRING, &service, N_("Search from a specific service"), N_("SERVICE")}, + {"detailed", 'd', 0, G_OPTION_ARG_NONE, &detailed, N_("Show more detailed results with service and mime type as well"), NULL}, {G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &terms, "search terms", NULL}, {NULL} }; @@ -74,19 +76,23 @@ char **p_strarray; GPtrArray *out_array = NULL; + bindtextdomain (GETTEXT_PACKAGE, TRACKER_LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + setlocale (LC_ALL, ""); - context = g_option_context_new ("search terms ... - search files for certain terms (ANDed)"); + context = g_option_context_new (_("TERM1 [TERM2...] - search files for certain terms (ANDed)")); g_option_context_add_main_entries (context, entries, NULL); g_option_context_parse (context, &argc, &argv, &error); if (error) { - g_printerr ("invalid arguments: %s\n", error->message); + g_printerr (_("Invalid arguments: %s\n"), error->message); return 1; } if (!terms) { - g_printerr ("missing search terms, try --help for help\n"); + g_printerr (_("Missing search terms, try '%s --help' for help\n"), argv[0]); return 1; } @@ -96,7 +102,7 @@ client = tracker_connect (FALSE); if (!client) { - g_printerr ("could not connect to Tracker\n"); + g_printerr (_("could not connect to Tracker\n")); return 1; } @@ -115,7 +121,7 @@ } else if (g_ascii_strcasecmp (service, "Development") == 0) { type = SERVICE_DEVELOPMENT_FILES; } else { - g_printerr ("service not recognized, searching in Other Files...\n"); + g_printerr (_("Service not recognized, searching in Other Files...\n")); type = SERVICE_OTHER_FILES; } @@ -132,13 +138,13 @@ if (error) { - g_printerr ("tracker raised error: %s\n", error->message); + g_printerr (_("tracker raised error: %s\n"), error->message); g_error_free (error); return 1; } if ((!detailed && !result) || (detailed && !out_array)) { - g_printerr ("no results found\n"); + g_printerr (_("No results found\n")); tracker_disconnect (client); return 0; } Index: src/tracker-search-tool/tracker-search-tool.c =================================================================== RCS file: /cvs/gnome/tracker/src/tracker-search-tool/tracker-search-tool.c,v retrieving revision 1.8 diff -n -u -r1.8 tracker-search-tool.c --- src/tracker-search-tool/tracker-search-tool.c 30 Oct 2006 00:35:31 -0000 1.8 +++ src/tracker-search-tool/tracker-search-tool.c 6 Nov 2006 11:23:08 -0000 @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #ifndef FNM_CASEFOLD @@ -65,7 +63,7 @@ static gchar *service = NULL; static GOptionEntry options[] = { - {"service", 's', 0, G_OPTION_ARG_STRING, &service, "search from a specific service", "service"}, + {"service", 's', 0, G_OPTION_ARG_STRING, &service, N_("Search from a specific service"), N_("SERVICE")}, {G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &terms, "search terms", NULL}, {NULL} }; @@ -98,14 +96,14 @@ }; static service_info_t services[8] = { - { "Files", "system-file-manager", SERVICE_FILES }, - { "Development Files", "applications-development", SERVICE_DEVELOPMENT_FILES }, - { "Documents", "x-office-document", SERVICE_DOCUMENTS }, - { "Images", "image", SERVICE_IMAGES }, - { "Music", "audio-x-generic", SERVICE_MUSIC }, - { "Text Files", "text-x-generic", SERVICE_TEXT_FILES }, - { "Videos", "video-x-generic", SERVICE_VIDEOS }, - { NULL, NULL, -1 } + { N_("All files"), "system-file-manager", SERVICE_FILES }, + { N_("Development"), "applications-development", SERVICE_DEVELOPMENT_FILES }, + { N_("Documents"), "x-office-document", SERVICE_DOCUMENTS }, + { N_("Images"), "image", SERVICE_IMAGES }, + { N_("Music"), "audio-x-generic", SERVICE_MUSIC }, + { N_("Plain text"), "text-x-generic", SERVICE_TEXT_FILES }, + { N_("Videos"), "video-x-generic", SERVICE_VIDEOS }, + { NULL, NULL, -1 } }; @@ -254,7 +252,7 @@ GTK_ICON_LOOKUP_USE_BUILTIN, &error); gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, pixbuf, 1, service->service, 2, service->service_type, -1); + gtk_list_store_set (store, &iter, 0, pixbuf, 1, _(service->service), 2, service->service_type, -1); } gtk_combo_box_set_active (combo, 0); @@ -2155,7 +2153,7 @@ gtk_box_set_spacing (GTK_BOX (hbox), 6); gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0); - widget = gtk_button_new_with_mnemonic ("_Previous"); + widget = gtk_button_new_with_mnemonic (_("_Previous")); image = gtk_image_new_from_stock (GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (widget), image); gsearch->back_button = widget; @@ -2163,7 +2161,7 @@ G_CALLBACK (click_find_cb), (gpointer) gsearch); gtk_container_add (GTK_CONTAINER (hbox), widget); - widget = gtk_button_new_with_mnemonic ("_Next"); + widget = gtk_button_new_with_mnemonic (_("_Next")); image = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (widget), image); gsearch->forward_button = widget; @@ -2298,7 +2296,7 @@ return 1; } - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, TRACKER_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); @@ -2350,7 +2348,7 @@ add_no_files_found_message (gsearch); if (service && !(tracker_search_select_service_type_by_string (GTK_COMBO_BOX (gsearch->combo), service))) { - g_printerr ("invalid service type: %s\n", service); + g_printerr (_("Invalid service type: %s\n"), service); return 1; }