[gimp] Global EXIF -> Exif string change (official spelling)
- From: Michael Schumacher <schumaml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Global EXIF -> Exif string change (official spelling)
- Date: Tue, 29 Oct 2013 21:49:43 +0000 (UTC)
commit 8db3b4312d7ad3bef4d7a497fe3a77c0dcf73335
Author: Michael Schumacher <schumaml gmx de>
Date: Tue Oct 29 22:48:46 2013 +0100
Global EXIF -> Exif string change (official spelling)
app/xcf/xcf-load.c | 2 +-
libgimp/gimpmetadata.c | 4 ++--
libgimpbase/gimpmetadata.c | 8 ++++----
plug-ins/common/file-psp.c | 2 +-
plug-ins/common/metadata.c | 4 ++--
plug-ins/file-jpeg/jpeg-load.c | 6 +++---
plug-ins/file-jpeg/jpeg-save.c | 2 +-
plug-ins/file-psd/psd-image-res-load.c | 2 +-
8 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c
index ae3dad0..061ee31 100644
--- a/app/xcf/xcf-load.c
+++ b/app/xcf/xcf-load.c
@@ -265,7 +265,7 @@ xcf_load_image (Gimp *gimp,
gimp_message (gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_WARNING,
_("Corrupt 'exif-data' parasite discovered.\n"
- "EXIF data could not be migrated: %s"),
+ "Exif data could not be migrated: %s"),
my_error->message);
g_clear_error (&my_error);
}
diff --git a/libgimp/gimpmetadata.c b/libgimp/gimpmetadata.c
index b807d90..3413693 100644
--- a/libgimp/gimpmetadata.c
+++ b/libgimp/gimpmetadata.c
@@ -218,7 +218,7 @@ gimp_image_metadata_save_prepare (gint32 image_ID,
if (comment_parasite)
comment = gimp_parasite_data (comment_parasite);
- /* EXIF */
+ /* Exif */
if (comment)
{
@@ -670,7 +670,7 @@ gimp_image_metadata_rotate_dialog (gint32 image_ID,
gtk_widget_show (vbox);
label = g_object_new (GTK_TYPE_LABEL,
- "label", _("According to the EXIF data, "
+ "label", _("According to the Exif data, "
"this image is rotated."),
"wrap", TRUE,
"justify", GTK_JUSTIFY_LEFT,
diff --git a/libgimpbase/gimpmetadata.c b/libgimpbase/gimpmetadata.c
index fc64774..4cf4a70 100644
--- a/libgimpbase/gimpmetadata.c
+++ b/libgimpbase/gimpmetadata.c
@@ -546,11 +546,11 @@ gimp_metadata_save_to_file (GimpMetadata *metadata,
/**
* gimp_metadata_set_from_exif:
* @metadata: A #GimpMetadata instance.
- * @exif_data: The blob of EXIF data to set
+ * @exif_data: The blob of Exif data to set
* @exif_data_length: Length of @exif_data, in bytes
* @error: Return location for error message
*
- * Sets the tags from a piece of EXIF data on @metadata.
+ * Sets the tags from a piece of Exif data on @metadata.
*
* Return value: %TRUE on success, %FALSE otherwise.
*
@@ -597,7 +597,7 @@ gimp_metadata_set_from_exif (GimpMetadata *metadata,
if (! gexiv2_metadata_has_exif (exif_metadata))
{
g_set_error (error, gimp_metadata_error_quark (), 0,
- _("Parsing EXIF data failed."));
+ _("Parsing Exif data failed."));
g_object_unref (exif_metadata);
g_byte_array_free (exif_bytes, TRUE);
return FALSE;
@@ -613,7 +613,7 @@ gimp_metadata_set_from_exif (GimpMetadata *metadata,
/**
* gimp_metadata_set_from_xmp:
* @metadata: A #GimpMetadata instance.
- * @xmp_data: The blob of EXIF data to set
+ * @xmp_data: The blob of Exif data to set
* @xmp_data_length: Length of @exif_data, in bytes
* @error: Return location for error message
*
diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
index c7771bd..9d2dbf5 100644
--- a/plug-ins/common/file-psp.c
+++ b/plug-ins/common/file-psp.c
@@ -434,7 +434,7 @@ typedef enum {
PSP_XDATA_TRNS_INDEX = 0, /* Transparency index field */
PSP_XDATA_GRID, /* Image grid information (since PSP7) */
PSP_XDATA_GUIDE, /* Image guide information (since PSP7) */
- PSP_XDATA_EXIF, /* Image EXIF information (since PSP8) */
+ PSP_XDATA_EXIF, /* Image Exif information (since PSP8) */
} PSPExtendedDataID;
/* Creator field types.
diff --git a/plug-ins/common/metadata.c b/plug-ins/common/metadata.c
index 0b9cda7..27cb582 100644
--- a/plug-ins/common/metadata.c
+++ b/plug-ins/common/metadata.c
@@ -127,9 +127,9 @@ query (void)
};
gimp_install_procedure (PLUG_IN_PROC,
- N_("View and edit metadata (EXIF, IPTC, XMP)"),
+ N_("View and edit metadata (Exif, IPTC, XMP)"),
"View and edit metadata information attached to the "
- "current image. This can include EXIF, IPTC and/or "
+ "current image. This can include Exif, IPTC and/or "
"XMP information. Some or all of this metadata "
"will be saved in the file, depending on the output "
"file format.",
diff --git a/plug-ins/file-jpeg/jpeg-load.c b/plug-ins/file-jpeg/jpeg-load.c
index 4273437..99507cb 100644
--- a/plug-ins/file-jpeg/jpeg-load.c
+++ b/plug-ins/file-jpeg/jpeg-load.c
@@ -142,7 +142,7 @@ load_image (const gchar *filename,
/* - step 2.1: tell the lib to save the comments */
jpeg_save_markers (&cinfo, JPEG_COM, 0xffff);
- /* - step 2.2: tell the lib to save APP1 data (EXIF or XMP) */
+ /* - step 2.2: tell the lib to save APP1 data (Exif or XMP) */
jpeg_save_markers (&cinfo, JPEG_APP0 + 1, 0xffff);
/* - step 2.3: tell the lib to save APP2 data (ICC profiles) */
@@ -255,7 +255,7 @@ load_image (const gchar *filename,
/* Step 5.0: save the original JPEG settings in a parasite */
jpeg_detect_original_settings (&cinfo, image_ID);
- /* Step 5.1: check for comments, or EXIF metadata in APP1 markers */
+ /* Step 5.1: check for comments, or Exif metadata in APP1 markers */
for (marker = cinfo.marker_list; marker; marker = marker->next)
{
const gchar *data = (const gchar *) marker->data;
@@ -284,7 +284,7 @@ load_image (const gchar *filename,
&& ! strcmp (JPEG_APP_HEADER_EXIF, data))
{
#ifdef GIMP_UNSTABLE
- g_print ("jpeg-load: found EXIF block (%d bytes)\n",
+ g_print ("jpeg-load: found Exif block (%d bytes)\n",
(gint) (len - sizeof (JPEG_APP_HEADER_EXIF)));
#endif
}
diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c
index f68f3d2..80e3cf7 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-save.c
@@ -881,7 +881,7 @@ save_dialog (void)
jsvals.progressive);
pg.save_exif = toggle =
- gtk_check_button_new_with_mnemonic (_("Save _EXIF data"));
+ gtk_check_button_new_with_mnemonic (_("Save _Exif data"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), jsvals.save_exif);
gtk_table_attach (GTK_TABLE (table), toggle, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
gtk_widget_show (toggle);
diff --git a/plug-ins/file-psd/psd-image-res-load.c b/plug-ins/file-psd/psd-image-res-load.c
index 9691ff0..db0153c 100644
--- a/plug-ins/file-psd/psd-image-res-load.c
+++ b/plug-ins/file-psd/psd-image-res-load.c
@@ -1207,7 +1207,7 @@ load_resource_1058 (const PSDimageres *res_a,
GimpParasite *parasite;
gchar *res_data;
- IFDBG(2) g_debug ("Process image resource block: 1058: EXIF data");
+ IFDBG(2) g_debug ("Process image resource block: 1058: Exif data");
res_data = g_malloc (res_a->data_len);
if (fread (res_data, res_a->data_len, 1, f) < 1)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]