diff --git a/ChangeLog b/ChangeLog index 9a9260572..2a876310a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-02-22 Miguel de Icaza + + * gtkedit/editwidget.c (selection_send): Use the proper type for + 64-bit cleanliness (Patch from George Lebl). + Tue Feb 16 21:24:43 1999 David Martin * gtkedit/gtkedit.c: Hack to get one more string defined in a macro diff --git a/gnome/ChangeLog b/gnome/ChangeLog index 72047dbd4..9b489c198 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,5 +1,9 @@ 1999-02-22 Miguel de Icaza + * gdesktop.c (desktop_reload_icons): Fix memory leak. + + * glayout.c (create_new_menu_from): Fix memory leak. + * gdesktop.c (desktop_icon_info_open): Launch a panel at the location of the mount point. diff --git a/gnome/gdesktop.c b/gnome/gdesktop.c index f21f3bef8..174de72e6 100644 --- a/gnome/gdesktop.c +++ b/gnome/gdesktop.c @@ -448,8 +448,6 @@ desktop_reload_icons (int user_pos, int xpos, int ypos) if (have_pos) { dii = desktop_icon_info_new (dirent->d_name, desktop_url, caption, x, y); gtk_widget_show (dii->dicon); - - g_free (full_name); } else { file_and_url_t *fau; @@ -462,6 +460,8 @@ desktop_reload_icons (int user_pos, int xpos, int ypos) need_position_list = g_slist_prepend (need_position_list, fau); } + g_free (full_name); + if (desktop_url) g_free (desktop_url); @@ -1499,6 +1499,7 @@ icon_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, gu dii->selected); gdk_drag_status (context, action, time); + file_entry_free (fe); return TRUE; } diff --git a/gnome/glayout.c b/gnome/glayout.c index 8d1b4fcfc..501d9bf50 100644 --- a/gnome/glayout.c +++ b/gnome/glayout.c @@ -460,9 +460,10 @@ create_new_menu_from (GnomeApp *app, WPanel *panel, char *file) continue; } - if (!gnome_is_program_in_path (gde->tryexec)){ + path = gnome_is_program_in_path (gde->tryexec); + g_free (path); + if (!path){ g_free (file2); - g_print ("yes!\n"); continue; } diff --git a/gnome/gpopup.c b/gnome/gpopup.c index c56979e85..0be610a80 100644 --- a/gnome/gpopup.c +++ b/gnome/gpopup.c @@ -377,7 +377,7 @@ create_actions (GtkWidget *menu, WPanel *panel, fullname = g_concat_dir_and_file (desktop_directory, dii->filename); fe = file_entry_from_file (fullname); if (fe){ - v = is_mountable (fullname, fe, &is_mounted); + v = is_mountable (fullname, fe, &is_mounted, NULL); file_entry_free (fe); g_free (fullname); @@ -404,7 +404,7 @@ create_actions (GtkWidget *menu, WPanel *panel, fullname = g_concat_dir_and_file (desktop_directory, dii->filename); fe = file_entry_from_file (fullname); if (fe){ - v = is_mountable (fullname, fe, &is_mounted); + v = is_mountable (fullname, fe, &is_mounted, NULL); file_entry_free (fe); g_free (fullname); diff --git a/icons/Makefile.in b/icons/Makefile.in index 1f3d23677..24be14322 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -34,9 +34,8 @@ ALLICONS = a.xpm application.xpm binary.xpm bitmap.xpm blackhole.xpm \ # are obtained # DECENTICONS = \ - compressed.xpm o.xpm \ - sound.xpm makefile.xpm word.xpm tex.xpm man.xpm \ - postscript.xpm tex.xpm text.xpm trash.xpm + sound.xpm makefile.xpm \ + trash.xpm all: diff --git a/po/mc.pot b/po/mc.pot index 2f2482134..61f28a0d3 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-02-16 20:51-0600\n" +"POT-Creation-Date: 1999-02-22 17:45-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgstr "" msgid "The GNOME edition of the Midnight Commander file manager." msgstr "" -#: gnome/gcmd.c:121 src/main.c:821 src/screen.c:2048 +#: gnome/gcmd.c:121 src/main.c:821 src/screen.c:2047 msgid " The Midnight Commander " msgstr "" @@ -57,14 +57,14 @@ msgstr "" #: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1809 #: src/file.c:2189 src/filegui.c:573 src/hotlist.c:1035 src/main.c:823 -#: src/screen.c:2050 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 +#: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&Yes" msgstr "" #: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1809 #: src/file.c:2189 src/filegui.c:572 src/hotlist.c:1035 src/main.c:823 -#: src/screen.c:2050 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 +#: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&No" msgstr "" @@ -153,7 +153,7 @@ msgid "Set Filter" msgstr "" #: gnome/gcmd.c:593 gnome/gcmd.c:634 gnome/gcmd.c:639 gnome/gcmd.c:643 -#: gnome/gscreen.c:2565 +#: gnome/gscreen.c:2567 msgid "Show all files" msgstr "" @@ -173,61 +173,54 @@ msgstr "" msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:675 gnome/gpopup.c:51 +#: gnome/gcmd.c:675 gnome/gpopup.c:52 msgid " Open with..." msgstr "" -#: gnome/gcmd.c:676 gnome/gpopup.c:52 +#: gnome/gcmd.c:676 gnome/gpopup.c:53 msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:376 gnome/gdesktop.c:1796 +#: gnome/gdesktop.c:389 gnome/gdesktop.c:1774 msgid "Warning" msgstr "" -#: gnome/gdesktop.c:377 +#: gnome/gdesktop.c:390 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:913 +#: gnome/gdesktop.c:961 msgid "While running the mount/umount command" msgstr "" -#: gnome/gdesktop.c:1675 -msgid "Trashcan" -msgstr "" - -#: gnome/gdesktop.c:1713 -#, c-format -msgid "floppy %d" -msgstr "" - -#: gnome/gdesktop.c:1716 -#, c-format -msgid "disk %d" -msgstr "" - -#: gnome/gdesktop.c:1719 -#, c-format -msgid "device %d" +#: gnome/gdesktop.c:1010 +msgid "While running the eject command" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1792 +#: gnome/gdesktop.c:1770 msgid "Home directory" msgstr "" -#: gnome/gdesktop.c:1797 +#: gnome/gdesktop.c:1775 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" -#: gnome/gdesktop.c:2105 +#: gnome/gdesktop.c:2104 msgid "Arrange Icons" msgstr "" #: gnome/gdesktop.c:2106 +msgid "Create New Window" +msgstr "" + +#: gnome/gdesktop.c:2108 +msgid "Rescan Mountable Devices" +msgstr "" + +#: gnome/gdesktop.c:2109 msgid "Rescan Desktop" msgstr "" @@ -290,12 +283,12 @@ msgstr "" msgid "Replace it?" msgstr "" -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:789 -#: src/screen.c:2289 src/screen.c:2319 src/tree.c:1024 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1067 src/file.c:789 +#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "" -#: gnome/gdialogs.c:535 gtkedit/editwidget.c:1065 +#: gnome/gdialogs.c:535 gtkedit/editwidget.c:1068 msgid "Move" msgstr "" @@ -401,239 +394,235 @@ msgstr "" msgid "Default set of icons not found, please check your installation" msgstr "" -#: gnome/glayout.c:274 +#: gnome/glayout.c:264 msgid "Enter command to run" msgstr "" -#: gnome/glayout.c:284 +#: gnome/glayout.c:274 msgid "_Terminal" msgstr "" -#: gnome/glayout.c:284 +#: gnome/glayout.c:274 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:286 +#: gnome/glayout.c:276 msgid "_Directory..." msgstr "" -#: gnome/glayout.c:286 +#: gnome/glayout.c:276 msgid "Creates a new directory" msgstr "" #. GNOMEUIINFO_ITEM_NONE( N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, -#: gnome/glayout.c:307 +#: gnome/glayout.c:297 msgid "_Copy..." msgstr "" -#: gnome/glayout.c:307 +#: gnome/glayout.c:297 msgid "Copy files" msgstr "" -#: gnome/glayout.c:308 +#: gnome/glayout.c:298 msgid "_Delete..." msgstr "" -#: gnome/glayout.c:308 +#: gnome/glayout.c:298 msgid "Delete files" msgstr "" -#: gnome/glayout.c:309 +#: gnome/glayout.c:299 msgid "_Move..." msgstr "" -#: gnome/glayout.c:309 +#: gnome/glayout.c:299 msgid "Rename or move files" msgstr "" -#: gnome/glayout.c:311 +#: gnome/glayout.c:301 msgid "Show directory sizes" msgstr "" -#: gnome/glayout.c:311 +#: gnome/glayout.c:301 msgid "Shows the disk space used by each directory" msgstr "" -#: gnome/glayout.c:318 +#: gnome/glayout.c:308 msgid "Select _All" msgstr "" -#: gnome/glayout.c:318 +#: gnome/glayout.c:308 msgid "Select all files in the current Panel" msgstr "" -#: gnome/glayout.c:320 +#: gnome/glayout.c:310 msgid "_Select Files..." msgstr "" -#: gnome/glayout.c:320 +#: gnome/glayout.c:310 msgid "Select a group of files" msgstr "" -#: gnome/glayout.c:321 +#: gnome/glayout.c:311 msgid "_Invert Selection" msgstr "" -#: gnome/glayout.c:321 +#: gnome/glayout.c:311 msgid "Reverses the list of tagged files" msgstr "" -#: gnome/glayout.c:323 +#: gnome/glayout.c:313 msgid "_Rescan Directory" msgstr "" -#: gnome/glayout.c:323 +#: gnome/glayout.c:313 msgid "Rescan the directory contents" msgstr "" -#: gnome/glayout.c:330 +#: gnome/glayout.c:320 msgid "Icon View" msgstr "" -#: gnome/glayout.c:331 +#: gnome/glayout.c:321 msgid "Partial View" msgstr "" -#: gnome/glayout.c:332 +#: gnome/glayout.c:322 msgid "Full View" msgstr "" -#: gnome/glayout.c:333 +#: gnome/glayout.c:323 msgid "Custom View" msgstr "" -#: gnome/glayout.c:338 +#: gnome/glayout.c:328 msgid "_Sort By..." msgstr "" -#: gnome/glayout.c:338 +#: gnome/glayout.c:328 msgid "Confirmation settings" msgstr "" -#: gnome/glayout.c:339 +#: gnome/glayout.c:329 msgid "_Filter View..." msgstr "" -#: gnome/glayout.c:339 +#: gnome/glayout.c:329 msgid "Global option settings" msgstr "" -#: gnome/glayout.c:346 +#: gnome/glayout.c:336 msgid "_Find File..." msgstr "" -#: gnome/glayout.c:346 +#: gnome/glayout.c:336 msgid "Locate files on disk" msgstr "" #. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels }, -#: gnome/glayout.c:349 +#: gnome/glayout.c:339 msgid "_Run Command..." msgstr "" -#: gnome/glayout.c:349 +#: gnome/glayout.c:339 msgid "Runs a command" msgstr "" -#: gnome/glayout.c:351 +#: gnome/glayout.c:341 msgid "_Run Command in panel..." msgstr "" -#: gnome/glayout.c:351 +#: gnome/glayout.c:341 msgid "Run a command and put the results in a panel" msgstr "" -#: gnome/glayout.c:354 +#: gnome/glayout.c:344 msgid "_Active VFS list..." msgstr "" -#: gnome/glayout.c:354 +#: gnome/glayout.c:344 msgid "List of active virtual file systems" msgstr "" -#: gnome/glayout.c:361 +#: gnome/glayout.c:351 msgid "_Background jobs..." msgstr "" -#: gnome/glayout.c:361 +#: gnome/glayout.c:351 msgid "List of background operations" msgstr "" -#: gnome/glayout.c:364 -msgid "Recreate desktop devices" -msgstr "" - -#: gnome/glayout.c:364 -msgid "Recreates the devices shown on the desktop" -msgstr "" - -#: gnome/glayout.c:378 +#: gnome/glayout.c:366 msgid "_Layout" msgstr "" -#: gnome/glayout.c:379 +#: gnome/glayout.c:367 msgid "_Commands" msgstr "" -#: gnome/glayout.c:476 +#: gnome/glayout.c:420 msgid "File/New/Directory..." msgstr "" -#: gnome/gpopup.c:246 gnome/gpopup.c:247 +#: gnome/gpopup.c:257 gnome/gpopup.c:258 msgid "Properties" msgstr "" -#: gnome/gpopup.c:248 +#: gnome/gpopup.c:259 msgid "Mount device" msgstr "" -#: gnome/gpopup.c:249 +#: gnome/gpopup.c:260 msgid "Unmount device" msgstr "" -#: gnome/gpopup.c:251 gnome/gpopup.c:252 +#: gnome/gpopup.c:261 +msgid "Eject device" +msgstr "" + +#: gnome/gpopup.c:263 gnome/gpopup.c:264 msgid "Open" msgstr "" -#: gnome/gpopup.c:253 +#: gnome/gpopup.c:265 msgid "Open with" msgstr "" -#: gnome/gpopup.c:254 src/screen.c:2287 src/screen.c:2317 +#: gnome/gpopup.c:266 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "" -#: gnome/gpopup.c:255 +#: gnome/gpopup.c:267 msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:256 src/screen.c:2288 src/screen.c:2318 src/view.c:1996 +#: gnome/gpopup.c:268 src/screen.c:2287 src/screen.c:2317 src/view.c:1996 msgid "Edit" msgstr "" -#: gnome/gpopup.c:258 +#: gnome/gpopup.c:270 msgid "Link..." msgstr "" -#: gnome/gpopup.c:259 +#: gnome/gpopup.c:271 msgid "Symlink..." msgstr "" -#: gnome/gpopup.c:260 +#: gnome/gpopup.c:272 msgid "Edit symlink..." msgstr "" -#: gnome/gpopup.c:267 gnome/gpopup.c:278 +#: gnome/gpopup.c:279 gnome/gpopup.c:290 msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:268 gnome/gpopup.c:279 +#: gnome/gpopup.c:280 gnome/gpopup.c:291 msgid "Copy..." msgstr "" -#: gnome/gpopup.c:269 gnome/gpopup.c:281 gtkedit/editwidget.c:1067 -#: src/screen.c:2292 src/screen.c:2322 +#: gnome/gpopup.c:281 gnome/gpopup.c:293 gtkedit/editwidget.c:1070 +#: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "" @@ -810,7 +799,7 @@ msgstr "" msgid "Title" msgstr "" -#: gnome/gprop.c:521 gnome/gscreen.c:2352 +#: gnome/gprop.c:521 gnome/gscreen.c:2354 msgid "Icon" msgstr "" @@ -818,174 +807,174 @@ msgstr "" msgid "Select icon" msgstr "" -#: gnome/gscreen.c:1437 +#: gnome/gscreen.c:1439 msgid "Rescan Directory" msgstr "" -#: gnome/gscreen.c:1437 +#: gnome/gscreen.c:1439 msgid "Reloads the current directory" msgstr "" -#: gnome/gscreen.c:1615 +#: gnome/gscreen.c:1617 msgid "All files" msgstr "" -#: gnome/gscreen.c:1617 +#: gnome/gscreen.c:1619 msgid "Archives and compressed files" msgstr "" -#: gnome/gscreen.c:1619 +#: gnome/gscreen.c:1621 msgid "RPM/DEB files" msgstr "" -#: gnome/gscreen.c:1621 +#: gnome/gscreen.c:1623 msgid "Text/Document files" msgstr "" -#: gnome/gscreen.c:1623 +#: gnome/gscreen.c:1625 msgid "HTML and SGML files" msgstr "" -#: gnome/gscreen.c:1625 +#: gnome/gscreen.c:1627 msgid "Postscript and PDF files" msgstr "" -#: gnome/gscreen.c:1627 +#: gnome/gscreen.c:1629 msgid "Spreadsheet files" msgstr "" -#: gnome/gscreen.c:1629 +#: gnome/gscreen.c:1631 msgid "Image files" msgstr "" -#: gnome/gscreen.c:1632 +#: gnome/gscreen.c:1634 msgid "Video/animation files" msgstr "" -#: gnome/gscreen.c:1634 +#: gnome/gscreen.c:1636 msgid "Audio files" msgstr "" -#: gnome/gscreen.c:1636 +#: gnome/gscreen.c:1638 msgid "C program files" msgstr "" -#: gnome/gscreen.c:1638 +#: gnome/gscreen.c:1640 msgid "C++ program files" msgstr "" -#: gnome/gscreen.c:1640 +#: gnome/gscreen.c:1642 msgid "Objective-C program files" msgstr "" -#: gnome/gscreen.c:1642 +#: gnome/gscreen.c:1644 msgid "Scheme program files" msgstr "" -#: gnome/gscreen.c:1644 +#: gnome/gscreen.c:1646 msgid "Assembler program files" msgstr "" -#: gnome/gscreen.c:1646 +#: gnome/gscreen.c:1648 msgid "Misc. program files" msgstr "" -#: gnome/gscreen.c:1648 +#: gnome/gscreen.c:1650 msgid "Font files" msgstr "" -#: gnome/gscreen.c:1775 +#: gnome/gscreen.c:1777 #, c-format msgid "Search: %s" msgstr "" -#: gnome/gscreen.c:1785 +#: gnome/gscreen.c:1787 #, c-format msgid "%s bytes in %d file" msgstr "" -#: gnome/gscreen.c:1785 +#: gnome/gscreen.c:1787 #, c-format msgid "%s bytes in %d files" msgstr "" -#: gnome/gscreen.c:1811 src/screen.c:677 +#: gnome/gscreen.c:1813 src/screen.c:677 msgid "" msgstr "" -#: gnome/gscreen.c:1865 +#: gnome/gscreen.c:1867 msgid "Filter" msgstr "" -#: gnome/gscreen.c:2352 +#: gnome/gscreen.c:2354 msgid "Switch view to an Icon view" msgstr "" -#: gnome/gscreen.c:2354 +#: gnome/gscreen.c:2356 msgid "Brief" msgstr "" -#: gnome/gscreen.c:2354 +#: gnome/gscreen.c:2356 msgid "Switch view to show just file name and type" msgstr "" -#: gnome/gscreen.c:2356 +#: gnome/gscreen.c:2358 msgid "Detailed" msgstr "" -#: gnome/gscreen.c:2356 +#: gnome/gscreen.c:2358 msgid "Switch view to show detailed file statistics" msgstr "" -#: gnome/gscreen.c:2358 +#: gnome/gscreen.c:2360 msgid "Custom" msgstr "" -#: gnome/gscreen.c:2358 +#: gnome/gscreen.c:2360 msgid "Switch view to show custom determined statistics." msgstr "" -#: gnome/gscreen.c:2366 +#: gnome/gscreen.c:2368 msgid "Back" msgstr "" -#: gnome/gscreen.c:2366 +#: gnome/gscreen.c:2368 msgid "Go to the previously visited directory" msgstr "" -#: gnome/gscreen.c:2368 +#: gnome/gscreen.c:2370 msgid "Up" msgstr "" -#: gnome/gscreen.c:2368 +#: gnome/gscreen.c:2370 msgid "Go up a level in the directory heirarchy" msgstr "" -#: gnome/gscreen.c:2370 +#: gnome/gscreen.c:2372 msgid "Forward" msgstr "" -#: gnome/gscreen.c:2370 +#: gnome/gscreen.c:2372 msgid "Go to the next directory" msgstr "" -#: gnome/gscreen.c:2373 src/tree.c:1020 +#: gnome/gscreen.c:2375 src/tree.c:1020 msgid "Rescan" msgstr "" -#: gnome/gscreen.c:2373 +#: gnome/gscreen.c:2375 msgid "Rescan the current directory" msgstr "" -#: gnome/gscreen.c:2376 +#: gnome/gscreen.c:2378 msgid "Home" msgstr "" -#: gnome/gscreen.c:2376 +#: gnome/gscreen.c:2378 msgid "Go to your home directory" msgstr "" -#: gnome/gscreen.c:2510 +#: gnome/gscreen.c:2512 msgid "Location:" msgstr "" @@ -1091,8 +1080,8 @@ msgstr "" #. The file-name is printed after the ':' #: 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:383 -#: src/screen.c:2307 src/tree.c:692 src/tree.c:698 src/wtools.c:222 +#: gtkedit/editcmd.c:1932 gtkedit/editwidget.c:950 src/dir.c:386 +#: src/screen.c:2306 src/tree.c:692 src/tree.c:698 src/wtools.c:222 #: vfs/fish.c:224 msgid " Error " msgstr "" @@ -1130,7 +1119,7 @@ msgstr "" #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:482 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 #: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:294 src/file.c:606 -#: src/help.c:318 src/main.c:668 src/screen.c:2064 src/subshell.c:700 +#: src/help.c:318 src/main.c:668 src/screen.c:2063 src/subshell.c:700 #: src/subshell.c:726 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458 #: vfs/mcfs.c:170 msgid " Warning " @@ -1216,7 +1205,7 @@ msgstr "" msgid " Save file " msgstr "" -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1992 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1064 src/view.c:1992 msgid "Save" msgstr "" @@ -1522,32 +1511,378 @@ msgstr "" msgid "Error initialising editor.\n" msgstr "" -#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1671 src/screen.c:2285 -#: src/screen.c:2315 src/tree.c:1018 src/view.c:1987 +#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1671 src/screen.c:2284 +#: src/screen.c:2314 src/tree.c:1018 src/view.c:1987 msgid "Help" msgstr "" -#: gtkedit/editwidget.c:1062 +#: gtkedit/editwidget.c:1065 msgid "Mark" msgstr "" -#: gtkedit/editwidget.c:1063 +#: gtkedit/editwidget.c:1066 msgid "Replac" msgstr "" -#: gtkedit/editwidget.c:1066 src/view.c:2000 +#: gtkedit/editwidget.c:1069 src/view.c:2000 msgid "Search" msgstr "" -#: gtkedit/editwidget.c:1069 src/main.c:1673 +#: gtkedit/editwidget.c:1072 src/main.c:1673 msgid "PullDn" msgstr "" -#: gtkedit/editwidget.c:1070 src/help.c:818 src/main.c:1674 src/view.c:1989 +#: gtkedit/editwidget.c:1073 src/help.c:818 src/main.c:1674 src/view.c:1989 #: src/view.c:2009 msgid "Quit" msgstr "" +#: gtkedit/editmenu.c:56 +msgid " Word wrap " +msgstr "" + +#. Not essential to translate +#: gtkedit/editmenu.c:58 +msgid " Enter line length, 0 for off: " +msgstr "" + +#: gtkedit/editmenu.c:69 +msgid " About " +msgstr "" + +#: gtkedit/editmenu.c:70 +msgid "" +"\n" +" Cooledit v2.1\n" +"\n" +" Copyright (C) 1996 the Free Software Foundation\n" +"\n" +" A user friendly text editor written\n" +" for the Midnight Commander.\n" +msgstr "" + +#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 +msgid "&Open/load... C-o" +msgstr "" + +#: gtkedit/editmenu.c:119 +msgid "&New C-n" +msgstr "" + +#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 +msgid "&Save F2" +msgstr "" + +#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 +msgid "save &As... F12" +msgstr "" + +#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 +msgid "&Insert file... F15" +msgstr "" + +#: gtkedit/editmenu.c:125 +msgid "copy to &File... C-f" +msgstr "" + +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +msgid "a&Bout... " +msgstr "" + +#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +msgid "&Quit F10" +msgstr "" + +#: gtkedit/editmenu.c:135 +msgid "&New C-x k" +msgstr "" + +#: gtkedit/editmenu.c:141 +msgid "copy to &File... " +msgstr "" + +#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 +msgid "&Toggle Mark F3" +msgstr "" + +#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 +msgid "&Mark Columns S-F3" +msgstr "" + +#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 +msgid "toggle &Ins/overw Ins" +msgstr "" + +#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 +msgid "&Copy F5" +msgstr "" + +#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +msgid "&Move F6" +msgstr "" + +#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 +msgid "&Delete F8" +msgstr "" + +#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 +msgid "&Undo C-u" +msgstr "" + +#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +msgid "&Beginning C-PgUp" +msgstr "" + +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +msgid "&End C-PgDn" +msgstr "" + +#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 +msgid "&Search... F7" +msgstr "" + +#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 +msgid "search &Again F17" +msgstr "" + +#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 +msgid "&Replace... F4" +msgstr "" + +#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 +msgid "&Goto line... M-l" +msgstr "" + +#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 +msgid "insert &Literal... C-q" +msgstr "" + +#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 +msgid "&Refresh screen C-l" +msgstr "" + +#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 +msgid "&Start record macro C-r" +msgstr "" + +#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 +msgid "&Finish record macro... C-r" +msgstr "" + +#: gtkedit/editmenu.c:206 +msgid "&Execute macro... C-a, KEY" +msgstr "" + +#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +msgid "delete macr&O... " +msgstr "" + +#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 +msgid "insert &Date/time " +msgstr "" + +#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 +msgid "format p&Aragraph M-p" +msgstr "" + +#: gtkedit/editmenu.c:212 +msgid "'ispell' s&Pell check C-p" +msgstr "" + +#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 +msgid "sor&T... M-t" +msgstr "" + +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +msgid "'indent' &C Formatter F19" +msgstr "" + +#: gtkedit/editmenu.c:215 +msgid "&Mail... " +msgstr "" + +#: gtkedit/editmenu.c:228 +msgid "&Execute macro... C-x e, KEY" +msgstr "" + +#: gtkedit/editmenu.c:234 +msgid "'ispell' s&Pell check M-$" +msgstr "" + +#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 +msgid "&General... " +msgstr "" + +#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 +msgid "&Save mode..." +msgstr "" + +#: 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' +#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr "" + +#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 +msgid " Edit " +msgstr "" + +#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 +msgid " Sear/Repl " +msgstr "" + +#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 +msgid " Command " +msgstr "" + +#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 +msgid " Options " +msgstr "" + +#: gtkedit/editmenu.c:392 +msgid "Open...\tC-o" +msgstr "" + +#: gtkedit/editmenu.c:393 +msgid "New\tC-n" +msgstr "" + +#: gtkedit/editmenu.c:395 +msgid "Save\tF2" +msgstr "" + +#: gtkedit/editmenu.c:396 +msgid "Save as...\tF12" +msgstr "" + +#: gtkedit/editmenu.c:398 +msgid "Insert file...\tF15" +msgstr "" + +#: gtkedit/editmenu.c:399 +msgid "Copy to file...\tC-f" +msgstr "" + +#. Tool hint +#: gtkedit/editmenu.c:402 +msgid "Disk operations" +msgstr "" + +#: gtkedit/editmenu.c:408 +msgid "Toggle mark\tF3" +msgstr "" + +#: gtkedit/editmenu.c:409 +msgid "Toggle mark columns\tC-b" +msgstr "" + +#: gtkedit/editmenu.c:411 +msgid "Toggle insert/overwrite\tIns" +msgstr "" + +#: gtkedit/editmenu.c:413 +msgid "Copy block to cursor\tF5" +msgstr "" + +#: gtkedit/editmenu.c:414 +msgid "Move block to cursor\tF6" +msgstr "" + +#: gtkedit/editmenu.c:415 +msgid "Delete block\tF8/C-Del" +msgstr "" + +#: gtkedit/editmenu.c:417 +msgid "Copy block to clipbrd\tC-Ins" +msgstr "" + +#: gtkedit/editmenu.c:418 +msgid "Cut block to clipbrd\tS-Del" +msgstr "" + +#: gtkedit/editmenu.c:419 +msgid "Paste block from clipbrd\tS-Ins" +msgstr "" + +#: gtkedit/editmenu.c:420 +msgid "Selection history\tM-Ins" +msgstr "" + +#: gtkedit/editmenu.c:422 +msgid "Undo\tC-BackSpace" +msgstr "" + +#. Tool hint +#: gtkedit/editmenu.c:425 +msgid "Manipulating blocks of text" +msgstr "" + +#: gtkedit/editmenu.c:430 +msgid " Srch/Replce " +msgstr "" + +#: gtkedit/editmenu.c:431 +msgid "Search...\tF7" +msgstr "" + +#: gtkedit/editmenu.c:432 +msgid "Search again\tF17" +msgstr "" + +#: gtkedit/editmenu.c:433 +msgid "Replace...\tF4" +msgstr "" + +#: gtkedit/editmenu.c:434 +msgid "Replace again\tF14" +msgstr "" + +#. Tool hint +#: gtkedit/editmenu.c:437 +msgid "Search for and replace text" +msgstr "" + +#: gtkedit/editmenu.c:443 +msgid "Goto line...\tM-l" +msgstr "" + +#: gtkedit/editmenu.c:445 +msgid "Start record macro\tC-r" +msgstr "" + +#: gtkedit/editmenu.c:446 +msgid "Finish record macro...\tC-r" +msgstr "" + +#: gtkedit/editmenu.c:447 +msgid "Execute macro...\tC-a, KEY" +msgstr "" + +#: gtkedit/editmenu.c:448 +msgid "Delete macro...\t" +msgstr "" + +#: gtkedit/editmenu.c:450 +msgid "Insert date/time\tC-d" +msgstr "" + +#: gtkedit/editmenu.c:451 +msgid "Format paragraph\tM-p" +msgstr "" + +#: gtkedit/editmenu.c:453 +msgid "Refresh display\tC-l" +msgstr "" + +#. Tool hint +#: gtkedit/editmenu.c:456 +msgid "Macros and internal commands" +msgstr "" + #: gtkedit/gtkedit.c:65 msgid "&Dismiss" msgstr "" @@ -1945,10 +2280,6 @@ msgstr "" msgid " Permission " msgstr "" -#: src/chmod.c:164 src/chown.c:130 -msgid " File " -msgstr "" - #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "" @@ -2341,12 +2672,12 @@ msgstr "" msgid "&Group" msgstr "" -#: src/dir.c:383 +#: src/dir.c:386 #, c-format msgid "File exists but can not be stat-ed: %s %s" msgstr "" -#: src/dir.c:647 +#: src/dir.c:660 msgid "Unknown" msgstr "" @@ -3701,10 +4032,6 @@ msgstr "" msgid "&Configuration..." msgstr "" -#: src/main.c:1305 -msgid "&Layout..." -msgstr "" - #: src/main.c:1306 msgid "c&Onfirmation..." msgstr "" @@ -3765,7 +4092,7 @@ msgid "" " the details. " msgstr "" -#: src/main.c:1672 src/screen.c:2286 src/screen.c:2316 +#: src/main.c:1672 src/screen.c:2285 src/screen.c:2315 msgid "Menu" msgstr "" @@ -3786,43 +4113,43 @@ msgstr "" msgid "The TERM environment variable is unset!\n" msgstr "" -#: src/main.c:2541 +#: src/main.c:2539 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "" -#: src/main.c:2552 +#: src/main.c:2550 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" -#: src/main.c:2678 +#: src/main.c:2676 msgid "Geometry for the window" msgstr "" -#: src/main.c:2678 +#: src/main.c:2676 msgid "GEOMETRY" msgstr "" -#: src/main.c:2679 +#: src/main.c:2677 msgid "No windows opened at startup" msgstr "" -#: src/main.c:2680 +#: src/main.c:2678 msgid "Force activation even if a server is already running" msgstr "" -#: src/main.c:2952 +#: src/main.c:2950 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" msgstr "" -#: src/main.c:3026 +#: src/main.c:3024 msgid " Notice " msgstr "" -#: src/main.c:3027 +#: src/main.c:3025 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -4035,23 +4362,23 @@ msgstr "" msgid "Unknow tag on display format: " msgstr "" -#: src/screen.c:2049 +#: src/screen.c:2048 msgid " Do you really want to execute? " msgstr "" -#: src/screen.c:2064 +#: src/screen.c:2063 msgid " No action taken " msgstr "" -#: src/screen.c:2290 src/screen.c:2320 src/tree.c:1026 +#: src/screen.c:2289 src/screen.c:2319 src/tree.c:1026 msgid "RenMov" msgstr "" -#: src/screen.c:2291 src/screen.c:2321 src/tree.c:1030 +#: src/screen.c:2290 src/screen.c:2320 src/tree.c:1030 msgid "Mkdir" msgstr "" -#: src/screen.c:2307 +#: src/screen.c:2306 #, c-format msgid "" " Can't chdir to %s \n" diff --git a/src/main.c b/src/main.c index 605738e8d..8da59f64c 100644 --- a/src/main.c +++ b/src/main.c @@ -2347,10 +2347,8 @@ OS_Setup () if (!shell || !*shell) shell = "/bin/sh"; -#ifndef HAVE_GNOME g_snprintf (control_file, sizeof (control_file), CONTROL_FILE, getpid ()); my_putenv ("MC_CONTROL_FILE", control_file); -#endif /* This is the directory, where MC was installed, on Unix this is LIBDIR */ /* and can be overriden by the MC_LIBDIR environment variable */