From 7ad845bdd71805a27c08258f21d4b9727f86d374 Mon Sep 17 00:00:00 2001
From: "Mikhail S. Pobolovets" <styx.mp@gmail.com>
Date: Tue, 24 Feb 2009 10:46:33 +0200
Subject: [PATCH 01/11] lib/mc.ext.in: command line options fix by adamw (#183)

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
---
 ChangeLog     |  5 +++++
 lib/mc.ext.in | 27 +++++++++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09736fc69..381fa7115 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+
 2009-02-17 Mikhail Pobolovets  <styx.mp@gmail.com>
 
 	* lt.po: update by stikonas (#274)
@@ -14,6 +15,10 @@
 
 	* mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing #240)
 
+2009-02-03 Enrico Weigelt, metux ITS <weigelt@metux.de>
+
+	* lib/mc.ext.in: command line options fix by adamw (#183)
+
 2009-02-03 Enrico Weigelt, metux ITS <weigelt@metux.de>
 
 	* lib/mc.lib: added patch on #219 by angel_il
diff --git a/lib/mc.ext.in b/lib/mc.ext.in
index 1f86157c8..9bcd82868 100644
--- a/lib/mc.ext.in
+++ b/lib/mc.ext.in
@@ -162,23 +162,32 @@ regex/\.(alz|ALZ)$
 # cpio
 shell/.cpio.Z
 	Open=%cd %p#ucpio
-	View=%view{ascii} gzip -dc '%f' | cpio -itv 2>/dev/null
+	View=%view{ascii} gzip -dc %f | cpio -itv 2>/dev/null
 
 shell/.cpio.gz
 	Open=%cd %p#ucpio
-	View=%view{ascii} gzip -dc '%f' | cpio -itv 2>/dev/null
+	View=%view{ascii} gzip -dc %f | cpio -itv 2>/dev/null
 
 shell/.cpio
 	Open=%cd %p#ucpio
-	View=%view{ascii} cpio -itv <'%f' 2>/dev/null
+	View=%view{ascii} cpio -itv < %f 2>/dev/null
 
 # ls-lR
-regex/(^|\.)ls-?lR(\.g?z|Z|bz2)?$
+regex/(^|\.)ls-?lR(\.gz|Z|bz2)$
 	Open=%cd %p#lslR
 
 # patch
-regex/\.(diff|patch)(\.(bz2|gz|Z))?$
-        Open=%cd %p#patchfs
+regex/\.(diff|patch)(\.bz2)$
+	Open=%cd %p#patchfs
+	View=%view{ascii} bzip2 -dc %f 2>/dev/null
+
+regex/\.(diff|patch)(\.(gz|Z))$
+	Open=%cd %p#patchfs
+	View=%view{ascii} gzip -dc %f 2>/dev/null
+
+regex/\.(diff|patch)$
+	Open=%cd %p#patchfs
+	View=%view{ascii} /bin/cat %f 2>/dev/null
 
 # ar library
 regex/\.s?a$
@@ -530,11 +539,17 @@ type/^gzip
 	Open=gzip -dc %f | %var{PAGER:more}
 	View=%view{ascii} gzip -dc %f 2>/dev/null
 
+regex/\.(gz|Z)?$
+	View=%view{ascii} gzip -dc %f 2>/dev/null
+
 # bzip2
 type/^bzip2
 	Open=bzip2 -dc %f | %var{PAGER:more}
 	View=%view{ascii} bzip2 -dc %f 2>/dev/null
 
+regex/\.bz2?$
+	View=%view{ascii} bzip2 -dc %f 2>/dev/null
+
 # bzip
 type/^bzip
 	Open=bzip -dc %f | %var{PAGER:more}

From da56ed225deb3a7adceb2526790a56e5bb82c784 Mon Sep 17 00:00:00 2001
From: "Mikhail S. Pobolovets" <styx.mp@gmail.com>
Date: Tue, 24 Feb 2009 21:02:45 +0200
Subject: [PATCH 02/11] Backport: syntax/spec.syntax: .spec syntax update by
 adamw (#189)

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
---
 ChangeLog          |   4 +
 syntax/spec.syntax | 194 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 192 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 381fa7115..c1485ce2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 
+2009-02-24 Mikhail Pobolovets <styx.mp@gmail.com>
+
+	* syntax/spec.syntax: .spec syntax update by adamw (#189)
+
 2009-02-17 Mikhail Pobolovets  <styx.mp@gmail.com>
 
 	* lt.po: update by stikonas (#274)
diff --git a/syntax/spec.syntax b/syntax/spec.syntax
index 2f45be451..3f787988e 100644
--- a/syntax/spec.syntax
+++ b/syntax/spec.syntax
@@ -3,6 +3,7 @@ context default
     keyword whole Auto\{Rr\}eq\{Pp\}rov: green
     keyword whole Auto\{Rr\}eq: green
     keyword whole Build\{Aa\}rch: green
+    keyword whole Build\{Cc\}onflicts: green
     keyword whole Build\{Pp\}re\{Rr\}eq: green
     keyword whole Build\{Rr\}oot: green
     keyword whole Build\{Rr\}equires: green
@@ -16,11 +17,10 @@ context default
     keyword whole Exclusive\{Aa\}rch: green
     keyword whole Exclusive\{Oo\}\{Ss\}: green
     keyword whole Group: green
-    keyword whole Group(\[abcdefghijklmnopqrstuvwxyz\]): green
-    keyword whole Group(\[abcdefghijklmnopqrstuvwxyz\]_\[ABCDEFGHIJKLMNOPQRSTUVWXYZ\]): green
     keyword whole Icon: green
     keyword whole License: green
     keyword whole Name: green    
+    keyword whole NoSource\[0123456789\]: green
     keyword whole Obsoletes: green
     keyword whole Packager: green
     keyword whole Patch\[0123456789\]: green    
@@ -33,10 +33,8 @@ context default
     keyword whole Root: green    
     keyword whole Serial: white
     keyword whole Source\[0123456789\]: green
+    keyword whole Suggests: green
     keyword whole Summary: green
-    keyword whole Summary(\[abcdefghijklmnopqrstuvwxyz\]): green
-    keyword whole Summary(\[abcdefghijklmnopqrstuvwxyz\]_\[ABCDEFGHIJKLMNOPQRSTUVWXYZ\]): green
-    keyword whole Summary(\[abcdefghijklmnopqrstuvwxyz\]_\[ABCDEFGHIJKLMNOPQRSTUVWXYZ\].\[ABCDEFGHIJKLMNOPQRSTUVWXYZ-1234567890\]): green
     keyword whole Vendor: green
     keyword whole Version: green
     keyword whole U\{Rr\}\{Ll\}: green
@@ -82,6 +80,7 @@ context default
     keyword wholeright $+ brightgreen
     keyword ftp://+ brightgreen
     keyword http://+ brightgreen
+    keyword cvs://+ brightgreen
 
     keyword whole missingok brightcyan
     keyword whole noreplace brightcyan
@@ -89,6 +88,189 @@ context default
     keyword whole PATCH\[0123456789\] cyan
     keyword whole SOURCE\[0123456789\] cyan
 
+context Group( ): green
+	keyword whole af yellow
+	keyword whole az yellow
+	keyword whole bg yellow
+	keyword whole br yellow
+	keyword whole ca yellow
+	keyword whole ca_ES yellow
+	keyword whole cs yellow
+	keyword whole cs_CZ yellow
+	keyword whole da yellow
+	keyword whole da_DK yellow
+	keyword whole de yellow
+	keyword whole de_AT yellow
+	keyword whole de_DE yellow
+	keyword whole el yellow
+	keyword whole el_GR yellow
+	keyword whole en yellow
+	keyword whole en_GB yellow
+	keyword whole eo yellow
+	keyword whole es yellow
+	keyword whole es_ES yellow
+	keyword whole et yellow
+	keyword whole et_EE yellow
+	keyword whole eu yellow
+	keyword whole fi yellow
+	keyword whole fi_FI yellow
+	keyword whole fr yellow
+	keyword whole fr_FR yellow
+	keyword whole gl yellow
+	keyword whole gl_ES yellow
+	keyword whole gr yellow
+	keyword whole he yellow
+	keyword whole he_IL yellow
+	keyword whole hi yellow
+	keyword whole hr yellow
+	keyword whole hr_HR yellow
+	keyword whole hu yellow
+	keyword whole hu_HU yellow
+	keyword whole id yellow
+	keyword whole is yellow
+	keyword whole is_IS yellow
+	keyword whole it yellow
+	keyword whole it_IT yellow
+	keyword whole ja yellow
+	keyword whole ja_JP yellow
+	keyword whole ja_JP.SJIS yellow
+	keyword whole ko yellow
+	keyword whole ko_KR yellow
+	keyword whole lt yellow
+	keyword whole lt_LT yellow
+	keyword whole lv yellow
+	keyword whole ms yellow
+	keyword whole nb yellow
+	keyword whole nl yellow
+	keyword whole nl_NL yellow
+	keyword whole nn yellow
+	keyword whole nn_NO yellow
+	keyword whole no yellow
+	keyword whole no_NO yellow
+	keyword whole pl yellow
+	keyword whole pl_PL yellow
+	keyword whole pt yellow
+	keyword whole pt_BR yellow
+	keyword whole pt_PT yellow
+	keyword whole ro yellow
+	keyword whole ro_RO yellow
+	keyword whole ru yellow
+	keyword whole ru_RU yellow
+	keyword whole sk yellow
+	keyword whole sk_SK yellow
+	keyword whole sl yellow
+	keyword whole sl_SI yellow
+	keyword whole sr yellow
+	keyword whole sv yellow
+	keyword whole sv_SE yellow
+	keyword whole ta yellow
+	keyword whole th_TH yellow
+	keyword whole tr yellow
+	keyword whole tr_TR yellow
+	keyword whole uk yellow
+	keyword whole vi yellow
+	keyword whole wa yellow
+	keyword whole zh yellow
+	keyword whole zh_CN yellow
+	keyword whole zh_CN.GB2312 yellow
+	keyword whole zh_TW yellow
+	keyword whole zh_TW.Big5 yellow
+
+context Requires( ): green
+	keyword whole post yellow
+	keyword whole pre yellow
+	keyword whole postun yellow
+	keyword whole preun yellow
+	keyword , lightgray
+
+context Summary( ): green
+	keyword whole af yellow
+	keyword whole az yellow
+	keyword whole bg yellow
+	keyword whole br yellow
+	keyword whole ca yellow
+	keyword whole ca_ES yellow
+	keyword whole cs yellow
+	keyword whole cs_CZ yellow
+	keyword whole da yellow
+	keyword whole da_DK yellow
+	keyword whole de yellow
+	keyword whole de_AT yellow
+	keyword whole de_DE yellow
+	keyword whole el yellow
+	keyword whole el_GR yellow
+	keyword whole en yellow
+	keyword whole en_GB yellow
+	keyword whole eo yellow
+	keyword whole es yellow
+	keyword whole es_ES yellow
+	keyword whole et yellow
+	keyword whole et_EE yellow
+	keyword whole eu yellow
+	keyword whole fi yellow
+	keyword whole fi_FI yellow
+	keyword whole fr yellow
+	keyword whole fr_FR yellow
+	keyword whole gl yellow
+	keyword whole gl_ES yellow
+	keyword whole gr yellow
+	keyword whole he yellow
+	keyword whole he_IL yellow
+	keyword whole hi yellow
+	keyword whole hr yellow
+	keyword whole hr_HR yellow
+	keyword whole hu yellow
+	keyword whole hu_HU yellow
+	keyword whole id yellow
+	keyword whole is yellow
+	keyword whole is_IS yellow
+	keyword whole it yellow
+	keyword whole it_IT yellow
+	keyword whole ja yellow
+	keyword whole ja_JP yellow
+	keyword whole ja_JP.SJIS yellow
+	keyword whole ko yellow
+	keyword whole ko_KR yellow
+	keyword whole lt yellow
+	keyword whole lt_LT yellow
+	keyword whole lv yellow
+	keyword whole ms yellow
+	keyword whole nb yellow
+	keyword whole nl yellow
+	keyword whole nl_NL yellow
+	keyword whole nn yellow
+	keyword whole nn_NO yellow
+	keyword whole no yellow
+	keyword whole no_NO yellow
+	keyword whole pl yellow
+	keyword whole pl_PL yellow
+	keyword whole pt yellow
+	keyword whole pt_BR yellow
+	keyword whole pt_PT yellow
+	keyword whole ro yellow
+	keyword whole ro_RO yellow
+	keyword whole ru yellow
+	keyword whole ru_RU yellow
+	keyword whole sk yellow
+	keyword whole sk_SK yellow
+	keyword whole sl yellow
+	keyword whole sl_SI yellow
+	keyword whole sr yellow
+	keyword whole sv yellow
+	keyword whole sv_SE yellow
+	keyword whole ta yellow
+	keyword whole th_TH yellow
+	keyword whole tr yellow
+	keyword whole tr_TR yellow
+	keyword whole uk yellow
+	keyword whole vi yellow
+	keyword whole wa yellow
+	keyword whole zh yellow
+	keyword whole zh_CN yellow
+	keyword whole zh_CN.GB2312 yellow
+	keyword whole zh_TW yellow
+	keyword whole zh_TW.Big5 yellow
+
 context linestart # \n brown
 context %( ) brightcyan
 
@@ -97,7 +279,7 @@ context exclusive whole linestart %changelog EOF lightgray
     keyword Revision*\n brightgreen
     keyword \*\s\{MWTFS\}*\n brightgreen
     keyword \s\s[*] brightgreen
-    keyword $Log*\n brightred
+    keyword $Log*$\n brightred
 
 #sections
 context exclusive linestart %build \n yellow

From 210ffed4fd9d09fb23da829604aa07829ead735a Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Tue, 24 Feb 2009 22:20:21 +0300
Subject: [PATCH 03/11] Fixed menu painting for NCurses screen library.

---
 ChangeLog  | 3 +++
 src/menu.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 381fa7115..a7f24ed96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-02-24 Andrew Borodin <aborodin@vmail.ru>
+
+	* src/menu.c: menubar_paint_idx(): fixed menu painting for NCurses screen library.
 
 2009-02-17 Mikhail Pobolovets  <styx.mp@gmail.com>
 
diff --git a/src/menu.c b/src/menu.c
index f291071a6..ba221fa63 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -110,7 +110,7 @@ static void menubar_paint_idx (WMenu *menubar, int idx, int color)
         widget_move (&menubar->widget, y, x + 1);
     	hline (slow_terminal ? ' ' : ACS_HLINE, menubar->max_entry_len);
     } else {
-	const char *text;
+	const unsigned char *text;
 
 	addch((unsigned char)menu->entries [idx].first_letter);
 	for (text = menu->entries [idx].text; *text; text++)

From 6de4c5aafcb1b6a8ecd4f22aa887a1cb4cbb4e6d Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT service" <weigelt@metux.de>
Date: Tue, 3 Feb 2009 03:54:10 +0100
Subject: [PATCH 04/11] mountlist: use fsblkcnt_t when available (fixes #179)

When defined 64bit interface to filesystem we do not get overflow
when detect FS size.
---
 ChangeLog       |  4 ++++
 src/mountlist.c | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2299890e3..49619ed95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,10 @@
 	* lib/mc.lib: added patch on #219 by angel_il
 	* vfs/extfs/u7z: patch from mandriva (#194)
 
+2009-02-03 Enrico Weigelt, metux ITS <weigelt@metux.de>
+
+	* src/mountlist.c: fixed #179 (invalid block scale routine, problems with 32bit overflow)
+
 2009-02-02 Enrico Weigelt, metux ITS <weigelt@metux.de>
 
 	* vfs/extfs/iso9660.in: added iso9660 fix by cppgx (#86)
diff --git a/src/mountlist.c b/src/mountlist.c
index bd9e8d9e5..0f8b20745 100644
--- a/src/mountlist.c
+++ b/src/mountlist.c
@@ -135,11 +135,11 @@ struct mount_entry
 
 struct fs_usage
 {
-  long fsu_blocks;		/* Total blocks. */
-  long fsu_bfree;		/* Free blocks available to superuser. */
-  long fsu_bavail;		/* Free blocks available to non-superuser. */
-  long fsu_files;		/* Total file nodes. */
-  long fsu_ffree;		/* Free file nodes. */
+    fsblkcnt_t fsu_blocks;	/* Total blocks. */
+    fsblkcnt_t fsu_bfree;	/* Free blocks available to superuser. */
+    fsblkcnt_t fsu_bavail;	/* Free blocks available to non-superuser. */
+    fsfilcnt_t fsu_files;	/* Total file nodes. */
+    fsfilcnt_t fsu_ffree;	/* Free file nodes. */
 };
 
 static int get_fs_usage (char *path, struct fs_usage *fsp);
@@ -756,8 +756,8 @@ my_statfs (struct my_statfs *myfs_stats, const char *path)
    BLOCKS FROMSIZE-byte blocks, rounding away from zero.
    TOSIZE must be positive.  Return -1 if FROMSIZE is not positive.  */
 
-static long
-fs_adjust_blocks (long blocks, int fromsize, int tosize)
+static fsblkcnt_t
+fs_adjust_blocks (fsblkcnt_t blocks, int fromsize, int tosize)
 {
     if (tosize <= 0)
 	abort ();
@@ -769,7 +769,7 @@ fs_adjust_blocks (long blocks, int fromsize, int tosize)
     else if (fromsize > tosize)	/* E.g., from 2048 to 512.  */
 	return blocks * (fromsize / tosize);
     else			/* E.g., from 256 to 512.  */
-	return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize);
+	return blocks / (tosize / fromsize);
 }
 
 #if defined(_AIX) && defined(_I386)

From a9d662aa571028262dc628109e9edf7c72e839a0 Mon Sep 17 00:00:00 2001
From: "Mikhail S. Pobolovets" <styx.mp@gmail.com>
Date: Thu, 12 Mar 2009 10:57:15 +0200
Subject: [PATCH 05/11] =?UTF-8?q?po/sk.po:=20translation=20update=20by=20I?=
 =?UTF-8?q?van=20Mas=C3=A1r=20<helix84@centrum.sk>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
---
 po/sk.po | 741 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 349 insertions(+), 392 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index 6f424d860..f6287a07f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,68 +2,68 @@
 # Miroslav Baranko <destin@dec.upjs.sk>, 1999.
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2001,2002.
 # Marcel Telka <marcel@telka.sk>, 2002, 2003.
+# Ivan Masár <helix84@centrum.sk>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mc\n"
 "Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
 "POT-Creation-Date: 2009-01-06 13:46+0200\n"
-"PO-Revision-Date: 2003-01-22 21:50+0100\n"
-"Last-Translator: Marcel Telka <marcel@telka.sk>\n"
+"PO-Revision-Date: 2009-03-11 10:48+0100\n"
+"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 
-#, fuzzy
 msgid " Choose syntax highlighting "
-msgstr "zvýraznenie s&Yntaxe"
+msgstr " Vyberte zvýraznenie syntaxe"
 
-#, fuzzy
 msgid "< Auto >"
-msgstr " O aplikácii "
+msgstr "< Auto >"
 
 msgid "< Reload Current Syntax >"
-msgstr ""
+msgstr "< Znovu načítať aktuálnu syntax >"
 
-#, fuzzy, c-format
+#, c-format
 msgid " Cannot open %s for reading "
-msgstr " Neúspešný pokus o otvorenie rúry pre čítanie: "
+msgstr " Nepodarilo sa otvoriť %s na čítanie "
 
 msgid "Error"
 msgstr "Chyba"
 
-#, fuzzy, c-format
+#, c-format
 msgid " Error reading from pipe: %s "
-msgstr " Chyba pri čítaní z rúry: "
+msgstr " Chyba pri čítaní z rúry: %s "
 
-#, fuzzy, c-format
+#, c-format
 msgid " Cannot open pipe for reading: %s "
-msgstr " Neúspešný pokus o otvorenie rúry pre čítanie: "
+msgstr " Nepodarilo sa otvoriť rúru na čítanie: %s "
 
-#, fuzzy, c-format
+#, c-format
 msgid " Cannot get size/permissions for %s "
-msgstr " Nemôžem získať info súbor o veľkosti/právach: "
+msgstr " Nepodarilo sa zistiť veľkosti/práva %s "
 
-#, fuzzy, c-format
+#, c-format
 msgid " %s is not a regular file "
-msgstr " Nemôžem nahliadnuť: toto nie je normálny súbor "
+msgstr " %s nie je normálny súbor "
 
-#, fuzzy, c-format
+#, c-format
 msgid " File %s is too large "
-msgstr " Súbor je príliš veľký: "
+msgstr " Súbor %s je príliš veľký"
 
 msgid "Macro recursion is too deep"
 msgstr "Rekurzia makra je príliš hlboká"
 
 msgid " Enter file name: "
-msgstr " Zadajte meno súbpru: "
+msgstr " Zadajte meno súboru: "
 
 msgid "Warning"
 msgstr "Varovanie"
 
 msgid " File has hard-links. Detach before saving? "
-msgstr ""
+msgstr " Súbor má pevné odkazy. Odpojiť pred uložením? "
 
 msgid "&Yes"
 msgstr "Án&o"
@@ -75,7 +75,7 @@ msgid "&Cancel"
 msgstr "&Zrušiť"
 
 msgid "The file has been modified in the meantime. Save anyway?"
-msgstr ""
+msgstr "Súbor bol medzitým zmenený. Uložiť napriek tomu?"
 
 msgid " Error writing to pipe: "
 msgstr " Chyba počas zápisu do rúry: "
@@ -99,7 +99,7 @@ msgid "Extension:"
 msgstr "Prípona:"
 
 msgid " Edit Save Mode "
-msgstr " Upraviť mód ukladania "
+msgstr " Upraviť režim ukladania "
 
 msgid " Save As "
 msgstr " Uložiť ako "
@@ -107,9 +107,8 @@ msgstr " Uložiť ako "
 msgid " A file already exists with this name. "
 msgstr " Súbor s daným meno už existuje. "
 
-#, fuzzy
 msgid "&Overwrite"
-msgstr "Prepísať"
+msgstr "&Prepísať"
 
 msgid " Cannot save file. "
 msgstr " Chyba počas ukladania súboru. "
@@ -133,13 +132,13 @@ msgid " Save macro "
 msgstr " Uložiť makro "
 
 msgid " Press the macro's new hotkey: "
-msgstr " Stlačte nové makro hotkey: "
+msgstr " Stlačte nový kláves pre makro: "
 
 msgid " Press macro hotkey: "
 msgstr " Stlačte kláves pre makro: "
 
 msgid " Load macro "
-msgstr " Nahrať makro "
+msgstr " Načítať makro "
 
 msgid " Confirm save file? : "
 msgstr " Potvrdiť uloženie súboru? : "
@@ -157,9 +156,8 @@ msgstr ""
 " Aktuálny text bol modifikovaný bez uloženia súboru. \n"
 " Pokračovať zrušením týchto zmien. "
 
-#, fuzzy
 msgid "C&ontinue"
-msgstr "Pokračovať"
+msgstr "P&okračovať"
 
 msgid " Load "
 msgstr " Nahrať "
@@ -221,16 +219,14 @@ msgstr " Nahradiť "
 msgid "Search"
 msgstr "Hľadať"
 
-msgid ""
-" Invalid regular expression, or scanf expression with too many conversions "
+msgid " Invalid regular expression, or scanf expression with too many conversions "
 msgstr " Nesprávny výraz, alebo scanf výraz s mnohými zmenami "
 
 msgid " Error in replacement format string. "
 msgstr " Chyba vo formáte nahradzovaného reťazca. "
 
-#, fuzzy
 msgid " Replacement too long. "
-msgstr " Zadajte reťazec pre nahradenie:"
+msgstr " Reťazec pre nahradenie je príliš dlhý."
 
 #, c-format
 msgid " %ld replacements made. "
@@ -249,28 +245,26 @@ msgstr "Skončiť"
 msgid " File was modified, Save with exit? "
 msgstr " Súbor bol zmenený, uložiť a skončiť? "
 
-#, fuzzy
 msgid "&Cancel quit"
-msgstr "Zrušiť ukončenie"
+msgstr "&Zrušiť ukončenie"
 
-#, fuzzy
 msgid " Error "
-msgstr "Chyba"
+msgstr " Chyba"
 
 msgid " This function is not implemented. "
-msgstr ""
+msgstr " Táto funkcia nie je implementovaná. "
 
 msgid " Copy to clipboard "
 msgstr " Kopírovať do schránky "
 
 msgid " Unable to save to file. "
-msgstr " Nemôžem uložiť do súboru. "
+msgstr " Nepodarilo sa uložiť do súboru. "
 
 msgid " Cut to clipboard "
-msgstr " Vystrihnuť do schránky "
+msgstr " Vystrihnúť do schránky "
 
 msgid " Goto line "
-msgstr " Choď na riadok "
+msgstr " Prejsť na riadok "
 
 msgid " Enter line: "
 msgstr " Zadajte riadok: "
@@ -294,8 +288,7 @@ msgid " Run Sort "
 msgstr " Spustiť triedenie "
 
 msgid " Enter sort options (see manpage) separated by whitespace: "
-msgstr ""
-" Zadajte voľby pre triedenie oddelené prázdnym miestom (pozri man stránku): "
+msgstr " Zadajte voľby pre triedenie oddelené prázdnym miestom (pozri man stránku): "
 
 msgid " Sort "
 msgstr " Triediť "
@@ -307,34 +300,31 @@ msgid " Sort returned non-zero: "
 msgstr " Triedenie vrátilo nenulovú hodnotu: "
 
 msgid "Paste output of external command"
-msgstr ""
+msgstr "Vložiť výstup externého príkazu"
 
-#, fuzzy
 msgid "Enter shell command(s):"
-msgstr " Zadajte návestie pre príkaz: "
+msgstr "Zadajte príkaz shellu:"
 
-#, fuzzy
 msgid "External command"
-msgstr "Další príkaz"
+msgstr "Externý príkaz"
 
-#, fuzzy
 msgid "Cannot execute command"
-msgstr " Chyba počas pokusu vykonať príkaz pre triedenie "
+msgstr "Nie je možné vykonať príkaz"
 
 msgid "Error creating script:"
-msgstr "Chyba pri vytvárení skriptu:"
+msgstr "Chyba pri vytváraní skriptu:"
 
 msgid "Error reading script:"
 msgstr "Chyba pri čítaní skriptu:"
 
 msgid "Error closing script:"
-msgstr "Chyba pri zatvárení skriptu:"
+msgstr "Chyba pri zatváraní skriptu:"
 
 msgid "Script created:"
 msgstr "Vytvorený skript:"
 
 msgid "Process block"
-msgstr "Spracovávam blok "
+msgstr "Spracovať blok "
 
 msgid " Mail "
 msgstr " Pošta "
@@ -355,7 +345,7 @@ msgid " Insert Literal "
 msgstr " Vložiť znak "
 
 msgid " Press any key: "
-msgstr " Stlačte nejakú klávesu: "
+msgstr " Stlačte ľubovoľný kláves: "
 
 msgid " Execute Macro "
 msgstr " Spustiť makro "
@@ -372,15 +362,18 @@ msgid ""
 "User: %s\n"
 "Process ID: %d"
 msgstr ""
+"Na súbore \"%s\" už prebiehajú úpravy\n"
+"Používateľ: %s\n"
+"ID procesu: %d"
 
 msgid "File locked"
-msgstr ""
+msgstr "Súbor zamknutý"
 
 msgid "&Grab lock"
-msgstr ""
+msgstr "&Získať zámok"
 
 msgid "&Ignore lock"
-msgstr ""
+msgstr "&Ignorovať zámok"
 
 msgid " About "
 msgstr " O aplikácii "
@@ -399,7 +392,7 @@ msgstr ""
 "\n"
 " Copyright (C) 1996 the Free Software Foundation\n"
 "\n"
-"  Používateľský prístupný textový editor napísaný\n"
+"  Používateľsky prívetivý textový editor napísaný\n"
 "           pre Midnight Commander.\n"
 
 msgid "&Open file..."
@@ -508,10 +501,10 @@ msgid "Sor&t...                 M-t"
 msgstr "&Usporiadať...               M-t"
 
 msgid "Paste o&utput of...      M-u"
-msgstr ""
+msgstr "Vložiť výst&up...      M-u"
 
 msgid "E&xternal Formatter      F19"
-msgstr "Externý &Formátor         F19"
+msgstr "Externý &Formátovač       F19"
 
 msgid "&Mail...                    "
 msgstr "&Pošta...                    "
@@ -520,25 +513,22 @@ msgid "&Execute macro... C-x e, KEY"
 msgstr "&Vykonať makro... C-x e, KEY"
 
 msgid "'ispell' s&pell check    M-$"
-msgstr "'isp&ell' jazyková kontrola  M-$"
+msgstr "kontrola pravopisu 'isp&ell' M-$"
 
 msgid "&General...  "
-msgstr "&Všeobecne...  "
+msgstr "&Všeobecné...  "
 
 msgid "&Save mode..."
-msgstr "&Ukladací mód..."
+msgstr "Režim &Ukladania..."
 
-#, fuzzy
 msgid "Learn &Keys..."
-msgstr "uč&Enie kláves..."
+msgstr "Uč&Enie kláves..."
 
-#, fuzzy
 msgid "Syntax &Highlighting..."
-msgstr "zvýraznenie s&Yntaxe"
+msgstr "Zvýraznenie s&Yntaxe..."
 
-#, fuzzy
 msgid "Save setu&p..."
-msgstr "&Uložiť nastavenie"
+msgstr "&Uložiť nastavenie..."
 
 msgid " File "
 msgstr " Súbor "
@@ -561,9 +551,8 @@ msgstr "Intuitívne"
 msgid "Emacs"
 msgstr "Emacs"
 
-#, fuzzy
 msgid "User-defined"
-msgstr "d&Efinovaný používateľom:"
+msgstr "d&Efinovaný používateľom"
 
 msgid "None"
 msgstr "Žiaden"
@@ -572,13 +561,13 @@ msgid "Dynamic paragraphing"
 msgstr "Dynamické rob. odstavcov"
 
 msgid "Type writer wrap"
-msgstr "Napíšte autora zarovnania"
+msgstr "Zalamovanie písacieho stroja"
 
 msgid "Word wrap line length: "
-msgstr "Zarov. textu podľa dĺžky riadku: "
+msgstr "Zalamovanie od dĺžky riadka: "
 
 msgid "Tab spacing: "
-msgstr "Tabelovať vzdialenosť: "
+msgstr "Rozostupy tabulátora: "
 
 msgid "Synta&x highlighting"
 msgstr "zvýraznenie s&Yntaxe"
@@ -602,7 +591,7 @@ msgid "&Fake half tabs"
 msgstr "&Spraviť polovičný tabulátor"
 
 msgid "Wrap mode"
-msgstr "Zarovnávací mód"
+msgstr "Zalamovanie riadkov"
 
 msgid "Key emulation"
 msgstr "Emulácia kľúča"
@@ -642,7 +631,7 @@ msgid ""
 " Cannot open file %s \n"
 " %s "
 msgstr ""
-" Nemôžem otvoriť súbor %s \n"
+" Nemôžno otvoriť súbor %s \n"
 " %s "
 
 #, c-format
@@ -651,51 +640,51 @@ msgstr " Chyba v súbore %s na riadku %d "
 
 #, c-format
 msgid "bind: Wrong argument number, bind <key> <command>"
-msgstr ""
+msgstr "bind: Nesprávne číslo argumentu, bind <kláv.> <príkaz>"
 
 #, c-format
 msgid "bind: Bad key value `%s'"
-msgstr ""
+msgstr "bind: Zlá hodnota klávesu `%s'"
 
 #, c-format
 msgid "bind: Ehh...no key?"
-msgstr ""
+msgstr "bind: Hmm... žiaden kláves?"
 
 #, c-format
 msgid "bind: Unknown key: `%s'"
-msgstr ""
+msgstr "bind: neznámy kláves: `%s'"
 
-#, fuzzy, c-format
+#, c-format
 msgid "bind: Unknown command: `%s'"
-msgstr " Príkaz zmeny vlastníka "
+msgstr "bind: neznámy príkaz: `%s'"
 
 #, c-format
 msgid "%s: Syntax: %s <n> <command> <label>"
-msgstr ""
+msgstr "%s: Syntax: %s <n> <príkaz> <menovka>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Unknown command: `%s'"
-msgstr " Príkaz zmeny vlastníka "
+msgstr "%s: Neznámy príkaz: `%s'"
 
 #, c-format
 msgid "%s: fn should be 1-10"
-msgstr ""
+msgstr "%s: fn by malo byť 1-10"
 
 #, c-format
 msgid "%s: fopen(): %s"
-msgstr ""
+msgstr "%s: fopen(): %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: unknown command `%s'"
-msgstr " Príkaz zmeny vlastníka "
+msgstr "%s:%d: neznámy príkaz `%s'"
 
 #, c-format
 msgid "%s:%d: %s"
-msgstr ""
+msgstr "%s:%d: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s not found!"
-msgstr "Upozornenie: súbor %s nenájdený\n"
+msgstr "%s nenájdené!"
 
 msgid "&Set"
 msgstr "&Nastaviť"
@@ -713,7 +702,7 @@ msgid "group"
 msgstr "skupina"
 
 msgid "other"
-msgstr "iný"
+msgstr "ostatní"
 
 msgid "On"
 msgstr "na"
@@ -722,11 +711,11 @@ msgid "Flag"
 msgstr "Označ"
 
 msgid "Mode"
-msgstr "Mód"
+msgstr "Režim"
 
 #, c-format
 msgid "%6d of %d"
-msgstr "%6d of %d"
+msgstr "%6d z %d"
 
 msgid " Chown advanced command "
 msgstr " Rozšírená zmena vlastníka "
@@ -736,7 +725,7 @@ msgid ""
 " Cannot chmod \"%s\" \n"
 " %s "
 msgstr ""
-" Nemohol som zmeniť práva \"%s\" \n"
+" Nepodarilo sa zmeniť práva \"%s\" \n"
 " %s "
 
 #, c-format
@@ -744,7 +733,7 @@ msgid ""
 " Cannot chown \"%s\" \n"
 " %s "
 msgstr ""
-" Nemohol som zmeniť vlastníka \"%s\" \n"
+" Nepodarilo sa zmeniť vlastníka \"%s\" \n"
 " %s "
 
 msgid " Background process error "
@@ -779,7 +768,7 @@ msgid "&User defined:"
 msgstr "d&Efinovaný používateľom:"
 
 msgid "Listing mode"
-msgstr "Módy výpisu"
+msgstr "Režim výpisu"
 
 msgid "user &Mini status"
 msgstr "používateľský &Mini stav"
@@ -793,9 +782,8 @@ msgstr "&Citlivý na veľkosť"
 msgid "Sort order"
 msgstr "Poradie triedenia"
 
-#, fuzzy
 msgid " confirm di&Rectory hotlist delete "
-msgstr "&Adresárový hotlist      C-\\"
+msgstr " potvrdiť zmazanie hotlistu ad&Resára "
 
 msgid " confirm &Exit "
 msgstr " potvrdiť &Koniec "
@@ -836,9 +824,8 @@ msgstr "Vstupná/Zobrazovacia znaková sada:"
 msgid "&Select"
 msgstr "&Vybrať"
 
-#, fuzzy
 msgid "Use passive mode over pro&xy"
-msgstr "Použiť &pasívny režim"
+msgstr "Použiť pasívny režim pri pro&xy"
 
 msgid "Use &passive mode"
 msgstr "Použiť &pasívny režim"
@@ -916,7 +903,7 @@ msgstr "Upozornenie: súbor %s nenájdený\n"
 
 #, c-format
 msgid "Cannot translate from %s to %s"
-msgstr "Nemôžem preložiť z %s do %s"
+msgstr "Nepodarilo sa preložiť z %s do %s"
 
 msgid "execute/search by others"
 msgstr "vykonávaný/hľadaný ostat."
@@ -1144,7 +1131,7 @@ msgstr " Upraviť symb. odkaz "
 
 #, c-format
 msgid " edit symlink, unable to remove %s: %s "
-msgstr " upraviť symb.odkaz, nemôžem odstrániť %s: %s "
+msgstr " upraviť symb.odkaz, nepodarilo sa odstrániť %s: %s "
 
 #, c-format
 msgid " edit symlink: %s "
@@ -1186,16 +1173,16 @@ msgstr ""
 msgid " Setup "
 msgstr " Nastavenie "
 
-#, fuzzy, c-format
+#, c-format
 msgid " Setup saved to ~/%s"
-msgstr " Nastavenie bolo uložené do ~/"
+msgstr " Nastavenie bolo uložené do ~/%s"
 
 #, c-format
 msgid ""
 " Cannot chdir to \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem zmeniť adresár na \"%s\" \n"
+" Nepodarilo sa zmeniť adresár na \"%s\" \n"
 " %s "
 
 msgid " Cannot execute commands on non-local filesystems"
@@ -1233,7 +1220,7 @@ msgstr "Nepodarilo sa načítať obsah adresára"
 
 #, c-format
 msgid "Press any key to continue..."
-msgstr "Stlačte nejakú klávesu pre pokračovanie..."
+msgstr "Pokračujte stlačením ľubovoľného klávesu..."
 
 #, c-format
 msgid "Type `exit' to return to the Midnight Commander"
@@ -1241,7 +1228,7 @@ msgstr "Napíšte `exit' ak sa chcete vrátiť do Midnight Commandera"
 
 #, c-format
 msgid " Cannot fetch a local copy of %s "
-msgstr " Nemôžem získať miestnu kópiu %s "
+msgstr " Nepodarilo sa získať miestnu kópiu %s "
 
 #, c-format
 msgid ""
@@ -1254,31 +1241,21 @@ msgstr ""
 msgid " Parameter "
 msgstr " Parameter "
 
-#, fuzzy, c-format
+#, c-format
 msgid " %s%s file error"
-msgstr " chyba v súbore "
-
-#, fuzzy, c-format
-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."
-msgstr ""
-"Súbor mc.ext bol zmenený vo verzii 3.0.\n"
-"Vyzerá to, že inštalácia zlyhala. Prosím, \n"
-"použite novú kópiu balíka Midnight\n"
-"Commander."
-
-#, fuzzy, c-format
-msgid " ~/%s file error "
-msgstr " chyba v súbore "
+msgstr " %s%s chyba v súbore"
 
 #, c-format
-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."
-msgstr ""
+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."
+msgstr "Formát súboru %smc.ext sa vo verzii 3.0 zmenil. Vyzerá to, že inštalácia zlyhala. Prosím, vezmite si novú kópiu z balíka Midnight Commander."
+
+#, c-format
+msgid " ~/%s file error "
+msgstr " ~/%s chyba v súbore "
+
+#, c-format
+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."
+msgstr "Formát súboru ~/%s sa vo verzii 3.0 zmenil. Buď si ho skopírujte z %smc.ext alebo ho použite ako vzor."
 
 msgid " Copy "
 msgstr " Kopírovať "
@@ -1293,14 +1270,14 @@ msgid " Invalid target mask "
 msgstr " Neplatná maska cieľa "
 
 msgid " Cannot make the hardlink "
-msgstr " Nemohol som vyrobiť hard odkaz "
+msgstr " Nepodarilo sa vytvoriť pevný odkaz "
 
 #, c-format
 msgid ""
 " Cannot read source link \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem prečítať zdrojový odkaz \"%s\" \n"
+" Nepodarilo sa prečítať zdrojový odkaz \"%s\" \n"
 " %s "
 
 msgid ""
@@ -1308,7 +1285,7 @@ msgid ""
 "\n"
 " Option Stable Symlinks will be disabled "
 msgstr ""
-" Nemôžem vyrobiť pevný symb. odkaz naprieč nelokálnymi súb. systémami: \n"
+" Nepodarilo sa vyrobiť pevný symb. odkaz naprieč nelokálnymi súb. systémami: \n"
 "\n"
 " Voľba stáleho Symbolického odkazu bude vypnutá "
 
@@ -1317,7 +1294,7 @@ msgid ""
 " Cannot create target symlink \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem vytvoriť cieľový symbolický odkaz \"%s\" \n"
+" Nepodarilo sa vytvoriť cieľový symbolický odkaz \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1325,7 +1302,7 @@ msgid ""
 " Cannot overwrite directory \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem prepísať adresár \"%s\" \n"
+" Nepodarilo sa prepísať adresár \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1333,7 +1310,7 @@ msgid ""
 " Cannot stat source file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem určiť zdrojový súbor \"%s\" \n"
+" Nepodarilo sa zistiť stav zdrojový súbor \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1345,7 +1322,7 @@ msgid ""
 " Cannot create special file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem vytvoriť špeciálny súbor \"%s\" \n"
+" Nepodarilo sa vytvoriť špeciálny súbor \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1353,7 +1330,7 @@ msgid ""
 " Cannot chown target file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem zmeniť vlastníka cieľového súboru \"%s\" \n"
+" Nepodarilo sa zmeniť vlastníka cieľového súboru \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1361,7 +1338,7 @@ msgid ""
 " Cannot chmod target file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem zmeniť práva pre cieľový súbor \"%s\" \n"
+" Nepodarilo sa zmeniť práva cieľového súboru \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1369,18 +1346,18 @@ msgid ""
 " Cannot open source file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem otvoriť zdrojový súbor \"%s\" \n"
+" Nepodarilo sa otvoriť zdrojový súbor \"%s\" \n"
 " %s "
 
 msgid " Reget failed, about to overwrite file "
-msgstr " Reget zlyhal pri prepísavaní súboru "
+msgstr " Reget zlyhal, chystá sa prepísanie súboru"
 
 #, c-format
 msgid ""
 " Cannot fstat source file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem vykonať fstat na zdrojový súbor \"%s\" \n"
+" Nepodarilo sa vykonať fstat zdrojového súboru \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1388,7 +1365,7 @@ msgid ""
 " Cannot create target file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem vytvoriť cieľový súbor \"%s\" \n"
+" Nepodarilo sa vytvoriť cieľový súbor \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1396,7 +1373,7 @@ msgid ""
 " Cannot fstat target file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem vykonať fstat na cieľový súbor \"%s\" \n"
+" Nepodarilo sa vykonať fstat cieľového súboru \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1404,7 +1381,7 @@ msgid ""
 " Cannot read source file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem prečítať zdrojový súbor \"%s\" \n"
+" Nepodarilo sa prečítať zdrojový súbor \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1412,7 +1389,7 @@ msgid ""
 " Cannot write target file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem zapísať do cieľového súbor \"%s\" \n"
+" Nepodarilo sa zapísať do cieľového súboru \"%s\" \n"
 " %s "
 
 msgid "(stalled)"
@@ -1423,7 +1400,7 @@ msgid ""
 " Cannot close source file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem zavrieť zdrojový súbor \"%s\" \n"
+" Nepodarilo sa zavrieť zdrojový súbor \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1431,11 +1408,11 @@ msgid ""
 " Cannot close target file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem zavrieť cieľový súbor \"%s\" \n"
+" Nepodarilo sa zavrieť cieľový súbor \"%s\" \n"
 " %s "
 
 msgid "Incomplete file was retrieved. Keep it?"
-msgstr "Bol vyvolaný neúplný súbor.Ponechať si ho?"
+msgstr "Bol získaný neúplný súbor. Ponechať ho?"
 
 msgid "&Delete"
 msgstr "&Zmazať"
@@ -1448,7 +1425,7 @@ msgid ""
 " Cannot stat source directory \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem určiť zdrojový adresár \"%s\" \n"
+" Nepodarilo sa zistiť stav zdrojového adresára \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1464,7 +1441,7 @@ msgid ""
 " Cannot copy cyclic symbolic link \n"
 " `%s' "
 msgstr ""
-" Nemôžem kopírovať cyklický symbolický odkaz \n"
+" Nepodarilo sa kopírovať cyklický symbolický odkaz \n"
 " `%s' "
 
 #, c-format
@@ -1480,7 +1457,7 @@ msgid ""
 " Cannot create target directory \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem vytvoriť cieľový adresár \"%s\" \n"
+" Nepodarilo sa vytvoriť cieľový adresár \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1488,7 +1465,7 @@ msgid ""
 " Cannot chown target directory \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem zmeniť vlastníka cieľového adresára \"%s\" \n"
+" Nepodarilo sa zmeniť vlastníka cieľového adresára \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1496,19 +1473,19 @@ msgid ""
 " Cannot stat file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem určiť súbor \"%s\" \n"
+" Nepodarilo sa zistiť stav súboru \"%s\" \n"
 " %s "
 
 #, c-format
 msgid " Cannot overwrite directory `%s' "
-msgstr " Nemôžem prepísať adresár `%s' "
+msgstr " Nepodarilo sa prepísať adresár `%s' "
 
 #, c-format
 msgid ""
 " Cannot move file \"%s\" to \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem presunúť súbor \"%s\" do \"%s\" \n"
+" Nepodarilo sa presunúť súbor \"%s\" do \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1516,7 +1493,7 @@ msgid ""
 " Cannot remove file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem odstrániť súbor \"%s\" \n"
+" Nepodarilo sa odstrániť súbor \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1525,18 +1502,18 @@ msgstr " `%s' a `%s' sú ten istý adresár "
 
 #, c-format
 msgid " Cannot overwrite directory \"%s\" %s "
-msgstr " Nemôžem prepísať adresár \"%s\" %s "
+msgstr " Nepodarilo sa prepísať adresár \"%s\" %s "
 
 #, c-format
 msgid " Cannot overwrite file \"%s\" %s "
-msgstr " Nemôžem prepísať súbor \"%s\" %s "
+msgstr " Nepodarilo sa prepísať súbor \"%s\" %s "
 
 #, c-format
 msgid ""
 " Cannot move directory \"%s\" to \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem presunúť adresár \"%s\" do \"%s\" \n"
+" Nepodarilo sa presunúť adresár \"%s\" do \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1544,7 +1521,7 @@ msgid ""
 " Cannot delete file \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem zmazať súbor \"%s\" \n"
+" Nepodarilo sa zmazať súbor \"%s\" \n"
 " %s "
 
 #, c-format
@@ -1552,7 +1529,7 @@ msgid ""
 " Cannot remove directory \"%s\" \n"
 " %s "
 msgstr ""
-" Nemôžem odstrániť adresár \"%s\" \n"
+" Nepodarilo sa odstrániť adresár \"%s\" \n"
 " %s "
 
 msgid "1Copy"
@@ -1594,10 +1571,10 @@ msgid " to:"
 msgstr " na:"
 
 msgid " Cannot operate on \"..\"! "
-msgstr " Nemôžem pracovať na \"..\"! "
+msgstr " Nie je možné pracovať na \"..\"! "
 
 msgid " Sorry, I could not put the job in background "
-msgstr " Ľutujem, ale nemohol som uložiť úlohu do pozadia "
+msgstr " Bohužiaľ, nebolo možné presunúť úlohu do pozadia "
 
 msgid "&Retry"
 msgstr "&Zopakovať"
@@ -1652,7 +1629,7 @@ msgid "Count"
 msgstr "Počet"
 
 msgid "Bytes"
-msgstr "Bytov"
+msgstr "Bajtov"
 
 msgid "Source"
 msgstr "Zdroj"
@@ -1685,19 +1662,19 @@ msgstr "&Pridať"
 msgid "Overwrite this target?"
 msgstr "Prepísať tento cieľ?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Target date: %s, size %llu"
 msgstr "Dátum cieľa: %s, veľkosť %llu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Source date: %s, size %llu"
 msgstr "Dátum zdroja: %s, veľkosť %llu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Target date: %s, size %u"
 msgstr "Dátum cieľa: %s, veľkosť %u"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Source date: %s, size %u"
 msgstr "Dátum zdroja: %s, veľkosť %u"
 
@@ -1761,7 +1738,7 @@ msgid "&Edit - F4"
 msgstr "&Editácia - F4"
 
 msgid "&Find recursively"
-msgstr ""
+msgstr "&Hľadať rekurzívne"
 
 msgid "Start at:"
 msgstr "Začať na:"
@@ -1800,7 +1777,7 @@ msgstr " Vnútorná chyba: Dvojité spustenie pripojenej oblasti "
 
 #, c-format
 msgid " Cannot find node %s in help file "
-msgstr " Nemôžem nájsť uzol %s v súbore pomocníka "
+msgstr " Nepodarilo sa nájsť uzol %s v súbore pomocníka "
 
 msgid "Index"
 msgstr "Index"
@@ -1832,9 +1809,8 @@ msgstr "&Hore"
 msgid "&Add current"
 msgstr "&Pridať aktuálny"
 
-#, fuzzy
 msgid "&Refresh"
-msgstr "o&Brátený"
+msgstr "&Obnoviť"
 
 msgid "Fr&ee VFSs now"
 msgstr "&Uvoľniť VFS teraz"
@@ -1874,7 +1850,7 @@ msgid " New hotlist group "
 msgstr " Nová hotlist skupina "
 
 msgid "Name of new group"
-msgstr "Meno novej skupiny"
+msgstr "Názov novej skupiny"
 
 #, c-format
 msgid "Label for \"%s\":"
@@ -1890,6 +1866,8 @@ msgid ""
 "\n"
 " Are you sure you want to remove this entry?"
 msgstr ""
+"\n"
+" Ste si istý, že chcete odstrániť túto položku?"
 
 msgid ""
 "\n"
@@ -1906,10 +1884,9 @@ msgstr " Skupina vrchného stupňa "
 msgid " Hotlist Load "
 msgstr " Nahrať Hotlistu "
 
-#, fuzzy, c-format
-msgid ""
-"MC was unable to write ~/%s file, your old hotlist entries were not deleted"
-msgstr " súbor, váš starý hotlist vstupov nebol zmazaný"
+#, c-format
+msgid "MC was unable to write ~/%s file, your old hotlist entries were not deleted"
+msgstr "MC nedokázal zapísať súbor ~/%s, vaše staré položky hotlistu neboli zmazané"
 
 #, c-format
 msgid "Midnight Commander %s"
@@ -1957,23 +1934,24 @@ msgid "Modified:  %s"
 msgstr "Zmenený:  %s"
 
 #. TRANSLATORS: "Status changed", like in the stat(2) man page
-#, fuzzy, c-format
+#, c-format
 msgid "Status:    %s"
-msgstr "Vytvorený:   %s"
+msgstr "Stav:      %s"
 
 #, c-format
 msgid "Dev. type: major %lu, minor %lu"
-msgstr ""
+msgstr "Typ zariad.: major %lu, minor %lu"
 
 #, c-format
 msgid "Size:      %s"
 msgstr "Veľkosť:     %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid " (%ld block)"
 msgid_plural " (%ld blocks)"
-msgstr[0] " (%ld blok)"
-msgstr[1] " (%ld blok)"
+msgstr[0] " (%ld block)"
+msgstr[1] " (%ld blocks)"
+msgstr[2] " (%ld blokov)"
 
 #, c-format
 msgid "Owner:     %s/%s"
@@ -1985,7 +1963,7 @@ msgstr "Odkazy:    %d"
 
 #, c-format
 msgid "Mode:      %s (%04o)"
-msgstr "Mód:      %s (%04o)"
+msgstr "Režim:    %s (%04o)"
 
 #, c-format
 msgid "Location:  %Xh:%Xh"
@@ -2069,7 +2047,7 @@ msgstr ""
 "a taktiež počkajte."
 
 msgid " Cannot accept this key "
-msgstr " Nemôžem akceptovať túto klávesu "
+msgstr " Nepodarilo sa akceptovať tento kláves "
 
 #, c-format
 msgid " You have entered \"%s\""
@@ -2103,7 +2081,7 @@ msgid "which keys are not marked with OK.  Press space on the missing"
 msgstr "nie sú označené s Áno. Stlačte medzeru pre vynechanie klávesy,"
 
 msgid "key, or click with the mouse to define it. Move around with Tab."
-msgstr "alebo kliknite myškou pre jeho definovanie. Pohybujte sa s Tab."
+msgstr "alebo kliknite myšou pre jeho definovanie. Pohybujte sa pomocou Tab."
 
 msgid ""
 " The Commander can't change to the directory that \n"
@@ -2113,8 +2091,8 @@ msgid ""
 msgstr ""
 " Commander nemôže modifikovať tento adresár, \n"
 " kedže subshell tvrdí, že ste v ňom.  Možno ste \n"
-" zmazali váš pracovný adresár alebo ste zadali vaše \n"
-" špeciálne práva pre prístup s príkazom \"su\"? "
+" zmazali svoj pracovný adresár alebo ste si udelili \n"
+" špeciálne prístupové práva príkazom \"su\"? "
 
 msgid " The Midnight Commander "
 msgstr " Midnight Commander "
@@ -2123,16 +2101,16 @@ msgid " Do you really want to quit the Midnight Commander? "
 msgstr " Naozaj chcete ukončiť Midnight Commander? "
 
 msgid "&Listing mode..."
-msgstr "&Forma výpisu..."
+msgstr "&Režim výpisu..."
 
 msgid "&Quick view     C-x q"
-msgstr "&Rýchly pohľad  C-x q"
+msgstr "&Rýchle zobrazenie  C-x q"
 
 msgid "&Info           C-x i"
 msgstr "&Informácie     C-x i"
 
 msgid "&Sort order..."
-msgstr "&Usporiadať poradie..."
+msgstr "&Poradie výpisu..."
 
 msgid "&Filter..."
 msgstr "fi&Lter..."
@@ -2316,8 +2294,8 @@ msgid ""
 msgstr ""
 " Použitie nastavenia rýchleho načítania nemusí presne   \n"
 " odrážať obsah adresára. V týchto prípadoch budete      \n"
-" musieť znovu načítať adresár manuálne. Pre podrobnosti \n"
-" si pozrite manuálovú stránku.                          "
+" musieť znovu načítať adresár manuálne. Podrobnosti \n"
+" nájdete v manuálovej stránke.                          "
 
 msgid "Menu"
 msgstr "Menu"
@@ -2336,7 +2314,7 @@ msgid "+number"
 msgstr "+číslo"
 
 msgid "Set initial line number for the internal editor"
-msgstr "Nastaviť počiatočné číslo riadku pre interný editor"
+msgstr "Nastaviť počiatočné číslo riadka pre interný editor"
 
 msgid ""
 "\n"
@@ -2347,7 +2325,6 @@ msgstr ""
 "Správy o chybách posielajte (vrátane výpisu `mc -V')\n"
 "na adresu mc-devel@gnome.org\n"
 
-#, fuzzy
 msgid ""
 "--colors KEYWORD={FORE},{BACK}\n"
 "\n"
@@ -2361,8 +2338,7 @@ msgid ""
 "   Menus:        menu, menuhot, menusel, menuhotsel\n"
 "   Editor:       editnormal, editbold, editmarked\n"
 "   Help:         helpnormal, helpitalic, helpbold, helplink, helpslink\n"
-"   File types:   directory, executable, link, stalelink, device, special, "
-"core\n"
+"   File types:   directory, executable, link, stalelink, device, special, core\n"
 "\n"
 "Colors:\n"
 "   black, gray, red, brightred, green, brightgreen, brown,\n"
@@ -2374,56 +2350,57 @@ msgstr ""
 "\n"
 "{FORE} a {BACK} je možné vynechať a bude použitá štandardná hodnota\n"
 "\n"
-"Kľúče:\n"
-"   Globálne:          errors, reverse, gauge, input\n"
+"Kľúčové slová:\n"
+"   Globálne:          errors, reverse, gauge, input, viewunderline\n"
 "   Zobrazenie súboru: normal, selected, marked, markselect\n"
-"   Dialógy:           dnormal, dfocus, dhotnormal, dhotfocus\n"
+"   Dialógy:           dnormal, dfocus, dhotnormal, dhotfocus,\n"
+"                 errdhotnormal, errdhotfocus\n"
 "   Menu:              menu, menuhot, menusel, menuhotsel\n"
-"   Pomocník:          helpnormal, helpitalic, helplink, helpslink\n"
-"   Typy súborov:      directory, executable, link, stalelink, device, "
-"special, core\n"
+"   Editor:       editnormal, editbold, editmarked\n"
+"   Pomocník:          helpnormal, helpitalic, helpbold, helplink, helpslink\n"
+"   Typy súborov:      directory, executable, link, stalelink, device, special, core\n"
 "\n"
 "Farby:\n"
 "   black, gray, red, brightred, green, brightgreen, brown,\n"
 "   yellow, blue, brightblue, magenta, brightmagenta, cyan,\n"
-"   brightcyan, lightgray and white\n"
+"   brightcyan, lightgray a white\n"
 "\n"
 
 msgid "Displays this help message"
-msgstr "Zobraziť tento pomocný odkaz"
+msgstr "Zobrazí tento pomocný odkaz"
 
 msgid "Displays the current version"
-msgstr "Ukázať aktuálnu verziu"
+msgstr "Zobrazí aktuálnu verziu"
 
 msgid "Forces xterm features"
-msgstr "Vnucuje xterm funkcie"
+msgstr "Vynúti funkcie xterm"
 
 msgid "Disable mouse support in text version"
-msgstr "Vypínam podporu pre myš v textovej verzii"
+msgstr "Vypína podporu myši v textovej verzii"
 
 msgid "Tries to use termcap instead of terminfo"
-msgstr "Skúšam použiť termcap namiesto terminfo"
+msgstr "Pokúsi sa použiť termcap namiesto terminfo"
 
 msgid "Resets soft keys on HP terminals"
-msgstr "Klávesy pre mäkký reset na HP termináloch"
+msgstr "Resetuje mäkké klávesy na termináloch HP"
 
 msgid "To run on slow terminals"
 msgstr "Na spúšťanie na pomalých termináloch"
 
 msgid "Use stickchars to draw"
-msgstr "Použiť čiarovú grafiku pre kreslenie"
+msgstr "Použiť na kreslenie čiarovú grafiku"
 
 msgid "Requests to run in black and white"
-msgstr "Požiadavka na čiernobiele spustenie"
+msgstr "Požiadať o spustenie v čiernobielom režime"
 
 msgid "Request to run in color mode"
-msgstr "Požiadavka pre spustenie vo farebnom móde"
+msgstr "Požiadať o spustenie vo farebnom režime"
 
 msgid "Specifies a color configuration"
-msgstr "Špecifikujte farebnú konfiguráciu"
+msgstr "Určuje farebnú konfiguráciu"
 
 msgid "Displays a help screen on how to change the color scheme"
-msgstr "Zobraziť pomocnú obrazovku, ako zmeniť farebnú schému"
+msgstr "Zobrazí pomocníka o tom ako zmeniť farebnú schému"
 
 msgid "Log ftp dialog to specified file"
 msgstr "Prihlasovacie ftp okno k určenému súboru"
@@ -2441,13 +2418,13 @@ msgid "Enables subshell support (default)"
 msgstr "Zapnutá podpora pre subshell (štandardne)"
 
 msgid "Disables subshell support"
-msgstr "Vypínam podporu pre subshell"
+msgstr "Vypína podporu pre subshell"
 
 msgid "Launches the file viewer on a file"
-msgstr "Spúšťam prehliadač súborov pre súbor"
+msgstr "Spúšťa prehliadač súborov na súbore"
 
 msgid "Edits one file"
-msgstr "Upravujte jeden súbor"
+msgstr "Upraví jeden súbor"
 
 msgid "safe de&Lete"
 msgstr "bezpečn&É mazanie"
@@ -2462,16 +2439,16 @@ msgid "rotatin&G dash"
 msgstr "To&Čiaca sa palička"
 
 msgid "co&Mplete: show all"
-msgstr "ukončené: uk&Ázať všetko"
+msgstr "ukončené: &Zobraziť všetko"
 
 msgid "&Use internal view"
-msgstr "&Použiť intený prehliadač"
+msgstr "po&Užiť vstavaný prehliadač"
 
 msgid "use internal ed&It"
-msgstr "použiť intený edito&R"
+msgstr "použiť vstavaný ed&Itor"
 
 msgid "auto m&Enus"
-msgstr "Automati&Cké ponuky"
+msgstr "Automatické m&Enu"
 
 msgid "&Auto save setup"
 msgstr "&Autom. ukladanie nastav."
@@ -2480,10 +2457,10 @@ msgid "shell &Patterns"
 msgstr "shel&L vzorov"
 
 msgid "Compute &Totals"
-msgstr "v&Ypočítať súčty"
+msgstr "vypočí&Tať súčty"
 
 msgid "&Verbose operation"
-msgstr "&Mnohoslovná operácia"
+msgstr "&Výrečná prevádzka"
 
 msgid "&Fast dir reload"
 msgstr "rýc&Hle načítanie adresára"
@@ -2540,7 +2517,7 @@ msgid " Enter command label: "
 msgstr " Zadajte návestie pre príkaz: "
 
 msgid " Cannot run external panelize in a non-local directory "
-msgstr " Nemôžem spustiť externé vytvorenie panelov v nelokálnom adresári "
+msgstr " Nepodarilo sa spustiť externé vytvorenie panelov v nelokálnom adresári "
 
 msgid "Find rejects after patching"
 msgstr "Nájsť súbory po oprave"
@@ -2552,7 +2529,7 @@ msgid "Find SUID and SGID programs"
 msgstr "Nájsť SUID a SGID programy"
 
 msgid "Cannot invoke command."
-msgstr "Nemôžem vyvolať príkaz."
+msgstr "Nepodarilo sa vyvolať príkaz."
 
 msgid "Pipe close failed"
 msgstr "Pipe, neúspešné uzavretie"
@@ -2580,7 +2557,7 @@ msgid "Usage:"
 msgstr "Použitie:"
 
 msgid "[dev]"
-msgstr ""
+msgstr "[dev]"
 
 msgid "UP--DIR"
 msgstr "UP--DIR"
@@ -2627,17 +2604,19 @@ msgstr "Vlastník"
 msgid "Group"
 msgstr "Skupina"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
-msgstr[0] "%s bytov"
-msgstr[1] "%s bytov"
+msgstr[0] "%s bajt"
+msgstr[1] "%s bajty"
+msgstr[2] "%s bajtov"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s in %d file"
 msgid_plural "%s in %d files"
-msgstr[0] "%s bytov v %d súbore"
-msgstr[1] "%s bytov v %d súbore"
+msgstr[0] "%s bajt v %d súboroch"
+msgstr[1] "%s bajty v %d súboroch"
+msgstr[2] "%s bajtov v %d súboroch"
 
 msgid "<readlink failed>"
 msgstr "<čítanie odkazu zlyhalo>"
@@ -2691,6 +2670,9 @@ msgid ""
 "running on this terminal.\n"
 "Subshell support will be disabled."
 msgstr ""
+"GNU Midnight Commander už na tomto\n"
+"termináli beží.\n"
+"Podpora subshell bude vypnutá."
 
 #, c-format
 msgid "Cannot open named pipe %s\n"
@@ -2754,12 +2736,12 @@ msgid ""
 "Cannot open the %s file for writing:\n"
 "%s\n"
 msgstr ""
-"Nemôžem otvoriť súbor %s pre zápis:\n"
+"Nepodarilo sa otvoriť súbor %s pre zápis:\n"
 "%s\n"
 
 #, c-format
 msgid "Copy \"%s\" directory to:"
-msgstr "Kopírujem \"%s\" adresár do:"
+msgstr "Kopíruje sa adresár \"%s\" do:"
 
 #, c-format
 msgid "Move \"%s\" directory to:"
@@ -2770,7 +2752,7 @@ msgid ""
 " Cannot stat the destination \n"
 " %s "
 msgstr ""
-" Nemôžem určiť cieľ \n"
+" Nepodarilo sa určiť cieľ \n"
 " %s "
 
 #, c-format
@@ -2797,7 +2779,7 @@ msgid ""
 "Cannot write to the %s file:\n"
 "%s\n"
 msgstr ""
-"Nemôžem zapísať do súboru %s:\n"
+"Nepodarilo sa zapísať do súboru %s:\n"
 "%s\n"
 
 msgid " Format error on file Extensions File "
@@ -2824,19 +2806,19 @@ msgid " False: "
 msgstr " Nepravda: "
 
 msgid " Warning -- ignoring file "
-msgstr " Upozornenie -- ignorujem súbor "
+msgstr " Upozornenie -- ignoruje sa súbor "
 
 #, c-format
 msgid ""
 "File %s is not owned by root or you or is world writable.\n"
 "Using it may compromise your security"
 msgstr ""
-"Súbor %s nieje vlast. rootom, vami, alebo nie je voľne zapisovateľný.\n"
-"Použitie môže kompromitovať vašu bezpečnosť"
+"Súbor %s nevlastní root ani vy alebo nie je zapisovateľný pre ostatných.\n"
+"Ak ho použijete, môže to kompromitovať vašu bezpečnosť"
 
 #, c-format
 msgid " No suitable entries found in %s "
-msgstr " Nenájdené žiadne odpovedajúce položky v %s "
+msgstr " Nenájdené žiadne zodpovedajúce položky v %s "
 
 msgid " User menu "
 msgstr " Používateľské menu "
@@ -2848,7 +2830,7 @@ msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
 msgid "(invalid)"
-msgstr ""
+msgstr "(neplatné)"
 
 #, c-format
 msgid "%s is not a directory\n"
@@ -2856,15 +2838,15 @@ msgstr "%s nie je adresár\n"
 
 #, c-format
 msgid "Directory %s is not owned by you\n"
-msgstr "Adresár %s nie je vlastnený vami\n"
+msgstr "Nevlastníte adresár %s\n"
 
 #, c-format
 msgid "Cannot set correct permissions for directory %s\n"
-msgstr "Nemôžem nastaviť správne prístupové práva pre adresár %s\n"
+msgstr "Nepodarilo sa nastaviť správne prístupové práva pre adresár %s\n"
 
 #, c-format
 msgid "Cannot create temporary directory %s: %s\n"
-msgstr "Nemôžem vytvoriť dočasný adresár %s: %s\n"
+msgstr "Nepodarilo sa vytvoriť dočasný adresár %s: %s\n"
 
 #, c-format
 msgid "Temporary files will be created in %s\n"
@@ -2880,9 +2862,8 @@ msgstr " Zlyhanie pipe "
 msgid " Dup failed "
 msgstr " Zlyhanie dup "
 
-#, fuzzy
 msgid " Cannot spawn child process "
-msgstr " Nemôžem spustiť program potomka procesu "
+msgstr " Nepodarilo sa spustiť proces potomka "
 
 msgid "Empty output from child filter"
 msgstr "Prázdny výstup z filtra potomka"
@@ -2892,7 +2873,7 @@ msgid ""
 " Cannot open \"%s\"\n"
 " %s "
 msgstr ""
-" Nemôžem otvoriť \"%s\"\n"
+" Nepodarilo sa otvoriť \"%s\"\n"
 " %s "
 
 #, c-format
@@ -2900,11 +2881,11 @@ msgid ""
 " Cannot stat \"%s\"\n"
 " %s "
 msgstr ""
-" Nemôžem určiť \"%s\"\n"
+" Nepodrilo sa zistiť stav \"%s\"\n"
 " %s "
 
 msgid " Cannot view: not a regular file "
-msgstr " Nemôžem nahliadnuť: toto nie je normálny súbor "
+msgstr " Nepodarilo sa zobraziť: toto nie je normálny súbor "
 
 #, c-format
 msgid "File: %s"
@@ -2916,15 +2897,15 @@ msgstr "Offset 0x%08lx"
 
 #, c-format
 msgid "Line %lu Col %lu"
-msgstr ""
+msgstr "Riad. %lu Stĺ. %lu"
 
 #, c-format
 msgid "%s bytes"
-msgstr "%s bytov"
+msgstr "%s bajtov"
 
-#, fuzzy, c-format
+#, c-format
 msgid ">= %s bytes"
-msgstr "%s bytov"
+msgstr ">= %s bajtov"
 
 #, c-format
 msgid ""
@@ -2932,12 +2913,17 @@ msgid ""
 " %s \n"
 " Data may have been written or not. "
 msgstr ""
+" Chyba pri zatváraní súboru: \n"
+" %s \n"
+" Údaje nemuseli byť zapísané. "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 " Cannot save file: \n"
 " %s "
-msgstr " Chyba počas ukladania súboru. "
+msgstr ""
+" Nebolo možné uložiť súbor: \n"
+" %s "
 
 msgid "Invalid hex search expression"
 msgstr "Neplatný hexadecimány vyhľadávací výraz"
@@ -2950,8 +2936,8 @@ msgid ""
 " The current line number is %d.\n"
 " Enter the new line number:"
 msgstr ""
-" Aktuálne číslo riadku je %d.\n"
-" Zadajte nové číslo riadku:"
+" Aktuálne číslo riadka je %d.\n"
+" Zadajte nové číslo riadka:"
 
 #, c-format
 msgid ""
@@ -2962,68 +2948,67 @@ msgstr ""
 " Zadajte novú adresu:"
 
 msgid " Goto Address "
-msgstr " Choď na Adresu "
+msgstr " Ísť na adresu "
 
-#, fuzzy
 msgid " Invalid address "
-msgstr " Neplatné heslo "
+msgstr " Neplatná adresa"
 
 msgid " Enter regexp:"
 msgstr " Zadajte regexp:"
 
 msgid "ButtonBar|Help"
-msgstr ""
+msgstr "ButtonBar|Pomoc"
 
 msgid "ButtonBar|Quit"
-msgstr ""
+msgstr "ButtonBar|Ukončiť"
 
 msgid "ButtonBar|Ascii"
-msgstr ""
+msgstr "ButtonBar|Ascii"
 
 msgid "ButtonBar|Hex"
-msgstr ""
+msgstr "ButtonBar|Hex"
 
 msgid "ButtonBar|Goto"
-msgstr ""
+msgstr "ButtonBar|ÍsťNa"
 
 msgid "ButtonBar|Line"
-msgstr ""
+msgstr "ButtonBar|Riadok"
 
 msgid "ButtonBar|View"
-msgstr ""
+msgstr "ButtonBar|Zobraz"
 
 msgid "ButtonBar|Edit"
-msgstr ""
+msgstr "ButtonBar|Upravi"
 
 msgid "ButtonBar|Save"
-msgstr ""
+msgstr "ButtonBar|Uložiť"
 
 msgid "ButtonBar|UnWrap"
-msgstr ""
+msgstr "ButtonBar|Nezal."
 
 msgid "ButtonBar|Wrap"
-msgstr ""
+msgstr "ButtonBar|Zalam"
 
 msgid "ButtonBar|RxSrch"
-msgstr ""
+msgstr "ButtonBar|RegHľ"
 
 msgid "ButtonBar|HxSrch"
-msgstr ""
+msgstr "ButtonBar|HexHľ"
 
 msgid "ButtonBar|Search"
-msgstr ""
+msgstr "ButtonBar|Hľad"
 
 msgid "ButtonBar|Raw"
-msgstr ""
+msgstr "ButtonBar|Nespr"
 
 msgid "ButtonBar|Parse"
-msgstr ""
+msgstr "ButtonBar|Analy"
 
 msgid "ButtonBar|Unform"
-msgstr ""
+msgstr "ButtonBar|Neform"
 
 msgid "ButtonBar|Format"
-msgstr ""
+msgstr "ButtonBar|Formát"
 
 msgid " History "
 msgstr " História "
@@ -3206,7 +3191,7 @@ msgid ""
 "in cpio archive\n"
 "%s"
 msgstr ""
-"Nekonzistentné tvrdé odkazy\n"
+"Nekonzistentné pevné odkazy\n"
 "%s\n"
 "v cpio archíve\n"
 "%s"
@@ -3228,7 +3213,7 @@ msgid "Directory cache expired for %s"
 msgstr "Vyrovnávacia pamäť adresárov vypršala pre %s"
 
 msgid "Starting linear transfer..."
-msgstr "Začínam lineárny prenos..."
+msgstr "Začína sa lineárny prenos..."
 
 #, c-format
 msgid "%s: %s: %s %3d%% (%lu bytes transferred)"
@@ -3246,7 +3231,7 @@ msgid ""
 "Cannot open %s archive\n"
 "%s"
 msgstr ""
-"Nemohol som otvoriť %s archív\n"
+"Nebolo možné otvoriť archív %s\n"
 "%s"
 
 msgid "Inconsistent extfs archive"
@@ -3254,7 +3239,7 @@ msgstr "Neúplný extfs archív"
 
 #, c-format
 msgid "fish: Disconnecting from %s"
-msgstr "fish: Odpájam z %s"
+msgstr "fish: Odpája sa z %s"
 
 msgid "fish: Waiting for initial line..."
 msgstr "fish: Čakám na inicilizačný riadok..."
@@ -3266,13 +3251,13 @@ msgid " fish: Password required for "
 msgstr " fish: Vyžaduje heslo "
 
 msgid "fish: Sending password..."
-msgstr "fish: Posielam heslo..."
+msgstr "fish: Posiela sa heslo..."
 
 msgid "fish: Sending initial line..."
-msgstr "fish: Posielam inicializačný riadok..."
+msgstr "fish: Posiela sa inicializačný riadok..."
 
 msgid "fish: Handshaking version..."
-msgstr "fish: Preberám verziu..."
+msgstr "fish: Preberá sa verzia..."
 
 msgid "fish: Setting up current directory..."
 msgstr "fish: Nastavenie aktuálneho adresár..."
@@ -3283,7 +3268,7 @@ msgstr "fish: Pripojený, domáci %s."
 
 #, c-format
 msgid "fish: Reading directory %s..."
-msgstr "fish: Čítanie adresára %s..."
+msgstr "fish: Načítava sa adresár %s..."
 
 #, c-format
 msgid "%s: done."
@@ -3295,10 +3280,10 @@ msgstr "%s: zlyhanie"
 
 #, c-format
 msgid "fish: store %s: sending command..."
-msgstr "fish: store %s: sending command..."
+msgstr "fish: store %s: posiela sa príkaz..."
 
 msgid "fish: Local read failed, sending zeros"
-msgstr "fish: Miestny čítanie zlyhalo, poslať nuly"
+msgstr "fish: Miestne čítanie zlyhalo, posielajú sa nuly"
 
 #, c-format
 msgid "fish: storing %s %d (%lu)"
@@ -3308,7 +3293,7 @@ msgid "zeros"
 msgstr "nuly"
 
 msgid "Aborting transfer..."
-msgstr "Prerušujem prenos..."
+msgstr "Prerušuje sa prenos..."
 
 msgid "Error reported after abort."
 msgstr "Chyba hlásená po prerušení."
@@ -3318,28 +3303,26 @@ msgstr "Prerušenie prenosu bolo úspešné."
 
 #, c-format
 msgid "ftpfs: Disconnecting from %s"
-msgstr "ftpfs: Odpájam z %s"
+msgstr "ftpfs: Odpája sa z %s"
 
 msgid " FTP: Password required for "
-msgstr " FTP: Vyžaduje heslo "
+msgstr " FTP: Vyžaduje sa heslo pre"
 
 msgid "ftpfs: sending login name"
-msgstr "ftpfs: posielam prihlasovacie meno"
+msgstr "ftpfs: posiela sa prihlasovacie meno"
 
 msgid "ftpfs: sending user password"
-msgstr "ftpfs: posielam používateľovo heslo"
+msgstr "ftpfs: posiela sa používateľovo heslo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "FTP: Account required for user %s"
-msgstr " FTP: Vyžaduje heslo "
+msgstr "FTP: Pre používateľa %s sa požaduje účet"
 
-#, fuzzy
 msgid "Account:"
-msgstr "Počet"
+msgstr "Účet:"
 
-#, fuzzy
 msgid "ftpfs: sending user account"
-msgstr "ftpfs: posielam používateľovo heslo"
+msgstr "ftpfs: posiela sa používateľský účet"
 
 msgid "ftpfs: logged in"
 msgstr "ftpfs: prihlásený"
@@ -3370,17 +3353,17 @@ msgid "Waiting to retry... %d (Control-C to cancel)"
 msgstr "Vyčkávam na zopakovanie... %d (Control-C pre zrušenie)"
 
 msgid "ftpfs: could not setup passive mode"
-msgstr "ftpfs: nemohol som nastaviť pasívny mód"
+msgstr "ftpfs: nepodarilo sa nastaviť pasívny režim"
 
 msgid "ftpfs: aborting transfer."
-msgstr "ftpfs: prerušujem prenos."
+msgstr "ftpfs: prerušuje sa prenos."
 
 #, c-format
 msgid "ftpfs: abort error: %s"
-msgstr "ftpfs: zrušiť chybu: %s"
+msgstr "ftpfs: chyba zrušenia: %s"
 
 msgid "ftpfs: abort failed"
-msgstr "ftpfs: zrušiť zlyhanie"
+msgstr "ftpfs: zrušenie zlyhalo"
 
 msgid "ftpfs: CWD failed."
 msgstr "ftpfs: CWD Zhyhanie."
@@ -3389,14 +3372,14 @@ msgid "ftpfs: couldn't resolve symlink"
 msgstr "ftpfs: nemohol som vylúštiť symbolickú linku"
 
 msgid "Resolving symlink..."
-msgstr "Lúštim symb. linku..."
+msgstr "Prekladá sa symb. odkaz..."
 
 #, c-format
 msgid "ftpfs: Reading FTP directory %s... %s%s"
-msgstr "ftpfs: Čítam FTP adresár %s... %s%s"
+msgstr "ftpfs: Číta sa adresár FTP %s... %s%s"
 
 msgid "(strict rfc959)"
-msgstr "(striktné rfc959)"
+msgstr "(striktne rfc959)"
 
 msgid "(chdir first)"
 msgstr "(naprv cd)"
@@ -3406,14 +3389,14 @@ msgstr "ftpfs: zlyhanie; niet kam sa vrátiť"
 
 #, c-format
 msgid "ftpfs: storing file %lu (%lu)"
-msgstr "ftpfs: ukladám súbor %lu (%lu)"
+msgstr "ftpfs: ukladá sa súbor %lu (%lu)"
 
 msgid ""
 "~/.netrc file has incorrect mode.\n"
 "Remove password or correct mode."
 msgstr ""
-"~/.netrc súbor nemá správny mod.\n"
-"Odstráňte heslo alebo správny mód."
+"~/.netrc súbor nemá správny režim.\n"
+"Odstráňte heslo alebo opravte režim."
 
 msgid " MCFS "
 msgstr " MCFS "
@@ -3427,8 +3410,8 @@ msgid ""
 " not be safe on the remote side.  Continue? \n"
 msgstr ""
 " Vzdialený server nebeží na systémovom porte \n"
-" potrebujete heslo k prihláseniu sa, ale informácia môže \n"
-" byť v nebezpečí na vzdialenej strane. Pokračovať? \n"
+" potrebujete heslo k prihláseniu sa, ale informácia nemusí \n"
+" byť na vzdialenej strane v bezpečí. Pokračovať? \n"
 
 msgid " MCFS Password required "
 msgstr " MCFS požaduje Heslo "
@@ -3438,15 +3421,15 @@ msgstr " Neplatné heslo "
 
 #, c-format
 msgid " Cannot locate hostname: %s "
-msgstr " Nemôžem určiť hostiteľa: %s "
+msgstr " Nie je možné určiť hostiteľa: %s "
 
 #, c-format
 msgid " Cannot create socket: %s "
-msgstr " Nemôžem vytvoriť soket: %s "
+msgstr " Nie je možné vytvoriť socket: %s "
 
 #, c-format
 msgid " Cannot connect to server: %s "
-msgstr " Nemôžem sa pripojiť k serveru: %s"
+msgstr " Nie je možné pripojiť sa k serveru: %s"
 
 msgid " Too many open connections "
 msgstr " Príliš veľa otvorených spojení "
@@ -3480,34 +3463,34 @@ msgstr " Overenie zlyhalo "
 
 #, c-format
 msgid " Error %s creating directory %s "
-msgstr " Error %s creating directory %s "
+msgstr " Chyba %s pri vytváraní adresára %s "
 
 #, c-format
 msgid " Error %s removing directory %s "
-msgstr " Error %s removing directory %s "
+msgstr " Chyba %s pri odstraňovaní adresára %s "
 
 #, c-format
 msgid " %s opening remote file %s "
-msgstr " %s otváram vzdialený súbor %s "
+msgstr " %s otvára sa vzdialený súbor %s "
 
 #, c-format
 msgid " %s removing remote file %s "
-msgstr " %s odstraňujem vzdialený súbor %s "
+msgstr " %s odstraňuje sa vzdialený súbor %s "
 
 #, c-format
 msgid " %s renaming files\n"
-msgstr " %s premenúvam súbory\n"
+msgstr " %s premenúvajú sa súbory\n"
 
 #, c-format
 msgid ""
 "Cannot open tar archive\n"
 "%s"
 msgstr ""
-"Nemohol som otvoriť tar archív\n"
+"Nie je možné otvoriť tar archív\n"
 "%s"
 
 msgid "Inconsistent tar archive"
-msgstr "Neúplný tar archív"
+msgstr "Poškodený archív tar"
 
 msgid "Unexpected EOF on archive file"
 msgstr "Neočakávaný koniec archívneho súboru"
@@ -3526,10 +3509,10 @@ msgid " undelfs: error "
 msgstr " undelfs: chyba"
 
 msgid " not enough memory "
-msgstr " nedostatok pamäti"
+msgstr " nedostatok pamäte"
 
 msgid " while allocating block buffer "
-msgstr " počas alokovanie bufferu pre bloky "
+msgstr " počas alokovania bufferu pre bloky "
 
 #, c-format
 msgid " open_inode_scan: %d "
@@ -3541,14 +3524,14 @@ msgstr " počas štartovania prechodu i-uzlov %d "
 
 #, c-format
 msgid "undelfs: loading deleted files information %d inodes"
-msgstr "undelfs: načítavam informácie o odstranených súboroch %d i-uzlov"
+msgstr "undelfs: načítavajú sa informácie o odstránených súboroch %d i-uzlov"
 
 #, c-format
 msgid " while calling ext2_block_iterate %d "
 msgstr " počas volania ext2_block_iterate %d "
 
 msgid " no more memory while reallocating array "
-msgstr " nie viac pamäti počas zmeny alokácie poľa "
+msgstr " nedostatok pamäte počas zmeny alokácie poľa "
 
 #, c-format
 msgid " while doing inode scan %d "
@@ -3559,81 +3542,83 @@ msgstr " Ext2lib: chyba "
 
 #, c-format
 msgid " Cannot open file %s "
-msgstr " Nemohol som otvoriť súbor %s "
+msgstr " Nie je možné otvoriť súbor %s "
 
 msgid "undelfs: reading inode bitmap..."
-msgstr "undelfs: čítam bitovú mapu inode..."
+msgstr "undelfs: číta sa bitová mapa inode..."
 
 #, c-format
 msgid ""
 " Cannot load inode bitmap from: \n"
 " %s \n"
 msgstr ""
-" Nemohol som načítať bitmapu inode z: \n"
+" Nie je možné načítať bitmapu inode z: \n"
 " %s \n"
 
 msgid "undelfs: reading block bitmap..."
-msgstr "undelfs: čítam bitovú mapu blokov..."
+msgstr "undelfs: číta sa bitová mapa blokov..."
 
 #, c-format
 msgid ""
 " Cannot load block bitmap from: \n"
 " %s \n"
 msgstr ""
-" Nemôžem načítať bitovú mapu blokov z: \n"
+" Nie je možné načítať bitovú mapu blokov z: \n"
 " %s \n"
 
 msgid " vfs_info is not fs! "
 msgstr " vfs_info nie je fs! "
 
 msgid " You have to chdir to extract files first "
-msgstr " Musíte zmeniť adresár pre extrakciu súborov "
+msgstr " Ak chcete rozbaliť súbory, musíte najprv zmeniť aktuálny adresár"
 
 msgid " while iterating over blocks "
 msgstr " počas prechodu cez bloky "
 
 msgid "Cannot parse:"
-msgstr "Nemohol som spracovať:"
+msgstr "Nie je možné spracovať:"
 
 msgid "More parsing errors will be ignored."
-msgstr "Ďalšie chyby pracovania budú ignorované."
+msgstr "Ďalšie chyby spracovania budú ignorované."
 
 msgid "Internal error:"
-msgstr "Interná chyba:"
+msgstr "Vnútorná chyba:"
 
 msgid "Changes to file lost"
 msgstr "Zmeny súboru stratené"
 
+msgid "Unform"
+msgstr "Obnov"
+
+msgid " Socket source routing setup "
+msgstr " Prvotné nastavenie smeru cesty Socketu "
+
+msgid " Enter host name to use as a source routing hop: "
+msgstr " Zadajte hostiteľské meno pre použitie ako zdrojového smeru cesty: "
+
+msgid " New mode is \"%s\" "
+msgstr " Nový mód je \"%s\" "
+
 #~ msgid "&Home"
 #~ msgstr "&Domáci"
-
 #~ msgid "&Type"
 #~ msgstr "&Typ"
-
 #~ msgid "&Links"
 #~ msgstr "&Odkazy"
-
 #~ msgid "N&GID"
 #~ msgstr "N&GID"
-
 #~ msgid "N&UID"
 #~ msgstr "N&UID"
-
 #~ msgid "&Owner"
 #~ msgstr "&Vlastník"
-
 #~ msgid "&Group"
 #~ msgstr "s&Kupina"
-
 #~ msgid "MC was unable to write ~/"
 #~ msgstr "MC nebol schopný zapísať ~/"
-
 #~ msgid " (%ld blocks)"
 #~ msgstr " (%ld blokov)"
-
 #~ msgid " Notice "
 #~ msgstr " Správa "
-
 #~ msgid ""
 #~ " The Midnight Commander configuration files \n"
 #~ " are now stored in the ~/.mc directory, the \n"
@@ -3642,19 +3627,14 @@ msgstr "Zmeny súboru stratené"
 #~ " Konfiguračné súbory pre Midnight Commander \n"
 #~ " sú teraz uložené v adresári ~/.mc, súbory  \n"
 #~ " boli teraz presunuté\n"
-
 #~ msgid "%s bytes in %d files"
 #~ msgstr "%s bytov v %d súboroch"
-
 #~ msgid " Cannot open file for reading: "
 #~ msgstr " Neúspešný pokus o otvorenie súboru pre čítanie: "
-
 #~ msgid " Not an ordinary file: "
 #~ msgstr " Toto nie je súbor ordinálneho typu: "
-
 #~ msgid "Format of the "
 #~ msgstr "Formát "
-
 #~ msgid ""
 #~ " file has changed\n"
 #~ "with version 3.0. You may want either to\n"
@@ -3663,83 +3643,56 @@ msgstr "Zmeny súboru stratené"
 #~ " súbor bol zmemený\n"
 #~ "verziou 3.0. Môžno ho tiež budete chcieť\n"
 #~ "kopírovať z "
-
 #~ msgid ""
 #~ "mc.ext or use that\n"
 #~ "file as an example of how to write it.\n"
 #~ msgstr ""
 #~ "mc.ext, alebo použite ten\n"
 #~ "súbor ako príklad, ako to napísať.\n"
-
 #~ msgid "mc.ext will be used for this moment."
 #~ msgstr "mc.ext bude používaný v tejto chvíli."
-
 #~ msgid " Cannot open file "
 #~ msgstr " Nemohol som otvoriť súbor "
-
 #~ msgid "Col %d"
 #~ msgstr "Col %d"
-
 #~ msgid "  [grow]"
 #~ msgstr "  [rásť]"
-
 #~ msgid "Ascii"
 #~ msgstr "Ascii"
-
 #~ msgid "Hex"
 #~ msgstr "Hex"
-
 #~ msgid "Goto"
 #~ msgstr "Choď"
-
 #~ msgid "Line"
 #~ msgstr "Riadok"
-
 #~ msgid "RxSrch"
 #~ msgstr "RxSrch"
-
 #~ msgid "EdHex"
 #~ msgstr "EdHex"
-
 #~ msgid "EdText"
 #~ msgstr "EdText"
-
 #~ msgid "UnWrap"
 #~ msgstr "Rozbaľ"
-
 #~ msgid "Wrap"
 #~ msgstr "Zabaľ"
-
 #~ msgid "HxSrch"
 #~ msgstr "HxSrch"
-
 #~ msgid "Raw"
 #~ msgstr "Prvotný"
 
+#, fuzzy
 #~ msgid "Parse"
-#~ msgstr "Rozober"
-
-#~ msgid "Unform"
-#~ msgstr "Obnov"
-
+#~ msgstr "Pred"
 #~ msgid "Format"
 #~ msgstr "Formát"
-
 #~ msgid "User menu available only in mcedit invoked from mc"
 #~ msgstr "Používateľské menu k dispozícii iba v mcedit spustenom z mc"
 
-#~ msgid " Socket source routing setup "
-#~ msgstr " Prvotné nastavenie smeru cesty Socketu "
-
-#~ msgid " Enter host name to use as a source routing hop: "
-#~ msgstr " Zadajte hostiteľské meno pre použitie ako zdrojového smeru cesty: "
-
+#, fuzzy
 #~ msgid " Host name "
-#~ msgstr " Meno hostiteľa "
-
+#~ msgstr " Meno používateľa "
 #~ msgid " Error while looking up IP address "
 #~ msgstr "Nastala chyba počas vyhľadávania IP adresy "
-
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -3754,24 +3707,28 @@ msgstr "Zmeny súboru stratené"
 #~ "obnovovací pamäťový zásobník nie je naplnený!\n"
 #~ "\n"
 #~ "\n"
-
 #~ msgid " Listing format edit "
 #~ msgstr " Upraviť formát výpisu "
-
-#~ msgid " New mode is \"%s\" "
-#~ msgstr " Nový mód je \"%s\" "
-
 #~ msgid "&Drive...       M-d"
 #~ msgstr "&Jednotka...      M-d"
-
 #~ msgid "Use to debug the background code"
 #~ msgstr "Pre ladenie použite kód na pozadí"
-
 #~ msgid "Force subshell execution"
 #~ msgstr "vynútiť vykonanie v subshelli"
-
 #~ msgid " No action taken "
 #~ msgstr " Nie je zadaná činnosť "
 
+#, fuzzy
 #~ msgid " Cannot set source routing (%s)"
-#~ msgstr " Nemohol som nastaviť trasu  zdroja (%s)"
+#~ msgstr ""
+#~ " Nepodarilo sa prečítať zdrojový odkaz \"%s\" \n"
+#~ " %s "
+#~ msgid "Executable first"
+#~ msgstr "Najprv spustiteľné"
+#~ msgid "S&kip hidden"
+#~ msgstr "Pres&kočiť skryté"
+#~ msgid "show free sp&Ace"
+#~ msgstr "zobr&Aziť voľné miesto"
+#~ msgid "Mkdir autoname"
+#~ msgstr "Mkdir autonázov"
+

From a079bd950c648728758935069694c80738cf8203 Mon Sep 17 00:00:00 2001
From: Ilia Maslakov <il.smind@gmail.com>
Date: Thu, 5 Mar 2009 09:59:50 +0000
Subject: [PATCH 06/11]  Denis Vlasenko posted a patch which would fix issue
 when no dialog for break operation. Trouble: recently i accidentally entered
 '.' instead of '..' in the file copy dialog on a relatively big tree ... for
 every file in the tree i got the <foo> and <bar> are the same file message
 box, without any way to escape except killing mc from the outside. Rework
 warn_same_file for more usage glib. ... msg = g_strdup_printf() ...

---
 src/file.c | 63 ++++++++++++++++++++----------------------------------
 1 file changed, 23 insertions(+), 40 deletions(-)

diff --git a/src/file.c b/src/file.c
index 103930104..b76ca0d13 100644
--- a/src/file.c
+++ b/src/file.c
@@ -462,6 +462,22 @@ enum {
     DEST_FULL			/* Created, fully copied */
 };
 
+static int warn_same_file(const char *fmt, const char *a, const char *b)
+{
+    char *msg;
+    /* We don't expect %d etc, just %s, so strlen(fmt) should be ok */
+    int result = 0;
+    msg = g_strdup_printf (fmt, a, b);
+    result = query_dialog (MSG_ERROR, msg, D_ERROR, 2, _("&Skip"), _("&Abort"));
+    g_free(msg);
+    do_refresh ();
+    if ( result ) { /* 1 == Abort */
+        return FILE_ABORT;
+    } else {
+        return FILE_SKIP;
+    }
+}
+
 int
 copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
 		int ask_overwrite, off_t *progress_count,
@@ -516,13 +532,9 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
 
     if (dst_exists) {
 	/* Destination already exists */
-	if (sb.st_dev == sb2.st_dev && sb.st_ino == sb2.st_ino) {
-	    message (1, MSG_ERROR,
-		    _(" `%s' and `%s' are the same file "), src_path, dst_path);
-	    do_refresh ();
-	    return FILE_SKIP;
-	}
-
+        if (sb.st_dev == sb2.st_dev && sb.st_ino == sb2.st_ino)
+            return warn_same_file(_(" `%s' and `%s' are the same file "),
+                                  src_path, dst_path);
 	/* Should we replace destination? */
 	if (ask_overwrite) {
 	    ctx->do_reget = 0;
@@ -1048,23 +1060,8 @@ move_file_file (FileOpContext *ctx, const char *s, const char *d,
 
     if (mc_lstat (d, &dst_stats) == 0) {
 	if (src_stats.st_dev == dst_stats.st_dev
-	    && src_stats.st_ino == dst_stats.st_ino) {
-	    int msize = COLS - 36;
-	    char st[MC_MAXPATHLEN];
-	    char dt[MC_MAXPATHLEN];
-
-	    if (msize < 0)
-		msize = 40;
-	    msize /= 2;
-
-	    strcpy (st, path_trunc (s, msize));
-	    strcpy (dt, path_trunc (d, msize));
-	    message (1, MSG_ERROR,
-			_(" `%s' and `%s' are the same file "), st, dt);
-	    do_refresh ();
-	    return FILE_SKIP;
-	}
-
+            && src_stats.st_ino == dst_stats.st_ino)
+            return warn_same_file(_(" `%s' and `%s' are the same file "), s, d);
 	if (S_ISDIR (dst_stats.st_mode)) {
 	    message (1, MSG_ERROR,
 			_(" Cannot overwrite directory `%s' "), d);
@@ -1171,22 +1168,8 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
     } else
 	destdir = concat_dir_and_file (d, x_basename (s));
 
-    if (sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino) {
-	int msize = COLS - 36;
-	char st[MC_MAXPATHLEN];
-	char dt[MC_MAXPATHLEN];
-
-	if (msize < 0)
-	    msize = 40;
-	msize /= 2;
-
-	strcpy (st, path_trunc (s, msize));
-	strcpy (dt, path_trunc (d, msize));
-	message (1, MSG_ERROR,
-		    _(" `%s' and `%s' are the same directory "), st, dt);
-	do_refresh ();
-	return FILE_SKIP;
-    }
+    if (sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino)
+        return warn_same_file(_(" `%s' and `%s' are the same directory "), s, d);
 
     /* Check if the user inputted an existing dir */
   retry_dst_stat:

From d60f4957de75c89d03ab9f727c415bdb4e4fcec5 Mon Sep 17 00:00:00 2001
From: Ilia Maslakov <il.smind@gmail.com>
Date: Thu, 5 Mar 2009 10:41:41 +0000
Subject: [PATCH 07/11] little fix for show message

---
 src/file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/file.c b/src/file.c
index b76ca0d13..8c6e030f4 100644
--- a/src/file.c
+++ b/src/file.c
@@ -533,8 +533,8 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
     if (dst_exists) {
 	/* Destination already exists */
         if (sb.st_dev == sb2.st_dev && sb.st_ino == sb2.st_ino)
-            return warn_same_file(_(" `%s' and `%s' are the same file "),
-                                  src_path, dst_path);
+            return warn_same_file(_(" `%s' and\n `%s'\n are the same file "),
+                                src_path, dst_path);
 	/* Should we replace destination? */
 	if (ask_overwrite) {
 	    ctx->do_reget = 0;

From 0ffd71949f1d6814f3c0aef1b2b26010fdc3a4ff Mon Sep 17 00:00:00 2001
From: Ilia Maslakov <il.smind@gmail.com>
Date: Thu, 5 Mar 2009 11:10:03 +0000
Subject: [PATCH 08/11] non-relevant comment removed

---
 src/file.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/file.c b/src/file.c
index 8c6e030f4..d7f62e37b 100644
--- a/src/file.c
+++ b/src/file.c
@@ -465,7 +465,6 @@ enum {
 static int warn_same_file(const char *fmt, const char *a, const char *b)
 {
     char *msg;
-    /* We don't expect %d etc, just %s, so strlen(fmt) should be ok */
     int result = 0;
     msg = g_strdup_printf (fmt, a, b);
     result = query_dialog (MSG_ERROR, msg, D_ERROR, 2, _("&Skip"), _("&Abort"));

From 68009d016fc03b70266ba069b74e6cd06bfb78d2 Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Sun, 8 Mar 2009 12:38:35 +0300
Subject: [PATCH 09/11] src/file.c: modified error messages fro
 warn_same_file() function. po/*.po: updated to sync with modified src/file.c
 file.

---
 po/az.po    |  39 ++++++++------
 po/be.po    |  37 ++++++++------
 po/bg.po    |  39 ++++++++------
 po/ca.po    |  37 ++++++++------
 po/cs.po    |  37 ++++++++------
 po/da.po    |  39 ++++++++------
 po/de.po    |  91 ++++++++++++++++++++++-----------
 po/el.po    |  33 +++++++-----
 po/es.po    |  40 +++++++++------
 po/eu.po    |  39 ++++++++------
 po/fi.po    |  39 ++++++++------
 po/fr.po    |  37 ++++++++------
 po/hu.po    |  39 ++++++++------
 po/it.po    |  40 +++++++++------
 po/ja.po    |  39 ++++++++------
 po/ko.po    |  37 ++++++++------
 po/lt.po    |  87 +++++++++++++++++++++----------
 po/lv.po    |  39 ++++++++------
 po/mn.po    |  37 ++++++++------
 po/nl.po    |  44 ++++++++--------
 po/no.po    |  37 ++++++++------
 po/pl.po    |  37 ++++++++------
 po/pt.po    |  39 ++++++++------
 po/pt_BR.po |  37 ++++++++------
 po/ro.po    |  37 ++++++++------
 po/ru.po    |  37 ++++++++------
 po/sk.po    | 144 ++++++++++++++++++++++++++++++++++++++--------------
 po/sl.po    |  37 ++++++++------
 po/sr.po    |  37 ++++++++------
 po/sv.po    |  37 ++++++++------
 po/ta.po    |  33 +++++++-----
 po/tr.po    |  39 ++++++++------
 po/uk.po    |  37 ++++++++------
 po/vi.po    |  37 ++++++++------
 po/wa.po    |  39 ++++++++------
 po/zh_CN.po |  39 ++++++++------
 po/zh_TW.po |  37 ++++++++------
 src/file.c  |   2 +-
 38 files changed, 993 insertions(+), 618 deletions(-)

diff --git a/po/az.po b/po/az.po
index 616293060..58b6b3ce8 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.99a\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2001-09-26 16:43GMT +0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkish <linuxaz@azerimal.net>\n"
@@ -56,9 +56,8 @@ msgstr " Fayl çox böyükdür: "
 msgid "Macro recursion is too deep"
 msgstr ""
 
-#, fuzzy
-msgid " Enter file name: "
-msgstr " Sətiri tap: "
+msgid "&Dismiss"
+msgstr "&Keç"
 
 msgid "Warning"
 msgstr "Xəbərdarlıq"
@@ -105,6 +104,10 @@ msgstr " Qeyd Etmə şəklini dəyişdir "
 msgid " Save As "
 msgstr " Fərqli qeyd et "
 
+#, fuzzy
+msgid " Enter file name: "
+msgstr " Sətiri tap: "
+
 msgid " A file already exists with this name. "
 msgstr " Bu adla onsuz da bir fayl vardır "
 
@@ -360,9 +363,6 @@ msgstr " İstədiyin düyməyə bas :"
 msgid " Execute Macro "
 msgstr " Makronu işə sal"
 
-msgid "&Dismiss"
-msgstr "&Keç"
-
 msgid " Emacs key: "
 msgstr " Emacs düyməsi :"
 
@@ -794,6 +794,9 @@ msgstr "böyük/kiçik hərf həssas"
 msgid "Sort order"
 msgstr "Süzmə əmri"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "qov&luqlar keçmişi      C-\\"
@@ -1327,6 +1330,9 @@ msgstr ""
 " \"%s\" Hədəf yumşaq bağa yaradıla bilmir\n"
 " %s "
 
+msgid "&Abort"
+msgstr "Lə&ğv et"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1343,8 +1349,11 @@ msgstr ""
 " \"%s\" qayanq faylı stat edilə bilmir \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' və `%s' eyni fayldır "
 
 #, c-format
@@ -1506,6 +1515,10 @@ msgstr ""
 " \"%s\" faylı stat edila bilmir \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' və `%s' eyni fayldır "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " `%s' qovluğun üstünü yaza bilmərəm "
@@ -1609,9 +1622,6 @@ msgstr " Bağışlayın. Arxaya əməliyyat ala bilmərəm "
 msgid "&Retry"
 msgstr "Təzədən &sına"
 
-msgid "&Abort"
-msgstr "Lə&ğv et"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2861,9 +2871,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "qovluq"
diff --git a/po/be.po b/po/be.po
index 8b5f49700..bb58b2628 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.6.0\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2002-08-25 16:15GMT+2\n"
 "Last-Translator: Vital Khilko <dojlid@mova.org>\n"
 "Language-Team: belarusian <i18n@mova.org>\n"
@@ -52,8 +52,8 @@ msgstr " 
 msgid "Macro recursion is too deep"
 msgstr ""
 
-msgid " Enter file name: "
-msgstr " ������� ��� �����: "
+msgid "&Dismiss"
+msgstr "&��������"
 
 msgid "Warning"
 msgstr "�������������"
@@ -100,6 +100,9 @@ msgstr " 
 msgid " Save As "
 msgstr " �������� �� "
 
+msgid " Enter file name: "
+msgstr " ������� ��� �����: "
+
 msgid " A file already exists with this name. "
 msgstr " ���� � ���� ���� ��� �����. "
 
@@ -355,9 +358,6 @@ msgstr " 
 msgid " Execute Macro "
 msgstr " �������� ������ "
 
-msgid "&Dismiss"
-msgstr "&��������"
-
 msgid " Emacs key: "
 msgstr " ������ Emacs: "
 
@@ -789,6 +789,9 @@ msgstr "
 msgid "Sort order"
 msgstr "������� �����������"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "���� ����&���      C-\\"
@@ -1322,6 +1325,9 @@ msgstr ""
 " ��������� �������� ����. �������� ���� \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&���������"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1338,8 +1344,11 @@ msgstr ""
 " ��������� �������� ������������� ��������� ����� \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' � `%s' ���� � ��� �� ���� "
 
 #, c-format
@@ -1501,6 +1510,10 @@ msgstr ""
 " ��������� �������� ������������� ����� \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' � `%s' ���� � ��� �� ���� "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " ��������� ��������� ������ `%s' "
@@ -1604,9 +1617,6 @@ msgstr " 
 msgid "&Retry"
 msgstr "��&�������"
 
-msgid "&Abort"
-msgstr "&���������"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2837,9 +2847,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "������"
diff --git a/po/bg.po b/po/bg.po
index fac201d28..5dbceca91 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 4.5.55\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2002-06-24 02:15+0300\n"
 "Last-Translator: Todor Buyukliev <adrez@mail.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -52,9 +52,8 @@ msgstr " Файлът е прекалено голям: "
 msgid "Macro recursion is too deep"
 msgstr ""
 
-#, fuzzy
-msgid " Enter file name: "
-msgstr " Въведете ред: "
+msgid "&Dismiss"
+msgstr "Затвори"
 
 msgid "Warning"
 msgstr "Внимание"
@@ -101,6 +100,10 @@ msgstr " Промени начина на запазване "
 msgid " Save As "
 msgstr " Запази като "
 
+#, fuzzy
+msgid " Enter file name: "
+msgstr " Въведете ред: "
+
 msgid " A file already exists with this name. "
 msgstr " Файл с това има вече съществува. "
 
@@ -359,9 +362,6 @@ msgstr " Натиснете клавиш: "
 msgid " Execute Macro "
 msgstr " Изпълни Макрос "
 
-msgid "&Dismiss"
-msgstr "Затвори"
-
 msgid " Emacs key: "
 msgstr " Emacs клавиш: "
 
@@ -793,6 +793,9 @@ msgstr "Различавай главни/малки"
 msgid "Sort order"
 msgstr "Ред на сортиране"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "Горещи директории       C-\\"
@@ -1324,6 +1327,9 @@ msgstr ""
 " Не може да се създаде връзката назначение \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "Отказ"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1340,8 +1346,11 @@ msgstr ""
 " Не може да се stat-не файлът източник \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' и `%s' са един и същи файл. "
 
 #, c-format
@@ -1503,6 +1512,10 @@ msgstr ""
 " Не може да се stat-не файлът \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' и `%s' са един и същи файл. "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Не може да се презапише директорията `%s' "
@@ -1606,9 +1619,6 @@ msgstr " Съжалявам, не може да се сложи задачата
 msgid "&Retry"
 msgstr "Отново"
 
-msgid "&Abort"
-msgstr "Отказ"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2856,9 +2866,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "директорията"
diff --git a/po/ca.po b/po/ca.po
index 4e9fe600d..81ec03fc4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.99a\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2001-09-29 17:41+0200\n"
 "Last-Translator: Softcatal� <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -56,8 +56,8 @@ msgstr " El fitxer 
 msgid "Macro recursion is too deep"
 msgstr ""
 
-msgid " Enter file name: "
-msgstr " Introdu�u el nom del fitxer: "
+msgid "&Dismiss"
+msgstr "&Ignora"
 
 msgid "Warning"
 msgstr "Av�s"
@@ -105,6 +105,9 @@ msgstr " Edita la manera de desar "
 msgid " Save As "
 msgstr " Desa com a"
 
+msgid " Enter file name: "
+msgstr " Introdu�u el nom del fitxer: "
+
 msgid " A file already exists with this name. "
 msgstr " Ja existeix un fitxer amb aquest nom. "
 
@@ -362,9 +365,6 @@ msgstr " Premeu una tecla: "
 msgid " Execute Macro "
 msgstr " Executa la macro "
 
-msgid "&Dismiss"
-msgstr "&Ignora"
-
 msgid " Emacs key: "
 msgstr " Tecla d'Emacs: "
 
@@ -797,6 +797,9 @@ msgstr "distingeix entre maj
 msgid "Sort order"
 msgstr "Ordre de classificaci�"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "directoris fa&Vorits     C-\\"
@@ -1330,6 +1333,9 @@ msgstr ""
 " No puc crear l'enlla� simb�lic objectiu \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "a&Vorta"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1346,8 +1352,11 @@ msgstr ""
 " No puc estudiar el fitxer origen \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' i `%s' s�n el mateix fitxer "
 
 #, c-format
@@ -1509,6 +1518,10 @@ msgstr ""
 " No puc estudiar el fitxer \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' i `%s' s�n el mateix fitxer "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " No puc sobreescriure el directori `%s' "
@@ -1612,9 +1625,6 @@ msgstr " Ho sento, no he pogut posar la tasca al rerafons "
 msgid "&Retry"
 msgstr "&Reintenta"
 
-msgid "&Abort"
-msgstr "a&Vorta"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2875,9 +2885,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "Crea un directori nou"
diff --git a/po/cs.po b/po/cs.po
index db73112bd..744ef7e49 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.99a\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2008-06-05 17:36+0100\n"
 "Last-Translator: Anna Talianova <anickat1@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -59,8 +59,8 @@ msgstr " Soubor %s je p
 msgid "Macro recursion is too deep"
 msgstr "Rekurze maker je p��li� hlubok�"
 
-msgid " Enter file name: "
-msgstr " Zadejte jm�no souboru: "
+msgid "&Dismiss"
+msgstr "&Odm�tnout"
 
 msgid "Warning"
 msgstr "Varov�n�"
@@ -107,6 +107,9 @@ msgstr " Upravit ukl
 msgid " Save As "
 msgstr " Ulo�it jako "
 
+msgid " Enter file name: "
+msgstr " Zadejte jm�no souboru: "
+
 msgid " A file already exists with this name. "
 msgstr " Soubor tohoto jm�na ji� existuje. "
 
@@ -354,9 +357,6 @@ msgstr " Stiskn
 msgid " Execute Macro "
 msgstr " Spustit makro "
 
-msgid "&Dismiss"
-msgstr "&Odm�tnout"
-
 msgid " Emacs key: "
 msgstr " Emacsov� kl�vesa: "
 
@@ -793,6 +793,9 @@ msgstr "v
 msgid "Sort order"
 msgstr "Po�ad�"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "&Rychl� p��stup k adres���m     C-\\"
@@ -1329,6 +1332,9 @@ msgstr ""
 " Nelze vytvo�it c�lov� symlink \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Zru�it"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1345,8 +1351,11 @@ msgstr ""
 " Na zdrojov�m souboru \"%s\" nelze prov�st stat \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' a `%s' jsou stejn� soubor "
 
 #, c-format
@@ -1508,6 +1517,10 @@ msgstr ""
 " Na souboru \"%s\" nelze prov�st stat \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' a `%s' jsou stejn� soubor "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Nelze p�epsat adres�� `%s' "
@@ -1611,9 +1624,6 @@ msgstr " Bohu
 msgid "&Retry"
 msgstr "&Zkusit znovu"
 
-msgid "&Abort"
-msgstr "&Zru�it"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2871,9 +2881,6 @@ msgstr "%e.%b %H:%M"
 msgid "%b %e  %Y"
 msgstr "%e.%b  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s nen� adres��\n"
diff --git a/po/da.po b/po/da.po
index 9e64c5d73..a3c332290 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.41\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2001-10-20 21:37+02:00\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -62,9 +62,8 @@ msgstr " Filen er for stor: "
 msgid "Macro recursion is too deep"
 msgstr ""
 
-#, fuzzy
-msgid " Enter file name: "
-msgstr " Indtast linje: "
+msgid "&Dismiss"
+msgstr "&Forkast"
 
 msgid "Warning"
 msgstr "Advarsel"
@@ -111,6 +110,10 @@ msgstr " Redig
 msgid " Save As "
 msgstr " Gem som "
 
+#, fuzzy
+msgid " Enter file name: "
+msgstr " Indtast linje: "
+
 msgid " A file already exists with this name. "
 msgstr " En fil med dette navn eksisterer allerede. "
 
@@ -367,9 +370,6 @@ msgstr " Tryk p
 msgid " Execute Macro "
 msgstr " K�r makro "
 
-msgid "&Dismiss"
-msgstr "&Forkast"
-
 msgid " Emacs key: "
 msgstr " Emacs-tast: "
 
@@ -801,6 +801,9 @@ msgstr "Forskel p
 msgid "Sort order"
 msgstr "Sorteringsr�kkef�lge"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "ma&Ppe hurtigliste    C-\\"
@@ -1334,6 +1337,9 @@ msgstr ""
 " Kan ikke oprette m�lsyml�nken \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Afbryd"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1350,8 +1356,11 @@ msgstr ""
 " Kan ikke k�re stat p� kildefilen \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' og `%s' er samme fil "
 
 #, c-format
@@ -1513,6 +1522,10 @@ msgstr ""
 " Kan ikke k�re status p� filen \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' og `%s' er samme fil "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Kan ikke overskrive mappen `%s' "
@@ -1616,9 +1629,6 @@ msgstr " Beklager, Jeg kunne ikke placere jobbet i baggrunden "
 msgid "&Retry"
 msgstr "&Pr�v igen"
 
-msgid "&Abort"
-msgstr "&Afbryd"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2868,9 +2878,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "mappe"
diff --git a/po/de.po b/po/de.po
index 1374eef73..3ee3d8310 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,15 +11,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.6.x\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2009-01-25 17:50-0000\n"
 "Last-Translator: Patrick Winnertz <winnie@der-winnie.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid " Choose syntax highlighting "
 msgstr " Syntaxhervorhebung ausw�hlen "
@@ -60,8 +60,8 @@ msgstr " Die Datei 
 msgid "Macro recursion is too deep"
 msgstr "Makros sind zu tief verschachtelt"
 
-msgid " Enter file name: "
-msgstr " Dateiname eingeben: "
+msgid "&Dismiss"
+msgstr "&Schlie�en"
 
 msgid "Warning"
 msgstr "Warnung"
@@ -109,6 +109,9 @@ msgstr " Editor-Speichermodus "
 msgid " Save As "
 msgstr " Speichern Unter "
 
+msgid " Enter file name: "
+msgstr " Dateiname eingeben: "
+
 msgid " A file already exists with this name. "
 msgstr " Es existiert bereits eine Datei mit diesem Namen. "
 
@@ -168,7 +171,8 @@ msgid " Load "
 msgstr "Laden"
 
 msgid " Block is large, you may not be able to undo this action. "
-msgstr " Gro�er Block, eventuell kann diese Aktion nicht r�ckg�ngig gemacht werden. "
+msgstr ""
+" Gro�er Block, eventuell kann diese Aktion nicht r�ckg�ngig gemacht werden. "
 
 msgid "O&ne"
 msgstr "ei&Ne"
@@ -224,8 +228,11 @@ msgstr " Ersetzen "
 msgid "Search"
 msgstr "Suchen"
 
-msgid " Invalid regular expression, or scanf expression with too many conversions "
-msgstr " Ung�ltiger regul�rer Ausdruck oder scanf-Ausdruck mit zu vielen Konvertierungen "
+msgid ""
+" Invalid regular expression, or scanf expression with too many conversions "
+msgstr ""
+" Ung�ltiger regul�rer Ausdruck oder scanf-Ausdruck mit zu vielen "
+"Konvertierungen "
 
 msgid " Error in replacement format string. "
 msgstr " Fehler in der Format-Zeichenkette der Ersetzungen "
@@ -355,9 +362,6 @@ msgstr " Eine Taste dr
 msgid " Execute Macro "
 msgstr " Makro ausf�hren "
 
-msgid "&Dismiss"
-msgstr "&Schlie�en"
-
 msgid " Emacs key: "
 msgstr " Emacs-Taste: "
 
@@ -788,6 +792,9 @@ msgstr "Gro
 msgid "Sort order"
 msgstr "Sortierung"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "Ve&Rzeichnis Hotlist  l�schen"
@@ -1253,7 +1260,10 @@ msgid " %s%s file error"
 msgstr " Fehler in der Datei %s%s "
 
 #, c-format
-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."
+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."
 msgstr ""
 "Das Dateiformat der Datei �%smc.ext� hat sich in Version 3.0 ge�ndert.\n"
 "Bitte aktualisieren Sie die Datei."
@@ -1263,8 +1273,13 @@ msgid " ~/%s file error "
 msgstr " Fehler in Datei �~/%s� "
 
 #, c-format
-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."
-msgstr "Das Dateiformat von �~/%s� hat sich mit Version 3.0 ge�ndert.  Eine Beispieldatei im neuen Format ist %smc.ext."
+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."
+msgstr ""
+"Das Dateiformat von �~/%s� hat sich mit Version 3.0 ge�ndert.  Eine "
+"Beispieldatei im neuen Format ist %smc.ext."
 
 msgid " Copy "
 msgstr " Kopieren "
@@ -1294,7 +1309,8 @@ msgid ""
 "\n"
 " Option Stable Symlinks will be disabled "
 msgstr ""
-" Kann keine stabilen symbolischen Links auf nicht-lokalen Dateisystemen anlegen: \n"
+" Kann keine stabilen symbolischen Links auf nicht-lokalen Dateisystemen "
+"anlegen: \n"
 "\n"
 " Einstellung Stabile Symbolische Links wird deaktiviert "
 
@@ -1306,6 +1322,9 @@ msgstr ""
 " Kann Ziel des symbolischen Links \"%s\" nicht anlegen \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Abbrechen"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1322,8 +1341,11 @@ msgstr ""
 " Kann Quelldatei \"%s\" nicht untersuchen \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' und `%s' sind die gleichen Dateien "
 
 #, c-format
@@ -1485,6 +1507,10 @@ msgstr ""
 " Kann Datei \"%s\" nicht untersuchen \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' und `%s' sind die gleichen Dateien "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Kann Verzeichnis `%s' nicht �berschreiben "
@@ -1588,9 +1614,6 @@ msgstr " Ich kann den Job nicht im Hintergrund bearbeiten "
 msgid "&Retry"
 msgstr "wiede&Rholen"
 
-msgid "&Abort"
-msgstr "&Abbrechen"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -1894,8 +1917,11 @@ msgid " Hotlist Load "
 msgstr " Hotlist laden "
 
 #, c-format
-msgid "MC was unable to write ~/%s file, your old hotlist entries were not deleted"
-msgstr "MC konnte ~/%s nicht schreiben, die alten Hotlist-Eintr�ge wurden nicht gel�scht"
+msgid ""
+"MC was unable to write ~/%s file, your old hotlist entries were not deleted"
+msgstr ""
+"MC konnte ~/%s nicht schreiben, die alten Hotlist-Eintr�ge wurden nicht "
+"gel�scht"
 
 #, c-format
 msgid "Midnight Commander %s"
@@ -2082,10 +2108,14 @@ msgstr ""
 "Alle Tasten arbeiten vern�nftig"
 
 msgid "Press all the keys mentioned here. After you have done it, check"
-msgstr "Dr�cken Sie alle angegebenen Tasten. Wenn Sie das getan haben, �berpr�fen Sie,"
+msgstr ""
+"Dr�cken Sie alle angegebenen Tasten. Wenn Sie das getan haben, �berpr�fen "
+"Sie,"
 
 msgid "which keys are not marked with OK.  Press space on the missing"
-msgstr "welche Tasten nicht mit OK markiert sind.  Dr�cken Sie die Leertaste bei den Fehlenden"
+msgstr ""
+"welche Tasten nicht mit OK markiert sind.  Dr�cken Sie die Leertaste bei den "
+"Fehlenden"
 
 msgid "key, or click with the mouse to define it. Move around with Tab."
 msgstr "Tasten oder arbeiten Sie mit der Maus, um sie zu definieren. "
@@ -2343,7 +2373,8 @@ msgid ""
 "   Menus:        menu, menuhot, menusel, menuhotsel\n"
 "   Editor:       editnormal, editbold, editmarked\n"
 "   Help:         helpnormal, helpitalic, helpbold, helplink, helpslink\n"
-"   File types:   directory, executable, link, stalelink, device, special, core\n"
+"   File types:   directory, executable, link, stalelink, device, special, "
+"core\n"
 "\n"
 "Colors:\n"
 "   black, gray, red, brightred, green, brightgreen, brown,\n"
@@ -2364,7 +2395,8 @@ msgstr ""
 "   Men�s:         menu, menuhot, menusel, menuhotsel\n"
 "   Editor:        editnormal, editbold, editmarked\n"
 "   Hilfe:         helpnormal, helpitalic, helplink, helpslink\n"
-"   Dateitypen:    directory, executable, link, stalelink, device, special, core\n"
+"   Dateitypen:    directory, executable, link, stalelink, device, special, "
+"core\n"
 "\n"
 "Farben:\n"
 "   black, gray, red, brightred, green, brightgreen, brown,\n"
@@ -2819,7 +2851,8 @@ msgid ""
 "File %s is not owned by root or you or is world writable.\n"
 "Using it may compromise your security"
 msgstr ""
-"Die Datei %s geh�rt weder root noch Ihnen oder sie kann von jedem beschrieben werden.\n"
+"Die Datei %s geh�rt weder root noch Ihnen oder sie kann von jedem "
+"beschrieben werden.\n"
 "Sie zu benutzen, kann Ihre Sicherheit gef�hrden"
 
 #, c-format
@@ -2835,9 +2868,6 @@ msgstr "%e. %b %H.%M"
 msgid "%b %e  %Y"
 msgstr "%e. %b %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s ist kein Verzeichnis\n"
@@ -3593,4 +3623,3 @@ msgstr "Interner Fehler:"
 
 msgid "Changes to file lost"
 msgstr "�nderungen an Datei verlorengegangen"
-
diff --git a/po/el.po b/po/el.po
index a843108ae..e7b3dc277 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.38\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 1997-07-23 00:04-0400\n"
 "Last-Translator: Spiros Papadimitriou <spapadim+@cs.cmu.edu>\n"
 "Language-Team: Greek <el@li.org>\n"
@@ -55,7 +55,7 @@ msgstr " 
 msgid "Macro recursion is too deep"
 msgstr ""
 
-msgid " Enter file name: "
+msgid "&Dismiss"
 msgstr ""
 
 msgid "Warning"
@@ -105,6 +105,9 @@ msgstr ""
 msgid " Save As "
 msgstr " ���������� �� "
 
+msgid " Enter file name: "
+msgstr ""
+
 msgid " A file already exists with this name. "
 msgstr ""
 
@@ -356,9 +359,6 @@ msgstr " 
 msgid " Execute Macro "
 msgstr " �����. ������������"
 
-msgid "&Dismiss"
-msgstr ""
-
 msgid " Emacs key: "
 msgstr " ������� Emacs: "
 
@@ -775,6 +775,9 @@ msgstr ""
 msgid "Sort order"
 msgstr ""
 
+msgid "Executable first"
+msgstr ""
+
 msgid " confirm di&Rectory hotlist delete "
 msgstr ""
 
@@ -1285,6 +1288,9 @@ msgid ""
 " %s "
 msgstr ""
 
+msgid "&Abort"
+msgstr ""
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1298,7 +1304,10 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid " `%s' and `%s' are the same file "
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr ""
 
 #, c-format
@@ -1424,6 +1433,10 @@ msgid ""
 " %s "
 msgstr ""
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr ""
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr ""
@@ -1517,9 +1530,6 @@ msgstr ""
 msgid "&Retry"
 msgstr ""
 
-msgid "&Abort"
-msgstr ""
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2699,9 +2709,6 @@ msgstr ""
 msgid "%b %e  %Y"
 msgstr ""
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "���������� ���� ���������"
diff --git a/po/es.po b/po/es.po
index 77c162522..11a7f2c79 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 4.6.2\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2008-06-15 19:00+0100\n"
 "Last-Translator: David Martín <dmartina@excite.com\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -55,8 +55,8 @@ msgstr " El archivo %s es demasiado grande "
 msgid "Macro recursion is too deep"
 msgstr "La macro es demasiado recursiva"
 
-msgid " Enter file name: "
-msgstr " Teclee el nombre del archivo: "
+msgid "&Dismiss"
+msgstr "&Ignorar"
 
 msgid "Warning"
 msgstr "¡ Atención !"
@@ -103,6 +103,9 @@ msgstr " Modo de guardar "
 msgid " Save As "
 msgstr " Guardar como "
 
+msgid " Enter file name: "
+msgstr " Teclee el nombre del archivo: "
+
 msgid " A file already exists with this name. "
 msgstr " Ya existe un archivo con ese nombre. "
 
@@ -352,9 +355,6 @@ msgstr " Presione cualquier tecla: "
 msgid " Execute Macro "
 msgstr " Ejecutar macro "
 
-msgid "&Dismiss"
-msgstr "&Ignorar"
-
 msgid " Emacs key: "
 msgstr " Tecla Emacs: "
 
@@ -784,6 +784,9 @@ msgstr "distinguir ma&Yúsculas"
 msgid "Sort order"
 msgstr " Ordenar "
 
+msgid "Executable first"
+msgstr ""
+
 msgid " confirm di&Rectory hotlist delete "
 msgstr " confirmar eliminación de &Favoritos "
 
@@ -1313,6 +1316,9 @@ msgstr ""
 " Imposible crear el enlace simbólico destino \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Abortar"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1329,8 +1335,11 @@ msgstr ""
 " Imposible identificar el archivo origen \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " \"%s\" y \"%s\" son el mismo archivo "
 
 #, c-format
@@ -1492,6 +1501,10 @@ msgstr ""
 " Imposible identificar el archivo \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " \"%s\" y \"%s\" son el mismo archivo "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Imposible sobrescribir el directorio \"%s\" "
@@ -1595,9 +1608,6 @@ msgstr " Lo siento, no pude poner la tarea en 2º plano "
 msgid "&Retry"
 msgstr "&Reintentar"
 
-msgid "&Abort"
-msgstr "&Abortar"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2847,9 +2857,6 @@ msgstr "%e %b %H:%M"
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
-msgid "(invalid)"
-msgstr "(inválido)"
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s no es un directorio\n"
@@ -3607,6 +3614,9 @@ msgstr "Error interno:"
 msgid "Changes to file lost"
 msgstr "Los cambios del archivo se han perdido"
 
+#~ msgid "(invalid)"
+#~ msgstr "(inválido)"
+
 #~ msgid " Notice "
 #~ msgstr " Aviso "
 
diff --git a/po/eu.po b/po/eu.po
index 3e2d0964b..1dd9d32c4 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.99\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: mari susperregi <mari@elhuyar.com>\n"
 "Language-Team: Euskara\n"
@@ -56,9 +56,8 @@ msgstr " Fitxategia handiegia da: "
 msgid "Macro recursion is too deep"
 msgstr ""
 
-#, fuzzy
-msgid " Enter file name: "
-msgstr "Sartu lerroa: "
+msgid "&Dismiss"
+msgstr "&Itxi"
 
 msgid "Warning"
 msgstr "Abisua"
@@ -105,6 +104,10 @@ msgstr " Editatu Gorde modua "
 msgid " Save As "
 msgstr " Gorde honela "
 
+#, fuzzy
+msgid " Enter file name: "
+msgstr "Sartu lerroa: "
+
 msgid " A file already exists with this name. "
 msgstr " Izen hau duen fitxategia badago lehendik. "
 
@@ -363,9 +366,6 @@ msgstr " Sakatu tekla bat: "
 msgid " Execute Macro "
 msgstr " Exekutatu makroa "
 
-msgid "&Dismiss"
-msgstr "&Itxi"
-
 msgid " Emacs key: "
 msgstr " Emacs tekla: "
 
@@ -797,6 +797,9 @@ msgstr "maiuskulak eta minuskulak bereizten ditu"
 msgid "Sort order"
 msgstr "Ordenazioa"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "&gogokoen direktorioa                C-\\"
@@ -1333,6 +1336,9 @@ msgstr ""
 "Ezin da \"%s\" helburu-esteka sinbolikorik sortu\n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Abortatu"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1349,8 +1355,11 @@ msgstr ""
 "Ezin da \"%s\" iturburu-fitxategia identifikatu\n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr "`%s' eta `%s' fitxategi bera dira "
 
 #, c-format
@@ -1512,6 +1521,10 @@ msgstr ""
 "Ezin da \"%s\" fitxategia identifikatu\n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr "`%s' eta `%s' fitxategi bera dira "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr "Ezin da `%s' direktorioa gainidatzi "
@@ -1615,9 +1628,6 @@ msgstr "Ezin izan dut lana atzeko planoan ipini "
 msgid "&Retry"
 msgstr "&Saiatu berriz"
 
-msgid "&Abort"
-msgstr "&Abortatu"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2872,9 +2882,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%Y %b %e"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "direktorioa"
diff --git a/po/fi.po b/po/fi.po
index bce07f5c0..f68de8256 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gmc finnish 0.01\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 1999-08-23 17:30+0200\n"
 "Last-Translator: Mikko Rauhala <mjr@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -55,8 +55,8 @@ msgstr " Tiedosto on liian suuri: "
 msgid "Macro recursion is too deep"
 msgstr ""
 
-msgid " Enter file name: "
-msgstr " Anna tiedostonimi: "
+msgid "&Dismiss"
+msgstr "&Kuittaa"
 
 msgid "Warning"
 msgstr "Varoitus"
@@ -105,6 +105,9 @@ msgstr " Muokkaa tallennusmoodia "
 msgid " Save As "
 msgstr " Tallenna nimell� "
 
+msgid " Enter file name: "
+msgstr " Anna tiedostonimi: "
+
 msgid " A file already exists with this name. "
 msgstr " T�m�nniminen tiedosto on jo olemassa. "
 
@@ -361,9 +364,6 @@ msgstr " Paina jotakin n
 msgid " Execute Macro "
 msgstr " Suorita makro "
 
-msgid "&Dismiss"
-msgstr "&Kuittaa"
-
 msgid " Emacs key: "
 msgstr " Emacs-n�pp�in: "
 
@@ -794,6 +794,9 @@ msgstr "&Isot/pienet eroavat"
 msgid "Sort order"
 msgstr "J�rjestys"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr " varmista &Poisto "
@@ -1330,6 +1333,9 @@ msgstr ""
 " Ei voitu luoda symbolista linkki� \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr ""
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1346,9 +1352,12 @@ msgstr ""
 " Ei saada tietoja l�hdetiedostosta \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
-msgstr ""
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
+msgstr " '%s' ja '%s' ovat sama tiedosto. "
 
 #, c-format
 msgid ""
@@ -1477,6 +1486,10 @@ msgid ""
 " %s "
 msgstr ""
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr ""
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr ""
@@ -1570,9 +1583,6 @@ msgstr ""
 msgid "&Retry"
 msgstr ""
 
-msgid "&Abort"
-msgstr ""
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2760,9 +2770,6 @@ msgstr ""
 msgid "%b %e  %Y"
 msgstr ""
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "Luo uusi hakemisto"
diff --git a/po/fr.po b/po/fr.po
index 738960865..a2ad05563 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.99a\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2002-04-30 16:46+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <christophe@merlet.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -58,8 +58,8 @@ msgstr " Fichier trop gros : "
 msgid "Macro recursion is too deep"
 msgstr ""
 
-msgid " Enter file name: "
-msgstr " Saisissez le nom de fichier : "
+msgid "&Dismiss"
+msgstr "&Fermer"
 
 msgid "Warning"
 msgstr "Attention"
@@ -106,6 +106,9 @@ msgstr " 
 msgid " Save As "
 msgstr " Enregistrer sous "
 
+msgid " Enter file name: "
+msgstr " Saisissez le nom de fichier : "
+
 msgid " A file already exists with this name. "
 msgstr " Un fichier portant le m�me nom existe d�j�. "
 
@@ -366,9 +369,6 @@ msgstr " Appuyez sur une touche : "
 msgid " Execute Macro "
 msgstr " Ex�cuter macro "
 
-msgid "&Dismiss"
-msgstr "&Fermer"
-
 msgid " Emacs key: "
 msgstr " Touches Emacs : "
 
@@ -799,6 +799,9 @@ msgstr "Respec&t de la casse "
 msgid "Sort order"
 msgstr "Ordre de tri"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "&R�pertoire hotlist              C-\\"
@@ -1332,6 +1335,9 @@ msgstr ""
 " Ne peut cr�er le lien symbolique cible � %s �\n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Interrompre"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1348,8 +1354,11 @@ msgstr ""
 " Ne peut analyser le fichier source � %s �\n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " � %s � et � %s � sont le m�me fichier "
 
 #, c-format
@@ -1509,6 +1518,10 @@ msgstr ""
 " Ne peut acc�der � � %s �\n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " � %s � et � %s � sont le m�me fichier "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Ne peut �craser le r�pertoire � %s � "
@@ -1612,9 +1625,6 @@ msgstr " D
 msgid "&Retry"
 msgstr "&R�-essayer"
 
-msgid "&Abort"
-msgstr "&Interrompre"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2871,9 +2881,6 @@ msgstr "%e %b %H:%M"
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "Cr�e un nouveau r�pertoire"
diff --git a/po/hu.po b/po/hu.po
index 20d33133c..5e915e836 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2005-07-22 00:47+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -59,8 +59,8 @@ msgstr " A(z) \"%s\" f
 msgid "Macro recursion is too deep"
 msgstr "A makr�rekurzi� t�l m�ly"
 
-msgid " Enter file name: "
-msgstr " F�jln�v: "
+msgid "&Dismiss"
+msgstr "&Tov�bb"
 
 #
 msgid "Warning"
@@ -111,6 +111,9 @@ msgstr " Ment
 msgid " Save As "
 msgstr " Ment�s m�s n�vvel "
 
+msgid " Enter file name: "
+msgstr " F�jln�v: "
+
 msgid " A file already exists with this name. "
 msgstr " M�r l�tezik ilyen nev� f�jl. "
 
@@ -366,9 +369,6 @@ msgstr " Nyomjon meg egy billenty
 msgid " Execute Macro "
 msgstr " Makr� futtat�sa "
 
-msgid "&Dismiss"
-msgstr "&Tov�bb"
-
 msgid " Emacs key: "
 msgstr " Emacs-billenty�: "
 
@@ -812,6 +812,9 @@ msgstr "&Kis-/nagybet
 msgid "Sort order"
 msgstr " Rendez�si m�d "
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "K�nyvt�r-&gyorslista       C-\\"
@@ -1360,6 +1363,9 @@ msgstr ""
 " (\"%s\"). \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Megszak�t�s"
+
 # 2. %s: hiba�zenet
 #, c-format
 msgid ""
@@ -1378,8 +1384,11 @@ msgstr ""
 " forr�sf�jl adatait. \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr ""
 " \"%s\" �s \n"
 " \"%s\" ugyanaz a f�jl "
@@ -1554,6 +1563,12 @@ msgstr ""
 " f�jl adatait. \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr ""
+" \"%s\" �s \n"
+" \"%s\" ugyanaz a f�jl "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Nem siker�lt fel�l�rni a(z) \"%s\" k�nyvt�rt "
@@ -1673,9 +1688,6 @@ msgstr " Nem lehet a m
 msgid "&Retry"
 msgstr "�j&ra"
 
-msgid "&Abort"
-msgstr "&Megszak�t�s"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2976,9 +2988,6 @@ msgstr "%b %e %H.%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "\"%s\" nem k�nyvt�r\n"
diff --git a/po/it.po b/po/it.po
index c49349730..22dbabf34 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 4.6.2\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2008-04-07 17:25+0200\n"
 "Last-Translator: Marco Ciampa <ciampix@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>,<it@li.org>\n"
@@ -58,8 +58,8 @@ msgstr " Il file %s è troppo grande "
 msgid "Macro recursion is too deep"
 msgstr "La ricorsione macro è troppo profonda"
 
-msgid " Enter file name: "
-msgstr " Inserire nome file: "
+msgid "&Dismiss"
+msgstr "&Chiudi"
 
 msgid "Warning"
 msgstr "Attenzione"
@@ -106,6 +106,9 @@ msgstr " Modifica modo salvataggio"
 msgid " Save As "
 msgstr " Salva come "
 
+msgid " Enter file name: "
+msgstr " Inserire nome file: "
+
 msgid " A file already exists with this name. "
 msgstr " Un file con lo stesso nome esiste già. "
 
@@ -355,9 +358,6 @@ msgstr " Premere un tasto: "
 msgid " Execute Macro "
 msgstr " Esegue macro "
 
-msgid "&Dismiss"
-msgstr "&Chiudi"
-
 msgid " Emacs key: "
 msgstr " Tasto emacs: "
 
@@ -787,6 +787,9 @@ msgstr "Controlla mai&uscole/minuscole"
 msgid "Sort order"
 msgstr "Modalità ordinamento"
 
+msgid "Executable first"
+msgstr ""
+
 msgid " confirm di&Rectory hotlist delete "
 msgstr " conferma cancellazione di&r favorite "
 
@@ -1319,6 +1322,9 @@ msgstr ""
 " Impossibile creare il coll. simbolico di destinazione \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Esci"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1335,8 +1341,11 @@ msgstr ""
 " Non trovo le informazioni sul file \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' e `%s' sono lo stesso file "
 
 #, c-format
@@ -1498,6 +1507,10 @@ msgstr ""
 " Non posso ottenere informazioni sul file \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' e `%s' sono lo stesso file "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Non posso rinominare la directory `%s' "
@@ -1603,9 +1616,6 @@ msgstr " Spiacente, non posso mettere il programma in background "
 msgid "&Retry"
 msgstr "&Riprova"
 
-msgid "&Abort"
-msgstr "&Esci"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2856,9 +2866,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr "(non valido)"
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s non è una directory\n"
@@ -3614,6 +3621,9 @@ msgstr " Errore interno:"
 msgid "Changes to file lost"
 msgstr "Cambiamenti al file persi"
 
+#~ msgid "(invalid)"
+#~ msgstr "(non valido)"
+
 #~ msgid " Notice "
 #~ msgstr " Avviso "
 
diff --git a/po/ja.po b/po/ja.po
index 9ef3e645d..0cd572a60 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc CVS-20011220\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2001-12-20 18:33+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -56,9 +56,8 @@ msgstr "
 msgid "Macro recursion is too deep"
 msgstr ""
 
-#, fuzzy
-msgid " Enter file name: "
-msgstr " ���ֹ�����Ϥ��Ƥ�������: "
+msgid "&Dismiss"
+msgstr "�õ�(&D)"
 
 msgid "Warning"
 msgstr "�ٹ�"
@@ -105,6 +104,10 @@ msgstr "
 msgid " Save As "
 msgstr " ��̾����¸ "
 
+#, fuzzy
+msgid " Enter file name: "
+msgstr " ���ֹ�����Ϥ��Ƥ�������: "
+
 msgid " A file already exists with this name. "
 msgstr "Ʊ̾�Υե����뤬¸�ߤ��ޤ�"
 
@@ -361,9 +364,6 @@ msgstr " 
 msgid " Execute Macro "
 msgstr " �ޥ�����¹� "
 
-msgid "&Dismiss"
-msgstr "�õ�(&D)"
-
 msgid " Emacs key: "
 msgstr " Emacs����: "
 
@@ -795,6 +795,9 @@ msgstr "
 msgid "Sort order"
 msgstr "�¤��Ѥ���"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "�ǥ��쥯�ȥ�ۥåȥꥹ��(&R) C-\\"
@@ -1328,6 +1331,9 @@ msgstr ""
 " �������åȤΥ���ܥ�å���� \"%s\" ������Ǥ��ޤ��� \n"
 " %s "
 
+msgid "&Abort"
+msgstr "����(&A)"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1344,8 +1350,11 @@ msgstr ""
 " ���ե����� \"%s\" �� stat �Ǥ��ޤ���\n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' �� `%s' ��Ʊ���ե�����Ǥ� "
 
 #, c-format
@@ -1507,6 +1516,10 @@ msgstr ""
 " �ե����� \"%s\" �� stat �Ǥ��ޤ���\n"
 "  %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' �� `%s' ��Ʊ���ե�����Ǥ� "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " �ǥ��쥯�ȥ� `%s' ���񤭤Ǥ��ޤ��� "
@@ -1610,9 +1623,6 @@ msgstr " 
 msgid "&Retry"
 msgstr "�ƻ��(&R)"
 
-msgid "&Abort"
-msgstr "����(&A)"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2861,9 +2871,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "directory"
diff --git a/po/ko.po b/po/ko.po
index 0fa2aa927..32ddfd952 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.6.0-pre3\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2003-01-22 17:31+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -53,8 +53,8 @@ msgstr " 
 msgid "Macro recursion is too deep"
 msgstr "��ũ�ΰ� �ʹ� ���� �ݺ��Ǿ� �ҷ������ϴ�"
 
-msgid " Enter file name: "
-msgstr " ���ϸ� �Է�: "
+msgid "&Dismiss"
+msgstr "���(&D)"
 
 msgid "Warning"
 msgstr "���"
@@ -101,6 +101,9 @@ msgstr " 
 msgid " Save As "
 msgstr " ���̸����� ���� "
 
+msgid " Enter file name: "
+msgstr " ���ϸ� �Է�: "
+
 msgid " A file already exists with this name. "
 msgstr " ���� �̸��� ������ �̹� �ֽ��ϴ�. "
 
@@ -356,9 +359,6 @@ msgstr " 
 msgid " Execute Macro "
 msgstr " ��ũ�� ���� "
 
-msgid "&Dismiss"
-msgstr "���(&D)"
-
 msgid " Emacs key: "
 msgstr " Emacs �ۼ�: "
 
@@ -789,6 +789,9 @@ msgstr "
 msgid "Sort order"
 msgstr "���� ����"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "���丮 ������(&R)        C-\\"
@@ -1316,6 +1319,9 @@ msgstr ""
 " �ɺ�����ũ \"%s\"��(��) ���� �� �����ϴ� \n"
 " %s "
 
+msgid "&Abort"
+msgstr "�ߴ�(&A)"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1332,8 +1338,11 @@ msgstr ""
 " \"%s\" ���� ������ ���� �� �����ϴ� \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s'�� `%s'��(��) ���� �����Դϴ� "
 
 #, c-format
@@ -1495,6 +1504,10 @@ msgstr ""
 " \"%s\" ������ ������ ���� �� �����ϴ� \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s'�� `%s'��(��) ���� �����Դϴ� "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " `%s' ���丮�� ��� �� �����ϴ� "
@@ -1598,9 +1611,6 @@ msgstr " 
 msgid "&Retry"
 msgstr "��õ�(&R)"
 
-msgid "&Abort"
-msgstr "�ߴ�(&A)"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2843,9 +2853,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s��(��) ���丮�� �ƴմϴ�\n"
diff --git a/po/lt.po b/po/lt.po
index 3a395cf62..c1887cfc5 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.6.1\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:05+0000\n"
 "PO-Revision-Date: 2009-02-16 19:45+0300\n"
 "Last-Translator: Andrius Štikonas <stikonas@gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2;\n"
 
 msgid " Choose syntax highlighting "
 msgstr " Parinkite sintaksės ryškinimą "
@@ -55,8 +56,8 @@ msgstr " Failas %s yra per didelis "
 msgid "Macro recursion is too deep"
 msgstr "Makrokomandų rekursija yra per gili"
 
-msgid " Enter file name: "
-msgstr " Įveskite failo pavadinimą: "
+msgid "&Dismiss"
+msgstr "At&mesti"
 
 msgid "Warning"
 msgstr "Įspėjimas"
@@ -103,6 +104,9 @@ msgstr " Keisti įrašymo režimą "
 msgid " Save As "
 msgstr " Įrašyti kaip "
 
+msgid " Enter file name: "
+msgstr " Įveskite failo pavadinimą: "
+
 msgid " A file already exists with this name. "
 msgstr " Failas šiuo pavadinimu jau yra. "
 
@@ -218,8 +222,11 @@ msgstr " Pakeisti "
 msgid "Search"
 msgstr "Paieška"
 
-msgid " Invalid regular expression, or scanf expression with too many conversions "
-msgstr " Klaida reguliarioje išraiškoje, arba „scanf“ išraiška turi per daug konvertavimų "
+msgid ""
+" Invalid regular expression, or scanf expression with too many conversions "
+msgstr ""
+" Klaida reguliarioje išraiškoje, arba „scanf“ išraiška turi per daug "
+"konvertavimų "
 
 msgid " Error in replacement format string. "
 msgstr " Klaida pakeitimo eilutės formate. "
@@ -349,9 +356,6 @@ msgstr " Paspauskite bet kurį klavišą: "
 msgid " Execute Macro "
 msgstr " Įvykdyti makrokomandą "
 
-msgid "&Dismiss"
-msgstr "At&mesti"
-
 msgid " Emacs key: "
 msgstr " „Emacs“ klavišas: "
 
@@ -781,6 +785,9 @@ msgstr "Skir&ti ABC nuo abc"
 msgid "Sort order"
 msgstr "Rikiavimo tvarka"
 
+msgid "Executable first"
+msgstr ""
+
 msgid " confirm di&Rectory hotlist delete "
 msgstr " patvirtinti katalogų są&rašo šalinimą "
 
@@ -1245,16 +1252,26 @@ msgid " %s%s file error"
 msgstr " %s%s failo klaida"
 
 #, c-format
-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."
-msgstr "3.0 versijoje pasikeitė „%smc.ext“ failo formatas. Panašu, kad įdiegimas nepavyko. Įsidiekite naują „Midnight Commander“ versiją."
+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."
+msgstr ""
+"3.0 versijoje pasikeitė „%smc.ext“ failo formatas. Panašu, kad įdiegimas "
+"nepavyko. Įsidiekite naują „Midnight Commander“ versiją."
 
 #, c-format
 msgid " ~/%s file error "
 msgstr " ~/%s failo klaida "
 
 #, c-format
-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."
-msgstr "3.0 versijoje pasikeitė ~/%s failo formatas. Galite jį nukopijuoti iš %smc.ext arba naudoti tą failą kaip pavyzdį naujo rašymui."
+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."
+msgstr ""
+"3.0 versijoje pasikeitė ~/%s failo formatas. Galite jį nukopijuoti iš %smc."
+"ext arba naudoti tą failą kaip pavyzdį naujo rašymui."
 
 msgid " Copy "
 msgstr " Kopijuoti "
@@ -1296,6 +1313,9 @@ msgstr ""
 " Nepavyko pakeisti „%s“ režimo \n"
 " %s "
 
+msgid "&Abort"
+msgstr "Nutr&aukti"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1312,8 +1332,11 @@ msgstr ""
 " Nepavyko nustatyti failo „%s“ būklės („stat“) \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " „%s“ ir „%s“ yra tas pats failas "
 
 #, c-format
@@ -1475,6 +1498,10 @@ msgstr ""
 " Nepavyko patikrinti failo „%s“ \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " „%s“ ir „%s“ yra tas pats failas "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Nepavyko perrašyti aplanko „%s“ "
@@ -1580,9 +1607,6 @@ msgstr " Nepavyko nukelti darbo į foną "
 msgid "&Retry"
 msgstr "&Iš naujo"
 
-msgid "&Abort"
-msgstr "Nutr&aukti"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -1886,7 +1910,8 @@ msgid " Hotlist Load "
 msgstr " Katalogų sąrašo įkėlimas "
 
 #, c-format
-msgid "MC was unable to write ~/%s file, your old hotlist entries were not deleted"
+msgid ""
+"MC was unable to write ~/%s file, your old hotlist entries were not deleted"
 msgstr "MC nesugebėjo įrašyti ~/%s failo, jūsų seni sąrašai nebuvo ištrinti"
 
 #, c-format
@@ -2337,7 +2362,8 @@ msgid ""
 "   Menus:        menu, menuhot, menusel, menuhotsel\n"
 "   Editor:       editnormal, editbold, editmarked\n"
 "   Help:         helpnormal, helpitalic, helpbold, helplink, helpslink\n"
-"   File types:   directory, executable, link, stalelink, device, special, core\n"
+"   File types:   directory, executable, link, stalelink, device, special, "
+"core\n"
 "\n"
 "Colors:\n"
 "   black, gray, red, brightred, green, brightgreen, brown,\n"
@@ -2357,7 +2383,8 @@ msgstr ""
 "   Meniu:          menu, menuhot, menusel, menuhotsel\n"
 "   Redaktorius:    editnormal, editbold, editmarked\n"
 "   Pagalba:        helpnormal, helpitalic, helpbold, helplink, helpslink\n"
-"   Failų tipai: directory, executable, link, stalelink, device, special, core\n"
+"   Failų tipai: directory, executable, link, stalelink, device, special, "
+"core\n"
 "\n"
 "Spalvos:\n"
 "   black, gray, red, brightred, green, brightgreen, brown,\n"
@@ -2828,9 +2855,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr "(negalioja)"
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s nėra aplankas\n"
@@ -3586,24 +3610,36 @@ msgstr "Vidinė klaida:"
 msgid "Changes to file lost"
 msgstr "Failo pakeitimai prarasti"
 
+#~ msgid "(invalid)"
+#~ msgstr "(negalioja)"
+
 #~ msgid "&Home"
 #~ msgstr "&Namų"
+
 #~ msgid "&Type"
 #~ msgstr "&Tipas"
+
 #~ msgid "&Links"
 #~ msgstr "&Nuorodos"
+
 #~ msgid "N&GID"
 #~ msgstr "N&GID"
+
 #~ msgid "N&UID"
 #~ msgstr "N&UID"
+
 #~ msgid "&Owner"
 #~ msgstr "&Savin."
+
 #~ msgid "&Group"
 #~ msgstr "&Grupė"
+
 #~ msgid "MC was unable to write ~/"
 #~ msgstr "Nepavyko įrašyti ~/"
+
 #~ msgid " Notice "
 #~ msgstr " Pastaba "
+
 #~ msgid ""
 #~ " The Midnight Commander configuration files \n"
 #~ " are now stored in the ~/.mc directory, the \n"
@@ -3611,4 +3647,3 @@ msgstr "Failo pakeitimai prarasti"
 #~ msgstr ""
 #~ " „Midnight Commander“ savo nustatymus laiko \n"
 #~ " „~/.mc“ kataloge, rinkmenos perkeltos į jį.\n"
-
diff --git a/po/lv.po b/po/lv.po
index 2e1f88a90..afbabca1c 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2001-11-20 15:15+0200\n"
 "Last-Translator: Artis Trops <hornet@navigators.lv>\n"
 "Language-Team: Latvian <hornet@navigators.lv>\n"
@@ -55,9 +55,8 @@ msgstr " Fails ir par lielu: "
 msgid "Macro recursion is too deep"
 msgstr ""
 
-#, fuzzy
-msgid " Enter file name: "
-msgstr " Ievad�et l�niju: "
+msgid "&Dismiss"
+msgstr "&Atcelt"
 
 msgid "Warning"
 msgstr "Br�din�jums"
@@ -104,6 +103,10 @@ msgstr " Redi
 msgid " Save As "
 msgstr " Glab�t K� "
 
+#, fuzzy
+msgid " Enter file name: "
+msgstr " Ievad�et l�niju: "
+
 msgid " A file already exists with this name. "
 msgstr " Fails ar t�du nosaukumu jau eksist�. "
 
@@ -362,9 +365,6 @@ msgstr " Spiest jebkuru tausti
 msgid " Execute Macro "
 msgstr " Palaist Makro "
 
-msgid "&Dismiss"
-msgstr "&Atcelt"
-
 msgid " Emacs key: "
 msgstr "Emacs tausti��: "
 
@@ -796,6 +796,9 @@ msgstr "lielo/ma&zo burtu j
 msgid "Sort order"
 msgstr "K�rto�anas sec�ba"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "di&Rektoriju karstais saraksts    C-\\"
@@ -1329,6 +1332,9 @@ msgstr ""
 " Nevar izveidot m�r�a simbolsaiti \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Atsaukt"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1345,8 +1351,11 @@ msgstr ""
 " Nevar s�kn�t avota failu \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' un `%s' ir tas pats fails "
 
 #, c-format
@@ -1508,6 +1517,10 @@ msgstr ""
 " Nevar s�kn�t failu \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' un `%s' ir tas pats fails "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Nevar p�rrakst�t direktoriju `%s' "
@@ -1611,9 +1624,6 @@ msgstr " Atvaino, bet nevar
 msgid "&Retry"
 msgstr "&V�lreiz"
 
-msgid "&Abort"
-msgstr "&Atsaukt"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2868,9 +2878,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "direktoriju"
diff --git a/po/mn.po b/po/mn.po
index 0b043a9e5..f08447d9c 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mn\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2003-03-04 21:16+0100\n"
 "Last-Translator: Sanlig Badral <badral@chinggis.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
@@ -59,8 +59,8 @@ msgstr " Маш том файл: "
 msgid "Macro recursion is too deep"
 msgstr "Макрогийн рекурс хэт гүн байна"
 
-msgid " Enter file name: "
-msgstr " Файлын нэрээ оруул: "
+msgid "&Dismiss"
+msgstr "&Хаах"
 
 msgid "Warning"
 msgstr "Анхааруулга"
@@ -107,6 +107,9 @@ msgstr " Хадгалах гормыг засварлах "
 msgid " Save As "
 msgstr " Гэж хадгалах "
 
+msgid " Enter file name: "
+msgstr " Файлын нэрээ оруул: "
+
 msgid " A file already exists with this name. "
 msgstr " Файл аль хэдийнэ ийм нэрээр үүссэн байна. "
 
@@ -365,9 +368,6 @@ msgstr " Дурын товч дарна уу: "
 msgid " Execute Macro "
 msgstr " Макрог гүйцэтгэх "
 
-msgid "&Dismiss"
-msgstr "&Хаах"
-
 msgid " Emacs key: "
 msgstr " Emacs-ийн товчлуурууд: "
 
@@ -798,6 +798,9 @@ msgstr "Учет ре&гистра"
 msgid "Sort order"
 msgstr "Эрэмбэлэх дараалал"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "&Хавтасны лавлах  C-\\"
@@ -1325,6 +1328,9 @@ msgstr ""
 " Заагдсан тэмдэгт холбоосийг үүсгэж чадсангүй \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Таслах"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1341,8 +1347,11 @@ msgstr ""
 " Эх файлыг байрлуулж чадсангүй \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' ба `%s' ууд нь адил файл байна "
 
 #, c-format
@@ -1504,6 +1513,10 @@ msgstr ""
 " Файлын stat ийг авч чадсангүй\"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' ба `%s' ууд нь адил файл байна "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " `%s' лавлахыг дарж бичиж чадсангүй "
@@ -1608,9 +1621,6 @@ msgstr " Уучлаарай, арын фонд ажилыг оруулж чад
 msgid "&Retry"
 msgstr "&Дахих"
 
-msgid "&Abort"
-msgstr "&Таслах"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2853,9 +2863,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s нь лавлах биш байна\n"
diff --git a/po/nl.po b/po/nl.po
index 5fce11d07..e46ad3f8f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.6.1\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-02-13 12:30+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2009-02-13\n"
 "Last-Translator: Marcel Pol <mpol@gmx.net>\n"
 "Language-Team: \n"
@@ -57,6 +57,9 @@ msgstr " Bestand %s is te groot "
 msgid "Macro recursion is too deep"
 msgstr "Macro-recursie gaat te diep"
 
+msgid "&Dismiss"
+msgstr "&Verwerp"
+
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -353,9 +356,6 @@ msgstr " Druk een toets: "
 msgid " Execute Macro "
 msgstr " Macro uitvoeren "
 
-msgid "&Dismiss"
-msgstr "&Verwerp"
-
 msgid " Emacs key: "
 msgstr " Emacs-toets: "
 
@@ -1181,7 +1181,7 @@ msgstr ""
 msgid " Setup "
 msgstr " Instellingen "
 
-#,c-format
+#, c-format
 msgid " Setup saved to ~/%s"
 msgstr " Instellingen opgeslagen in ~/%s"
 
@@ -1317,6 +1317,9 @@ msgstr ""
 " Maken van doel van symbolische link \"%s\" mislukt \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Afbreken"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1333,8 +1336,11 @@ msgstr ""
 " Bronbestand \"%s\" kan niet ge�nspecteerd worden \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' en `%s' zijn het zelfde bestand "
 
 #, c-format
@@ -1496,6 +1502,10 @@ msgstr ""
 " Bestand \"%s\" kan niet ge�nspecteerd worden \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' en `%s' zijn het zelfde bestand "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Overschrijven van map `%s' mislukt "
@@ -1599,9 +1609,6 @@ msgstr " De job kon niet in de achtergrond geplaatst worden "
 msgid "&Retry"
 msgstr "Nogmaals"
 
-msgid "&Abort"
-msgstr "&Afbreken"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2485,9 +2492,6 @@ msgstr "Bereken tota&Len"
 msgid "&Verbose operation"
 msgstr "Uitvoering met &Weergave"
 
-msgid "Mkdir autoname"
-msgstr ""
-
 msgid "&Fast dir reload"
 msgstr "Snel herle&Zen"
 
@@ -2717,6 +2721,12 @@ msgstr "Met ingebouwde editor\n"
 msgid "Using system-installed S-Lang library"
 msgstr "Door het systeem ge�nstalleerd S-Lang bibliotheek zal gebruikt worden."
 
+msgid "Using included S-Lang library"
+msgstr "Bijgesloten S-Lang bibliotheek zal gebruikt worden."
+
+msgid "with termcap database"
+msgstr "met termcap database"
+
 msgid "with terminfo database"
 msgstr "met terminfo database"
 
@@ -3605,12 +3615,6 @@ msgstr "Interne fout:"
 msgid "Changes to file lost"
 msgstr "Wijzigingen zijn verloren"
 
-#~ msgid "Using included S-Lang library"
-#~ msgstr "Bijgesloten S-Lang bibliotheek zal gebruikt worden."
-
-#~ msgid "with termcap database"
-#~ msgstr "met termcap database"
-
 #~ msgid "&Home"
 #~ msgstr "&Home"
 
diff --git a/po/no.po b/po/no.po
index 72908572d..418d2cb80 100644
--- a/po/no.po
+++ b/po/no.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.54\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2002-10-22 14:28+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -54,8 +54,8 @@ msgstr " Filen er for stor: "
 msgid "Macro recursion is too deep"
 msgstr "For dyp rekursjon i makro"
 
-msgid " Enter file name: "
-msgstr " Skriv inn filnavn: "
+msgid "&Dismiss"
+msgstr "Forkast"
 
 msgid "Warning"
 msgstr "Advarsel"
@@ -102,6 +102,9 @@ msgstr " Rediger lagringsmodus "
 msgid " Save As "
 msgstr " Lagre som "
 
+msgid " Enter file name: "
+msgstr " Skriv inn filnavn: "
+
 msgid " A file already exists with this name. "
 msgstr " En fil med dette navnet eksisterer allerede. "
 
@@ -358,9 +361,6 @@ msgstr " Trykk en tast: "
 msgid " Execute Macro "
 msgstr " Kj�r makro "
 
-msgid "&Dismiss"
-msgstr "Forkast"
-
 msgid " Emacs key: "
 msgstr " Emacs-tast: "
 
@@ -792,6 +792,9 @@ msgstr "skill mellom s&tore/sm
 msgid "Sort order"
 msgstr "Sorteringsrekkef�lge"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "kataloghurtigliste    C-\\"
@@ -1323,6 +1326,9 @@ msgstr ""
 " Kan ikke lage m�llenken \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Avbryt"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1339,8 +1345,11 @@ msgstr ""
 " Kan ikke kj�re stat p� kildefilen \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' og `%s' er samme fil "
 
 #, c-format
@@ -1502,6 +1511,10 @@ msgstr ""
 " Kan ikke kj�re stat p� filen \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' og `%s' er samme fil "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Kan ikke overskrive katalogen `%s' "
@@ -1605,9 +1618,6 @@ msgstr " Beklager, Jeg kunne ikke plassere jobben i bakgrunnen "
 msgid "&Retry"
 msgstr "&Pr�v igjen"
 
-msgid "&Abort"
-msgstr "&Avbryt"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2853,9 +2863,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "Katalog for utskriftsdata"
diff --git a/po/pl.po b/po/pl.po
index 37ebb5c0d..b5b2c3426 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2003-02-04 02:57+0100\n"
 "Last-Translator: Andrzej Zaborowski <balrog@zabor.org>\n"
 "Language-Team: Polish\n"
@@ -59,8 +59,8 @@ msgstr " Plik %s jest zbyt du
 msgid "Macro recursion is too deep"
 msgstr "Zbyt g��boka rekursja makr"
 
-msgid " Enter file name: "
-msgstr " Wprowad� nazw� pliku: "
+msgid "&Dismiss"
+msgstr "&Porzu�"
 
 msgid "Warning"
 msgstr "Ostrze�enie"
@@ -107,6 +107,9 @@ msgstr " Modyfikacja trybu zapisu "
 msgid " Save As "
 msgstr " Zapisz jako "
 
+msgid " Enter file name: "
+msgstr " Wprowad� nazw� pliku: "
+
 msgid " A file already exists with this name. "
 msgstr " Plik o tej nazwie ju� istnieje. "
 
@@ -356,9 +359,6 @@ msgstr " Naci
 msgid " Execute Macro "
 msgstr " Wykonaj makro "
 
-msgid "&Dismiss"
-msgstr "&Porzu�"
-
 msgid " Emacs key: "
 msgstr " Klawisz Emacsa: "
 
@@ -788,6 +788,9 @@ msgstr "Rozr
 msgid "Sort order"
 msgstr "Porz�dek sortowania"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "Podr�czne &katalogi      C-\\"
@@ -1317,6 +1320,9 @@ msgstr ""
 " Nie mo�na utworzy� dowi�zania symbolicznego \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Rezygnuj"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1333,8 +1339,11 @@ msgstr ""
 " Nie mo�na wykona� operacji stat na pliku �r�d�owym \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " '%s' oraz '%s' to ten sam plik "
 
 #, c-format
@@ -1496,6 +1505,10 @@ msgstr ""
 " Nie mo�na wykona� operacji stat na pliku \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " '%s' oraz '%s' to ten sam plik "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Nie mo�na nadpisa� katalogu '%s' "
@@ -1599,9 +1612,6 @@ msgstr " Niestety nie mo
 msgid "&Retry"
 msgstr "Pon�w"
 
-msgid "&Abort"
-msgstr "&Rezygnuj"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2853,9 +2863,6 @@ msgstr "%e.%m %H:%M"
 msgid "%b %e  %Y"
 msgstr "%e.%m.%Y "
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s to nie katalog\n"
diff --git a/po/pt.po b/po/pt.po
index 8b5a7ba9c..5982b3a58 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2002-04-25 03:55+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -55,9 +55,8 @@ msgstr " Ficheiro demasiado grande: "
 msgid "Macro recursion is too deep"
 msgstr ""
 
-#, fuzzy
-msgid " Enter file name: "
-msgstr " Introduza linha: "
+msgid "&Dismiss"
+msgstr "&Fechar"
 
 msgid "Warning"
 msgstr "Aviso"
@@ -104,6 +103,10 @@ msgstr " Editar Modo Grava
 msgid " Save As "
 msgstr " Gravar Como "
 
+#, fuzzy
+msgid " Enter file name: "
+msgstr " Introduza linha: "
+
 msgid " A file already exists with this name. "
 msgstr " J� existe um ficheiro com este nome. "
 
@@ -361,9 +364,6 @@ msgstr " Primir qualquer tecla: "
 msgid " Execute Macro "
 msgstr " Executar Macro "
 
-msgid "&Dismiss"
-msgstr "&Fechar"
-
 msgid " Emacs key: "
 msgstr " Tecla Emacs: "
 
@@ -795,6 +795,9 @@ msgstr "sens
 msgid "Sort order"
 msgstr "Ordem de ordena��o"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "lista-top de di&rect�rios C-\\"
@@ -1328,6 +1331,9 @@ msgstr ""
 " Incapaz de criar alvo de atalho \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Abortar"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1344,8 +1350,11 @@ msgstr ""
 " Incapaz de opter informa��o do ficheiro origem \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' e `%s' s�o o mesmo ficheiro "
 
 #, c-format
@@ -1507,6 +1516,10 @@ msgstr ""
 " Incapaz de executar stat ao ficheiro \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' e `%s' s�o o mesmo ficheiro "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Incapaz de sobrepor direct�rio `%s' "
@@ -1610,9 +1623,6 @@ msgstr " Incapaz de colocar o processo em exedcu
 msgid "&Retry"
 msgstr "&Repetir"
 
-msgid "&Abort"
-msgstr "&Abortar"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2864,9 +2874,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "direct�rio"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 17e881c18..b7bd138d9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc-4.5.36\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2000-10-27 15:37-03:00\n"
 "Last-Translator: E. A. Tac�o <tacao@conectiva.com.br>\n"
 "Language-Team: pt_BR <ldp-br@bazar.conectiva.com.br>\n"
@@ -59,8 +59,8 @@ msgstr " Arquivo grande demais: "
 msgid "Macro recursion is too deep"
 msgstr ""
 
-msgid " Enter file name: "
-msgstr " Informe nome do arquivo: "
+msgid "&Dismiss"
+msgstr "&Dispensar"
 
 msgid "Warning"
 msgstr "Aviso"
@@ -109,6 +109,9 @@ msgstr " Editar modo de salvamento "
 msgid " Save As "
 msgstr " Salvar Como "
 
+msgid " Enter file name: "
+msgstr " Informe nome do arquivo: "
+
 msgid " A file already exists with this name. "
 msgstr " Um arquivo com esse nome j� existe. "
 
@@ -367,9 +370,6 @@ msgstr " Pressione qualquer tecla: "
 msgid " Execute Macro "
 msgstr " Executar Macro "
 
-msgid "&Dismiss"
-msgstr "&Dispensar"
-
 msgid " Emacs key: "
 msgstr " Tecla do Emacs: "
 
@@ -804,6 +804,9 @@ msgstr "sens
 msgid "Sort order"
 msgstr "Par�metros de ordenamento"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "Lista de di&ret�rios C-\\"
@@ -1347,6 +1350,9 @@ msgstr ""
 " Imposs�vel criar liga��o simb�lica \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "C&Ancelar"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1363,8 +1369,11 @@ msgstr ""
 " N�o � poss�vel testar arquivo de origem \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " '%s' e '%s' s�o o mesmo arquivo"
 
 #, c-format
@@ -1526,6 +1535,10 @@ msgstr ""
 " Imposs�vel testar arquivo \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " '%s' e '%s' s�o o mesmo arquivo"
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Imposs�vel sobrescrever diret�rio '%s' "
@@ -1629,9 +1642,6 @@ msgstr "Desculpe, mas n
 msgid "&Retry"
 msgstr "&Tentar Novamente"
 
-msgid "&Abort"
-msgstr "C&Ancelar"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2897,9 +2907,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "Cria um novo diret�rio"
diff --git a/po/ro.po b/po/ro.po
index 8f6cf9983..5470e792a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.6\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2003-01-31 00:11+0200\n"
 "Last-Translator: Mi�u Moldovan <dumol@go.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -57,8 +57,8 @@ msgstr " Fi
 msgid "Macro recursion is too deep"
 msgstr "Recursivitatea macro este prea mare"
 
-msgid " Enter file name: "
-msgstr " Introduce�i numele fi�ierului: "
+msgid "&Dismiss"
+msgstr "&�nchide"
 
 msgid "Warning"
 msgstr "Aten�ie"
@@ -105,6 +105,9 @@ msgstr " Editeaz
 msgid " Save As "
 msgstr " Salveaz� Ca "
 
+msgid " Enter file name: "
+msgstr " Introduce�i numele fi�ierului: "
+
 msgid " A file already exists with this name. "
 msgstr " Exist� deja un fi�ier cu acest nume. "
 
@@ -361,9 +364,6 @@ msgstr " Ap
 msgid " Execute Macro "
 msgstr " Execut� Combina�ia "
 
-msgid "&Dismiss"
-msgstr "&�nchide"
-
 msgid " Emacs key: "
 msgstr " Tasta Emacs: "
 
@@ -794,6 +794,9 @@ msgstr "nu ignora &Majusculele "
 msgid "Sort order"
 msgstr "Ordinea de sortare"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "lista rapid� de di&Rectoare       C-\\"
@@ -1321,6 +1324,9 @@ msgstr ""
 " Nu pot crea leg�tura simbolic� �int� \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&�ntrerup"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1337,8 +1343,11 @@ msgstr ""
 " Nu pot executa stat pe fi�ierul surs� \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' �i `%s' sunt acela�i fi�ier "
 
 #, c-format
@@ -1500,6 +1509,10 @@ msgstr ""
 " Nu pot executa stat pe fi�ierul \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' �i `%s' sunt acela�i fi�ier "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Nu pot suprascrie directorul `%s' "
@@ -1603,9 +1616,6 @@ msgstr " Scuze, nu am putut trimite opera
 msgid "&Retry"
 msgstr "&Re�ncerc"
 
-msgid "&Abort"
-msgstr "&�ntrerup"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2851,9 +2861,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s nu este un director\n"
diff --git a/po/ru.po b/po/ru.po
index 5ee11d076..1166713ce 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2005-09-09 14:37+0300\n"
 "Last-Translator: Anton S. Chumak <nightfast@yahoo.co.uk>\n"
 "Language-Team: Russian ru@li.org\n"
@@ -66,8 +66,8 @@ msgstr " 
 msgid "Macro recursion is too deep"
 msgstr "������� �������� �������� ��������"
 
-msgid " Enter file name: "
-msgstr " ������� ��� �����: "
+msgid "&Dismiss"
+msgstr "&�������"
 
 msgid "Warning"
 msgstr "��������������"
@@ -114,6 +114,9 @@ msgstr " 
 msgid " Save As "
 msgstr " ��������� ��� "
 
+msgid " Enter file name: "
+msgstr " ������� ��� �����: "
+
 msgid " A file already exists with this name. "
 msgstr " ���� � ����� ������ ��� ����������. "
 
@@ -362,9 +365,6 @@ msgstr " 
 msgid " Execute Macro "
 msgstr " ��������� ������ "
 
-msgid "&Dismiss"
-msgstr "&�������"
-
 msgid " Emacs key: "
 msgstr " ������� Emacs: "
 
@@ -794,6 +794,9 @@ msgstr "
 msgid "Sort order"
 msgstr "������� ����������"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "������� ������ � ����&�����  C-\\"
@@ -1321,6 +1324,9 @@ msgstr ""
 " ���������� ������� ������� ����. ������ \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&��������"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1337,8 +1343,11 @@ msgstr ""
 " ���������� �������� �������� ��������� ����� \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' � `%s' ���� � ��� �� ���� "
 
 #, c-format
@@ -1500,6 +1509,10 @@ msgstr ""
 " ���������� �������� �������� ����� \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' � `%s' ���� � ��� �� ���� "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " ���������� ���������� ������� `%s' "
@@ -1604,9 +1617,6 @@ msgstr " 
 msgid "&Retry"
 msgstr "��&�������"
 
-msgid "&Abort"
-msgstr "&��������"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2855,9 +2865,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s �� �������� ���������\n"
diff --git a/po/sk.po b/po/sk.po
index f6287a07f..9aca0bce4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2009-03-11 10:48+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -56,8 +56,8 @@ msgstr " Súbor %s je príliš veľký"
 msgid "Macro recursion is too deep"
 msgstr "Rekurzia makra je príliš hlboká"
 
-msgid " Enter file name: "
-msgstr " Zadajte meno súboru: "
+msgid "&Dismiss"
+msgstr "&Odmietnuť"
 
 msgid "Warning"
 msgstr "Varovanie"
@@ -104,6 +104,9 @@ msgstr " Upraviť režim ukladania "
 msgid " Save As "
 msgstr " Uložiť ako "
 
+msgid " Enter file name: "
+msgstr " Zadajte meno súboru: "
+
 msgid " A file already exists with this name. "
 msgstr " Súbor s daným meno už existuje. "
 
@@ -219,7 +222,8 @@ msgstr " Nahradiť "
 msgid "Search"
 msgstr "Hľadať"
 
-msgid " Invalid regular expression, or scanf expression with too many conversions "
+msgid ""
+" Invalid regular expression, or scanf expression with too many conversions "
 msgstr " Nesprávny výraz, alebo scanf výraz s mnohými zmenami "
 
 msgid " Error in replacement format string. "
@@ -288,7 +292,8 @@ msgid " Run Sort "
 msgstr " Spustiť triedenie "
 
 msgid " Enter sort options (see manpage) separated by whitespace: "
-msgstr " Zadajte voľby pre triedenie oddelené prázdnym miestom (pozri man stránku): "
+msgstr ""
+" Zadajte voľby pre triedenie oddelené prázdnym miestom (pozri man stránku): "
 
 msgid " Sort "
 msgstr " Triediť "
@@ -350,9 +355,6 @@ msgstr " Stlačte ľubovoľný kláves: "
 msgid " Execute Macro "
 msgstr " Spustiť makro "
 
-msgid "&Dismiss"
-msgstr "&Odmietnuť"
-
 msgid " Emacs key: "
 msgstr " Emacs kláves: "
 
@@ -782,6 +784,9 @@ msgstr "&Citlivý na veľkosť"
 msgid "Sort order"
 msgstr "Poradie triedenia"
 
+msgid "Executable first"
+msgstr "Najprv spustiteľné"
+
 msgid " confirm di&Rectory hotlist delete "
 msgstr " potvrdiť zmazanie hotlistu ad&Resára "
 
@@ -1246,16 +1251,26 @@ msgid " %s%s file error"
 msgstr " %s%s chyba v súbore"
 
 #, c-format
-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."
-msgstr "Formát súboru %smc.ext sa vo verzii 3.0 zmenil. Vyzerá to, že inštalácia zlyhala. Prosím, vezmite si novú kópiu z balíka Midnight Commander."
+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."
+msgstr ""
+"Formát súboru %smc.ext sa vo verzii 3.0 zmenil. Vyzerá to, že inštalácia "
+"zlyhala. Prosím, vezmite si novú kópiu z balíka Midnight Commander."
 
 #, c-format
 msgid " ~/%s file error "
 msgstr " ~/%s chyba v súbore "
 
 #, c-format
-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."
-msgstr "Formát súboru ~/%s sa vo verzii 3.0 zmenil. Buď si ho skopírujte z %smc.ext alebo ho použite ako vzor."
+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."
+msgstr ""
+"Formát súboru ~/%s sa vo verzii 3.0 zmenil. Buď si ho skopírujte z %smc.ext "
+"alebo ho použite ako vzor."
 
 msgid " Copy "
 msgstr " Kopírovať "
@@ -1285,7 +1300,8 @@ msgid ""
 "\n"
 " Option Stable Symlinks will be disabled "
 msgstr ""
-" Nepodarilo sa vyrobiť pevný symb. odkaz naprieč nelokálnymi súb. systémami: \n"
+" Nepodarilo sa vyrobiť pevný symb. odkaz naprieč nelokálnymi súb. "
+"systémami: \n"
 "\n"
 " Voľba stáleho Symbolického odkazu bude vypnutá "
 
@@ -1297,6 +1313,9 @@ msgstr ""
 " Nepodarilo sa vytvoriť cieľový symbolický odkaz \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "p&Rerušiť"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1313,8 +1332,11 @@ msgstr ""
 " Nepodarilo sa zistiť stav zdrojový súbor \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' a `%s' sú rovnaké súbory "
 
 #, c-format
@@ -1476,6 +1498,10 @@ msgstr ""
 " Nepodarilo sa zistiť stav súboru \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' a `%s' sú rovnaké súbory "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Nepodarilo sa prepísať adresár `%s' "
@@ -1579,9 +1605,6 @@ msgstr " Bohužiaľ, nebolo možné presunúť úlohu do pozadia "
 msgid "&Retry"
 msgstr "&Zopakovať"
 
-msgid "&Abort"
-msgstr "p&Rerušiť"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -1885,8 +1908,10 @@ msgid " Hotlist Load "
 msgstr " Nahrať Hotlistu "
 
 #, c-format
-msgid "MC was unable to write ~/%s file, your old hotlist entries were not deleted"
-msgstr "MC nedokázal zapísať súbor ~/%s, vaše staré položky hotlistu neboli zmazané"
+msgid ""
+"MC was unable to write ~/%s file, your old hotlist entries were not deleted"
+msgstr ""
+"MC nedokázal zapísať súbor ~/%s, vaše staré položky hotlistu neboli zmazané"
 
 #, c-format
 msgid "Midnight Commander %s"
@@ -2338,7 +2363,8 @@ msgid ""
 "   Menus:        menu, menuhot, menusel, menuhotsel\n"
 "   Editor:       editnormal, editbold, editmarked\n"
 "   Help:         helpnormal, helpitalic, helpbold, helplink, helpslink\n"
-"   File types:   directory, executable, link, stalelink, device, special, core\n"
+"   File types:   directory, executable, link, stalelink, device, special, "
+"core\n"
 "\n"
 "Colors:\n"
 "   black, gray, red, brightred, green, brightgreen, brown,\n"
@@ -2358,7 +2384,8 @@ msgstr ""
 "   Menu:              menu, menuhot, menusel, menuhotsel\n"
 "   Editor:       editnormal, editbold, editmarked\n"
 "   Pomocník:          helpnormal, helpitalic, helpbold, helplink, helpslink\n"
-"   Typy súborov:      directory, executable, link, stalelink, device, special, core\n"
+"   Typy súborov:      directory, executable, link, stalelink, device, "
+"special, core\n"
 "\n"
 "Farby:\n"
 "   black, gray, red, brightred, green, brightgreen, brown,\n"
@@ -2517,7 +2544,8 @@ msgid " Enter command label: "
 msgstr " Zadajte návestie pre príkaz: "
 
 msgid " Cannot run external panelize in a non-local directory "
-msgstr " Nepodarilo sa spustiť externé vytvorenie panelov v nelokálnom adresári "
+msgstr ""
+" Nepodarilo sa spustiť externé vytvorenie panelov v nelokálnom adresári "
 
 msgid "Find rejects after patching"
 msgstr "Nájsť súbory po oprave"
@@ -2829,9 +2857,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr "(neplatné)"
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s nie je adresár\n"
@@ -3587,38 +3612,51 @@ msgstr "Vnútorná chyba:"
 msgid "Changes to file lost"
 msgstr "Zmeny súboru stratené"
 
-msgid "Unform"
-msgstr "Obnov"
+#~ msgid "(invalid)"
+#~ msgstr "(neplatné)"
 
-msgid " Socket source routing setup "
-msgstr " Prvotné nastavenie smeru cesty Socketu "
+#~ msgid "Unform"
+#~ msgstr "Obnov"
 
-msgid " Enter host name to use as a source routing hop: "
-msgstr " Zadajte hostiteľské meno pre použitie ako zdrojového smeru cesty: "
+#~ msgid " Socket source routing setup "
+#~ msgstr " Prvotné nastavenie smeru cesty Socketu "
 
-msgid " New mode is \"%s\" "
-msgstr " Nový mód je \"%s\" "
+#~ msgid " Enter host name to use as a source routing hop: "
+#~ msgstr " Zadajte hostiteľské meno pre použitie ako zdrojového smeru cesty: "
+
+#~ msgid " New mode is \"%s\" "
+#~ msgstr " Nový mód je \"%s\" "
 
 #~ msgid "&Home"
 #~ msgstr "&Domáci"
+
 #~ msgid "&Type"
 #~ msgstr "&Typ"
+
 #~ msgid "&Links"
 #~ msgstr "&Odkazy"
+
 #~ msgid "N&GID"
 #~ msgstr "N&GID"
+
 #~ msgid "N&UID"
 #~ msgstr "N&UID"
+
 #~ msgid "&Owner"
 #~ msgstr "&Vlastník"
+
 #~ msgid "&Group"
 #~ msgstr "s&Kupina"
+
 #~ msgid "MC was unable to write ~/"
 #~ msgstr "MC nebol schopný zapísať ~/"
+
 #~ msgid " (%ld blocks)"
 #~ msgstr " (%ld blokov)"
+
 #~ msgid " Notice "
 #~ msgstr " Správa "
+
 #~ msgid ""
 #~ " The Midnight Commander configuration files \n"
 #~ " are now stored in the ~/.mc directory, the \n"
@@ -3627,14 +3665,19 @@ msgstr " Nový mód je \"%s\" "
 #~ " Konfiguračné súbory pre Midnight Commander \n"
 #~ " sú teraz uložené v adresári ~/.mc, súbory  \n"
 #~ " boli teraz presunuté\n"
+
 #~ msgid "%s bytes in %d files"
 #~ msgstr "%s bytov v %d súboroch"
+
 #~ msgid " Cannot open file for reading: "
 #~ msgstr " Neúspešný pokus o otvorenie súboru pre čítanie: "
+
 #~ msgid " Not an ordinary file: "
 #~ msgstr " Toto nie je súbor ordinálneho typu: "
+
 #~ msgid "Format of the "
 #~ msgstr "Formát "
+
 #~ msgid ""
 #~ " file has changed\n"
 #~ "with version 3.0. You may want either to\n"
@@ -3643,56 +3686,76 @@ msgstr " Nový mód je \"%s\" "
 #~ " súbor bol zmemený\n"
 #~ "verziou 3.0. Môžno ho tiež budete chcieť\n"
 #~ "kopírovať z "
+
 #~ msgid ""
 #~ "mc.ext or use that\n"
 #~ "file as an example of how to write it.\n"
 #~ msgstr ""
 #~ "mc.ext, alebo použite ten\n"
 #~ "súbor ako príklad, ako to napísať.\n"
+
 #~ msgid "mc.ext will be used for this moment."
 #~ msgstr "mc.ext bude používaný v tejto chvíli."
+
 #~ msgid " Cannot open file "
 #~ msgstr " Nemohol som otvoriť súbor "
+
 #~ msgid "Col %d"
 #~ msgstr "Col %d"
+
 #~ msgid "  [grow]"
 #~ msgstr "  [rásť]"
+
 #~ msgid "Ascii"
 #~ msgstr "Ascii"
+
 #~ msgid "Hex"
 #~ msgstr "Hex"
+
 #~ msgid "Goto"
 #~ msgstr "Choď"
+
 #~ msgid "Line"
 #~ msgstr "Riadok"
+
 #~ msgid "RxSrch"
 #~ msgstr "RxSrch"
+
 #~ msgid "EdHex"
 #~ msgstr "EdHex"
+
 #~ msgid "EdText"
 #~ msgstr "EdText"
+
 #~ msgid "UnWrap"
 #~ msgstr "Rozbaľ"
+
 #~ msgid "Wrap"
 #~ msgstr "Zabaľ"
+
 #~ msgid "HxSrch"
 #~ msgstr "HxSrch"
+
 #~ msgid "Raw"
 #~ msgstr "Prvotný"
 
 #, fuzzy
 #~ msgid "Parse"
 #~ msgstr "Pred"
+
 #~ msgid "Format"
 #~ msgstr "Formát"
+
 #~ msgid "User menu available only in mcedit invoked from mc"
 #~ msgstr "Používateľské menu k dispozícii iba v mcedit spustenom z mc"
 
 #, fuzzy
 #~ msgid " Host name "
 #~ msgstr " Meno používateľa "
+
 #~ msgid " Error while looking up IP address "
 #~ msgstr "Nastala chyba počas vyhľadávania IP adresy "
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -3707,14 +3770,19 @@ msgstr " Nový mód je \"%s\" "
 #~ "obnovovací pamäťový zásobník nie je naplnený!\n"
 #~ "\n"
 #~ "\n"
+
 #~ msgid " Listing format edit "
 #~ msgstr " Upraviť formát výpisu "
+
 #~ msgid "&Drive...       M-d"
 #~ msgstr "&Jednotka...      M-d"
+
 #~ msgid "Use to debug the background code"
 #~ msgstr "Pre ladenie použite kód na pozadí"
+
 #~ msgid "Force subshell execution"
 #~ msgstr "vynútiť vykonanie v subshelli"
+
 #~ msgid " No action taken "
 #~ msgstr " Nie je zadaná činnosť "
 
@@ -3723,12 +3791,12 @@ msgstr " Nový mód je \"%s\" "
 #~ msgstr ""
 #~ " Nepodarilo sa prečítať zdrojový odkaz \"%s\" \n"
 #~ " %s "
-#~ msgid "Executable first"
-#~ msgstr "Najprv spustiteľné"
+
 #~ msgid "S&kip hidden"
 #~ msgstr "Pres&kočiť skryté"
+
 #~ msgid "show free sp&Ace"
 #~ msgstr "zobr&Aziť voľné miesto"
+
 #~ msgid "Mkdir autoname"
 #~ msgstr "Mkdir autonázov"
-
diff --git a/po/sl.po b/po/sl.po
index c62058ef7..3beca0777 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc \n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2000-06-22 00:00+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -54,8 +54,8 @@ msgstr " Datoteka je prevelika: "
 msgid "Macro recursion is too deep"
 msgstr "Rekurzija makra je pregloboka"
 
-msgid " Enter file name: "
-msgstr " Vpnesi ime datoteke: "
+msgid "&Dismiss"
+msgstr "&Opusti"
 
 msgid "Warning"
 msgstr "Opozorilo"
@@ -102,6 +102,9 @@ msgstr " Uredi Shranjevalni Način"
 msgid " Save As "
 msgstr " Shrani kot "
 
+msgid " Enter file name: "
+msgstr " Vpnesi ime datoteke: "
+
 msgid " A file already exists with this name. "
 msgstr " Datoteka s tem imenom že obstaja. "
 
@@ -359,9 +362,6 @@ msgstr " Pritisni tipko: "
 msgid " Execute Macro "
 msgstr " Izvedi makro "
 
-msgid "&Dismiss"
-msgstr "&Opusti"
-
 msgid " Emacs key: "
 msgstr " Emacs ključ: "
 
@@ -793,6 +793,9 @@ msgstr "razlikuj velike in male črke"
 msgid "Sort order"
 msgstr "Vrstni red sortiranja"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "v&Roč seznam imenikov  C-\\"
@@ -1321,6 +1324,9 @@ msgstr ""
 " Ne morem ustvariti cilja simbolične povezeave \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Prekini"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1337,8 +1343,11 @@ msgstr ""
 " Ne morem poizvedeti o stanju izvorne datoteke \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " datoteki `%s' in `%s' sta isti "
 
 #, c-format
@@ -1500,6 +1509,10 @@ msgstr ""
 " Ne morem poizvedeti o stanju datoteke \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " datoteki `%s' in `%s' sta isti "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Ne morem prepisati imenika `%s' "
@@ -1603,9 +1616,6 @@ msgstr " Oprostite, posla nisem mogel postaviti v ozadje"
 msgid "&Retry"
 msgstr "Poskusi &znova"
 
-msgid "&Abort"
-msgstr "&Prekini"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2851,9 +2861,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s ni imenik\n"
diff --git a/po/sr.po b/po/sr.po
index 00309644b..4785f5489 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.6.0\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2003-09-20 18:50+0200\n"
 "Last-Translator: Strahinya Radich (�������� �����) <mr99164@alas.matf.bg.ac."
 "yu>\n"
@@ -57,8 +57,8 @@ msgstr " 
 msgid "Macro recursion is too deep"
 msgstr "���� ��������� ������ �� ��������"
 
-msgid " Enter file name: "
-msgstr " ������� ����� ��������: "
+msgid "&Dismiss"
+msgstr "&�������"
 
 msgid "Warning"
 msgstr "���������"
@@ -105,6 +105,9 @@ msgstr " 
 msgid " Save As "
 msgstr " ������� ��� "
 
+msgid " Enter file name: "
+msgstr " ������� ����� ��������: "
+
 msgid " A file already exists with this name. "
 msgstr " �������� ��� ��� ������� ��� �������. "
 
@@ -358,9 +361,6 @@ msgstr " 
 msgid " Execute Macro "
 msgstr " ������ ����� "
 
-msgid "&Dismiss"
-msgstr "&�������"
-
 msgid " Emacs key: "
 msgstr " ������� ������: "
 
@@ -794,6 +794,9 @@ msgstr "
 msgid "Sort order"
 msgstr "������� ������"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "���� �&����� �������������  C-\\"
@@ -1321,6 +1324,9 @@ msgstr ""
 " �� ���� �� ������� ��������� ������� `%s' \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&�������"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1337,8 +1343,11 @@ msgstr ""
 " �� ���� �� ������� `stat' �� �������� �������� `%s' \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' � `%s' �� ��������� "
 
 #, c-format
@@ -1500,6 +1509,10 @@ msgstr ""
 " �� ���� �� ������� stat �� �������� `%s' \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' � `%s' �� ��������� "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " �� ���� �� �������� ������������ `%s' "
@@ -1603,9 +1616,6 @@ msgstr " 
 msgid "&Retry"
 msgstr "�&����� ������"
 
-msgid "&Abort"
-msgstr "&�������"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2855,9 +2865,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s ���� ������������\n"
diff --git a/po/sv.po b/po/sv.po
index b58c1bc68..51654eb24 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2003-01-22 18:10+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -61,8 +61,8 @@ msgstr " Filen 
 msgid "Macro recursion is too deep"
 msgstr "Makrorekursion �r f�r djup"
 
-msgid " Enter file name: "
-msgstr " Ange filnamn: "
+msgid "&Dismiss"
+msgstr "&F�rsvinn"
 
 msgid "Warning"
 msgstr "Varning"
@@ -109,6 +109,9 @@ msgstr " Redigera sparl
 msgid " Save As "
 msgstr " Spara som "
 
+msgid " Enter file name: "
+msgstr " Ange filnamn: "
+
 msgid " A file already exists with this name. "
 msgstr " Det finns redan en fil med det namnet. "
 
@@ -370,9 +373,6 @@ msgstr " Tryck valfri tangent:"
 msgid " Execute Macro "
 msgstr " K�r makro "
 
-msgid "&Dismiss"
-msgstr "&F�rsvinn"
-
 msgid " Emacs key: "
 msgstr " Emacstangent: "
 
@@ -811,6 +811,9 @@ msgstr "ski&Lj p
 msgid "Sort order"
 msgstr "Sorteringsordning"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "&Katalogfavoriter      C-\\"
@@ -1343,6 +1346,9 @@ msgstr ""
 " Kan inte skapa symbolisk l�nk \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Avbryt"
+
 # b�ttre �n 'm�lsyml�nk'?
 #, c-format
 msgid ""
@@ -1360,8 +1366,11 @@ msgstr ""
 " Kan inte inh�mta status om fil \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " \"%s\" och \"%s\" �r samma fil "
 
 #, c-format
@@ -1524,6 +1533,10 @@ msgstr ""
 " Kan inte inh�mta status om fil \"%s\" \n"
 " %s"
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " \"%s\" och \"%s\" �r samma fil "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Kan inte skriva �ver katalog \"%s\" "
@@ -1627,9 +1640,6 @@ msgstr " Tyv
 msgid "&Retry"
 msgstr "f�rs�k &Igen"
 
-msgid "&Abort"
-msgstr "&Avbryt"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2892,9 +2902,6 @@ msgstr "%e %b %H.%M"
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s �r inte en katalog\n"
diff --git a/po/ta.po b/po/ta.po
index fb9784939..c53da3364 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:06+0000\n"
 "PO-Revision-Date: 2000-10-26 11:00 CST\n"
 "Last-Translator: Dinesh Nadarajah <n_dinesh@yahoo.com>\n"
 "Language-Team: Tamil\n"
@@ -54,7 +54,7 @@ msgstr " 
 msgid "Macro recursion is too deep"
 msgstr ""
 
-msgid " Enter file name: "
+msgid "&Dismiss"
 msgstr ""
 
 msgid "Warning"
@@ -102,6 +102,9 @@ msgstr " 
 msgid " Save As "
 msgstr " ��� ���â� ���� "
 
+msgid " Enter file name: "
+msgstr ""
+
 msgid " A file already exists with this name. "
 msgstr " �� ���â� ����� ��� ��츢���. "
 
@@ -355,9 +358,6 @@ msgstr "
 msgid " Execute Macro "
 msgstr " ��� ��è� �������� "
 
-msgid "&Dismiss"
-msgstr ""
-
 msgid " Emacs key: "
 msgstr "  Emacs ��:"
 
@@ -779,6 +779,9 @@ msgstr ""
 msgid "Sort order"
 msgstr ""
 
+msgid "Executable first"
+msgstr ""
+
 msgid " confirm di&Rectory hotlist delete "
 msgstr ""
 
@@ -1289,6 +1292,9 @@ msgid ""
 " %s "
 msgstr ""
 
+msgid "&Abort"
+msgstr ""
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1302,7 +1308,10 @@ msgid ""
 msgstr ""
 
 #, c-format
-msgid " `%s' and `%s' are the same file "
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr ""
 
 #, c-format
@@ -1428,6 +1437,10 @@ msgid ""
 " %s "
 msgstr ""
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr ""
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr ""
@@ -1521,9 +1534,6 @@ msgstr ""
 msgid "&Retry"
 msgstr ""
 
-msgid "&Abort"
-msgstr ""
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2704,9 +2714,6 @@ msgstr ""
 msgid "%b %e  %Y"
 msgstr ""
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "Ҿ�� Ө��� �ɨ�� ������"
diff --git a/po/tr.po b/po/tr.po
index f61a7e68e..f6abf7210 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.54\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:07+0000\n"
 "PO-Revision-Date: 2001-11-06 05:50+0200\n"
 "Last-Translator: Nilg�n Belma Bug�ner <nilgun@fide.org>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -57,9 +57,8 @@ msgstr " Dosya 
 msgid "Macro recursion is too deep"
 msgstr ""
 
-#, fuzzy
-msgid " Enter file name: "
-msgstr " Sat�r� girin: "
+msgid "&Dismiss"
+msgstr "&B�rak"
 
 msgid "Warning"
 msgstr "Uyar�"
@@ -106,6 +105,10 @@ msgstr " Kaydetme kipini d
 msgid " Save As "
 msgstr " Farkl� kaydet "
 
+#, fuzzy
+msgid " Enter file name: "
+msgstr " Sat�r� girin: "
+
 msgid " A file already exists with this name. "
 msgstr " Bu isimde bir dosya zaten var. "
 
@@ -362,9 +365,6 @@ msgstr " Bir tu
 msgid " Execute Macro "
 msgstr " Macro'yu �al��t�r "
 
-msgid "&Dismiss"
-msgstr "&B�rak"
-
 msgid " Emacs key: "
 msgstr " Emacs tu�u: "
 
@@ -796,6 +796,9 @@ msgstr "&Harf b
 msgid "Sort order"
 msgstr "S�ralama t�r�"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "Di&zin Ge�mi�i               C-\\"
@@ -1327,6 +1330,9 @@ msgstr ""
 " Hedef sembolik ba� \"%s\" olu�turulam�yor \n"
 " %s"
 
+msgid "&Abort"
+msgstr "�&ptal"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1343,8 +1349,11 @@ msgstr ""
 " \"%s\" kaynak dosyas� durumlanam�yor \n"
 " %s"
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' ve `%s' ayn� dosyad�r "
 
 #, c-format
@@ -1506,6 +1515,10 @@ msgstr ""
 " \"%s\" dosyas� durumlanam�yor \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' ve `%s' ayn� dosyad�r "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " %s dizinin �st�ne yaz�lam�yor "
@@ -1609,9 +1622,6 @@ msgstr " 
 msgid "&Retry"
 msgstr "&Tekrar"
 
-msgid "&Abort"
-msgstr "�&ptal"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2862,9 +2872,6 @@ msgstr "%e %b %H:%M"
 msgid "%b %e  %Y"
 msgstr "%e %b  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "dizin:"
diff --git a/po/uk.po b/po/uk.po
index efa716a04..a56b004c7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: uk\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:07+0000\n"
 "PO-Revision-Date: 2005-09-10 13:28+0300\n"
 "Last-Translator: Anton Sergeevich Chumak <nightfast@yahoo.co.uk>\n"
 "Language-Team: �������\n"
@@ -56,8 +56,8 @@ msgstr "
 msgid "Macro recursion is too deep"
 msgstr "������� ������� �����Ӧ� �����Ӧ�"
 
-msgid " Enter file name: "
-msgstr " ���Ħ�� ����� �����: "
+msgid "&Dismiss"
+msgstr "&�������"
 
 msgid "Warning"
 msgstr "������������"
@@ -104,6 +104,9 @@ msgstr " 
 msgid " Save As "
 msgstr " �������� �� "
 
+msgid " Enter file name: "
+msgstr " ���Ħ�� ����� �����: "
+
 msgid " A file already exists with this name. "
 msgstr " ���� � æ�� ������ ��� ���դ. "
 
@@ -351,9 +354,6 @@ msgstr " 
 msgid " Execute Macro "
 msgstr " �������� ������ "
 
-msgid "&Dismiss"
-msgstr "&�������"
-
 msgid " Emacs key: "
 msgstr " ���צ�� Emacs: "
 
@@ -783,6 +783,9 @@ msgstr "
 msgid "Sort order"
 msgstr "������� ����������"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "������ ����&��Ǧ�           C-\\"
@@ -1310,6 +1313,9 @@ msgstr ""
 " �� �������� �������� ���� ��������� ��������� \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&���������"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1326,8 +1332,11 @@ msgstr ""
 " �� �������� �������� ���������Ԧ ��Ȧ����� ����� \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " \"%s\" � \"%s\" �� ���� � ��� �� � ���� "
 
 #, c-format
@@ -1489,6 +1498,10 @@ msgstr ""
 " �� �������� �������� ���������Ԧ ����� \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " \"%s\" � \"%s\" �� ���� � ��� �� � ���� "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " �� �������� ��ͦ����� ������� \"%s\" "
@@ -1592,9 +1605,6 @@ msgstr " 
 msgid "&Retry"
 msgstr "��&�������"
 
-msgid "&Abort"
-msgstr "&���������"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2840,9 +2850,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s �� � ���������\n"
diff --git a/po/vi.po b/po/vi.po
index 37ac257ef..522ee425f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.6.1\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:07+0000\n"
 "PO-Revision-Date: 2006-08-16 16:20+0400\n"
 "Last-Translator: Phan Vĩnh Thịnh <teppi82@gmail.com>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -55,8 +55,8 @@ msgstr " Tập tin %s quá lớn "
 msgid "Macro recursion is too deep"
 msgstr "Đệ qui của macro quá sâu"
 
-msgid " Enter file name: "
-msgstr " Hãy nhập tên tập tin: "
+msgid "&Dismiss"
+msgstr "Đó&ng"
 
 msgid "Warning"
 msgstr "Cảnh báo"
@@ -103,6 +103,9 @@ msgstr " Chế độ ghi nhớ "
 msgid " Save As "
 msgstr " Ghi như "
 
+msgid " Enter file name: "
+msgstr " Hãy nhập tên tập tin: "
+
 msgid " A file already exists with this name. "
 msgstr " Tập tin có tên như vậy đã tồn tại. "
 
@@ -353,9 +356,6 @@ msgstr " Nhấn phím bất kỳ: "
 msgid " Execute Macro "
 msgstr "Thực hiện Macro "
 
-msgid "&Dismiss"
-msgstr "Đó&ng"
-
 msgid " Emacs key: "
 msgstr "Phím Emacs: "
 
@@ -785,6 +785,9 @@ msgstr "tính đến kiể&U chữ"
 msgid "Sort order"
 msgstr "Thứ tự sắp xếp"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "Thư mục thường dùng &*         C-\\"
@@ -1314,6 +1317,9 @@ msgstr ""
 " Khônt tạo được liên kết mềm đích \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "&Dừng"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1330,8 +1336,11 @@ msgstr ""
 " Không lấy được tính chất (stat) của tập tin nguồn \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' và `%s' là một tập tin "
 
 #, c-format
@@ -1493,6 +1502,10 @@ msgstr ""
 " Không nhận được tính chất (stat) của tập tin \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' và `%s' là một tập tin "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Không thể ghi đè lên thư mục `%s' "
@@ -1597,9 +1610,6 @@ msgstr " Xin lỗi, không thể đặt công việc nào vào chế độ nền
 msgid "&Retry"
 msgstr "&Thử lại"
 
-msgid "&Abort"
-msgstr "&Dừng"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2846,9 +2856,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, c-format
 msgid "%s is not a directory\n"
 msgstr "%s không phải là một thư mục\n"
diff --git a/po/wa.po b/po/wa.po
index baadea00e..0919b3626 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.99a\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:07+0000\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Lorint Hendschel <LorintHendschel@skynet.be>\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -62,9 +62,8 @@ msgstr " Li fitch
 msgid "Macro recursion is too deep"
 msgstr ""
 
-#, fuzzy
-msgid " Enter file name: "
-msgstr " Diner roye: "
+msgid "&Dismiss"
+msgstr "&Rinonc�"
 
 msgid "Warning"
 msgstr "Advertixhmint"
@@ -112,6 +111,10 @@ msgstr " M
 msgid " Save As "
 msgstr " Schaper et rlomer "
 
+#, fuzzy
+msgid " Enter file name: "
+msgstr " Diner roye: "
+
 msgid " A file already exists with this name. "
 msgstr " I gn a ddja on fitch� lom� insi. "
 
@@ -372,9 +375,6 @@ msgstr " Tch
 msgid " Execute Macro "
 msgstr " Enonder Macro "
 
-msgid "&Dismiss"
-msgstr "&Rinonc�"
-
 msgid " Emacs key: "
 msgstr " Tape di Emacs: "
 
@@ -807,6 +807,9 @@ msgstr "grand
 msgid "Sort order"
 msgstr "�rde po relire"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "dj�v�ye rasco�rti des &Ridants    C-\\"
@@ -1344,6 +1347,9 @@ msgstr ""
 " Dji n' sai f� li loy�n simbolike s�me �%s� \n"
 " %s "
 
+msgid "&Abort"
+msgstr "Ri&nonc�"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1361,8 +1367,11 @@ msgstr ""
 " Dji n' sai f� on stat sol fitch� so�rdant �%s� \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " �%s� eyet �%s� sont li minme fitch� "
 
 #, c-format
@@ -1525,6 +1534,10 @@ msgstr ""
 " Dji n' sai f� on stat sol fitch� �%s� \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " �%s� eyet �%s� sont li minme fitch� "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Dji n' s�reu spotch� li ridant �%s� "
@@ -1628,9 +1641,6 @@ msgstr " Dji rgrete, dji n' sai mete ci bezogne la e fond "
 msgid "&Retry"
 msgstr "&Rissay�"
 
-msgid "&Abort"
-msgstr "Ri&nonc�"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2860,9 +2870,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "ridant"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index af8f610fa..0bdb78857 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:07+0000\n"
 "PO-Revision-Date: 2002-01-29 22:05+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -55,9 +55,8 @@ msgstr " 文件太大："
 msgid "Macro recursion is too deep"
 msgstr ""
 
-#, fuzzy
-msgid " Enter file name: "
-msgstr " 输入行号："
+msgid "&Dismiss"
+msgstr "取消(&D)"
 
 msgid "Warning"
 msgstr "警告"
@@ -104,6 +103,10 @@ msgstr " 编辑保存模式 "
 msgid " Save As "
 msgstr " 保存为"
 
+#, fuzzy
+msgid " Enter file name: "
+msgstr " 输入行号："
+
 msgid " A file already exists with this name. "
 msgstr " 同名文件已存在。"
 
@@ -359,9 +362,6 @@ msgstr " 按下任意键："
 msgid " Execute Macro "
 msgstr " 执行宏 "
 
-msgid "&Dismiss"
-msgstr "取消(&D)"
-
 msgid " Emacs key: "
 msgstr " Emacs 键："
 
@@ -791,6 +791,9 @@ msgstr "大小写敏感(&T)"
 msgid "Sort order"
 msgstr "排序"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr " 删除时确认(&D) "
@@ -1319,6 +1322,9 @@ msgstr ""
 " 无法创建目标符号链接“%s” \n"
 " %s "
 
+msgid "&Abort"
+msgstr "中止(&A)"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1335,8 +1341,11 @@ msgstr ""
 " 无法 stat 源文件“%s” \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " “%s”和“%s”是同一个文件 "
 
 #, c-format
@@ -1498,6 +1507,10 @@ msgstr ""
 " 无法 stat 文件“%s” \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " “%s”和“%s”是同一个文件 "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " 无法覆盖目录“%s” "
@@ -1601,9 +1614,6 @@ msgstr " 抱歉，无法将任务放到后台 "
 msgid "&Retry"
 msgstr "重试(&R)"
 
-msgid "&Abort"
-msgstr "中止(&A)"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2842,9 +2852,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "目录"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c128957ec..0acbcdb00 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mc 4.5.54a\n"
-"Report-Msgid-Bugs-To: mc-devel@gnome.org\n"
-"POT-Creation-Date: 2009-01-06 13:46+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-17 17:07+0000\n"
 "PO-Revision-Date: 2001-07-27 03:02+0800\n"
 "Last-Translator: Jing-Jong Shyue <shyue@sonoma.com.tw>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -56,8 +56,8 @@ msgstr " 
 msgid "Macro recursion is too deep"
 msgstr ""
 
-msgid " Enter file name: "
-msgstr " ��J�ɦW�G "
+msgid "&Dismiss"
+msgstr "����"
 
 msgid "Warning"
 msgstr "ĵ�i"
@@ -104,6 +104,9 @@ msgstr " 
 msgid " Save As "
 msgstr " �t�s�s�� "
 
+msgid " Enter file name: "
+msgstr " ��J�ɦW�G "
+
 msgid " A file already exists with this name. "
 msgstr " �P�W���ɮפw�g�s�b�C "
 
@@ -359,9 +362,6 @@ msgstr " 
 msgid " Execute Macro "
 msgstr " ���楨�� "
 
-msgid "&Dismiss"
-msgstr "����"
-
 msgid " Emacs key: "
 msgstr " Emacs ����G"
 
@@ -793,6 +793,9 @@ msgstr "
 msgid "Sort order"
 msgstr "�ƧǪ�����"
 
+msgid "Executable first"
+msgstr ""
+
 #, fuzzy
 msgid " confirm di&Rectory hotlist delete "
 msgstr "�ؿ������C��            C-\\"
@@ -1325,6 +1328,9 @@ msgstr ""
 " �L�k�إߥؼвŸ��s�� \"%s\" \n"
 " %s "
 
+msgid "&Abort"
+msgstr "���_"
+
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -1341,8 +1347,11 @@ msgstr ""
 " �L�k stat �ӷ��ɮ� \"%s\" \n"
 " %s "
 
-#, c-format
-msgid " `%s' and `%s' are the same file "
+#, fuzzy, c-format
+msgid ""
+" `%s' and\n"
+" `%s'\n"
+" are the same file "
 msgstr " `%s' �P `%s' �O�P�@���ɮ� "
 
 #, c-format
@@ -1504,6 +1513,10 @@ msgstr ""
 " �L�k stat �ɮ� \"%s\" \n"
 " %s "
 
+#, c-format
+msgid " `%s' and `%s' are the same file "
+msgstr " `%s' �P `%s' �O�P�@���ɮ� "
+
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " �L�k�\�g�ؿ� `%s' "
@@ -1607,9 +1620,6 @@ msgstr " 
 msgid "&Retry"
 msgstr "����"
 
-msgid "&Abort"
-msgstr "���_"
-
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2862,9 +2872,6 @@ msgstr "%b %e %H:%M"
 msgid "%b %e  %Y"
 msgstr "%b %e  %Y"
 
-msgid "(invalid)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s is not a directory\n"
 msgstr "�إ߷s�ؿ�"
diff --git a/src/file.c b/src/file.c
index d7f62e37b..cd4b51fa0 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1060,7 +1060,7 @@ move_file_file (FileOpContext *ctx, const char *s, const char *d,
     if (mc_lstat (d, &dst_stats) == 0) {
 	if (src_stats.st_dev == dst_stats.st_dev
             && src_stats.st_ino == dst_stats.st_ino)
-            return warn_same_file(_(" `%s' and `%s' are the same file "), s, d);
+            return warn_same_file(_(" `%s' \n and\n `%s'\n are the same file "), s, d);
 	if (S_ISDIR (dst_stats.st_mode)) {
 	    message (1, MSG_ERROR,
 			_(" Cannot overwrite directory `%s' "), d);

From 5df2f5aa223f9f9a72e19668bcb32c0c5d4ca6ae Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Sun, 8 Mar 2009 12:49:28 +0300
Subject: [PATCH 10/11] fileopctx.h: set definitely values for
 FileProgressStatus enum type. file.c file.h: fixed types for file/dir
 operation functions.

---
 src/file.c      | 95 ++++++++++++++++++++++++-------------------------
 src/file.h      | 22 ++++++------
 src/fileopctx.h |  8 ++---
 3 files changed, 61 insertions(+), 64 deletions(-)

diff --git a/src/file.c b/src/file.c
index cd4b51fa0..a251b9da8 100644
--- a/src/file.c
+++ b/src/file.c
@@ -125,16 +125,16 @@ const char *op_names[3] = {
 
 /* }}} */
 
-static int query_replace (FileOpContext * ctx, const char *destname,
-			  struct stat *_s_stat, struct stat *_d_stat);
-static int query_recursive (FileOpContext * ctx, const char *s);
-static int do_file_error (const char *str);
-static int erase_dir_iff_empty (FileOpContext *ctx, const char *s);
-static int erase_file (FileOpContext *ctx, const char *s,
-		       off_t *progress_count, double *progress_bytes,
-		       int is_toplevel_file);
-static int files_error (const char *format, const char *file1,
-			const char *file2);
+static FileProgressStatus query_replace (FileOpContext * ctx, const char *destname,
+					    struct stat *_s_stat, struct stat *_d_stat);
+static FileProgressStatus query_recursive (FileOpContext * ctx, const char *s);
+static FileProgressStatus do_file_error (const char *str);
+static FileProgressStatus erase_dir_iff_empty (FileOpContext *ctx, const char *s);
+static FileProgressStatus erase_file (FileOpContext *ctx, const char *s,
+					off_t *progress_count, double *progress_bytes,
+					int is_toplevel_file);
+static FileProgressStatus files_error (const char *format, const char *file1,
+					const char *file2);
 
 
 enum CaseConvs { NO_CONV = 0, UP_CHAR = 1, LOW_CHAR = 2, UP_SECT =
@@ -157,7 +157,7 @@ convert_case (char c, enum CaseConvs *conversion)
 	return c;
 }
 
-static int transform_error = 0;
+static FileProgressStatus transform_error = FILE_CONT;
 
 static const char *
 do_transform_source (FileOpContext *ctx, const char *source)
@@ -345,12 +345,12 @@ check_hardlinks (const char *src_name, const char *dst_name, struct stat *pstat)
  * If dst_path is an existing symlink it will be deleted silently
  * (upper levels take already care of existing files at dst_path).
  */
-static int
+static FileProgressStatus
 make_symlink (FileOpContext *ctx, const char *src_path, const char *dst_path)
 {
     char link_target[MC_MAXPATHLEN];
     int len;
-    int return_status;
+    FileProgressStatus return_status;
     struct stat sb;
     int dst_is_symlink;
 
@@ -477,7 +477,7 @@ static int warn_same_file(const char *fmt, const char *a, const char *b)
     }
 }
 
-int
+FileProgressStatus
 copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
 		int ask_overwrite, off_t *progress_count,
 		double *progress_bytes, int is_toplevel_file)
@@ -494,7 +494,7 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
     struct utimbuf utb;
     int dst_exists = 0, appending = 0;
     off_t n_read_total = 0, file_size = -1;
-    int return_status, temp_status;
+    FileProgressStatus return_status, temp_status;
     struct timeval tv_transfer_start;
     int dst_status = DEST_NONE;	/* 1 if the file is not fully copied */
 
@@ -551,12 +551,8 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
 	    return FILE_CONT;
 	}
 
-	if (S_ISLNK (sb.st_mode)) {
-	    int retval;
-
-	    retval = make_symlink (ctx, src_path, dst_path);
-	    return retval;
-	}
+	if (S_ISLNK (sb.st_mode))
+	    return make_symlink (ctx, src_path, dst_path);
 
 	if (S_ISCHR (sb.st_mode) || S_ISBLK (sb.st_mode) || 
 		S_ISFIFO (sb.st_mode) || S_ISNAM (sb.st_mode) ||
@@ -836,7 +832,7 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
  */
 /* FIXME: This function needs to check the return values of the
    function calls */
-int
+FileProgressStatus
 copy_dir_dir (FileOpContext *ctx, const char *s, const char *d, int toplevel,
 	      int move_over, int delete, struct link *parent_dirs,
 	      off_t *progress_count, double *progress_bytes)
@@ -845,7 +841,7 @@ copy_dir_dir (FileOpContext *ctx, const char *s, const char *d, int toplevel,
     struct stat buf, cbuf;
     DIR *reading;
     char *path, *mdpath, *dest_file, *dest_dir;
-    int return_status = FILE_CONT;
+    FileProgressStatus return_status = FILE_CONT;
     struct utimbuf utb;
     struct link *lp;
 
@@ -1035,12 +1031,12 @@ copy_dir_dir (FileOpContext *ctx, const char *s, const char *d, int toplevel,
 
 /* {{{ Move routines */
 
-static int
+static FileProgressStatus
 move_file_file (FileOpContext *ctx, const char *s, const char *d,
 		off_t *progress_count, double *progress_bytes)
 {
     struct stat src_stats, dst_stats;
-    int return_status = FILE_CONT;
+    FileProgressStatus return_status = FILE_CONT;
     gboolean copy_done = FALSE;
 
     if (file_progress_show_source (ctx, s) == FILE_ABORT
@@ -1142,14 +1138,14 @@ move_file_file (FileOpContext *ctx, const char *s, const char *d,
     return return_status;
 }
 
-int
+FileProgressStatus
 move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
 	      off_t *progress_count, double *progress_bytes)
 {
     struct stat sbuf, dbuf, destbuf;
     struct link *lp;
     char *destdir;
-    int return_status;
+    FileProgressStatus return_status;
     int move_over = 0;
 
     if (file_progress_show_source (ctx, s) == FILE_ABORT ||
@@ -1255,7 +1251,7 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
 
 /* {{{ Erase routines */
 /* Don't update progress status if progress_count==NULL */
-static int
+static FileProgressStatus
 erase_file (FileOpContext *ctx, const char *s, off_t *progress_count,
 	    double *progress_bytes, int is_toplevel_file)
 {
@@ -1285,7 +1281,7 @@ erase_file (FileOpContext *ctx, const char *s, off_t *progress_count,
 	return FILE_CONT;
 }
 
-static int
+static FileProgressStatus
 recursive_erase (FileOpContext *ctx, const char *s, off_t *progress_count,
 		 double *progress_bytes)
 {
@@ -1293,15 +1289,15 @@ recursive_erase (FileOpContext *ctx, const char *s, off_t *progress_count,
     struct stat buf;
     DIR *reading;
     char *path;
-    int return_status = FILE_CONT;
+    FileProgressStatus return_status = FILE_CONT;
 
     if (!strcmp (s, ".."))
-	return 1;
+	return FILE_RETRY;
 
     reading = mc_opendir (s);
 
     if (!reading)
-	return 1;
+	return FILE_RETRY;
 
     while ((next = mc_readdir (reading)) && return_status == FILE_CONT) {
 	if (!strcmp (next->d_name, "."))
@@ -1312,13 +1308,13 @@ recursive_erase (FileOpContext *ctx, const char *s, off_t *progress_count,
 	if (mc_lstat (path, &buf)) {
 	    g_free (path);
 	    mc_closedir (reading);
-	    return 1;
+	    return FILE_RETRY;
 	}
 	if (S_ISDIR (buf.st_mode))
 	    return_status =
 		(recursive_erase
 		 (ctx, path, progress_count, progress_bytes)
-		 != FILE_CONT);
+		 != FILE_CONT) ? FILE_RETRY : FILE_CONT;
 	else
 	    return_status =
 		erase_file (ctx, path, progress_count, progress_bytes, 0);
@@ -1367,11 +1363,11 @@ check_dir_is_empty (const char *path)
     return i;
 }
 
-int
+FileProgressStatus
 erase_dir (FileOpContext *ctx, const char *s, off_t *progress_count,
 	   double *progress_bytes)
 {
-    int error;
+    FileProgressStatus error;
 
     if (strcmp (s, "..") == 0)
 	return FILE_SKIP;
@@ -1410,10 +1406,10 @@ erase_dir (FileOpContext *ctx, const char *s, off_t *progress_count,
     return FILE_CONT;
 }
 
-static int
+static FileProgressStatus
 erase_dir_iff_empty (FileOpContext *ctx, const char *s)
 {
-    int error;
+    FileProgressStatus error;
 
     if (strcmp (s, "..") == 0)
 	return FILE_SKIP;
@@ -1721,7 +1717,8 @@ panel_operate (void *source_panel, FileOperation operation,
     int single_entry = (get_current_type () == view_tree)
 	|| (panel->marked <= 1) || force_single;
     struct stat src_stat, dst_stat;
-    int i, value;
+    int i;
+    FileProgressStatus value;
     FileOpContext *ctx;
 
     off_t count = 0;
@@ -2074,7 +2071,7 @@ panel_operate (void *source_panel, FileOperation operation,
 
 /* {{{ Query/status report routines */
 
-static int
+static FileProgressStatus
 real_do_file_error (enum OperationMode mode, const char *error)
 {
     int result;
@@ -2101,7 +2098,7 @@ real_do_file_error (enum OperationMode mode, const char *error)
 }
 
 /* Report error with one file */
-int
+FileProgressStatus
 file_error (const char *format, const char *file)
 {
     g_snprintf (cmd_buf, sizeof (cmd_buf), format,
@@ -2111,7 +2108,7 @@ file_error (const char *format, const char *file)
 }
 
 /* Report error with two files */
-static int
+static FileProgressStatus
 files_error (const char *format, const char *file1, const char *file2)
 {
     char nfile1[16];
@@ -2126,7 +2123,7 @@ files_error (const char *format, const char *file1, const char *file2)
     return do_file_error (cmd_buf);
 }
 
-static int
+static FileProgressStatus
 real_query_recursive (FileOpContext *ctx, enum OperationMode mode, const char *s)
 {
     gchar *text;
@@ -2170,7 +2167,7 @@ real_query_recursive (FileOpContext *ctx, enum OperationMode mode, const char *s
 }
 
 #ifdef WITH_BACKGROUND
-static int
+static FileProgressStatus
 do_file_error (const char *str)
 {
     if (we_are_background)
@@ -2180,7 +2177,7 @@ do_file_error (const char *str)
 	return real_do_file_error (Foreground, str);
 }
 
-static int
+static FileProgressStatus
 query_recursive (FileOpContext *ctx, const char *s)
 {
     if (we_are_background)
@@ -2189,7 +2186,7 @@ query_recursive (FileOpContext *ctx, const char *s)
 	return real_query_recursive (ctx, Foreground, s);
 }
 
-static int
+static FileProgressStatus
 query_replace (FileOpContext *ctx, const char *destname, struct stat *_s_stat,
 	       struct stat *_d_stat)
 {
@@ -2206,19 +2203,19 @@ query_replace (FileOpContext *ctx, const char *destname, struct stat *_s_stat,
 }
 
 #else
-static int
+static FileProgressStatus
 do_file_error (const char *str)
 {
     return real_do_file_error (Foreground, str);
 }
 
-static int
+static FileProgressStatus
 query_recursive (FileOpContext *ctx, const char *s)
 {
     return real_query_recursive (ctx, Foreground, s);
 }
 
-static int
+static FileProgressStatus
 query_replace (FileOpContext *ctx, const char *destname, struct stat *_s_stat,
 	       struct stat *_d_stat)
 {
diff --git a/src/file.h b/src/file.h
index 97c38cf1e..d95eeeff1 100644
--- a/src/file.h
+++ b/src/file.h
@@ -5,16 +5,16 @@
 
 struct link;
 
-int copy_file_file (FileOpContext *ctx, const char *s, const char *d,
-		    int ask_overwrite, off_t *progress_count,
-		    double *progress_bytes, int is_toplevel_file);
-int move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
-		  off_t *progress_count, double *progress_bytes);
-int copy_dir_dir (FileOpContext *ctx, const char *s, const char *d, int toplevel,
-		  int move_over, int delete, struct link *parent_dirs,
-		  off_t *progress_count, double *progress_bytes);
-int erase_dir (FileOpContext *ctx, const char *s, off_t *progress_count,
-	       double *progress_bytes);
+FileProgressStatus copy_file_file (FileOpContext *ctx, const char *s, const char *d,
+				    int ask_overwrite, off_t *progress_count,
+				    double *progress_bytes, int is_toplevel_file);
+FileProgressStatus move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
+				    off_t *progress_count, double *progress_bytes);
+FileProgressStatus copy_dir_dir (FileOpContext *ctx, const char *s, const char *d, int toplevel,
+				    int move_over, int delete, struct link *parent_dirs,
+				    off_t *progress_count, double *progress_bytes);
+FileProgressStatus erase_dir (FileOpContext *ctx, const char *s, off_t *progress_count,
+				    double *progress_bytes);
 
 int panel_operate (void *source_panel, FileOperation op, int force_single);
 
@@ -23,7 +23,7 @@ extern int file_op_compute_totals;
 /* Error reporting routines */
 
 /* Report error with one file */
-int file_error (const char *format, const char *file);
+FileProgressStatus file_error (const char *format, const char *file);
 
 /* Query routines */
 
diff --git a/src/fileopctx.h b/src/fileopctx.h
index d2de6a99c..d12acbb3c 100644
--- a/src/fileopctx.h
+++ b/src/fileopctx.h
@@ -118,10 +118,10 @@ void file_op_context_destroy (FileOpContext *ctx);
 extern const char *op_names [3];
 
 typedef enum {
-	FILE_CONT,
-	FILE_RETRY,
-	FILE_SKIP,
-	FILE_ABORT
+	FILE_CONT  = 0,
+	FILE_RETRY = 1,
+	FILE_SKIP  = 2,
+	FILE_ABORT = 3
 } FileProgressStatus;
 
 typedef enum {

From 8353da9e8f576273bc5d6c5ef4fe70ae37201dd8 Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Sun, 8 Mar 2009 13:22:10 +0300
Subject: [PATCH 11/11] src/file.c: move_dir_dir():     * changed type of
 move_over variable from int to gboolean;     * fixed memory leak: destdir is
 not free'd when the same directory is copied;     * don't use the non-valid
 dbuf variable if mc_stat(d, &dbuf) returns non-zero.

---
 src/file.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/file.c b/src/file.c
index a251b9da8..edc17e8b2 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1146,7 +1146,8 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
     struct link *lp;
     char *destdir;
     FileProgressStatus return_status;
-    int move_over = 0;
+    gboolean move_over = FALSE;
+    gboolean dstat_ok;
 
     if (file_progress_show_source (ctx, s) == FILE_ABORT ||
 	file_progress_show_target (ctx, d) == FILE_ABORT)
@@ -1155,17 +1156,18 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d,
     mc_refresh ();
 
     mc_stat (s, &sbuf);
-    if (mc_stat (d, &dbuf))
+    dstat_ok = (mc_stat (d, &dbuf) == 0);
+
+    if (dstat_ok && sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino)
+        return warn_same_file (_(" `%s' \n and \n `%s' \n are the same directory "), s, d);
+
+    if (!dstat_ok)
 	destdir = g_strdup (d);	/* destination doesn't exist */
     else if (!ctx->dive_into_subdirs) {
 	destdir = g_strdup (d);
-	move_over = 1;
+	move_over = TRUE;
     } else
 	destdir = concat_dir_and_file (d, x_basename (s));
-
-    if (sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino)
-        return warn_same_file(_(" `%s' and `%s' are the same directory "), s, d);
-
     /* Check if the user inputted an existing dir */
   retry_dst_stat:
     if (!mc_stat (destdir, &destbuf)) {