From 9a43865fa60604899eed90ab4b44615dd4a52239 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Tue, 26 Jan 1999 23:46:11 +0000 Subject: [PATCH] Fix my regex.h breakage --- gnome/gscreen.c | 2 +- gtkedit/edit.h | 4 +- po/mc.pot | 1110 ++++++++++++++----------------------- src/Makefile.in | 2 +- src/{regex.h => eregex.h} | 2 + src/file.c | 2 +- src/regex.c | 2 +- 7 files changed, 409 insertions(+), 715 deletions(-) rename src/{regex.h => eregex.h} (99%) diff --git a/gnome/gscreen.c b/gnome/gscreen.c index 14dbc371b..2a3a46587 100644 --- a/gnome/gscreen.c +++ b/gnome/gscreen.c @@ -2399,7 +2399,7 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel) evbox, NULL, NULL); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("Location:")), FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), cwd, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), cwd, TRUE, TRUE, 0); dock = gnome_dock_item_new ("gmc-toolbar1", GNOME_DOCK_ITEM_BEH_EXCLUSIVE | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL); gtk_container_add (GTK_CONTAINER(dock),status_line); gnome_dock_add_item (GNOME_DOCK(GNOME_APP (panel->xwindow)->dock), diff --git a/gtkedit/edit.h b/gtkedit/edit.h index 3d6e55516..da64d73c3 100644 --- a/gtkedit/edit.h +++ b/gtkedit/edit.h @@ -79,7 +79,7 @@ # endif # endif -# include "regex.h" +# include #endif @@ -123,7 +123,7 @@ # include "src/win.h" # include "vfs/vfs.h" # include "src/menu.h" -# include "src/regex.h" +# include # define WANT_WIDGETS # define WIDGET_COMMAND (WIDGET_USER + 10) diff --git a/po/mc.pot b/po/mc.pot index bcb8469b6..469c7f69a 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -1,29 +1,14 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. -# -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-01-20 15:07-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" +"Date: 1999-01-26 14:37:49-0600\n" +"From: Miguel de Icaza,computo,622-4680 \n" +"Content-Type: text/plain; charset=\n" +"Xgettext-Options: --default-domain=mc --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" +"Files: edit/edit.c edit/edit.h edit/edit_key_translator.c edit/editcmd.c edit/editmenu.c edit/editoptions.c edit/editwidget.c edit/gtkedit.c edit/syntax.c gnome/achown.c gnome/background.c gnome/boxes.c gnome/chmod.c gnome/chown.c gnome/cmd.c gnome/command.c gnome/dialog.c gnome/dir.c gnome/ext.c gnome/file.c gnome/filegui.c gnome/find.c gnome/fixhlp.c gnome/gcmd.c gnome/gdesktop.c gnome/gdialogs.c gnome/gdnd.c gnome/gicon.c gnome/glayout.c gnome/gpopup.c gnome/gprefs.c gnome/gprop.c gnome/gscreen.c gnome/gtools.c gnome/gview.c gnome/gwidget.c gnome/help.c gnome/hotlist.c gnome/i18n.h gnome/info.c gnome/layout.c gnome/learn.c gnome/main.c gnome/menu.c gnome/olddnd.c gnome/option.c gnome/panelize.c gnome/popthelp.c gnome/poptint.h gnome/screen.c gnome/subshell.c gnome/tree.c gnome/treestore.c gnome/user.c gnome/util.c gnome/utilunix.c gnome/view.c gnome/win.c gnome/wtools.c gtkedit/edit.c gtkedit/edit.h gtkedit/editcmd.c gtkedit/editmenu.c gtkedit/editoptions.c gtkedit/editwidget.c " +"gtkedit/gtkedit.c gtkedit/syntax.c src/achown.c src/background.c src/boxes.c src/chmod.c src/chown.c src/cmd.c src/command.c src/dialog.c src/dir.c src/ext.c src/file.c src/filegui.c src/find.c src/fixhlp.c src/help.c src/hotlist.c src/i18n.h src/info.c src/layout.c src/learn.c src/main.c src/menu.c src/option.c src/panelize.c src/popthelp.c src/poptint.h src/screen.c src/subshell.c src/tree.c src/treestore.c src/user.c src/util.c src/utilunix.c src/view.c src/win.c src/wtools.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c vfs/mcfs.c vfs/tar.c vfs/vfs.c\n" #. The file-name is printed after the ':' -#: edit/edit.c:129 edit/edit.c:224 edit/edit.c:231 edit/edit.c:238 -#: edit/edit.c:245 edit/edit.c:251 edit/edit.c:308 edit/edit.c:344 -#: edit/editcmd.c:1932 edit/editwidget.c:947 gnome/dir.c:378 -#: gnome/screen.c:2323 gnome/tree.c:694 gnome/tree.c:700 gnome/wtools.c:225 -#: gtkedit/edit.c:129 gtkedit/edit.c:224 gtkedit/edit.c:231 gtkedit/edit.c:238 -#: gtkedit/edit.c:245 gtkedit/edit.c:251 gtkedit/edit.c:308 gtkedit/edit.c:344 -#: gtkedit/editcmd.c:1932 gtkedit/editwidget.c:947 src/dir.c:378 -#: src/screen.c:2323 src/tree.c:694 src/tree.c:700 src/wtools.c:225 -#: vfs/fish.c:226 +#: edit/edit.c:129 edit/edit.c:224 edit/edit.c:231 edit/edit.c:238 edit/edit.c:245 edit/edit.c:251 edit/edit.c:308 edit/edit.c:344 edit/editcmd.c:1932 edit/editwidget.c:947 gnome/dir.c:378 gnome/screen.c:2323 gnome/tree.c:694 gnome/tree.c:700 gnome/wtools.c:225 gtkedit/edit.c:129 gtkedit/edit.c:224 gtkedit/edit.c:231 gtkedit/edit.c:238 gtkedit/edit.c:245 gtkedit/edit.c:251 gtkedit/edit.c:308 gtkedit/edit.c:344 gtkedit/editcmd.c:1932 gtkedit/editwidget.c:947 src/dir.c:378 src/screen.c:2323 src/tree.c:694 src/tree.c:700 src/wtools.c:225 vfs/fish.c:224 msgid " Error " msgstr "" @@ -62,8 +47,7 @@ msgid " Execute Macro " msgstr "" #. Input line for a single key press follows the ':' -#: edit/edit_key_translator.c:133 edit/editcmd.c:698 edit/editcmd.c:707 -#: gtkedit/editcmd.c:698 gtkedit/editcmd.c:707 +#: edit/edit_key_translator.c:133 edit/editcmd.c:698 edit/editcmd.c:707 gtkedit/editcmd.c:698 gtkedit/editcmd.c:707 msgid " Press macro hotkey: " msgstr "" @@ -79,16 +63,8 @@ msgstr "" msgid " Save As " msgstr "" -#. Warning message with a query to continue or cancel the operation -#: edit/editcmd.c:482 edit/editcmd.c:801 edit/editcmd.c:831 edit/editcmd.c:978 -#: edit/editcmd.c:1075 gnome/ext.c:299 gnome/file.c:613 gnome/help.c:321 -#: gnome/main.c:668 gnome/olddnd.c:1681 gnome/screen.c:2081 -#: gnome/subshell.c:700 gnome/subshell.c:726 gnome/utilunix.c:384 -#: gnome/utilunix.c:388 gnome/utilunix.c:454 gtkedit/editcmd.c:482 -#: gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 -#: gtkedit/editcmd.c:1075 src/ext.c:299 src/file.c:613 src/help.c:321 -#: src/main.c:668 src/screen.c:2081 src/subshell.c:700 src/subshell.c:726 -#: src/utilunix.c:384 src/utilunix.c:388 src/utilunix.c:454 vfs/mcfs.c:171 +#. the file exists +#: edit/editcmd.c:482 edit/editcmd.c:801 edit/editcmd.c:831 edit/editcmd.c:978 edit/editcmd.c:1075 gnome/ext.c:300 gnome/file.c:610 gnome/help.c:321 gnome/main.c:668 gnome/olddnd.c:1681 gnome/screen.c:2081 gnome/subshell.c:700 gnome/subshell.c:726 gnome/utilunix.c:384 gnome/utilunix.c:388 gnome/utilunix.c:454 gtkedit/editcmd.c:482 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:300 src/file.c:610 src/help.c:321 src/main.c:668 src/screen.c:2081 src/subshell.c:700 src/subshell.c:726 src/utilunix.c:384 src/utilunix.c:388 src/utilunix.c:454 vfs/mcfs.c:169 msgid " Warning " msgstr "" @@ -101,10 +77,7 @@ msgstr "" msgid "Overwrite" msgstr "" -#: edit/editcmd.c:485 edit/editcmd.c:774 edit/editcmd.c:801 edit/editcmd.c:831 -#: edit/editcmd.c:978 edit/editcmd.c:1565 gtkedit/editcmd.c:485 -#: gtkedit/editcmd.c:774 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 -#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1565 +#: edit/editcmd.c:485 edit/editcmd.c:774 edit/editcmd.c:801 edit/editcmd.c:831 edit/editcmd.c:978 edit/editcmd.c:1565 gtkedit/editcmd.c:485 gtkedit/editcmd.c:774 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 gtkedit/editcmd.c:1565 msgid "Cancel" msgstr "" @@ -112,14 +85,12 @@ msgstr "" msgid " Save as " msgstr "" -#: edit/editcmd.c:501 edit/editcmd.c:2594 gtkedit/editcmd.c:501 -#: gtkedit/editcmd.c:2594 +#: edit/editcmd.c:501 edit/editcmd.c:2594 gtkedit/editcmd.c:501 gtkedit/editcmd.c:2594 msgid " Error trying to save file. " msgstr "" #. This heads the delete macro error dialog box -#: edit/editcmd.c:617 edit/editcmd.c:625 edit/editcmd.c:650 -#: gtkedit/editcmd.c:617 gtkedit/editcmd.c:625 gtkedit/editcmd.c:650 +#: edit/editcmd.c:617 edit/editcmd.c:625 edit/editcmd.c:650 gtkedit/editcmd.c:617 gtkedit/editcmd.c:625 gtkedit/editcmd.c:650 msgid " Delete macro " msgstr "" @@ -129,15 +100,11 @@ msgid " Error trying to open temp file " msgstr "" #. 'Open' = load temp file -#: edit/editcmd.c:627 edit/editcmd.c:688 edit/editcmd.c:756 -#: gtkedit/editcmd.c:627 gtkedit/editcmd.c:688 gtkedit/editcmd.c:756 +#: edit/editcmd.c:627 edit/editcmd.c:688 edit/editcmd.c:756 gtkedit/editcmd.c:627 gtkedit/editcmd.c:688 gtkedit/editcmd.c:756 msgid " Error trying to open macro file " msgstr "" -#: edit/editcmd.c:632 edit/editcmd.c:640 edit/editcmd.c:676 edit/editcmd.c:731 -#: gtkedit/editcmd.c:632 gtkedit/editcmd.c:640 gtkedit/editcmd.c:676 -#: gtkedit/editcmd.c:731 -#, c-format +#: edit/editcmd.c:632 edit/editcmd.c:640 edit/editcmd.c:676 edit/editcmd.c:731 gtkedit/editcmd.c:632 gtkedit/editcmd.c:640 gtkedit/editcmd.c:676 gtkedit/editcmd.c:731 msgid "key '%d 0': " msgstr "" @@ -145,7 +112,6 @@ msgstr "" msgid " Error trying to overwrite macro file " msgstr "" -#. This heads the 'Macro' dialog box #: edit/editcmd.c:668 gtkedit/editcmd.c:668 msgid " Macro " msgstr "" @@ -160,18 +126,15 @@ msgstr "" msgid " Save macro " msgstr "" -#: edit/editcmd.c:698 edit/editcmd.c:705 gtkedit/editcmd.c:698 -#: gtkedit/editcmd.c:705 +#: edit/editcmd.c:698 edit/editcmd.c:705 gtkedit/editcmd.c:698 gtkedit/editcmd.c:705 msgid " Delete Macro " msgstr "" -#. This heads the 'Load Macro' dialog box #: edit/editcmd.c:755 gtkedit/editcmd.c:755 msgid " Load macro " msgstr "" -#: edit/editcmd.c:769 edit/editcmd.c:771 gtkedit/editcmd.c:769 -#: gtkedit/editcmd.c:771 +#: edit/editcmd.c:769 edit/editcmd.c:771 gtkedit/editcmd.c:769 gtkedit/editcmd.c:771 msgid " Confirm save file? : " msgstr "" @@ -180,27 +143,21 @@ msgstr "" msgid " Save file " msgstr "" -#: edit/editcmd.c:774 edit/editwidget.c:1061 edit/gtkedit.c:1293 -#: gnome/view.c:1968 gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 -#: gtkedit/gtkedit.c:1293 src/view.c:1968 +#: edit/editcmd.c:774 edit/editwidget.c:1061 edit/gtkedit.c:1293 gnome/view.c:1968 gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1293 src/view.c:1968 msgid "Save" msgstr "" -#: edit/editcmd.c:801 edit/editcmd.c:831 gtkedit/editcmd.c:801 -#: gtkedit/editcmd.c:831 +#: edit/editcmd.c:801 edit/editcmd.c:831 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 msgid "" " Current text was modified without a file save. \n" " Continue discards these changes. " msgstr "" -#: edit/editcmd.c:801 edit/editcmd.c:831 edit/editcmd.c:978 -#: gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 +#: edit/editcmd.c:801 edit/editcmd.c:831 edit/editcmd.c:978 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 msgid "Continue" msgstr "" -#. Heads the 'Load' file dialog box -#: edit/editcmd.c:820 edit/editcmd.c:834 gtkedit/editcmd.c:820 -#: gtkedit/editcmd.c:834 +#: edit/editcmd.c:820 edit/editcmd.c:834 gtkedit/editcmd.c:820 gtkedit/editcmd.c:834 msgid " Load " msgstr "" @@ -208,8 +165,7 @@ msgstr "" msgid " Error trying to open file for reading " msgstr "" -#: edit/editcmd.c:978 edit/editcmd.c:1075 gtkedit/editcmd.c:978 -#: gtkedit/editcmd.c:1075 +#: edit/editcmd.c:978 edit/editcmd.c:1075 gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 msgid " Block is large, you may not be able to undo this action. " msgstr "" @@ -221,31 +177,18 @@ msgstr "" msgid " Cancel " msgstr "" -#. This is for the confirm replace dialog box. The replaced string comes after the ':' -#: edit/editcmd.c:1136 edit/editcmd.c:1563 gtkedit/editcmd.c:1136 -#: gtkedit/editcmd.c:1563 +#: edit/editcmd.c:1136 edit/editcmd.c:1563 gtkedit/editcmd.c:1136 gtkedit/editcmd.c:1563 msgid " Replace with: " msgstr "" -#. Heads the 'Replace' dialog box -#: edit/editcmd.c:1140 edit/editcmd.c:1217 edit/editcmd.c:1467 -#: edit/editcmd.c:1561 edit/editcmd.c:2094 edit/editcmd.c:2125 -#: edit/editcmd.c:2127 gtkedit/editcmd.c:1140 gtkedit/editcmd.c:1217 -#: gtkedit/editcmd.c:1467 gtkedit/editcmd.c:1561 gtkedit/editcmd.c:2094 -#: gtkedit/editcmd.c:2125 gtkedit/editcmd.c:2127 +#: edit/editcmd.c:1140 edit/editcmd.c:1217 edit/editcmd.c:1467 edit/editcmd.c:1561 edit/editcmd.c:2094 edit/editcmd.c:2125 edit/editcmd.c:2127 gtkedit/editcmd.c:1140 gtkedit/editcmd.c:1217 gtkedit/editcmd.c:1467 gtkedit/editcmd.c:1561 gtkedit/editcmd.c:2094 gtkedit/editcmd.c:2125 gtkedit/editcmd.c:2127 msgid " Replace " msgstr "" -#. Heads the 'Search' dialog box -#: edit/editcmd.c:1285 edit/editcmd.c:1461 edit/editcmd.c:2196 -#: gnome/view.c:1450 gnome/view.c:1540 gnome/view.c:1662 gnome/view.c:1861 -#: gnome/view.c:1893 gtkedit/editcmd.c:1285 gtkedit/editcmd.c:1461 -#: gtkedit/editcmd.c:2196 src/view.c:1450 src/view.c:1540 src/view.c:1662 -#: src/view.c:1861 src/view.c:1893 +#: edit/editcmd.c:1285 edit/editcmd.c:1461 edit/editcmd.c:2196 gnome/view.c:1450 gnome/view.c:1540 gnome/view.c:1662 gnome/view.c:1861 gnome/view.c:1893 gtkedit/editcmd.c:1285 gtkedit/editcmd.c:1461 gtkedit/editcmd.c:2196 src/view.c:1450 src/view.c:1540 src/view.c:1662 src/view.c:1861 src/view.c:1893 msgid " Search " msgstr "" -#. An input line comes after the ':' #: edit/editcmd.c:1335 gtkedit/editcmd.c:1335 msgid " Enter search text : " msgstr "" @@ -258,13 +201,10 @@ msgstr "" msgid " Enter argument order : " msgstr "" -#. Tool hint -#: edit/editcmd.c:1350 edit/editcmd.c:1351 gtkedit/editcmd.c:1350 -#: gtkedit/editcmd.c:1351 +#: edit/editcmd.c:1350 edit/editcmd.c:1351 gtkedit/editcmd.c:1350 gtkedit/editcmd.c:1351 msgid "Enter the order of replacement of your scanf format specifiers" msgstr "" -#. The following are check boxes #: edit/editcmd.c:1356 gtkedit/editcmd.c:1356 msgid " Whole words only " msgstr "" @@ -277,8 +217,7 @@ msgstr "" msgid " Regular expression " msgstr "" -#: edit/editcmd.c:1362 edit/editcmd.c:1363 gtkedit/editcmd.c:1362 -#: gtkedit/editcmd.c:1363 +#: edit/editcmd.c:1362 edit/editcmd.c:1363 gtkedit/editcmd.c:1362 gtkedit/editcmd.c:1363 msgid "See the regex man page for how to compose a regular expression" msgstr "" @@ -286,9 +225,7 @@ msgstr "" msgid " Backwards " msgstr "" -#. Tool hint -#: edit/editcmd.c:1371 edit/editcmd.c:1372 gtkedit/editcmd.c:1371 -#: gtkedit/editcmd.c:1372 +#: edit/editcmd.c:1371 edit/editcmd.c:1372 gtkedit/editcmd.c:1371 gtkedit/editcmd.c:1372 msgid "Warning: Searching backward can be slow" msgstr "" @@ -338,8 +275,7 @@ msgid "Replace all" msgstr "" #: edit/editcmd.c:1932 gtkedit/editcmd.c:1932 -msgid "" -" Invalid regular expression, or scanf expression with to many conversions " +msgid " Invalid regular expression, or scanf expression with to many conversions " msgstr "" #. "Invalid regexp string or scanf string" @@ -348,23 +284,18 @@ msgid " Error in replacement format string. " msgstr "" #: edit/editcmd.c:2124 gtkedit/editcmd.c:2124 -#, c-format msgid " %ld replacements made. " msgstr "" -#: edit/editcmd.c:2127 edit/editcmd.c:2196 gtkedit/editcmd.c:2127 -#: gtkedit/editcmd.c:2196 +#: edit/editcmd.c:2127 edit/editcmd.c:2196 gtkedit/editcmd.c:2127 gtkedit/editcmd.c:2196 msgid " Search string not found. " msgstr "" -#. Confirm 'Quit' dialog box -#: edit/editcmd.c:2220 edit/editcmd.c:2235 edit/editcmd.c:2238 -#: gtkedit/editcmd.c:2220 gtkedit/editcmd.c:2235 gtkedit/editcmd.c:2238 +#: edit/editcmd.c:2220 edit/editcmd.c:2235 edit/editcmd.c:2238 gtkedit/editcmd.c:2220 gtkedit/editcmd.c:2235 gtkedit/editcmd.c:2238 msgid " Quit " msgstr "" -#: edit/editcmd.c:2221 edit/editcmd.c:2239 gtkedit/editcmd.c:2221 -#: gtkedit/editcmd.c:2239 +#: edit/editcmd.c:2221 edit/editcmd.c:2239 gtkedit/editcmd.c:2221 gtkedit/editcmd.c:2239 msgid "" " Current text was modified without a file save. \n" " Save with exit? " @@ -378,23 +309,11 @@ msgstr "" msgid "Cancel quit" msgstr "" -#: edit/editcmd.c:2235 gnome/cmd.c:256 gnome/file.c:1798 gnome/file.c:2177 -#: gnome/filegui.c:578 gnome/gcmd.c:108 gnome/hotlist.c:1030 gnome/main.c:823 -#: gnome/olddnd.c:958 gnome/olddnd.c:1536 gnome/screen.c:2067 -#: gnome/subshell.c:701 gnome/subshell.c:727 gnome/tree.c:759 gnome/view.c:408 -#: gtkedit/editcmd.c:2235 src/cmd.c:256 src/file.c:1798 src/file.c:2177 -#: src/filegui.c:578 src/hotlist.c:1030 src/main.c:823 src/screen.c:2067 -#: src/subshell.c:701 src/subshell.c:727 src/tree.c:759 src/view.c:408 +#: edit/editcmd.c:2235 gnome/cmd.c:256 gnome/file.c:1795 gnome/file.c:2174 gnome/filegui.c:578 gnome/gcmd.c:108 gnome/hotlist.c:1030 gnome/main.c:823 gnome/olddnd.c:958 gnome/olddnd.c:1536 gnome/screen.c:2067 gnome/subshell.c:701 gnome/subshell.c:727 gnome/tree.c:759 gnome/view.c:408 gtkedit/editcmd.c:2235 src/cmd.c:256 src/file.c:1795 src/file.c:2174 src/filegui.c:578 src/hotlist.c:1030 src/main.c:823 src/screen.c:2067 src/subshell.c:701 src/subshell.c:727 src/tree.c:759 src/view.c:408 msgid "&Yes" msgstr "" -#: edit/editcmd.c:2235 gnome/cmd.c:256 gnome/file.c:1798 gnome/file.c:2177 -#: gnome/filegui.c:577 gnome/gcmd.c:108 gnome/hotlist.c:1030 gnome/main.c:823 -#: gnome/olddnd.c:958 gnome/olddnd.c:1536 gnome/screen.c:2067 -#: gnome/subshell.c:701 gnome/subshell.c:727 gnome/tree.c:759 gnome/view.c:408 -#: gtkedit/editcmd.c:2235 src/cmd.c:256 src/file.c:1798 src/file.c:2177 -#: src/filegui.c:577 src/hotlist.c:1030 src/main.c:823 src/screen.c:2067 -#: src/subshell.c:701 src/subshell.c:727 src/tree.c:759 src/view.c:408 +#: edit/editcmd.c:2235 gnome/cmd.c:256 gnome/file.c:1795 gnome/file.c:2174 gnome/filegui.c:577 gnome/gcmd.c:108 gnome/hotlist.c:1030 gnome/main.c:823 gnome/olddnd.c:958 gnome/olddnd.c:1536 gnome/screen.c:2067 gnome/subshell.c:701 gnome/subshell.c:727 gnome/tree.c:759 gnome/view.c:408 gtkedit/editcmd.c:2235 src/cmd.c:256 src/file.c:1795 src/file.c:2174 src/filegui.c:577 src/hotlist.c:1030 src/main.c:823 src/screen.c:2067 src/subshell.c:701 src/subshell.c:727 src/tree.c:759 src/view.c:408 msgid "&No" msgstr "" @@ -410,40 +329,31 @@ msgstr "" msgid " &No " msgstr "" -#: edit/editcmd.c:2434 edit/editcmd.c:2509 gtkedit/editcmd.c:2434 -#: gtkedit/editcmd.c:2509 +#: edit/editcmd.c:2434 edit/editcmd.c:2509 gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2509 msgid " Copy to clipboard " msgstr "" -#: edit/editcmd.c:2434 edit/editcmd.c:2456 edit/editcmd.c:2509 -#: edit/editcmd.c:2522 gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2456 -#: gtkedit/editcmd.c:2509 gtkedit/editcmd.c:2522 +#: edit/editcmd.c:2434 edit/editcmd.c:2456 edit/editcmd.c:2509 edit/editcmd.c:2522 gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2509 gtkedit/editcmd.c:2522 msgid " Unable to save to file. " msgstr "" -#: edit/editcmd.c:2456 edit/editcmd.c:2522 gtkedit/editcmd.c:2456 -#: gtkedit/editcmd.c:2522 +#: edit/editcmd.c:2456 edit/editcmd.c:2522 gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2522 msgid " Cut to clipboard " msgstr "" -#: edit/editcmd.c:2544 edit/editcmd.c:2548 edit/editcmd.c:2553 -#: edit/editcmd.c:2556 gnome/view.c:1833 gtkedit/editcmd.c:2544 -#: gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553 gtkedit/editcmd.c:2556 -#: src/view.c:1833 +#: edit/editcmd.c:2544 edit/editcmd.c:2548 edit/editcmd.c:2553 edit/editcmd.c:2556 gnome/view.c:1833 gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553 gtkedit/editcmd.c:2556 src/view.c:1833 msgid " Goto line " msgstr "" -#: edit/editcmd.c:2544 edit/editcmd.c:2548 edit/editcmd.c:2553 -#: edit/editcmd.c:2556 gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 -#: gtkedit/editcmd.c:2553 gtkedit/editcmd.c:2556 +#: edit/editcmd.c:2544 edit/editcmd.c:2548 edit/editcmd.c:2553 edit/editcmd.c:2556 gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553 gtkedit/editcmd.c:2556 msgid " Enter line: " msgstr "" -#: edit/editcmd.c:2577 edit/editcmd.c:2594 gtkedit/editcmd.c:2577 -#: gtkedit/editcmd.c:2594 +#: edit/editcmd.c:2577 edit/editcmd.c:2594 gtkedit/editcmd.c:2577 gtkedit/editcmd.c:2594 msgid " Save Block " msgstr "" +#. returns 1 on success #: edit/editcmd.c:2628 gtkedit/editcmd.c:2628 msgid " Insert File " msgstr "" @@ -456,14 +366,12 @@ msgstr "" msgid " Error trying to insert file. " msgstr "" -#. Not essential to translate #: edit/editcmd.c:2663 gtkedit/editcmd.c:2663 msgid " Sort block " msgstr "" #. Not essential to translate -#: edit/editcmd.c:2663 edit/editcmd.c:2717 gtkedit/editcmd.c:2663 -#: gtkedit/editcmd.c:2717 +#: edit/editcmd.c:2663 edit/editcmd.c:2717 gtkedit/editcmd.c:2663 gtkedit/editcmd.c:2717 msgid " You must first highlight a block of text. " msgstr "" @@ -471,13 +379,11 @@ msgstr "" msgid " Run Sort " msgstr "" -#. Not essential to translate #: edit/editcmd.c:2672 gtkedit/editcmd.c:2672 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr "" -#: edit/editcmd.c:2683 edit/editcmd.c:2689 gtkedit/editcmd.c:2683 -#: gtkedit/editcmd.c:2689 +#: edit/editcmd.c:2683 edit/editcmd.c:2689 gtkedit/editcmd.c:2683 gtkedit/editcmd.c:2689 msgid " Sort " msgstr "" @@ -492,8 +398,7 @@ msgid " Sort returned non-zero: " msgstr "" #. Not essential to translate -#: edit/editcmd.c:2715 edit/editcmd.c:2745 gtkedit/editcmd.c:2715 -#: gtkedit/editcmd.c:2745 +#: edit/editcmd.c:2715 edit/editcmd.c:2745 gtkedit/editcmd.c:2715 gtkedit/editcmd.c:2745 msgid " Process block " msgstr "" @@ -515,8 +420,7 @@ msgstr "" msgid " Enter line length, 0 for off: " msgstr "" -#: edit/editmenu.c:118 edit/editmenu.c:134 gtkedit/editmenu.c:118 -#: gtkedit/editmenu.c:134 +#: edit/editmenu.c:118 edit/editmenu.c:134 gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 msgid "&Open/load... C-o" msgstr "" @@ -524,18 +428,15 @@ msgstr "" msgid "&New C-n" msgstr "" -#: edit/editmenu.c:121 edit/editmenu.c:137 gtkedit/editmenu.c:121 -#: gtkedit/editmenu.c:137 +#: edit/editmenu.c:121 edit/editmenu.c:137 gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 msgid "&Save F2" msgstr "" -#: edit/editmenu.c:122 edit/editmenu.c:138 gtkedit/editmenu.c:122 -#: gtkedit/editmenu.c:138 +#: edit/editmenu.c:122 edit/editmenu.c:138 gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 msgid "save &As... F12" msgstr "" -#: edit/editmenu.c:124 edit/editmenu.c:140 gtkedit/editmenu.c:124 -#: gtkedit/editmenu.c:140 +#: edit/editmenu.c:124 edit/editmenu.c:140 gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 msgid "&Insert file... F15" msgstr "" @@ -543,13 +444,11 @@ msgstr "" msgid "copy to &File... C-f" msgstr "" -#: edit/editmenu.c:127 edit/editmenu.c:143 gtkedit/editmenu.c:127 -#: gtkedit/editmenu.c:143 +#: edit/editmenu.c:127 edit/editmenu.c:143 gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 msgid "a&Bout... " msgstr "" -#: edit/editmenu.c:129 edit/editmenu.c:145 gtkedit/editmenu.c:129 -#: gtkedit/editmenu.c:145 +#: edit/editmenu.c:129 edit/editmenu.c:145 gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 msgid "&Quit F10" msgstr "" @@ -561,88 +460,71 @@ msgstr "" msgid "copy to &File... " msgstr "" -#: edit/editmenu.c:150 edit/editmenu.c:167 gtkedit/editmenu.c:150 -#: gtkedit/editmenu.c:167 +#: edit/editmenu.c:150 edit/editmenu.c:167 gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 msgid "&Toggle Mark F3" msgstr "" -#: edit/editmenu.c:151 edit/editmenu.c:168 gtkedit/editmenu.c:151 -#: gtkedit/editmenu.c:168 +#: edit/editmenu.c:151 edit/editmenu.c:168 gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 msgid "&Mark Columns S-F3" msgstr "" -#: edit/editmenu.c:153 edit/editmenu.c:170 gtkedit/editmenu.c:153 -#: gtkedit/editmenu.c:170 +#: edit/editmenu.c:153 edit/editmenu.c:170 gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 msgid "toggle &Ins/overw Ins" msgstr "" -#: edit/editmenu.c:155 edit/editmenu.c:172 gtkedit/editmenu.c:155 -#: gtkedit/editmenu.c:172 +#: edit/editmenu.c:155 edit/editmenu.c:172 gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 msgid "&Copy F5" msgstr "" -#: edit/editmenu.c:156 edit/editmenu.c:173 gtkedit/editmenu.c:156 -#: gtkedit/editmenu.c:173 +#: edit/editmenu.c:156 edit/editmenu.c:173 gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 msgid "&Move F6" msgstr "" -#: edit/editmenu.c:157 edit/editmenu.c:174 gtkedit/editmenu.c:157 -#: gtkedit/editmenu.c:174 +#: edit/editmenu.c:157 edit/editmenu.c:174 gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 msgid "&Delete F8" msgstr "" -#: edit/editmenu.c:159 edit/editmenu.c:176 gtkedit/editmenu.c:159 -#: gtkedit/editmenu.c:176 +#: edit/editmenu.c:159 edit/editmenu.c:176 gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 msgid "&Undo C-u" msgstr "" -#: edit/editmenu.c:161 edit/editmenu.c:178 gtkedit/editmenu.c:161 -#: gtkedit/editmenu.c:178 +#: edit/editmenu.c:161 edit/editmenu.c:178 gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 msgid "&Beginning C-PgUp" msgstr "" -#: edit/editmenu.c:162 edit/editmenu.c:179 gtkedit/editmenu.c:162 -#: gtkedit/editmenu.c:179 +#: edit/editmenu.c:162 edit/editmenu.c:179 gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&End C-PgDn" msgstr "" -#: edit/editmenu.c:184 edit/editmenu.c:191 gtkedit/editmenu.c:184 -#: gtkedit/editmenu.c:191 +#: edit/editmenu.c:184 edit/editmenu.c:191 gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 msgid "&Search... F7" msgstr "" -#: edit/editmenu.c:185 edit/editmenu.c:192 gtkedit/editmenu.c:185 -#: gtkedit/editmenu.c:192 +#: edit/editmenu.c:185 edit/editmenu.c:192 gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 msgid "search &Again F17" msgstr "" -#: edit/editmenu.c:186 edit/editmenu.c:193 gtkedit/editmenu.c:186 -#: gtkedit/editmenu.c:193 +#: edit/editmenu.c:186 edit/editmenu.c:193 gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 msgid "&Replace... F4" msgstr "" -#: edit/editmenu.c:198 edit/editmenu.c:220 gtkedit/editmenu.c:198 -#: gtkedit/editmenu.c:220 +#: edit/editmenu.c:198 edit/editmenu.c:220 gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 msgid "&Goto line... M-l" msgstr "" -#: edit/editmenu.c:200 edit/editmenu.c:222 gtkedit/editmenu.c:200 -#: gtkedit/editmenu.c:222 +#: edit/editmenu.c:200 edit/editmenu.c:222 gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 msgid "insert &Literal... C-q" msgstr "" -#: edit/editmenu.c:202 edit/editmenu.c:224 gtkedit/editmenu.c:202 -#: gtkedit/editmenu.c:224 +#: edit/editmenu.c:202 edit/editmenu.c:224 gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 msgid "&Refresh screen C-l" msgstr "" -#: edit/editmenu.c:204 edit/editmenu.c:226 gtkedit/editmenu.c:204 -#: gtkedit/editmenu.c:226 +#: edit/editmenu.c:204 edit/editmenu.c:226 gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 msgid "&Start record macro C-r" msgstr "" -#: edit/editmenu.c:205 edit/editmenu.c:227 gtkedit/editmenu.c:205 -#: gtkedit/editmenu.c:227 +#: edit/editmenu.c:205 edit/editmenu.c:227 gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 msgid "&Finish record macro... C-r" msgstr "" @@ -650,18 +532,15 @@ msgstr "" msgid "&Execute macro... C-a, KEY" msgstr "" -#: edit/editmenu.c:207 edit/editmenu.c:229 gtkedit/editmenu.c:207 -#: gtkedit/editmenu.c:229 +#: edit/editmenu.c:207 edit/editmenu.c:229 gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 msgid "delete macr&O... " msgstr "" -#: edit/editmenu.c:209 edit/editmenu.c:231 gtkedit/editmenu.c:209 -#: gtkedit/editmenu.c:231 +#: edit/editmenu.c:209 edit/editmenu.c:231 gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 msgid "insert &Date/time " msgstr "" -#: edit/editmenu.c:211 edit/editmenu.c:233 gtkedit/editmenu.c:211 -#: gtkedit/editmenu.c:233 +#: edit/editmenu.c:211 edit/editmenu.c:233 gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 msgid "format p&Aragraph M-p" msgstr "" @@ -669,13 +548,11 @@ msgstr "" msgid "'ispell' s&Pell check C-p" msgstr "" -#: edit/editmenu.c:213 edit/editmenu.c:235 gtkedit/editmenu.c:213 -#: gtkedit/editmenu.c:235 +#: edit/editmenu.c:213 edit/editmenu.c:235 gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 msgid "sor&T... M-t" msgstr "" -#: edit/editmenu.c:214 edit/editmenu.c:236 gtkedit/editmenu.c:214 -#: gtkedit/editmenu.c:236 +#: edit/editmenu.c:214 edit/editmenu.c:236 gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 msgid "'indent' &C Formatter F19" msgstr "" @@ -691,46 +568,35 @@ msgstr "" msgid "'ispell' s&Pell check M-$" msgstr "" -#: edit/editmenu.c:243 edit/editmenu.c:252 gtkedit/editmenu.c:243 -#: gtkedit/editmenu.c:252 +#: edit/editmenu.c:243 edit/editmenu.c:252 gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 msgid "&General... " msgstr "" -#: edit/editmenu.c:244 edit/editmenu.c:253 gtkedit/editmenu.c:244 -#: gtkedit/editmenu.c:253 +#: edit/editmenu.c:244 edit/editmenu.c:253 gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 msgid "&Save mode..." msgstr "" -#: edit/editmenu.c:246 edit/editmenu.c:255 gnome/main.c:1305 -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1305 +#: edit/editmenu.c:246 edit/editmenu.c:255 gnome/main.c:1305 gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1305 msgid "&Layout..." msgstr "" -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: edit/editmenu.c:265 edit/editmenu.c:274 edit/editmenu.c:391 -#: gnome/chmod.c:165 gnome/chown.c:132 gtkedit/editmenu.c:265 -#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 src/chmod.c:165 -#: src/chown.c:132 +#: edit/editmenu.c:265 edit/editmenu.c:274 edit/editmenu.c:391 gnome/chmod.c:165 gnome/chown.c:132 gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 src/chmod.c:165 src/chown.c:132 msgid " File " msgstr "" -#: edit/editmenu.c:266 edit/editmenu.c:275 edit/editmenu.c:407 -#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 +#: edit/editmenu.c:266 edit/editmenu.c:275 edit/editmenu.c:407 gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 msgid " Edit " msgstr "" -#: edit/editmenu.c:267 edit/editmenu.c:276 gtkedit/editmenu.c:267 -#: gtkedit/editmenu.c:276 +#: edit/editmenu.c:267 edit/editmenu.c:276 gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 msgid " Sear/Repl " msgstr "" -#: edit/editmenu.c:268 edit/editmenu.c:277 edit/editmenu.c:442 -#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 +#: edit/editmenu.c:268 edit/editmenu.c:277 edit/editmenu.c:442 gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 msgid " Command " msgstr "" -#: edit/editmenu.c:269 edit/editmenu.c:278 gtkedit/editmenu.c:269 -#: gtkedit/editmenu.c:278 +#: edit/editmenu.c:269 edit/editmenu.c:278 gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 msgid " Options " msgstr "" @@ -901,11 +767,7 @@ msgstr "" msgid "Error initialising editor.\n" msgstr "" -#: edit/editwidget.c:1060 edit/gtkedit.c:1365 gnome/help.c:809 -#: gnome/main.c:1671 gnome/screen.c:2301 gnome/screen.c:2331 gnome/tree.c:1022 -#: gnome/view.c:1963 gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1365 -#: src/help.c:809 src/main.c:1671 src/screen.c:2301 src/screen.c:2331 -#: src/tree.c:1022 src/view.c:1963 +#: edit/editwidget.c:1060 edit/gtkedit.c:1365 gnome/help.c:809 gnome/main.c:1671 gnome/screen.c:2301 gnome/screen.c:2331 gnome/tree.c:1022 gnome/view.c:1963 gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1365 src/help.c:809 src/main.c:1671 src/screen.c:2301 src/screen.c:2331 src/tree.c:1022 src/view.c:1963 msgid "Help" msgstr "" @@ -917,40 +779,27 @@ msgstr "" msgid "Replac" msgstr "" -#. mapping operations into names -#: edit/editwidget.c:1064 edit/gtkedit.c:1315 gnome/file.c:129 -#: gnome/file.c:791 gnome/gdialogs.c:535 gnome/olddnd.c:649 -#: gnome/screen.c:2305 gnome/screen.c:2335 gnome/tree.c:1028 -#: gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1315 src/file.c:129 -#: src/file.c:791 src/screen.c:2305 src/screen.c:2335 src/tree.c:1028 +#: edit/editwidget.c:1064 edit/gtkedit.c:1315 gnome/file.c:788 gnome/gdialogs.c:533 gnome/olddnd.c:649 gnome/screen.c:2305 gnome/screen.c:2335 gnome/tree.c:1028 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1315 src/file.c:788 src/screen.c:2305 src/screen.c:2335 src/tree.c:1028 msgid "Copy" msgstr "" -#: edit/editwidget.c:1065 gnome/file.c:129 gnome/gdialogs.c:538 -#: gnome/olddnd.c:655 gtkedit/editwidget.c:1065 src/file.c:129 +#: edit/editwidget.c:1065 gnome/gdialogs.c:536 gnome/olddnd.c:655 gtkedit/editwidget.c:1065 msgid "Move" msgstr "" -#: edit/editwidget.c:1066 gnome/view.c:1976 gtkedit/editwidget.c:1066 -#: src/view.c:1976 +#: edit/editwidget.c:1066 gnome/view.c:1976 gtkedit/editwidget.c:1066 src/view.c:1976 msgid "Search" msgstr "" -#: edit/editwidget.c:1067 gnome/file.c:129 gnome/gpopup.c:220 -#: gnome/gpopup.c:232 gnome/olddnd.c:957 gnome/screen.c:2308 -#: gnome/screen.c:2338 gtkedit/editwidget.c:1067 src/file.c:129 -#: src/screen.c:2308 src/screen.c:2338 +#: edit/editwidget.c:1067 gnome/gpopup.c:233 gnome/gpopup.c:245 gnome/olddnd.c:957 gnome/screen.c:2308 gnome/screen.c:2338 gtkedit/editwidget.c:1067 src/screen.c:2308 src/screen.c:2338 msgid "Delete" msgstr "" -#: edit/editwidget.c:1069 gnome/main.c:1673 gtkedit/editwidget.c:1069 -#: src/main.c:1673 +#: edit/editwidget.c:1069 gnome/main.c:1673 gtkedit/editwidget.c:1069 src/main.c:1673 msgid "PullDn" msgstr "" -#: edit/editwidget.c:1070 gnome/help.c:821 gnome/main.c:1674 gnome/view.c:1965 -#: gnome/view.c:1985 gtkedit/editwidget.c:1070 src/help.c:821 src/main.c:1674 -#: src/view.c:1965 src/view.c:1985 +#: edit/editwidget.c:1070 gnome/help.c:821 gnome/main.c:1674 gnome/view.c:1965 gnome/view.c:1985 gtkedit/editwidget.c:1070 src/help.c:821 src/main.c:1674 src/view.c:1965 src/view.c:1985 msgid "Quit" msgstr "" @@ -959,8 +808,7 @@ msgid "The Quick Brown Fox Jumps Over The Lazy Dog" msgstr "" #: edit/gtkedit.c:798 gtkedit/gtkedit.c:798 -msgid "" -"gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n" +msgid "gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n" msgstr "" #: edit/gtkedit.c:1286 gtkedit/gtkedit.c:1286 @@ -1059,8 +907,7 @@ msgstr "" msgid "Repeat most recent search" msgstr "" -#: edit/gtkedit.c:1339 edit/gtkedit.c:1364 gtkedit/gtkedit.c:1339 -#: gtkedit/gtkedit.c:1364 +#: edit/gtkedit.c:1339 edit/gtkedit.c:1364 gtkedit/gtkedit.c:1339 gtkedit/gtkedit.c:1364 msgid "Search/Replace" msgstr "" @@ -1076,19 +923,15 @@ msgstr "" msgid "Info about Mcedit" msgstr "" -#: edit/gtkedit.c:1362 gnome/filegui.c:409 gtkedit/gtkedit.c:1362 -#: src/filegui.c:409 +#: edit/gtkedit.c:1362 gnome/filegui.c:409 gtkedit/gtkedit.c:1362 src/filegui.c:409 msgid "File" msgstr "" -#: edit/gtkedit.c:1363 gnome/gpopup.c:207 gnome/screen.c:2304 -#: gnome/screen.c:2334 gnome/view.c:1972 gtkedit/gtkedit.c:1363 -#: src/screen.c:2304 src/screen.c:2334 src/view.c:1972 +#: edit/gtkedit.c:1363 gnome/gpopup.c:220 gnome/screen.c:2304 gnome/screen.c:2334 gnome/view.c:1972 gtkedit/gtkedit.c:1363 src/screen.c:2304 src/screen.c:2334 src/view.c:1972 msgid "Edit" msgstr "" -#: edit/syntax.c:3180 edit/syntax.c:3187 gtkedit/syntax.c:3180 -#: gtkedit/syntax.c:3187 +#: edit/syntax.c:3180 edit/syntax.c:3187 gtkedit/syntax.c:3180 gtkedit/syntax.c:3187 msgid " Load syntax file " msgstr "" @@ -1097,28 +940,14 @@ msgid " File access error " msgstr "" #: edit/syntax.c:3186 gtkedit/syntax.c:3186 -#, c-format msgid " Syntax error in file %s on line %d " msgstr "" -#: gnome/achown.c:73 gnome/boxes.c:143 gnome/boxes.c:283 gnome/boxes.c:380 -#: gnome/boxes.c:468 gnome/boxes.c:648 gnome/boxes.c:731 gnome/boxes.c:785 -#: gnome/chmod.c:115 gnome/chown.c:81 gnome/cmd.c:861 gnome/filegui.c:795 -#: gnome/find.c:156 gnome/hotlist.c:141 gnome/hotlist.c:813 -#: gnome/hotlist.c:906 gnome/layout.c:373 gnome/learn.c:61 gnome/option.c:145 -#: gnome/panelize.c:90 gnome/view.c:408 gnome/wtools.c:114 gnome/wtools.c:389 -#: gnome/wtools.c:562 gnome/wtools.c:643 src/achown.c:73 src/boxes.c:143 -#: src/boxes.c:283 src/boxes.c:380 src/boxes.c:468 src/boxes.c:648 -#: src/boxes.c:731 src/boxes.c:785 src/chmod.c:115 src/chown.c:81 -#: src/cmd.c:861 src/filegui.c:795 src/find.c:156 src/hotlist.c:141 -#: src/hotlist.c:813 src/hotlist.c:906 src/layout.c:373 src/learn.c:61 -#: src/option.c:145 src/panelize.c:90 src/view.c:408 src/wtools.c:114 -#: src/wtools.c:389 src/wtools.c:562 src/wtools.c:643 +#: gnome/achown.c:73 gnome/boxes.c:143 gnome/boxes.c:283 gnome/boxes.c:380 gnome/boxes.c:468 gnome/boxes.c:648 gnome/boxes.c:731 gnome/boxes.c:785 gnome/chmod.c:115 gnome/chown.c:81 gnome/cmd.c:861 gnome/filegui.c:795 gnome/find.c:156 gnome/hotlist.c:141 gnome/hotlist.c:813 gnome/hotlist.c:906 gnome/layout.c:373 gnome/learn.c:61 gnome/option.c:145 gnome/panelize.c:90 gnome/view.c:408 gnome/wtools.c:114 gnome/wtools.c:389 gnome/wtools.c:562 gnome/wtools.c:643 src/achown.c:73 src/boxes.c:143 src/boxes.c:283 src/boxes.c:380 src/boxes.c:468 src/boxes.c:648 src/boxes.c:731 src/boxes.c:785 src/chmod.c:115 src/chown.c:81 src/cmd.c:861 src/filegui.c:795 src/find.c:156 src/hotlist.c:141 src/hotlist.c:813 src/hotlist.c:906 src/layout.c:373 src/learn.c:61 src/option.c:145 src/panelize.c:90 src/view.c:408 src/wtools.c:114 src/wtools.c:389 src/wtools.c:562 src/wtools.c:643 msgid "&Cancel" msgstr "" -#: gnome/achown.c:74 gnome/chmod.c:116 gnome/chown.c:82 src/achown.c:74 -#: src/chmod.c:116 src/chown.c:82 +#: gnome/achown.c:74 gnome/chmod.c:116 gnome/chown.c:82 src/achown.c:74 src/chmod.c:116 src/chown.c:82 msgid "&Set" msgstr "" @@ -1126,8 +955,7 @@ msgstr "" msgid "S&kip" msgstr "" -#: gnome/achown.c:76 gnome/chmod.c:120 gnome/chown.c:85 src/achown.c:76 -#: src/chmod.c:120 src/chown.c:85 +#: gnome/achown.c:76 gnome/chmod.c:120 gnome/chown.c:85 src/achown.c:76 src/chmod.c:120 src/chown.c:85 msgid "Set &all" msgstr "" @@ -1156,7 +984,6 @@ msgid "Mode" msgstr "" #: gnome/achown.c:385 src/achown.c:385 -#, c-format msgid "%6d of %d" msgstr "" @@ -1164,28 +991,20 @@ msgstr "" msgid " Chown advanced command " msgstr "" -#: gnome/achown.c:631 gnome/achown.c:647 gnome/achown.c:710 gnome/chmod.c:286 -#: gnome/chmod.c:371 src/achown.c:631 src/achown.c:647 src/achown.c:710 -#: src/chmod.c:286 src/chmod.c:371 -#, c-format +#: gnome/achown.c:631 gnome/achown.c:647 gnome/achown.c:710 gnome/chmod.c:286 gnome/chmod.c:371 src/achown.c:631 src/achown.c:647 src/achown.c:710 src/chmod.c:286 src/chmod.c:371 msgid "" " Couldn't chmod \"%s\" \n" " %s " msgstr "" -#: gnome/achown.c:636 gnome/achown.c:651 gnome/achown.c:714 gnome/chown.c:225 -#: gnome/chown.c:347 src/achown.c:636 src/achown.c:651 src/achown.c:714 -#: src/chown.c:225 src/chown.c:347 -#, c-format +#. call mc_chown only, if mc_chmod didn't fail +#: gnome/achown.c:636 gnome/achown.c:651 gnome/achown.c:714 gnome/chown.c:225 gnome/chown.c:347 src/achown.c:636 src/achown.c:651 src/achown.c:714 src/chown.c:225 src/chown.c:347 msgid "" " Couldn't chown \"%s\" \n" " %s " msgstr "" -#: gnome/achown.c:668 gnome/achown.c:672 gnome/chmod.c:321 gnome/chmod.c:325 -#: gnome/chown.c:262 gnome/chown.c:266 gnome/panelize.c:304 gnome/user.c:628 -#: src/achown.c:668 src/achown.c:672 src/chmod.c:321 src/chmod.c:325 -#: src/chown.c:262 src/chown.c:266 src/panelize.c:304 src/user.c:628 +#: gnome/achown.c:668 gnome/achown.c:672 gnome/chmod.c:321 gnome/chmod.c:325 gnome/chown.c:262 gnome/chown.c:266 gnome/panelize.c:304 gnome/user.c:628 src/achown.c:668 src/achown.c:672 src/chmod.c:321 src/chmod.c:325 src/chown.c:262 src/chown.c:266 src/panelize.c:304 src/user.c:628 msgid " Oops... " msgstr "" @@ -1201,8 +1020,7 @@ msgstr "" msgid "Background process:" msgstr "" -#: gnome/background.c:286 gnome/file.c:2120 src/background.c:286 -#: src/file.c:2120 +#: gnome/background.c:286 gnome/file.c:2117 src/background.c:286 src/file.c:2117 msgid " Background process error " msgstr "" @@ -1252,14 +1070,8 @@ msgstr "" msgid "user &Mini status" msgstr "" -#: gnome/boxes.c:142 gnome/boxes.c:282 gnome/boxes.c:382 gnome/boxes.c:470 -#: gnome/boxes.c:650 gnome/boxes.c:732 gnome/boxes.c:787 gnome/boxes.c:898 -#: gnome/filegui.c:812 gnome/find.c:156 gnome/gtools.c:103 gnome/layout.c:372 -#: gnome/option.c:144 gnome/wtools.c:292 gnome/wtools.c:564 src/boxes.c:142 -#: src/boxes.c:282 src/boxes.c:382 src/boxes.c:470 src/boxes.c:650 -#: src/boxes.c:732 src/boxes.c:787 src/boxes.c:898 src/filegui.c:812 -#: src/find.c:156 src/layout.c:372 src/option.c:144 src/wtools.c:292 -#: src/wtools.c:564 +#. WITH_BACKGROUND +#: gnome/boxes.c:142 gnome/boxes.c:282 gnome/boxes.c:382 gnome/boxes.c:470 gnome/boxes.c:650 gnome/boxes.c:732 gnome/boxes.c:787 gnome/boxes.c:898 gnome/filegui.c:812 gnome/find.c:156 gnome/gtools.c:104 gnome/layout.c:372 gnome/option.c:144 gnome/wtools.c:292 gnome/wtools.c:564 src/boxes.c:142 src/boxes.c:282 src/boxes.c:382 src/boxes.c:470 src/boxes.c:650 src/boxes.c:732 src/boxes.c:787 src/boxes.c:898 src/filegui.c:812 src/find.c:156 src/layout.c:372 src/option.c:144 src/wtools.c:292 src/wtools.c:564 msgid "&Ok" msgstr "" @@ -1444,8 +1256,7 @@ msgstr "" msgid "&Marked all" msgstr "" -#: gnome/chmod.c:151 gnome/gcmd.c:217 gnome/screen.c:444 src/chmod.c:151 -#: src/screen.c:444 +#: gnome/chmod.c:151 gnome/gcmd.c:219 gnome/screen.c:444 src/chmod.c:151 src/screen.c:444 msgid "Name" msgstr "" @@ -1543,7 +1354,6 @@ msgid " I can't run the Chown command on a tarfs " msgstr "" #: gnome/cmd.c:205 src/cmd.c:205 -#, c-format msgid " Can not fetch a local copy of %s " msgstr "" @@ -1555,8 +1365,7 @@ msgstr "" msgid "Files tagged, want to cd?" msgstr "" -#: gnome/cmd.c:261 gnome/cmd.c:720 gnome/cmd.c:734 src/cmd.c:261 src/cmd.c:720 -#: src/cmd.c:734 +#: gnome/cmd.c:261 gnome/cmd.c:720 gnome/cmd.c:734 src/cmd.c:261 src/cmd.c:720 src/cmd.c:734 msgid "Could not change directory" msgstr "" @@ -1682,7 +1491,6 @@ msgid "" msgstr "" #: gnome/cmd.c:1025 src/cmd.c:1025 -#, c-format msgid "" " Couldn't stat %s \n" " %s " @@ -1692,18 +1500,15 @@ msgstr "" msgid " Link " msgstr "" -#: gnome/cmd.c:1035 gnome/cmd.c:1140 gnome/file.c:1628 src/cmd.c:1035 -#: src/cmd.c:1140 src/file.c:1628 +#: gnome/cmd.c:1035 gnome/cmd.c:1140 gnome/file.c:1625 src/cmd.c:1035 src/cmd.c:1140 src/file.c:1625 msgid " to:" msgstr "" #: gnome/cmd.c:1046 src/cmd.c:1046 -#, c-format msgid " link: %s " msgstr "" #: gnome/cmd.c:1079 src/cmd.c:1079 -#, c-format msgid " symlink: %s " msgstr "" @@ -1720,7 +1525,6 @@ msgid " Edit symlink " msgstr "" #: gnome/cmd.c:1116 src/cmd.c:1116 -#, c-format msgid " edit symlink: %s " msgstr "" @@ -1733,7 +1537,6 @@ msgid " Relative symlink " msgstr "" #: gnome/cmd.c:1152 src/cmd.c:1152 -#, c-format msgid " relative symlink: %s " msgstr "" @@ -1742,7 +1545,6 @@ msgid " Enter machine name (F1 for details): " msgstr "" #: gnome/cmd.c:1279 src/cmd.c:1279 -#, c-format msgid " Could not chdir to %s " msgstr "" @@ -1789,7 +1591,6 @@ msgid " Setup " msgstr "" #: gnome/command.c:173 src/command.c:173 -#, c-format msgid "" " Can't chdir to '%s' \n" " %s " @@ -1867,7 +1668,6 @@ msgid "&Group" msgstr "" #: gnome/dir.c:378 src/dir.c:378 -#, c-format msgid "File exists but can not be stat-ed: %s %s" msgstr "" @@ -1875,312 +1675,281 @@ msgstr "" msgid "Unknown" msgstr "" -#: gnome/ext.c:143 gnome/user.c:511 src/ext.c:143 src/user.c:511 -#, c-format +#: gnome/ext.c:144 gnome/user.c:511 src/ext.c:144 src/user.c:511 msgid "" " Can't create temporary command file \n" " %s " msgstr "" -#: gnome/ext.c:156 gnome/user.c:538 src/ext.c:156 src/user.c:538 +#: gnome/ext.c:157 gnome/user.c:538 src/ext.c:157 src/user.c:538 msgid " Parameter " msgstr "" -#: gnome/ext.c:299 src/ext.c:299 +#: gnome/ext.c:300 src/ext.c:300 msgid " Can't execute commands on a Virtual File System directory " msgstr "" -#: gnome/ext.c:396 src/ext.c:396 +#: gnome/ext.c:397 src/ext.c:397 msgid " file error" msgstr "" -#: gnome/ext.c:397 src/ext.c:397 +#: gnome/ext.c:398 src/ext.c:398 msgid "Format of the " msgstr "" -#: gnome/ext.c:415 src/ext.c:415 +#: gnome/ext.c:416 src/ext.c:416 msgid " file error " msgstr "" -#: gnome/ext.c:416 src/ext.c:416 +#: gnome/ext.c:417 src/ext.c:417 msgid "Format of the ~/" msgstr "" -#: gnome/ext.c:416 src/ext.c:416 +#: gnome/ext.c:417 src/ext.c:417 msgid "" " file has changed\n" "with version 3.0. You may want either to\n" "copy it from " msgstr "" -#: gnome/ext.c:418 src/ext.c:418 +#: gnome/ext.c:419 src/ext.c:419 msgid "" "mc.ext or use that\n" "file as an example of how to write it.\n" msgstr "" -#: gnome/ext.c:420 src/ext.c:420 +#: gnome/ext.c:421 src/ext.c:421 msgid "mc.ext will be used for this moment." msgstr "" -#: gnome/file.c:161 gnome/tree.c:651 src/file.c:161 src/tree.c:651 +#: gnome/file.c:158 gnome/tree.c:651 src/file.c:158 src/tree.c:651 msgid " Copy " msgstr "" -#: gnome/file.c:162 gnome/tree.c:689 src/file.c:162 src/tree.c:689 +#: gnome/file.c:159 gnome/tree.c:689 src/file.c:159 src/tree.c:689 msgid " Move " msgstr "" -#: gnome/file.c:163 gnome/tree.c:759 src/file.c:163 src/tree.c:759 +#: gnome/file.c:160 gnome/tree.c:759 src/file.c:160 src/tree.c:759 msgid " Delete " msgstr "" -#: gnome/file.c:251 src/file.c:251 +#: gnome/file.c:248 src/file.c:248 msgid " Invalid target mask " msgstr "" -#: gnome/file.c:349 src/file.c:349 +#: gnome/file.c:346 src/file.c:346 msgid " Could not make the hardlink " msgstr "" -#: gnome/file.c:391 src/file.c:391 -#, c-format +#: gnome/file.c:388 src/file.c:388 msgid "" " Cannot read source link \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:401 src/file.c:401 +#: gnome/file.c:398 src/file.c:398 msgid "" " Cannot make stable symlinks across non-local filesystems: \n" "\n" " Option Stable Symlinks will be disabled " msgstr "" -#: gnome/file.c:449 src/file.c:449 -#, c-format +#: gnome/file.c:446 src/file.c:446 msgid "" " Cannot create target symlink \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:517 src/file.c:517 -#, c-format +#: gnome/file.c:514 src/file.c:514 msgid "" " Cannot overwrite directory \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:526 src/file.c:526 -#, c-format +#: gnome/file.c:523 src/file.c:523 msgid "" " Cannot stat source file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:539 src/file.c:539 -#, c-format +#: gnome/file.c:536 src/file.c:536 msgid " `%s' and `%s' are the same file. " msgstr "" -#: gnome/file.c:572 src/file.c:572 -#, c-format +#: gnome/file.c:569 src/file.c:569 msgid "" " Cannot create special file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:581 gnome/file.c:801 src/file.c:581 src/file.c:801 -#, c-format +#: gnome/file.c:578 gnome/file.c:798 src/file.c:578 src/file.c:798 msgid "" " Cannot chown target file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:590 gnome/file.c:816 src/file.c:590 src/file.c:816 -#, c-format +#: gnome/file.c:587 gnome/file.c:813 src/file.c:587 src/file.c:813 msgid "" " Cannot chmod target file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:603 src/file.c:603 -#, c-format +#: gnome/file.c:600 src/file.c:600 msgid "" " Cannot open source file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:613 src/file.c:613 +#: gnome/file.c:610 src/file.c:610 msgid " Reget failed, about to overwrite file " msgstr "" -#: gnome/file.c:619 src/file.c:619 -#, c-format +#: gnome/file.c:616 src/file.c:616 msgid "" " Cannot fstat source file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:640 src/file.c:640 -#, c-format +#: gnome/file.c:637 src/file.c:637 msgid "" " Cannot create target file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:654 src/file.c:654 -#, c-format +#. Find out the optimal buffer size. +#: gnome/file.c:651 src/file.c:651 msgid "" " Cannot fstat target file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:685 src/file.c:685 -#, c-format +#: gnome/file.c:682 src/file.c:682 msgid "" " Cannot read source file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:715 src/file.c:715 -#, c-format +#: gnome/file.c:712 src/file.c:712 msgid "" " Cannot write target file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:734 src/file.c:734 +#: gnome/file.c:731 src/file.c:731 msgid "(stalled)" msgstr "" -#: gnome/file.c:772 src/file.c:772 -#, c-format +#: gnome/file.c:769 src/file.c:769 msgid "" " Cannot close source file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:781 src/file.c:781 -#, c-format +#: gnome/file.c:778 src/file.c:778 msgid "" " Cannot close target file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:791 src/file.c:791 +#: gnome/file.c:788 src/file.c:788 msgid "Incomplete file was retrieved. Keep it?" msgstr "" -#: gnome/file.c:792 src/file.c:792 +#: gnome/file.c:789 src/file.c:789 msgid "&Delete" msgstr "" -#: gnome/file.c:792 gnome/hotlist.c:1438 src/file.c:792 src/hotlist.c:1438 +#: gnome/file.c:789 gnome/hotlist.c:1438 src/file.c:789 src/hotlist.c:1438 msgid "&Keep" msgstr "" -#: gnome/file.c:861 src/file.c:861 -#, c-format +#: gnome/file.c:858 src/file.c:858 msgid "" " Cannot stat source directory \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:884 src/file.c:884 -#, c-format +#: gnome/file.c:881 src/file.c:881 msgid "" " Source directory \"%s\" is not a directory \n" " %s " msgstr "" #. we found a cyclic symbolic link -#: gnome/file.c:892 src/file.c:892 -#, c-format +#: gnome/file.c:889 src/file.c:889 msgid "" " Cannot copy cyclic symbolic link \n" " `%s' " msgstr "" -#: gnome/file.c:945 src/file.c:945 -#, c-format +#: gnome/file.c:942 src/file.c:942 msgid "" " Cannot create target directory \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:963 src/file.c:963 -#, c-format +#: gnome/file.c:960 src/file.c:960 msgid "" " Cannot chown target directory \"%s\" \n" " %s " msgstr "" #. Source doesn't exist -#: gnome/file.c:1073 src/file.c:1073 -#, c-format +#: gnome/file.c:1070 src/file.c:1070 msgid "" " Cannot stat file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:1095 src/file.c:1095 -#, c-format +#: gnome/file.c:1092 src/file.c:1092 msgid " `%s' and `%s' are the same file " msgstr "" -#: gnome/file.c:1102 src/file.c:1102 -#, c-format +#. OS2_NT +#: gnome/file.c:1099 src/file.c:1099 msgid " Cannot overwrite directory `%s' " msgstr "" -#: gnome/file.c:1135 src/file.c:1135 -#, c-format +#: gnome/file.c:1132 src/file.c:1132 msgid "" " Cannot move file \"%s\" to \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:1155 src/file.c:1155 -#, c-format +#: gnome/file.c:1152 src/file.c:1152 msgid "" " Cannot remove file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:1205 src/file.c:1205 -#, c-format +#: gnome/file.c:1202 src/file.c:1202 msgid " Cannot overwrite directory \"%s\" %s " msgstr "" -#: gnome/file.c:1207 src/file.c:1207 -#, c-format +#: gnome/file.c:1204 src/file.c:1204 msgid " Cannot overwrite file \"%s\" %s " msgstr "" -#: gnome/file.c:1230 src/file.c:1230 -#, c-format +#: gnome/file.c:1227 src/file.c:1227 msgid "" " Cannot move directory \"%s\" to \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:1293 src/file.c:1293 -#, c-format +#: gnome/file.c:1290 src/file.c:1290 msgid "" " Cannot delete file \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:1351 gnome/file.c:1418 gnome/file.c:1447 src/file.c:1351 -#: src/file.c:1418 src/file.c:1447 -#, c-format +#: gnome/file.c:1348 gnome/file.c:1415 gnome/file.c:1444 src/file.c:1348 src/file.c:1415 src/file.c:1444 msgid "" " Cannot remove directory \"%s\" \n" " %s " msgstr "" -#: gnome/file.c:1483 src/file.c:1483 +#: gnome/file.c:1480 src/file.c:1480 msgid " Internal error: get_file \n" msgstr "" @@ -2193,153 +1962,147 @@ msgstr "" #. * (I don't use spaces around the words, because someday they could be #. * dropped, when widgets get smarter) #. -#: gnome/file.c:1604 src/file.c:1604 +#: gnome/file.c:1601 src/file.c:1601 msgid "1Copy" msgstr "" -#: gnome/file.c:1604 src/file.c:1604 +#: gnome/file.c:1601 src/file.c:1601 msgid "1Move" msgstr "" -#: gnome/file.c:1604 src/file.c:1604 +#: gnome/file.c:1601 src/file.c:1601 msgid "1Delete" msgstr "" -#: gnome/file.c:1619 src/file.c:1619 -#, c-format +#: gnome/file.c:1616 src/file.c:1616 msgid "%o %f \"%s\"%m" msgstr "" -#: gnome/file.c:1620 src/file.c:1620 -#, c-format +#: gnome/file.c:1617 src/file.c:1617 msgid "%o %d %f%m" msgstr "" -#: gnome/file.c:1622 src/file.c:1622 -#, c-format +#: gnome/file.c:1619 src/file.c:1619 msgid "%o %f \"%s\"%e" msgstr "" -#: gnome/file.c:1623 src/file.c:1623 -#, c-format +#: gnome/file.c:1620 src/file.c:1620 msgid "%o %d %f%e" msgstr "" -#: gnome/file.c:1627 src/file.c:1627 +#: gnome/file.c:1624 src/file.c:1624 msgid "file" msgstr "" -#: gnome/file.c:1627 src/file.c:1627 +#: gnome/file.c:1624 src/file.c:1624 msgid "files" msgstr "" -#: gnome/file.c:1627 src/file.c:1627 +#: gnome/file.c:1624 src/file.c:1624 msgid "directory" msgstr "" -#: gnome/file.c:1627 src/file.c:1627 +#: gnome/file.c:1624 src/file.c:1624 msgid "directories" msgstr "" -#: gnome/file.c:1628 src/file.c:1628 +#: gnome/file.c:1625 src/file.c:1625 msgid "files/directories" msgstr "" -#: gnome/file.c:1628 src/file.c:1628 +#: gnome/file.c:1625 src/file.c:1625 msgid " with source mask:" msgstr "" -#: gnome/file.c:1776 src/file.c:1776 +#: gnome/file.c:1773 src/file.c:1773 msgid " Can't operate on \"..\"! " msgstr "" -#: gnome/file.c:1795 src/file.c:1795 +#: gnome/file.c:1792 src/file.c:1792 msgid "Yes" msgstr "" -#: gnome/file.c:1795 src/file.c:1795 +#: gnome/file.c:1792 src/file.c:1792 msgid "No" msgstr "" -#: gnome/file.c:1848 src/file.c:1848 +#: gnome/file.c:1845 src/file.c:1845 msgid " Sorry, I could not put the job in background " msgstr "" -#: gnome/file.c:1931 gnome/file.c:2036 src/file.c:1931 src/file.c:2036 +#: gnome/file.c:1928 gnome/file.c:2033 src/file.c:1928 src/file.c:2033 msgid " Internal failure " msgstr "" -#: gnome/file.c:1931 gnome/file.c:2036 src/file.c:1931 src/file.c:2036 +#: gnome/file.c:1928 gnome/file.c:2033 src/file.c:1928 src/file.c:2033 msgid " Unknown file operation " msgstr "" -#: gnome/file.c:1950 src/file.c:1950 -#, c-format +#: gnome/file.c:1947 src/file.c:1947 msgid "" " Destination \"%s\" must be a directory \n" " %s " msgstr "" -#: gnome/file.c:2121 gnome/filegui.c:268 src/file.c:2121 src/filegui.c:268 +#: gnome/file.c:2118 gnome/filegui.c:268 src/file.c:2118 src/filegui.c:268 msgid "&Skip" msgstr "" -#: gnome/file.c:2121 src/file.c:2121 +#: gnome/file.c:2118 src/file.c:2118 msgid "&Retry" msgstr "" -#: gnome/file.c:2121 gnome/file.c:2179 gnome/filegui.c:265 gnome/filegui.c:567 -#: src/file.c:2121 src/file.c:2179 src/filegui.c:265 src/filegui.c:567 +#: gnome/file.c:2118 gnome/file.c:2176 gnome/filegui.c:265 gnome/filegui.c:567 src/file.c:2118 src/file.c:2176 src/filegui.c:265 src/filegui.c:567 msgid "&Abort" msgstr "" -#: gnome/file.c:2170 src/file.c:2170 +#: gnome/file.c:2167 src/file.c:2167 msgid "" "\n" " Directory not empty. \n" " Delete it recursively? " msgstr "" -#: gnome/file.c:2171 src/file.c:2171 +#: gnome/file.c:2168 src/file.c:2168 msgid "" "\n" " Background process: Directory not empty \n" " Delete it recursively? " msgstr "" -#: gnome/file.c:2172 src/file.c:2172 +#: gnome/file.c:2169 src/file.c:2169 msgid " Delete: " msgstr "" -#: gnome/file.c:2178 src/file.c:2178 +#: gnome/file.c:2175 src/file.c:2175 msgid "a&ll" msgstr "" -#: gnome/file.c:2178 gnome/filegui.c:570 src/file.c:2178 src/filegui.c:570 +#: gnome/file.c:2175 gnome/filegui.c:570 src/file.c:2175 src/filegui.c:570 msgid "non&E" msgstr "" -#: gnome/file.c:2188 src/file.c:2188 +#: gnome/file.c:2185 src/file.c:2185 msgid " Type 'yes' if you REALLY want to delete " msgstr "" -#: gnome/file.c:2190 src/file.c:2190 +#: gnome/file.c:2187 src/file.c:2187 msgid "all the directories " msgstr "" -#: gnome/file.c:2192 src/file.c:2192 +#: gnome/file.c:2189 src/file.c:2189 msgid " Recursive Delete " msgstr "" -#: gnome/file.c:2193 src/file.c:2193 +#: gnome/file.c:2190 src/file.c:2190 msgid " Background process: Recursive Delete " msgstr "" -#: gnome/file.c:2194 gnome/gwidget.c:98 src/file.c:2194 +#: gnome/file.c:2191 gnome/gwidget.c:98 src/file.c:2191 msgid "no" msgstr "" -#: gnome/file.c:2196 gnome/gwidget.c:96 src/file.c:2196 +#: gnome/file.c:2193 gnome/gwidget.c:96 src/file.c:2193 msgid "yes" msgstr "" @@ -2351,6 +2114,7 @@ msgstr "" msgid "Bytes" msgstr "" +#. WITH_FULL_PATHS #: gnome/filegui.c:484 src/filegui.c:484 msgid "Source" msgstr "" @@ -2364,7 +2128,6 @@ msgid "Deleting" msgstr "" #: gnome/filegui.c:565 src/filegui.c:565 -#, c-format msgid "Target file \"%s\" already exists!" msgstr "" @@ -2397,12 +2160,10 @@ msgid "Overwrite this target?" msgstr "" #: gnome/filegui.c:581 src/filegui.c:581 -#, c-format msgid "Target date: %s, size %d" msgstr "" #: gnome/filegui.c:583 src/filegui.c:583 -#, c-format msgid "Source date: %s, size %d" msgstr "" @@ -2419,7 +2180,6 @@ msgstr "" msgid "preserve &Attributes" msgstr "" -#. &op_preserve #: gnome/filegui.c:780 src/filegui.c:780 msgid "follow &Links" msgstr "" @@ -2447,7 +2207,6 @@ msgid "&Dive into subdir if exists" msgstr "" #: gnome/filegui.c:974 src/filegui.c:974 -#, c-format msgid "" "Invalid source pattern `%s' \n" " %s " @@ -2497,8 +2256,7 @@ msgstr "" msgid "Content: " msgstr "" -#: gnome/find.c:156 gnome/main.c:1202 gnome/main.c:1223 src/find.c:156 -#: src/main.c:1202 src/main.c:1223 +#: gnome/find.c:156 gnome/main.c:1202 gnome/main.c:1223 src/find.c:156 src/main.c:1202 src/main.c:1223 msgid "&Tree" msgstr "" @@ -2507,7 +2265,6 @@ msgid "Find File" msgstr "" #: gnome/find.c:435 src/find.c:435 -#, c-format msgid "Grepping in %s" msgstr "" @@ -2524,7 +2281,6 @@ msgid "Finished" msgstr "" #: gnome/find.c:544 gnome/view.c:1450 src/find.c:544 src/view.c:1450 -#, c-format msgid "Searching %s" msgstr "" @@ -2536,6 +2292,7 @@ msgstr "" msgid "Find file" msgstr "" +#. Validity check for arguments #: gnome/fixhlp.c:173 src/fixhlp.c:173 msgid "Usage: fixhlp \n" msgstr "" @@ -2546,7 +2303,7 @@ msgstr "" #: gnome/fixhlp.c:181 src/fixhlp.c:181 msgid "" -"[Contents]\n" +"\004[Contents]\n" " Topics:\n" "\n" msgstr "" @@ -2563,8 +2320,7 @@ msgstr "" msgid "The GNOME edition of the Midnight Commander file manager." msgstr "" -#: gnome/gcmd.c:106 gnome/main.c:821 gnome/olddnd.c:1534 gnome/screen.c:2065 -#: src/main.c:821 src/screen.c:2065 +#: gnome/gcmd.c:106 gnome/main.c:821 gnome/olddnd.c:1534 gnome/screen.c:2065 src/main.c:821 src/screen.c:2065 msgid " The Midnight Commander " msgstr "" @@ -2576,92 +2332,89 @@ msgstr "" msgid "Sort By" msgstr "" -#. we define this up here so we can pass it in to our callback -#: gnome/gcmd.c:209 +#: gnome/gcmd.c:211 msgid "Ignore case sensitivity." msgstr "" -#: gnome/gcmd.c:224 +#: gnome/gcmd.c:226 msgid "File Type" msgstr "" -#: gnome/gcmd.c:230 gnome/screen.c:445 gnome/screen.c:448 src/screen.c:445 -#: src/screen.c:448 +#: gnome/gcmd.c:232 gnome/screen.c:445 gnome/screen.c:448 src/screen.c:445 src/screen.c:448 msgid "Size" msgstr "" -#: gnome/gcmd.c:236 +#: gnome/gcmd.c:238 msgid "Time Last Accessed" msgstr "" -#: gnome/gcmd.c:242 +#: gnome/gcmd.c:244 msgid "Time Last Modified" msgstr "" -#: gnome/gcmd.c:248 +#: gnome/gcmd.c:250 msgid "Time Last Changed" msgstr "" -#: gnome/gcmd.c:262 +#: gnome/gcmd.c:264 msgid "Reverse the order." msgstr "" -#: gnome/gcmd.c:324 +#: gnome/gcmd.c:326 msgid "Enter name." msgstr "" -#: gnome/gcmd.c:329 +#: gnome/gcmd.c:332 msgid "Enter label for command:" msgstr "" -#: gnome/gcmd.c:424 +#: gnome/gcmd.c:427 msgid "Find all core files" msgstr "" -#: gnome/gcmd.c:427 gnome/panelize.c:354 src/panelize.c:354 +#: gnome/gcmd.c:430 gnome/panelize.c:354 src/panelize.c:354 msgid "Find rejects after patching" msgstr "" -#: gnome/gcmd.c:469 +#: gnome/gcmd.c:472 msgid "Run Command" msgstr "" #. Frame 1 -#: gnome/gcmd.c:473 +#: gnome/gcmd.c:477 msgid "Preset Commands" msgstr "" -#: gnome/gcmd.c:490 +#: gnome/gcmd.c:494 msgid "Add" msgstr "" -#: gnome/gcmd.c:494 +#: gnome/gcmd.c:498 msgid "Remove" msgstr "" #. Frame 2 -#: gnome/gcmd.c:502 +#: gnome/gcmd.c:506 msgid "Run this Command" msgstr "" -#: gnome/gcmd.c:509 +#: gnome/gcmd.c:513 msgid "Command: " msgstr "" -#: gnome/gcmd.c:553 +#: gnome/gcmd.c:557 msgid "Set Filter" msgstr "" -#: gnome/gcmd.c:557 gnome/gcmd.c:598 gnome/gcmd.c:603 gnome/gcmd.c:607 -#: gnome/gscreen.c:2398 +#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612 gnome/gscreen.c:2452 msgid "Show all files" msgstr "" -#: gnome/gcmd.c:564 +#: gnome/gcmd.c:569 msgid "." msgstr "" -#: gnome/gcmd.c:580 +#: gnome/gcmd.c:585 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -2669,85 +2422,92 @@ msgid "" "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:582 +#: gnome/gcmd.c:587 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:639 gnome/gpopup.c:47 +#: gnome/gcmd.c:644 gnome/gpopup.c:47 msgid " Open with..." msgstr "" -#: gnome/gcmd.c:640 gnome/gpopup.c:48 gnome/olddnd.c:1546 +#: gnome/gcmd.c:645 gnome/gpopup.c:48 gnome/olddnd.c:1546 msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:355 gnome/gdesktop.c:1414 +#: gnome/gdesktop.c:359 gnome/gdesktop.c:1527 msgid "Warning" msgstr "" -#: gnome/gdesktop.c:356 -#, c-format +#: gnome/gdesktop.c:360 msgid "Could not open %s; will not have initial desktop icons" msgstr "" -#: gnome/gdesktop.c:1380 +#: gnome/gdesktop.c:1493 msgid "Trashcan" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1410 +#: gnome/gdesktop.c:1523 msgid "Home directory" msgstr "" -#: gnome/gdesktop.c:1415 -#, c-format +#: gnome/gdesktop.c:1528 msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" -#: gnome/gdialogs.c:345 +#: gnome/gdialogs.c:58 +msgid "To: " +msgstr "" + +#: gnome/gdialogs.c:59 +msgid "Copying from: " +msgstr "" + +#: gnome/gdialogs.c:60 +msgid "Deleting file: " +msgstr "" + +#: gnome/gdialogs.c:341 msgid "Files Exist" msgstr "" -#: gnome/gdialogs.c:356 -msgid "" -"Some of the files you are trying to copy already exist in the destination " -"folder." +#: gnome/gdialogs.c:353 +msgid "Some of the files you are trying to copy already exist in the destination folder." msgstr "" -#: gnome/gdialogs.c:365 +#: gnome/gdialogs.c:362 msgid "Prompt me before overwriting any file." msgstr "" -#: gnome/gdialogs.c:372 +#: gnome/gdialogs.c:369 msgid "Don't overwrite any files." msgstr "" -#: gnome/gdialogs.c:384 +#: gnome/gdialogs.c:381 msgid "Overwrite:" msgstr "" -#: gnome/gdialogs.c:391 +#: gnome/gdialogs.c:388 msgid "Older files." msgstr "" -#: gnome/gdialogs.c:397 +#: gnome/gdialogs.c:394 msgid "Files only if size differs." msgstr "" -#: gnome/gdialogs.c:403 +#: gnome/gdialogs.c:400 msgid "All files." msgstr "" -#: gnome/gdialogs.c:452 +#: gnome/gdialogs.c:449 msgid "File Exists" msgstr "" -#: gnome/gdialogs.c:457 -#, c-format +#: gnome/gdialogs.c:455 msgid "The target file already exists: %s" msgstr "" -#: gnome/gdialogs.c:464 +#: gnome/gdialogs.c:462 msgid "Replace it?" msgstr "" @@ -2776,9 +2536,7 @@ msgid "Follow links." msgstr "" #: gnome/gdialogs.c:601 -msgid "" -"Selecting this will copy the files that symlinks point to instead of just " -"copying the link." +msgid "Selecting this will copy the files that symlinks point to instead of just copying the link." msgstr "" #: gnome/gdialogs.c:605 @@ -2797,37 +2555,48 @@ msgstr "" msgid "If set, this will copy the directories recursively" msgstr "" -#: gnome/gdialogs.c:784 +#: gnome/gdialogs.c:734 +msgid "Move Progress" +msgstr "" + +#: gnome/gdialogs.c:737 +msgid "Copy Progress" +msgstr "" + +#: gnome/gdialogs.c:740 +msgid "Delete Progress" +msgstr "" + +#: gnome/gdialogs.c:785 msgid "File " msgstr "" -#: gnome/gdialogs.c:788 +#: gnome/gdialogs.c:789 msgid " is " msgstr "" -#: gnome/gdialogs.c:791 +#: gnome/gdialogs.c:792 msgid " Done." msgstr "" -#: gnome/gdnd.c:24 -msgid "Move here" +#: gnome/gdnd.c:49 +msgid "_Move here" msgstr "" -#: gnome/gdnd.c:25 -msgid "Copy here" +#: gnome/gdnd.c:50 +msgid "_Copy here" msgstr "" -#: gnome/gdnd.c:26 -msgid "Link here" +#: gnome/gdnd.c:51 +msgid "_Link here" msgstr "" -#: gnome/gdnd.c:28 +#: gnome/gdnd.c:53 msgid "Cancel drag" msgstr "" #. FIXME: this error message sucks -#: gnome/gdnd.c:207 -#, c-format +#: gnome/gdnd.c:191 msgid "" "Could not stat %s\n" "%s" @@ -2853,7 +2622,6 @@ msgstr "" msgid "Launch a new terminal in the current directory" msgstr "" -#. If this ever changes, make sure you update create_new_menu accordingly. #: gnome/glayout.c:285 msgid "_Directory..." msgstr "" @@ -2870,13 +2638,6 @@ msgstr "" msgid "Opens a new window" msgstr "" -#. We want to make a new menu entry here... -#. For example: -#. New-> -#. Command Prompt -#. Gimp Image -#. Gnumeric Spreadsheet -#. Text Document #. etc... #: gnome/glayout.c:301 msgid "_New" @@ -2923,189 +2684,181 @@ msgstr "" msgid "Close this panel" msgstr "" -#: gnome/glayout.c:320 -msgid "_Select All" +#: gnome/glayout.c:316 +msgid "Select _All" msgstr "" -#: gnome/glayout.c:320 +#: gnome/glayout.c:316 msgid "Select all files in the current Panel" msgstr "" -#: gnome/glayout.c:321 +#: gnome/glayout.c:317 msgid "_Select Files..." msgstr "" -#: gnome/glayout.c:321 +#: gnome/glayout.c:317 msgid "Select a group of files" msgstr "" -#: gnome/glayout.c:322 +#: gnome/glayout.c:318 msgid "_Invert Selection" msgstr "" -#: gnome/glayout.c:322 +#: gnome/glayout.c:318 msgid "Reverses the list of tagged files" msgstr "" -#: gnome/glayout.c:324 +#: gnome/glayout.c:320 msgid "_Rescan Directory" msgstr "" -#: gnome/glayout.c:324 +#: gnome/glayout.c:320 msgid "Rescan the directory contents" msgstr "" -#: gnome/glayout.c:331 +#: gnome/glayout.c:327 msgid "Icon View" msgstr "" -#: gnome/glayout.c:332 +#: gnome/glayout.c:328 msgid "Partial View" msgstr "" -#: gnome/glayout.c:333 +#: gnome/glayout.c:329 msgid "Full View" msgstr "" -#: gnome/glayout.c:334 +#: gnome/glayout.c:330 msgid "Custom View" msgstr "" -#: gnome/glayout.c:340 +#: gnome/glayout.c:336 msgid "_Sort By..." msgstr "" -#: gnome/glayout.c:340 +#: gnome/glayout.c:336 msgid "Confirmation settings" msgstr "" -#: gnome/glayout.c:341 +#: gnome/glayout.c:337 msgid "_Filter View..." msgstr "" -#: gnome/glayout.c:341 +#: gnome/glayout.c:337 msgid "Global option settings" msgstr "" -#: gnome/glayout.c:348 +#: gnome/glayout.c:344 msgid "_Find File..." msgstr "" -#: gnome/glayout.c:348 +#: gnome/glayout.c:344 msgid "Locate files on disk" msgstr "" -#: gnome/glayout.c:351 -msgid "_Compare panels..." -msgstr "" - -#: gnome/glayout.c:351 -msgid "Compare two panel contents" -msgstr "" - -#: gnome/glayout.c:352 +#: gnome/glayout.c:348 msgid "_Run Command..." msgstr "" -#: gnome/glayout.c:352 +#: gnome/glayout.c:348 msgid "Runs a command" msgstr "" -#: gnome/glayout.c:354 +#: gnome/glayout.c:350 msgid "_Run Command in panel..." msgstr "" -#: gnome/glayout.c:354 +#: gnome/glayout.c:350 msgid "Run a command and put the results in a panel" msgstr "" -#: gnome/glayout.c:357 +#: gnome/glayout.c:353 msgid "_Active VFS list..." msgstr "" -#: gnome/glayout.c:357 +#: gnome/glayout.c:353 msgid "List of active virtual file systems" msgstr "" -#: gnome/glayout.c:364 +#. { GNOME_APP_UI_ITEM, N_("_Undelete files (ext2fs only)..."), N_("Recover deleted files"), undelete_cmd }, +#: gnome/glayout.c:360 msgid "_Background jobs..." msgstr "" -#: gnome/glayout.c:364 +#: gnome/glayout.c:360 msgid "List of background operations" msgstr "" #. GNOMEUIINFO_HELP ("midnight-commander"), -#: gnome/glayout.c:372 +#: gnome/glayout.c:368 msgid "_About" msgstr "" -#: gnome/glayout.c:372 +#: gnome/glayout.c:368 msgid "Information on this program" msgstr "" -#: gnome/glayout.c:378 gnome/gview.c:323 +#: gnome/glayout.c:374 gnome/gview.c:323 msgid "_File" msgstr "" -#: gnome/glayout.c:379 +#: gnome/glayout.c:375 msgid "_Edit" msgstr "" -#: gnome/glayout.c:380 +#: gnome/glayout.c:376 msgid "_Layout" msgstr "" -#: gnome/glayout.c:381 +#: gnome/glayout.c:377 msgid "_Commands" msgstr "" -#: gnome/glayout.c:382 +#: gnome/glayout.c:378 msgid "_Help" msgstr "" -#: gnome/glayout.c:477 +#: gnome/glayout.c:473 msgid "File/New/Directory..." msgstr "" -#: gnome/gpopup.c:199 gnome/gpopup.c:200 +#: gnome/gpopup.c:212 gnome/gpopup.c:213 msgid "Properties" msgstr "" -#: gnome/gpopup.c:202 gnome/gpopup.c:203 +#: gnome/gpopup.c:215 gnome/gpopup.c:216 msgid "Open" msgstr "" -#: gnome/gpopup.c:204 +#: gnome/gpopup.c:217 msgid "Open with" msgstr "" -#: gnome/gpopup.c:205 gnome/screen.c:2303 gnome/screen.c:2333 -#: src/screen.c:2303 src/screen.c:2333 +#: gnome/gpopup.c:218 gnome/screen.c:2303 gnome/screen.c:2333 src/screen.c:2303 src/screen.c:2333 msgid "View" msgstr "" -#: gnome/gpopup.c:206 +#: gnome/gpopup.c:219 msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:209 +#: gnome/gpopup.c:222 msgid "Link..." msgstr "" -#: gnome/gpopup.c:210 +#: gnome/gpopup.c:223 msgid "Symlink..." msgstr "" -#: gnome/gpopup.c:211 +#: gnome/gpopup.c:224 msgid "Edit symlink..." msgstr "" -#: gnome/gpopup.c:218 gnome/gpopup.c:229 +#: gnome/gpopup.c:231 gnome/gpopup.c:242 msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:219 gnome/gpopup.c:230 +#: gnome/gpopup.c:232 gnome/gpopup.c:243 msgid "Copy..." msgstr "" @@ -3213,7 +2966,6 @@ msgstr "" msgid "Current mode: " msgstr "" -#. Headings #: gnome/gprop.c:272 msgid "Read" msgstr "" @@ -3230,12 +2982,10 @@ msgstr "" msgid "Special" msgstr "" -#. Permissions #: gnome/gprop.c:279 msgid "User" msgstr "" -#. Group #: gnome/gprop.c:280 gnome/gprop.c:405 gnome/screen.c:456 src/screen.c:456 msgid "Group" msgstr "" @@ -3244,7 +2994,6 @@ msgstr "" msgid "Other" msgstr "" -#. Special #: gnome/gprop.c:285 msgid "Set UID" msgstr "" @@ -3261,7 +3010,6 @@ msgstr "" msgid "" msgstr "" -#. Owner #: gnome/gprop.c:390 gnome/screen.c:455 src/screen.c:455 msgid "Owner" msgstr "" @@ -3274,7 +3022,7 @@ msgstr "" msgid "Title" msgstr "" -#: gnome/gprop.c:521 gnome/gscreen.c:2180 +#: gnome/gprop.c:521 gnome/gscreen.c:2234 msgid "Icon" msgstr "" @@ -3282,174 +3030,167 @@ msgstr "" msgid "Select icon" msgstr "" -#: gnome/gscreen.c:1478 +#: gnome/gscreen.c:1532 msgid "All files" msgstr "" -#: gnome/gscreen.c:1480 +#: gnome/gscreen.c:1534 msgid "Archives and compressed files" msgstr "" -#: gnome/gscreen.c:1482 +#: gnome/gscreen.c:1536 msgid "RPM/DEB files" msgstr "" -#: gnome/gscreen.c:1484 +#: gnome/gscreen.c:1538 msgid "Text/Document files" msgstr "" -#: gnome/gscreen.c:1486 +#: gnome/gscreen.c:1540 msgid "HTML and SGML files" msgstr "" -#: gnome/gscreen.c:1488 +#: gnome/gscreen.c:1542 msgid "Postscript and PDF files" msgstr "" -#: gnome/gscreen.c:1490 +#: gnome/gscreen.c:1544 msgid "Spreadsheet files" msgstr "" -#: gnome/gscreen.c:1492 +#: gnome/gscreen.c:1546 msgid "Image files" msgstr "" -#: gnome/gscreen.c:1495 +#: gnome/gscreen.c:1549 msgid "Video/animation files" msgstr "" -#: gnome/gscreen.c:1497 +#: gnome/gscreen.c:1551 msgid "Audio files" msgstr "" -#: gnome/gscreen.c:1499 +#: gnome/gscreen.c:1553 msgid "C program files" msgstr "" -#: gnome/gscreen.c:1501 +#: gnome/gscreen.c:1555 msgid "C++ program files" msgstr "" -#: gnome/gscreen.c:1503 +#: gnome/gscreen.c:1557 msgid "Objective-C program files" msgstr "" -#: gnome/gscreen.c:1505 +#: gnome/gscreen.c:1559 msgid "Scheme program files" msgstr "" -#: gnome/gscreen.c:1507 +#: gnome/gscreen.c:1561 msgid "Assembler program files" msgstr "" -#: gnome/gscreen.c:1509 +#: gnome/gscreen.c:1563 msgid "Misc. program files" msgstr "" -#: gnome/gscreen.c:1511 +#: gnome/gscreen.c:1565 msgid "Font files" msgstr "" -#: gnome/gscreen.c:1638 -#, c-format +#: gnome/gscreen.c:1692 msgid "Search: %s" msgstr "" -#: gnome/gscreen.c:1648 -#, c-format +#: gnome/gscreen.c:1702 msgid "%s bytes in %d file" msgstr "" -#: gnome/gscreen.c:1648 -#, c-format +#: gnome/gscreen.c:1702 msgid "%s bytes in %d files" msgstr "" -#: gnome/gscreen.c:1674 gnome/screen.c:693 src/screen.c:693 +#: gnome/gscreen.c:1728 gnome/screen.c:693 src/screen.c:693 msgid "" msgstr "" -#: gnome/gscreen.c:1728 +#: gnome/gscreen.c:1782 msgid "Filter" msgstr "" -#: gnome/gscreen.c:2180 +#: gnome/gscreen.c:2234 msgid "Switch view to an Icon view" msgstr "" -#: gnome/gscreen.c:2182 +#: gnome/gscreen.c:2236 msgid "Brief" msgstr "" -#: gnome/gscreen.c:2182 +#: gnome/gscreen.c:2236 msgid "Switch view to show just file name and type" msgstr "" -#: gnome/gscreen.c:2184 +#: gnome/gscreen.c:2238 msgid "Detailed" msgstr "" -#: gnome/gscreen.c:2184 +#: gnome/gscreen.c:2238 msgid "Switch view to show detailed file statistics" msgstr "" -#: gnome/gscreen.c:2186 +#: gnome/gscreen.c:2240 msgid "Custom" msgstr "" -#: gnome/gscreen.c:2186 -msgid "" -"Switch view to show custom determined statistics. You can set this in the " +#: gnome/gscreen.c:2240 +msgid "Switch view to show custom determined statistics. You can set this in the " msgstr "" -#: gnome/gscreen.c:2191 +#: gnome/gscreen.c:2245 msgid "Back" msgstr "" -#: gnome/gscreen.c:2191 +#: gnome/gscreen.c:2245 msgid "Go to the previously visited directory" msgstr "" -#: gnome/gscreen.c:2193 +#: gnome/gscreen.c:2247 msgid "Up" msgstr "" -#: gnome/gscreen.c:2193 +#: gnome/gscreen.c:2247 msgid "Go up a level in the directory heirarchy" msgstr "" -#: gnome/gscreen.c:2195 +#: gnome/gscreen.c:2249 msgid "Forward" msgstr "" -#: gnome/gscreen.c:2195 +#: gnome/gscreen.c:2249 msgid "Go to the next directory" msgstr "" -#: gnome/gscreen.c:2198 +#: gnome/gscreen.c:2252 msgid "Home" msgstr "" -#: gnome/gscreen.c:2198 +#: gnome/gscreen.c:2252 msgid "Go to your home directory" msgstr "" -#: gnome/gscreen.c:2347 +#: gnome/gscreen.c:2401 msgid "Location:" msgstr "" #: gnome/gview.c:119 gnome/view.c:687 src/view.c:687 -#, c-format msgid "Offset 0x%08x" msgstr "" #: gnome/gview.c:121 gnome/view.c:689 src/view.c:689 -#, c-format msgid "Col %d" msgstr "" #: gnome/gview.c:125 gnome/view.c:693 src/view.c:693 -#, c-format msgid "%s bytes" msgstr "" @@ -3485,6 +3226,7 @@ msgstr "" msgid "Wrap the text" msgstr "" +#. Can not use this one yet, as it destroys the viewer, need to fix that #: gnome/gview.c:315 msgid "_Formatted" msgstr "" @@ -3524,7 +3266,7 @@ msgstr "" #: gnome/help.c:282 src/help.c:282 msgid "" " Help file format error\n" -"" +"\004" msgstr "" #: gnome/help.c:321 src/help.c:321 @@ -3540,14 +3282,12 @@ msgid " Help " msgstr "" #: gnome/help.c:769 gnome/user.c:644 src/help.c:769 src/user.c:644 -#, c-format msgid "" " Can't open file %s \n" " %s " msgstr "" #: gnome/help.c:774 src/help.c:774 -#, c-format msgid " Can't find node %s in help file " msgstr "" @@ -3563,19 +3303,15 @@ msgstr "" msgid "&Move" msgstr "" -#: gnome/hotlist.c:136 gnome/hotlist.c:1438 gnome/panelize.c:92 -#: gnome/wtools.c:386 src/hotlist.c:136 src/hotlist.c:1438 src/panelize.c:92 -#: src/wtools.c:386 +#: gnome/hotlist.c:136 gnome/hotlist.c:1438 gnome/panelize.c:92 gnome/wtools.c:386 src/hotlist.c:136 src/hotlist.c:1438 src/panelize.c:92 src/wtools.c:386 msgid "&Remove" msgstr "" -#: gnome/hotlist.c:137 gnome/hotlist.c:817 gnome/hotlist.c:910 -#: src/hotlist.c:137 src/hotlist.c:817 src/hotlist.c:910 +#: gnome/hotlist.c:137 gnome/hotlist.c:817 gnome/hotlist.c:910 src/hotlist.c:137 src/hotlist.c:817 src/hotlist.c:910 msgid "&Append" msgstr "" -#: gnome/hotlist.c:138 gnome/hotlist.c:815 gnome/hotlist.c:908 -#: src/hotlist.c:138 src/hotlist.c:815 src/hotlist.c:908 +#: gnome/hotlist.c:138 gnome/hotlist.c:815 gnome/hotlist.c:908 src/hotlist.c:138 src/hotlist.c:815 src/hotlist.c:908 msgid "&Insert" msgstr "" @@ -3645,7 +3381,6 @@ msgid "Name of new group" msgstr "" #: gnome/hotlist.c:982 src/hotlist.c:982 -#, c-format msgid "Label for \"%s\":" msgstr "" @@ -3680,14 +3415,11 @@ msgstr "" msgid "and then delete [Hotlist] section there" msgstr "" -#: gnome/hotlist.c:1395 gnome/hotlist.c:1414 gnome/hotlist.c:1437 -#: gnome/hotlist.c:1462 src/hotlist.c:1395 src/hotlist.c:1414 -#: src/hotlist.c:1437 src/hotlist.c:1462 +#: gnome/hotlist.c:1395 gnome/hotlist.c:1414 gnome/hotlist.c:1437 gnome/hotlist.c:1462 src/hotlist.c:1395 src/hotlist.c:1414 src/hotlist.c:1437 src/hotlist.c:1462 msgid " Hotlist Load " msgstr "" -#: gnome/hotlist.c:1411 gnome/hotlist.c:1459 src/hotlist.c:1411 -#: src/hotlist.c:1459 +#: gnome/hotlist.c:1411 gnome/hotlist.c:1459 src/hotlist.c:1411 src/hotlist.c:1459 msgid "MC was unable to write ~/" msgstr "" @@ -3750,7 +3482,6 @@ msgid " file your old hotlist entries were not deleted" msgstr "" #: gnome/info.c:82 src/info.c:82 -#, c-format msgid "Midnight Commander %s" msgstr "" @@ -3775,7 +3506,6 @@ msgid "No space information" msgstr "" #: gnome/info.c:135 src/info.c:135 -#, c-format msgid "Type: %s " msgstr "" @@ -3784,27 +3514,22 @@ msgid "non-local vfs" msgstr "" #: gnome/info.c:141 src/info.c:141 -#, c-format msgid "Device: %s" msgstr "" #: gnome/info.c:145 src/info.c:145 -#, c-format msgid "Filesystem: %s" msgstr "" #: gnome/info.c:150 src/info.c:150 -#, c-format msgid "Accessed: %s" msgstr "" #: gnome/info.c:154 src/info.c:154 -#, c-format msgid "Modified: %s" msgstr "" #: gnome/info.c:158 src/info.c:158 -#, c-format msgid "Created: %s" msgstr "" @@ -3813,32 +3538,26 @@ msgid "Size: " msgstr "" #: gnome/info.c:174 src/info.c:174 -#, c-format msgid " (%d blocks)" msgstr "" #: gnome/info.c:180 src/info.c:180 -#, c-format msgid "Owner: %s/%s" msgstr "" #: gnome/info.c:185 src/info.c:185 -#, c-format msgid "Links: %d" msgstr "" #: gnome/info.c:189 src/info.c:189 -#, c-format msgid "Mode: %s (%04o)" msgstr "" #: gnome/info.c:194 src/info.c:194 -#, c-format msgid "Location: %Xh:%Xh" msgstr "" #: gnome/info.c:200 src/info.c:200 -#, c-format msgid "File: %s" msgstr "" @@ -3890,8 +3609,7 @@ msgstr "" msgid "&File types" msgstr "" -#: gnome/layout.c:374 gnome/learn.c:62 gnome/learn.c:181 gnome/option.c:146 -#: src/layout.c:374 src/learn.c:62 src/learn.c:181 src/option.c:146 +#: gnome/layout.c:374 gnome/learn.c:62 gnome/learn.c:181 gnome/option.c:146 src/layout.c:374 src/learn.c:62 src/learn.c:181 src/option.c:146 msgid "&Save" msgstr "" @@ -3929,7 +3647,6 @@ msgid " Teach me a key " msgstr "" #: gnome/learn.c:96 src/learn.c:96 -#, c-format msgid "" "Please press the %s\n" "and then wait until this message disappears.\n" @@ -3946,7 +3663,6 @@ msgid " Cannot accept this key " msgstr "" #: gnome/learn.c:125 src/learn.c:125 -#, c-format msgid " You have entered \"%s\"" msgstr "" @@ -4002,6 +3718,7 @@ msgstr "" msgid " The shell is already running a command " msgstr "" +#. NOTICE: hotkeys specified here are overriden in menubar_paint_idx (alex) #: gnome/main.c:1199 gnome/main.c:1220 src/main.c:1199 src/main.c:1220 msgid "&Listing mode..." msgstr "" @@ -4242,8 +3959,7 @@ msgid "" " the details. " msgstr "" -#: gnome/main.c:1672 gnome/screen.c:2302 gnome/screen.c:2332 src/main.c:1672 -#: src/screen.c:2302 src/screen.c:2332 +#: gnome/main.c:1672 gnome/screen.c:2302 gnome/screen.c:2332 src/main.c:1672 src/screen.c:2302 src/screen.c:2332 msgid "Menu" msgstr "" @@ -4252,7 +3968,6 @@ msgid "Thank you for using GNU Midnight Commander" msgstr "" #: gnome/main.c:2230 src/main.c:2230 -#, c-format msgid "with mouse support on xterm%s.\n" msgstr "" @@ -4265,13 +3980,11 @@ msgid "The TERM environment variable is unset!\n" msgstr "" #: gnome/main.c:2528 src/main.c:2528 -#, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "" #: gnome/main.c:2533 src/main.c:2533 -msgid "" -"Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" +msgid "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" #: gnome/main.c:2656 src/main.c:2656 @@ -4321,7 +4034,6 @@ msgid "Open with..." msgstr "" #: gnome/olddnd.c:1681 -#, c-format msgid " Could not open %s directory" msgstr "" @@ -4417,7 +4129,6 @@ msgstr "" msgid "alwa&Ys" msgstr "" -#. Similar code is in layout.c (init_layout()) #: gnome/option.c:154 src/option.c:154 msgid " Configure options " msgstr "" @@ -4442,14 +4153,13 @@ msgstr "" msgid " External panelize " msgstr "" -#: gnome/panelize.c:198 gnome/panelize.c:466 src/panelize.c:198 -#: src/panelize.c:466 +#. SCO_FLAVOR +#. SCO_FLAVOR +#: gnome/panelize.c:198 gnome/panelize.c:466 src/panelize.c:198 src/panelize.c:466 msgid "External panelize" msgstr "" -#: gnome/panelize.c:223 gnome/panelize.c:280 gnome/panelize.c:351 -#: gnome/panelize.c:372 src/panelize.c:223 src/panelize.c:280 -#: src/panelize.c:351 src/panelize.c:372 +#: gnome/panelize.c:223 gnome/panelize.c:280 gnome/panelize.c:351 gnome/panelize.c:372 src/panelize.c:223 src/panelize.c:280 src/panelize.c:351 src/panelize.c:372 msgid "Other command" msgstr "" @@ -4530,7 +4240,6 @@ msgid "Inode" msgstr "" #: gnome/screen.c:666 src/screen.c:666 -#, c-format msgid " %s bytes in %d file%s" msgstr "" @@ -4542,25 +4251,22 @@ msgstr "" msgid " No action taken " msgstr "" -#: gnome/screen.c:2306 gnome/screen.c:2336 gnome/tree.c:1030 src/screen.c:2306 -#: src/screen.c:2336 src/tree.c:1030 +#: gnome/screen.c:2306 gnome/screen.c:2336 gnome/tree.c:1030 src/screen.c:2306 src/screen.c:2336 src/tree.c:1030 msgid "RenMov" msgstr "" -#: gnome/screen.c:2307 gnome/screen.c:2337 gnome/tree.c:1034 src/screen.c:2307 -#: src/screen.c:2337 src/tree.c:1034 +#. FIXME: mkdir is currently defunct +#: gnome/screen.c:2307 gnome/screen.c:2337 gnome/tree.c:1034 src/screen.c:2307 src/screen.c:2337 src/tree.c:1034 msgid "Mkdir" msgstr "" #: gnome/screen.c:2323 src/screen.c:2323 -#, c-format msgid "" " Can't chdir to %s \n" " %s " msgstr "" #: gnome/subshell.c:287 src/subshell.c:287 -#, c-format msgid "Couldn't open named pipe %s\n" msgstr "" @@ -4577,29 +4283,24 @@ msgid " Quit anyway? " msgstr "" #: gnome/subshell.c:780 src/subshell.c:780 -#, c-format msgid "Warning: Couldn't change to %s.\n" msgstr "" #: gnome/tree.c:204 src/tree.c:204 -#, c-format msgid "" "Can't open the %s file for writing:\n" "%s\n" msgstr "" #: gnome/tree.c:649 src/tree.c:649 -#, c-format msgid "Copy \"%s\" directory to:" msgstr "" #: gnome/tree.c:687 src/tree.c:687 -#, c-format msgid "Move \"%s\" directory to:" msgstr "" #: gnome/tree.c:694 src/tree.c:694 -#, c-format msgid "" " Can't stat the destination \n" " %s " @@ -4610,7 +4311,6 @@ msgid " The destination isn't a directory " msgstr "" #: gnome/tree.c:758 src/tree.c:758 -#, c-format msgid " Delete %s? " msgstr "" @@ -4623,7 +4323,6 @@ msgid "Dynamc" msgstr "" #: gnome/tree.c:880 src/tree.c:880 -#, c-format msgid "" " Can't chdir to \"%s\" \n" " %s " @@ -4642,14 +4341,12 @@ msgid "Rmdir" msgstr "" #: gnome/treestore.c:358 src/treestore.c:358 -#, c-format msgid "" "Can't write to the %s file:\n" "%s\n" msgstr "" #: gnome/user.c:265 src/user.c:265 -#, c-format msgid " Invalid shell pattern defination \"%c\". " msgstr "" @@ -4657,6 +4354,7 @@ msgstr "" msgid " Debug " msgstr "" +#. Save the result of the condition #: gnome/user.c:407 src/user.c:407 msgid " ERROR: " msgstr "" @@ -4674,7 +4372,6 @@ msgid " Warning -- ignoring file " msgstr "" #: gnome/user.c:611 src/user.c:611 -#, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" "Using it may compromise your security" @@ -4746,7 +4443,6 @@ msgid " Can't view: not a regular file " msgstr "" #: gnome/view.c:682 src/view.c:682 -#, c-format msgid "File: %s" msgstr "" @@ -4763,7 +4459,6 @@ msgid " Invalid regular expression " msgstr "" #: gnome/view.c:1831 src/view.c:1831 -#, c-format msgid "" " The current line number is %d.\n" " Enter the new line number:" @@ -5024,7 +4719,7 @@ msgstr "" msgid "NumLock on keypad" msgstr "" -#: gnome/wtools.c:590 src/wtools.c:590 vfs/vfs.c:1776 +#: gnome/wtools.c:590 src/wtools.c:590 vfs/vfs.c:1755 msgid "Password:" msgstr "" @@ -5036,88 +4731,85 @@ msgstr "" msgid "Ok" msgstr "" -#: vfs/extfs.c:274 -#, c-format +#: vfs/extfs.c:266 msgid "" "Couldn't open %s archive\n" "%s" msgstr "" -#: vfs/extfs.c:306 vfs/extfs.c:326 +#: vfs/extfs.c:298 vfs/extfs.c:318 msgid "Inconsistent extfs archive" msgstr "" -#: vfs/fish.c:226 +#: vfs/fish.c:224 msgid "Sorry, we can not do password authenticated connections for now." msgstr "" -#: vfs/ftpfs.c:466 -#, c-format +#: vfs/ftpfs.c:461 msgid " Could not set source routing (%s)" msgstr "" -#: vfs/ftpfs.c:1878 vfs/ftpfs.c:1893 +#: vfs/ftpfs.c:1865 vfs/ftpfs.c:1880 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." msgstr "" -#: vfs/mcfs.c:155 +#: vfs/mcfs.c:153 msgid " MCFS " msgstr "" -#: vfs/mcfs.c:155 +#: vfs/mcfs.c:153 msgid " The server does not support this version " msgstr "" -#: vfs/mcfs.c:172 +#: vfs/mcfs.c:170 msgid "" " The remote server is not running on a system port \n" " you need a password to log in, but the information may \n" " not be safe on the remote side. Continue? \n" msgstr "" -#: vfs/mcfs.c:175 +#: vfs/mcfs.c:173 msgid " Yes " msgstr "" -#: vfs/mcfs.c:175 +#: vfs/mcfs.c:173 msgid " No " msgstr "" -#: vfs/mcfs.c:177 +#: vfs/mcfs.c:175 msgid " The remote server is running on strange port. Giving up.\n" msgstr "" -#: vfs/mcfs.c:189 +#: vfs/mcfs.c:187 msgid " MCFS Password required " msgstr "" -#: vfs/mcfs.c:203 +#: vfs/mcfs.c:201 msgid " Invalid password " msgstr "" -#: vfs/mcfs.c:323 +#: vfs/mcfs.c:321 msgid " Too many open connections " msgstr "" -#: vfs/tar.c:83 vfs/tar.c:100 -#, c-format +#: vfs/tar.c:84 vfs/tar.c:101 msgid "" "Couldn't open tar archive\n" "%s" msgstr "" -#: vfs/tar.c:283 +#: vfs/tar.c:284 msgid "Unexpected EOF on archive file" msgstr "" -#: vfs/tar.c:338 vfs/tar.c:345 +#: vfs/tar.c:339 vfs/tar.c:346 msgid "Inconsistent tar archive" msgstr "" -#: vfs/tar.c:411 -#, c-format +#. Error on first record +#: vfs/tar.c:412 msgid "" "Hmm,...\n" "%s\n" diff --git a/src/Makefile.in b/src/Makefile.in index 5437842f6..99337e91c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -32,7 +32,7 @@ HDRS = color.h file.h mouse.h user.h dialog.h find.h main.h \ help.h profile.h dlg.h option.h tree.h info.h \ widget.h chmod.h cons.saver.h mad.h wtools.h chown.h \ subshell.h view.h setup.h key.h ext.h boxes.h \ - hotlist.h layout.h fsusage.h mountlist.h regex.h complete.h \ + hotlist.h layout.h fsusage.h mountlist.h eregex.h complete.h \ myslang.h command.h cmd.h tty.h fs.h panelize.h achown.h \ learn.h listmode.h features.inc background.h \ x.h textconf.h i18n.h findme.h popt.h filegui.h keys.h xtty.h \ diff --git a/src/regex.h b/src/eregex.h similarity index 99% rename from src/regex.h rename to src/eregex.h index 8d1758bd7..6a24fad0f 100644 --- a/src/regex.h +++ b/src/eregex.h @@ -475,6 +475,7 @@ extern char *re_comp _RE_ARGS ((const char *)); extern int re_exec _RE_ARGS ((const char *)); #endif +#if 0 /* POSIX compatibility. */ extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags)); extern int regexec @@ -484,6 +485,7 @@ extern size_t regerror _RE_ARGS ((int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)); extern void regfree _RE_ARGS ((regex_t *preg)); +#endif #endif /* not __REGEXP_LIBRARY_H__ */ diff --git a/src/file.c b/src/file.c index ed8fb4181..67b66b5c2 100644 --- a/src/file.c +++ b/src/file.c @@ -82,7 +82,7 @@ #include #include #include "mad.h" -#include "regex.h" +#include "eregex.h" #include "util.h" #include "dialog.h" #include "global.h" diff --git a/src/regex.c b/src/regex.c index 20b28d144..698e28663 100644 --- a/src/regex.c +++ b/src/regex.c @@ -149,7 +149,7 @@ init_syntax_once () #endif /* not emacs */ /* Get the interface, including the syntax bits. */ -#include "regex.h" +#include "eregex.h" /* isalpha etc. are used for the character classes. */ #include