gnome-commander r1892 - branches/gcmd-1-3/src

[epiotr svn gnome org]

Author: epiotr
Date: Thu Jul 17 21:43:27 2008
New Revision: 1892
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1892&view=rev

Log:
Sync with trunk

Modified:
   branches/gcmd-1-3/src/dirlist.cc
   branches/gcmd-1-3/src/gnome-cmd-con-dialog.cc
   branches/gcmd-1-3/src/gnome-cmd-main-win.cc
   branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc

Modified: branches/gcmd-1-3/src/dirlist.cc
==============================================================================
--- branches/gcmd-1-3/src/dirlist.cc	(original)
+++ branches/gcmd-1-3/src/dirlist.cc	Thu Jul 17 21:43:27 2008
@@ -69,7 +69,7 @@
 
     if (dir->state == DIR_STATE_LISTING)
     {
-        gchar *msg = g_strdup_printf ("%d files listed", dir->list_counter);
+        gchar *msg = g_strdup_printf (ngettext ("%d file listed", "%d files listed", dir->list_counter), dir->list_counter);
         gtk_label_set_text (GTK_LABEL (dir->label), msg);
         progress_bar_update (dir->pbar, 50);
         DEBUG('l', "%s\n", msg);
@@ -83,8 +83,7 @@
 }
 
 
-static void
-visprog_list (GnomeCmdDir *dir)
+inline void visprog_list (GnomeCmdDir *dir)
 {
     DEBUG('l', "visprog_list\n");
 
@@ -109,7 +108,7 @@
 }
 
 
-static void blocking_list (GnomeCmdDir *dir)
+inline void blocking_list (GnomeCmdDir *dir)
 {
     DEBUG('l', "blocking_list\n");
 

Modified: branches/gcmd-1-3/src/gnome-cmd-con-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-con-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-con-dialog.cc	Thu Jul 17 21:43:27 2008
@@ -411,13 +411,13 @@
     show_entry (table, dialog->priv->folder_entry, _("_Remote dir:"), i);
 
     if (show_user)
-        show_entry (table, dialog->priv->user_entry, _("_User name"), i);
+        show_entry (table, dialog->priv->user_entry, _("_User name:"), i);
 
     if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->auth_check)) && type!=CON_ANON_FTP)
-        show_entry (table, dialog->priv->password_entry, _("_Password"), i);
+        show_entry (table, dialog->priv->password_entry, _("_Password:"), i);
 
     if (show_domain)
-        show_entry (table, dialog->priv->domain_entry, _("_Domain name"), i);
+        show_entry (table, dialog->priv->domain_entry, _("_Domain name:"), i);
 }
 
 
@@ -548,8 +548,7 @@
     else
         gtk_widget_set_sensitive (conndlg->priv->alias_entry, FALSE);
 
-    ConnectionMethodID method = CON_SSH;
-    gtk_combo_box_set_active (GTK_COMBO_BOX (conndlg->priv->type_combo), method);
+    gtk_combo_box_set_active (GTK_COMBO_BOX (conndlg->priv->type_combo), CON_SSH);
 
     conndlg->priv->use_auth = gnome_cmd_data_get_use_gnome_auth_manager ();
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (conndlg->priv->auth_check), conndlg->priv->use_auth);

Modified: branches/gcmd-1-3/src/gnome-cmd-main-win.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-main-win.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-main-win.cc	Thu Jul 17 21:43:27 2008
@@ -1159,10 +1159,10 @@
     {
         GNOMEUIINFO_ITEM_STOCK(NULL, _("Refresh"), view_refresh, GTK_STOCK_REFRESH),
         GNOMEUIINFO_ITEM_STOCK(NULL, _("Up one directory"), view_up, GTK_STOCK_GO_UP),
-        GNOMEUIINFO_ITEM_STOCK(NULL, _("Goto the oldest"), view_first, GTK_STOCK_GOTO_FIRST),
+        GNOMEUIINFO_ITEM_STOCK(NULL, _("Go to the oldest"), view_first, GTK_STOCK_GOTO_FIRST),
         GNOMEUIINFO_ITEM_STOCK(NULL, _("Go back"), view_back, GTK_STOCK_GO_BACK),
         GNOMEUIINFO_ITEM_STOCK(NULL, _("Go forward"), view_forward, GTK_STOCK_GO_FORWARD),
-        GNOMEUIINFO_ITEM_STOCK(NULL, _("Goto the latest"), view_last, GTK_STOCK_GOTO_LAST),
+        GNOMEUIINFO_ITEM_STOCK(NULL, _("Go to the latest"), view_last, GTK_STOCK_GOTO_LAST),
         GNOMEUIINFO_SEPARATOR,
         GNOMEUIINFO_ITEM(NULL, _("Copy file names (SHIFT for full paths, ALT for URIs)"), edit_copy_fnames, copy_file_names_xpm),
         GNOMEUIINFO_ITEM_STOCK(NULL, _("Cut"), edit_cap_cut, GTK_STOCK_CUT),

Modified: branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc	Thu Jul 17 21:43:27 2008
@@ -626,7 +626,7 @@
 
 
 /**
- * The user has clicked on the goto button
+ * The user has clicked on the go to button
  *
  */
 static void on_goto (GtkButton *button, GnomeCmdSearchDialog *dialog)