Create menu manualy; Text using gettext for translations

5 files changed, 124 insertions, 95 deletions

diff --git a/dialogs.c b/dialogs.c
index bf7835a..a2999f2 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -14,7 +14,8 @@ typedef enum lvl
 
 
 
-/** Signature leve combo box text */
+/* Signature leve combo box text */
+/*
 gchar *sig_level_texts[] =
 {
     "Do not use signature level",
@@ -23,7 +24,7 @@ gchar *sig_level_texts[] =
     "Level 2 - prefered",
     "Level 3 - required"
 };
-
+*/
 
 
 /**
@@ -167,7 +168,7 @@ void show_options_dialog ()
     row  = 0;
 
     /* Create the widgets */
-    options.dialog = gtk_dialog_new_with_buttons ("Options",
+    options.dialog = gtk_dialog_new_with_buttons (_("Options"),
                      GTK_WINDOW (gui.win),
                      GTK_DIALOG_DESTROY_WITH_PARENT,
                      GTK_STOCK_OK, GTK_RESPONSE_OK,
@@ -180,7 +181,7 @@ void show_options_dialog ()
     gtk_container_add (GTK_CONTAINER (content_area), table);
 
     label = gtk_label_new (NULL);
-    gtk_label_set_markup (GTK_LABEL (label), "<span weight=\"bold\"><big>Set ncpmount options:</big></span>");
+    gtk_label_set_markup (GTK_LABEL (label), _("<span weight=\"bold\"><big>Set ncpmount options:</big></span>"));
     gtk_table_attach(GTK_TABLE(table), label, 0, 2, row, row+1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 6, 0);
     row++;
 
@@ -190,7 +191,7 @@ void show_options_dialog ()
     row++;
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Codepage [-p]:");
+    label = gtk_label_new (_("Codepage [-p]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -199,7 +200,7 @@ void show_options_dialog ()
     row++;
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Charset [-y]:");
+    label = gtk_label_new (_("Charset [-y]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -213,16 +214,16 @@ void show_options_dialog ()
     row++;
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Signature level [-i]:");
+    label = gtk_label_new (_("Signature level [-i]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0);
 
     options.combo_signature = gtk_combo_box_new_text();
-    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), sig_level_texts[NOT_USED]);
-    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), sig_level_texts[NEVER]);
-    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), sig_level_texts[SUPPORTED]);
-    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), sig_level_texts[PREFERED]);
-    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), sig_level_texts[REQUIRED]);
+    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), _("Do not use signature level"));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), _("Level 0 - never"));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), _("Level 1 - supported"));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), _("Level 2 - prefered"));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(options.combo_signature), _("Level 3 - required"));
 
     gtk_combo_box_set_active(GTK_COMBO_BOX(options.combo_signature), 0);
     gtk_table_attach_defaults (GTK_TABLE (table),  options.combo_signature, 1, 2, row, row+1);
