[gimp] app, libgimp*: pass translated blurbs to GIMP_CONFIG_INSTALL_PROP_FOO()



commit 8be52f6aa7b1d2443ecf0ddda9fc07d321b55462
Author: Michael Natterer <mitch gimp org>
Date:   Wed May 14 23:34:01 2014 +0200

    app, libgimp*: pass translated blurbs to GIMP_CONFIG_INSTALL_PROP_FOO()
    
    instead of passing N_()-strings; and remove gettext() calls on these
    strings when using them. Reduces complexitx, and fixes double- and
    untranslated strings. Also enables to treat properties of GIMP and
    GEGL objects the same way, which was totally broken before.

 app/config/gimprc-blurbs.h                    |  292 ++++++++++++------------
 app/core/gimptemplate.c                       |    8 +-
 app/dialogs/preferences-dialog.c              |    4 +-
 app/operations/gimpbrightnesscontrastconfig.c |    6 +-
 app/operations/gimpcolorbalanceconfig.c       |   12 +-
 app/operations/gimpcolorizeconfig.c           |    8 +-
 app/operations/gimpcurvesconfig.c             |    6 +-
 app/operations/gimpdesaturateconfig.c         |    4 +-
 app/operations/gimphuesaturationconfig.c      |   12 +-
 app/operations/gimplevelsconfig.c             |   12 +-
 app/operations/gimpthresholdconfig.c          |    6 +-
 app/tools/gimpalignoptions.c                  |    6 +-
 app/tools/gimpbucketfilloptions.c             |   14 +-
 app/tools/gimpcolorpickeroptions.c            |   10 +-
 app/tools/gimpcropoptions.c                   |    8 +-
 app/tools/gimpforegroundselectoptions.c       |   16 +-
 app/tools/gimpmagnifyoptions.c                |    6 +-
 app/tools/gimprectangleselectoptions.c        |    6 +-
 app/tools/gimpregionselectoptions.c           |   10 +-
 app/tools/gimpseamlesscloneoptions.c          |    2 +-
 app/tools/gimpselectionoptions.c              |    6 +-
 app/tools/gimptextoptions.c                   |   30 ++--
 app/tools/gimptransformoptions.c              |   15 +-
 app/tools/gimpwarpoptions.c                   |   11 +-
 app/widgets/gimppropwidgets.c                 |    2 +-
 libgimpconfig/gimpcolorconfig.c               |   55 +++---
 libgimpwidgets/gimppropwidgets.c              |   10 +-
 po/POTFILES.in                                |    6 +
 28 files changed, 299 insertions(+), 284 deletions(-)
---
diff --git a/app/config/gimprc-blurbs.h b/app/config/gimprc-blurbs.h
index 1454164..1ac437f 100644
--- a/app/config/gimprc-blurbs.h
+++ b/app/config/gimprc-blurbs.h
@@ -10,9 +10,9 @@
  */
 
 #define ACTIVATE_ON_FOCUS_BLURB \
-N_("When enabled, an image will become the active image when its image " \
-   "window receives the focus. This is useful for window managers using " \
-   "\"click to focus\".")
+_("When enabled, an image will become the active image when its image " \
+  "window receives the focus. This is useful for window managers using " \
+  "\"click to focus\".")
 
 #define BRUSH_PATH_BLURB \
 "Sets the brush search path."
