Commit 357cf155 authored by Ari Pollak's avatar Ari Pollak

Imported Upstream version 2.6.11

parent 04341c96
This diff is collapsed.
......@@ -7,6 +7,34 @@ This is the stable branch of GIMP. No new features are being added
here, just bug-fixes.
Overview of Changes from GIMP 2.6.10 to GIMP 2.6.11
===================================================
* Bugs fixed:
631199 - Printing and Print preview broken with cairo 1.10
572865 - Parasite handling had problems and can cause crashing
628893 - Error with string-append and gimp-drawable-get-name
623850 - (Paco) Recursive Gaussian Filter error
624487 - Fix incorrect "wrap mode" documentation values in Edge plug-in
557380 - Difference of Gaussians gives blank doc if "Invert" selected
627009 - Image type filter doesn't include .rgba SGI files
626020 - Console window opening on file-ps-load
624698 - Wood 1 and Wood 2 have bad alpha value
624275 - Image saved from google docs generates a
'gimp-image-set-resolution' error message
* Updated translations:
German (de)
Spanish (es)
Italian (it)
Japanese (ja)
Romanian (ro)
Chinese (Hong Kong) (zh_HK)
Chinese (Taiwan) (zh_HK)
Overview of Changes from GIMP 2.6.9 to GIMP 2.6.10
==================================================
......
......@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
[m4_warning([this file was generated for autoconf 2.65.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......
......@@ -64,6 +64,10 @@
#include "version.h"
#ifdef G_OS_WIN32
/* To get PROCESS_DEP_* defined we need _WIN32_WINNT at 0x0601. We still
* use the API optionally only if present, though.
*/
#define _WIN32_WINNT 0x0601
#include <windows.h>
#include <conio.h>
#endif
......@@ -288,6 +292,30 @@ main (int argc,
argv = __argv;
#endif
#ifdef G_OS_WIN32
/* Reduce risks */
{
typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName);
t_SetDllDirectoryA p_SetDllDirectoryA;
p_SetDllDirectoryA = GetProcAddress (GetModuleHandle ("kernel32.dll"),
"SetDllDirectoryA");
if (p_SetDllDirectoryA)
(*p_SetDllDirectoryA) ("");
}
#ifndef _WIN64
{
typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags);
t_SetProcessDEPPolicy p_SetProcessDEPPolicy;
p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandle ("kernel32.dll"),
"SetProcessDEPPolicy");
if (p_SetProcessDEPPolicy)
(*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE|PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
}
#endif
#endif
g_thread_init (NULL);
#ifdef GIMP_UNSTABLE
......
......@@ -581,17 +581,27 @@ gimp_plug_in_handle_proc_return (GimpPlugIn *plug_in,
g_return_if_fail (proc_return != NULL);
proc_frame->return_vals =
plug_in_params_to_args (proc_frame->procedure->values,
proc_frame->procedure->num_values,
proc_return->params,
proc_return->nparams,
TRUE, TRUE);
if (proc_frame->main_loop)
{
proc_frame->return_vals =
plug_in_params_to_args (proc_frame->procedure->values,
proc_frame->procedure->num_values,
proc_return->params,
proc_return->nparams,
TRUE, TRUE);
g_main_loop_quit (proc_frame->main_loop);
}
else
{
/* the plug-in is run asynchronously, so display its error
* messages here because nobody else will do it
*/
gimp_plug_in_procedure_handle_return_values (GIMP_PLUG_IN_PROCEDURE (proc_frame->procedure),
plug_in->manager->gimp,
proc_frame->progress,
proc_frame->return_vals);
}
gimp_plug_in_close (plug_in, FALSE);
}
......
This diff is collapsed.
......@@ -8,11 +8,11 @@ AC_PREREQ(2.54)
m4_define([gimp_major_version], [2])
m4_define([gimp_minor_version], [6])
m4_define([gimp_micro_version], [10])
m4_define([gimp_micro_version], [11])
m4_define([gimp_real_version],
[gimp_major_version.gimp_minor_version.gimp_micro_version])
m4_define([gimp_version], [gimp_real_version])
m4_define([gimp_interface_age], [10])
m4_define([gimp_interface_age], [11])
m4_define([gimp_binary_age],
[m4_eval(100 * gimp_minor_version + gimp_micro_version)])
......@@ -841,7 +841,10 @@ AC_MSG_CHECKING([whether symbols are prefixed])
case "$host_os" in
mingw*)
SYMPREFIX='_'
case "$host_cpu" in
x86_64) SYMPREFIX='' ;;
*) SYMPREFIX='_' ;;
esac
;;
darwin* | rhapsody* | machten*)
SYMPREFIX='_'
......
......@@ -3,4 +3,4 @@ Name: Wood 1
3
0.000000 0.252087 0.555927 1.000000 0.700000 0.400000 1.000000 0.920000 0.579600 0.239200 1.000000 3 0
0.555927 0.834725 0.981636 0.920000 0.579600 0.239200 1.000000 0.000000 0.000000 0.000000 1.000000 4 0
0.981636 0.991653 1.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 4 0
0.981636 0.991653 1.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 1.000000 4 0
......@@ -9,4 +9,4 @@ Name: Wood 2
0.662354 0.715568 0.768781 0.810000 0.510300 0.210600 1.000000 0.850329 0.535708 0.221086 1.000000 4 0
0.768781 0.821995 0.875209 0.760000 0.478800 0.197600 1.000000 0.708598 0.446417 0.184235 1.000000 4 0
0.875209 0.928422 0.981636 0.620000 0.390600 0.161200 1.000000 0.000000 0.000000 0.000000 1.000000 4 0
0.981636 0.991653 1.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 4 0
0.981636 0.991653 1.000000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 1.000000 4 0
......@@ -85,6 +85,7 @@
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
# define STRICT
# define _WIN32_WINNT 0x0601
# include <windows.h>
# undef RGB
# define USE_WIN32_SHM 1
......@@ -237,6 +238,28 @@ gimp_main (const GimpPlugInInfo *info,
#ifdef G_OS_WIN32
gint i, j, k;
/* Reduce risks */
{
typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName);
t_SetDllDirectoryA p_SetDllDirectoryA;
p_SetDllDirectoryA = GetProcAddress (GetModuleHandle ("kernel32.dll"),
"SetDllDirectoryA");
if (p_SetDllDirectoryA)
(*p_SetDllDirectoryA) ("");
}
#ifndef _WIN64
{
typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags);
t_SetProcessDEPPolicy p_SetProcessDEPPolicy;
p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandle ("kernel32.dll"),
"SetProcessDEPPolicy");
if (p_SetProcessDEPPolicy)
(*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE|PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
}
#endif
/* Check for exe file name with spaces in the path having been split up
* by buggy NT C runtime, or something. I don't know why this happens
* on NT (including w2k), but not on w95/98.
......
......@@ -11,8 +11,8 @@ G_BEGIN_DECLS
#define GIMP_MAJOR_VERSION (2)
#define GIMP_MINOR_VERSION (6)
#define GIMP_MICRO_VERSION (10)
#define GIMP_VERSION "2.6.10"
#define GIMP_MICRO_VERSION (11)
#define GIMP_VERSION "2.6.11"
#define GIMP_API_VERSION "2.0"
#define GIMP_CHECK_VERSION(major, minor, micro) \
(GIMP_MAJOR_VERSION > (major) || \
......
......@@ -599,7 +599,7 @@ gausssmooth (gfloat *in, gfloat *out, gint size, gint rowstride, gauss3_coefs *c
w2[size+3]= w1[size+3];
for (i = size, n = i; i >= 0; i--, n--)
{
w2[n]= out[i * rowstride] = (gfloat)(c->B*w1[n] +
w2[n]= out[i * rowstride] = (gfloat)(c->B*w1[n+3] +
((c->b[1]*w2[n+1] +
c->b[2]*w2[n+2] +
c->b[3]*w2[n+3] ) / c->b[0]));
......
......@@ -70,8 +70,10 @@ static void compute_difference (GimpDrawable *drawable,
GimpDrawable *drawable2,
guchar *maxval);
static void normalize (GimpDrawable *drawable,
guint maxval);
static void normalize_invert (GimpDrawable *drawable,
gboolean normalize,
guint maxval,
gboolean invert);
static void dog (gint32 image_ID,
GimpDrawable *drawable,
......@@ -493,16 +495,16 @@ dog (gint32 image_ID,
gimp_drawable_merge_shadow (drawable_id, TRUE);
gimp_drawable_update (drawable_id, x1, y1, width, height);
if (dogvals.normalize)
if (dogvals.normalize || dogvals.invert)
/* gimp_invert doesn't work properly with previews due to shadow handling
* so reimplement it here - see Bug 557380
*/
{
normalize (drawable, maxval);
normalize_invert (drawable, dogvals.normalize, maxval, dogvals.invert);
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable_id, TRUE);
gimp_drawable_update (drawable_id, x1, y1, width, height);
}
if (dogvals.invert)
gimp_invert (drawable_id);
}
......@@ -593,8 +595,10 @@ compute_difference (GimpDrawable *drawable,
static void
normalize (GimpDrawable *drawable,
guint maxval)
normalize_invert (GimpDrawable *drawable,
gboolean normalize,
guint maxval,
gboolean invert)
{
GimpPixelRgn src_rgn, dest_rgn;
gint bpp;
......@@ -604,10 +608,11 @@ normalize (GimpDrawable *drawable,
gboolean has_alpha;
gdouble factor;
if (maxval == 0)
return;
if (normalize && maxval != 0) {
factor = 255.0 / maxval;
}
else
factor = 255.0 / maxval;
factor = 1.0;
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
bpp = drawable->bpp;
......@@ -640,12 +645,20 @@ normalize (GimpDrawable *drawable,
if (has_alpha)
{
for (k = 0; k < bpp-1; k++)
d[k] = factor * s[k];
{
d[k] = factor * s[k];
if (invert)
d[k] = 255 - d[k];
}
}
else
{
for (k = 0; k < bpp; k++)
d[k] = factor * s[k];
{
d[k] = factor * s[k];
if (invert)
d[k] = 255 - d[k];
}
}
s += bpp;
......
......@@ -137,8 +137,8 @@ query (void)
{ GIMP_PDB_IMAGE, "image", "Input image (unused)" },
{ GIMP_PDB_DRAWABLE, "drawable", "Input drawable" },
{ GIMP_PDB_FLOAT, "amount", "Edge detection amount" },
{ GIMP_PDB_INT32, "wrapmode", "Edge detection behavior: { WRAP (0), SMEAR (1), BLACK (2) }" },
{ GIMP_PDB_INT32, "edgemode", "Edge detection algorithm: { SOBEL (0), PREWITT (1), GRADIENT (2), ROBERTS (3), DIFFERENTIAL (4), LAPLACE (5) }" }
{ GIMP_PDB_INT32, "wrapmode", "Edge detection behavior { WRAP (1), SMEAR (2), BLACK (3) }" },
{ GIMP_PDB_INT32, "edgemode", "Edge detection algorithm { SOBEL (0), PREWITT (1), GRADIENT (2), ROBERTS (3), DIFFERENTIAL (4), LAPLACE (5) }" }
};
const gchar *help_string =
......
......@@ -897,7 +897,8 @@ load_image (const gchar *filename,
png_uint_32 yres;
gint unit_type;
if (png_get_pHYs (pp, info, &xres, &yres, &unit_type))
if (png_get_pHYs (pp, info,
&xres, &yres, &unit_type) && xres > 0 && yres > 0)
{
switch (unit_type)
{
......
......@@ -1748,7 +1748,9 @@ ps_open (const gchar *filename,
#else
/* Use a real outputfile. Wait until ghostscript has finished */
flags = G_SPAWN_SEARCH_PATH;
flags = G_SPAWN_SEARCH_PATH |
G_SPAWN_STDOUT_TO_DEV_NULL |
G_SPAWN_STDERR_TO_DEV_NULL;
if ( !g_spawn_sync (NULL, /* working dir */
pcmdA, /* command array */
......
......@@ -128,7 +128,7 @@ query (void)
gimp_register_file_handler_mime (LOAD_PROC, "image/x-sgi");
gimp_register_magic_load_handler (LOAD_PROC,
"sgi,rgb,bw,icon",
"sgi,rgb,rgba,bw,icon",
"",
"0,short,474");
......@@ -147,7 +147,7 @@ query (void)
NULL);
gimp_register_file_handler_mime (SAVE_PROC, "image/x-sgi");
gimp_register_save_handler (SAVE_PROC, "sgi,rgb,bw,icon", "");
gimp_register_save_handler (SAVE_PROC, "sgi,rgb,rgba,bw,icon", "");
}
static void
......
......@@ -240,6 +240,8 @@ print_cairo_surface_from_drawable (gint32 drawable_ID)
gimp_drawable_detach (drawable);
cairo_surface_mark_dirty (surface);
return surface;
}
......@@ -864,5 +864,7 @@ print_preview_get_thumbnail (GimpDrawable *drawable,
g_free (data);
cairo_surface_mark_dirty (surface);
return surface;
}
......@@ -1251,10 +1251,9 @@ script_fu_marshal_procedure_call (scheme *sc,
break;
}
args[i].data.d_parasite.size =
sc->vptr->ivalue (sc->vptr->pair_car (temp_val));
args[i].data.d_parasite.data =
sc->vptr->string_value (sc->vptr->pair_car (temp_val));
args[i].data.d_parasite.size = strlen (args[i].data.d_parasite.data);
#if DEBUG_MARSHALL
g_printerr (", size %d\n", args[i].data.d_parasite.size);
......@@ -1395,7 +1394,6 @@ script_fu_marshal_procedure_call (scheme *sc,
sc->vptr->mk_integer (sc,
values[i + 1].data.d_int32),
return_val);
set_safe_foreign (sc, return_val);
break;
case GIMP_PDB_INT16:
......@@ -1403,7 +1401,6 @@ script_fu_marshal_procedure_call (scheme *sc,
sc->vptr->mk_integer (sc,
values[i + 1].data.d_int16),
return_val);
set_safe_foreign (sc, return_val);
break;
case GIMP_PDB_INT8:
......@@ -1411,7 +1408,6 @@ script_fu_marshal_procedure_call (scheme *sc,
sc->vptr->mk_integer (sc,
values[i + 1].data.d_int8),
return_val);
set_safe_foreign (sc, return_val);
break;
case GIMP_PDB_FLOAT:
......@@ -1419,7 +1415,6 @@ script_fu_marshal_procedure_call (scheme *sc,
sc->vptr->mk_real (sc,
values[i + 1].data.d_float),
return_val);
set_safe_foreign (sc, return_val);
break;
case GIMP_PDB_STRING:
......@@ -1429,7 +1424,6 @@ script_fu_marshal_procedure_call (scheme *sc,
return_val = sc->vptr->cons (sc,
sc->vptr->mk_string (sc, string),
return_val);
set_safe_foreign (sc, return_val);
break;
case GIMP_PDB_INT32ARRAY:
......@@ -1438,15 +1432,14 @@ script_fu_marshal_procedure_call (scheme *sc,
gint32 *array = (gint32 *) values[i + 1].data.d_int32array;
pointer vector = sc->vptr->mk_vector (sc, num_int32s);
return_val = sc->vptr->cons (sc, vector, return_val);
set_safe_foreign (sc, return_val);
for (j = 0; j < num_int32s; j++)
{
sc->vptr->set_vector_elem (vector, j,
sc->vptr->mk_integer (sc,
array[j]));
}
return_val = sc->vptr->cons (sc, vector, return_val);
}
break;
......@@ -1456,15 +1449,14 @@ script_fu_marshal_procedure_call (scheme *sc,
gint16 *array = (gint16 *) values[i + 1].data.d_int16array;
pointer vector = sc->vptr->mk_vector (sc, num_int16s);
return_val = sc->vptr->cons (sc, vector, return_val);
set_safe_foreign (sc, return_val);
for (j = 0; j < num_int16s; j++)
{
sc->vptr->set_vector_elem (vector, j,
sc->vptr->mk_integer (sc,
array[j]));
}
return_val = sc->vptr->cons (sc, vector, return_val);
}
break;
......@@ -1474,15 +1466,14 @@ script_fu_marshal_procedure_call (scheme *sc,
guint8 *array = (guint8 *) values[i + 1].data.d_int8array;
pointer vector = sc->vptr->mk_vector (sc, num_int8s);
return_val = sc->vptr->cons (sc, vector, return_val);
set_safe_foreign (sc, return_val);
for (j = 0; j < num_int8s; j++)
{
sc->vptr->set_vector_elem (vector, j,
sc->vptr->mk_integer (sc,
array[j]));
}
return_val = sc->vptr->cons (sc, vector, return_val);
}
break;
......@@ -1492,15 +1483,14 @@ script_fu_marshal_procedure_call (scheme *sc,
gdouble *array = (gdouble *) values[i + 1].data.d_floatarray;
pointer vector = sc->vptr->mk_vector (sc, num_floats);
return_val = sc->vptr->cons (sc, vector, return_val);
set_safe_foreign (sc, return_val);
for (j = 0; j < num_floats; j++)
{
sc->vptr->set_vector_elem (vector, j,
sc->vptr->mk_real (sc,
array[j]));
}
return_val = sc->vptr->cons (sc, vector, return_val);
}
break;
......@@ -1510,9 +1500,6 @@ script_fu_marshal_procedure_call (scheme *sc,
gchar **array = (gchar **) values[i + 1].data.d_stringarray;
pointer list = sc->NIL;
return_val = sc->vptr->cons (sc, list, return_val);
set_safe_foreign (sc, return_val);
for (j = num_strings - 1; j >= 0; j--)
{
list = sc->vptr->cons (sc,
......@@ -1520,14 +1507,9 @@ script_fu_marshal_procedure_call (scheme *sc,
array[j] ?
array[j] : ""),
list);
/* hook the current list into return_val, so that it
* inherits the set_safe_foreign()-protection.
* May be removed when tinyscheme fixes the GC issue
* with foreign functions
*/
sc->vptr->set_car (return_val, list);
}
return_val = sc->vptr->cons (sc, list, return_val);
}
break;
......@@ -1548,7 +1530,6 @@ script_fu_marshal_procedure_call (scheme *sc,
return_val = sc->vptr->cons (sc,
temp_val,
return_val);
set_safe_foreign (sc, return_val);
break;
}
......@@ -1558,9 +1539,6 @@ script_fu_marshal_procedure_call (scheme *sc,
GimpRGB *array = (GimpRGB *) values[i + 1].data.d_colorarray;
pointer vector = sc->vptr->mk_vector (sc, num_colors);
return_val = sc->vptr->cons (sc, vector, return_val);
set_safe_foreign (sc, return_val);
for (j = 0; j < num_colors; j++)
{
guchar r, g, b;
......@@ -1575,11 +1553,10 @@ script_fu_marshal_procedure_call (scheme *sc,
sc->vptr->cons (sc,
sc->vptr->mk_integer (sc, b),
sc->NIL)));
return_val = sc->vptr->cons (sc,
temp_val,
return_val);
set_safe_foreign (sc, return_val);
sc->vptr->set_vector_elem (vector, j, temp_val);
}
return_val = sc->vptr->cons (sc, vector, return_val);
}
break;
......@@ -1605,7 +1582,6 @@ script_fu_marshal_procedure_call (scheme *sc,
return_val = sc->vptr->cons (sc,
temp_val,
return_val);
set_safe_foreign (sc, return_val);
break;
}
break;
......@@ -1619,6 +1595,8 @@ script_fu_marshal_procedure_call (scheme *sc,
else
{
GimpParasite *p = &values[i + 1].data.d_parasite;
gchar *data = g_strndup (p->data, p->size);
gint char_cnt = g_utf8_strlen (data, p->size);
pointer temp_val;
/* don't move the mk_foo() calls outside this function call,
......@@ -1630,13 +1608,13 @@ script_fu_marshal_procedure_call (scheme *sc,
sc->vptr->mk_integer (sc, p->flags),
sc->vptr->cons (sc,
sc->vptr->mk_counted_string (sc,
p->data,
p->size),
data,
char_cnt),
sc->NIL)));
return_val = sc->vptr->cons (sc,
temp_val,
return_val);
set_safe_foreign (sc, return_val);
g_free (data);
#if DEBUG_MARSHALL
g_printerr (" name '%s'\n", p->name);
......
......@@ -68,7 +68,6 @@ pointer args; /* register for arguments of function */
pointer envir; /* stack register for current environment */
pointer code; /* register for current code */
pointer dump; /* stack register for next evaluation */
pointer safe_foreign; /* register to avoid gc problems */
pointer foreign_error; /* used for foreign functions to signal an error */
int interactive_repl; /* are we in an interactive REPL? */
......
This diff is collapsed.
......@@ -164,8 +164,6 @@ void putstr(scheme *sc, const char *s);
int list_length(scheme *sc, pointer a);
int eqv(pointer a, pointer b);
SCHEME_EXPORT void set_safe_foreign (scheme *sc, pointer data);
SCHEME_EXPORT pointer foreign_error (scheme *sc, const char *s, pointer a);
#if USE_INTERFACE
......
......@@ -62,4 +62,5 @@ vi
xh
yi
zh_CN
zh_HK
zh_TW
......@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: gimp-libgimp\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=gimp&component=general\n"
"POT-Creation-Date: 2010-05-10 06:50+0000\n"
"PO-Revision-Date: 2010-02-24 18:57+0200\n"
"POT-Creation-Date: 2010-08-04 15:23+0000\n"
"PO-Revision-Date: 2010-08-02 00:03+0200\n"
"Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
"Language-Team: Română <gnomero-list@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
......@@ -386,15 +386,15 @@ msgstr "_Canal"
#: ../libgimpbase/gimpbaseenums.c:64
msgid "FG to BG (RGB)"
msgstr "Prim-plan -> Fundal (RGB)"
msgstr "Prim-plan la fundal (RGB)"
#: ../libgimpbase/gimpbaseenums.c:65
msgid "FG to BG (HSV)"
msgstr "Prim-plan -> Fundal (HSV)"
msgstr "Prim-plan la fundal (HSV)"
#: ../libgimpbase/gimpbaseenums.c:66
msgid "FG to transparent"
msgstr "Prim-plan -> transparent"
msgstr "Prim-plan la transparent"
#: ../libgimpbase/gimpbaseenums.c:67
msgid "Custom gradient"
......@@ -1132,7 +1132,7 @@ msgid ""
"Click the eyedropper, then click a color anywhere on your screen to select "
"that color."
msgstr ""
"Clic pe pipetă, după care clic o culoare oriunde pe ecran pentru a selecta "
"Clic pe pipetă, după care clic o culoare oriunde pe ecran pentru a preleva "
"acea culoare."
#: ../libgimpwidgets/gimppreviewarea.c:94
......@@ -1622,7 +1622,7 @@ msgstr "Buton de sarcină"
#: ../modules/controller-linux-input.c:78
msgid "Button Wheel"
msgstr "Buton roată"
msgstr "Buton rotiță"
#: ../modules/controller-linux-input.c:81
msgid "Button Gear Down"
......@@ -1680,7 +1680,7 @@ msgstr "Înclinare spre dreapta pe axa Y"
#: ../modules/controller-linux-input.c:100
#: ../modules/controller-dx-dinput.c:482
msgid "Y Axis Tilt Left"
msgstr "Înclinare spre stînga pe axa Y"
msgstr "Înclinare spre stânga pe axa Y"
# hm ?
#: ../modules/controller-linux-input.c:101
......@@ -1878,17 +1878,15 @@ msgstr ""
msgid "MIDI"
msgstr "MIDI"
# hm ? conform es, mesajele MIDI nu se traduc
#: ../modules/controller-midi.c:355
#, c-format
msgid "Note %02x on"
msgstr "Note %02x on"
msgstr "Nota %02x activată"
# hm ? conform es, mesajele MIDI nu se traduc
#: ../modules/controller-midi.c:358
#, c-format
msgid "Note %02x off"
msgstr "Note %02x off"
msgstr "Nota %02x dezactivată"
#: ../modules/controller-midi.c:361
#, c-format
......@@ -1906,39 +1904,3 @@ msgstr "GIMP"
#: ../modules/controller-midi.c:428
msgid "GIMP MIDI Input Controller"
msgstr "Controler de intrare GIMP MIDI"
#~ msgid "%d Byte"
#~ msgid_plural "%d Bytes"
#~ msgstr[0] "%d octet"
#~ msgstr[1] "%d octeți"
#~ msgstr[2] "%d de octeți"
#~ msgid "%.2f KB"
#~ msgstr "%.2f KOcteți"
#~ msgid "%.1f KB"
#~ msgstr "%.1f KOcteți"
#~ msgid "%d KB"
#~ msgstr "%d KOcteți"
#~ msgid "%.2f MB"
#~ msgstr "%.2f MOcteți"
#~ msgid "%.1f MB"
#~ msgstr "%.1f MOcteți"
#~ msgid "%d MB"
#~ msgstr "%d MO"
#~ msgid "%.2f GB"
#~ msgstr "%.2f GO"
#~ msgid "%.1f GB"
#~ msgstr "%.1f GO"
#~ msgid "%d GB"
#~ msgstr "%d GO"
#~ msgid "Triangle"
#~ msgstr "Triunghi"
This diff is collapsed.
This diff is collapsed.
......@@ -9471,9 +9471,10 @@ msgstr "Gfig"