Menu
▾
▴
libexif-cvs — CVS commitlogs of all libexif CVS modules
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(22) |
Sep
(57) |
Oct
(39) |
Nov
(93) |
Dec
(72) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(15) |
Feb
(8) |
Mar
(12) |
Apr
(25) |
May
(2) |
Jun
|
Jul
(11) |
Aug
(32) |
Sep
(18) |
Oct
(53) |
Nov
|
Dec
(11) |
| 2004 |
Jan
(19) |
Feb
(1) |
Mar
(15) |
Apr
(17) |
May
(56) |
Jun
(19) |
Jul
(6) |
Aug
(16) |
Sep
(44) |
Oct
(31) |
Nov
(36) |
Dec
(13) |
| 2005 |
Jan
(2) |
Feb
(41) |
Mar
(304) |
Apr
(176) |
May
(19) |
Jun
(33) |
Jul
(14) |
Aug
(21) |
Sep
(4) |
Oct
(3) |
Nov
|
Dec
(8) |
| 2006 |
Jan
(18) |
Feb
(9) |
Mar
(5) |
Apr
(2) |
May
(2) |
Jun
(4) |
Jul
(2) |
Aug
|
Sep
(7) |
Oct
(10) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(3) |
Mar
(1) |
Apr
(4) |
May
(124) |
Jun
(59) |
Jul
(1) |
Aug
(13) |
Sep
(3) |
Oct
(11) |
Nov
(30) |
Dec
(35) |
| 2008 |
Jan
(31) |
Feb
(42) |
Mar
(4) |
Apr
(5) |
May
(2) |
Jun
(12) |
Jul
(8) |
Aug
(2) |
Sep
(4) |
Oct
(5) |
Nov
(89) |
Dec
(23) |
| 2009 |
Jan
(71) |
Feb
(5) |
Mar
(8) |
Apr
(7) |
May
(8) |
Jun
(7) |
Jul
|
Aug
(4) |
Sep
(58) |
Oct
(74) |
Nov
(53) |
Dec
(32) |
| 2010 |
Jan
(8) |
Feb
(13) |
Mar
(4) |
Apr
|
May
|
Jun
(10) |
Jul
(1) |
Aug
(2) |
Sep
(12) |
Oct
(17) |
Nov
(2) |
Dec
(24) |
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(24) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
(20) |
Mar
(18) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(8) |
Jun
|
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(5) |
|
From: Jan P. <pa...@us...> - 2007-05-10 19:49:58
|
Update of /cvsroot/libexif/libexif/po In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23914 Added Files: sk.po Log Message: Slovak translation, submitted by Ivan Masar --- NEW FILE: sk.po --- (This appears to be a binary file; contents omitted.) |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 17:22:16
|
Update of /cvsroot/libexif/libexif/po In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23227/po Added Files: cs.po Log Message: add Czech translation (cs) --- NEW FILE: cs.po --- # LIBEXIF PO FILE # Copyright: # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # This file is distributed under the same license as the libexif package. # msgid "" msgstr "" "Project-Id-Version: cs\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-10 15:58+0200\n" "PO-Revision-Date: 2007-05-10 19:20+0200\n" "Last-Translator: Jan Pateras <EMAIL@ADDRESS>\n" "Language-Team: <cs...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: libexif/canon/mnote-canon-entry.c:40 #: libexif/olympus/mnote-olympus-entry.c:37 [...3603 lines suppressed...] #: libexif/pentax/mnote-pentax-tag.c:53 msgid "ISOSpeed" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:58 msgid "PrintIM Settings" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:59 msgid "TimeZone" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:60 msgid "DaylightSavings" msgstr "" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "" |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 17:12:05
|
Update of /cvsroot/libexif/gexif/gexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18365 Modified Files: gexif-thumbnail.c gexif-thumbnail.h Log Message: Avoid empty struct by replacing it with void. Fixes #1616320 Index: gexif-thumbnail.h =================================================================== RCS file: /cvsroot/libexif/gexif/gexif/gexif-thumbnail.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- gexif-thumbnail.h 13 Jul 2003 08:04:38 -0000 1.3 +++ gexif-thumbnail.h 10 May 2007 17:12:00 -0000 1.4 @@ -28,9 +28,12 @@ #define GEXIF_IS_THUMBNAIL(o) (GTK_CHECK_TYPE((o),GEXIF_TYPE_THUMBNAIL)) typedef struct _GExifThumbnail GExifThumbnail; -typedef struct _GExifThumbnailPrivate GExifThumbnailPrivate; typedef struct _GExifThumbnailClass GExifThumbnailClass; +/* use the struct and typedef if you have actually defined some struct members */ +typedef void GExifThumbnailPrivate; +/* typedef struct _GExifThumbnailPrivate GExifThumbnailPrivate; */ + struct _GExifThumbnail { GtkDialog parent; Index: gexif-thumbnail.c =================================================================== RCS file: /cvsroot/libexif/gexif/gexif/gexif-thumbnail.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- gexif-thumbnail.c 13 Jul 2003 08:04:38 -0000 1.5 +++ gexif-thumbnail.c 10 May 2007 17:11:59 -0000 1.6 @@ -52,9 +52,11 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf-loader.h> +/* define this later if needed struct _GExifThumbnailPrivate { }; +*/ #define PARENT_TYPE GTK_TYPE_DIALOG static GtkDialogClass *parent_class; |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 17:09:16
|
Update of /cvsroot/libexif/libexif-gtk/libexif-gtk In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16875/libexif-gtk/libexif-gtk Modified Files: Makefile.am Log Message: Do not set -DGTK_DISABLE_DEPRECATED because our code is quite old and has not been updated to the newest GTK stuff yet. Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif-gtk/libexif-gtk/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -d -r1.15 -r1.16 --- Makefile.am 2 Apr 2005 02:34:01 -0000 1.15 +++ Makefile.am 10 May 2007 17:09:11 -0000 1.16 @@ -33,14 +33,18 @@ libexif_gtk_la_SOURCES = \ gtk-exif-entry-user-comment.c \ gtk-exif-entry-version.c \ gtk-exif-util.h + +# We cannot define -DGTK_DISABLE_DEPRECATED here +# as long as we're still using our old code with +# the old deprecated GTK stuff. + libexif_gtk_la_CFLAGS = \ $(AM_CPPFLAGS) $(CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/gtk-extensions \ $(LIBEXIF_CFLAGS) \ $(GTK_CFLAGS) \ - -DG_LOG_DOMAIN=\"libexif\" \ - -DGTK_DISABLE_DEPRECATED + -DG_LOG_DOMAIN=\"libexif\" libexif_gtk_la_LDFLAGS = -version-info @LIBEXIF_GTK_VERSION_INFO@ libexif_gtk_la_LIBADD = \ $(AM_LDFLAGS) $(LDFLAGS) \ |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 17:09:15
|
Update of /cvsroot/libexif/libexif-gtk/gtk-extensions In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16875/libexif-gtk/gtk-extensions Modified Files: Makefile.am Log Message: Do not set -DGTK_DISABLE_DEPRECATED because our code is quite old and has not been updated to the newest GTK stuff yet. Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif-gtk/gtk-extensions/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -d -r1.7 -r1.8 --- Makefile.am 24 Mar 2005 05:06:56 -0000 1.7 +++ Makefile.am 10 May 2007 17:09:10 -0000 1.8 @@ -3,9 +3,11 @@ noinst_LTLIBRARIES = libgtk-extensions.l libgtk_extensions_la_SOURCES = \ gtk-menu-option.c gtk-menu-option.h \ gtk-options.c gtk-options.h + # We don't set -DGTK_DISABLE_DEPRECATED here because # our code is quite old and hasn't been updated to the # newest stuff yet. + libgtk_extensions_la_CFLAGS = \ $(AM_CFLAGS) $(CFLAGS) \ -I$(top_srcdir) \ |
|
From: Jan P. <pa...@us...> - 2007-05-10 17:03:44
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14368 Modified Files: ChangeLog NEWS Log Message: Changes of the last week: * Added support for Olympus S760 & S770 makernote (bug #1703284) * Fixed crashes when looking up invalid values (bug #1457501) * Added heuristics (bug #1525770): mismatching Olympus makernote in big endian when the rest is in little endian is detected to prevent crashes * Added option EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE to prevent modification of maker notes * EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS propagated to Canon makernote (Bug #1617991) * Updated several tags * Updated translations Index: NEWS =================================================================== RCS file: /cvsroot/libexif/libexif/NEWS,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -d -r1.13 -r1.14 --- NEWS 10 May 2007 15:46:57 -0000 1.13 +++ NEWS 10 May 2007 17:03:15 -0000 1.14 @@ -4,14 +4,19 @@ New in 0.6.14.cvs1 since 0.6.14 (2007-05 [ 1443183 ] install error when doxygen is not present. -New in 0.6.14 since 0.6.13 (2005-12-27): +New in 0.6.14 (2007-05-10) since 0.6.13 (2005-12-27): - * Bug fixes: #1716196 + * Bug fixes: #1457501, #1471060, #1525770, #1617991, #1703284, #1716196 + + * Extended support of Canon, Nikon, Olympus makernotes + + * Added option EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE to prevent + modification of maker notes * Other fixes and improvements which include API/ABI additions. -New in 0.6.13 since 0.6.12 (2005-03-13): +New in 0.6.13 (2005-12-27) since 0.6.12 (2005-03-13): * Bug fixes: #803191, #1051994, #1054321, #1054323, #1196787 Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.241 retrieving revision 1.242 diff -u -p -d -r1.241 -r1.242 --- ChangeLog 6 May 2007 17:51:52 -0000 1.241 +++ ChangeLog 10 May 2007 17:03:15 -0000 1.242 @@ -1,3 +1,17 @@ +2007-05-09 Jan Patera <pa...@us...> + + * Added support for Olympus S760 & S770 makernote (bug #1703284) + * Fixed crashes when looking up invalid values (bug #1457501) + * Added heuristics (bug #1525770): mismatching Olympus makernote + in big endian when the rest is in little endian is detected + to prevent crashes + * Added option EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE to prevent + modification of maker notes + * EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS propagated to Canon makernote + (Bug #1617991) + * Updated several tags + * Updated translations + 2007-05-06 Jan Patera <pa...@us...> * libexif/olympus/exif-mnote-data-olympus.c: Nikon v1 makernotes were saved |
|
From: Jan P. <pa...@us...> - 2007-05-10 16:50:33
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9174 Modified Files: mnote-canon-entry.c Log Message: Zero value for Self-Timer is not invalid, it means "Off" Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -d -r1.20 -r1.21 --- mnote-canon-entry.c 24 Apr 2007 04:48:29 -0000 1.20 +++ mnote-canon-entry.c 10 May 2007 16:50:20 -0000 1.21 @@ -467,7 +467,10 @@ mnote_canon_entry_get_value (const Mnote vs = exif_get_short (entry->data + 2 + t * 2, entry->order); switch (t) { case 1: - if (!vs) break; + if (!vs) { + strncpy(val, _("Off"), maxlen); + break; + } snprintf (val, maxlen, _("%i (ms)"), vs * 100); break; case 15: @@ -559,7 +562,10 @@ mnote_canon_entry_get_value (const Mnote snprintf (val, maxlen, _("%u mm"), vs); break; case 28: - if (!vs) break; + if (!vs) { + strncpy(val, _("Off"), maxlen); + break; + } snprintf (val, maxlen, _("%i (ms)"), vs * 100); break; default: |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 15:47:01
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14511 Modified Files: NEWS Log Message: fix #1443183: install error when doxygen is not present Index: NEWS =================================================================== RCS file: /cvsroot/libexif/libexif/NEWS,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -d -r1.12 -r1.13 --- NEWS 10 May 2007 15:44:17 -0000 1.12 +++ NEWS 10 May 2007 15:46:57 -0000 1.13 @@ -1,6 +1,7 @@ New in 0.6.14.cvs1 since 0.6.14 (2007-05-10): * Bug fixes: + [ 1443183 ] install error when doxygen is not present. New in 0.6.14 since 0.6.13 (2005-12-27): |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 15:47:00
|
Update of /cvsroot/libexif/libexif/doc In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14511/doc Modified Files: Makefile.am Log Message: fix #1443183: install error when doxygen is not present Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/doc/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -d -r1.7 -r1.8 --- Makefile.am 18 Jul 2005 20:36:24 -0000 1.7 +++ Makefile.am 10 May 2007 15:46:55 -0000 1.8 @@ -61,6 +61,15 @@ $(DOXYGEN_UPLOAD): $(DOXYGEN_STAMPS) rsync -avz --progress $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)/ sf:/home/users/h/hu/hun/libexif/htdocs/internals/ ssh "sf" "find /home/groups/l/li/libexif/htdocs/internals /home/groups/l/li/libexif/htdocs/api \( -type d -exec chgrp libexif {} \; -exec chmod g+rwxs,a+rx {} \; \) -or \( -type f -exec chgrp libexif {} \; -exec chmod g+rw {} \; \( -name '*.html' -or -name '*.png' -or -name '*.php' -or -name '*.jpg' -or -name '*.css' -name '*.dot' -name '*.map' \) -exec chmod a+r {} \; \)" +else + +# Dummy targets for non-doxygen case +install-apidocs: +install-apidocs-internals: +uninstall-apidocs: +uninstall-apidocs-internals: +clean-apidocs: + endif |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 15:44:25
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13083 Modified Files: configure.ac NEWS Log Message: new release number after 0.6.14 is out, working towards 0.6.15 Index: NEWS =================================================================== RCS file: /cvsroot/libexif/libexif/NEWS,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -d -r1.11 -r1.12 --- NEWS 10 May 2007 15:13:45 -0000 1.11 +++ NEWS 10 May 2007 15:44:17 -0000 1.12 @@ -1,3 +1,8 @@ +New in 0.6.14.cvs1 since 0.6.14 (2007-05-10): + + * Bug fixes: + + New in 0.6.14 since 0.6.13 (2005-12-27): * Bug fixes: #1716196 Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/libexif/configure.ac,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -d -r1.19 -r1.20 --- configure.ac 10 May 2007 15:17:24 -0000 1.19 +++ configure.ac 10 May 2007 15:44:15 -0000 1.20 @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([EXIF library],[0.6.14],[lib...@li...],[libexif]) +AC_INIT([EXIF library],[0.6.14.cvs1],[lib...@li...],[libexif]) AC_CONFIG_SRCDIR([libexif/exif-data.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([auto-m4]) |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 15:17:29
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30107 Modified Files: configure.ac Log Message: properly update so name for API/ABI addition Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/libexif/configure.ac,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -d -r1.18 -r1.19 --- configure.ac 10 May 2007 14:25:51 -0000 1.18 +++ configure.ac 10 May 2007 15:17:24 -0000 1.19 @@ -46,9 +46,12 @@ dnl change does not break upward compat dnl increment AGE, Otherwise AGE is reset to 0. If CURRENT has changed, dnl REVISION is set to 0, otherwise REVISION is incremented. dnl --------------------------------------------------------------------------- -LIBEXIF_AGE=0 -LIBEXIF_REVISION=2 -LIBEXIF_CURRENT=12 +dnl C:A:R +dnl 12:0:1 0.6.13 +dnl 13:1:0 added EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE (for 0.6.14) +LIBEXIF_AGE=1 +LIBEXIF_REVISION=0 +LIBEXIF_CURRENT=13 AC_SUBST([LIBEXIF_AGE]) AC_SUBST([LIBEXIF_REVISION]) AC_SUBST([LIBEXIF_CURRENT]) |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 15:13:50
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28169 Modified Files: NEWS Log Message: mention API/ABI additions Index: NEWS =================================================================== RCS file: /cvsroot/libexif/libexif/NEWS,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -d -r1.10 -r1.11 --- NEWS 10 May 2007 14:27:07 -0000 1.10 +++ NEWS 10 May 2007 15:13:45 -0000 1.11 @@ -2,7 +2,7 @@ New in 0.6.14 since 0.6.13 (2005-12-27): * Bug fixes: #1716196 - * Other fixes and improvements. + * Other fixes and improvements which include API/ABI additions. New in 0.6.13 since 0.6.12 (2005-03-13): |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 15:13:06
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27688 Modified Files: Makefile.am Log Message: help release manager not forget how to upload Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/Makefile.am,v retrieving revision 1.41 retrieving revision 1.42 diff -u -p -d -r1.41 -r1.42 --- Makefile.am 10 May 2007 14:30:22 -0000 1.41 +++ Makefile.am 10 May 2007 15:12:58 -0000 1.42 @@ -43,4 +43,8 @@ cvs-tag-release: read; \ cd "$(srcdir)" && cvs tag "$${tag}" +.PHONY: upload-release +upload-release: + echo ncftpput upload.sourceforge.net incoming/ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).* + # End of Makefile.am. |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 14:38:07
|
Update of /cvsroot/libexif/libexif/po In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11589 Modified Files: de.po es.po fr.po pl.po ru.po vi.po Log Message: update-po Index: es.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/es.po,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -d -r1.21 -r1.22 --- es.po 8 May 2007 16:45:28 -0000 1.21 +++ es.po 10 May 2007 14:38:01 -0000 1.22 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-03 15:46+0200\n" +"POT-Creation-Date: 2007-05-10 15:58+0200\n" "PO-Revision-Date: 2005-03-12 05:43+0100\n" "Last-Translator: Fabian Mandelbaum <fa...@ma...>\n" "Language-Team: Spanish <es...@li...>\n" @@ -966,12 +966,12 @@ msgstr "" msgid "%.2f EV" msgstr "" -#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:775 +#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:776 #, c-format msgid "1/%d" msgstr "1/%d" -#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:778 +#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:779 #, c-format msgid "%d" msgstr "" @@ -1295,41 +1295,51 @@ msgstr "" msgid "Intel" msgstr "" -#: libexif/exif-data.c:693 +#: libexif/exif-data.c:695 msgid "Size of data too small to allow for EXIF data." msgstr "" -#: libexif/exif-data.c:754 +#: libexif/exif-data.c:756 msgid "EXIF marker not found." msgstr "" -#: libexif/exif-data.c:781 +#: libexif/exif-data.c:783 msgid "EXIF header not found." msgstr "" -#: libexif/exif-data.c:797 +#: libexif/exif-data.c:799 #, fuzzy msgid "Unknown encoding." msgstr "Desconocido" -#: libexif/exif-data.c:1100 +#: libexif/exif-data.c:1102 msgid "Ignore unknown tags" msgstr "" -#: libexif/exif-data.c:1101 +#: libexif/exif-data.c:1103 msgid "Ignore unknown tags when loading EXIF data." msgstr "" -#: libexif/exif-data.c:1102 +#: libexif/exif-data.c:1104 msgid "Follow specification" msgstr "" -#: libexif/exif-data.c:1103 +#: libexif/exif-data.c:1105 msgid "" "Add, correct and remove entries to get EXIF data that follows the " "specification." msgstr "" +#: libexif/exif-data.c:1107 +msgid "Don not change maker note" +msgstr "" + +#: libexif/exif-data.c:1108 +msgid "" +"When loading and resaving Exif data, save the maker note unmodified. Be " +"aware that the maker note can get corrupted." +msgstr "" + #: libexif/exif-entry.c:202 libexif/exif-entry.c:236 #, c-format msgid "" @@ -1720,7 +1730,7 @@ msgstr "Modo retrato (para fotos de cerc msgid "Landscape mode (for landscape photos with the background in focus)" msgstr "Modo paisaje (para fotos de paisaje con el fondo en foco" -#: libexif/exif-entry.c:491 +#: libexif/exif-entry.c:491 libexif/exif-entry.c:496 msgid "Flash did not fire." msgstr "El flash no disparó." @@ -1834,10 +1844,11 @@ msgstr "" #: libexif/exif-entry.c:518 #, fuzzy msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected." +"Flash fired, compulsory flash mode, red-eye reduction mode, return light " +"detected." msgstr "" "El flash disparó, modo compulsivo del flash, modo de reducción de ojos " -"rojos, luz de retorno detectada." +"rojos, luz de retorno no detectada." #: libexif/exif-entry.c:520 #, fuzzy @@ -1896,168 +1907,168 @@ msgstr "" msgid "Uncalibrated" msgstr "Descalibrado" -#: libexif/exif-entry.c:589 +#: libexif/exif-entry.c:590 #, c-format msgid "Invalid size of entry (%i, expected %li x %i)." msgstr "Cantidad de componentes no válida (%i, se esperaba %li x %i)." -#: libexif/exif-entry.c:622 +#: libexif/exif-entry.c:623 msgid "Unsupported UNICODE string" msgstr "" -#: libexif/exif-entry.c:626 +#: libexif/exif-entry.c:627 msgid "Unsupported JIS string" msgstr "" -#: libexif/exif-entry.c:641 +#: libexif/exif-entry.c:642 msgid "Tag UserComment does not comply with standard but contains data." msgstr "" -#: libexif/exif-entry.c:645 +#: libexif/exif-entry.c:646 #, c-format msgid "Byte at position %i: 0x%02x" msgstr "" -#: libexif/exif-entry.c:654 +#: libexif/exif-entry.c:655 #, fuzzy msgid "Unknown Exif Version" msgstr "Versión Exif" -#: libexif/exif-entry.c:658 +#: libexif/exif-entry.c:659 #, c-format msgid "Exif Version %d.%d" msgstr "Versión Exif %d.%d" -#: libexif/exif-entry.c:669 +#: libexif/exif-entry.c:670 msgid "FlashPix Version 1.0" msgstr "" -#: libexif/exif-entry.c:671 +#: libexif/exif-entry.c:672 msgid "FlashPix Version 1.01" msgstr "" -#: libexif/exif-entry.c:673 +#: libexif/exif-entry.c:674 msgid "Unknown FlashPix Version" msgstr "" -#: libexif/exif-entry.c:686 libexif/exif-entry.c:698 libexif/exif-entry.c:1307 -#: libexif/exif-entry.c:1312 libexif/exif-entry.c:1315 -#: libexif/exif-entry.c:1320 libexif/exif-entry.c:1321 +#: libexif/exif-entry.c:687 libexif/exif-entry.c:699 libexif/exif-entry.c:1311 +#: libexif/exif-entry.c:1316 libexif/exif-entry.c:1319 +#: libexif/exif-entry.c:1324 libexif/exif-entry.c:1325 msgid "[None]" msgstr "" -#: libexif/exif-entry.c:688 +#: libexif/exif-entry.c:689 msgid "(Photographer)" msgstr "" -#: libexif/exif-entry.c:701 +#: libexif/exif-entry.c:702 msgid "(Editor)" msgstr "" -#: libexif/exif-entry.c:719 libexif/exif-entry.c:788 libexif/exif-entry.c:808 -#: libexif/exif-entry.c:846 +#: libexif/exif-entry.c:720 libexif/exif-entry.c:789 libexif/exif-entry.c:809 +#: libexif/exif-entry.c:847 #, c-format msgid "%.02f EV" msgstr "" -#: libexif/exif-entry.c:720 +#: libexif/exif-entry.c:721 #, c-format msgid " (f/%.01f)" msgstr "" -#: libexif/exif-entry.c:751 +#: libexif/exif-entry.c:752 #, c-format msgid " (35 equivalent: %d mm)" msgstr " (equivalente 35: %d mm)" -#: libexif/exif-entry.c:779 libexif/exif-entry.c:780 +#: libexif/exif-entry.c:780 libexif/exif-entry.c:781 msgid " sec." msgstr " seg." -#: libexif/exif-entry.c:794 +#: libexif/exif-entry.c:795 #, c-format msgid " 1/%d sec.)" msgstr " 1/%d seg.)" -#: libexif/exif-entry.c:796 +#: libexif/exif-entry.c:797 #, c-format msgid " %d sec.)" msgstr " %d seg.)" -#: libexif/exif-entry.c:809 +#: libexif/exif-entry.c:810 #, c-format msgid " (%.02f cd/m^2)" msgstr "" -#: libexif/exif-entry.c:818 +#: libexif/exif-entry.c:819 msgid "DSC" msgstr "DSC" -#: libexif/exif-entry.c:827 +#: libexif/exif-entry.c:828 msgid "-" msgstr "-" -#: libexif/exif-entry.c:828 +#: libexif/exif-entry.c:829 msgid "Y" msgstr "Y" -#: libexif/exif-entry.c:829 +#: libexif/exif-entry.c:830 msgid "Cb" msgstr "Cb" -#: libexif/exif-entry.c:830 +#: libexif/exif-entry.c:831 msgid "Cr" msgstr "Cr" -#: libexif/exif-entry.c:831 +#: libexif/exif-entry.c:832 msgid "R" msgstr "R" -#: libexif/exif-entry.c:832 +#: libexif/exif-entry.c:833 msgid "G" msgstr "V" -#: libexif/exif-entry.c:833 +#: libexif/exif-entry.c:834 msgid "B" msgstr "A" -#: libexif/exif-entry.c:834 +#: libexif/exif-entry.c:835 msgid "reserved" msgstr "reservado" -#: libexif/exif-entry.c:856 +#: libexif/exif-entry.c:857 msgid "YCbCr4:2:2" msgstr "YCbCr4:2:2" -#: libexif/exif-entry.c:858 +#: libexif/exif-entry.c:859 msgid "YCbCr4:2:0" msgstr "YCbCr4:2:0" -#: libexif/exif-entry.c:864 +#: libexif/exif-entry.c:865 #, c-format msgid "%i bytes unknown data" msgstr "%i bytes de datos desconocidos" -#: libexif/exif-entry.c:880 +#: libexif/exif-entry.c:881 #, c-format msgid "Within distance %i of (x,y) = (%i,%i)" msgstr "Dentro de la distancia %i de (x,y) = (%i,%i)" -#: libexif/exif-entry.c:889 +#: libexif/exif-entry.c:890 #, c-format msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)" msgstr "Dentro del rectángulo (ancho %i, alto %i) alrededor de (x,y) = (%i,%i)" -#: libexif/exif-entry.c:895 +#: libexif/exif-entry.c:896 #, c-format msgid "Unexpected number of components (%li, expected 2, 3, or 4)." msgstr "Cantidad de componentes inesperada (%li, esperados 2, 3, o 4)." -#: libexif/exif-entry.c:916 libexif/exif-entry.c:960 +#: libexif/exif-entry.c:917 libexif/exif-entry.c:960 msgid "Internal error." msgstr "" -#: libexif/exif-entry.c:924 +#: libexif/exif-entry.c:925 #, c-format msgid "Internal error (unknown value %i)." msgstr "" @@ -4132,6 +4143,14 @@ msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "" #, fuzzy +#~ msgid "" +#~ "Flash fired, compulsory flash mode, red-eye reduction, return light " +#~ "detected." +#~ msgstr "" +#~ "El flash disparó, modo compulsivo del flash, modo de reducción de ojos " +#~ "rojos, luz de retorno detectada." + +#, fuzzy #~ msgid "Flash not fired" #~ msgstr "El flash no disparó." Index: fr.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/fr.po,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -d -r1.22 -r1.23 --- fr.po 8 May 2007 16:45:28 -0000 1.22 +++ fr.po 10 May 2007 14:38:02 -0000 1.23 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-03 15:46+0200\n" +"POT-Creation-Date: 2007-05-10 15:58+0200\n" "PO-Revision-Date: 2005-03-12 05:42+0100\n" "Last-Translator: Arnaud Launay <as...@la...>\n" "Language-Team: Français <tr...@tr...>\n" @@ -967,12 +967,12 @@ msgstr "" msgid "%.2f EV" msgstr "" -#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:775 +#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:776 #, c-format msgid "1/%d" msgstr "1/%d" -#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:778 +#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:779 #, c-format msgid "%d" msgstr "" @@ -1293,42 +1293,52 @@ msgstr "Motorola" msgid "Intel" msgstr "Intel" -#: libexif/exif-data.c:693 +#: libexif/exif-data.c:695 msgid "Size of data too small to allow for EXIF data." msgstr "" -#: libexif/exif-data.c:754 +#: libexif/exif-data.c:756 msgid "EXIF marker not found." msgstr "" -#: libexif/exif-data.c:781 +#: libexif/exif-data.c:783 msgid "EXIF header not found." msgstr "" -#: libexif/exif-data.c:797 +#: libexif/exif-data.c:799 #, fuzzy msgid "Unknown encoding." msgstr "Inconnu" -#: libexif/exif-data.c:1100 +#: libexif/exif-data.c:1102 #, fuzzy msgid "Ignore unknown tags" msgstr "Inconnu" -#: libexif/exif-data.c:1101 +#: libexif/exif-data.c:1103 msgid "Ignore unknown tags when loading EXIF data." msgstr "" -#: libexif/exif-data.c:1102 +#: libexif/exif-data.c:1104 msgid "Follow specification" msgstr "" -#: libexif/exif-data.c:1103 +#: libexif/exif-data.c:1105 msgid "" "Add, correct and remove entries to get EXIF data that follows the " "specification." msgstr "" +#: libexif/exif-data.c:1107 +msgid "Don not change maker note" +msgstr "" + +#: libexif/exif-data.c:1108 +msgid "" +"When loading and resaving Exif data, save the maker note unmodified. Be " +"aware that the maker note can get corrupted." +msgstr "" + #: libexif/exif-entry.c:202 libexif/exif-entry.c:236 #, c-format msgid "" @@ -1719,7 +1729,7 @@ msgstr "Mode portrait (photos en gros pl msgid "Landscape mode (for landscape photos with the background in focus)" msgstr "Mode paysage (paysages avec arrière-plan net)" -#: libexif/exif-entry.c:491 +#: libexif/exif-entry.c:491 libexif/exif-entry.c:496 msgid "Flash did not fire." msgstr "Le flash ne s'est pas déclenché." @@ -1828,10 +1838,11 @@ msgstr "" #: libexif/exif-entry.c:518 #, fuzzy msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected." +"Flash fired, compulsory flash mode, red-eye reduction mode, return light " +"detected." msgstr "" "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière " -"de retour détectée." +"de retour non détectée." #: libexif/exif-entry.c:520 #, fuzzy @@ -1889,168 +1900,168 @@ msgstr "" msgid "Uncalibrated" msgstr "Non calibré" -#: libexif/exif-entry.c:589 +#: libexif/exif-entry.c:590 #, c-format msgid "Invalid size of entry (%i, expected %li x %i)." msgstr "Nombre invalide de composants (%i, attendait %li x %i)." -#: libexif/exif-entry.c:622 +#: libexif/exif-entry.c:623 msgid "Unsupported UNICODE string" msgstr "" -#: libexif/exif-entry.c:626 +#: libexif/exif-entry.c:627 msgid "Unsupported JIS string" msgstr "" -#: libexif/exif-entry.c:641 +#: libexif/exif-entry.c:642 msgid "Tag UserComment does not comply with standard but contains data." msgstr "" -#: libexif/exif-entry.c:645 +#: libexif/exif-entry.c:646 #, c-format msgid "Byte at position %i: 0x%02x" msgstr "" -#: libexif/exif-entry.c:654 +#: libexif/exif-entry.c:655 msgid "Unknown Exif Version" msgstr "Version d'exif inconnu" -#: libexif/exif-entry.c:658 +#: libexif/exif-entry.c:659 #, c-format msgid "Exif Version %d.%d" msgstr "Version d'exif %d.%d" -#: libexif/exif-entry.c:669 +#: libexif/exif-entry.c:670 msgid "FlashPix Version 1.0" msgstr "" -#: libexif/exif-entry.c:671 +#: libexif/exif-entry.c:672 msgid "FlashPix Version 1.01" msgstr "" -#: libexif/exif-entry.c:673 +#: libexif/exif-entry.c:674 msgid "Unknown FlashPix Version" msgstr "" -#: libexif/exif-entry.c:686 libexif/exif-entry.c:698 libexif/exif-entry.c:1307 -#: libexif/exif-entry.c:1312 libexif/exif-entry.c:1315 -#: libexif/exif-entry.c:1320 libexif/exif-entry.c:1321 +#: libexif/exif-entry.c:687 libexif/exif-entry.c:699 libexif/exif-entry.c:1311 +#: libexif/exif-entry.c:1316 libexif/exif-entry.c:1319 +#: libexif/exif-entry.c:1324 libexif/exif-entry.c:1325 msgid "[None]" msgstr "" -#: libexif/exif-entry.c:688 +#: libexif/exif-entry.c:689 msgid "(Photographer)" msgstr "" -#: libexif/exif-entry.c:701 +#: libexif/exif-entry.c:702 msgid "(Editor)" msgstr "" -#: libexif/exif-entry.c:719 libexif/exif-entry.c:788 libexif/exif-entry.c:808 -#: libexif/exif-entry.c:846 +#: libexif/exif-entry.c:720 libexif/exif-entry.c:789 libexif/exif-entry.c:809 +#: libexif/exif-entry.c:847 #, c-format msgid "%.02f EV" msgstr "" -#: libexif/exif-entry.c:720 +#: libexif/exif-entry.c:721 #, c-format msgid " (f/%.01f)" msgstr "" -#: libexif/exif-entry.c:751 +#: libexif/exif-entry.c:752 #, c-format msgid " (35 equivalent: %d mm)" msgstr " (équivalent 35mm: %d mm)" -#: libexif/exif-entry.c:779 libexif/exif-entry.c:780 +#: libexif/exif-entry.c:780 libexif/exif-entry.c:781 #, fuzzy msgid " sec." msgstr " sec." -#: libexif/exif-entry.c:794 +#: libexif/exif-entry.c:795 #, fuzzy, c-format msgid " 1/%d sec.)" msgstr " 1/%d sec.)" -#: libexif/exif-entry.c:796 +#: libexif/exif-entry.c:797 #, fuzzy, c-format msgid " %d sec.)" msgstr "%d sec.)" -#: libexif/exif-entry.c:809 +#: libexif/exif-entry.c:810 #, c-format msgid " (%.02f cd/m^2)" msgstr "" -#: libexif/exif-entry.c:818 +#: libexif/exif-entry.c:819 msgid "DSC" msgstr "" -#: libexif/exif-entry.c:827 +#: libexif/exif-entry.c:828 msgid "-" msgstr "-" -#: libexif/exif-entry.c:828 +#: libexif/exif-entry.c:829 msgid "Y" msgstr "Y" -#: libexif/exif-entry.c:829 +#: libexif/exif-entry.c:830 msgid "Cb" msgstr "Cb" -#: libexif/exif-entry.c:830 +#: libexif/exif-entry.c:831 msgid "Cr" msgstr "Cr" -#: libexif/exif-entry.c:831 +#: libexif/exif-entry.c:832 msgid "R" msgstr "R" -#: libexif/exif-entry.c:832 +#: libexif/exif-entry.c:833 msgid "G" msgstr "G" -#: libexif/exif-entry.c:833 +#: libexif/exif-entry.c:834 msgid "B" msgstr "B" -#: libexif/exif-entry.c:834 +#: libexif/exif-entry.c:835 msgid "reserved" msgstr "réservé" -#: libexif/exif-entry.c:856 +#: libexif/exif-entry.c:857 msgid "YCbCr4:2:2" msgstr "YCbCr4:2:2" -#: libexif/exif-entry.c:858 +#: libexif/exif-entry.c:859 msgid "YCbCr4:2:0" msgstr "YCbCr4:2:0" -#: libexif/exif-entry.c:864 +#: libexif/exif-entry.c:865 #, c-format msgid "%i bytes unknown data" msgstr "%i de données inconnues" -#: libexif/exif-entry.c:880 +#: libexif/exif-entry.c:881 #, c-format msgid "Within distance %i of (x,y) = (%i,%i)" msgstr "Dans la distance %i de (x,y) = (%i,%i)" -#: libexif/exif-entry.c:889 +#: libexif/exif-entry.c:890 #, c-format msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)" msgstr "Dans le rectangle (largeur %i, hauteur %i) autour de (x,y) = (%i,%i)" -#: libexif/exif-entry.c:895 +#: libexif/exif-entry.c:896 #, c-format msgid "Unexpected number of components (%li, expected 2, 3, or 4)." msgstr "Nombre inattendu de composants (%li, attendait 2, 3, ou 4)." -#: libexif/exif-entry.c:916 libexif/exif-entry.c:960 +#: libexif/exif-entry.c:917 libexif/exif-entry.c:960 msgid "Internal error." msgstr "" -#: libexif/exif-entry.c:924 +#: libexif/exif-entry.c:925 #, c-format msgid "Internal error (unknown value %i)." msgstr "" @@ -3916,6 +3927,14 @@ msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "" #, fuzzy +#~ msgid "" +#~ "Flash fired, compulsory flash mode, red-eye reduction, return light " +#~ "detected." +#~ msgstr "" +#~ "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, " +#~ "lumière de retour détectée." + +#, fuzzy #~ msgid "Flash not fired" #~ msgstr "Le flash ne s'est pas déclenché." Index: ru.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/ru.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -d -r1.6 -r1.7 --- ru.po 8 May 2007 16:45:28 -0000 1.6 +++ ru.po 10 May 2007 14:38:02 -0000 1.7 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-03 15:46+0200\n" +"POT-Creation-Date: 2007-05-10 15:58+0200\n" "PO-Revision-Date: 2006-01-12 13:25+0300\n" "Last-Translator: Alexandre Prokoudine <ale...@gm...>\n" "Language-Team: Russian <ru...@li...>\n" @@ -976,12 +976,12 @@ msgstr "%.2f mm" msgid "%.2f EV" msgstr "%.2f EV" -#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:775 +#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:776 #, c-format msgid "1/%d" msgstr "1/%d" -#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:778 +#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:779 #, c-format msgid "%d" msgstr "%d" @@ -1298,40 +1298,50 @@ msgstr "Motorola" msgid "Intel" msgstr "Intel" -#: libexif/exif-data.c:693 +#: libexif/exif-data.c:695 msgid "Size of data too small to allow for EXIF data." msgstr "" -#: libexif/exif-data.c:754 +#: libexif/exif-data.c:756 msgid "EXIF marker not found." msgstr "ÐаÑÐºÐµÑ EXIF не найден" -#: libexif/exif-data.c:781 +#: libexif/exif-data.c:783 msgid "EXIF header not found." msgstr "Ðаголовок EXIF не найден" -#: libexif/exif-data.c:797 +#: libexif/exif-data.c:799 msgid "Unknown encoding." msgstr "ÐеизвеÑÑÐ½Ð°Ñ ÐºÐ¾Ð´Ð¸Ñовка" -#: libexif/exif-data.c:1100 +#: libexif/exif-data.c:1102 msgid "Ignore unknown tags" msgstr "ÐгноÑиÑоваÑÑ Ð½ÐµÐ¸Ð·Ð²ÐµÑÑнÑе ÑÑги" -#: libexif/exif-data.c:1101 +#: libexif/exif-data.c:1103 msgid "Ignore unknown tags when loading EXIF data." msgstr "ÐгноÑиÑоваÑÑ Ð½ÐµÐ¸Ð·Ð²ÐµÑÑнÑе ÑÑги пÑи загÑÑзке даннÑÑ EXIF" -#: libexif/exif-data.c:1102 +#: libexif/exif-data.c:1104 msgid "Follow specification" msgstr "СледоваÑÑ ÑпеÑиÑикаÑии" -#: libexif/exif-data.c:1103 +#: libexif/exif-data.c:1105 msgid "" "Add, correct and remove entries to get EXIF data that follows the " "specification." msgstr "" +#: libexif/exif-data.c:1107 +msgid "Don not change maker note" +msgstr "" + +#: libexif/exif-data.c:1108 +msgid "" +"When loading and resaving Exif data, save the maker note unmodified. Be " +"aware that the maker note can get corrupted." +msgstr "" + #: libexif/exif-entry.c:202 libexif/exif-entry.c:236 #, c-format msgid "" @@ -1714,7 +1724,7 @@ msgstr "" msgid "Landscape mode (for landscape photos with the background in focus)" msgstr "ÐлÑбомнÑй Ñежим (Ð´Ð»Ñ Ð°Ð»ÑбомнÑÑ ÑоÑо Ñ Ð¿ÐµÑедним планом в ÑокÑÑе)" -#: libexif/exif-entry.c:491 +#: libexif/exif-entry.c:491 libexif/exif-entry.c:496 msgid "Flash did not fire." msgstr "СнÑÑо без вÑпÑÑки" @@ -1814,9 +1824,11 @@ msgid "" msgstr "" #: libexif/exif-entry.c:518 +#, fuzzy msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected." -msgstr "" +"Flash fired, compulsory flash mode, red-eye reduction mode, return light " +"detected." +msgstr "ÐÑпÑÑка ÑÑабоÑала, авÑомаÑиÑеÑкий Ñежим, возвÑаÑнÑй ÑÐ²ÐµÑ Ð½Ð°Ð¹Ð´ÐµÐ½" #: libexif/exif-entry.c:520 msgid "Flash did not fire, auto mode, red-eye reduction mode." @@ -1869,167 +1881,167 @@ msgstr "Adobe RGB" msgid "Uncalibrated" msgstr "Ðе оÑкалибÑовано" -#: libexif/exif-entry.c:589 +#: libexif/exif-entry.c:590 #, c-format msgid "Invalid size of entry (%i, expected %li x %i)." msgstr "ÐекоÑÑекÑнÑй ÑÐ°Ð·Ð¼ÐµÑ Ð·Ð°Ð¿Ð¸Ñи (%i, ожидалоÑÑ %li x %i)." -#: libexif/exif-entry.c:622 +#: libexif/exif-entry.c:623 msgid "Unsupported UNICODE string" msgstr "ÐеподдеÑÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ ÑÑÑока Unicode" -#: libexif/exif-entry.c:626 +#: libexif/exif-entry.c:627 msgid "Unsupported JIS string" msgstr "ÐеподдеÑÐ¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ ÑÑÑока JIS" -#: libexif/exif-entry.c:641 +#: libexif/exif-entry.c:642 msgid "Tag UserComment does not comply with standard but contains data." msgstr "ТÑг UserComment не ÑооÑвеÑÑÑвÑÐµÑ ÑÑандаÑÑÑ, но ÑодеÑÐ¶Ð¸Ñ Ð´Ð°Ð½Ð½Ñе" -#: libexif/exif-entry.c:645 +#: libexif/exif-entry.c:646 #, c-format msgid "Byte at position %i: 0x%02x" msgstr "ÐÐ°Ð¹Ñ Ð² позиÑии %i: 0x%02x" -#: libexif/exif-entry.c:654 +#: libexif/exif-entry.c:655 msgid "Unknown Exif Version" msgstr "ÐеизвеÑÑÐ½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ EXIF" -#: libexif/exif-entry.c:658 +#: libexif/exif-entry.c:659 #, c-format msgid "Exif Version %d.%d" msgstr "EXIF веÑÑии %d.%d" -#: libexif/exif-entry.c:669 +#: libexif/exif-entry.c:670 msgid "FlashPix Version 1.0" msgstr "FlashPix веÑÑии 1.0" -#: libexif/exif-entry.c:671 +#: libexif/exif-entry.c:672 msgid "FlashPix Version 1.01" msgstr "FlashPix веÑÑии 1.01" -#: libexif/exif-entry.c:673 +#: libexif/exif-entry.c:674 msgid "Unknown FlashPix Version" msgstr "ÐеизвеÑÑÐ½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ FlashPix" -#: libexif/exif-entry.c:686 libexif/exif-entry.c:698 libexif/exif-entry.c:1307 -#: libexif/exif-entry.c:1312 libexif/exif-entry.c:1315 -#: libexif/exif-entry.c:1320 libexif/exif-entry.c:1321 +#: libexif/exif-entry.c:687 libexif/exif-entry.c:699 libexif/exif-entry.c:1311 +#: libexif/exif-entry.c:1316 libexif/exif-entry.c:1319 +#: libexif/exif-entry.c:1324 libexif/exif-entry.c:1325 msgid "[None]" msgstr "[ÐиÑего]" -#: libexif/exif-entry.c:688 +#: libexif/exif-entry.c:689 msgid "(Photographer)" msgstr "(ФоÑогÑаÑ)" -#: libexif/exif-entry.c:701 +#: libexif/exif-entry.c:702 msgid "(Editor)" msgstr "(РедакÑоÑ)" -#: libexif/exif-entry.c:719 libexif/exif-entry.c:788 libexif/exif-entry.c:808 -#: libexif/exif-entry.c:846 +#: libexif/exif-entry.c:720 libexif/exif-entry.c:789 libexif/exif-entry.c:809 +#: libexif/exif-entry.c:847 #, c-format msgid "%.02f EV" msgstr "%.02f EV" -#: libexif/exif-entry.c:720 +#: libexif/exif-entry.c:721 #, c-format msgid " (f/%.01f)" msgstr "" -#: libexif/exif-entry.c:751 +#: libexif/exif-entry.c:752 #, c-format msgid " (35 equivalent: %d mm)" msgstr " (35мм ÑквиваленÑ: %d мм)" -#: libexif/exif-entry.c:779 libexif/exif-entry.c:780 +#: libexif/exif-entry.c:780 libexif/exif-entry.c:781 msgid " sec." msgstr " Ñек." -#: libexif/exif-entry.c:794 +#: libexif/exif-entry.c:795 #, c-format msgid " 1/%d sec.)" msgstr " 1/%d Ñек.)" -#: libexif/exif-entry.c:796 +#: libexif/exif-entry.c:797 #, c-format msgid " %d sec.)" msgstr " %d Ñек.)" -#: libexif/exif-entry.c:809 +#: libexif/exif-entry.c:810 #, c-format msgid " (%.02f cd/m^2)" msgstr "" -#: libexif/exif-entry.c:818 +#: libexif/exif-entry.c:819 msgid "DSC" msgstr "DSC" -#: libexif/exif-entry.c:827 +#: libexif/exif-entry.c:828 msgid "-" msgstr "-" -#: libexif/exif-entry.c:828 +#: libexif/exif-entry.c:829 msgid "Y" msgstr "Y" -#: libexif/exif-entry.c:829 +#: libexif/exif-entry.c:830 msgid "Cb" msgstr "Cb" -#: libexif/exif-entry.c:830 +#: libexif/exif-entry.c:831 msgid "Cr" msgstr "Cr" -#: libexif/exif-entry.c:831 +#: libexif/exif-entry.c:832 msgid "R" msgstr "R" -#: libexif/exif-entry.c:832 +#: libexif/exif-entry.c:833 msgid "G" msgstr "G" -#: libexif/exif-entry.c:833 +#: libexif/exif-entry.c:834 msgid "B" msgstr "B" -#: libexif/exif-entry.c:834 +#: libexif/exif-entry.c:835 msgid "reserved" msgstr "заÑезеÑвиÑовано" -#: libexif/exif-entry.c:856 +#: libexif/exif-entry.c:857 msgid "YCbCr4:2:2" msgstr "YCbCr4:2:2" -#: libexif/exif-entry.c:858 +#: libexif/exif-entry.c:859 msgid "YCbCr4:2:0" msgstr "YCbCr4:2:0" -#: libexif/exif-entry.c:864 +#: libexif/exif-entry.c:865 #, c-format msgid "%i bytes unknown data" msgstr "%i байÑов неизвеÑÑнÑÑ Ð´Ð°Ð½Ð½ÑÑ " -#: libexif/exif-entry.c:880 +#: libexif/exif-entry.c:881 #, c-format msgid "Within distance %i of (x,y) = (%i,%i)" msgstr "" -#: libexif/exif-entry.c:889 +#: libexif/exif-entry.c:890 #, c-format msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)" msgstr "" -#: libexif/exif-entry.c:895 +#: libexif/exif-entry.c:896 #, c-format msgid "Unexpected number of components (%li, expected 2, 3, or 4)." msgstr "Ðеожиданное колиÑеÑÑво компоненÑов (%li, ожидалоÑÑ 2, 3, или 4)." -#: libexif/exif-entry.c:916 libexif/exif-entry.c:960 +#: libexif/exif-entry.c:917 libexif/exif-entry.c:960 msgid "Internal error." msgstr "ÐнÑÑÑеннÑÑ Ð¾Ñибка" -#: libexif/exif-entry.c:924 +#: libexif/exif-entry.c:925 #, c-format msgid "Internal error (unknown value %i)." msgstr "ÐнÑÑÑеннÑÑ Ð¾Ñибка (неизвеÑÑное знаÑение %i)" Index: de.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/de.po,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -d -r1.34 -r1.35 --- de.po 8 May 2007 16:45:28 -0000 1.34 +++ de.po 10 May 2007 14:38:01 -0000 1.35 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-03 15:46+0200\n" +"POT-Creation-Date: 2007-05-10 15:58+0200\n" "PO-Revision-Date: 2006-10-17 17:03+0200\n" "Last-Translator: \n" "Language-Team: <de...@li...>\n" @@ -930,12 +930,12 @@ msgstr "%.2f mm" msgid "%.2f EV" msgstr "%.2f EV" -#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:775 +#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:776 #, c-format msgid "1/%d" msgstr "1/%d" -#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:778 +#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:779 #, c-format msgid "%d" msgstr "%d" @@ -1227,35 +1227,35 @@ msgstr "Motorola" msgid "Intel" msgstr "Intel" -#: libexif/exif-data.c:693 +#: libexif/exif-data.c:695 msgid "Size of data too small to allow for EXIF data." msgstr "GröÃe der Daten zu klein um EXIF Daten aufzunehmen." -#: libexif/exif-data.c:754 +#: libexif/exif-data.c:756 msgid "EXIF marker not found." msgstr "EXIF Marker nicht gefunden." -#: libexif/exif-data.c:781 +#: libexif/exif-data.c:783 msgid "EXIF header not found." msgstr "EXIF Informationen nicht gefunden." -#: libexif/exif-data.c:797 +#: libexif/exif-data.c:799 msgid "Unknown encoding." msgstr "Unbekannte Kodierung." -#: libexif/exif-data.c:1100 +#: libexif/exif-data.c:1102 msgid "Ignore unknown tags" msgstr "Ignoriere unbekannte EXIF Tags." -#: libexif/exif-data.c:1101 +#: libexif/exif-data.c:1103 msgid "Ignore unknown tags when loading EXIF data." msgstr "Ignoriere unbekannte Tags beim Laden der EXIF Daten." -#: libexif/exif-data.c:1102 +#: libexif/exif-data.c:1104 msgid "Follow specification" msgstr "Beachte Spezifikation." -#: libexif/exif-data.c:1103 +#: libexif/exif-data.c:1105 msgid "" "Add, correct and remove entries to get EXIF data that follows the " "specification." @@ -1263,6 +1263,16 @@ msgstr "" "Korrigiere, entferne oder füge fehlende Einträge zu den EXIF Daten hinzu, um " "Daten zu erhalten, die der Spezifikation entsprechen." +#: libexif/exif-data.c:1107 +msgid "Don not change maker note" +msgstr "" + +#: libexif/exif-data.c:1108 +msgid "" +"When loading and resaving Exif data, save the maker note unmodified. Be " +"aware that the maker note can get corrupted." +msgstr "" + #: libexif/exif-entry.c:202 libexif/exif-entry.c:236 #, c-format msgid "" @@ -1655,7 +1665,7 @@ msgstr "Portrait Modus (für Nahaufnahme msgid "Landscape mode (for landscape photos with the background in focus)" msgstr "Landschafts Modus (für Landschaftsaufnahmen mit scharfem Hintergrund)" -#: libexif/exif-entry.c:491 +#: libexif/exif-entry.c:491 libexif/exif-entry.c:496 msgid "Flash did not fire." msgstr "Blitz löste nicht aus." @@ -1755,10 +1765,12 @@ msgstr "" "Blitzreflektion erkannt." #: libexif/exif-entry.c:518 +#, fuzzy msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected." +"Flash fired, compulsory flash mode, red-eye reduction mode, return light " +"detected." msgstr "" -"Blitz ausgelöst, fester Blitzmodus, Rote Augen Reduktions Modus, " +"Blitz ausgelöst, fester Blitzmodus, Rote Augen Reduktions Modus, keine " "Blitzreflektion erkannt." #: libexif/exif-entry.c:520 @@ -1815,168 +1827,168 @@ msgstr "Adobe RGB" msgid "Uncalibrated" msgstr "Unkalibriert" -#: libexif/exif-entry.c:589 +#: libexif/exif-entry.c:590 #, c-format msgid "Invalid size of entry (%i, expected %li x %i)." msgstr "Ungültige GröÃe des Eintrags (%i, erwartet %li x %i)." -#: libexif/exif-entry.c:622 +#: libexif/exif-entry.c:623 msgid "Unsupported UNICODE string" msgstr "Nicht unterstützter UNICODE String." -#: libexif/exif-entry.c:626 +#: libexif/exif-entry.c:627 msgid "Unsupported JIS string" msgstr "Nicht unterstützter JIS String." -#: libexif/exif-entry.c:641 +#: libexif/exif-entry.c:642 msgid "Tag UserComment does not comply with standard but contains data." msgstr "" "Der Tag \"UserComment\" ist nicht standard konform, enthält aber Daten." -#: libexif/exif-entry.c:645 +#: libexif/exif-entry.c:646 #, c-format msgid "Byte at position %i: 0x%02x" msgstr "Byte an Position %i: 0x%02x" -#: libexif/exif-entry.c:654 +#: libexif/exif-entry.c:655 msgid "Unknown Exif Version" msgstr "Unbekannte Exif-Version" -#: libexif/exif-entry.c:658 +#: libexif/exif-entry.c:659 #, c-format msgid "Exif Version %d.%d" msgstr "Exif Version %d.%d" -#: libexif/exif-entry.c:669 +#: libexif/exif-entry.c:670 msgid "FlashPix Version 1.0" msgstr "FlashPix Version 1.0" -#: libexif/exif-entry.c:671 +#: libexif/exif-entry.c:672 msgid "FlashPix Version 1.01" msgstr "FlashPix Version 1.01" -#: libexif/exif-entry.c:673 +#: libexif/exif-entry.c:674 msgid "Unknown FlashPix Version" msgstr "Unbekannte FlashPix Version" -#: libexif/exif-entry.c:686 libexif/exif-entry.c:698 libexif/exif-entry.c:1307 -#: libexif/exif-entry.c:1312 libexif/exif-entry.c:1315 -#: libexif/exif-entry.c:1320 libexif/exif-entry.c:1321 +#: libexif/exif-entry.c:687 libexif/exif-entry.c:699 libexif/exif-entry.c:1311 +#: libexif/exif-entry.c:1316 libexif/exif-entry.c:1319 +#: libexif/exif-entry.c:1324 libexif/exif-entry.c:1325 msgid "[None]" msgstr "[Keins]" -#: libexif/exif-entry.c:688 +#: libexif/exif-entry.c:689 msgid "(Photographer)" msgstr "(Photograph)" -#: libexif/exif-entry.c:701 +#: libexif/exif-entry.c:702 msgid "(Editor)" msgstr "(Editor)" -#: libexif/exif-entry.c:719 libexif/exif-entry.c:788 libexif/exif-entry.c:808 -#: libexif/exif-entry.c:846 +#: libexif/exif-entry.c:720 libexif/exif-entry.c:789 libexif/exif-entry.c:809 +#: libexif/exif-entry.c:847 #, c-format msgid "%.02f EV" msgstr "%.02f EV" -#: libexif/exif-entry.c:720 +#: libexif/exif-entry.c:721 #, c-format msgid " (f/%.01f)" msgstr "" -#: libexif/exif-entry.c:751 +#: libexif/exif-entry.c:752 #, c-format msgid " (35 equivalent: %d mm)" msgstr " (35 äquivalent: %d mm)" -#: libexif/exif-entry.c:779 libexif/exif-entry.c:780 +#: libexif/exif-entry.c:780 libexif/exif-entry.c:781 msgid " sec." msgstr "sek." -#: libexif/exif-entry.c:794 +#: libexif/exif-entry.c:795 #, c-format msgid " 1/%d sec.)" msgstr "1/%dsek.)" -#: libexif/exif-entry.c:796 -#, c-format +#: libexif/exif-entry.c:797 +#, c-format msgid " %d sec.)" msgstr " %dsek.)" -#: libexif/exif-entry.c:809 +#: libexif/exif-entry.c:810 #, c-format msgid " (%.02f cd/m^2)" msgstr "" -#: libexif/exif-entry.c:818 +#: libexif/exif-entry.c:819 msgid "DSC" msgstr "DSC" -#: libexif/exif-entry.c:827 +#: libexif/exif-entry.c:828 msgid "-" msgstr "-" -#: libexif/exif-entry.c:828 +#: libexif/exif-entry.c:829 msgid "Y" msgstr "Y" -#: libexif/exif-entry.c:829 +#: libexif/exif-entry.c:830 msgid "Cb" msgstr "Cb" -#: libexif/exif-entry.c:830 +#: libexif/exif-entry.c:831 msgid "Cr" msgstr "Cr" -#: libexif/exif-entry.c:831 +#: libexif/exif-entry.c:832 msgid "R" msgstr "R" -#: libexif/exif-entry.c:832 +#: libexif/exif-entry.c:833 msgid "G" msgstr "G" -#: libexif/exif-entry.c:833 +#: libexif/exif-entry.c:834 msgid "B" msgstr "B" -#: libexif/exif-entry.c:834 +#: libexif/exif-entry.c:835 msgid "reserved" msgstr "reserviert" -#: libexif/exif-entry.c:856 +#: libexif/exif-entry.c:857 msgid "YCbCr4:2:2" msgstr "YCbCr4:2:2" -#: libexif/exif-entry.c:858 +#: libexif/exif-entry.c:859 msgid "YCbCr4:2:0" msgstr "YCbCr4:2:0" -#: libexif/exif-entry.c:864 +#: libexif/exif-entry.c:865 #, c-format msgid "%i bytes unknown data" msgstr "%i Byte(s) unbekannte Daten" -#: libexif/exif-entry.c:880 +#: libexif/exif-entry.c:881 #, c-format msgid "Within distance %i of (x,y) = (%i,%i)" msgstr "Innerhalb einer Entfernung %i von (x,y) = (%i,%i)" -#: libexif/exif-entry.c:889 +#: libexif/exif-entry.c:890 #, c-format msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)" msgstr "Innerhalb eines Rechtecks (Breite %i, Höhe %i) um (x,y) = (%i,%i)" -#: libexif/exif-entry.c:895 +#: libexif/exif-entry.c:896 #, c-format msgid "Unexpected number of components (%li, expected 2, 3, or 4)." msgstr "Unerwartete Nummer von Komponenten (%li, erwartete 2, 3 oder 4)." -#: libexif/exif-entry.c:916 libexif/exif-entry.c:960 +#: libexif/exif-entry.c:917 libexif/exif-entry.c:960 msgid "Internal error." msgstr "Interner Fehler." -#: libexif/exif-entry.c:924 +#: libexif/exif-entry.c:925 #, c-format msgid "Internal error (unknown value %i)." msgstr "Interner Fehler (unbekannter Wert %i)." @@ -3947,6 +3959,13 @@ msgstr "Sommerzeit" msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "[DO_NOT_TRANSLATE_THIS_MARKER_de]" +#~ msgid "" +#~ "Flash fired, compulsory flash mode, red-eye reduction, return light " +#~ "detected." +#~ msgstr "" +#~ "Blitz ausgelöst, fester Blitzmodus, Rote Augen Reduktions Modus, " +#~ "Blitzreflektion erkannt." + #~ msgid "flash did not fire" #~ msgstr "Blitz löste nicht aus." Index: pl.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/pl.po,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -d -r1.8 -r1.9 --- pl.po 8 May 2007 16:45:28 -0000 1.8 +++ pl.po 10 May 2007 14:38:02 -0000 1.9 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libexif 0.6.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-03 15:46+0200\n" +"POT-Creation-Date: 2007-05-10 15:58+0200\n" "PO-Revision-Date: 2006-01-05 18:20+0100\n" "Last-Translator: Jakub Bogusz <qb...@pl...>\n" "Language-Team: Polish <tra...@li...>\n" @@ -979,12 +979,12 @@ msgstr "%.2f mm" msgid "%.2f EV" msgstr "%.2f EV" -#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:775 +#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:776 #, c-format msgid "1/%d" msgstr "1/%d" -#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:778 +#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:779 #, c-format msgid "%d" msgstr "%d" @@ -1304,35 +1304,35 @@ msgstr "Motorola" msgid "Intel" msgstr "Intel" -#: libexif/exif-data.c:693 +#: libexif/exif-data.c:695 msgid "Size of data too small to allow for EXIF data." msgstr "Rozmiar danych zbyt maÅy aby pozwalaÅ na dane EXIF." -#: libexif/exif-data.c:754 +#: libexif/exif-data.c:756 msgid "EXIF marker not found." msgstr "Nie znaleziono znacznika EXIF." -#: libexif/exif-data.c:781 +#: libexif/exif-data.c:783 msgid "EXIF header not found." msgstr "Nie znaleziono nagÅówka EXIF." -#: libexif/exif-data.c:797 +#: libexif/exif-data.c:799 msgid "Unknown encoding." msgstr "Nieznane kodowanie." -#: libexif/exif-data.c:1100 +#: libexif/exif-data.c:1102 msgid "Ignore unknown tags" msgstr "Ignorowanie nieznanych znaczników" -#: libexif/exif-data.c:1101 +#: libexif/exif-data.c:1103 msgid "Ignore unknown tags when loading EXIF data." msgstr "Ignorowanie nieznanych znaczników przy wczytywaniu danych EXIF." -#: libexif/exif-data.c:1102 +#: libexif/exif-data.c:1104 msgid "Follow specification" msgstr "ZgodnoÅÄ ze specyfikacjÄ " -#: libexif/exif-data.c:1103 +#: libexif/exif-data.c:1105 msgid "" "Add, correct and remove entries to get EXIF data that follows the " "specification." @@ -1340,6 +1340,16 @@ msgstr "" "Dodawanie, poprawianie i usuwanie wpisów aby uzyskaÄ dane EXIF zgodne ze " "specyfikacjÄ ." +#: libexif/exif-data.c:1107 +msgid "Don not change maker note" +msgstr "" + +#: libexif/exif-data.c:1108 +msgid "" +"When loading and resaving Exif data, save the maker note unmodified. Be " +"aware that the maker note can get corrupted." +msgstr "" + #: libexif/exif-entry.c:202 libexif/exif-entry.c:236 #, c-format msgid "" @@ -1729,7 +1739,7 @@ msgstr "Tryb portretowy (do zbliżeÅ z msgid "Landscape mode (for landscape photos with the background in focus)" msgstr "Tryb pejzażowy (do krajobrazów z tÅem w ognisku)" -#: libexif/exif-entry.c:491 +#: libexif/exif-entry.c:491 libexif/exif-entry.c:496 msgid "Flash did not fire." msgstr "Flesz siÄ nie uruchomiÅ." @@ -1836,11 +1846,13 @@ msgstr "" "zwrotne nie wykryte." #: libexif/exif-entry.c:518 +#, fuzzy msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected." +"Flash fired, compulsory flash mode, red-eye reduction mode, return light " +"detected." msgstr "" "Flesz siÄ uruchomiÅ w trybie pulsujÄ cym z redukcjÄ czerwonych oczu, ÅwiatÅo " -"zwrotne wykryte." +"zwrotne nie wykryte." #: libexif/exif-entry.c:520 msgid "Flash did not fire, auto mode, red-eye reduction mode." @@ -1896,168 +1908,168 @@ msgstr "RGB Adobe" msgid "Uncalibrated" msgstr "Nieskalibrowana" -#: libexif/exif-entry.c:589 +#: libexif/exif-entry.c:590 #, c-format msgid "Invalid size of entry (%i, expected %li x %i)." msgstr "BÅÄdny rozmiar wpisu (%i, a oczekiwano %li x %i)." -#: libexif/exif-entry.c:622 +#: libexif/exif-entry.c:623 msgid "Unsupported UNICODE string" msgstr "NieobsÅugiwany ÅaÅcuch UNICODE" -#: libexif/exif-entry.c:626 +#: libexif/exif-entry.c:627 msgid "Unsupported JIS string" msgstr "NieobsÅugiwany ÅaÅcuch JIS" -#: libexif/exif-entry.c:641 +#: libexif/exif-entry.c:642 msgid "Tag UserComment does not comply with standard but contains data." msgstr "Znacznik UserComment nie jest zgodny ze standardem, ale zawiera dane." -#: libexif/exif-entry.c:645 +#: libexif/exif-entry.c:646 #, c-format msgid "Byte at position %i: 0x%02x" msgstr "Bajt na pozycji %i: 0x%02x" -#: libexif/exif-entry.c:654 +#: libexif/exif-entry.c:655 msgid "Unknown Exif Version" msgstr "Nieznana wersja Exif" -#: libexif/exif-entry.c:658 +#: libexif/exif-entry.c:659 #, c-format msgid "Exif Version %d.%d" msgstr "Exif w wersji %d.%d" -#: libexif/exif-entry.c:669 +#: libexif/exif-entry.c:670 msgid "FlashPix Version 1.0" msgstr "FlashPix w wersji 1.0" -#: libexif/exif-entry.c:671 +#: libexif/exif-entry.c:672 msgid "FlashPix Version 1.01" msgstr "FlashPIx w wersji 1.01" -#: libexif/exif-entry.c:673 +#: libexif/exif-entry.c:674 msgid "Unknown FlashPix Version" msgstr "Nieznana wersja FlashPix" -#: libexif/exif-entry.c:686 libexif/exif-entry.c:698 libexif/exif-entry.c:1307 -#: libexif/exif-entry.c:1312 libexif/exif-entry.c:1315 -#: libexif/exif-entry.c:1320 libexif/exif-entry.c:1321 +#: libexif/exif-entry.c:687 libexif/exif-entry.c:699 libexif/exif-entry.c:1311 +#: libexif/exif-entry.c:1316 libexif/exif-entry.c:1319 +#: libexif/exif-entry.c:1324 libexif/exif-entry.c:1325 msgid "[None]" msgstr "[Brak]" -#: libexif/exif-entry.c:688 +#: libexif/exif-entry.c:689 msgid "(Photographer)" msgstr "(Fotograf)" -#: libexif/exif-entry.c:701 +#: libexif/exif-entry.c:702 msgid "(Editor)" msgstr "(Redaktor)" -#: libexif/exif-entry.c:719 libexif/exif-entry.c:788 libexif/exif-entry.c:808 -#: libexif/exif-entry.c:846 +#: libexif/exif-entry.c:720 libexif/exif-entry.c:789 libexif/exif-entry.c:809 +#: libexif/exif-entry.c:847 #, c-format msgid "%.02f EV" msgstr "%.02f EV" -#: libexif/exif-entry.c:720 +#: libexif/exif-entry.c:721 #, c-format msgid " (f/%.01f)" msgstr "" -#: libexif/exif-entry.c:751 +#: libexif/exif-entry.c:752 #, c-format msgid " (35 equivalent: %d mm)" msgstr " (odpowiednik 35: %d mm)" -#: libexif/exif-entry.c:779 libexif/exif-entry.c:780 +#: libexif/exif-entry.c:780 libexif/exif-entry.c:781 msgid " sec." msgstr " sek." -#: libexif/exif-entry.c:794 +#: libexif/exif-entry.c:795 #, c-format msgid " 1/%d sec.)" msgstr " 1/%d sek.)" -#: libexif/exif-entry.c:796 +#: libexif/exif-entry.c:797 #, c-format msgid " %d sec.)" msgstr " %d sek.)" -#: libexif/exif-entry.c:809 +#: libexif/exif-entry.c:810 #, c-format msgid " (%.02f cd/m^2)" msgstr "" -#: libexif/exif-entry.c:818 +#: libexif/exif-entry.c:819 msgid "DSC" msgstr "DSC" -#: libexif/exif-entry.c:827 +#: libexif/exif-entry.c:828 msgid "-" msgstr "-" -#: libexif/exif-entry.c:828 +#: libexif/exif-entry.c:829 msgid "Y" msgstr "Y" -#: libexif/exif-entry.c:829 +#: libexif/exif-entry.c:830 msgid "Cb" msgstr "Cb" -#: libexif/exif-entry.c:830 +#: libexif/exif-entry.c:831 msgid "Cr" msgstr "Cr" -#: libexif/exif-entry.c:831 +#: libexif/exif-entry.c:832 msgid "R" msgstr "R" -#: libexif/exif-entry.c:832 +#: libexif/exif-entry.c:833 msgid "G" msgstr "G" -#: libexif/exif-entry.c:833 +#: libexif/exif-entry.c:834 msgid "B" msgstr "B" -#: libexif/exif-entry.c:834 +#: libexif/exif-entry.c:835 msgid "reserved" msgstr "zarezerwowany" -#: libexif/exif-entry.c:856 +#: libexif/exif-entry.c:857 msgid "YCbCr4:2:2" msgstr "YCbCr4:2:2" -#: libexif/exif-entry.c:858 +#: libexif/exif-entry.c:859 msgid "YCbCr4:2:0" msgstr "YCbCr4:2:0" -#: libexif/exif-entry.c:864 +#: libexif/exif-entry.c:865 #, c-format msgid "%i bytes unknown data" msgstr "%i bajtów nieznanych danych" -#: libexif/exif-entry.c:880 +#: libexif/exif-entry.c:881 #, c-format msgid "Within distance %i of (x,y) = (%i,%i)" msgstr "W odlegÅoÅci %i w (x,y) = (%i,%i)" -#: libexif/exif-entry.c:889 +#: libexif/exif-entry.c:890 #, c-format msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)" msgstr "" "WewnÄ trz prostokÄ ta (szerokoÅÄ %i, wysokoÅÄ %i) w okolicy (x,y) = (%i,%i)" -#: libexif/exif-entry.c:895 +#: libexif/exif-entry.c:896 #, c-format msgid "Unexpected number of components (%li, expected 2, 3, or 4)." msgstr "Nieoczekiwana liczba skÅadowych (%li, a oczekiwano 2, 3 lub 4)." -#: libexif/exif-entry.c:916 libexif/exif-entry.c:960 +#: libexif/exif-entry.c:917 libexif/exif-entry.c:960 msgid "Internal error." msgstr "BÅÄ d wewnÄtrzny." -#: libexif/exif-entry.c:924 +#: libexif/exif-entry.c:925 #, c-format msgid "Internal error (unknown value %i)." msgstr "BÅÄ d wewnÄtrzny (nieznana wartoÅÄ %i)." @@ -4077,6 +4089,13 @@ msgstr "Zmiana czasu" msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]" +#~ msgid "" +#~ "Flash fired, compulsory flash mode, red-eye reduction, return light " +#~ "detected." +#~ msgstr "" +#~ "Flesz siÄ uruchomiÅ w trybie pulsujÄ cym z redukcjÄ czerwonych oczu, " +#~ "ÅwiatÅo zwrotne wykryte." + #~ msgid "flash did not fire" #~ msgstr "flesz siÄ nie uruchomiÅ" Index: vi.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/vi.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -d -r1.6 -r1.7 --- vi.po 8 May 2007 16:45:28 -0000 1.6 +++ vi.po 10 May 2007 14:38:02 -0000 1.7 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: libexif-0.6.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-03 15:46+0200\n" +"POT-Creation-Date: 2007-05-10 15:58+0200\n" "PO-Revision-Date: 2006-02-11 22:57+1030\n" "Last-Translator: Clytie Siddall <cl...@ri...>\n" "Language-Team: Vietnamese <gno...@li...>\n" @@ -977,7 +977,7 @@ msgid "%i" msgstr "%i" #: libexif/canon/mnote-canon-entry.c:515 -#, c-format +#, c-format msgid "%.2f mm" msgstr "%.2f mm" @@ -986,13 +986,13 @@ msgstr "%.2f mm" msgid "%.2f EV" msgstr "%.2f EV" -#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:775 +#: libexif/canon/mnote-canon-entry.c:547 libexif/exif-entry.c:776 #, c-format msgid "1/%d" msgstr "1/%d" # Variable: don't translate / Biến: Äừng dá»ch -#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:778 +#: libexif/canon/mnote-canon-entry.c:549 libexif/exif-entry.c:779 #, c-format msgid "%d" msgstr "%d" @@ -1317,40 +1317,50 @@ msgstr "Motorola" msgid "Intel" msgstr "Intel" -#: libexif/exif-data.c:693 +#: libexif/exif-data.c:695 msgid "Size of data too small to allow for EXIF data." msgstr "Dữ liá»u có kÃch cỡ quá nhá» Äá» chứa dữ liá»u EXIF." -#: libexif/exif-data.c:754 +#: libexif/exif-data.c:756 msgid "EXIF marker not found." msgstr "Không tìm thấy dấu hiá»u EXIF." -#: libexif/exif-data.c:781 +#: libexif/exif-data.c:783 msgid "EXIF header not found." msgstr "Không tìm thấy phần Äầu EXIF." -#: libexif/exif-data.c:797 +#: libexif/exif-data.c:799 msgid "Unknown encoding." msgstr "Không biết bảng mã." -#: libexif/exif-data.c:1100 +#: libexif/exif-data.c:1102 msgid "Ignore unknown tags" msgstr "Bá» qua các thẻ lạ" -#: libexif/exif-data.c:1101 +#: libexif/exif-data.c:1103 msgid "Ignore unknown tags when loading EXIF data." msgstr "Bá» qua các thẻ lạ khi tải dữ liá»u EXIF." -#: libexif/exif-data.c:1102 +#: libexif/exif-data.c:1104 msgid "Follow specification" msgstr "Theo Äặc tả" -#: libexif/exif-data.c:1103 +#: libexif/exif-data.c:1105 msgid "" "Add, correct and remove entries to get EXIF data that follows the " "specification." msgstr "Thêm, sá»a và gỡ bá» mục nháºp Äá» tạo dữ liá»u EXIF tùy theo Äặc tả." +#: libexif/exif-data.c:1107 +msgid "Don not change maker note" +msgstr "" + +#: libexif/exif-data.c:1108 +msgid "" +"When loading and resaving Exif data, save the maker note unmodified. Be " +"aware that the maker note can get corrupted." +msgstr "" + #: libexif/exif-entry.c:202 libexif/exif-entry.c:236 #, c-format msgid "" @@ -1744,7 +1754,7 @@ msgstr "Chế Äá» thẳng Äứng (chá msgid "Landscape mode (for landscape photos with the background in focus)" msgstr "Chế Äá» nằm ngang (chụp phong cảnh vá»i ná»n rõ)" -#: libexif/exif-entry.c:491 +#: libexif/exif-entry.c:491 libexif/exif-entry.c:496 msgid "Flash did not fire." msgstr "Äèn nháy chÆ°a hoạt Äá»ng." @@ -1849,11 +1859,13 @@ msgstr "" "hiá»n ánh sáng trá» vá»." #: libexif/exif-entry.c:518 +#, fuzzy msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected." +"Flash fired, compulsory flash mode, red-eye reduction mode, return light " +"detected." msgstr "" -"Äèn nháy Äã hoạt Äá»ng, chế Äá» nháy bắt buá»c, chế Äá» giảm mặt Äá», phát hiá»n " -"ánh sáng trá» vá»." +"Äèn nháy Äã hoạt Äá»ng, chế Äá» nháy bắt buá»c, chế Äá» giảm mặt Äá», chÆ°a phát " +"hiá»n ánh sáng trá» vá»." #: libexif/exif-entry.c:520 msgid "Flash did not fire, auto mode, red-eye reduction mode." @@ -1909,168 +1921,168 @@ msgstr "Adobe RGB" msgid "Uncalibrated" msgstr "ChÆ°a Äá»nh chuẩn" -#: libexif/exif-entry.c:589 +#: libexif/exif-entry.c:590 #, c-format msgid "Invalid size of entry (%i, expected %li x %i)." msgstr "Mục nháºp có kÃch cỡ không hợp lá» (%i, còn ngá» %li x %i)." -#: libexif/exif-entry.c:622 +#: libexif/exif-entry.c:623 msgid "Unsupported UNICODE string" msgstr "Chuá»i Unicode không Äược há» trợ" -#: libexif/exif-entry.c:626 +#: libexif/exif-entry.c:627 msgid "Unsupported JIS string" msgstr "Chuá»i JIS không Äược há» trợ" -#: libexif/exif-entry.c:641 +#: libexif/exif-entry.c:642 msgid "Tag UserComment does not comply with standard but contains data." msgstr "" "Thẻ « NgÆ°á»i dùng ghi chú » không tuân theo tiêu chuẩn, còn chứa dữ liá»u." -#: libexif/exif-entry.c:645 +#: libexif/exif-entry.c:646 #, c-format msgid "Byte at position %i: 0x%02x" msgstr "Có byte tại vá» trà %i: 0x%02x" -#: libexif/exif-entry.c:654 +#: libexif/exif-entry.c:655 msgid "Unknown Exif Version" msgstr "Không biết phiên bản EXIF" -#: libexif/exif-entry.c:658 +#: libexif/exif-entry.c:659 #, c-format msgid "Exif Version %d.%d" msgstr "Phiên bản EXIF %d.%d" -#: libexif/exif-entry.c:669 +#: libexif/exif-entry.c:670 msgid "FlashPix Version 1.0" msgstr "FlashPix phiên bản 1.0" -#: libexif/exif-entry.c:671 +#: libexif/exif-entry.c:672 msgid "FlashPix Version 1.01" msgstr "FlashPix phiên bản 1.01" -#: libexif/exif-entry.c:673 +#: libexif/exif-entry.c:674 msgid "Unknown FlashPix Version" msgstr "Không biết phiên bản FlashPix" -#: libexif/exif-entry.c:686 libexif/exif-entry.c:698 libexif/exif-entry.c:1307 -#: libexif/exif-entry.c:1312 libexif/exif-entry.c:1315 -#: libexif/exif-entry.c:1320 libexif/exif-entry.c:1321 +#: libexif/exif-entry.c:687 libexif/exif-entry.c:699 libexif/exif-entry.c:1311 +#: libexif/exif-entry.c:1316 libexif/exif-entry.c:1319 +#: libexif/exif-entry.c:1324 libexif/exif-entry.c:1325 msgid "[None]" msgstr "[Không có]" -#: libexif/exif-entry.c:688 +#: libexif/exif-entry.c:689 msgid "(Photographer)" msgstr "(Nhà nhiếp ảnh)" -#: libexif/exif-entry.c:701 +#: libexif/exif-entry.c:702 msgid "(Editor)" msgstr "(Nhà soạn thảo)" -#: libexif/exif-entry.c:719 libexif/exif-entry.c:788 libexif/exif-entry.c:808 -#: libexif/exif-entry.c:846 +#: libexif/exif-entry.c:720 libexif/exif-entry.c:789 libexif/exif-entry.c:809 +#: libexif/exif-entry.c:847 #, c-format msgid "%.02f EV" msgstr "%.02f EV" -#: libexif/exif-entry.c:720 +#: libexif/exif-entry.c:721 #, c-format msgid " (f/%.01f)" msgstr "" -#: libexif/exif-entry.c:751 +#: libexif/exif-entry.c:752 #, c-format msgid " (35 equivalent: %d mm)" msgstr " (35 tÆ°Æ¡ng ÄÆ°Æ¡ng: %d mm)" -#: libexif/exif-entry.c:779 libexif/exif-entry.c:780 +#: libexif/exif-entry.c:780 libexif/exif-entry.c:781 msgid " sec." msgstr " giây" -#: libexif/exif-entry.c:794 +#: libexif/exif-entry.c:795 #, c-format msgid " 1/%d sec.)" msgstr " 1/%d giây)" -#: libexif/exif-entry.c:796 +#: libexif/exif-entry.c:797 #, c-format msgid " %d sec.)" msgstr " %d giây)" -#: libexif/exif-entry.c:809 +#: libexif/exif-entry.c:810 #, c-format msgid " (%.02f cd/m^2)" msgstr "" -#: libexif/exif-entry.c:818 +#: libexif/exif-entry.c:819 msgid "DSC" msgstr "DSC" -#: libexif/exif-entry.c:827 +#: libexif/exif-entry.c:828 msgid "-" msgstr "-" -#: libexif/exif-entry.c:828 +#: libexif/exif-entry.c:829 msgid "Y" msgstr "Y" -#: libexif/exif-entry.c:829 +#: libexif/exif-entry.c:830 msgid "Cb" msgstr "Cb" -#: libexif/exif-entry.c:830 +#: libexif/exif-entry.c:831 msgid "Cr" msgstr "Cr" -#: libexif/exif-entry.c:831 +#: libexif/exif-entry.c:832 msgid "R" msgstr "R" -#: libexif/exif-entry.c:832 +#: libexif/exif-entry.c:833 msgid "G" msgstr "G" -#: libexif/exif-entry.c:833 +#: libexif/exif-entry.c:834 msgid "B" msgstr "B" -#: libexif/exif-entry.c:834 +#: libexif/exif-entry.c:835 msgid "reserved" msgstr "dá»± trữ" -#: libexif/exif-entry.c:856 +#: libexif/exif-entry.c:857 msgid "YCbCr4:2:2" msgstr "YCbCr4:2:2" -#: libexif/exif-entry.c:858 +#: libexif/exif-entry.c:859 msgid "YCbCr4:2:0" msgstr "YCbCr4:2:0" -#: libexif/exif-entry.c:864 +#: libexif/exif-entry.c:865 #, c-format msgid "%i bytes unknown data" msgstr "%i byte dữ liá»u lạ" -#: libexif/exif-entry.c:880 +#: libexif/exif-entry.c:881 #, c-format msgid "Within distance %i of (x,y) = (%i,%i)" msgstr "Trong khoảng cách %i trên (x,y) = (%i,%i)" -#: libexif/exif-entry.c:889 +#: libexif/exif-entry.c:890 #, c-format msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)" msgstr "Trong há»p (rá»ng %i, cao %i) chung quanh (x,y) = (%i,%i)" -#: libexif/exif-entry.c:895 +#: libexif/exif-entry.c:896 #, c-format msgid "Unexpected number of components (%li, expected 2, 3, or 4)." msgstr "Sá» thà nh phần bất ngá» (%li, còn ngá» 2, 3, hay 4)." -#: libexif/exif-entry.c:916 libexif/exif-entry.c:960 +#: libexif/exif-entry.c:917 libexif/exif-entry.c:960 msgid "Internal error." msgstr "Lá»i ná»i bá»." -#: libexif/exif-entry.c:924 +#: libexif/exif-entry.c:925 #, c-format msgid "Internal error (unknown value %i)." msgstr "Lá»i ná»i bá» (không biết giá trá» %i)." @@ -4058,6 +4070,13 @@ msgstr "Giá» giữ ban ngà y" msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]" +#~ msgid "" +#~ "Flash fired, compulsory flash mode, red-eye reduction, return light " +#~ "detected." +#~ msgstr "" +#~ "Äèn nháy Äã hoạt Äá»ng, chế Äá» nháy bắt buá»c, chế Äá» giảm mặt Äá», phát " +#~ "hiá»n ánh sáng trá» vá»." + #~ msgid "flash did not fire" #~ msgstr "Äèn nháy chÆ°a hoạt Äá»ng" |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 14:32:05
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9028/libexif Modified Files: exif-data.c Log Message: Fixes: #1716196 Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -d -r1.89 -r1.90 --- exif-data.c 9 May 2007 06:09:05 -0000 1.89 +++ exif-data.c 10 May 2007 14:32:01 -0000 1.90 @@ -179,7 +179,9 @@ exif_data_load_data_entry (ExifData *dat else doff = offset + 8; - /* Sanity check */ + /* Sanity checks */ + if ((doff + s < doff) || (doff + s < s)) + return 0; if (size < doff + s) return 0; |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 14:30:26
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8522 Modified Files: Makefile.am Log Message: also include auto-m4 dir Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/Makefile.am,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -d -r1.40 -r1.41 --- Makefile.am 26 Dec 2005 00:39:50 -0000 1.40 +++ Makefile.am 10 May 2007 14:30:22 -0000 1.41 @@ -6,7 +6,7 @@ endif EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST) -ACLOCAL_AMFLAGS = -I m4m +ACLOCAL_AMFLAGS = -I auto-m4 -I m4m doc_DATA = README AUTHORS NEWS ChangeLog ABOUT-NLS COPYING |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 14:27:11
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7202 Modified Files: NEWS Log Message: update NEWS Index: NEWS =================================================================== RCS file: /cvsroot/libexif/libexif/NEWS,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -d -r1.9 -r1.10 --- NEWS 27 Dec 2005 21:30:11 -0000 1.9 +++ NEWS 10 May 2007 14:27:07 -0000 1.10 @@ -1,6 +1,11 @@ -New in CVS HEAD since 0.6.13 (2005-12-27): +New in 0.6.14 since 0.6.13 (2005-12-27): -New in CVS HEAD since 0.6.12 (2005-03-13): + * Bug fixes: #1716196 + + * Other fixes and improvements. + + +New in 0.6.13 since 0.6.12 (2005-03-13): * Bug fixes: #803191, #1051994, #1054321, #1054323, #1196787 |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 14:26:56
|
Update of /cvsroot/libexif/libexif/test/nls In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6882/test/nls Modified Files: Makefile.am Log Message: use non-GNU make rules Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/test/nls/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -d -r1.6 -r1.7 --- Makefile.am 24 Apr 2005 09:05:14 -0000 1.6 +++ Makefile.am 10 May 2007 14:26:51 -0000 1.7 @@ -29,6 +29,6 @@ CLEANFILES = $(check_SCRIPTS) EXTRA_DIST = check-localedir.in check-nls.in test-nls.c test-codeset.c -%.sh: %.in Makefile +.in.sh: Makefile sed 's|@top_builddir\@|$(top_builddir)|g;s|@localedir\@|$(localedir)|g;s|@PRINT_LOCALEDIR\@|./print-localedir$(EXEEXT)|g;s|@build_alias\@|$(build_alias)|g;s|@host_alias\@|$(host_alias)|g;s|@codeset_tests\@|$(codeset_tests)|g;s|@DESTDIR\@|$(DESTDIR)|g' < $< > $@ chmod +x $@ |
|
From: Hans U. N. <hu...@us...> - 2007-05-10 14:25:56
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6429 Modified Files: configure.ac Log Message: require automake >= 1.9, check NEWS, update NEWS, update so revision, add pedantic C checks for gcc Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/libexif/configure.ac,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -d -r1.17 -r1.18 --- configure.ac 18 Feb 2006 21:07:16 -0000 1.17 +++ configure.ac 10 May 2007 14:25:51 -0000 1.18 @@ -2,7 +2,8 @@ AC_PREREQ(2.59) AC_INIT([EXIF library],[0.6.14],[lib...@li...],[libexif]) AC_CONFIG_SRCDIR([libexif/exif-data.h]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2 dist-zip]) +AC_CONFIG_MACRO_DIR([auto-m4]) +AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 dist-zip check-news]) if test ! -d "$srcdir/m4m"; then AC_MSG_ERROR([ @@ -46,7 +47,7 @@ dnl increment AGE, Otherwise AGE is res dnl REVISION is set to 0, otherwise REVISION is incremented. dnl --------------------------------------------------------------------------- LIBEXIF_AGE=0 -LIBEXIF_REVISION=1 +LIBEXIF_REVISION=2 LIBEXIF_CURRENT=12 AC_SUBST([LIBEXIF_AGE]) AC_SUBST([LIBEXIF_REVISION]) @@ -145,6 +146,8 @@ AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdi AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/libexif" AM_LDFLAGS="$LDFLAGS" if test "x$GCC" = "xyes"; then + AM_CFLAGS="$AM_CFLAGS -ansi -pedantic-error" + AM_CXXFLAGS="$AM_CXXFLAGS -ansi -pedantic-error" AM_CPPFLAGS="$AM_CPPFLAGS -g -Wall -Wmissing-declarations -Wmissing-prototypes" AM_LDFLAGS="$AM_LDFLAGS -g -Wall" fi |
|
From: Jan P. <pa...@us...> - 2007-05-09 06:15:26
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12201 Modified Files: exif-mnote-data-canon.c exif-mnote-data-canon.h mnote-canon-tag.c mnote-canon-tag.h Log Message: Fix of Bug #1617991: EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS is now propagated to Canon makernote and used to ignore unknown subtags of Settings1, Settings2, FocalLength & Panorama makernote tags. Index: mnote-canon-tag.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -d -r1.11 -r1.12 --- mnote-canon-tag.c 16 Oct 2006 09:56:50 -0000 1.11 +++ mnote-canon-tag.c 9 May 2007 06:15:23 -0000 1.12 @@ -127,13 +127,22 @@ mnote_canon_tag_get_name (MnoteCanonTag } const char * -mnote_canon_tag_get_name_sub (MnoteCanonTag t, unsigned int s) +mnote_canon_tag_get_name_sub (MnoteCanonTag t, unsigned int s, ExifDataOption o) { unsigned int i; - for (i = 0; i < sizeof (table_sub) / sizeof (table_sub[0]); i++) - if ((table_sub[i].tag == t) && (table_sub[i].subtag == s)) - return table_sub[i].name; - return mnote_canon_tag_get_name (t); + int tag_found = 0; + + for (i = 0; i < sizeof (table_sub) / sizeof (table_sub[0]); i++) { + if (table_sub[i].tag == t) { + if (table_sub[i].subtag == s) + return table_sub[i].name; + tag_found = 1; + } + } + if (!tag_found || !(o & EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS)) + return mnote_canon_tag_get_name (t); + else + return NULL; } const char * @@ -148,13 +157,22 @@ mnote_canon_tag_get_title (MnoteCanonTag } const char * -mnote_canon_tag_get_title_sub (MnoteCanonTag t, unsigned int s) +mnote_canon_tag_get_title_sub (MnoteCanonTag t, unsigned int s, ExifDataOption o) { unsigned int i; - for (i = 0; i < sizeof (table_sub) / sizeof (table_sub[0]); i++) - if ((table_sub[i].tag == t) && (table_sub[i].subtag == s)) - return _(table_sub[i].name); - return mnote_canon_tag_get_title (t); + int tag_found = 0; + + for (i = 0; i < sizeof (table_sub) / sizeof (table_sub[0]); i++) { + if (table_sub[i].tag == t) { + if (table_sub[i].subtag == s) + return _(table_sub[i].name); + tag_found = 1; + } + } + if (!tag_found || !(o & EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS)) + return mnote_canon_tag_get_title (t); + else + return NULL; } const char * Index: mnote-canon-tag.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- mnote-canon-tag.h 17 Sep 2006 10:18:29 -0000 1.3 +++ mnote-canon-tag.h 9 May 2007 06:15:23 -0000 1.4 @@ -21,6 +21,8 @@ #ifndef __MNOTE_CANON_TAG_H__ #define __MNOTE_CANON_TAG_H__ +#include <libexif/exif-data.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -44,9 +46,9 @@ enum _MnoteCanonTag { typedef enum _MnoteCanonTag MnoteCanonTag; const char *mnote_canon_tag_get_name (MnoteCanonTag); -const char *mnote_canon_tag_get_name_sub (MnoteCanonTag, unsigned int); +const char *mnote_canon_tag_get_name_sub (MnoteCanonTag, unsigned int, ExifDataOption); const char *mnote_canon_tag_get_title (MnoteCanonTag); -const char *mnote_canon_tag_get_title_sub (MnoteCanonTag, unsigned int); +const char *mnote_canon_tag_get_title_sub (MnoteCanonTag, unsigned int, ExifDataOption); const char *mnote_canon_tag_get_description (MnoteCanonTag); #ifdef __cplusplus Index: exif-mnote-data-canon.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -d -r1.14 -r1.15 --- exif-mnote-data-canon.c 22 Aug 2005 22:59:57 -0000 1.14 +++ exif-mnote-data-canon.c 9 May 2007 06:15:23 -0000 1.15 @@ -257,7 +257,7 @@ exif_mnote_data_canon_get_name (ExifMnot if (!dc) return NULL; exif_mnote_data_canon_get_tags (dc, i, &m, &s); if (m >= dc->count) return NULL; - return mnote_canon_tag_get_name_sub (dc->entries[m].tag, s); + return mnote_canon_tag_get_name_sub (dc->entries[m].tag, s, dc->options); } static const char * @@ -269,7 +269,7 @@ exif_mnote_data_canon_get_title (ExifMno if (!dc) return NULL; exif_mnote_data_canon_get_tags (dc, i, &m, &s); if (m >= dc->count) return NULL; - return mnote_canon_tag_get_title_sub (dc->entries[m].tag, s); + return mnote_canon_tag_get_title_sub (dc->entries[m].tag, s, dc->options); } static const char * @@ -285,9 +285,10 @@ exif_mnote_data_canon_get_description (E } ExifMnoteData * -exif_mnote_data_canon_new (ExifMem *mem) +exif_mnote_data_canon_new (ExifMem *mem, ExifDataOption o) { ExifMnoteData *d; + ExifMnoteDataCanon *dc; if (!mem) return NULL; @@ -309,5 +310,7 @@ exif_mnote_data_canon_new (ExifMem *mem) d->methods.get_description = exif_mnote_data_canon_get_description; d->methods.get_value = exif_mnote_data_canon_get_value; + dc = (ExifMnoteDataCanon*)d; + dc->options = o; return d; } Index: exif-mnote-data-canon.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- exif-mnote-data-canon.h 4 Oct 2004 06:26:59 -0000 1.3 +++ exif-mnote-data-canon.h 9 May 2007 06:15:23 -0000 1.4 @@ -25,6 +25,7 @@ #include <libexif/exif-mnote-data.h> #include <libexif/exif-mnote-data-priv.h> #include <libexif/exif-mem.h> +#include <libexif/exif-data.h> typedef struct _ExifMnoteDataCanon ExifMnoteDataCanon; @@ -38,8 +39,10 @@ struct _ExifMnoteDataCanon { ExifByteOrder order; unsigned int offset; + + ExifDataOption options; }; -ExifMnoteData *exif_mnote_data_canon_new (ExifMem *mem); +ExifMnoteData *exif_mnote_data_canon_new (ExifMem *mem, ExifDataOption o); #endif /* __EXIF_MNOTE_DATA_CANON_H__ */ |
|
From: Jan P. <pa...@us...> - 2007-05-09 06:09:16
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9609 Modified Files: exif-data.c exif-data.h Log Message: Saving unmodified makernote no longer controlled at compile time by #ifdef EXIF_DONT_CHANGE_MAKER_NOTE, but at run-time by newly introduced option EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -p -d -r1.88 -r1.89 --- exif-data.c 8 May 2007 09:09:06 -0000 1.88 +++ exif-data.c 9 May 2007 06:09:05 -0000 1.89 @@ -222,17 +222,17 @@ exif_data_save_data_entry (ExifData *dat exif_set_short (*d + 6 + offset + 2, data->priv->order, (ExifShort) e->format); -#ifndef EXIF_DONT_CHANGE_MAKER_NOTE - /* If this is the maker note tag, update it. */ - if ((e->tag == EXIF_TAG_MAKER_NOTE) && data->priv->md) { - exif_mem_free (data->priv->mem, e->data); - e->data = NULL; - e->size = 0; - exif_mnote_data_set_offset (data->priv->md, *ds - 6); - exif_mnote_data_save (data->priv->md, &e->data, &e->size); - e->components = e->size; + if (!(data->priv->options & EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE)) { + /* If this is the maker note tag, update it. */ + if ((e->tag == EXIF_TAG_MAKER_NOTE) && data->priv->md) { + exif_mem_free (data->priv->mem, e->data); + e->data = NULL; + e->size = 0; + exif_mnote_data_set_offset (data->priv->md, *ds - 6); + exif_mnote_data_save (data->priv->md, &e->data, &e->size); + e->components = e->size; + } } -#endif exif_set_long (*d + 6 + offset + 4, data->priv->order, e->components); @@ -847,7 +847,7 @@ exif_data_load_data (ExifData *data, con data->priv->md = exif_mnote_data_pentax_new (data->priv->mem); break; case EXIF_DATA_TYPE_MAKER_NOTE_CANON: - data->priv->md = exif_mnote_data_canon_new (data->priv->mem); + data->priv->md = exif_mnote_data_canon_new (data->priv->mem, data->priv->options); break; default: break; @@ -1102,6 +1102,9 @@ static struct { {EXIF_DATA_OPTION_FOLLOW_SPECIFICATION, N_("Follow specification"), N_("Add, correct and remove entries to get EXIF data that follows " "the specification.")}, + {EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE, N_("Don not change maker note"), + N_("When loading and resaving Exif data, save the maker note unmodified." + " Be aware that the maker note can get corrupted.")}, {0, NULL, NULL} }; Index: exif-data.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -d -r1.12 -r1.13 --- exif-data.h 30 Apr 2005 00:55:42 -0000 1.12 +++ exif-data.h 9 May 2007 06:09:05 -0000 1.13 @@ -84,7 +84,8 @@ void exif_data_foreach_content typedef enum { EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS = 1 << 0, - EXIF_DATA_OPTION_FOLLOW_SPECIFICATION = 1 << 1 + EXIF_DATA_OPTION_FOLLOW_SPECIFICATION = 1 << 1, + EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE = 1 << 2 } ExifDataOption; const char *exif_data_option_get_name (ExifDataOption); |
|
From: Jan P. <pa...@us...> - 2007-05-08 16:45:32
|
Update of /cvsroot/libexif/libexif/po In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27528/po Modified Files: de.po es.po fr.po pl.po ru.po vi.po Log Message: Unified values of EXIF_TAG_FLASH Index: es.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/es.po,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -d -r1.20 -r1.21 --- es.po 5 May 2007 09:25:14 -0000 1.20 +++ es.po 8 May 2007 16:45:28 -0000 1.21 @@ -1761,14 +1761,9 @@ msgstr "Luz de retorno estrosboscópica msgid "W. strobe" msgstr "con estrosboscópica" -#: libexif/exif-entry.c:496 -#, fuzzy -msgid "Flash did not fire, compulsory flash mode" -msgstr "El flash no disparó, modo compulsivo del flash." - #: libexif/exif-entry.c:497 #, fuzzy -msgid "Flash fired, compulsory flash mode" +msgid "Flash fired, compulsory flash mode." msgstr "El flash no disparó, modo compulsivo del flash." #: libexif/exif-entry.c:498 @@ -1831,7 +1826,7 @@ msgstr "" #, fuzzy msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light not " -"detected" +"detected." msgstr "" "El flash disparó, modo compulsivo del flash, modo de reducción de ojos " "rojos, luz de retorno no detectada." @@ -1839,19 +1834,19 @@ msgstr "" #: libexif/exif-entry.c:518 #, fuzzy msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected" +"Flash fired, compulsory flash mode, red-eye reduction, return light detected." msgstr "" "El flash disparó, modo compulsivo del flash, modo de reducción de ojos " "rojos, luz de retorno detectada." #: libexif/exif-entry.c:520 #, fuzzy -msgid "Flash did not fire, auto mode, red-eye reduction mode" +msgid "Flash did not fire, auto mode, red-eye reduction mode." msgstr "El flash disparó, modo automático, modo de reducción de ojos rojos." #: libexif/exif-entry.c:521 #, fuzzy -msgid "Flash fired, auto mode, red-eye reduction mode" +msgid "Flash fired, auto mode, red-eye reduction mode." msgstr "El flash disparó, modo automático, modo de reducción de ojos rojos." #: libexif/exif-entry.c:522 Index: fr.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/fr.po,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -d -r1.21 -r1.22 --- fr.po 5 May 2007 09:25:14 -0000 1.21 +++ fr.po 8 May 2007 16:45:28 -0000 1.22 @@ -1758,13 +1758,9 @@ msgstr "" msgid "W. strobe" msgstr "" -#: libexif/exif-entry.c:496 -msgid "Flash did not fire, compulsory flash mode" -msgstr "Flash non déclenché, mode de flash obligatoire." - #: libexif/exif-entry.c:497 #, fuzzy -msgid "Flash fired, compulsory flash mode" +msgid "Flash fired, compulsory flash mode." msgstr "Flash non déclenché, mode de flash obligatoire." #: libexif/exif-entry.c:498 @@ -1824,7 +1820,7 @@ msgstr "Flash déclenché, mode de flash #, fuzzy msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light not " -"detected" +"detected." msgstr "" "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière " "de retour non détectée." @@ -1832,19 +1828,19 @@ msgstr "" #: libexif/exif-entry.c:518 #, fuzzy msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected" +"Flash fired, compulsory flash mode, red-eye reduction, return light detected." msgstr "" "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière " -"de retour détectée" +"de retour détectée." #: libexif/exif-entry.c:520 #, fuzzy -msgid "Flash did not fire, auto mode, red-eye reduction mode" +msgid "Flash did not fire, auto mode, red-eye reduction mode." msgstr "Flash déclenché, mode auto, mode anti-yeux rouges." #: libexif/exif-entry.c:521 #, fuzzy -msgid "Flash fired, auto mode, red-eye reduction mode" +msgid "Flash fired, auto mode, red-eye reduction mode." msgstr "Flash déclenché, mode auto, mode anti-yeux rouges." #: libexif/exif-entry.c:522 Index: ru.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/ru.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- ru.po 5 May 2007 09:25:14 -0000 1.5 +++ ru.po 8 May 2007 16:45:28 -0000 1.6 @@ -1751,14 +1751,9 @@ msgstr "" msgid "W. strobe" msgstr "Со ÑÑÑобоÑкопом" -#: libexif/exif-entry.c:496 -#, fuzzy -msgid "Flash did not fire, compulsory flash mode" -msgstr "ÐÑпÑÑка не ÑÑабоÑала, Ñежим компенÑаÑии вÑпÑÑки" - #: libexif/exif-entry.c:497 #, fuzzy -msgid "Flash fired, compulsory flash mode" +msgid "Flash fired, compulsory flash mode." msgstr "ÐÑпÑÑка ÑÑабоÑала, Ñежим компенÑаÑии вÑпÑÑки" #: libexif/exif-entry.c:498 @@ -1815,21 +1810,21 @@ msgstr "" #: libexif/exif-entry.c:516 msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light not " -"detected" +"detected." msgstr "" #: libexif/exif-entry.c:518 msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected" +"Flash fired, compulsory flash mode, red-eye reduction, return light detected." msgstr "" #: libexif/exif-entry.c:520 -msgid "Flash did not fire, auto mode, red-eye reduction mode" +msgid "Flash did not fire, auto mode, red-eye reduction mode." msgstr "" "ÐÑпÑÑка не ÑÑабоÑала, авÑомаÑиÑеÑкий Ñежим, Ñежим ÑнÑÑÐ¸Ñ ÑÑÑекÑа кÑаÑнÑÑ Ð³Ð»Ð°Ð·" #: libexif/exif-entry.c:521 -msgid "Flash fired, auto mode, red-eye reduction mode" +msgid "Flash fired, auto mode, red-eye reduction mode." msgstr "" "ÐÑпÑÑка ÑÑабоÑала, авÑомаÑиÑеÑкий Ñежим, Ñежим ÑнÑÑÐ¸Ñ ÑÑÑекÑа кÑаÑнÑÑ Ð³Ð»Ð°Ð·" Index: de.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/de.po,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -d -r1.33 -r1.34 --- de.po 5 May 2007 09:25:14 -0000 1.33 +++ de.po 8 May 2007 16:45:28 -0000 1.34 @@ -1692,14 +1692,9 @@ msgstr "Blitzreflektion erkannt." msgid "W. strobe" msgstr "Mit Röhrenblitz" -#: libexif/exif-entry.c:496 -#, fuzzy -msgid "Flash did not fire, compulsory flash mode" -msgstr "Blitz löste nicht aus, erzwungener Blitzmodus." - #: libexif/exif-entry.c:497 -msgid "Flash fired, compulsory flash mode" -msgstr "Blitz ausgelöst, festgelegter Blitzmodus" +msgid "Flash fired, compulsory flash mode." +msgstr "Blitz ausgelöst, festgelegter Blitzmodus." #: libexif/exif-entry.c:498 msgid "Flash fired, compulsory flash mode, return light not detected." @@ -1754,25 +1749,25 @@ msgstr "Blitz ausgelöst, fester Blitzmo #: libexif/exif-entry.c:516 msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light not " -"detected" +"detected." msgstr "" "Blitz ausgelöst, fester Blitzmodus, Rote Augen Reduktions Modus, keine " "Blitzreflektion erkannt." #: libexif/exif-entry.c:518 msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected" +"Flash fired, compulsory flash mode, red-eye reduction, return light detected." msgstr "" "Blitz ausgelöst, fester Blitzmodus, Rote Augen Reduktions Modus, " "Blitzreflektion erkannt." #: libexif/exif-entry.c:520 -msgid "Flash did not fire, auto mode, red-eye reduction mode" +msgid "Flash did not fire, auto mode, red-eye reduction mode." msgstr "" "Blitz nicht ausgelöst, automatischer Modus, Rote Augen Reduktions Modus." #: libexif/exif-entry.c:521 -msgid "Flash fired, auto mode, red-eye reduction mode" +msgid "Flash fired, auto mode, red-eye reduction mode." msgstr "Blitz ausgelöst, automatischer Modus, Rote Augen Reduktions Modus." #: libexif/exif-entry.c:522 Index: pl.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/pl.po,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -d -r1.7 -r1.8 --- pl.po 5 May 2007 09:25:14 -0000 1.7 +++ pl.po 8 May 2007 16:45:28 -0000 1.8 @@ -1766,15 +1766,10 @@ msgstr "Zwrotne ÅwiatÅo stroboskopowe msgid "W. strobe" msgstr "Ze ÅwiatÅem stroboskopowym" -#: libexif/exif-entry.c:496 -#, fuzzy -msgid "Flash did not fire, compulsory flash mode" -msgstr "Flesz siÄ nie uruchomiÅ w trybie pulsujÄ cym." - #: libexif/exif-entry.c:497 #, fuzzy -msgid "Flash fired, compulsory flash mode" -msgstr "Flesz siÄ uruchomiÅ w trybie pulsujÄ cym" +msgid "Flash fired, compulsory flash mode." +msgstr "Flesz siÄ uruchomiÅ w trybie pulsujÄ cym." #: libexif/exif-entry.c:498 #, fuzzy @@ -1835,26 +1830,26 @@ msgstr "Flesz siÄ uruchomiÅ w trybie p #: libexif/exif-entry.c:516 msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light not " -"detected" +"detected." msgstr "" "Flesz siÄ uruchomiÅ w trybie pulsujÄ cym z redukcjÄ czerwonych oczu, ÅwiatÅo " -"zwrotne nie wykryte" +"zwrotne nie wykryte." #: libexif/exif-entry.c:518 msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected" +"Flash fired, compulsory flash mode, red-eye reduction, return light detected." msgstr "" "Flesz siÄ uruchomiÅ w trybie pulsujÄ cym z redukcjÄ czerwonych oczu, ÅwiatÅo " -"zwrotne wykryte" +"zwrotne wykryte." #: libexif/exif-entry.c:520 -msgid "Flash did not fire, auto mode, red-eye reduction mode" +msgid "Flash did not fire, auto mode, red-eye reduction mode." msgstr "" -"Flesz siÄ nie uruchomiÅ w trybie automatycznym z redukcjÄ czerwonych oczu" +"Flesz siÄ nie uruchomiÅ w trybie automatycznym z redukcjÄ czerwonych oczu." #: libexif/exif-entry.c:521 -msgid "Flash fired, auto mode, red-eye reduction mode" -msgstr "Flesz siÄ uruchomiÅ w trybie automatycznym z redukcjÄ czerwonych oczu" +msgid "Flash fired, auto mode, red-eye reduction mode." +msgstr "Flesz siÄ uruchomiÅ w trybie automatycznym z redukcjÄ czerwonych oczu." #: libexif/exif-entry.c:522 msgid "" Index: vi.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/vi.po,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- vi.po 5 May 2007 09:25:14 -0000 1.5 +++ vi.po 8 May 2007 16:45:28 -0000 1.6 @@ -1781,15 +1781,10 @@ msgstr "Phát hiá»n Äẻn trá» vá» n msgid "W. strobe" msgstr "Có nháy nhanh" -#: libexif/exif-entry.c:496 -#, fuzzy -msgid "Flash did not fire, compulsory flash mode" -msgstr "Äèn nháy không hoạt Äá»ng, chế Äá» nháy bắt buá»c" - #: libexif/exif-entry.c:497 #, fuzzy -msgid "Flash fired, compulsory flash mode" -msgstr "Äèn nháy Äã hoạt Äá»ng, chế Äá» nháy bắt buá»c" +msgid "Flash fired, compulsory flash mode." +msgstr "Äèn nháy Äã hoạt Äá»ng, chế Äá» nháy bắt buá»c." #: libexif/exif-entry.c:498 #, fuzzy @@ -1806,7 +1801,7 @@ msgstr "" #: libexif/exif-entry.c:502 #, fuzzy msgid "Flash did not fire, compulsory flash mode." -msgstr "Äèn nháy không hoạt Äá»ng, chế Äá» nháy bắt buá»c" +msgstr "Äèn nháy không hoạt Äá»ng, chế Äá» nháy bắt buá»c." #: libexif/exif-entry.c:503 msgid "Flash did not fire, auto mode." @@ -1814,7 +1809,7 @@ msgstr "Äèn nháy không hoạt Äá»n #: libexif/exif-entry.c:504 msgid "Flash fired, auto mode." -msgstr "Äèn nháy Äã hoạt Äá»ng, chế Äá» tá»± Äá»ng" +msgstr "Äèn nháy Äã hoạt Äá»ng, chế Äá» tá»± Äá»ng." #: libexif/exif-entry.c:505 msgid "Flash fired, auto mode, return light not detected." @@ -1848,24 +1843,24 @@ msgstr "Äèn nháy Äã hoạt Äá»ng, #: libexif/exif-entry.c:516 msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light not " -"detected" +"detected." msgstr "" "Äèn nháy Äã hoạt Äá»ng, chế Äá» nháy bắt buá»c, chế Äá» giảm mặt Äá», chÆ°a phát " "hiá»n ánh sáng trá» vá»." #: libexif/exif-entry.c:518 msgid "" -"Flash fired, compulsory flash mode, red-eye reduction, return light detected" +"Flash fired, compulsory flash mode, red-eye reduction, return light detected." msgstr "" "Äèn nháy Äã hoạt Äá»ng, chế Äá» nháy bắt buá»c, chế Äá» giảm mặt Äá», phát hiá»n " "ánh sáng trá» vá»." #: libexif/exif-entry.c:520 -msgid "Flash did not fire, auto mode, red-eye reduction mode" +msgid "Flash did not fire, auto mode, red-eye reduction mode." msgstr "Äèn nháy chÆ°a hoạt Äá»ng, chế Äá» tá»± Äá»ng, chế Äá» giảm mặt Äá»." #: libexif/exif-entry.c:521 -msgid "Flash fired, auto mode, red-eye reduction mode" +msgid "Flash fired, auto mode, red-eye reduction mode." msgstr "Äèn nháy Äã hoạt Äá»ng, chế Äá» tá»± Äá»ng, chế Äá» giảm mặt Äá»." #: libexif/exif-entry.c:522 |
|
From: Jan P. <pa...@us...> - 2007-05-08 16:45:31
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv27528/libexif Modified Files: exif-entry.c Log Message: Unified values of EXIF_TAG_FLASH Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -p -d -r1.97 -r1.98 --- exif-entry.c 8 May 2007 09:09:06 -0000 1.97 +++ exif-entry.c 8 May 2007 16:45:27 -0000 1.98 @@ -493,8 +493,8 @@ static struct { {0x0005, {N_("Strobe return light not detected."), N_("W/o strobe"), NULL}}, {0x0007, {N_("Strobe return light detected."), N_("W. strobe"), NULL}}, - {0x0008, {N_("Flash did not fire, compulsory flash mode"), NULL}}, /* Olympus E-330 */ - {0x0009, {N_("Flash fired, compulsory flash mode"), NULL}}, + {0x0008, {N_("Flash did not fire."), NULL}}, /* Olympus E-330 */ + {0x0009, {N_("Flash fired, compulsory flash mode."), NULL}}, {0x000d, {N_("Flash fired, compulsory flash mode, return light " "not detected."), NULL}}, {0x000f, {N_("Flash fired, compulsory flash mode, return light " @@ -514,11 +514,11 @@ static struct { {0x0049, {N_("Flash fired, compulsory flash mode, red-eye reduction " "mode."), NULL}}, {0x004d, {N_("Flash fired, compulsory flash mode, red-eye reduction " - "mode, return light not detected"), NULL}}, - {0x004f, {N_("Flash fired, compulsory flash mode, red-eye reduction, " - "return light detected"), NULL}}, - {0x0058, {N_("Flash did not fire, auto mode, red-eye reduction mode"), NULL}}, - {0x0059, {N_("Flash fired, auto mode, red-eye reduction mode"), NULL}}, + "mode, return light not detected."), NULL}}, + {0x004f, {N_("Flash fired, compulsory flash mode, red-eye reduction mode, " + "return light detected."), NULL}}, + {0x0058, {N_("Flash did not fire, auto mode, red-eye reduction mode."), NULL}}, + {0x0059, {N_("Flash fired, auto mode, red-eye reduction mode."), NULL}}, {0x005d, {N_("Flash fired, auto mode, return light not detected, " "red-eye reduction mode."), NULL}}, {0x005f, {N_("Flash fired, auto mode, return light detected, " |
|
From: Jan P. <pa...@us...> - 2007-05-08 09:49:18
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12813 Modified Files: exif-mnote-data-olympus.c Log Message: Added heuristics for partial fix of #1525770: Microsoft Windows Photo Gallery 6.0.6000.16386 apparently converts main Exif IFD from Intel to Motorola order, but copies Olympus makernote in Intel order as-is. We now detect this order-mismatch, plus we now write back some unknown short in the makernote that seems to be version number. Index: exif-mnote-data-olympus.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -d -r1.27 -r1.28 --- exif-mnote-data-olympus.c 8 May 2007 09:18:36 -0000 1.27 +++ exif-mnote-data-olympus.c 8 May 2007 09:48:53 -0000 1.28 @@ -102,6 +102,7 @@ exif_mnote_data_olympus_save (ExifMnoteD /* Write the header and the number of entries. */ strcpy ((char *)*buf, "OLYMP"); + exif_set_short (*buf + 6, n->order, (ExifShort) 1); datao = n->offset; break; case olympusV2: @@ -224,6 +225,10 @@ exif_mnote_data_olympus_load (ExifMnoteD /* The number of entries is at position 8. */ n->version = olympusV1; + if (buf[o2 + 6] == 1) + n->order = EXIF_BYTE_ORDER_INTEL; + else if (buf[o2 + 6 + 1] == 1) + n->order = EXIF_BYTE_ORDER_MOTOROLA; o2 += 8; } else if (!memcmp (buf + o2, "OLYMPUS", 8)) { |
|
From: Jan P. <pa...@us...> - 2007-05-08 09:18:40
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1392 Modified Files: exif-mnote-data-olympus.c exif-mnote-data-olympus.h mnote-olympus-entry.c Log Message: Added support for Olympus S760 & S770 makernote (bug #1703284) Index: mnote-olympus-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -d -r1.28 -r1.29 --- mnote-olympus-entry.c 26 Apr 2007 17:01:36 -0000 1.28 +++ mnote-olympus-entry.c 8 May 2007 09:18:36 -0000 1.29 @@ -475,7 +475,7 @@ mnote_olympus_entry_get_value (MnoteOlym break; case MNOTE_OLYMPUS_TAG_INFO: CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen); - CC2 (entry->components, 52, 53, v, maxlen); + CC2 (entry->components, 52, 60, v, maxlen); strncpy (v, (char *)entry->data, MIN (maxlen, entry->size)); break; case MNOTE_OLYMPUS_TAG_ID: Index: exif-mnote-data-olympus.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -d -r1.6 -r1.7 --- exif-mnote-data-olympus.h 5 Jul 2005 08:29:32 -0000 1.6 +++ exif-mnote-data-olympus.h 8 May 2007 09:18:36 -0000 1.7 @@ -26,7 +26,7 @@ #include <libexif/exif-byte-order.h> #include <libexif/exif-mem.h> -enum OlympusVersion {olympus = 0, nikonV1 = 1, nikonV2 = 2}; +enum OlympusVersion {nikonV1 = 1, nikonV2 = 2, olympusV1 = 3, olympusV2 = 4 }; typedef struct _ExifMnoteDataOlympus ExifMnoteDataOlympus; Index: exif-mnote-data-olympus.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -d -r1.26 -r1.27 --- exif-mnote-data-olympus.c 6 May 2007 17:41:57 -0000 1.26 +++ exif-mnote-data-olympus.c 8 May 2007 09:18:36 -0000 1.27 @@ -86,7 +86,7 @@ exif_mnote_data_olympus_save (ExifMnoteD unsigned char **buf, unsigned int *buf_size) { ExifMnoteDataOlympus *n = (ExifMnoteDataOlympus *) ne; - unsigned int i, o, s, doff, base = 0, o2 = 6; + unsigned int i, o, s, doff, base = 0, o2 = 6 + 2; int datao = 0; if (!n || !buf || !buf_size) return; @@ -95,9 +95,8 @@ exif_mnote_data_olympus_save (ExifMnoteD * Allocate enough memory for all entries and the number of entries. */ *buf_size = 6 + 2 + 2 + n->count * 12; - o2 += 2; switch (n->version) { - case olympus: + case olympusV1: *buf = exif_mem_alloc (ne->mem, *buf_size); if (!*buf) return; @@ -105,6 +104,20 @@ exif_mnote_data_olympus_save (ExifMnoteD strcpy ((char *)*buf, "OLYMP"); datao = n->offset; break; + case olympusV2: + *buf_size += 8-6 + 4; + *buf = exif_mem_alloc (ne->mem, *buf_size); + if (!*buf) return; + + /* Write the header and the number of entries. */ + strcpy ((char *)*buf, "OLYMPUS"); + exif_set_short (*buf + 8, n->order, (ExifShort) ( + (n->order == EXIF_BYTE_ORDER_INTEL) ? + ('I' << 8) | 'I' : + ('M' << 8) | 'M')); + exif_set_short (*buf + 10, n->order, (ExifShort) 3); + o2 += 4; + break; case nikonV1: base = MNOTE_NIKON1_TAG_BASE; @@ -205,14 +218,31 @@ exif_mnote_data_olympus_load (ExifMnoteD * lastly 0x2A. */ if (buf_size - n->offset < 22) return; - if (!memcmp (buf + o2, "OLYMP", 5)) { + if (!memcmp (buf + o2, "OLYMP", 6)) { exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus", - "Parsing Olympus maker note..."); + "Parsing Olympus maker note v1..."); /* The number of entries is at position 8. */ - n->version = olympus; + n->version = olympusV1; o2 += 8; + } else if (!memcmp (buf + o2, "OLYMPUS", 8)) { + /* Olympus S760, S770 */ + datao = o2; + o2 += 8; + exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus", + "Parsing Olympus maker note v2 (0x%02x, %02x, %02x, %02x)...", + buf[o2], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3]); + + if ((buf[o2] == 'I') && (buf[o2 + 1] == 'I')) + n->order = EXIF_BYTE_ORDER_INTEL; + else if ((buf[o2] == 'M') && (buf[o2 + 1] == 'M')) + n->order = EXIF_BYTE_ORDER_MOTOROLA; + + /* The number of entries is at position 8+4. */ + n->version = olympusV2; + o2 += 4; + } else if (!memcmp (buf + o2, "Nikon", 6)) { o2 += 6; exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus", |