@@ -20,40 +20,40 @@ N_("When enabled, an image will become the active image when its image " \
 #define BRUSH_PATH_WRITABLE_BLURB ""
 
 #define DYNAMICS_PATH_BLURB \
-N_("Sets the dynamics search path.")
+_("Sets the dynamics search path.")
 
 #define DYNAMICS_PATH_WRITABLE_BLURB ""
 
 #define TOOL_PRESET_PATH_BLURB \
-N_("Sets the dynamics search path.")
+_("Sets the dynamics search path.")
 
 #define TOOL_PRESET_PATH_WRITABLE_BLURB ""
 
 #define CANVAS_PADDING_COLOR_BLURB \
-N_("Sets the canvas padding color used if the padding mode is set to " \
-   "custom color.")
+_("Sets the canvas padding color used if the padding mode is set to " \
+  "custom color.")
 
 #define CANVAS_PADDING_MODE_BLURB \
-N_("Specifies how the area around the image should be drawn.")
+_("Specifies how the area around the image should be drawn.")
 
 #define COLOR_MANAGEMENT_BLURB \
 "Defines the color management behavior."
 
 #define COLOR_PROFILE_POLICY_BLURB \
-N_("How to handle embedded color profiles when opening a file.")
+_("How to handle embedded color profiles when opening a file.")
 
 #define CURSOR_FORMAT_BLURB \
-N_("Sets the pixel format to use for mouse pointers.")
+_("Sets the pixel format to use for mouse pointers.")
 
 #define CURSOR_MODE_BLURB \
-N_("Sets the type of mouse pointers to use.")
+_("Sets the type of mouse pointers to use.")
 
 #define CURSOR_HANDEDNESS_BLURB \
-N_("Sets the handedness for cursor positioning.")
+_("Sets the handedness for cursor positioning.")
 
 #define CURSOR_UPDATING_BLURB \
-N_("Context-dependent mouse pointers are helpful.  They are enabled by " \
-   "default.  However, they require overhead that you may want to do without.")
+_("Context-dependent mouse pointers are helpful.  They are enabled by " \
+  "default.  However, they require overhead that you may want to do without.")
 
 #define DEFAULT_BRUSH_BLURB \
 "Specify a default brush.  The brush is searched for in the " \
@@ -68,8 +68,8 @@ N_("Context-dependent mouse pointers are helpful.  They are enabled by " \
 "specified tool prests path."
 
 #define DEFAULT_DOT_FOR_DOT_BLURB \
-N_("When enabled, this will ensure that each pixel of an image gets " \
-   "mapped to a pixel on the screen.")
+_("When enabled, this will ensure that each pixel of an image gets " \
+  "mapped to a pixel on the screen.")
 
 #define DEFAULT_FONT_BLURB \
 "Specify a default font."
@@ -90,8 +90,8 @@ N_("When enabled, this will ensure that each pixel of an image gets " \
 "Specify a default palette."
 
 #define DEFAULT_SNAP_DISTANCE_BLURB \
-N_("This is the distance in pixels where Guide and Grid snapping " \
-   "activates.")
+_("This is the distance in pixels where Guide and Grid snapping " \
+  "activates.")
 
 #define SNAP_TO_GUIDES_BLURB \
 "Snap to guides by default in new image windows."
@@ -106,11 +106,11 @@ N_("This is the distance in pixels where Guide and Grid snapping " \
 "Snap to the active path by default in new image windows."
 
 #define DEFAULT_THRESHOLD_BLURB \
-N_("Tools such as fuzzy-select and bucket fill find regions based on a " \
-   "seed-fill algorithm.  The seed fill starts at the initially selected " \
-   "pixel and progresses in all directions until the difference of pixel " \
-   "intensity from the original is greater than a specified threshold. " \
-   "This value represents the default threshold.")
+_("Tools such as fuzzy-select and bucket fill find regions based on a " \
+  "seed-fill algorithm.  The seed fill starts at the initially selected " \
+  "pixel and progresses in all directions until the difference of pixel " \
+  "intensity from the original is greater than a specified threshold. " \
+  "This value represents the default threshold.")
 
 #define DEFAULT_VIEW_BLURB \
 "Sets the default settings for the image view."
@@ -119,9 +119,9 @@ N_("Tools such as fuzzy-select and bucket fill find regions based on a " \
 "Sets the default settings used when an image is viewed in fullscreen mode."
 
 #define DOCK_WINDOW_HINT_BLURB \
-N_("The window type hint that is set on dock windows and the toolbox " \
-   "window. This may affect the way your window manager decorates and " \
-   "handles these windows.")
+_("The window type hint that is set on dock windows and the toolbox " \
+  "window. This may affect the way your window manager decorates and " \
+  "handles these windows.")
 
 #define ENVIRON_PATH_BLURB \
 "Sets the environ search path."
@@ -151,19 +151,19 @@ N_("The window type hint that is set on dock windows and the toolbox " \
 "Where to search for data used by the Gimpressionist plug-in."
 
 #define GLOBAL_BRUSH_BLURB \
-N_("When enabled, the selected brush will be used for all tools.")
+_("When enabled, the selected brush will be used for all tools.")
 
 #define GLOBAL_DYNAMICS_BLURB \
-N_("When enabled, the selected dynamics will be used for all tools.")
+_("When enabled, the selected dynamics will be used for all tools.")
 
 #define GLOBAL_FONT_BLURB \
 "When enabled, the selected font will be used for all tools."
 
 #define GLOBAL_GRADIENT_BLURB \
-N_("When enabled, the selected gradient will be used for all tools.")
+_("When enabled, the selected gradient will be used for all tools.")
 
 #define GLOBAL_PATTERN_BLURB \
-N_("When enabled, the selected pattern will be used for all tools.")
+_("When enabled, the selected pattern will be used for all tools.")
 
 #define GLOBAL_PALETTE_BLURB \
 "When enabled, the selected palette will be used for all tools."
@@ -177,7 +177,7 @@ N_("When enabled, the selected pattern will be used for all tools.")
 "Where to look for fonts in addition to the system-wide installed fonts."
 
 #define HELP_BROWSER_BLURB \
-N_("Sets the browser used by the help system.")
+_("Sets the browser used by the help system.")
 
 #define HELP_LOCALES_BLURB \
 "Specifies the language preferences used by the help system. This is a " \
@@ -188,35 +188,35 @@ N_("Sets the browser used by the help system.")
 "How many recent settings to keep around in color correction tools"
 
 #define IMAGE_STATUS_FORMAT_BLURB \
-N_("Sets the text to appear in image window status bars.")
+_("Sets the text to appear in image window status bars.")
 
 #define IMAGE_TITLE_FORMAT_BLURB \
-N_("Sets the text to appear in image window titles.")
+_("Sets the text to appear in image window titles.")
 
 #define INITIAL_ZOOM_TO_FIT_BLURB \
-N_("When enabled, this will ensure that the full image is visible after a " \
-   "file is opened, otherwise it will be displayed with a scale of 1:1.")
+_("When enabled, this will ensure that the full image is visible after a " \
+  "file is opened, otherwise it will be displayed with a scale of 1:1.")
 
 #define INTERPOLATION_TYPE_BLURB \
-N_("Sets the level of interpolation used for scaling and other " \
-   "transformations.")
+_("Sets the level of interpolation used for scaling and other " \
+  "transformations.")
 
 #define INTERPRETER_PATH_BLURB \
 "Sets the interpreter search path."
 
 #define LANGUAGE_BLURB \
-N_("Specifies the language to use for the user interface.")
+_("Specifies the language to use for the user interface.")
 
 #define LAST_OPENED_SIZE_BLURB \
-N_("How many recently opened image filenames to keep on the File menu.")
+_("How many recently opened image filenames to keep on the File menu.")
 
 #define MARCHING_ANTS_SPEED_BLURB \
-N_("Speed of marching ants in the selection outline.  This value is in " \
-   "milliseconds (less time indicates faster marching).")
+_("Speed of marching ants in the selection outline.  This value is in " \
+  "milliseconds (less time indicates faster marching).")
 
 #define MAX_NEW_IMAGE_SIZE_BLURB  \
-N_("GIMP will warn the user if an attempt is made to create an image that " \
-   "would take more memory than the size specified here.")
+_("GIMP will warn the user if an attempt is made to create an image that " \
+  "would take more memory than the size specified here.")
 
 #define MODULE_PATH_BLURB \
 "Sets the module search path."
@@ -225,25 +225,25 @@ N_("GIMP will warn the user if an attempt is made to create an image that " \
 "When enabled, GIMP will use the monitor resolution from the windowing system."
 
 #define MONITOR_XRESOLUTION_BLURB \
-N_("Sets the monitor's horizontal resolution, in dots per inch.  If set to " \
-   "0, forces the X server to be queried for both horizontal and vertical " \
-   "resolution information.")
+_("Sets the monitor's horizontal resolution, in dots per inch.  If set to " \
+  "0, forces the X server to be queried for both horizontal and vertical " \
+  "resolution information.")
 
 #define MONITOR_YRESOLUTION_BLURB \
-N_("Sets the monitor's vertical resolution, in dots per inch.  If set to " \
-   "0, forces the X server to be queried for both horizontal and vertical " \
-   "resolution information.")
+_("Sets the monitor's vertical resolution, in dots per inch.  If set to " \
+  "0, forces the X server to be queried for both horizontal and vertical " \
+  "resolution information.")
 
 #define MOVE_TOOL_CHANGES_ACTIVE_BLURB \
-N_("If enabled, the move tool sets the edited layer or path as active.  " \
-   "This used to be the default behaviour in older versions.")
+_("If enabled, the move tool sets the edited layer or path as active.  " \
+  "This used to be the default behaviour in older versions.")
 
 #define NAVIGATION_PREVIEW_SIZE_BLURB \
-N_("Sets the size of the navigation preview available in the lower right " \
-   "corner of the image window.")
+_("Sets the size of the navigation preview available in the lower right " \
+  "corner of the image window.")
 
 #define NUM_PROCESSORS_BLURB \
-N_("Sets how many processors GIMP should try to use simultaneously.")
+_("Sets how many processors GIMP should try to use simultaneously.")
 
 #define PALETTE_PATH_BLURB \
 "Sets the palette search path."
@@ -256,11 +256,11 @@ N_("Sets how many processors GIMP should try to use simultaneously.")
 #define PATTERN_PATH_WRITABLE_BLURB ""
 
 #define PERFECT_MOUSE_BLURB \
-N_("When enabled, the X server is queried for the mouse's current position " \
-   "on each motion event, rather than relying on the position hint.  This " \
-   "means painting with large brushes should be more accurate, but it may " \
-   "be slower.  Conversely, on some X servers enabling this option results " \
-   "in faster painting.")
+_("When enabled, the X server is queried for the mouse's current position " \
+  "on each motion event, rather than relying on the position hint.  This " \
+  "means painting with large brushes should be more accurate, but it may " \
+  "be slower.  Conversely, on some X servers enabling this option results " \
+  "in faster painting.")
 
 #define PLUG_IN_HISTORY_SIZE_BLURB \
 "How many recently used plug-ins to keep on the Filters menu."
@@ -272,138 +272,138 @@ N_("When enabled, the X server is queried for the mouse's current position " \
 "Sets the pluginrc search path."
 
 #define LAYER_PREVIEWS_BLURB \
-N_("Sets whether GIMP should create previews of layers and channels. " \
-   "Previews in the layers and channels dialog are nice to have but they " \
-   "can slow things down when working with large images.")
+_("Sets whether GIMP should create previews of layers and channels. " \
+  "Previews in the layers and channels dialog are nice to have but they " \
+  "can slow things down when working with large images.")
 
 #define LAYER_PREVIEW_SIZE_BLURB \
-N_("Sets the preview size used for layers and channel previews in newly " \
-   "created dialogs.")
+_("Sets the preview size used for layers and channel previews in newly " \
+  "created dialogs.")
 
 #define QUICK_MASK_COLOR_BLURB \
-N_("Sets the default quick mask color.")
+_("Sets the default quick mask color.")
 
 #define RESIZE_WINDOWS_ON_RESIZE_BLURB \
-N_("When enabled, the image window will automatically resize itself " \
-   "whenever the physical image size changes.")
+_("When enabled, the image window will automatically resize itself " \
+  "whenever the physical image size changes.")
 
 #define RESIZE_WINDOWS_ON_ZOOM_BLURB \
-N_("When enabled, the image window will automatically resize itself " \
-   "when zooming into and out of images.")
+_("When enabled, the image window will automatically resize itself " \
+  "when zooming into and out of images.")
 
 #define RESTORE_SESSION_BLURB \
-N_("Let GIMP try to restore your last saved session on each startup.")
+_("Let GIMP try to restore your last saved session on each startup.")
 
 #define RESTORE_MONITOR_BLURB \
-N_("When enabled, GIMP will try to restore windows on the monitor they " \
-   "were open before.  When disabled, windows will appear on the currently " \
-   "used monitor.")
+_("When enabled, GIMP will try to restore windows on the monitor they " \
+  "were open before.  When disabled, windows will appear on the currently " \
+  "used monitor.")
 
 #define SAVE_DEVICE_STATUS_BLURB \
-N_("Remember the current tool, pattern, color, and brush across GIMP " \
-   "sessions.")
+_("Remember the current tool, pattern, color, and brush across GIMP " \
+  "sessions.")
 
 #define SAVE_DOCUMENT_HISTORY_BLURB \
-N_("Keep a permanent record of all opened and saved files in the Recent " \
-   "Documents list.")
+_("Keep a permanent record of all opened and saved files in the Recent " \
+  "Documents list.")
 
 #define SAVE_SESSION_INFO_BLURB \
-N_("Save the positions and sizes of the main dialogs when GIMP exits.")
+_("Save the positions and sizes of the main dialogs when GIMP exits.")
 
 #define SAVE_TOOL_OPTIONS_BLURB \
-N_("Save the tool options when GIMP exits.")
+_("Save the tool options when GIMP exits.")
 
 #define SCRIPT_FU_PATH_BLURB \
 "This path will be searched for scripts when the Script-Fu plug-in is run."
 
 #define SHOW_BRUSH_OUTLINE_BLURB \
-N_("When enabled, all paint tools will show a preview of the current " \
-   "brush's outline.")
+_("When enabled, all paint tools will show a preview of the current " \
+  "brush's outline.")
 
 #define SHOW_HELP_BUTTON_BLURB \
-N_("When enabled, dialogs will show a help button that gives access to " \
-   "the related help page.  Without this button, the help page can still " \
-   "be reached by pressing F1.")
+_("When enabled, dialogs will show a help button that gives access to " \
+  "the related help page.  Without this button, the help page can still " \
+  "be reached by pressing F1.")
 
 #define SHOW_PAINT_TOOL_CURSOR_BLURB \
-N_("When enabled, the mouse pointer will be shown over the image while " \
-   "using a paint tool.")
+_("When enabled, the mouse pointer will be shown over the image while " \
+  "using a paint tool.")
 
 #define SHOW_MENUBAR_BLURB \
-N_("When enabled, the menubar is visible by default. This can also be " \
-   "toggled with the \"View->Show Menubar\" command.")
+_("When enabled, the menubar is visible by default. This can also be " \
+  "toggled with the \"View->Show Menubar\" command.")
 
 #define SHOW_RULERS_BLURB \
-N_("When enabled, the rulers are visible by default. This can also be " \
-   "toggled with the \"View->Show Rulers\" command.")
+_("When enabled, the rulers are visible by default. This can also be " \
+  "toggled with the \"View->Show Rulers\" command.")
 
 #define SHOW_SCROLLBARS_BLURB \
-N_("When enabled, the scrollbars are visible by default. This can also be " \
-   "toggled with the \"View->Show Scrollbars\" command.")
+_("When enabled, the scrollbars are visible by default. This can also be " \
+  "toggled with the \"View->Show Scrollbars\" command.")
 
 #define SHOW_STATUSBAR_BLURB \
-N_("When enabled, the statusbar is visible by default. This can also be " \
-   "toggled with the \"View->Show Statusbar\" command.")
+_("When enabled, the statusbar is visible by default. This can also be " \
+  "toggled with the \"View->Show Statusbar\" command.")
 
 #define SHOW_SELECTION_BLURB \
-N_("When enabled, the selection is visible by default. This can also be " \
-   "toggled with the \"View->Show Selection\" command.")
+_("When enabled, the selection is visible by default. This can also be " \
+  "toggled with the \"View->Show Selection\" command.")
 
 #define SHOW_LAYER_BOUNDARY_BLURB \
-N_("When enabled, the layer boundary is visible by default. This can also " \
-   "be toggled with the \"View->Show Layer Boundary\" command.")
+_("When enabled, the layer boundary is visible by default. This can also " \
+  "be toggled with the \"View->Show Layer Boundary\" command.")
 
 #define SHOW_GUIDES_BLURB \
-N_("When enabled, the guides are visible by default. This can also be " \
-   "toggled with the \"View->Show Guides\" command.")
+_("When enabled, the guides are visible by default. This can also be " \
+  "toggled with the \"View->Show Guides\" command.")
 
 #define SHOW_GRID_BLURB \
-N_("When enabled, the grid is visible by default. This can also be toggled " \
-   "with the \"View->Show Grid\" command.")
+_("When enabled, the grid is visible by default. This can also be toggled " \
+  "with the \"View->Show Grid\" command.")
 
 #define SHOW_SAMPLE_POINTS_BLURB \
-N_("When enabled, the sample points are visible by default. This can also be " \
-   "toggled with the \"View->Show Sample Points\" command.")
+_("When enabled, the sample points are visible by default. This can also be " \
+  "toggled with the \"View->Show Sample Points\" command.")
 
 #define SHOW_TOOLTIPS_BLURB \
-N_("Show a tooltip when the pointer hovers over an item.")
+_("Show a tooltip when the pointer hovers over an item.")
 
 #define SINGLE_WINDOW_MODE_BLURB \
-N_("Use GIMP in a single-window mode.")
+_("Use GIMP in a single-window mode.")
 
 #define HIDE_DOCKS_BLURB \
-N_("Hide docks and other windows, leaving only image windows.")
+_("Hide docks and other windows, leaving only image windows.")
 
 #define SPACE_BAR_ACTION_BLURB \
-N_("What to do when the space bar is pressed in the image window.")
+_("What to do when the space bar is pressed in the image window.")
 
 #define SWAP_PATH_BLURB \
-N_("Sets the swap file location. GIMP uses a tile based memory allocation " \
-   "scheme. The swap file is used to quickly and easily swap tiles out to " \
-   "disk and back in. Be aware that the swap file can easily get very large " \
-   "if GIMP is used with large images. " \
-   "Also, things can get horribly slow if the swap file is created on " \
-   "a folder that is mounted over NFS.  For these reasons, it may be " \
-   "desirable to put your swap file in \"/tmp\".")
+_("Sets the swap file location. GIMP uses a tile based memory allocation " \
+  "scheme. The swap file is used to quickly and easily swap tiles out to " \
+  "disk and back in. Be aware that the swap file can easily get very large " \
+  "if GIMP is used with large images. " \
+  "Also, things can get horribly slow if the swap file is created on " \
+  "a folder that is mounted over NFS.  For these reasons, it may be " \
+  "desirable to put your swap file in \"/tmp\".")
 
 #define TEAROFF_MENUS_BLURB \
-N_("When enabled, menus can be torn off.")
+_("When enabled, menus can be torn off.")
 
 #define CAN_CHANGE_ACCELS_BLURB \
-N_("When enabled, you can change keyboard shortcuts for menu items " \
-   "by hitting a key combination while the menu item is highlighted.")
+_("When enabled, you can change keyboard shortcuts for menu items " \
+  "by hitting a key combination while the menu item is highlighted.")
 
 #define SAVE_ACCELS_BLURB \
-N_("Save changed keyboard shortcuts when GIMP exits.")
+_("Save changed keyboard shortcuts when GIMP exits.")
 
 #define RESTORE_ACCELS_BLURB \
-N_("Restore saved keyboard shortcuts on each GIMP startup.")
+_("Restore saved keyboard shortcuts on each GIMP startup.")
 
 #define TEMP_PATH_BLURB \
-N_("Sets the folder for temporary storage. Files will appear here " \
-   "during the course of running GIMP.  Most files will disappear " \
-   "when GIMP exits, but some files are likely to remain, so it " \
-   "is best if this folder not be one that is shared by other users.")
+_("Sets the folder for temporary storage. Files will appear here " \
+  "during the course of running GIMP.  Most files will disappear " \
+  "when GIMP exits, but some files are likely to remain, so it " \
+  "is best if this folder not be one that is shared by other users.")
 
 #define THEME_BLURB \
 "The name of the theme to use."
@@ -412,57 +412,57 @@ N_("Sets the folder for temporary storage. Files will appear here " \
 "Sets the theme search path."
 
 #define THUMBNAIL_SIZE_BLURB \
-N_("Sets the size of the thumbnail shown in the Open dialog.")
+_("Sets the size of the thumbnail shown in the Open dialog.")
 
 #define THUMBNAIL_FILESIZE_LIMIT_BLURB \
-N_("The thumbnail in the Open dialog will be automatically updated " \
-   "if the file being previewed is smaller than the size set here.")
+_("The thumbnail in the Open dialog will be automatically updated " \
+  "if the file being previewed is smaller than the size set here.")
 
 #define TILE_CACHE_SIZE_BLURB \
-N_("When the amount of pixel data exceeds this limit, GIMP will start to " \
-   "swap tiles to disk.  This is a lot slower but it makes it possible to " \
-   "work on images that wouldn't fit into memory otherwise.  If you have a " \
-   "lot of RAM, you may want to set this to a higher value.")
+_("When the amount of pixel data exceeds this limit, GIMP will start to " \
+  "swap tiles to disk.  This is a lot slower but it makes it possible to " \
+  "work on images that wouldn't fit into memory otherwise.  If you have a " \
+  "lot of RAM, you may want to set this to a higher value.")
 
 #define TOOLBOX_COLOR_AREA_BLURB \
-N_("Show the current foreground and background colors in the toolbox.")
+_("Show the current foreground and background colors in the toolbox.")
 
 #define TOOLBOX_FOO_AREA_BLURB \
-N_("Show the currently selected brush, pattern and gradient in the toolbox.")
+_("Show the currently selected brush, pattern and gradient in the toolbox.")
 
 #define TOOLBOX_IMAGE_AREA_BLURB \
-N_("Show the currently active image in the toolbox.")
+_("Show the currently active image in the toolbox.")
 
 #define TOOLBOX_WILBER_BLURB \
 "Show the GIMP mascot at the top of the toolbox."
 
 #define TRANSPARENCY_TYPE_BLURB \
-N_("Sets the manner in which transparency is displayed in images.")
+_("Sets the manner in which transparency is displayed in images.")
 
 #define TRANSPARENCY_SIZE_BLURB \
-N_("Sets the size of the checkerboard used to display transparency.")
+_("Sets the size of the checkerboard used to display transparency.")
 
 #define TRUST_DIRTY_FLAG_BLURB \
-N_("When enabled, GIMP will not save an image if it has not been changed " \
-   "since it was opened.")
+_("When enabled, GIMP will not save an image if it has not been changed " \
+  "since it was opened.")
 
 #define UNDO_LEVELS_BLURB \
-N_("Sets the minimal number of operations that can be undone. More undo " \
-   "levels are kept available until the undo-size limit is reached.")
+_("Sets the minimal number of operations that can be undone. More undo " \
+  "levels are kept available until the undo-size limit is reached.")
 
 #define UNDO_SIZE_BLURB \
-N_("Sets an upper limit to the memory that is used per image to keep " \
-   "operations on the undo stack. Regardless of this setting, at least " \
-   "as many undo-levels as configured can be undone.")
+_("Sets an upper limit to the memory that is used per image to keep " \
+  "operations on the undo stack. Regardless of this setting, at least " \
+  "as many undo-levels as configured can be undone.")
 
 #define UNDO_PREVIEW_SIZE_BLURB \
-N_("Sets the size of the previews in the Undo History.")
+_("Sets the size of the previews in the Undo History.")
 
 #define USE_HELP_BLURB \
-N_("When enabled, pressing F1 will open the help browser.")
+_("When enabled, pressing F1 will open the help browser.")
 
 #define USE_OPENCL_BLURB \
-N_("When enabled, uses OpenCL for some operations.")
+_("When enabled, uses OpenCL for some operations.")
 
 #define USER_MANUAL_ONLINE_BLURB \
 "When enabled, the online user manual will be used by the help system. " \
diff --git a/app/core/gimptemplate.c b/app/core/gimptemplate.c
index 2adb254..bd92e2e 100644
--- a/app/core/gimptemplate.c
+++ b/app/core/gimptemplate.c
@@ -132,20 +132,20 @@ gimp_template_class_init (GimpTemplateClass *klass)
                                 GIMP_DEFAULT_IMAGE_HEIGHT,
                                 GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_UNIT (object_class, PROP_UNIT, "unit",
-                                 N_("The unit used for coordinate display "
-                                    "when not in dot-for-dot mode."),
+                                 _("The unit used for coordinate display "
+                                   "when not in dot-for-dot mode."),
                                  TRUE, FALSE, GIMP_UNIT_PIXEL,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_RESOLUTION (object_class, PROP_XRESOLUTION,
                                        "xresolution",
-                                       N_("The horizontal image resolution."),
+                                       _("The horizontal image resolution."),
                                        DEFAULT_RESOLUTION,
                                        GIMP_PARAM_STATIC_STRINGS |
                                        GIMP_TEMPLATE_PARAM_COPY_FIRST);
   GIMP_CONFIG_INSTALL_PROP_RESOLUTION (object_class, PROP_YRESOLUTION,
                                        "yresolution",
-                                       N_("The vertical image resolution."),
+                                       _("The vertical image resolution."),
                                        DEFAULT_RESOLUTION,
                                        GIMP_PARAM_STATIC_STRINGS |
                                        GIMP_TEMPLATE_PARAM_COPY_FIRST);
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 135d8ca..cf8bb28 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -807,9 +807,7 @@ prefs_profile_combo_add_tooltip (GtkWidget   *combo,
   blurb = g_param_spec_get_blurb (param_spec);
 
   if (blurb)
-    gimp_help_set_help_data (combo,
-                             dgettext (GETTEXT_PACKAGE "-libgimp", blurb),
-                             NULL);
+    gimp_help_set_help_data (combo, blurb, NULL);
 
   return combo;
 }
diff --git a/app/operations/gimpbrightnesscontrastconfig.c b/app/operations/gimpbrightnesscontrastconfig.c
index b04ddd3..e194bb2 100644
--- a/app/operations/gimpbrightnesscontrastconfig.c
+++ b/app/operations/gimpbrightnesscontrastconfig.c
@@ -31,6 +31,8 @@
 #include "gimpbrightnesscontrastconfig.h"
 #include "gimplevelsconfig.h"
 
+#include "gimp-intl.h"
+
 
 enum
 {
@@ -71,12 +73,12 @@ gimp_brightness_contrast_config_class_init (GimpBrightnessContrastConfigClass *k
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_BRIGHTNESS,
                                    "brightness",
-                                   "Brightness",
+                                   _("Brightness"),
                                    -1.0, 1.0, 0.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_CONTRAST,
                                    "contrast",
-                                   "Contrast",
+                                   _("Contrast"),
                                    -1.0, 1.0, 0.0, 0);
 }
 
diff --git a/app/operations/gimpcolorbalanceconfig.c b/app/operations/gimpcolorbalanceconfig.c
index 01cde69..4fa7f11 100644
--- a/app/operations/gimpcolorbalanceconfig.c
+++ b/app/operations/gimpcolorbalanceconfig.c
@@ -32,6 +32,8 @@
 
 #include "gimpcolorbalanceconfig.h"
 
+#include "gimp-intl.h"
+
 
 enum
 {
@@ -91,28 +93,28 @@ gimp_color_balance_config_class_init (GimpColorBalanceConfigClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_RANGE,
                                  "range",
-                                 "The affected range",
+                                 _("The affected range"),
                                  GIMP_TYPE_TRANSFER_MODE,
                                  GIMP_TRANSFER_MIDTONES, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_CYAN_RED,
                                    "cyan-red",
-                                   "Cyan-Red",
+                                   _("Cyan-Red"),
                                    -1.0, 1.0, 0.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_MAGENTA_GREEN,
                                    "magenta-green",
-                                   "Magenta-Green",
+                                   _("Magenta-Green"),
                                    -1.0, 1.0, 0.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_YELLOW_BLUE,
                                    "yellow-blue",
-                                   "Yellow-Blue",
+                                   _("Yellow-Blue"),
                                    -1.0, 1.0, 0.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_PRESERVE_LUMINOSITY,
                                     "preserve-luminosity",
-                                    "Preserve Luminosity",
+                                    _("Preserve Luminosity"),
                                     TRUE, 0);
 }
 
diff --git a/app/operations/gimpcolorizeconfig.c b/app/operations/gimpcolorizeconfig.c
index 4f182d7..30cd700 100644
--- a/app/operations/gimpcolorizeconfig.c
+++ b/app/operations/gimpcolorizeconfig.c
@@ -31,6 +31,8 @@
 
 #include "gimpcolorizeconfig.h"
 
+#include "gimp-intl.h"
+
 
 enum
 {
@@ -74,17 +76,17 @@ gimp_colorize_config_class_init (GimpColorizeConfigClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_HUE,
                                    "hue",
-                                   "Hue",
+                                   _("Hue"),
                                    0.0, 1.0, 0.5, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_SATURATION,
                                    "saturation",
-                                   "Saturation",
+                                   _("Saturation"),
                                    0.0, 1.0, 0.5, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_LIGHTNESS,
                                    "lightness",
-                                   "Lightness",
+                                   _("Lightness"),
                                    -1.0, 1.0, 0.0, 0);
 
   gimp_hsl_set (&hsl, 0.5, 0.5, 0.5);
diff --git a/app/operations/gimpcurvesconfig.c b/app/operations/gimpcurvesconfig.c
index 8d370d0..c1a6847 100644
--- a/app/operations/gimpcurvesconfig.c
+++ b/app/operations/gimpcurvesconfig.c
@@ -40,6 +40,8 @@
 
 #include "gimp-intl.h"
 
+#include "gimp-intl.h"
+
 
 enum
 {
@@ -101,13 +103,13 @@ gimp_curves_config_class_init (GimpCurvesConfigClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_CHANNEL,
                                  "channel",
-                                 "The affected channel",
+                                 _("The affected channel"),
                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
                                  GIMP_HISTOGRAM_VALUE, 0);
 
   GIMP_CONFIG_INSTALL_PROP_OBJECT (object_class, PROP_CURVE,
                                    "curve",
-                                   "Curve",
+                                   _("Curve"),
                                    GIMP_TYPE_CURVE,
                                    GIMP_CONFIG_PARAM_AGGREGATE);
 }
diff --git a/app/operations/gimpdesaturateconfig.c b/app/operations/gimpdesaturateconfig.c
index c7646ed..d4c1d33 100644
--- a/app/operations/gimpdesaturateconfig.c
+++ b/app/operations/gimpdesaturateconfig.c
@@ -29,6 +29,8 @@
 
 #include "gimpdesaturateconfig.h"
 
+#include "gimp-intl.h"
+
 
 enum
 {
@@ -68,7 +70,7 @@ gimp_desaturate_config_class_init (GimpDesaturateConfigClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_MODE,
                                  "mode",
-                                 "Desaturate mode",
+                                 _("Desaturate mode"),
                                  GIMP_TYPE_DESATURATE_MODE,
                                  GIMP_DESATURATE_LIGHTNESS, 0);
 }
diff --git a/app/operations/gimphuesaturationconfig.c b/app/operations/gimphuesaturationconfig.c
index 7cbf12f..46d03c8 100644
--- a/app/operations/gimphuesaturationconfig.c
+++ b/app/operations/gimphuesaturationconfig.c
@@ -30,6 +30,8 @@
 
 #include "gimphuesaturationconfig.h"
 
+#include "gimp-intl.h"
+
 
 enum
 {
@@ -89,28 +91,28 @@ gimp_hue_saturation_config_class_init (GimpHueSaturationConfigClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_RANGE,
                                  "range",
-                                 "The affected range",
+                                 _("The affected range"),
                                  GIMP_TYPE_HUE_RANGE,
                                  GIMP_ALL_HUES, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_HUE,
                                    "hue",
-                                   "Hue",
+                                   _("Hue"),
                                    -1.0, 1.0, 0.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_SATURATION,
                                    "saturation",
-                                   "Saturation",
+                                   _("Saturation"),
                                    -1.0, 1.0, 0.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_LIGHTNESS,
                                    "lightness",
-                                   "Lightness",
+                                   _("Lightness"),
                                    -1.0, 1.0, 0.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_OVERLAP,
                                    "overlap",
-                                   "Overlap",
+                                   _("Overlap"),
                                    0.0, 1.0, 0.0, 0);
 }
 
diff --git a/app/operations/gimplevelsconfig.c b/app/operations/gimplevelsconfig.c
index 957e484..f433e0b 100644
--- a/app/operations/gimplevelsconfig.c
+++ b/app/operations/gimplevelsconfig.c
@@ -103,33 +103,33 @@ gimp_levels_config_class_init (GimpLevelsConfigClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_CHANNEL,
                                  "channel",
-                                 "The affected channel",
+                                 _("The affected channel"),
                                  GIMP_TYPE_HISTOGRAM_CHANNEL,
                                  GIMP_HISTOGRAM_VALUE, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_GAMMA,
                                    "gamma",
-                                   "Gamma",
+                                   _("Gamma"),
                                    0.1, 10.0, 1.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_LOW_INPUT,
                                    "low-input",
-                                   "Low Input",
+                                   _("Low Input"),
                                    0.0, 1.0, 0.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_HIGH_INPUT,
                                    "high-input",
-                                   "High Input",
+                                   _("High Input"),
                                    0.0, 1.0, 1.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_LOW_OUTPUT,
                                    "low-output",
-                                   "Low Output",
+                                   _("Low Output"),
                                    0.0, 1.0, 0.0, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_HIGH_OUTPUT,
                                    "high-output",
-                                   "High Output",
+                                   _("High Output"),
                                    0.0, 1.0, 1.0, 0);
 }
 
diff --git a/app/operations/gimpthresholdconfig.c b/app/operations/gimpthresholdconfig.c
index 4a19fac..d355836 100644
--- a/app/operations/gimpthresholdconfig.c
+++ b/app/operations/gimpthresholdconfig.c
@@ -29,6 +29,8 @@
 
 #include "gimpthresholdconfig.h"
 
+#include "gimp-intl.h"
+
 
 enum
 {
@@ -68,12 +70,12 @@ gimp_threshold_config_class_init (GimpThresholdConfigClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_LOW,
                                    "low",
-                                   "Low threshold",
+                                   _("Low threshold"),
                                    0.0, 1.0, 0.5, 0);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_HIGH,
                                    "high",
-                                   "High threshold",
+                                   _("High threshold"),
                                    0.0, 1.0, 1.0, 0);
 }
 
diff --git a/app/tools/gimpalignoptions.c b/app/tools/gimpalignoptions.c
index bddbddd..efd6c82 100644
--- a/app/tools/gimpalignoptions.c
+++ b/app/tools/gimpalignoptions.c
@@ -89,20 +89,20 @@ gimp_align_options_class_init (GimpAlignOptionsClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_ALIGN_REFERENCE,
                                  "align-reference",
-                                 N_("Reference image object a layer will be aligned on"),
+                                 _("Reference image object a layer will be aligned on"),
                                  GIMP_TYPE_ALIGN_REFERENCE_TYPE,
                                  GIMP_ALIGN_REFERENCE_FIRST,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_OFFSET_X,
                                    "offset-x",
-                                   N_("Horizontal offset for distribution"),
+                                   _("Horizontal offset for distribution"),
                                    -GIMP_MAX_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE, 0,
                                    GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_OFFSET_Y,
                                    "offset-y",
-                                   N_("Vertical offset for distribution"),
+                                   _("Vertical offset for distribution"),
                                    -GIMP_MAX_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE, 0,
                                    GIMP_PARAM_STATIC_STRINGS);
 }
diff --git a/app/tools/gimpbucketfilloptions.c b/app/tools/gimpbucketfilloptions.c
index 94096be..ccef99a 100644
--- a/app/tools/gimpbucketfilloptions.c
+++ b/app/tools/gimpbucketfilloptions.c
@@ -91,29 +91,29 @@ gimp_bucket_fill_options_class_init (GimpBucketFillOptionsClass *klass)
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_FILL_SELECTION,
                                     "fill-selection",
-                                    N_("Which area will be filled"),
+                                    _("Which area will be filled"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_FILL_TRANSPARENT,
                                     "fill-transparent",
-                                    N_("Allow completely transparent regions "
-                                       "to be filled"),
+                                    _("Allow completely transparent regions "
+                                      "to be filled"),
                                     TRUE,
                                     GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
                                     "sample-merged",
-                                    N_("Base filled area on all visible "
-                                       "layers"),
+                                    _("Base filled area on all visible "
+                                      "layers"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_THRESHOLD,
                                    "threshold",
-                                   N_("Maximum color difference"),
+                                   _("Maximum color difference"),
                                    0.0, 255.0, 15.0,
                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_FILL_CRITERION,
                                  "fill-criterion",
-                                 N_("Criterion used for determining color similarity"),
+                                 _("Criterion used for determining color similarity"),
                                  GIMP_TYPE_SELECT_CRITERION,
                                  GIMP_SELECT_CRITERION_COMPOSITE,
                                  GIMP_PARAM_STATIC_STRINGS);
diff --git a/app/tools/gimpcolorpickeroptions.c b/app/tools/gimpcolorpickeroptions.c
index ca9b595..42944d4 100644
--- a/app/tools/gimpcolorpickeroptions.c
+++ b/app/tools/gimpcolorpickeroptions.c
@@ -66,20 +66,20 @@ gimp_color_picker_options_class_init (GimpColorPickerOptionsClass *klass)
   /* override a GimpColorOptions property to get a different default value */
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SAMPLE_AVERAGE,
                                     "sample-average",
-                                    N_("Use accumulated color value from "
-                                       "all composited visible layers"),
+                                    _("Use accumulated color value from "
+                                      "all composited visible layers"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_PICK_MODE,
                                  "pick-mode",
-                                 N_("Choose what color picker will do"),
+                                 _("Choose what color picker will do"),
                                  GIMP_TYPE_COLOR_PICK_MODE,
                                  GIMP_COLOR_PICK_MODE_FOREGROUND,
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_USE_INFO_WINDOW,
                                     "use-info-window",
-                                    N_("Open a floating dialog to view picked "
-                                       "color values in various color models"),
+                                    _("Open a floating dialog to view picked "
+                                      "color values in various color models"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 }
diff --git a/app/tools/gimpcropoptions.c b/app/tools/gimpcropoptions.c
index deccfd2..c158dc5 100644
--- a/app/tools/gimpcropoptions.c
+++ b/app/tools/gimpcropoptions.c
@@ -74,20 +74,20 @@ gimp_crop_options_class_init (GimpCropOptionsClass *klass)
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class,
                                     GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT,
                                     "highlight",
-                                    N_("Dim everything outside selection"),
+                                    _("Dim everything outside selection"),
                                     TRUE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_LAYER_ONLY,
                                     "layer-only",
-                                    N_("Crop only currently selected layer"),
+                                    _("Crop only currently selected layer"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ALLOW_GROWING,
                                     "allow-growing",
-                                    N_("Allow resizing canvas by dragging cropping frame "
-                                       "beyond image boundary"),
+                                    _("Allow resizing canvas by dragging cropping frame "
+                                      "beyond image boundary"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
diff --git a/app/tools/gimpforegroundselectoptions.c b/app/tools/gimpforegroundselectoptions.c
index 5c81da8..43ff720 100644
--- a/app/tools/gimpforegroundselectoptions.c
+++ b/app/tools/gimpforegroundselectoptions.c
@@ -81,47 +81,47 @@ gimp_foreground_select_options_class_init (GimpForegroundSelectOptionsClass *kla
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_DRAW_MODE,
                                  "draw-mode",
-                                 N_("Paint over areas to mark color values for "
-                                    "inclusion or exclusion from selection"),
+                                 _("Paint over areas to mark color values for "
+                                   "inclusion or exclusion from selection"),
                                  GIMP_TYPE_MATTING_DRAW_MODE,
                                  GIMP_MATTING_DRAW_MODE_FOREGROUND,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_INT  (object_class, PROP_STROKE_WIDTH,
                                  "stroke-width",
-                                 N_("Size of the brush used for refinements"),
+                                 _("Size of the brush used for refinements"),
                                  1, 6000, 10,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_MASK_COLOR,
                                  "mask-color",
-                                 N_("Color of selection preview mask"),
+                                 _("Color of selection preview mask"),
                                  GIMP_TYPE_CHANNEL_TYPE,
                                  GIMP_BLUE_CHANNEL,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_ENGINE,
                                  "engine",
-                                 N_("Matting engine to use"),
+                                 _("Matting engine to use"),
                                  GIMP_TYPE_MATTING_ENGINE,
                                  GIMP_MATTING_ENGINE_GLOBAL,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_INT  (object_class, PROP_LEVELS,
                                  "levels",
-                                 N_("Parameter for matting-levin"),
+                                 _("Parameter for matting-levin"),
                                  1, 10, 2,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_INT  (object_class, PROP_ACTIVE_LEVELS,
                                  "active-levels",
-                                 N_("Parameter for matting-levin"),
+                                 _("Parameter for matting-levin"),
                                  1, 10, 2,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_INT  (object_class, PROP_ITERATIONS,
                                  "iterations",
-                                 N_("Parameter for matting-global"),
+                                 _("Parameter for matting-global"),
                                  1, 10, 2,
                                  GIMP_PARAM_STATIC_STRINGS);
 }
diff --git a/app/tools/gimpmagnifyoptions.c b/app/tools/gimpmagnifyoptions.c
index 0a77d58..78f8c19 100644
--- a/app/tools/gimpmagnifyoptions.c
+++ b/app/tools/gimpmagnifyoptions.c
@@ -77,14 +77,14 @@ gimp_magnify_options_class_init (GimpMagnifyOptionsClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_AUTO_RESIZE,
                                     "auto-resize",
-                                    N_("Resize image window to accommodate "
-                                       "new zoom level"),
+                                    _("Resize image window to accommodate "
+                                      "new zoom level"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_ZOOM_TYPE,
                                  "zoom-type",
-                                 N_("Direction of magnification"),
+                                 _("Direction of magnification"),
                                  GIMP_TYPE_ZOOM_TYPE,
                                  GIMP_ZOOM_IN,
                                  GIMP_PARAM_STATIC_STRINGS);
diff --git a/app/tools/gimprectangleselectoptions.c b/app/tools/gimprectangleselectoptions.c
index 2454610..3ff19a3 100644
--- a/app/tools/gimprectangleselectoptions.c
+++ b/app/tools/gimprectangleselectoptions.c
@@ -75,19 +75,19 @@ gimp_rectangle_select_options_class_init (GimpRectangleSelectOptionsClass *klass
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class,
                                     GIMP_RECTANGLE_OPTIONS_PROP_HIGHLIGHT,
                                     "highlight",
-                                    N_("Dim everything outside selection"),
+                                    _("Dim everything outside selection"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ROUND_CORNERS,
                                     "round-corners",
-                                    N_("Round corners of selection"),
+                                    _("Round corners of selection"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_CORNER_RADIUS,
                                    "corner-radius",
-                                   N_("Radius of rounding in pixels"),
+                                   _("Radius of rounding in pixels"),
                                    0.0, 100.0, 5.0,
                                    GIMP_PARAM_STATIC_STRINGS);
 
diff --git a/app/tools/gimpregionselectoptions.c b/app/tools/gimpregionselectoptions.c
index be8713e..e90c8d7 100644
--- a/app/tools/gimpregionselectoptions.c
+++ b/app/tools/gimpregionselectoptions.c
@@ -80,26 +80,26 @@ gimp_region_select_options_class_init (GimpRegionSelectOptionsClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SELECT_TRANSPARENT,
                                     "select-transparent",
-                                    N_("Allow completely transparent regions "
-                                       "to be selected"),
+                                    _("Allow completely transparent regions "
+                                      "to be selected"),
                                     TRUE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
                                     "sample-merged",
-                                    N_("Base selection on all visible layers"),
+                                    _("Base selection on all visible layers"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_THRESHOLD,
                                    "threshold",
-                                   N_("Maximum color difference"),
+                                   _("Maximum color difference"),
                                    0.0, 255.0, 15.0,
                                    GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_SELECT_CRITERION,
                                  "select-criterion",
-                                 N_("Selection criterion"),
+                                 _("Selection criterion"),
                                  GIMP_TYPE_SELECT_CRITERION,
                                  GIMP_SELECT_CRITERION_COMPOSITE,
                                  GIMP_PARAM_STATIC_STRINGS);
diff --git a/app/tools/gimpseamlesscloneoptions.c b/app/tools/gimpseamlesscloneoptions.c
index 3589cba..e7f1342 100644
--- a/app/tools/gimpseamlesscloneoptions.c
+++ b/app/tools/gimpseamlesscloneoptions.c
@@ -69,7 +69,7 @@ gimp_seamless_clone_options_class_init (GimpSeamlessCloneOptionsClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_INT  (object_class, PROP_MAX_REFINE_STEPS,
                                  "max-refine-steps",
-                                 N_("Maximal amount of refinement points to be used for the interpolation 
mesh"),
+                                 _("Maximal amount of refinement points to be used for the interpolation 
mesh"),
                                  0, 100000, 2000,
                                  GIMP_PARAM_STATIC_STRINGS);
 }
diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c
index d43b01e..7aa418b 100644
--- a/app/tools/gimpselectionoptions.c
+++ b/app/tools/gimpselectionoptions.c
@@ -76,19 +76,19 @@ gimp_selection_options_class_init (GimpSelectionOptionsClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
                                     "antialias",
-                                    N_("Smooth edges"),
+                                    _("Smooth edges"),
                                     TRUE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_FEATHER,
                                     "feather",
-                                    N_("Enable feathering of selection edges"),
+                                    _("Enable feathering of selection edges"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_FEATHER_RADIUS,
                                    "feather-radius",
-                                   N_("Radius of feathering"),
+                                   _("Radius of feathering"),
                                    0.0, 100.0, 10.0,
                                    GIMP_PARAM_STATIC_STRINGS);
 }
diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c
index dc3b21c..bb5b478 100644
--- a/app/tools/gimptextoptions.c
+++ b/app/tools/gimptextoptions.c
@@ -129,12 +129,12 @@ gimp_text_options_class_init (GimpTextOptionsClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_UNIT (object_class, PROP_UNIT,
                                  "font-size-unit",
-                                 N_("Font size unit"),
+                                 _("Font size unit"),
                                  TRUE, FALSE, GIMP_UNIT_PIXEL,
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_FONT_SIZE,
                                    "font-size",
-                                   N_("Font size"),
+                                   _("Font size"),
                                    0.0, 8192.0, 18.0,
                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
@@ -143,16 +143,16 @@ gimp_text_options_class_init (GimpTextOptionsClass *klass)
                                     GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_HINT_STYLE,
                                  "hint-style",
-                                 N_("Hinting alters the font outline to "
-                                    "produce a crisp bitmap at small "
-                                    "sizes"),
+                                 _("Hinting alters the font outline to "
+                                   "produce a crisp bitmap at small "
+                                   "sizes"),
                                  GIMP_TYPE_TEXT_HINT_STYLE,
                                  GIMP_TEXT_HINT_STYLE_MEDIUM,
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_LANGUAGE,
                                    "language",
-                                   N_("The text language may have an effect "
-                                      "on the way the text is rendered."),
+                                   _("The text language may have an effect "
+                                     "on the way the text is rendered."),
                                    (const gchar *) gtk_get_default_language (),
                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_BASE_DIR,
@@ -162,40 +162,40 @@ gimp_text_options_class_init (GimpTextOptionsClass *klass)
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_JUSTIFICATION,
                                 "justify",
-                                N_("Text alignment"),
+                                _("Text alignment"),
                                  GIMP_TYPE_TEXT_JUSTIFICATION,
                                  GIMP_TEXT_JUSTIFY_LEFT,
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_INDENTATION,
                                    "indent",
-                                   N_("Indentation of the first line"),
+                                   _("Indentation of the first line"),
                                    -8192.0, 8192.0, 0.0,
                                    GIMP_PARAM_STATIC_STRINGS |
                                    GIMP_CONFIG_PARAM_DEFAULTS);
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_LINE_SPACING,
                                    "line-spacing",
-                                   N_("Adjust line spacing"),
+                                   _("Adjust line spacing"),
                                    -8192.0, 8192.0, 0.0,
                                    GIMP_PARAM_STATIC_STRINGS |
                                    GIMP_CONFIG_PARAM_DEFAULTS);
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_LETTER_SPACING,
                                    "letter-spacing",
-                                   N_("Adjust letter spacing"),
+                                   _("Adjust letter spacing"),
                                    -8192.0, 8192.0, 0.0,
                                    GIMP_PARAM_STATIC_STRINGS |
                                    GIMP_CONFIG_PARAM_DEFAULTS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_BOX_MODE,
                                 "box-mode",
-                                 N_("Whether text flows into rectangular shape or "
-                                    "moves into a new line when you press Enter"),
+                                 _("Whether text flows into rectangular shape or "
+                                   "moves into a new line when you press Enter"),
                                  GIMP_TYPE_TEXT_BOX_MODE,
                                  GIMP_TEXT_BOX_DYNAMIC,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_USE_EDITOR,
                                     "use-editor",
-                                    N_("Use an external editor window for text "
-                                       "entry"),
+                                    _("Use an external editor window for text "
+                                      "entry"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
diff --git a/app/tools/gimptransformoptions.c b/app/tools/gimptransformoptions.c
index ff607f9..4cc1e25 100644
--- a/app/tools/gimptransformoptions.c
+++ b/app/tools/gimptransformoptions.c
@@ -107,41 +107,42 @@ gimp_transform_options_class_init (GimpTransformOptionsClass *klass)
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_DIRECTION,
                                  "direction",
-                                 N_("Direction of transformation"),
+                                 _("Direction of transformation"),
                                  GIMP_TYPE_TRANSFORM_DIRECTION,
                                  GIMP_TRANSFORM_FORWARD,
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_INTERPOLATION,
                                  "interpolation",
-                                 N_("Interpolation method"),
+                                 _("Interpolation method"),
                                  GIMP_TYPE_INTERPOLATION_TYPE,
                                  GIMP_INTERPOLATION_LINEAR,
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_CLIP,
                                  "clip",
-                                 N_("How to clip"),
+                                 _("How to clip"),
                                  GIMP_TYPE_TRANSFORM_RESIZE,
                                  GIMP_TRANSFORM_RESIZE_ADJUST,
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_PREVIEW,
                                     "show-preview",
-                                    N_("Show a preview of the transformed image"),
+                                    _("Show a preview of the transformed image"),
                                     TRUE,
                                     GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_PREVIEW_OPACITY,
                                    "preview-opacity",
-                                   N_("Opacity of the preview image"),
+                                   _("Opacity of the preview image"),
                                    0.0, 1.0, 1.0,
                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_GRID_TYPE,
                                  "grid-type",
-                                 N_("Composition guides such as rule of thirds"),
+                                 _("Composition guides such as rule of thirds"),
                                  GIMP_TYPE_GUIDES_TYPE,
                                  GIMP_GUIDES_N_LINES,
                                  GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_GRID_SIZE,
                                 "grid-size",
-                                N_("Size of a grid cell for variable number of composition guides"),
+                                _("Size of a grid cell for variable number "
+                                  "of composition guides"),
                                 1, 128, 15,
                                 GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_CONSTRAIN_MOVE,
diff --git a/app/tools/gimpwarpoptions.c b/app/tools/gimpwarpoptions.c
index ddaadbd..df1d650 100644
--- a/app/tools/gimpwarpoptions.c
+++ b/app/tools/gimpwarpoptions.c
@@ -72,23 +72,26 @@ gimp_warp_options_class_init (GimpWarpOptionsClass *klass)
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_BEHAVIOR,
                                  "behavior",
-                                 N_("Behavior"),
+                                 _("Behavior"),
                                  GIMP_TYPE_WARP_BEHAVIOR,
                                  GIMP_WARP_BEHAVIOR_MOVE,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_EFFECT_STRENGTH,
-                                   "effect-strength", _("Effect Strength"),
+                                   "effect-strength",
+                                   _("Effect Strength"),
                                    1.0, 100.0, 50.0,
                                    GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_EFFECT_SIZE,
-                                   "effect-size", _("Effect Size"),
+                                   "effect-size",
+                                   _("Effect Size"),
                                    1.0, 10000.0, 40.0,
                                    GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_EFFECT_HARDNESS,
-                                   "effect-hardness", _("Effect Hardness"),
+                                   "effect-hardness",
+                                   _("Effect Hardness"),
                                    0.0, 1.0, 0.5,
                                    GIMP_PARAM_STATIC_STRINGS);
 }
diff --git a/app/widgets/gimppropwidgets.c b/app/widgets/gimppropwidgets.c
index 5bd68a9..2a1fc27 100644
--- a/app/widgets/gimppropwidgets.c
+++ b/app/widgets/gimppropwidgets.c
@@ -1516,7 +1516,7 @@ set_param_spec (GObject     *object,
       const gchar *blurb = g_param_spec_get_blurb (param_spec);
 
       if (blurb)
-        gimp_help_set_help_data (widget, gettext (blurb), NULL);
+        gimp_help_set_help_data (widget, blurb, NULL);
     }
 }
 
diff --git a/libgimpconfig/gimpcolorconfig.c b/libgimpconfig/gimpcolorconfig.c
index 7698337..fc32f73 100644
--- a/libgimpconfig/gimpcolorconfig.c
+++ b/libgimpconfig/gimpcolorconfig.c
@@ -50,41 +50,40 @@
 
 
 #define COLOR_MANAGEMENT_MODE_BLURB \
-  N_("Mode of operation for color management.")
+  _("Mode of operation for color management.")
 #define DISPLAY_PROFILE_BLURB \
-  N_("The color profile of your (primary) monitor.")
+  _("The color profile of your (primary) monitor.")
 #define DISPLAY_PROFILE_FROM_GDK_BLURB \
-  N_("When enabled, GIMP will try to use the display color profile from " \
-     "the windowing system.  The configured monitor profile is then only " \
-     "used as a fallback.")
+  _("When enabled, GIMP will try to use the display color profile from " \
+    "the windowing system.  The configured monitor profile is then only " \
+    "used as a fallback.")
 #define RGB_PROFILE_BLURB \
-  N_("The default RGB working space color profile.")
+  _("The default RGB working space color profile.")
 #define CMYK_PROFILE_BLURB \
-  N_("The CMYK color profile used to convert between RGB and CMYK.")
+  _("The CMYK color profile used to convert between RGB and CMYK.")
 #define PRINTER_PROFILE_BLURB \
-  N_("The color profile to use for soft proofing from your image's " \
-     "color space to some other color space, including " \
-     "soft proofing to a printer or other output device profile. ")
+  _("The color profile to use for soft proofing from your image's " \
+    "color space to some other color space, including "             \
+    "soft proofing to a printer or other output device profile. ")
 #define DISPLAY_RENDERING_INTENT_BLURB \
-  N_("How colors are converted from your image's color space to your display device. " \
-     "Relative colorimetric is usually the best choice. " \
-     "Unless you use a LUT monitor profile (most monitor profiles are matrix), " \
-     "choosing perceptual intent really gives you relative colorimetric." )
+  _("How colors are converted from your image's color space to your display device. " \
+    "Relative colorimetric is usually the best choice. "                \
+    "Unless you use a LUT monitor profile (most monitor profiles are matrix), " \
+    "choosing perceptual intent really gives you relative colorimetric." )
 #define DISPLAY_USE_BPC_BLURB \
-  N_("Do use black point compensation (unless you know you have a reason not to). ")
-#define SIMULATION_RENDERING_INTENT_BLURB \
-  N_("How colors are converted from your image's color space to the " \
-     "output simulation device (usually your monitor). " \
-     "Try them all and choose what looks the best. ")
-#define SIMULATION_USE_BPC_BLURB \
-  N_("Try with and without black point compensation "\
-     "and choose what looks best. ")
-#define SIMULATION_GAMUT_CHECK_BLURB \
-  N_("When enabled, the print simulation will mark colors " \
-     "which can not be represented in the target color space.")
-#define OUT_OF_GAMUT_COLOR_BLURB \
-  N_("The color to use for marking colors which are out of gamut.")
-
+  _("Do use black point compensation (unless you know you have a reason not to). ")
+#define SIMULATION_RENDERING_INTENT_BLURB                             \
+  _("How colors are converted from your image's color space to the "  \
+    "output simulation device (usually your monitor). "               \
+    "Try them all and choose what looks the best. ")
+#define SIMULATION_USE_BPC_BLURB                        \
+  _("Try with and without black point compensation "\
+    "and choose what looks best. ")
+#define SIMULATION_GAMUT_CHECK_BLURB                        \
+  _("When enabled, the print simulation will mark colors " \
+    "which can not be represented in the target color space.")
+#define OUT_OF_GAMUT_COLOR_BLURB                                        \
+  _("The color to use for marking colors which are out of gamut.")
 
 
 enum
diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c
index b58e6a2..53977eb 100644
--- a/libgimpwidgets/gimppropwidgets.c
+++ b/libgimpwidgets/gimppropwidgets.c
@@ -1225,8 +1225,7 @@ gimp_prop_scale_entry_new (GObject     *config,
                             param_spec, &value, &lower, &upper, G_STRFUNC))
     return NULL;
 
-  tooltip = dgettext (gimp_type_get_translation_domain (G_OBJECT_TYPE (config)),
-                      g_param_spec_get_blurb (param_spec));
+  tooltip = g_param_spec_get_blurb (param_spec);
 
   if (! limit_scale)
     {
@@ -3921,12 +3920,7 @@ set_param_spec (GObject     *object,
       const gchar *blurb = g_param_spec_get_blurb (param_spec);
 
       if (blurb)
-        {
-          const gchar *domain;
-
-          domain = gimp_type_get_translation_domain (param_spec->owner_type);
-          gimp_help_set_help_data (widget, dgettext (domain, blurb), NULL);
-        }
+        gimp_help_set_help_data (widget, blurb, NULL);
     }
 }
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8f6b339..55eead9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -236,12 +236,18 @@ app/file/file-utils.c
 app/gegl/gimp-babl.c
 app/gegl/gimp-gegl-enums.c
 
+app/operations/gimpbrightnesscontrastconfig.c
+app/operations/gimpcolorbalanceconfig.c
+app/operations/gimpcolorizeconfig.c
 app/operations/gimpcurvesconfig.c
+app/operations/gimpdesaturateconfig.c
+app/operations/gimphuesaturationconfig.c
 app/operations/gimplevelsconfig.c
 app/operations/gimpoperationcagecoefcalc.c
 app/operations/gimpoperationcagetransform.c
 app/operations/gimpoperationsemiflatten.c
 app/operations/gimpoperationthresholdalpha.c
+app/operations/gimpthresholdconfig.c
 
 app/gui/gui.c
 app/gui/gui-message.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]