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

removed explicit newlines from all multi-line texts except where 

2004-01-08  Michael Natterer  <mitch@gimp.org>

	* app/gui/user-install-dialog.c: removed explicit newlines from
	all multi-line texts except where neccessary to do paragraph
	breaks. Instead, configure the resp. GtkLabels to do automatic
	line wrapping. Tweaked layout slightly to look better with long
	one-line strings. Fixes bug #130916 and prevents similar bugs to
	occur in the future.
This commit is contained in:
Michael Natterer 2004-01-08 21:39:13 +00:00 committed by Michael Natterer
parent cbfeedb8c9
commit ed250afdae
3 changed files with 227 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2004-01-08 Michael Natterer <mitch@gimp.org>
* app/gui/user-install-dialog.c: removed explicit newlines from
all multi-line texts except where neccessary to do paragraph
breaks. Instead, configure the resp. GtkLabels to do automatic
line wrapping. Tweaked layout slightly to look better with long
one-line strings. Fixes bug #130916 and prevents similar bugs to
occur in the future.
2004-01-08 Dave Neary <bolsh@gimp.org>
* etc/templaterc: Add some templates for screen sizes, as i

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

@ -129,135 +129,132 @@ tree_items[] =
{
{
FALSE, "gimprc",
N_("The gimprc is used to store personal preferences\n"
"that affect GIMP's default behavior.\n"
"Paths to search for brushes, palettes, gradients,\n"
"patterns, plug-ins and modules can also configured\n"
N_("The gimprc is used to store personal preferences "
"that affect GIMP's default behavior. "
"Paths to search for brushes, palettes, gradients, "
"patterns, plug-ins and modules can also configured "
"here."),
TREE_ITEM_DO_NOTHING
},
{
FALSE, "gtkrc",
N_("GIMP uses an additional gtkrc file so you can\n"
N_("GIMP uses an additional gtkrc file so you can "
"configure it to look differently than other GTK apps."),
TREE_ITEM_FROM_SYSCONF_DIR
},
{
FALSE, "pluginrc",
N_("Plug-ins and extensions are external programs run\n"
"by the GIMP which provide additional functionality.\n"
"These programs are searched for at run-time and\n"
"information about their functionality and mod-times\n"
"is cached in this file. This file is intended to\n"
N_("Plug-ins and extensions are external programs run "
"by the GIMP which provide additional functionality. "
"These programs are searched for at run-time and "
"information about their functionality and mod-times "
"is cached in this file. This file is intended to "
"be GIMP-readable only, and should not be edited."),
TREE_ITEM_DO_NOTHING
},
{
FALSE, "menurc",
N_("Key shortcuts can be dynamically redefined in The GIMP.\n"
"The menurc is a dump of your configuration so it can.\n"
"be remembered for the next session. You may edit this\n"
"file if you wish, but it is much easier to define the\n"
"keys from within The GIMP. Deleting this file will\n"
N_("Key shortcuts can be dynamically redefined in The GIMP. "
"The menurc is a dump of your configuration so it can. "
"be remembered for the next session. You may edit this "
"file if you wish, but it is much easier to define the "
"keys from within The GIMP. Deleting this file will "
"restore the default shortcuts."),
TREE_ITEM_DO_NOTHING
},
{
FALSE, "sessionrc",
N_("The sessionrc is used to store what dialog windows were\n"
"open the last time you quit The GIMP. You can configure\n"
N_("The sessionrc is used to store what dialog windows were "
"open the last time you quit The GIMP. You can configure "
"The GIMP to reopen these dialogs at the saved position."),
TREE_ITEM_DO_NOTHING
},
{
FALSE, "templaterc",
N_("This file holds a collection of standard media sizes that\n"
N_("This file holds a collection of standard media sizes that "
"serve as image templates."),
TREE_ITEM_DO_NOTHING
},
{
FALSE, "unitrc",
N_("The unitrc is used to store your user units database.\n"
"You can define additional units and use them just\n"
"like you use the built-in units inches, millimeters,\n"
"points and picas. This file is overwritten each time\n"
N_("The unitrc is used to store your user units database. "
"You can define additional units and use them just "
"like you use the built-in units inches, millimeters, "
"points and picas. This file is overwritten each time "
"you quit the GIMP."),
TREE_ITEM_DO_NOTHING
},
{
TRUE, "brushes",
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"
N_("This folder is used to store user defined brushes. "
"The GIMP checks this folder in addition to the system-wide "
"GIMP brushes installation when searching for "
"brushes."),
TREE_ITEM_MKDIR
},
{
TRUE, "fonts",
N_("This folder is used to store fonts you only want\n"
"visible in the GIMP. The GIMP checks this folder in\n"
"addition to the system-wide GIMP fonts installation\n"
"when searching for fonts. Use this only if you really\n"
"want to have GIMP-only fonts, otherwise put things\n"
N_("This folder is used to store fonts you only want "
"visible in the GIMP. The GIMP checks this folder in "
"addition to the system-wide GIMP fonts installation "
"when searching for fonts. Use this only if you really "
"want to have GIMP-only fonts, otherwise put things "
"in your global font directory."),
TREE_ITEM_MKDIR
},
{
TRUE, "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."),
N_("This folder is used to store user defined gradients. "
"The GIMP checks this folder in addition to the system-wide "
"GIMP gradients installation when searching for gradients."),
TREE_ITEM_MKDIR
},
{
TRUE, "palettes",
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."),
N_("This folder is used to store user defined palettes. "
"The GIMP checks this folder in addition to the system-wide "
"GIMP palettes installation when searching for palettes."),
TREE_ITEM_MKDIR
},
{
TRUE, "patterns",
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."),
N_("This folder is used to store user defined patterns. "
"The GIMP checks this folder in addition to the system-wide "
"GIMP patterns installation when searching for patterns."),
TREE_ITEM_MKDIR
},
{
TRUE, "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"
N_("This folder is used to store user created, temporary, "
"or otherwise non-system-supported plug-ins. The GIMP "
"checks this folder in addition to the system-wide "
"GIMP plug-in folder when searching for plug-ins."),
TREE_ITEM_MKDIR
},
{
TRUE, "modules",
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"
N_("This folder is used to store user created, temporary, "
"or otherwise non-system-supported DLL modules. The "
"GIMP checks this folder in addition to the system-wide "
"GIMP module folder when searching for modules to load "
"during initialization."),
TREE_ITEM_MKDIR
},
{
TRUE, "environ",
N_("This folder is used to store user created, temporary,\n"
"or otherwise non-system-supported additions to the\n"
"plug-in environment. The GIMP checks this folder in\n"
"addition to the system-wide GIMP environment folder\n"
"when searching for plug-in environment modification\n"
N_("This folder is used to store user created, temporary, "
"or otherwise non-system-supported additions to the "
"plug-in environment. The GIMP checks this folder in "
"addition to the system-wide GIMP environment folder "
"when searching for plug-in environment modification "
"files."),
TREE_ITEM_MKDIR
},
{
TRUE, "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"
N_("This folder is used to store user created and installed "
"scripts. The GIMP checks this folder in addition to "
"the systemwide GIMP scripts folder when searching for "
"scripts."),
TREE_ITEM_MKDIR
},
@ -273,10 +270,10 @@ tree_items[] =
},
{
TRUE, "tmp",
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"
N_("This folder is used to temporarily store undo buffers "
"to reduce memory usage. If The GIMP is unceremoniously "
"killed, files of the form: gimp<#>.<#> may persist in "
"this folder. These files are useless across GIMP "
"sessions and can be destroyed with impunity."),
TREE_ITEM_MKDIR
},
@ -287,14 +284,12 @@ tree_items[] =
},
{
TRUE, "curves",
N_("This folder is used to store parameter files for the\n"
"Curves tool."),
N_("This folder is used to store parameter files for the Curves tool."),
TREE_ITEM_MKDIR
},
{
TRUE, "levels",
N_("This folder is used to store parameter files for the\n"
"Levels tool."),
N_("This folder is used to store parameter files for the Levels tool."),
TREE_ITEM_MKDIR
},
{
@ -394,13 +389,13 @@ user_install_response (GtkWidget *widget,
gtk_dialog_set_response_sensitive (GTK_DIALOG (widget),
GTK_RESPONSE_OK, TRUE);
gtk_label_set_text (GTK_LABEL (footer_label),
_("Installation successful.\n"
_("Installation successful. "
"Click \"Continue\" to proceed."));
}
else
{
gtk_label_set_text (GTK_LABEL (footer_label),
_("Installation failed.\n"
_("Installation failed. "
"Contact system administrator."));
}
@ -539,6 +534,7 @@ add_label (GtkBox *box,
gtk_label_set_markup (GTK_LABEL (label), text);
PAGE_STYLE (label);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (box, label, FALSE, FALSE, 0);
@ -660,6 +656,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
footer_label = gtk_label_new (NULL);
PAGE_STYLE (footer_label);
gtk_label_set_justify (GTK_LABEL (footer_label), GTK_JUSTIFY_RIGHT);
gtk_label_set_line_wrap (GTK_LABEL (footer_label), TRUE);
gtk_box_pack_end (GTK_BOX (eek_box), footer_label, FALSE, FALSE,0 );
gtk_widget_show (footer_label);
@ -694,6 +691,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
title_label = gtk_label_new (NULL);
TITLE_STYLE (title_label);
gtk_label_set_justify (GTK_LABEL (title_label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (title_label), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), title_label, FALSE, FALSE, 0);
gtk_widget_show (title_label);
@ -755,7 +753,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
add_label (GTK_BOX (page),
_("<b>The GIMP - GNU Image Manipulation Program</b>\n"
"Copyright (C) 1995-2003\n"
"Copyright (C) 1995-2004\n"
"Spencer Kimball, Peter Mattis and the GIMP Development Team."));
sep = gtk_hseparator_new ();
@ -764,21 +762,21 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
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"
_("This program is free software; you can redistribute it and/or modify "
"it under the terms of the GNU General Public License as published by "
"the Free Software Foundation; either version 2 of the License, or "
"(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"
_("This program is distributed in the hope that it will be useful, "
"but WITHOUT ANY WARRANTY; without even the implied warranty of "
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "
"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"
_("You should have received a copy of the GNU General Public License "
"along with this program; if not, write to the Free Software "
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
"MA 02111-1307, USA."));
/* Page 2 */
@ -846,15 +844,15 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
str = g_strdup_printf (_("For a proper GIMP installation, a folder named\n"
str = g_strdup_printf (_("For a proper GIMP installation, a folder named "
"'<b>%s</b>' needs to be created."),
gimp_directory ());
add_label (GTK_BOX (vbox), str);
g_free (str);
add_label (GTK_BOX (vbox),
_("This folder will contain a number of important files.\n"
"Click on one of the files or folders in the tree\n"
_("This folder will contain a number of important files. "
"Click on one of the files or folders in the tree "
"to get more information about the selected item."));
notebook2 = gtk_notebook_new ();
@ -911,6 +909,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
g_free (foo);
PAGE_STYLE (label);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (page2), label, FALSE, FALSE, 0);
gtk_widget_show (label);
@ -918,6 +917,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
label = gtk_label_new (gettext (tree_items[i].description));
PAGE_STYLE (label);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (page2), label, FALSE, FALSE, 0);
gtk_widget_show (label);
@ -940,7 +940,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
page = log_page =
user_install_notebook_append_page (GTK_NOTEBOOK (notebook),
_("User Installation Log"),
_("Please wait while your personal\n"
_("Please wait while your personal "
"GIMP folder is being created..."),
0);
@ -948,17 +948,20 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
page = tuning_page =
user_install_notebook_append_page (GTK_NOTEBOOK (notebook),
_("GIMP Performance Tuning"),
_("Click \"Continue\" to accept the settings above."),
_("Click \"Continue\" to accept the "
"settings above."),
24);
add_label (GTK_BOX (page),
_("<b>For optimal GIMP performance, some settings may have to be adjusted.</b>"));
_("<b>For optimal GIMP performance, some settings may have to "
"be adjusted.</b>"));
/* Page 5 */
page = resolution_page =
user_install_notebook_append_page (GTK_NOTEBOOK (notebook),
_("Monitor Resolution"),
_("Click \"Continue\" to start The GIMP."),
_("Click \"Continue\" to start "
"The GIMP."),
24);
add_label (GTK_BOX (resolution_page),
@ -1154,9 +1157,10 @@ user_install_tuning (GimpRc *gimprc)
gtk_widget_show (vbox);
add_label (GTK_BOX (vbox),
_("GIMP uses a limited amount of memory to store image data, the so-called\n"
"\"Tile Cache\". You should adjust its size to fit into memory. Consider\n"
"the amount of memory used by other running processes."));
_("GIMP uses a limited amount of memory to store image data, "
"the so-called \"Tile Cache\". You should adjust its size "
"to fit into memory. Consider the amount of memory used by "
"other running processes."));
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@ -1178,10 +1182,11 @@ user_install_tuning (GimpRc *gimprc)
gtk_widget_show (vbox);
add_label (GTK_BOX (vbox),
_("All image and undo data which doesn't fit into the Tile Cache will be\n"
"written to a swap file. This file should be located on a local filesystem\n"
"with enough free space (several hundred MB). On a UNIX system, you\n"
"may want to use the system-wide temp-dir (\"/tmp\" or \"/var/tmp\")."));
_("All image and undo data which doesn't fit into the Tile Cache "
"will be written to a swap file. This file should be located "
"on a local filesystem with enough free space (several hundred "
"MB). On a UNIX system, you may want to use the system-wide "
"temp-dir (\"/tmp\" or \"/var/tmp\")."));
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@ -1244,7 +1249,7 @@ user_install_resolution (GimpRc *gimprc)
gtk_widget_show (vbox);
add_label (GTK_BOX (vbox),
_("GIMP can obtain this information from the windowing system.\n"
_("GIMP can obtain this information from the windowing system. "
"However, usually this does not give useful values."));
hbox = gtk_hbox_new (FALSE, 0);
@ -1265,14 +1270,17 @@ user_install_resolution (GimpRc *gimprc)
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_widget_show (toggle);
/* manually */
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (resolution_page), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
vbox = gtk_vbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (resolution_page), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
add_label (GTK_BOX (hbox),
_("Alternatively, you can set\nthe monitor resolution manually."));
add_label (GTK_BOX (vbox),
_("Alternatively, you can set the monitor resolution manually."));
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
pixels_per_unit = g_strconcat (_("Pixels"), "/%s", NULL);
@ -1317,8 +1325,9 @@ user_install_resolution (GimpRc *gimprc)
gtk_widget_show (hbox);
add_label (GTK_BOX (hbox),
_("You can also press the \"Calibrate\" button to open a window\n"
"which lets you determine your monitor resolution interactively."));
_("You can also press the \"Calibrate\" button to open a window "
"which lets you determine your monitor resolution "
"interactively."));
button = gtk_button_new_with_label (_("Calibrate"));
gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 4, 0);

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

@ -129,135 +129,132 @@ tree_items[] =
{
{
FALSE, "gimprc",
N_("The gimprc is used to store personal preferences\n"
"that affect GIMP's default behavior.\n"
"Paths to search for brushes, palettes, gradients,\n"
"patterns, plug-ins and modules can also configured\n"
N_("The gimprc is used to store personal preferences "
"that affect GIMP's default behavior. "
"Paths to search for brushes, palettes, gradients, "
"patterns, plug-ins and modules can also configured "
"here."),
TREE_ITEM_DO_NOTHING
},
{
FALSE, "gtkrc",
N_("GIMP uses an additional gtkrc file so you can\n"
N_("GIMP uses an additional gtkrc file so you can "
"configure it to look differently than other GTK apps."),
TREE_ITEM_FROM_SYSCONF_DIR
},
{
FALSE, "pluginrc",
N_("Plug-ins and extensions are external programs run\n"
"by the GIMP which provide additional functionality.\n"
"These programs are searched for at run-time and\n"
"information about their functionality and mod-times\n"
"is cached in this file. This file is intended to\n"
N_("Plug-ins and extensions are external programs run "
"by the GIMP which provide additional functionality. "
"These programs are searched for at run-time and "
"information about their functionality and mod-times "
"is cached in this file. This file is intended to "
"be GIMP-readable only, and should not be edited."),
TREE_ITEM_DO_NOTHING
},
{
FALSE, "menurc",
N_("Key shortcuts can be dynamically redefined in The GIMP.\n"
"The menurc is a dump of your configuration so it can.\n"
"be remembered for the next session. You may edit this\n"
"file if you wish, but it is much easier to define the\n"
"keys from within The GIMP. Deleting this file will\n"
N_("Key shortcuts can be dynamically redefined in The GIMP. "
"The menurc is a dump of your configuration so it can. "
"be remembered for the next session. You may edit this "
"file if you wish, but it is much easier to define the "
"keys from within The GIMP. Deleting this file will "
"restore the default shortcuts."),
TREE_ITEM_DO_NOTHING
},
{
FALSE, "sessionrc",
N_("The sessionrc is used to store what dialog windows were\n"
"open the last time you quit The GIMP. You can configure\n"
N_("The sessionrc is used to store what dialog windows were "
"open the last time you quit The GIMP. You can configure "
"The GIMP to reopen these dialogs at the saved position."),
TREE_ITEM_DO_NOTHING
},
{
FALSE, "templaterc",
N_("This file holds a collection of standard media sizes that\n"
N_("This file holds a collection of standard media sizes that "
"serve as image templates."),
TREE_ITEM_DO_NOTHING
},
{
FALSE, "unitrc",
N_("The unitrc is used to store your user units database.\n"
"You can define additional units and use them just\n"
"like you use the built-in units inches, millimeters,\n"
"points and picas. This file is overwritten each time\n"
N_("The unitrc is used to store your user units database. "
"You can define additional units and use them just "
"like you use the built-in units inches, millimeters, "
"points and picas. This file is overwritten each time "
"you quit the GIMP."),
TREE_ITEM_DO_NOTHING
},
{
TRUE, "brushes",
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"
N_("This folder is used to store user defined brushes. "
"The GIMP checks this folder in addition to the system-wide "
"GIMP brushes installation when searching for "
"brushes."),
TREE_ITEM_MKDIR
},
{
TRUE, "fonts",
N_("This folder is used to store fonts you only want\n"
"visible in the GIMP. The GIMP checks this folder in\n"
"addition to the system-wide GIMP fonts installation\n"
"when searching for fonts. Use this only if you really\n"
"want to have GIMP-only fonts, otherwise put things\n"
N_("This folder is used to store fonts you only want "
"visible in the GIMP. The GIMP checks this folder in "
"addition to the system-wide GIMP fonts installation "
"when searching for fonts. Use this only if you really "
"want to have GIMP-only fonts, otherwise put things "
"in your global font directory."),
TREE_ITEM_MKDIR
},
{
TRUE, "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."),
N_("This folder is used to store user defined gradients. "
"The GIMP checks this folder in addition to the system-wide "
"GIMP gradients installation when searching for gradients."),
TREE_ITEM_MKDIR
},
{
TRUE, "palettes",
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."),
N_("This folder is used to store user defined palettes. "
"The GIMP checks this folder in addition to the system-wide "
"GIMP palettes installation when searching for palettes."),
TREE_ITEM_MKDIR
},
{
TRUE, "patterns",
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."),
N_("This folder is used to store user defined patterns. "
"The GIMP checks this folder in addition to the system-wide "
"GIMP patterns installation when searching for patterns."),
TREE_ITEM_MKDIR
},
{
TRUE, "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"
N_("This folder is used to store user created, temporary, "
"or otherwise non-system-supported plug-ins. The GIMP "
"checks this folder in addition to the system-wide "
"GIMP plug-in folder when searching for plug-ins."),
TREE_ITEM_MKDIR
},
{
TRUE, "modules",
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"
N_("This folder is used to store user created, temporary, "
"or otherwise non-system-supported DLL modules. The "
"GIMP checks this folder in addition to the system-wide "
"GIMP module folder when searching for modules to load "
"during initialization."),
TREE_ITEM_MKDIR
},
{
TRUE, "environ",
N_("This folder is used to store user created, temporary,\n"
"or otherwise non-system-supported additions to the\n"
"plug-in environment. The GIMP checks this folder in\n"
"addition to the system-wide GIMP environment folder\n"
"when searching for plug-in environment modification\n"
N_("This folder is used to store user created, temporary, "
"or otherwise non-system-supported additions to the "
"plug-in environment. The GIMP checks this folder in "
"addition to the system-wide GIMP environment folder "
"when searching for plug-in environment modification "
"files."),
TREE_ITEM_MKDIR
},
{
TRUE, "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"
N_("This folder is used to store user created and installed "
"scripts. The GIMP checks this folder in addition to "
"the systemwide GIMP scripts folder when searching for "
"scripts."),
TREE_ITEM_MKDIR
},
@ -273,10 +270,10 @@ tree_items[] =
},
{
TRUE, "tmp",
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"
N_("This folder is used to temporarily store undo buffers "
"to reduce memory usage. If The GIMP is unceremoniously "
"killed, files of the form: gimp<#>.<#> may persist in "
"this folder. These files are useless across GIMP "
"sessions and can be destroyed with impunity."),
TREE_ITEM_MKDIR
},
@ -287,14 +284,12 @@ tree_items[] =
},
{
TRUE, "curves",
N_("This folder is used to store parameter files for the\n"
"Curves tool."),
N_("This folder is used to store parameter files for the Curves tool."),
TREE_ITEM_MKDIR
},
{
TRUE, "levels",
N_("This folder is used to store parameter files for the\n"
"Levels tool."),
N_("This folder is used to store parameter files for the Levels tool."),
TREE_ITEM_MKDIR
},
{
@ -394,13 +389,13 @@ user_install_response (GtkWidget *widget,
gtk_dialog_set_response_sensitive (GTK_DIALOG (widget),
GTK_RESPONSE_OK, TRUE);
gtk_label_set_text (GTK_LABEL (footer_label),
_("Installation successful.\n"
_("Installation successful. "
"Click \"Continue\" to proceed."));
}
else
{
gtk_label_set_text (GTK_LABEL (footer_label),
_("Installation failed.\n"
_("Installation failed. "
"Contact system administrator."));
}
@ -539,6 +534,7 @@ add_label (GtkBox *box,
gtk_label_set_markup (GTK_LABEL (label), text);
PAGE_STYLE (label);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (box, label, FALSE, FALSE, 0);
@ -660,6 +656,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
footer_label = gtk_label_new (NULL);
PAGE_STYLE (footer_label);
gtk_label_set_justify (GTK_LABEL (footer_label), GTK_JUSTIFY_RIGHT);
gtk_label_set_line_wrap (GTK_LABEL (footer_label), TRUE);
gtk_box_pack_end (GTK_BOX (eek_box), footer_label, FALSE, FALSE,0 );
gtk_widget_show (footer_label);
@ -694,6 +691,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
title_label = gtk_label_new (NULL);
TITLE_STYLE (title_label);
gtk_label_set_justify (GTK_LABEL (title_label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (title_label), TRUE);
gtk_box_pack_start (GTK_BOX (hbox), title_label, FALSE, FALSE, 0);
gtk_widget_show (title_label);
@ -755,7 +753,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
add_label (GTK_BOX (page),
_("<b>The GIMP - GNU Image Manipulation Program</b>\n"
"Copyright (C) 1995-2003\n"
"Copyright (C) 1995-2004\n"
"Spencer Kimball, Peter Mattis and the GIMP Development Team."));
sep = gtk_hseparator_new ();
@ -764,21 +762,21 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
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"
_("This program is free software; you can redistribute it and/or modify "
"it under the terms of the GNU General Public License as published by "
"the Free Software Foundation; either version 2 of the License, or "
"(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"
_("This program is distributed in the hope that it will be useful, "
"but WITHOUT ANY WARRANTY; without even the implied warranty of "
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "
"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"
_("You should have received a copy of the GNU General Public License "
"along with this program; if not, write to the Free Software "
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
"MA 02111-1307, USA."));
/* Page 2 */
@ -846,15 +844,15 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
str = g_strdup_printf (_("For a proper GIMP installation, a folder named\n"
str = g_strdup_printf (_("For a proper GIMP installation, a folder named "
"'<b>%s</b>' needs to be created."),
gimp_directory ());
add_label (GTK_BOX (vbox), str);
g_free (str);
add_label (GTK_BOX (vbox),
_("This folder will contain a number of important files.\n"
"Click on one of the files or folders in the tree\n"
_("This folder will contain a number of important files. "
"Click on one of the files or folders in the tree "
"to get more information about the selected item."));
notebook2 = gtk_notebook_new ();
@ -911,6 +909,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
g_free (foo);
PAGE_STYLE (label);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (page2), label, FALSE, FALSE, 0);
gtk_widget_show (label);
@ -918,6 +917,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
label = gtk_label_new (gettext (tree_items[i].description));
PAGE_STYLE (label);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (page2), label, FALSE, FALSE, 0);
gtk_widget_show (label);
@ -940,7 +940,7 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
page = log_page =
user_install_notebook_append_page (GTK_NOTEBOOK (notebook),
_("User Installation Log"),
_("Please wait while your personal\n"
_("Please wait while your personal "
"GIMP folder is being created..."),
0);
@ -948,17 +948,20 @@ user_install_dialog_run (const gchar *alternate_system_gimprc,
page = tuning_page =
user_install_notebook_append_page (GTK_NOTEBOOK (notebook),
_("GIMP Performance Tuning"),
_("Click \"Continue\" to accept the settings above."),
_("Click \"Continue\" to accept the "
"settings above."),
24);
add_label (GTK_BOX (page),
_("<b>For optimal GIMP performance, some settings may have to be adjusted.</b>"));
_("<b>For optimal GIMP performance, some settings may have to "
"be adjusted.</b>"));
/* Page 5 */
page = resolution_page =
user_install_notebook_append_page (GTK_NOTEBOOK (notebook),
_("Monitor Resolution"),
_("Click \"Continue\" to start The GIMP."),
_("Click \"Continue\" to start "
"The GIMP."),
24);
add_label (GTK_BOX (resolution_page),
@ -1154,9 +1157,10 @@ user_install_tuning (GimpRc *gimprc)
gtk_widget_show (vbox);
add_label (GTK_BOX (vbox),
_("GIMP uses a limited amount of memory to store image data, the so-called\n"
"\"Tile Cache\". You should adjust its size to fit into memory. Consider\n"
"the amount of memory used by other running processes."));
_("GIMP uses a limited amount of memory to store image data, "
"the so-called \"Tile Cache\". You should adjust its size "
"to fit into memory. Consider the amount of memory used by "
"other running processes."));
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@ -1178,10 +1182,11 @@ user_install_tuning (GimpRc *gimprc)
gtk_widget_show (vbox);
add_label (GTK_BOX (vbox),
_("All image and undo data which doesn't fit into the Tile Cache will be\n"
"written to a swap file. This file should be located on a local filesystem\n"
"with enough free space (several hundred MB). On a UNIX system, you\n"
"may want to use the system-wide temp-dir (\"/tmp\" or \"/var/tmp\")."));
_("All image and undo data which doesn't fit into the Tile Cache "
"will be written to a swap file. This file should be located "
"on a local filesystem with enough free space (several hundred "
"MB). On a UNIX system, you may want to use the system-wide "
"temp-dir (\"/tmp\" or \"/var/tmp\")."));
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@ -1244,7 +1249,7 @@ user_install_resolution (GimpRc *gimprc)
gtk_widget_show (vbox);
add_label (GTK_BOX (vbox),
_("GIMP can obtain this information from the windowing system.\n"
_("GIMP can obtain this information from the windowing system. "
"However, usually this does not give useful values."));
hbox = gtk_hbox_new (FALSE, 0);
@ -1265,14 +1270,17 @@ user_install_resolution (GimpRc *gimprc)
gtk_box_pack_end (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_widget_show (toggle);
/* manually */
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (resolution_page), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
vbox = gtk_vbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (resolution_page), vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
add_label (GTK_BOX (hbox),
_("Alternatively, you can set\nthe monitor resolution manually."));
add_label (GTK_BOX (vbox),
_("Alternatively, you can set the monitor resolution manually."));
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
pixels_per_unit = g_strconcat (_("Pixels"), "/%s", NULL);
@ -1317,8 +1325,9 @@ user_install_resolution (GimpRc *gimprc)
gtk_widget_show (hbox);
add_label (GTK_BOX (hbox),
_("You can also press the \"Calibrate\" button to open a window\n"
"which lets you determine your monitor resolution interactively."));
_("You can also press the \"Calibrate\" button to open a window "
"which lets you determine your monitor resolution "
"interactively."));
button = gtk_button_new_with_label (_("Calibrate"));
gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 4, 0);