Translation updated by Ivar Smolin

[evince.git] / shell / main.c

diff --git a/shell/main.c b/shell/main.c
index 37db7e434e2fc608cfac9922907618120215bc0c..0ddf56f32fff2d54001a769a781146cb85df176a 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -34,7 +34,6 @@
 #include "ev-backends-manager.h"
 #include "ev-debug.h"
 #include "ev-file-helpers.h"
-#include "ev-metadata-manager.h"
 #include "ev-stock-icons.h"
 #include "eggsmclient.h"
 #include "eggdesktopfile.h"
@@ -42,7 +41,7 @@
 static gchar   *ev_page_label;
 static gchar   *ev_find_string;
 static gboolean preview_mode = FALSE;
-static gboolean fullscren_mode = FALSE;
+static gboolean fullscreen_mode = FALSE;
 static gboolean presentation_mode = FALSE;
 static gboolean unlink_temp_file = FALSE;
 static gchar   *print_settings;
@@ -51,7 +50,7 @@ static const char **file_arguments = NULL;
 static const GOptionEntry goption_options[] =
 {
        { "page-label", 'p', 0, G_OPTION_ARG_STRING, &ev_page_label, N_("The page of the document to display."), N_("PAGE")},
-       { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscren_mode, N_("Run evince in fullscreen mode"), NULL },
+       { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscreen_mode, N_("Run evince in fullscreen mode"), NULL },
        { "presentation", 's', 0, G_OPTION_ARG_NONE, &presentation_mode, N_("Run evince in presentation mode"), NULL },
        { "preview", 'w', 0, G_OPTION_ARG_NONE, &preview_mode, N_("Run evince as a previewer"), NULL },
        { "find", 'l', 0, G_OPTION_ARG_STRING, &ev_find_string, N_("The word or phrase to find in the document"), N_("STRING")},
@@ -140,7 +139,7 @@ arguments_parse (void)
                ev_page_label = NULL;
        }
 
-       if (fullscren_mode)
+       if (fullscreen_mode)
                mode = EV_WINDOW_MODE_FULLSCREEN;
        else if (presentation_mode)
                mode = EV_WINDOW_MODE_PRESENTATION;
@@ -316,33 +315,28 @@ main (int argc, char *argv[])
 {
        GOptionContext *context;
        GHashTable *args;
-       gboolean enable_metadata = FALSE;
        GError *error = NULL;
 
        /* Init glib threads asap */
        if (!g_thread_supported ())
                g_thread_init (NULL);
 
-       context = g_option_context_new (_("GNOME Document Viewer"));
-
 #ifdef ENABLE_NLS
        /* Initialize the i18n stuff */
        bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
-       g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE);
+#endif
+
+       context = g_option_context_new (N_("GNOME Document Viewer"));
        g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
-#else
-       g_option_context_add_main_entries (context, goption_options, NULL);
-#endif /* ENABLE_NLS */
+       g_option_context_add_main_entries (context, goption_options, GETTEXT_PACKAGE);
        
        g_option_context_add_group (context, egg_sm_client_get_option_group ());
        g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
-       gtk_init (&argc, &argv);
-
        if (!g_option_context_parse (context, &argc, &argv, &error)) {
-               g_warning ("Cannot parse arguments: %s", error->message);
+               g_printerr ("Cannot parse arguments: %s", error->message);
                g_error_free (error);
                g_option_context_free (context);
                
@@ -359,18 +353,12 @@ main (int argc, char *argv[])
 
                        return 0;
                }
-       } else {
-               enable_metadata = TRUE;
        }
 #endif /* ENABLE_DBUS */
 
        ev_debug_init ();
        ev_backends_manager_init ();
        
-       if (enable_metadata) {
-               ev_metadata_manager_init ();
-       }
-
        ev_file_helpers_init ();
        ev_stock_icons_init ();
        
@@ -384,10 +372,6 @@ main (int argc, char *argv[])
 
        ev_file_helpers_shutdown ();
 
-       if (enable_metadata) {
-               ev_metadata_manager_shutdown ();
-       }
-
        ev_backends_manager_shutdown ();
 
        ev_debug_shutdown ();