dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/gui/tips-dialog.c app/gui/user-install-dialog.c 

2002-02-08  Sven Neumann  <sven@gimp.org>

	* app/gui/tips-dialog.c
	* app/gui/user-install-dialog.c
	* libgimpwidgets/gimpfileselection.c
	* plug-ins/FractalExplorer/Dialogs.c
	* plug-ins/FractalExplorer/FractalExplorer.c
	* plug-ins/gfig/gfig.c
	* plug-ins/gflare/gflare.c
	* plug-ins/gimpressionist/presets.c
	* plug-ins/script-fu/script-fu-scripts.c: use the term Folder instead
	of Directory (bug #56194).

	* etc/gimprc.in
	* etc/gimprc.win32: added global palettes folder to the palettes
	search path.

	* data/misc/user_install: don't copy palettes into users ~/.gimp-1.3.
This commit is contained in:
Sven Neumann 2002-02-08 17:59:40 +00:00 committed by Sven Neumann
parent 34bc220787
commit 310e0e9855
17 changed files with 205 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,22 @@
2002-02-08 Sven Neumann <sven@gimp.org>
* app/gui/tips-dialog.c
* app/gui/user-install-dialog.c
* libgimpwidgets/gimpfileselection.c
* plug-ins/FractalExplorer/Dialogs.c
* plug-ins/FractalExplorer/FractalExplorer.c
* plug-ins/gfig/gfig.c
* plug-ins/gflare/gflare.c
* plug-ins/gimpressionist/presets.c
* plug-ins/script-fu/script-fu-scripts.c: use the term Folder instead
of Directory (bug #56194).
* etc/gimprc.in
* etc/gimprc.win32: added global palettes folder to the palettes
search path.
* data/misc/user_install: don't copy palettes into users ~/.gimp-1.3.
2002-02-08 Sven Neumann <sven@gimp.org>
* app/config/gimprc.[ch]: added gimp_rc_duplicate() and started to
@ -22,7 +41,6 @@
* app/tools/Makefile.am: added gimptoolmodule to the build.
2002-02-07 Nathan Summers <rock@gimp.org>
* app/gimprc.c

2
app/dialogs/tips-dialog.c
View File

@ -283,7 +283,7 @@ read_tips_file (gchar *filename)
{
store_tip (_("Your GIMP tips file appears to be missing!\n"
"There should be a file called gimp_tips.txt in\n"
"the tips subdirectory of the GIMP data directory.\n"
"the tips subfolder of the GIMP data folder.\n"
"Please check your installation."));
return;
}

171
app/dialogs/user-install-dialog.c
View File

@ -172,118 +172,104 @@ tree_items[] =
},
{
TRUE, "brushes",
N_("This is a subdirectory which can be used to store\n"
"user defined brushes. The default gimprc file\n"
"checks this subdirectory in addition to the system-\n"
N_("This folder is used to store user defined brushes.\n"
"The GIMP checks this folder in addition to the system-\n"
"wide GIMP brushes installation when searching for\n"
"brushes.")
},
{
TRUE, "generated_brushes",
N_("This is a subdirectory which is used to store brushes\n"
"that are created with the brush editor. The default\n"
"gimprc file checks this subdirectory when searching\n"
"for generated brushes.")
N_("This folder is used to store brushes that are created\n"
"created with the brush editor.")
},
{
TRUE, "gradients",
N_("This is a subdirectory which can be used to store\n"
"user defined gradients. The default gimprc file\n"
"checks this subdirectory in addition to the system-\n"
"wide GIMP gradients installation when searching\n"
"for gradients.")
N_("This folder is used to store user defined gradients\n"
"The GIMP checks this folder in addition to the system-\n"
"wide GIMP gradients installation when searching for\n"
"gradients.")
},
{
TRUE, "palettes",
N_("This is a subdirectory which can be used to store\n"
"user defined palettes. The default gimprc file\n"
"checks only this subdirectory (not the system-wide\n"
"installation) when searching for palettes. During\n"
"installation, the system palettes will be copied\n"
"here. This is done to allow modifications made to\n"
"palettes during GIMP execution to persist across\n"
"sessions.")
N_("This folder is used to store user defined palettes.\n"
"The GIMP checks this folder in addition to the system-\n"
"wide GIMP palettes installation when searching for\n"
"palettes.")
},
{
TRUE, "patterns",
N_("This is a subdirectory which can be used to store\n"
"user defined patterns. The default gimprc file\n"
"checks this subdirectory in addition to the system-\n"
N_("This folder is used to store user defined patterns.\n"
"The GIMP checks this folder in addition to the system-\n"
"wide GIMP patterns installation when searching for\n"
"patterns.")
},
{
TRUE, "plug-ins",
N_("This is a subdirectory which can be used to store\n"
"user created, temporary, or otherwise non-system-\n"
"supported plug-ins. The default gimprc file checks\n"
"this subdirectory in addition to the systemwide\n"
"GIMP plug-in directories when searching for plug-ins.")
N_("This folder is used to store user created, temporary,\n"
"or otherwise non-system-supported plug-ins. The GIMP\n"
"checks this folder in addition to the system-wide\n"
"GIMP plug-in folder when searching for plug-ins.")
},
{
TRUE, "modules",
N_("This subdirectory can be used to store user created,\n"
"temporary, or otherwise non-system-supported DLL\n"
"modules. The default gimprc file checks this subdirectory\n"
"in addition to the system-wide GIMP module directory\n"
"when searching for modules to load when initializing.")
N_("This folder is used to store user created, temporary,\n"
"or otherwise non-system-supported DLL modules. The\n"
"GIMP checks this folder in addition to the system-wide\n"
"GIMP module folder when searching for modules to load\n"
"during initialization.")
},
{
TRUE, "scripts",
N_("This subdirectory is used by the GIMP to store user\n"
"created and installed scripts. The default gimprc file\n"
"checks this subdirectory in addition to the systemwide\n"
"GIMP scripts subdirectory when searching for scripts")
N_("This folder is used to store user created and installed\n"
"scripts. The GIMP checks this folder in addition to\n"
"the systemwide GIMP scripts folder when searching for\n"
"scripts.")
},
{
TRUE, "tmp",
N_("This subdirectory is used by the GIMP to temporarily\n"
"store undo buffers to reduce memory usage. If GIMP is\n"
"unceremoniously killed, files may persist in this directory\n"
"of the form: gimp<#>.<#>. These files are useless across\n"
"GIMP sessions and can be destroyed with impunity.")
N_("This folder is used to temporarily store undo buffers\n"
"to reduce memory usage. If The GIMP is unceremoniously\n"
"killed, files of the form: gimp<#>.<#> may persist in\n"
"this folder. These files are useless across GIMP\n"
"sessions and can be destroyed with impunity.")
},
{
TRUE, "curves",
N_("This subdirectory is used to store parameter files for\n"
"the Curves tool.")
N_("This folder is used to store parameter files for the\n"
"Curves tool.")
},
{
TRUE, "levels",
N_("This subdirectory is used to store parameter files for\n"
"the Levels tool.")
N_("This folder is used to store parameter files for the\n"
"Levels tool.")
},
{
TRUE, "fractalexplorer",
N_("This is a subdirectory which can be used to store\n"
"user defined fractals to be used by the FractalExplorer\n"
"plug-in. The default gimprc file checks this subdirectory\n"
"in addition to the systemwide GIMP FractalExplorer\n"
"installation when searching for fractals.")
N_("This is folder used to store user defined fractals to\n"
"be used by the FractalExplorer plug-in. The GIMP\n"
"checks this folder in addition to the systemwide\n"
"FractalExplorer installation when searching for fractals.")
},
{
TRUE, "gfig",
N_("This is a subdirectory which can be used to store\n"
"user defined figures to be used by the GFig plug-in.\n"
"The default gimprc file checks this subdirectory in\n"
"addition to the systemwide GIMP GFig installation\n"
N_("This folder is used to store user defined figures to\n"
"be used by the GFig plug-in. The GIMP checks this\n"
"folder in addition to the systemwide GFig installation\n"
"when searching for gfig figures.")
},
{
TRUE, "gflare",
N_("This is a subdirectory which can be used to store\n"
"user defined gflares to be used by the GFlare plug-in.\n"
"The default gimprc file checks this subdirectory in\n"
"addition to the systemwide GIMP GFlares installation\n"
"when searching for gflares.")
N_("This folder is used to store user defined gflares to\n"
"be used by the GFlare plug-in. The GIMP checks this\n"
"folder in addition to the systemwide GFlares\n"
"installation when searching for gflares.")
},
{
TRUE, "gimpressionist",
N_("This is a subdirectory which can be used to store\n"
"user defined data to be used by the Gimpressionist\n"
"plug-in. The default gimprc file checks this subdirectory\n"
"in addition to the systemwide GIMP Gimpressionist\n"
"installation when searching for data.")
N_("This folder is used to store user defined data to be\n"
"used by the Gimpressionist plug-in. The GIMP checks\n"
"this folder in addition to the systemwide Gimpressionist\n"
"installation when searching for data.")
}
};
static gint num_tree_items = sizeof (tree_items) / sizeof (tree_items[0]);
@ -347,7 +333,7 @@ user_install_continue_callback (GtkWidget *widget,
gtk_widget_set_sensitive (cancel_button, FALSE);
gtk_label_set_text (GTK_LABEL (footer_label),
_("Please wait while your personal\n"
"GIMP directory is being created..."));
"GIMP folder is being created..."));
while (gtk_events_pending ())
gtk_main_iteration ();
@ -699,22 +685,25 @@ user_install_dialog_create (Gimp *gimp)
gtk_box_pack_start (GTK_BOX (page), sep, FALSE, FALSE, 2);
gtk_widget_show (sep);
add_label (GTK_BOX (page),
_("This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version."));
add_label (GTK_BOX (page),
_("This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details."));
add_label (GTK_BOX (page),
_("You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
"MA 02111-1307, USA."));
add_label
(GTK_BOX (page),
_("This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version."));
add_label
(GTK_BOX (page),
_("This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details."));
add_label
(GTK_BOX (page),
_("You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
"MA 02111-1307, USA."));
/* Page 2 */
{
GtkWidget *hbox;
@ -736,9 +725,9 @@ user_install_dialog_create (Gimp *gimp)
gchar *node[1];
page = user_install_notebook_append_page (GTK_NOTEBOOK (notebook),
_("Personal GIMP Directory"),
_("Personal GIMP Folder"),
_("Click \"Continue\" to create "
"your personal GIMP directory."));
"your personal GIMP folder."));
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0);
@ -756,14 +745,14 @@ user_install_dialog_create (Gimp *gimp)
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
str = g_strdup_printf (_("For a proper GIMP installation, a subdirectory named\n"
str = g_strdup_printf (_("For a proper GIMP installation, a folder named\n"
"%s needs to be created."), gimp_directory ());
add_label (GTK_BOX (vbox), str);
g_free (str);
add_label (GTK_BOX (vbox),
_("This subdirectory will contain a number of important files.\n"
"Click on one of the files or subdirectories in the tree\n"
_("This folder will contain a number of important files.\n"
"Click on one of the files or folders in the tree\n"
"to get more information about the selected item."));
notebook2 = gtk_notebook_new ();
@ -804,7 +793,8 @@ user_install_dialog_create (Gimp *gimp)
if (tree_items[i].directory)
{
sub_node = gtk_ctree_insert_node (GTK_CTREE (ctree), main_node, NULL,
sub_node = gtk_ctree_insert_node (GTK_CTREE (ctree),
main_node, NULL,
node, 4,
folder_pixmap, folder_mask,
folder_pixmap, folder_mask,
@ -812,7 +802,8 @@ user_install_dialog_create (Gimp *gimp)
}
else
{
sub_node = gtk_ctree_insert_node (GTK_CTREE (ctree), main_node, NULL,
sub_node = gtk_ctree_insert_node (GTK_CTREE (ctree),
main_node, NULL,
node, 4,
file_pixmap, file_mask,
file_pixmap, file_mask,
@ -1154,7 +1145,7 @@ user_install_tuning (void)
gtk_box_pack_end (GTK_BOX (hbox), swap_path_filesel, FALSE, FALSE, 0);
gtk_widget_show (swap_path_filesel);
label = gtk_label_new (_("Swap Directory:"));
label = gtk_label_new (_("Swap Folder:"));
PAGE_STYLE (label);
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);

2
app/gui/tips-dialog.c
View File

@ -283,7 +283,7 @@ read_tips_file (gchar *filename)
{
store_tip (_("Your GIMP tips file appears to be missing!\n"
"There should be a file called gimp_tips.txt in\n"
"the tips subdirectory of the GIMP data directory.\n"
"the tips subfolder of the GIMP data folder.\n"
"Please check your installation."));
return;
}

171
app/gui/user-install-dialog.c
View File

@ -172,118 +172,104 @@ tree_items[] =
},
{
TRUE, "brushes",
N_("This is a subdirectory which can be used to store\n"
"user defined brushes. The default gimprc file\n"
"checks this subdirectory in addition to the system-\n"
N_("This folder is used to store user defined brushes.\n"
"The GIMP checks this folder in addition to the system-\n"
"wide GIMP brushes installation when searching for\n"
"brushes.")
},
{
TRUE, "generated_brushes",
N_("This is a subdirectory which is used to store brushes\n"
"that are created with the brush editor. The default\n"
"gimprc file checks this subdirectory when searching\n"
"for generated brushes.")
N_("This folder is used to store brushes that are created\n"
"created with the brush editor.")
},
{
TRUE, "gradients",
N_("This is a subdirectory which can be used to store\n"
"user defined gradients. The default gimprc file\n"
"checks this subdirectory in addition to the system-\n"
"wide GIMP gradients installation when searching\n"
"for gradients.")
N_("This folder is used to store user defined gradients\n"
"The GIMP checks this folder in addition to the system-\n"
"wide GIMP gradients installation when searching for\n"
"gradients.")
},
{
TRUE, "palettes",
N_("This is a subdirectory which can be used to store\n"
"user defined palettes. The default gimprc file\n"
"checks only this subdirectory (not the system-wide\n"
"installation) when searching for palettes. During\n"
"installation, the system palettes will be copied\n"
"here. This is done to allow modifications made to\n"
"palettes during GIMP execution to persist across\n"
"sessions.")
N_("This folder is used to store user defined palettes.\n"
"The GIMP checks this folder in addition to the system-\n"
"wide GIMP palettes installation when searching for\n"
"palettes.")
},
{
TRUE, "patterns",
N_("This is a subdirectory which can be used to store\n"
"user defined patterns. The default gimprc file\n"
"checks this subdirectory in addition to the system-\n"
N_("This folder is used to store user defined patterns.\n"
"The GIMP checks this folder in addition to the system-\n"
"wide GIMP patterns installation when searching for\n"
"patterns.")
},
{
TRUE, "plug-ins",
N_("This is a subdirectory which can be used to store\n"
"user created, temporary, or otherwise non-system-\n"
"supported plug-ins. The default gimprc file checks\n"
"this subdirectory in addition to the systemwide\n"
"GIMP plug-in directories when searching for plug-ins.")
N_("This folder is used to store user created, temporary,\n"
"or otherwise non-system-supported plug-ins. The GIMP\n"
"checks this folder in addition to the system-wide\n"
"GIMP plug-in folder when searching for plug-ins.")
},
{
TRUE, "modules",
N_("This subdirectory can be used to store user created,\n"
"temporary, or otherwise non-system-supported DLL\n"
"modules. The default gimprc file checks this subdirectory\n"
"in addition to the system-wide GIMP module directory\n"
"when searching for modules to load when initializing.")
N_("This folder is used to store user created, temporary,\n"
"or otherwise non-system-supported DLL modules. The\n"
"GIMP checks this folder in addition to the system-wide\n"
"GIMP module folder when searching for modules to load\n"
"during initialization.")
},
{
TRUE, "scripts",
N_("This subdirectory is used by the GIMP to store user\n"
"created and installed scripts. The default gimprc file\n"
"checks this subdirectory in addition to the systemwide\n"
"GIMP scripts subdirectory when searching for scripts")
N_("This folder is used to store user created and installed\n"
"scripts. The GIMP checks this folder in addition to\n"
"the systemwide GIMP scripts folder when searching for\n"
"scripts.")
},
{
TRUE, "tmp",
N_("This subdirectory is used by the GIMP to temporarily\n"
"store undo buffers to reduce memory usage. If GIMP is\n"
"unceremoniously killed, files may persist in this directory\n"
"of the form: gimp<#>.<#>. These files are useless across\n"
"GIMP sessions and can be destroyed with impunity.")
N_("This folder is used to temporarily store undo buffers\n"
"to reduce memory usage. If The GIMP is unceremoniously\n"
"killed, files of the form: gimp<#>.<#> may persist in\n"
"this folder. These files are useless across GIMP\n"
"sessions and can be destroyed with impunity.")
},
{
TRUE, "curves",
N_("This subdirectory is used to store parameter files for\n"
"the Curves tool.")
N_("This folder is used to store parameter files for the\n"
"Curves tool.")
},
{
TRUE, "levels",
N_("This subdirectory is used to store parameter files for\n"
"the Levels tool.")
N_("This folder is used to store parameter files for the\n"
"Levels tool.")
},
{
TRUE, "fractalexplorer",
N_("This is a subdirectory which can be used to store\n"
"user defined fractals to be used by the FractalExplorer\n"
"plug-in. The default gimprc file checks this subdirectory\n"
"in addition to the systemwide GIMP FractalExplorer\n"
"installation when searching for fractals.")
N_("This is folder used to store user defined fractals to\n"
"be used by the FractalExplorer plug-in. The GIMP\n"
"checks this folder in addition to the systemwide\n"
"FractalExplorer installation when searching for fractals.")
},
{
TRUE, "gfig",
N_("This is a subdirectory which can be used to store\n"
"user defined figures to be used by the GFig plug-in.\n"
"The default gimprc file checks this subdirectory in\n"
"addition to the systemwide GIMP GFig installation\n"
N_("This folder is used to store user defined figures to\n"
"be used by the GFig plug-in. The GIMP checks this\n"
"folder in addition to the systemwide GFig installation\n"
"when searching for gfig figures.")
},
{
TRUE, "gflare",
N_("This is a subdirectory which can be used to store\n"
"user defined gflares to be used by the GFlare plug-in.\n"
"The default gimprc file checks this subdirectory in\n"
"addition to the systemwide GIMP GFlares installation\n"
"when searching for gflares.")
N_("This folder is used to store user defined gflares to\n"
"be used by the GFlare plug-in. The GIMP checks this\n"
"folder in addition to the systemwide GFlares\n"
"installation when searching for gflares.")
},
{
TRUE, "gimpressionist",
N_("This is a subdirectory which can be used to store\n"
"user defined data to be used by the Gimpressionist\n"
"plug-in. The default gimprc file checks this subdirectory\n"
"in addition to the systemwide GIMP Gimpressionist\n"
"installation when searching for data.")
N_("This folder is used to store user defined data to be\n"
"used by the Gimpressionist plug-in. The GIMP checks\n"
"this folder in addition to the systemwide Gimpressionist\n"
"installation when searching for data.")
}
};
static gint num_tree_items = sizeof (tree_items) / sizeof (tree_items[0]);
@ -347,7 +333,7 @@ user_install_continue_callback (GtkWidget *widget,
gtk_widget_set_sensitive (cancel_button, FALSE);
gtk_label_set_text (GTK_LABEL (footer_label),
_("Please wait while your personal\n"
"GIMP directory is being created..."));
"GIMP folder is being created..."));
while (gtk_events_pending ())
gtk_main_iteration ();
@ -699,22 +685,25 @@ user_install_dialog_create (Gimp *gimp)
gtk_box_pack_start (GTK_BOX (page), sep, FALSE, FALSE, 2);
gtk_widget_show (sep);
add_label (GTK_BOX (page),
_("This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version."));
add_label (GTK_BOX (page),
_("This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details."));
add_label (GTK_BOX (page),
_("You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
"MA 02111-1307, USA."));
add_label
(GTK_BOX (page),
_("This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version."));
add_label
(GTK_BOX (page),
_("This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
"See the GNU General Public License for more details."));
add_label
(GTK_BOX (page),
_("You should have received a copy of the GNU General Public License\n"
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
"MA 02111-1307, USA."));
/* Page 2 */
{
GtkWidget *hbox;
@ -736,9 +725,9 @@ user_install_dialog_create (Gimp *gimp)
gchar *node[1];
page = user_install_notebook_append_page (GTK_NOTEBOOK (notebook),
_("Personal GIMP Directory"),
_("Personal GIMP Folder"),
_("Click \"Continue\" to create "
"your personal GIMP directory."));
"your personal GIMP folder."));
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (page), hbox, FALSE, FALSE, 0);
@ -756,14 +745,14 @@ user_install_dialog_create (Gimp *gimp)
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
str = g_strdup_printf (_("For a proper GIMP installation, a subdirectory named\n"
str = g_strdup_printf (_("For a proper GIMP installation, a folder named\n"
"%s needs to be created."), gimp_directory ());
add_label (GTK_BOX (vbox), str);
g_free (str);
add_label (GTK_BOX (vbox),
_("This subdirectory will contain a number of important files.\n"
"Click on one of the files or subdirectories in the tree\n"
_("This folder will contain a number of important files.\n"
"Click on one of the files or folders in the tree\n"
"to get more information about the selected item."));
notebook2 = gtk_notebook_new ();
@ -804,7 +793,8 @@ user_install_dialog_create (Gimp *gimp)
if (tree_items[i].directory)
{
sub_node = gtk_ctree_insert_node (GTK_CTREE (ctree), main_node, NULL,
sub_node = gtk_ctree_insert_node (GTK_CTREE (ctree),
main_node, NULL,
node, 4,
folder_pixmap, folder_mask,
folder_pixmap, folder_mask,
@ -812,7 +802,8 @@ user_install_dialog_create (Gimp *gimp)
}
else
{
sub_node = gtk_ctree_insert_node (GTK_CTREE (ctree), main_node, NULL,
sub_node = gtk_ctree_insert_node (GTK_CTREE (ctree),
main_node, NULL,
node, 4,
file_pixmap, file_mask,
file_pixmap, file_mask,
@ -1154,7 +1145,7 @@ user_install_tuning (void)
gtk_box_pack_end (GTK_BOX (hbox), swap_path_filesel, FALSE, FALSE, 0);
gtk_widget_show (swap_path_filesel);
label = gtk_label_new (_("Swap Directory:"));
label = gtk_label_new (_("Swap Folder:"));
PAGE_STYLE (label);
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);

3
data/misc/user_install
View File

@ -7,7 +7,6 @@
# 2) Copy system gimprc file to ~/.gimp-1.2
# 3) Create brushes, gradients, palettes, patterns, plug-ins subdirs
# 4) Create the tmp subdirectory for disk-swapping undo buffers
# 5) Copy the palette files in system palette directory
#
echo "mkdir $2"
@ -30,8 +29,6 @@ echo "mkdir $2/gradients"
mkdir $2/gradients
echo "mkdir $2/palettes"
mkdir $2/palettes
echo "cp $1/palettes/* $2/palettes"
cp $1/palettes/* $2/palettes
echo "mkdir $2/patterns"
mkdir $2/patterns
echo "mkdir $2/plug-ins"

2
etc/gimprc.in
View File

@ -51,7 +51,7 @@
# Set the palette search path...this path will be searched for valid
# palettes at startup.
(palette-path "${gimp_dir}/palettes")
(palette-path "${gimp_dir}/palettes:${gimp_data_dir}/palettes")
# Specify a default palette.
# The pattern is searched for in the specified pattern paths.

2
etc/gimprc.win32
View File

@ -60,7 +60,7 @@
# Set the palette search path...this path will be searched for valid
# palettes at startup.
(palette-path "${gimp_dir}\\palettes")
(palette-path "${gimp_dir}\\palettes;${gimp_data_dir}\\palettes")
# Specify a default palette.
# The pattern is searched for in the specified pattern paths.

2
libgimpwidgets/gimpfileentry.c
View File

@ -349,7 +349,7 @@ gimp_file_selection_browse_callback (GtkWidget *widget,
{
gfs->file_selection =
gtk_file_selection_new (gfs->title ?
gfs->title : _("Select Directory"));
gfs->title : _("Select Folder"));
/* hiding these widgets uses internal gtk+ knowledge, but it's
* easier than creating my own directory browser -- michael

2
libgimpwidgets/gimpfileselection.c
View File

@ -349,7 +349,7 @@ gimp_file_selection_browse_callback (GtkWidget *widget,
{
gfs->file_selection =
gtk_file_selection_new (gfs->title ?
gfs->title : _("Select Directory"));
gfs->title : _("Select Folder"));
/* hiding these widgets uses internal gtk+ knowledge, but it's
* easier than creating my own directory browser -- michael

2
plug-ins/FractalExplorer/Dialogs.c
View File

@ -1630,7 +1630,7 @@ file_selection_ok (GtkWidget *w,
if (!err && S_ISDIR (filestat.st_mode))
{
/* Can't save to directory */
g_message (_("Save: Can't save to a directory"));
g_message (_("Save: Can't save to a folder."));
return;
}

6
plug-ins/FractalExplorer/FractalExplorer.c
View File

@ -1176,7 +1176,7 @@ plug_in_parse_fractalexplorer_path (void)
{
GString *err =
g_string_new (_("fractalexplorer-path misconfigured - "
"the following directories were not found"));
"the following folders were not found:"));
for (list = fail_list; list; list = g_list_next (list))
{
@ -1312,7 +1312,7 @@ fractalexplorer_list_load_all (GList *plist)
if (!dir)
{
g_warning ("error reading fractalexplorer directory \"%s\"", path);
g_warning ("error reading fractalexplorer folder \"%s\"", path);
}
else
{
@ -1403,7 +1403,7 @@ add_objects_list (void)
G_CALLBACK (fractalexplorer_rescan_list),
NULL);
gimp_help_set_help_data (button,
_("Select directory and rescan collection"), NULL);
_("Select folder and rescan collection"), NULL);
gtk_widget_show (button);
button = gtk_button_new_with_label (_("Delete"));

8
plug-ins/gfig/gfig.c
View File

@ -840,7 +840,7 @@ plug_in_parse_gfig_path (void)
{
GString *err =
g_string_new (_("gfig-path misconfigured - "
"the following directories were not found"));
"the following folders were not found:"));
for (list = fail_list; list; list = g_list_next (list))
{
@ -1026,7 +1026,7 @@ gfig_list_load_all (GList *plist)
dir = opendir (path);
if (!dir)
g_warning ("Error reading GFig directory \"%s\"", path);
g_warning ("Error reading GFig folder \"%s\"", path);
else
{
while ((dir_ent = readdir (dir)))
@ -1542,7 +1542,7 @@ file_selection_ok (GtkWidget *w,
if (!err && S_ISDIR (filestat.st_mode))
{
g_message ("Save: Can't save to a directory");
g_message ("Save: Can't save to a folder.");
return;
}
@ -3553,7 +3553,7 @@ add_objects_list (void)
GTK_SIGNAL_FUNC (rescan_button_callback),
NULL);
gimp_help_set_help_data (button,
_("Select directory and rescan Gfig object "
_("Select folder and rescan Gfig object "
"collection"), NULL);
gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1,
GTK_FILL, GTK_FILL, 0, 0);

10
plug-ins/gflare/gflare.c
View File

@ -856,7 +856,7 @@ plugin_query (void)
" This plug-in produces a lense flare effect using custom gradients."
" In interactive call, the user can edit his/her own favorite lense flare"
" (GFlare) and render it. Edited gflare is saved automatically to"
" the directory in gflare-path, if it is defined in gimprc."
" the folder in gflare-path, if it is defined in gimprc."
" In non-interactive call, the user can only render one of GFlare"
" which has been stored in gflare-path already.";
@ -1053,7 +1053,7 @@ plug_in_parse_gflare_path (void)
{
GString *err =
g_string_new (_("gflare-path misconfigured - "
"the following directories were not found"));
"the following folders were not found:"));
for (list = fail_list; list; list = g_list_next (list))
{
@ -1603,8 +1603,8 @@ gflare_save (GFlare *gflare)
g_message (_("GFlare `%s' is not saved.\n"
"If you add a new entry in %s, like:\n"
"(gflare-path \"%s\")\n"
"and make a directory %s,\n"
"then you can save your own GFlare's into that directory."),
"and make a folder %s,\n"
"then you can save your own GFlare's into that folder."),
gflare->name, gimprc, gflare_path, dir);
g_free (gimprc);
g_free (gflare_path);
@ -1830,7 +1830,7 @@ gflares_list_load_all (void)
dir = opendir (path);
if (!dir)
g_warning(_("error reading GFlare directory \"%s\""), path);
g_warning(_("error reading GFlare folder \"%s\""), path);
else
{
while ((dir_ent = readdir (dir)))

2
plug-ins/gimpressionist/presets.c
View File

@ -692,7 +692,7 @@ void create_presetpage(GtkNotebook *notebook)
gtk_signal_connect (GTK_OBJECT(tmpw), "clicked",
GTK_SIGNAL_FUNC(presetsrefresh),
NULL);
gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), tmpw, _("Reread the directory of Presets"), NULL);
gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), tmpw, _("Reread the folder of Presets"), NULL);
presetdesclabel = tmpw = gtk_label_new( _("(Desc)"));
gtk_box_pack_start(GTK_BOX(box2), tmpw, FALSE, FALSE,0);

4
plug-ins/script-fu/script-fu-interface.c
View File

@ -293,7 +293,7 @@ script_fu_find_scripts (void)
if (!dir)
{
g_message ("Error reading script directory '%s'\n%s",
g_message ("Error reading script folder '%s'\n%s",
path, error->message);
g_clear_error (&error);
}
@ -1373,7 +1373,7 @@ script_fu_interface (SFScript *script)
FALSE, TRUE);
else
sf_interface->args_widgets[i] =
gimp_file_selection_new (_("Script-Fu Directory Selection"),
gimp_file_selection_new (_("Script-Fu Folder Selection"),
script->arg_values[i].sfa_file.filename,
TRUE, TRUE);

4
plug-ins/script-fu/script-fu-scripts.c
View File

@ -293,7 +293,7 @@ script_fu_find_scripts (void)
if (!dir)
{
g_message ("Error reading script directory '%s'\n%s",
g_message ("Error reading script folder '%s'\n%s",
path, error->message);
g_clear_error (&error);
}
@ -1373,7 +1373,7 @@ script_fu_interface (SFScript *script)
FALSE, TRUE);
else
sf_interface->args_widgets[i] =
gimp_file_selection_new (_("Script-Fu Directory Selection"),
gimp_file_selection_new (_("Script-Fu Folder Selection"),
script->arg_values[i].sfa_file.filename,
TRUE, TRUE);