@@ -234,7 +235,7 @@ void show_options_dialog ()
     row++;
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Volume to mount [-V]:");
+    label = gtk_label_new (_("Volume to mount [-V]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -248,7 +249,7 @@ void show_options_dialog ()
     row++;
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Mounted files uid [-u]:");
+    label = gtk_label_new (_("Mounted files uid [-u]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -257,7 +258,7 @@ void show_options_dialog ()
     row++;
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Mounted files gid [-g]:");
+    label = gtk_label_new (_("Mounted files gid [-g]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -266,7 +267,7 @@ void show_options_dialog ()
     row++;
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Files permission [-f]:");
+    label = gtk_label_new (_("Files permission [-f]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -275,7 +276,7 @@ void show_options_dialog ()
     row++;
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Dirs permission [-d]:");
+    label = gtk_label_new (_("Dirs permission [-d]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -288,7 +289,7 @@ void show_options_dialog ()
     row++;
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Timeout [-t]:");
+    label = gtk_label_new (_("Timeout [-t]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -297,7 +298,7 @@ void show_options_dialog ()
     row++;
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Retry count [-r]:");
+    label = gtk_label_new (_("Retry count [-r]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(table), halign, 0, 1, row, row+1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -310,19 +311,19 @@ void show_options_dialog ()
     gtk_table_attach (GTK_TABLE(table), hsep, 0, 2, row, row+1,  GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 6, 6);
     row++;
 
-    options.check_C = gtk_check_button_new_with_label ("Don't convet password to uppercase [-C]");
+    options.check_C = gtk_check_button_new_with_label (_("Don't convet password to uppercase [-C]"));
     gtk_table_attach_defaults (GTK_TABLE (table), options.check_C, 0, 2, row, row+1);
     row++;
 
-    options.check_m = gtk_check_button_new_with_label ("Allow multiple logins to server [-m]");
+    options.check_m = gtk_check_button_new_with_label (_("Allow multiple logins to server [-m]"));
     gtk_table_attach_defaults (GTK_TABLE (table), options.check_m, 0, 2, row, row+1);
     row++;
 
-    options.check_s = gtk_check_button_new_with_label ("Enable renaming/deletion of read-only files [-s]");
+    options.check_s = gtk_check_button_new_with_label (_("Enable renaming/deletion of read-only files [-s]"));
     gtk_table_attach_defaults (GTK_TABLE (table), options.check_s, 0, 2, row, row+1);
     row++;
 
-    options.check_b = gtk_check_button_new_with_label ("Force bindery login to NDS servers [-b]");
+    options.check_b = gtk_check_button_new_with_label (_("Force bindery login to NDS servers [-b]"));
     gtk_table_attach_defaults (GTK_TABLE (table), options.check_b, 0, 2, row, row+1);
     row++;
 
@@ -384,7 +385,7 @@ void show_ncpmount_command ()
     gchar *command = get_ncpmount_command(FALSE,&strlen);
 
     /* Create the widgets */
-    dialog = gtk_dialog_new_with_buttons ("Show ncpmount command",
+    dialog = gtk_dialog_new_with_buttons (_("Show ncpmount command"),
                                           GTK_WINDOW (gui.win),
                                           GTK_DIALOG_DESTROY_WITH_PARENT,
                                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
@@ -398,7 +399,7 @@ void show_ncpmount_command ()
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("ncpmount command with selected options:");
+    label = gtk_label_new (_("ncpmount command with selected options:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_box_pack_start (GTK_BOX (vbox),  halign,  FALSE, TRUE, 0);
 
diff --git a/globals.h b/globals.h
index 907adf3..3a3fa38 100644
--- a/globals.h
+++ b/globals.h
@@ -2,10 +2,16 @@
 #define GNCPMOUNT_GLOBALS_H
 
 #include <gtk/gtk.h>
+/* gettext - localize */
+#include <locale.h>
+#include <libintl.h>
 
 #define PROG_VERSION "0.0.3"
 #define GUI_TITLE "gncpmount - 0.0.3"
 
+/* gettext function */
+#define _(string) gettext(string)
+#define N_(string1, string2, n) ngettext(string1, string2, n)
 
 
 /**
diff --git a/gncpmount.c b/gncpmount.c
index ef71acc..8706fe1 100644
--- a/gncpmount.c
+++ b/gncpmount.c
@@ -1,7 +1,7 @@
+#include "globals.h"
 #include "keyfile.h"
 #include "ncpwrapper.h"
 #include "dialogs.h"
-#include "globals.h"
 
 #include "logo.xpm.h"
 
@@ -72,8 +72,8 @@ static void
 enable_mount_button ()
 {
     gint tmp = ( gtk_entry_get_text_length (GTK_ENTRY(gui.entry_username)) *
-                gtk_entry_get_text_length (GTK_ENTRY(gui.entry_password)) *
-                gtk_entry_get_text_length (GTK_ENTRY(gui.entry_mount_point)));
+                 gtk_entry_get_text_length (GTK_ENTRY(gui.entry_password)) *
+                 gtk_entry_get_text_length (GTK_ENTRY(gui.entry_mount_point)));
 
     if ( (tmp * gtk_entry_get_text_length (GTK_ENTRY(gui.entry_server)) != 0) ||
             (tmp * gtk_entry_get_text_length (GTK_ENTRY(gui.entry_dns_server))) != 0)
@@ -104,7 +104,7 @@ static void
 open_folder ()
 {
     GtkWidget *dialog;
-    dialog = gtk_file_chooser_dialog_new ("Select folder - mount point",
+    dialog = gtk_file_chooser_dialog_new (_("Select folder - mount point"),
                                           GTK_WINDOW (gui.win),
                                           GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -132,7 +132,7 @@ static void
 open_file ()
 {
     GtkWidget *dialog;
-    dialog = gtk_file_chooser_dialog_new ("Load options from file",
+    dialog = gtk_file_chooser_dialog_new (_("Load options from file"),
                                           GTK_WINDOW (gui.win),
                                           GTK_FILE_CHOOSER_ACTION_OPEN,
                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -162,7 +162,7 @@ static void
 save_file ()
 {
     GtkWidget *dialog;
-    dialog = gtk_file_chooser_dialog_new ("Save options to file",
+    dialog = gtk_file_chooser_dialog_new (_("Save options to file"),
                                           GTK_WINDOW (gui.win),
                                           GTK_FILE_CHOOSER_ACTION_SAVE,
                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -221,7 +221,7 @@ passwd_usage ()
     {
         gtk_entry_set_visibility (GTK_ENTRY(gui.entry_password), TRUE);
         set_parameter_text (gui.entry_password, &(cmd_params.password));
-        gtk_entry_set_text (GTK_ENTRY(gui.entry_password), "no password will be used");
+        gtk_entry_set_text (GTK_ENTRY(gui.entry_password), _("no password will be used"));
     }
     else
     {
@@ -270,52 +270,6 @@ clear_gui ()
 
 
 
-/** Menu, an array of GtkItemFactoryEntry structures that defines each menu item */
-static GtkItemFactoryEntry menu_items[] =
-{
-    { "/_File",         NULL,         NULL,           0, "<Branch>", NULL},
-    { "/File/_New",     "<control>N", clear_gui,    0, "<StockItem>", GTK_STOCK_NEW},
-    { "/File/_Load",    "<control>L", open_file,    0, "<StockItem>", GTK_STOCK_OPEN},
-    { "/File/_Save",    "<control>S", save_file,    0, "<StockItem>", GTK_STOCK_SAVE},
-    { "/File/sep1",     NULL,         NULL,           0, "<Separator>", NULL},
-    { "/File/_Quit",    "<CTRL>Q", gtk_main_quit, 0, "<StockItem>", GTK_STOCK_QUIT},
-    { "/Tools",      NULL,         NULL,           0, "<Branch>", NULL  },
-    { "/_Tools/Options",  "<control>O",   run_options_dialog,            0, "<Item>", NULL},
-    { "/_Tools/Show command",  NULL,   run_command_dialog,            0, "<Item>", NULL},
-    { "/_Help",         NULL,         NULL,           0, "<Branch>", NULL},
-    { "/_Help/About...",   NULL,         show_about,           0, "<Item>", GTK_STOCK_ABOUT},
-};
-
-
-
-/** Menu items count */
-static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
-
-
-
-/**
-* Returns a menubar widget made from the above menu
-*/
-static GtkWidget *
-get_menubar_menu( GtkWidget  *window )
-{
-    GtkItemFactory *item_factory;
-    GtkAccelGroup *accel_group;
-
-    accel_group = gtk_accel_group_new ();
-
-    item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>",
-                                         accel_group);
-
-    gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, NULL);
-
-    gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
-    return gtk_item_factory_get_widget (item_factory, "<main>");
-}
-
-
-
 int main (int argc, char *argv[])
 {
     GtkWidget *label = NULL;
@@ -323,6 +277,9 @@ int main (int argc, char *argv[])
     GtkWidget *hbox = NULL;
     GtkWidget *halign = NULL;
     GtkWidget *logo = NULL;
+    GtkWidget *menu = NULL;
+    GtkWidget *submenu = NULL;
+    GtkWidget *menuitem = NULL;
 
     GdkPixbuf *xpm = NULL;
 
@@ -345,9 +302,76 @@ int main (int argc, char *argv[])
     tmp = gtk_vbox_new (FALSE, 1);
     gtk_container_add (GTK_CONTAINER (gui.win), tmp);
 
-    gui.menu = get_menubar_menu (gui.win);
+    /* Create menu bar*/
+    gui.menu = gtk_menu_bar_new();
     gtk_box_pack_start (GTK_BOX (tmp), gui.menu, FALSE, TRUE, 0);
 
+    /* File menu */
+    menu = gtk_menu_item_new_with_label (_("File"));
+    gtk_menu_bar_append (GTK_MENU_BAR(gui.menu), menu);
+    gtk_widget_show(menu);
+
+    /*-- Create File submenu  --*/
+    submenu = gtk_menu_new();
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
+
+    menuitem = gtk_menu_item_new_with_mnemonic (_("_New"));
+    gtk_menu_append(GTK_MENU(submenu), menuitem);
+    gtk_signal_connect(GTK_OBJECT (menuitem), "activate", clear_gui, NULL);
+    gtk_widget_show (menuitem);
+
+    menuitem = gtk_menu_item_new_with_mnemonic (_("_Load"));
+    gtk_menu_append(GTK_MENU(submenu), menuitem);
+    gtk_signal_connect(GTK_OBJECT (menuitem), "activate", open_file, NULL);
+    gtk_widget_show (menuitem);
+
+    menuitem = gtk_menu_item_new_with_mnemonic (_("_Save"));
+    gtk_menu_append(GTK_MENU(submenu), menuitem);
+    gtk_signal_connect(GTK_OBJECT (menuitem), "activate", save_file, NULL);
+    gtk_widget_show (menuitem);
+
+    menuitem = gtk_separator_menu_item_new ();
+    gtk_menu_append(GTK_MENU(submenu), menuitem);
+    gtk_widget_show (menuitem);
+
+    menuitem = gtk_menu_item_new_with_mnemonic (_("_Quit"));
+    gtk_menu_append(GTK_MENU(submenu), menuitem);
+    gtk_signal_connect(GTK_OBJECT (menuitem), "activate", gtk_main_quit, NULL);
+    gtk_widget_show (menuitem);
+
+
+    /* Tools menu */
+    menu = gtk_menu_item_new_with_label (_("Tools"));
+    gtk_menu_bar_append (GTK_MENU_BAR(gui.menu), menu);
+    gtk_widget_show(menu);
+
+    submenu = gtk_menu_new();
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
+
+    menuitem = gtk_menu_item_new_with_label (_("Options"));
+    gtk_menu_append(GTK_MENU(submenu), menuitem);
+    gtk_signal_connect(GTK_OBJECT (menuitem), "activate", run_options_dialog, NULL);
+    gtk_widget_show (menuitem);
+
+    menuitem = gtk_menu_item_new_with_label (_("Show command"));
+    gtk_menu_append(GTK_MENU(submenu), menuitem);
+    gtk_signal_connect(GTK_OBJECT (menuitem), "activate", run_command_dialog, NULL);
+    gtk_widget_show (menuitem);
+
+
+    /* Help menu */
+    menu = gtk_menu_item_new_with_label (_("Help"));
+    gtk_menu_bar_append (GTK_MENU_BAR(gui.menu), menu);
+    gtk_widget_show(menu);
+
+    submenu = gtk_menu_new();
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu), submenu);
+
+    menuitem = gtk_menu_item_new_with_label (_("About..."));
+    gtk_menu_append(GTK_MENU(submenu), menuitem);
+    gtk_signal_connect(GTK_OBJECT (menuitem), "activate", show_about, NULL);
+    gtk_widget_show (menuitem);
+
     /* Create a vertical box */
     gui.vbox = gtk_vbox_new (FALSE, 6);
     gtk_box_pack_start (GTK_BOX (tmp), gui.vbox,  FALSE, TRUE, 0);
@@ -370,13 +394,13 @@ int main (int argc, char *argv[])
 
     /* Create table */
     gui.table = gtk_table_new (3, 2, FALSE);
-    label = gtk_label_new ("Login");
+    label = gtk_label_new (_("Login"));
     gtk_notebook_prepend_page (GTK_NOTEBOOK (gui.notebook), gui.table, label);
 
     /* Labels */
     halign = gtk_alignment_new(0, 0, 0, 1);
 
-    label = gtk_label_new ("Username [-U]:");
+    label = gtk_label_new (_("Username [-U]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(gui.table), halign, 0, 1, 0, 1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 4, 0);
 
@@ -386,7 +410,7 @@ int main (int argc, char *argv[])
     gtk_table_attach_defaults (GTK_TABLE (gui.table),  gui.entry_username, 1, 2, 0, 1);
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Password [-P]:");
+    label = gtk_label_new (_("Password [-P]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(gui.table), halign, 0, 1, 1, 2,  GTK_FILL, GTK_FILL | GTK_EXPAND, 4, 0);
 
@@ -397,7 +421,7 @@ int main (int argc, char *argv[])
     gtk_table_attach_defaults (GTK_TABLE (gui.table),  gui.entry_password, 1, 2, 1, 2);
 
     /* Chcekbox */
-    gui.check_n = gtk_check_button_new_with_label ("Do not use any password [-n]");
+    gui.check_n = gtk_check_button_new_with_label (_("Do not use any password [-n]"));
     g_signal_connect (G_OBJECT (gui.check_n), "toggled", G_CALLBACK (passwd_usage), NULL);
     gtk_table_attach_defaults (GTK_TABLE (gui.table), gui.check_n, 1, 2, 2, 3);
 
@@ -406,11 +430,11 @@ int main (int argc, char *argv[])
     /* Page SERVER */
     gui.table = gtk_table_new (4, 2, FALSE);
 
-    label = gtk_label_new ("Server");
+    label = gtk_label_new (_("Server"));
     gtk_notebook_append_page (GTK_NOTEBOOK (gui.notebook), gui.table, label);
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Mount point:");
+    label = gtk_label_new (_("Mount point:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(gui.table), halign, 0, 1, 0, 1,  GTK_FILL , GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -430,7 +454,7 @@ int main (int argc, char *argv[])
 
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("Server [-S]:");
+    label = gtk_label_new (_("Server [-S]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(gui.table), halign, 0, 1, 2, 3,  GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -440,7 +464,7 @@ int main (int argc, char *argv[])
 
 
     halign = gtk_alignment_new(0, 0, 0, 1);
-    label = gtk_label_new ("DNS name [-A]:");
+    label = gtk_label_new (_("DNS name [-A]:"));
     gtk_container_add(GTK_CONTAINER(halign), label);
     gtk_table_attach(GTK_TABLE(gui.table), halign, 0, 1, 3, 4,  GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0);
 
@@ -456,7 +480,7 @@ int main (int argc, char *argv[])
     gtk_box_pack_start (GTK_BOX (gui.vbox), gui.btnbox, TRUE, TRUE, 0);
 
     /* Buttons */
-    gui.btn_mount = gtk_button_new_with_label  ("Mount");
+    gui.btn_mount = gtk_button_new_with_label  (_("Mount"));
     g_signal_connect (gui.btn_mount, "clicked", G_CALLBACK(call_ncpmount), NULL);
     gtk_box_pack_start (GTK_BOX (gui.btnbox), gui.btn_mount, TRUE, TRUE, 0);
 
diff --git a/keyfile.c b/keyfile.c
index 68926df..8000244 100644
--- a/keyfile.c
+++ b/keyfile.c
@@ -168,7 +168,7 @@ void save_cmdparams_to_file (const gchar *filename)
         fprintf(saved, "%s", file_data);
     }
     else
-        show_message( GTK_MESSAGE_ERROR,"ERROR: %s", "while opening file","", "");
+        show_message( GTK_MESSAGE_ERROR,"ERROR: While opening keyfile", "","", "");
 
     fclose(saved);
 
diff --git a/ncpwrapper.c b/ncpwrapper.c
index 9d8d889..e4de9c6 100644
--- a/ncpwrapper.c
+++ b/ncpwrapper.c
@@ -65,9 +65,7 @@ void fill_data (TData *data,
 * Catch termination of the process
 */
 static void
-cb_child_watch( GPid  pid,
-                gint  status,
-                TData *data)
+cb_child_watch(GPid  pid)
 {
     /* Close pid */
     g_spawn_close_pid( pid );
@@ -90,7 +88,7 @@ cb_timeout( TData *data )
     if(data->stderr_end && data->stdout_end)
     {
         if(data->count == 0)
-            show_message(GTK_MESSAGE_INFO, "Mounting succesfull", "","Mounted to \"%s\" directory.",cmd_params.mount_point);
+            show_message(GTK_MESSAGE_INFO, _("Mounting succesfull"), "",_("Mounted to \"%s\" directory."),cmd_params.mount_point);
 
         g_source_remove(data->timeout);
     }
@@ -129,7 +127,7 @@ cb_out_watch( GIOChannel   *channel,
         g_free( tmp );
     }
 
-    fill_data (data,"%s", "ncpmount output","%s",string->str, GTK_MESSAGE_INFO, TRUE);
+    fill_data (data,"%s", _("ncpmount output"),"%s",string->str, GTK_MESSAGE_INFO, TRUE);
     g_string_free(string, TRUE);
 
     return( TRUE );
@@ -165,7 +163,7 @@ cb_err_watch( GIOChannel   *channel,
         g_free( tmp );
     }
 
-    fill_data (data, "%s", "ncpmount error","%s",string->str, GTK_MESSAGE_ERROR, TRUE);
+    fill_data (data, "%s", _("ncpmount error"),"%s",string->str, GTK_MESSAGE_ERROR, TRUE);
     g_string_free(string, TRUE);
 
     return( TRUE );