Merge branch 'master' of ssh://styx@midnight-commander.org:22/git/mc

misc/syntax/cabal.syntax

@@ -188,8 +188,10 @@ context default
     keyword whole True  white
     keyword whole False white
     keyword whole if white
-    keyword whole impl white
     keyword whole else white
+    keyword whole os white
+    keyword whole impl white
+    keyword whole arch white
 
     keyword whole linestart \[\s\]executable yellow
     keyword whole linestart \[\s\]library yellow

po/el.po

@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid " Search string not found "
-msgstr ""
+msgstr "Η φράση αναζήτησης δεν βρέθηκε"
 
 msgid " Not implemented yet "
 msgstr "Δεν έχει ακόμη υλοποιηθεί"
 
 msgid " Num of replace tokens not equal to num of found tokens "
-msgstr ""
+msgstr "Ο αριθμός των ορισμάτων αντικατάστασης δεν είναι ίσος με τον αριθμό των ορισμάτων που βρέθηκαν"
 
 #, fuzzy, c-format
 msgid " Invalid token number %d "
@@ -37,19 +37,23 @@ msgid "Hexadecimal"
 msgstr "Δεκαεξαδικό"
 
 msgid "Wildcard search"
-msgstr ""
+msgstr "Αναζήτηση χαρακτήρα μπαλαντέρ"
 
 #, c-format
 msgid ""
 "Unable to load '%s' skin.\n"
 "Default skin has been loaded"
 msgstr ""
+"Αδύνατη η φόρτωση του δέρματος '%s'. \n"
+" Το προεπιλεγμένο δέρμα έχει φορτωθεί"
 
 #, c-format
 msgid ""
 "Unable to parse '%s' skin.\n"
 "Default skin has been loaded"
 msgstr ""
+"Αδύνατη η ανάγνωση του δέρματος '%s'. \n"
+" Το προεπιλεγμένο δέρμα έχει φορτωθεί"
 
 msgid "Function key 1"
 msgstr "Πλήκτρο λειτουργίας 1"
@@ -424,9 +428,7 @@ msgid "fish: Waiting for initial line..."
 msgstr ""
 
 msgid "Sorry, we cannot do password authenticated connections for now."
-msgstr ""
+msgstr "Με συγχωρείτε, αλλά προς το παρόν συνδέσεις με χρήση κωδικού δεν υποστηρίζονται."
-"Με συγχωρείτε, αλλά προς το παρόν συνδέσεις με χρήση κωδικού δεν "
-"υποστηρίζονται."
 
 #, fuzzy
 msgid " fish: Password required for "
@@ -1014,7 +1016,8 @@ msgstr ""
 msgid "Confirmation"
 msgstr ""
 
-#. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix
+#. TRANSLATORS: no need to translate 'Confirmation', it's just a context
+#. prefix
 #. 2
 msgid "Confirmation|&History cleanup"
 msgstr ""
@@ -2147,10 +2150,7 @@ msgid " %s%s file error"
 msgstr ""
 
 #, c-format
-msgid ""
+msgid "The format of the %smc.ext file has changed with version 3.0.  It seems that the installation failed.  Please fetch a fresh copy from the Midnight Commander package."
-"The format of the %smc.ext file has changed with version 3.0.  It seems that "
-"the installation failed.  Please fetch a fresh copy from the Midnight "
-"Commander package."
 msgstr ""
 
 #, c-format
@@ -2158,10 +2158,7 @@ msgid " ~/%s file error "
 msgstr ""
 
 #, c-format
-msgid ""
+msgid "The format of the ~/%s file has changed with version 3.0.  You may either want to copy it from %smc.ext or use that file as an example of how to write it."
-"The format of the ~/%s file has changed with version 3.0.  You may either "
-"want to copy it from %smc.ext or use that file as an example of how to write "
-"it."
 msgstr ""
 
 msgid "DialogTitle|Copy"
@@ -2762,8 +2759,7 @@ msgid " Hotlist Load "
 msgstr ""
 
 #, c-format
-msgid ""
+msgid "MC was unable to write ~/%s file, your old hotlist entries were not deleted"
-"MC was unable to write ~/%s file, your old hotlist entries were not deleted"
 msgstr ""
 
 #, c-format

src/editor/syntax.c

@@ -800,8 +800,11 @@ inline static void
 xx_lowerize_line (WEdit * edit, char *line, size_t len)
 {
     if (edit->is_case_insensitive)
-        for (size_t i = 0; i < len; ++i)
+    {
+        size_t i;
+        for (i = 0; i < len; ++i)
             line[i] = tolower (line[i]);
+    }
 }
 
 /* returns line number on error */

src/execute.c

@@ -304,8 +304,10 @@ toggle_panels (void)
     }
 #endif				/* HAVE_SUBSHELL_SUPPORT */
 
+    if ((view_one_file == NULL) && (edit_one_file == NULL)) {
 	update_panels (UP_OPTIMIZE, UP_KEEPSEL);
 	update_xterm_title_path ();
+    }
     repaint_screen ();
 }
 

src/filegui.c

@@ -249,7 +249,7 @@ file_op_context_create_ui_without_init (FileOpContext * ctx, gboolean with_eta,
                                         filegui_dialog_type_t dialog_type)
 {
     FileOpContextUI *ui;
-    int minus, total_reserve = 0;
+    int minus = 0, total_reserve = 0;
     const char *abort_button_label = N_("&Abort");
     const char *skip_button_label = N_("&Skip");
     int abort_button_width, skip_button_width, buttons_width;
@@ -273,18 +273,20 @@ file_op_context_create_ui_without_init (FileOpContext * ctx, gboolean with_eta,
     ctx->ui = ui;
 
     ctx->dialog_type = dialog_type;
-    minus = verbose ? 0 : 3;
 
     switch (dialog_type)
     {
     case FILEGUI_DIALOG_ONE_ITEM:
         total_reserve = 0;
+        minus = verbose ? 0 : 2;
         break;
     case FILEGUI_DIALOG_MULTI_ITEM:
         total_reserve = 5;
+        minus = verbose ? 0 : 7;
         break;
     case FILEGUI_DIALOG_DELETE_ITEM:
         total_reserve = -5;
+        minus = 0;
         break;
     }
 
@@ -312,7 +314,7 @@ file_op_context_create_ui_without_init (FileOpContext * ctx, gboolean with_eta,
                             NORMAL_BUTTON, skip_button_label, NULL));
 
 
-    if (dialog_type == FILEGUI_DIALOG_MULTI_ITEM)
+    if (verbose && dialog_type == FILEGUI_DIALOG_MULTI_ITEM)
     {
         add_widget (ui->op_dlg, hline_new (8, 1, dlg_width - 2));
 
@@ -510,6 +512,9 @@ file_progress_show_total (FileOpTotalContext * tctx, FileOpContext * ctx, double
     struct timeval tv_current;
     FileOpContextUI *ui;
 
+    if (!verbose)
+        return;
+
     if (ctx->dialog_type != FILEGUI_DIALOG_MULTI_ITEM || ctx->ui == NULL)
         return;