diff options
110 files changed, 309 insertions, 1641 deletions
diff --git a/camlibs/ax203/library.c b/camlibs/ax203/library.c index 7e15a20d4..b0134a9dd 100644 --- a/camlibs/ax203/library.c +++ b/camlibs/ax203/library.c @@ -34,19 +34,8 @@ #include <gphoto2/gphoto2-setting.h> #include "ax203.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + static const struct ax203_devinfo ax203_devinfo[] = { { 0x1908, 0x1315, AX203_FIRMWARE_3_3_x }, diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c index b325095b4..50608f1b2 100644 --- a/camlibs/barbie/barbie.c +++ b/camlibs/barbie/barbie.c @@ -33,19 +33,8 @@ #include <libgphoto2/bayer.h> #include <gphoto2/gphoto2.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #define MAX_PICTURES 6 diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index efa7b3985..86df352b3 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -33,19 +33,8 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #include "usb.h" #include "util.h" diff --git a/camlibs/canon/crc.c b/camlibs/canon/crc.c index 17b8990da..ce862655a 100644 --- a/camlibs/canon/crc.c +++ b/camlibs/canon/crc.c @@ -3,21 +3,9 @@ #include <stdlib.h> #include <stdio.h> -#include "crc.h" +#include "libgphoto2/i18n.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "crc.h" /* diff --git a/camlibs/canon/library.c b/camlibs/canon/library.c index 51ef59f6d..68c1e5300 100644 --- a/camlibs/canon/library.c +++ b/camlibs/canon/library.c @@ -39,24 +39,8 @@ #include <gphoto2/gphoto2.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #include "util.h" #include "library.h" diff --git a/camlibs/canon/serial.c b/camlibs/canon/serial.c index 7477cd828..7d6b0f0fc 100644 --- a/camlibs/canon/serial.c +++ b/camlibs/canon/serial.c @@ -26,24 +26,8 @@ #include <gphoto2/gphoto2.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #include "library.h" #include "canon.h" diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c index c655b3c1d..2583932a7 100644 --- a/camlibs/canon/usb.c +++ b/camlibs/canon/usb.c @@ -22,24 +22,8 @@ #include <unistd.h> #endif /* CANON_EXPERIMENTAL_UPLOAD */ -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #include <gphoto2/gphoto2.h> diff --git a/camlibs/casio/casio-qv.c b/camlibs/casio/casio-qv.c index 50c088948..c659aeb1e 100644 --- a/camlibs/casio/casio-qv.c +++ b/camlibs/casio/casio-qv.c @@ -34,19 +34,8 @@ #define THUMBNAIL_HEIGHT 36 #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);} -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + static int get_info_func (CameraFilesystem *fs, const char *folder, const char *file, diff --git a/camlibs/digita/digita.c b/camlibs/digita/digita.c index e77e84dcc..78e8910bb 100644 --- a/camlibs/digita/digita.c +++ b/camlibs/digita/digita.c @@ -37,19 +37,8 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #include "libgphoto2/gphoto2-endian.h" #include "digita.h" diff --git a/camlibs/dimera/dimera3500.c b/camlibs/dimera/dimera3500.c index 98f6efcc4..039f8c016 100644 --- a/camlibs/dimera/dimera3500.c +++ b/camlibs/dimera/dimera3500.c @@ -33,19 +33,8 @@ #include <gphoto2/gphoto2.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #define GP_MODULE "dimera" diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c index af6f25b46..0f354c3be 100644 --- a/camlibs/directory/directory.c +++ b/camlibs/directory/directory.c @@ -59,24 +59,8 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-port-portability.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + static const struct { const char *extension; diff --git a/camlibs/docupen/docupen.c b/camlibs/docupen/docupen.c index 373ddebe1..9490ff936 100644 --- a/camlibs/docupen/docupen.c +++ b/camlibs/docupen/docupen.c @@ -25,21 +25,10 @@ #include <gphoto2/gphoto2-result.h> #include <libgphoto2/gphoto2-endian.h> +#include "libgphoto2/i18n.h" + #include "docupen.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif #if 0 static const struct { diff --git a/camlibs/enigma13/enigma13.c b/camlibs/enigma13/enigma13.c index 0b42482c4..99f28f548 100644 --- a/camlibs/enigma13/enigma13.c +++ b/camlibs/enigma13/enigma13.c @@ -30,24 +30,14 @@ #include <gphoto2/gphoto2-result.h> #include "libgphoto2/gphoto2-endian.h" +#include "libgphoto2/i18n.h" + + #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION #define sleep(x) #define usleep(x) #endif -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif #define ENIGMA13_BLK_FLASH_ALIGN 0x2000 #define ENIGMA13_BLK_CARD_ALIGN 0x4000 diff --git a/camlibs/fuji/fuji.c b/camlibs/fuji/fuji.c index 47b0f6cee..131b0b199 100644 --- a/camlibs/fuji/fuji.c +++ b/camlibs/fuji/fuji.c @@ -49,24 +49,8 @@ #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #ifndef MIN #define MIN(a, b) (((a) < (b)) ? (a) : (b)) diff --git a/camlibs/fuji/library.c b/camlibs/fuji/library.c index 60bf94069..d9c761829 100644 --- a/camlibs/fuji/library.c +++ b/camlibs/fuji/library.c @@ -31,26 +31,10 @@ #include <gphoto2/gphoto2-port.h> #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + #include "fuji.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define GP_MODULE "fuji" diff --git a/camlibs/hp215/hp215.c b/camlibs/hp215/hp215.c index e8e9976f0..f78ccf748 100644 --- a/camlibs/hp215/hp215.c +++ b/camlibs/hp215/hp215.c @@ -69,24 +69,12 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-result.h> -#include "crctab.h" - -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" +#include "crctab.h" #include "hp215.h" + enum hp215_cmd { SET_TIME = 0x86, SET_TIME_AS_STR = 0x87, diff --git a/camlibs/jamcam/jamcam.c b/camlibs/jamcam/jamcam.c index 2975aa779..d31816e0f 100644 --- a/camlibs/jamcam/jamcam.c +++ b/camlibs/jamcam/jamcam.c @@ -33,22 +33,11 @@ #include <libgphoto2/bayer.h> #include <libgphoto2/gamma.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "library.h" + #define GP_MODULE "jamcam" #define TIMEOUT 2000 diff --git a/camlibs/jamcam/library.c b/camlibs/jamcam/library.c index 8913cc393..bc838f116 100644 --- a/camlibs/jamcam/library.c +++ b/camlibs/jamcam/library.c @@ -31,26 +31,10 @@ #include <time.h> #include <math.h> +#include "libgphoto2/i18n.h" + #include "library.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define GP_MODULE diff --git a/camlibs/jd11/jd11.c b/camlibs/jd11/jd11.c index 7d49fd346..3fdd02dfa 100644 --- a/camlibs/jd11/jd11.c +++ b/camlibs/jd11/jd11.c @@ -27,22 +27,11 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "serial.h" + int camera_id (CameraText *id) { strcpy(id->text, "JD11"); diff --git a/camlibs/jd11/serial.c b/camlibs/jd11/serial.c index 73c44007c..b4cac363c 100644 --- a/camlibs/jd11/serial.c +++ b/camlibs/jd11/serial.c @@ -31,28 +31,11 @@ #include <gphoto2/gphoto2-port.h> #include <libgphoto2/bayer.h> +#include "libgphoto2/i18n.h" #include "serial.h" #include "decomp.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #if 0 static int diff --git a/camlibs/kodak/dc120/dc120.c b/camlibs/kodak/dc120/dc120.c index 0ec0be271..ebf6bf001 100644 --- a/camlibs/kodak/dc120/dc120.c +++ b/camlibs/kodak/dc120/dc120.c @@ -31,24 +31,12 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# ifdef gettext_noop -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# define N_(String) gettext_noop (String) -# else -# define _(String) (String) -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "dc120.h" #include "library.h" + #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);} int camera_id (CameraText *id) { diff --git a/camlibs/kodak/dc120/library.c b/camlibs/kodak/dc120/library.c index 1dcef471c..faa56eb32 100644 --- a/camlibs/kodak/dc120/library.c +++ b/camlibs/kodak/dc120/library.c @@ -28,27 +28,11 @@ #include <time.h> #include <gphoto2/gphoto2.h> +#include "libgphoto2/i18n.h" + #include "dc120.h" #include "library.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif static char * dc120_packet_new (int command_byte) { diff --git a/camlibs/kodak/dc210/library.c b/camlibs/kodak/dc210/library.c index 8b54837f4..a5f29c8ff 100644 --- a/camlibs/kodak/dc210/library.c +++ b/camlibs/kodak/dc210/library.c @@ -25,27 +25,11 @@ #include <string.h> #include <gphoto2/gphoto2.h> +#include "libgphoto2/i18n.h" + #include "dc210.h" #include "library.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif static int dc210_cmd_error = 0; static const char ppmheader[] = "P6\n96 72\n255\n"; diff --git a/camlibs/kodak/dc240/dc240.c b/camlibs/kodak/dc240/dc240.c index 0e7c95979..c18a753b8 100644 --- a/camlibs/kodak/dc240/dc240.c +++ b/camlibs/kodak/dc240/dc240.c @@ -34,28 +34,12 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "dc240.h" #include "library.h" + int camera_id (CameraText *id) { diff --git a/camlibs/kodak/dc240/library.c b/camlibs/kodak/dc240/library.c index 5ef5ea444..1b7e755f1 100644 --- a/camlibs/kodak/dc240/library.c +++ b/camlibs/kodak/dc240/library.c @@ -35,28 +35,11 @@ #include <gphoto2/gphoto2-port.h> #include "libgphoto2/gphoto2-endian.h" +#include "libgphoto2/i18n.h" + #include "dc240.h" #include "library.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif - #define GP_MODULE "dc240" diff --git a/camlibs/kodak/dc3200/dc3200.c b/camlibs/kodak/dc3200/dc3200.c index 8b67fb441..e72315f8a 100644 --- a/camlibs/kodak/dc3200/dc3200.c +++ b/camlibs/kodak/dc3200/dc3200.c @@ -39,21 +39,10 @@ #include <gphoto2/gphoto2-library.h> +#include "libgphoto2/i18n.h" + #include "library.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif /* * FIXME: Use properly sized integer types. The dc3200 code used lots diff --git a/camlibs/kodak/dc3200/library.c b/camlibs/kodak/dc3200/library.c index ee0a377bf..567550dae 100644 --- a/camlibs/kodak/dc3200/library.c +++ b/camlibs/kodak/dc3200/library.c @@ -40,21 +40,10 @@ #include <string.h> #include <errno.h> +#include "libgphoto2/i18n.h" + #include "dc3200.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif /* * FIXME: Use properly sized integer types. The dc3200 code used lots diff --git a/camlibs/kodak/ez200/ez200.c b/camlibs/kodak/ez200/ez200.c index 972adec6d..d9b56374b 100644 --- a/camlibs/kodak/ez200/ez200.c +++ b/camlibs/kodak/ez200/ez200.c @@ -28,6 +28,8 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> +#include "libgphoto2/i18n.h" + #define PING 0x05 #define STATUS 0x06 #define PICTURE 0x08 @@ -47,20 +49,6 @@ typedef enum { #define GP_MODULE "ez200" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif - #define WRITE gp_port_usb_msg_write #define READ gp_port_usb_msg_read diff --git a/camlibs/konica/konica.c b/camlibs/konica/konica.c index fba7092c4..32b60ab7a 100644 --- a/camlibs/konica/konica.c +++ b/camlibs/konica/konica.c @@ -28,26 +28,10 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + #include "lowlevel.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define GP_MODULE "konica" #define CHECK_NULL(r) {if (!(r)) return (GP_ERROR_BAD_PARAMETERS);} diff --git a/camlibs/konica/library.c b/camlibs/konica/library.c index 58ad29ca4..7ec0e1fb6 100644 --- a/camlibs/konica/library.c +++ b/camlibs/konica/library.c @@ -30,26 +30,10 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + #include "konica.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define C(r) {int ret=(r);if(ret<0) return(ret);} #define C_NULL(r) {if (!(r)) return (GP_ERROR_BAD_PARAMETERS);} diff --git a/camlibs/konica/lowlevel.c b/camlibs/konica/lowlevel.c index 02faafe34..2bc873236 100644 --- a/camlibs/konica/lowlevel.c +++ b/camlibs/konica/lowlevel.c @@ -28,26 +28,10 @@ #include <gphoto2/gphoto2-result.h> #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + #include "konica.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define GP_MODULE "konica" diff --git a/camlibs/konica/qm150.c b/camlibs/konica/qm150.c index 805a812f9..cf4469ad0 100644 --- a/camlibs/konica/qm150.c +++ b/camlibs/konica/qm150.c @@ -49,20 +49,8 @@ # include <libexif/exif-utils.h> #endif +#include "libgphoto2/i18n.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif /* Functions codes */ #define CAPTUREIMAGE_CMD2 0x30 diff --git a/camlibs/largan/lmini/largan.c b/camlibs/largan/lmini/largan.c index 2f3e87f5f..cd42c5774 100644 --- a/camlibs/largan/lmini/largan.c +++ b/camlibs/largan/lmini/largan.c @@ -35,22 +35,10 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-result.h> -#include "lmini.h" +#include "libgphoto2/i18n.h" +#include "lmini.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif #define TIMEOUT 1500 diff --git a/camlibs/lumix/lumix.c b/camlibs/lumix/lumix.c index c8177d91a..7505f3538 100644 --- a/camlibs/lumix/lumix.c +++ b/camlibs/lumix/lumix.c @@ -50,6 +50,8 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-result.h> +#include "libgphoto2/i18n.h" + #define GP_MODULE "lumix" @@ -64,31 +66,6 @@ } -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -/** -* This define is the string translation macro used in -* libgphoto2. It will resolve to a dcgettext() function call and -* does both the translation itself and also marks up the string -* for the collector (xgettext). -*/ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -/** -* This is the noop translation macro, which does not translate the -* string, but marks it up for the extraction of translatable strings. -*/ -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif - - char* CDS_Control = ":60606/Server0/CDS_control"; int ReadoutMode = 2; // this should be picked up from the settings.... 0-> JPG; 1->RAW; 2 -> Thumbnails char* cameraShutterSpeed = "B"; // //placeholder to store the value of the shutterspeed set in camera; "B" is for bulb. diff --git a/camlibs/minolta/dimagev/dimagev.c b/camlibs/minolta/dimagev/dimagev.c index b3a27197e..3db09f9c9 100644 --- a/camlibs/minolta/dimagev/dimagev.c +++ b/camlibs/minolta/dimagev/dimagev.c @@ -25,23 +25,11 @@ #include <stdio.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# ifdef gettext_noop -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# define N_(String) gettext_noop (String) -# else -# define _(String) (String) -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "dimagev.h" + #define GP_MODULE "dimagev" int camera_id (CameraText *id) diff --git a/camlibs/mustek/core.c b/camlibs/mustek/core.c index 05f487144..52bf8d4d0 100644 --- a/camlibs/mustek/core.c +++ b/camlibs/mustek/core.c @@ -27,23 +27,11 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-result.h> +#include "libgphoto2/i18n.h" + #include "core.h" #include "print.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define _(String) (String) -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif /*---------------------- Funktion for Communication ------------------------ */ diff --git a/camlibs/mustek/mdc800.c b/camlibs/mustek/mdc800.c index 4390a7327..770685eaf 100644 --- a/camlibs/mustek/mdc800.c +++ b/camlibs/mustek/mdc800.c @@ -23,23 +23,11 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-result.h> +#include "libgphoto2/i18n.h" + #include "print.h" #include "core.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define _(String) (String) -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif int camera_id (CameraText *id) diff --git a/camlibs/panasonic/coolshot/coolshot.c b/camlibs/panasonic/coolshot/coolshot.c index a662ce04f..7e050d5ff 100644 --- a/camlibs/panasonic/coolshot/coolshot.c +++ b/camlibs/panasonic/coolshot/coolshot.c @@ -31,22 +31,11 @@ #include <string.h> #include <gphoto2/gphoto2.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "library.h" + #define GP_MODULE "coolshot" #define TIMEOUT 2000 diff --git a/camlibs/panasonic/coolshot/library.c b/camlibs/panasonic/coolshot/library.c index 3ce3ce394..5e6b57d73 100644 --- a/camlibs/panasonic/coolshot/library.c +++ b/camlibs/panasonic/coolshot/library.c @@ -33,26 +33,11 @@ #include <string.h> #include <gphoto2/gphoto2.h> #include <time.h> + +#include "libgphoto2/i18n.h" + #include "library.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define GP_MODULE "coolshot" diff --git a/camlibs/panasonic/dc1000.c b/camlibs/panasonic/dc1000.c index 8360d746c..0e2daa92d 100644 --- a/camlibs/panasonic/dc1000.c +++ b/camlibs/panasonic/dc1000.c @@ -27,23 +27,12 @@ #endif #include <string.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "dc.h" #include "dc1000.h" + #ifndef __FILE__ # define __FILE__ "dc1000.c" #endif diff --git a/camlibs/panasonic/dc1580.c b/camlibs/panasonic/dc1580.c index 462a7a5b6..a68a136ff 100644 --- a/camlibs/panasonic/dc1580.c +++ b/camlibs/panasonic/dc1580.c @@ -30,23 +30,12 @@ #endif #include <string.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "dc.h" #include "dc1580.h" + #ifndef __FILE__ # define __FILE__ "dc1580.c" #endif diff --git a/camlibs/panasonic/l859/l859.c b/camlibs/panasonic/l859/l859.c index b6c80153d..8cb630197 100644 --- a/camlibs/panasonic/l859/l859.c +++ b/camlibs/panasonic/l859/l859.c @@ -22,24 +22,12 @@ #include <stdio.h> #include <string.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif - +#include "libgphoto2/i18n.h" #include "libgphoto2/gphoto2-endian.h" #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-library.h> + #ifndef __FILE__ # define __FILE__ "l859.c" #endif diff --git a/camlibs/pccam600/library.c b/camlibs/pccam600/library.c index fe01597a4..33b30c9af 100644 --- a/camlibs/pccam600/library.c +++ b/camlibs/pccam600/library.c @@ -39,21 +39,10 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> -#define GP_MODULE "pccam600" +#include "libgphoto2/i18n.h" + -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#define GP_MODULE "pccam600" #define QUALITY_LO 0x56 diff --git a/camlibs/pccam600/pccam600.c b/camlibs/pccam600/pccam600.c index 2f60e6056..39170472a 100644 --- a/camlibs/pccam600/pccam600.c +++ b/camlibs/pccam600/pccam600.c @@ -36,21 +36,11 @@ #include <gphoto2/gphoto2-port.h> #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + + #define GP_MODULE "pccam600" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif /* *waits until the status value is 0 or 8. diff --git a/camlibs/pentax/library.c b/camlibs/pentax/library.c index 67d620c5d..65595afb9 100644 --- a/camlibs/pentax/library.c +++ b/camlibs/pentax/library.c @@ -35,21 +35,11 @@ #include <gphoto2/gphoto2-result.h> #include <gphoto2/gphoto2-port.h> #include <gphoto2/gphoto2-setting.h> + +#include "libgphoto2/i18n.h" + #include "pslr.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif bool debug = true; diff --git a/camlibs/polaroid/pdc320.c b/camlibs/polaroid/pdc320.c index 1b69bbb65..61b742147 100644 --- a/camlibs/polaroid/pdc320.c +++ b/camlibs/polaroid/pdc320.c @@ -40,26 +40,10 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + #include "pdc320.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define GP_MODULE "pdc320" diff --git a/camlibs/polaroid/pdc640.c b/camlibs/polaroid/pdc640.c index 64a1ad017..9adaac878 100644 --- a/camlibs/polaroid/pdc640.c +++ b/camlibs/polaroid/pdc640.c @@ -26,11 +26,14 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-port-log.h> + #include <libgphoto2/bayer.h> +#include "libgphoto2/i18n.h" #include "jd350e.h" #include "dlink350f.h" + #define GP_MODULE "pdc640" #define PDC640_PING "\x01" @@ -40,26 +43,6 @@ #define CHECK_RESULT(result) {int __r = (result); if (__r < 0) return (__r);} -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif - - typedef enum{ pdc640, jd350e, diff --git a/camlibs/polaroid/pdc700.c b/camlibs/polaroid/pdc700.c index 9e13c66ec..27cddca68 100644 --- a/camlibs/polaroid/pdc700.c +++ b/camlibs/polaroid/pdc700.c @@ -30,24 +30,8 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #define GP_MODULE "pdc700" diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c index a8274bfa9..6d0c4a69c 100644 --- a/camlibs/ptp2/chdk.c +++ b/camlibs/ptp2/chdk.c @@ -35,24 +35,7 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-setting.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "ptp.h" #include "ptp-bugs.h" diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index f89430279..ae1136ce0 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -38,24 +38,7 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-setting.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "ptp.h" #include "ptp-bugs.h" diff --git a/camlibs/ptp2/fujiptpip.c b/camlibs/ptp2/fujiptpip.c index 1aeefb48f..ab1969c42 100644 --- a/camlibs/ptp2/fujiptpip.c +++ b/camlibs/ptp2/fujiptpip.c @@ -68,31 +68,14 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-setting.h> +#include "libgphoto2/i18n.h" + #include "ptp.h" #include "ptp-private.h" #define PTPIP_VERSION_MAJOR 0x0001 #define PTPIP_VERSION_MINOR 0x0000 -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif - #include "ptp.h" #include "ptp-bugs.h" diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 2be2e04c1..3ed991b00 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -39,24 +39,7 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-setting.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "ptp.h" #include "ptp-bugs.h" diff --git a/camlibs/ptp2/ptp-private.h b/camlibs/ptp2/ptp-private.h index 5b4f309ac..41007e450 100644 --- a/camlibs/ptp2/ptp-private.h +++ b/camlibs/ptp2/ptp-private.h @@ -87,7 +87,7 @@ inline static int log_on_ptp_error_helper( int _r, const char* _func, const char if (c_ptp_rep_ret != PTP_RC_OK) {\ const char* ptp_err_str = ptp_strerror(c_ptp_rep_ret, params->deviceinfo.VendorExtensionID);\ GP_LOG_E ("'%s' failed: '%s' (0x%04x)", #RESULT, ptp_err_str, c_ptp_rep_ret);\ - gp_context_error (context, "%s", dgettext(GETTEXT_PACKAGE, ptp_err_str));\ + gp_context_error (context, "%s", dgettext(GETTEXT_PACKAGE_LIBGPHOTO2, ptp_err_str));\ return translate_ptp_result (c_ptp_rep_ret);\ }\ } while(0) @@ -100,7 +100,7 @@ inline static int log_on_ptp_error_helper( int _r, const char* _func, const char snprintf(fmt_str, sizeof(fmt_str), "%s%s%s", "'%s' failed: ", MSG, " (0x%04x: %s)");\ GP_LOG_E (fmt_str, #RESULT, ##__VA_ARGS__, c_ptp_rep_msg_ret, ptp_err_str);\ snprintf(fmt_str, sizeof(fmt_str), "%s%s", MSG, " (0x%04x: %s)");\ - gp_context_error (context, fmt_str, ##__VA_ARGS__, c_ptp_rep_msg_ret, dgettext(GETTEXT_PACKAGE, ptp_err_str));\ + gp_context_error (context, fmt_str, ##__VA_ARGS__, c_ptp_rep_msg_ret, dgettext(GETTEXT_PACKAGE_LIBGPHOTO2, ptp_err_str));\ return translate_ptp_result (c_ptp_rep_msg_ret);\ }\ } while(0) diff --git a/camlibs/ptp2/ptpip.c b/camlibs/ptp2/ptpip.c index bb0fc3228..8eabd749d 100644 --- a/camlibs/ptp2/ptpip.c +++ b/camlibs/ptp2/ptpip.c @@ -57,31 +57,14 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-setting.h> +#include "libgphoto2/i18n.h" + #include "ptp.h" #include "ptp-private.h" #define PTPIP_VERSION_MAJOR 0x0001 #define PTPIP_VERSION_MINOR 0x0000 -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif - #include "ptp.h" #include "ptp-bugs.h" diff --git a/camlibs/ricoh/g3.c b/camlibs/ricoh/g3.c index 32c6495ac..bd1d76a52 100644 --- a/camlibs/ricoh/g3.c +++ b/camlibs/ricoh/g3.c @@ -28,19 +28,8 @@ #include <gphoto2/gphoto2-result.h> #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + /* channel header: * diff --git a/camlibs/ricoh/library.c b/camlibs/ricoh/library.c index c40ab42c9..e374cafe6 100644 --- a/camlibs/ricoh/library.c +++ b/camlibs/ricoh/library.c @@ -29,28 +29,12 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + #include "ricoh.h" #define GP_MODULE "ricoh" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define CR(result) {int r=(result); if (r<0) return r;} #define CRW(result,widget) {int r=(result); if (r<0) { gp_widget_free (widget); return r; } } diff --git a/camlibs/ricoh/ricoh.c b/camlibs/ricoh/ricoh.c index 31fe3f8b8..bc9814a4d 100644 --- a/camlibs/ricoh/ricoh.c +++ b/camlibs/ricoh/ricoh.c @@ -26,8 +26,11 @@ #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + #include "crctab.h" + #define GP_MODULE "ricoh" #define STX 0x02 /* start of text */ @@ -37,24 +40,6 @@ #define ETB 0x17 /* end of transmission block */ #define DLE 0x10 /* datalink escape */ -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define CR(result) {int r_mac=(result); if (r_mac<0) return r_mac;} #define CRF(result,data) {int r_mac=(result); \ diff --git a/camlibs/samsung/samsung.c b/camlibs/samsung/samsung.c index 8031b83fc..494988bc6 100644 --- a/camlibs/samsung/samsung.c +++ b/camlibs/samsung/samsung.c @@ -27,6 +27,9 @@ #include <gphoto2/gphoto2-library.h> +#include "libgphoto2/i18n.h" + + /* The commands */ #define SDSC_START 0x43 #define SDSC_NEXT 0x53 @@ -44,19 +47,6 @@ #define CHECK_RESULT(result) {int r = result; if (r < 0) return (r);} -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif static int SDSC_send (GPPort *port, unsigned char command) diff --git a/camlibs/sierra/epson-desc.c b/camlibs/sierra/epson-desc.c index 981783d66..a9c79fbc9 100644 --- a/camlibs/sierra/epson-desc.c +++ b/camlibs/sierra/epson-desc.c @@ -26,7 +26,11 @@ #include <sys/types.h> #include <stdlib.h> #include <string.h> + #include <gphoto2/gphoto2-library.h> + +#include "libgphoto2/i18n.h" + #include "sierra.h" #include "library.h" #include "sierra-desc.h" @@ -51,24 +55,6 @@ * other data is stored here. */ -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif /* * Register 1: resolution/size. diff --git a/camlibs/sierra/library.c b/camlibs/sierra/library.c index 30390cab0..19b2b871f 100644 --- a/camlibs/sierra/library.c +++ b/camlibs/sierra/library.c @@ -29,30 +29,13 @@ #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + #include "sierra.h" #include "sierra-usbwrap.h" #define GP_MODULE "sierra" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif - enum _SierraPacket { NUL = 0x00, SIERRA_PACKET_DATA = 0x02, diff --git a/camlibs/sierra/nikon-desc.c b/camlibs/sierra/nikon-desc.c index 0311b74df..6769857a0 100644 --- a/camlibs/sierra/nikon-desc.c +++ b/camlibs/sierra/nikon-desc.c @@ -17,12 +17,17 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ + #include <stdio.h> #include <stdint.h> #include <sys/types.h> #include <stdlib.h> #include <string.h> + #include <gphoto2/gphoto2-library.h> + +#include "libgphoto2/i18n.h" + #include "sierra.h" #include "library.h" #include "sierra-desc.h" @@ -47,24 +52,6 @@ * other data is stored here. */ -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif /* * Register 1: resolution/size. diff --git a/camlibs/sierra/olympus-desc.c b/camlibs/sierra/olympus-desc.c index 41abe540e..2e8d0e0d3 100644 --- a/camlibs/sierra/olympus-desc.c +++ b/camlibs/sierra/olympus-desc.c @@ -22,16 +22,22 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ + #include <stdio.h> #include <stdint.h> #include <sys/types.h> #include <stdlib.h> #include <string.h> + #include <gphoto2/gphoto2-library.h> + +#include "libgphoto2/i18n.h" + #include "sierra.h" #include "library.h" #include "sierra-desc.h" + /* * Camera descriptor for Olympus C-3040Z, 3000Z (and somday maybe others). */ @@ -52,24 +58,6 @@ * other data is stored here. */ -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif /* * Register 1: resolution/size. diff --git a/camlibs/sierra/sierra-desc.c b/camlibs/sierra/sierra-desc.c index 41740f9d0..e713752ce 100644 --- a/camlibs/sierra/sierra-desc.c +++ b/camlibs/sierra/sierra-desc.c @@ -29,31 +29,16 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + #include "sierra.h" #include "sierra-desc.h" #include "library.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define GP_MODULE "sierra" + /* * For some reason, round() does not get a prototype from math.h. */ diff --git a/camlibs/sierra/sierra.c b/camlibs/sierra/sierra.c index d8f403b35..e03bf4a3e 100644 --- a/camlibs/sierra/sierra.c +++ b/camlibs/sierra/sierra.c @@ -31,27 +31,11 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-port-log.h> +#include "libgphoto2/i18n.h" + #include "sierra-desc.h" #include "library.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define GP_MODULE "sierra" diff --git a/camlibs/sipix/blink.c b/camlibs/sipix/blink.c index e1395d05d..7d7a644db 100644 --- a/camlibs/sipix/blink.c +++ b/camlibs/sipix/blink.c @@ -30,19 +30,8 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-result.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + int camera_id (CameraText *id) diff --git a/camlibs/sipix/blink2.c b/camlibs/sipix/blink2.c index 0ee52d582..4450c6f9d 100644 --- a/camlibs/sipix/blink2.c +++ b/camlibs/sipix/blink2.c @@ -17,6 +17,7 @@ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ + #include "config.h" #include <stdio.h> @@ -31,19 +32,8 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-result.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #define BLINK2_GET_NUMPICS 0x08 #define BLINK2_GET_MEMORY 0x0a diff --git a/camlibs/sipix/web2.c b/camlibs/sipix/web2.c index 85e06adfc..a9f14d864 100644 --- a/camlibs/sipix/web2.c +++ b/camlibs/sipix/web2.c @@ -26,19 +26,8 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-result.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #define WEB2_SELECT_PICTURE 0xb2 #define WEB2_GET_NUMPICS 0xb6 diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c index 6000880c3..2b36538ab 100644 --- a/camlibs/sonydscf1/sonydscf1.c +++ b/camlibs/sonydscf1/sonydscf1.c @@ -29,23 +29,12 @@ #include <gphoto2/gphoto2.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "command.h" #include "pmp.h" + #define JPEG 0 #define JPEG_T 1 #define PMP 2 diff --git a/camlibs/sonydscf55/Makefile-files b/camlibs/sonydscf55/Makefile-files index 84ae3dd4e..4e82dcd1e 100644 --- a/camlibs/sonydscf55/Makefile-files +++ b/camlibs/sonydscf55/Makefile-files @@ -3,9 +3,11 @@ EXTRA_LTLIBRARIES += sony_dscf55.la EXTRA_DIST += sonydscf55/ChangeLog sonydscf55/TODO -sony_dscf55_la_SOURCES = \ - sonydscf55/sony.c sonydscf55/sony.h \ - sonydscf55/camera.c sonydscf55/nls.h +sony_dscf55_la_SOURCES = +sony_dscf55_la_SOURCES += sonydscf55/sony.c +sony_dscf55_la_SOURCES += sonydscf55/sony.h +sony_dscf55_la_SOURCES += sonydscf55/camera.c + sony_dscf55_la_LDFLAGS = $(camlib_ldflags) sony_dscf55_la_DEPENDENCIES = $(camlib_dependencies) sony_dscf55_la_LIBADD = $(camlib_libadd) diff --git a/camlibs/sonydscf55/camera.c b/camlibs/sonydscf55/camera.c index a6d29f403..95099322e 100644 --- a/camlibs/sonydscf55/camera.c +++ b/camlibs/sonydscf55/camera.c @@ -25,12 +25,15 @@ #include <gphoto2/gphoto2.h> #include <sys/types.h> -#include "sony.h" -#include "nls.h" #include <gphoto2/gphoto2-camera.h> +#include "libgphoto2/i18n.h" + +#include "sony.h" + #define GP_MODULE "sonydscf55" + struct ModelInfo { SonyModel model_id; const char *model_str; diff --git a/camlibs/sonydscf55/nls.h b/camlibs/sonydscf55/nls.h deleted file mode 100644 index e71f06b3c..000000000 --- a/camlibs/sonydscf55/nls.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Sony DSC-F55 & MSAC-SR1 - gPhoto2 camera library - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - */ - -#ifndef CAMLIBS_SONYDSCF55_NLS_H -#define CAMLIBS_SONYDSCF55_NLS_H - -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif - -#endif /* !defined(CAMLIBS_SONYDSCF55_NLS_H) */ diff --git a/camlibs/soundvision/soundvision.c b/camlibs/soundvision/soundvision.c index 5fb7e71a8..0aa34b69d 100644 --- a/camlibs/soundvision/soundvision.c +++ b/camlibs/soundvision/soundvision.c @@ -36,24 +36,12 @@ #include <string.h> #include <gphoto2/gphoto2.h> +#include <gphoto2/gphoto2-port.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "soundvision.h" -#include <gphoto2/gphoto2-port.h> #define GP_MODULE "soundvision" diff --git a/camlibs/spca50x/library.c b/camlibs/spca50x/library.c index 5043bc906..469a1a8a9 100644 --- a/camlibs/spca50x/library.c +++ b/camlibs/spca50x/library.c @@ -34,19 +34,7 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "spca50x.h" #include "spca50x-flash.h" diff --git a/camlibs/spca50x/spca50x-sdram.c b/camlibs/spca50x/spca50x-sdram.c index c6881aa06..5a5d946c8 100644 --- a/camlibs/spca50x/spca50x-sdram.c +++ b/camlibs/spca50x/spca50x-sdram.c @@ -34,31 +34,16 @@ #include <gphoto2/gphoto2.h> #include "libgphoto2/gphoto2-endian.h" +#include "libgphoto2/i18n.h" + #include "spca50x.h" #include "spca50x-sdram.h" #include "spca50x-registers.h" #include "spca50x-avi-header.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define GP_MODULE "spca50x" + static int spca50x_mode_set_idle (CameraPrivateLibrary * lib); static int spca50x_is_idle (CameraPrivateLibrary * lib); static int spca50x_mode_set_download (CameraPrivateLibrary * lib); diff --git a/camlibs/spca50x/spca50x.c b/camlibs/spca50x/spca50x.c index e21da12b7..987d361c2 100644 --- a/camlibs/spca50x/spca50x.c +++ b/camlibs/spca50x/spca50x.c @@ -36,28 +36,12 @@ #include <gphoto2/gphoto2.h> #include "libgphoto2/gphoto2-endian.h" +#include "libgphoto2/i18n.h" + #include "spca50x.h" #include "spca50x-registers.h" #include "spca50x-jpeg-header.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif #define GP_MODULE "spca50x" diff --git a/camlibs/st2205/library.c b/camlibs/st2205/library.c index ea00b1125..f599c6ceb 100644 --- a/camlibs/st2205/library.c +++ b/camlibs/st2205/library.c @@ -33,21 +33,11 @@ #include <gphoto2/gphoto2-result.h> #include <gphoto2/gphoto2-port.h> #include <gphoto2/gphoto2-setting.h> + +#include "libgphoto2/i18n.h" + #include "st2205.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif int camera_id (CameraText *id) diff --git a/camlibs/stv0674/library.c b/camlibs/stv0674/library.c index 746637248..0fcd546b6 100644 --- a/camlibs/stv0674/library.c +++ b/camlibs/stv0674/library.c @@ -27,23 +27,11 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> +#include "libgphoto2/i18n.h" + #include "stv0674.h" #include "library.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif - int stv0674_ping(GPPort *port) { diff --git a/camlibs/stv0674/stv0674.c b/camlibs/stv0674/stv0674.c index 18ef1f4c3..9cc00bcf3 100644 --- a/camlibs/stv0674/stv0674.c +++ b/camlibs/stv0674/stv0674.c @@ -23,23 +23,12 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> + #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> #include <gphoto2/gphoto2-library.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "stv0674.h" #include "library.h" diff --git a/camlibs/stv0680/library.c b/camlibs/stv0680/library.c index 3d2699773..3b032c475 100644 --- a/camlibs/stv0680/library.c +++ b/camlibs/stv0680/library.c @@ -27,6 +27,8 @@ #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> +#include "libgphoto2/i18n.h" + #include "stv0680.h" #include "library.h" #include "sharpen.h" @@ -35,19 +37,6 @@ #include "libgphoto2/bayer.h" #include "demosaic_sharpen.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif #define CMD_RETRIES 0x03 diff --git a/camlibs/stv0680/stv0680.c b/camlibs/stv0680/stv0680.c index c49e39bb5..c495b81e2 100644 --- a/camlibs/stv0680/stv0680.c +++ b/camlibs/stv0680/stv0680.c @@ -23,23 +23,12 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> + #include <gphoto2/gphoto2.h> #include <gphoto2/gphoto2-port.h> #include <gphoto2/gphoto2-library.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #include "stv0680.h" #include "library.h" diff --git a/camlibs/sx330z/library.c b/camlibs/sx330z/library.c index 7dbb98846..95b5ac463 100644 --- a/camlibs/sx330z/library.c +++ b/camlibs/sx330z/library.c @@ -25,28 +25,9 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-port-log.h> -#include "sx330z.h" - - -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" +#include "sx330z.h" #define GP_MODULE "sx330z" diff --git a/camlibs/template/template.c b/camlibs/template/template.c index ad5875886..d3caae51d 100644 --- a/camlibs/template/template.c +++ b/camlibs/template/template.c @@ -56,29 +56,7 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-result.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -/** - * This define is the string translation macro used in - * libgphoto2. It will resolve to a dcgettext() function call and - * does both the translation itself and also marks up the string - * for the collector (xgettext). - */ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -/** - * This is the noop translation macro, which does not translate the - * string, but marks it up for the extraction of translatable strings. - */ -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" /**********************************************************************/ diff --git a/camlibs/topfield/puppy.c b/camlibs/topfield/puppy.c index 2b3784ba1..28bfe4783 100644 --- a/camlibs/topfield/puppy.c +++ b/camlibs/topfield/puppy.c @@ -27,24 +27,6 @@ #include <string.h> -#include <gphoto2/gphoto2-library.h> -#include <gphoto2/gphoto2-result.h> -#include <gphoto2/gphoto2-setting.h> - -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif - #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -60,6 +42,12 @@ # include <langinfo.h> #endif +#include <gphoto2/gphoto2-library.h> +#include <gphoto2/gphoto2-result.h> +#include <gphoto2/gphoto2-setting.h> + +#include "libgphoto2/i18n.h" + #include "usb_io.h" #include "tf_bytes.h" diff --git a/camlibs/toshiba/pdrm11/library.c b/camlibs/toshiba/pdrm11/library.c index 8c4bb9624..142002a67 100644 --- a/camlibs/toshiba/pdrm11/library.c +++ b/camlibs/toshiba/pdrm11/library.c @@ -26,20 +26,7 @@ #include <gphoto2/gphoto2.h> - -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" #define GP_MODULE "Toshiba" diff --git a/camlibs/tp6801/library.c b/camlibs/tp6801/library.c index 4720ce638..6575c2f7e 100644 --- a/camlibs/tp6801/library.c +++ b/camlibs/tp6801/library.c @@ -31,21 +31,11 @@ #include <gphoto2/gphoto2-result.h> #include <gphoto2/gphoto2-port.h> #include <gphoto2/gphoto2-setting.h> + +#include "libgphoto2/i18n.h" + #include "tp6801.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif static const struct tp6801_devinfo tp6801_devinfo[] = { { 0x0168, 0x3011 }, diff --git a/configure.ac b/configure.ac index da99fccfb..a4a38b3ac 100644 --- a/configure.ac +++ b/configure.ac @@ -194,7 +194,10 @@ dnl i18n support (including some hacks) dnl --------------------------------------------------------------------------- ALL_LINGUAS="cs da de es eu fr hu it ja nl pl ru sv uk vi zh_CN" -GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}]) +GP_GETTEXT_HACK([GETTEXT_PACKAGE_LIBGPHOTO2], + [${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}], + [The gPhoto Team], + [${MAIL_GPHOTO_TRANSLATION}]) AM_PO_SUBDIRS() AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT([external]) diff --git a/gphoto-m4/gp-gettext-hack.m4 b/gphoto-m4/gp-gettext-hack.m4 index f7427745e..940e287de 100644 --- a/gphoto-m4/gp-gettext-hack.m4 +++ b/gphoto-m4/gp-gettext-hack.m4 @@ -23,13 +23,13 @@ dnl AC_DEFUN([GP_GETTEXT_HACK], [dnl AC_BEFORE([$0], [AM_GNU_GETTEXT])dnl AC_BEFORE([$0], [AM_GNU_GETTEXT_VERSION])dnl -m4_if([$1],[],[GETTEXT_PACKAGE="${PACKAGE_TARNAME}"],[GETTEXT_PACKAGE="$1"]) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], +m4_if([$2],[],[$1="${PACKAGE_TARNAME}"],[$1="$2"]) +AC_DEFINE_UNQUOTED([$1], ["${$1}"], [The gettext domain we're using]) -AC_SUBST([GETTEXT_PACKAGE]) -sed_cmds="s|^DOMAIN.*|DOMAIN = ${GETTEXT_PACKAGE}|" -m4_if([$2],[],[],[sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = $2|"]) -m4_ifval([$3],[ +AC_SUBST([$1]) +sed_cmds="s|^DOMAIN.*|DOMAIN = ${$1}|" +m4_if([$3],[],[],[sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = $3|"]) +m4_ifval([$4],[ if test -n "$PACKAGE_BUGREPORT"; then sed_mb="${PACKAGE_BUGREPORT}" else @@ -41,7 +41,7 @@ else ]) fi ],[ -sed_mb="$3" +sed_mb="$4" ]) sed_cmds="${sed_cmds};s|^MSGID_BUGS_ADDRESS.*|MSGID_BUGS_ADDRESS = ${sed_mb}|" # Not so sure whether this hack is all *that* evil... diff --git a/libgphoto2/Makefile.am b/libgphoto2/Makefile.am index dde166998..18809dcfb 100644 --- a/libgphoto2/Makefile.am +++ b/libgphoto2/Makefile.am @@ -55,3 +55,5 @@ libgphoto2_la_DEPENDENCIES = \ $(srcdir)/libgphoto2.sym EXTRA_DIST = gphoto2-library.c libgphoto2.sym + +EXTRA_DIST += i18n.h diff --git a/libgphoto2/gphoto2-abilities-list.c b/libgphoto2/gphoto2-abilities-list.c index 0657e2f41..34292bf10 100644 --- a/libgphoto2/gphoto2-abilities-list.c +++ b/libgphoto2/gphoto2-abilities-list.c @@ -36,25 +36,8 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-library.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define bind_textdomain_codeset(Domain,Charset) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + /** \internal */ #define CHECK_RESULT(result) {int r = (result); if (r < 0) return (r);} @@ -85,7 +68,7 @@ const char* gp_message_codeset (const char *codeset) { gp_port_message_codeset (codeset); - return bind_textdomain_codeset (GETTEXT_PACKAGE, codeset); + return bind_textdomain_codeset (GETTEXT_PACKAGE_LIBGPHOTO2, codeset); } /** @@ -109,7 +92,7 @@ gp_abilities_list_new (CameraAbilitiesList **list) * an other way without introducing a global initialization * function... */ - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE_LIBGPHOTO2, LOCALEDIR); C_MEM (*list = calloc (1, sizeof (CameraAbilitiesList))); diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c index 36cbeb46c..91828df46 100644 --- a/libgphoto2/gphoto2-camera.c +++ b/libgphoto2/gphoto2-camera.c @@ -38,24 +38,8 @@ #include <gphoto2/gphoto2-library.h> #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #define CAMERA_UNUSED(c,ctx) \ { \ diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c index 4b98bdfc9..eabb48931 100644 --- a/libgphoto2/gphoto2-filesys.c +++ b/libgphoto2/gphoto2-filesys.c @@ -42,24 +42,8 @@ # include <libexif/exif-data.h> #endif -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + #ifndef PATH_MAX # define PATH_MAX 4096 diff --git a/libgphoto2/gphoto2-result.c b/libgphoto2/gphoto2-result.c index 0f37bcefd..5b9770dc9 100644 --- a/libgphoto2/gphoto2-result.c +++ b/libgphoto2/gphoto2-result.c @@ -26,19 +26,8 @@ #include <stddef.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2/i18n.h" + static struct { int result; diff --git a/libgphoto2/i18n.h b/libgphoto2/i18n.h new file mode 100644 index 000000000..03862b791 --- /dev/null +++ b/libgphoto2/i18n.h @@ -0,0 +1,27 @@ +#ifndef LIBGPHOTO2_I18N_H +#define LIBGPHOTO2_I18N_H + +#include "config.h" + +#ifdef ENABLE_NLS +# include <libintl.h> +# undef _ +# define _(String) dgettext (GETTEXT_PACKAGE_LIBGPHOTO2, String) +# ifdef gettext_noop +# define N_(String) gettext_noop (String) +# else +# define N_(String) (String) +# endif +#else +# define N_(String) (String) +# define _(String) (String) +# define bind_textdomain_codeset(Domain, codeset) (codeset) +# define bindtextdomain(Domain, Directory) (Domain) +# define dcgettext(Domain, Message, Type) (Message) +# define dgettext(Domain, Message) (Message) +# define gettext(String) (String) +# define ngettext(String1, String2, Count) ((Count==1)?String1:String2) +# define textdomain(String) (String) +#endif + +#endif /* !defined(LIBGPHOTO2_I18N_H) */ diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index af698723a..4b5375901 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -120,7 +120,10 @@ dnl AC_SUBST(BUILD_INCLUDED_LIBINTL) dnl USE_INCLUDED_LIBINTL=no dnl AC_SUBST(USE_INCLUDED_LIBINTL) -GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],[Lutz Mueller and others],[${MAIL_GPHOTO_TRANSLATION}]) +GP_GETTEXT_HACK([GETTEXT_PACKAGE_LIBGPHOTO2_PORT], + [${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}], + [Lutz Mueller and others], + [${MAIL_GPHOTO_TRANSLATION}]) ALL_LINGUAS="cs da de es eu fi fr it ja nl pl pt_BR ru sk sr sv uk vi zh_CN zh_TW" AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT([external]) diff --git a/libgphoto2_port/disk/disk.c b/libgphoto2_port/disk/disk.c index dcec24a14..a74e79702 100644 --- a/libgphoto2_port/disk/disk.c +++ b/libgphoto2_port/disk/disk.c @@ -51,24 +51,8 @@ #include <gphoto2/gphoto2-port-result.h> #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" + #define CHECK(result) {int r=(result); if (r<0) return (r);} diff --git a/libgphoto2_port/gphoto-m4/gp-gettext-hack.m4 b/libgphoto2_port/gphoto-m4/gp-gettext-hack.m4 index 3f5dbb72a..d7d611dd2 100644 --- a/libgphoto2_port/gphoto-m4/gp-gettext-hack.m4 +++ b/libgphoto2_port/gphoto-m4/gp-gettext-hack.m4 @@ -24,13 +24,13 @@ AC_DEFUN([GP_GETTEXT_HACK], [ AC_BEFORE([$0], [AM_GNU_GETTEXT])dnl AC_BEFORE([$0], [AM_GNU_GETTEXT_VERSION])dnl -m4_if([$1],[],[GETTEXT_PACKAGE="${PACKAGE_TARNAME}"],[GETTEXT_PACKAGE="$1"]) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], +m4_if([$2],[],[$1="${PACKAGE_TARNAME}"],[$1="$2"]) +AC_DEFINE_UNQUOTED([$1], ["${$1}"], [The gettext domain we're using]) -AC_SUBST([GETTEXT_PACKAGE]) -sed_cmds="s|^DOMAIN.*|DOMAIN = ${GETTEXT_PACKAGE}|" -m4_if([$2],[],[],[sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = $2|"]) -m4_ifval([$3],[ +AC_SUBST([$1]) +sed_cmds="s|^DOMAIN.*|DOMAIN = ${$1}|" +m4_if([$3],[],[],[sed_cmds="${sed_cmds};s|^COPYRIGHT_HOLDER.*|COPYRIGHT_HOLDER = $3|"]) +m4_ifval([$4],[ if test -n "$PACKAGE_BUGREPORT"; then sed_mb="${PACKAGE_BUGREPORT}" else @@ -42,7 +42,7 @@ else ]) fi ],[ -sed_mb="$3" +sed_mb="$4" ]) sed_cmds="${sed_cmds};s|^MSGID_BUGS_ADDRESS.*|MSGID_BUGS_ADDRESS = ${sed_mb}|" # Not so sure whether this hack is all *that* evil... diff --git a/libgphoto2_port/libgphoto2_port/Makefile.am b/libgphoto2_port/libgphoto2_port/Makefile.am index 37ab423cb..967949843 100644 --- a/libgphoto2_port/libgphoto2_port/Makefile.am +++ b/libgphoto2_port/libgphoto2_port/Makefile.am @@ -58,3 +58,5 @@ libgphoto2_port_la_DEPENDENCIES = \ # characters of path length. EXTRA_DIST = \ libgphoto2_port.ver + +EXTRA_DIST += i18n.h diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c index 41775d814..83c531f30 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c @@ -45,27 +45,8 @@ #include <gphoto2/gphoto2-port-log.h> #include "libgphoto2_port/gphoto2-port-info.h" +#include "libgphoto2_port/i18n.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define bind_textdomain_codeset(Domain,codeset) (codeset) -# define ngettext(String1,String2,Count) ((Count==1)?String1:String2) -# define _(String) (String) -# define N_(String) (String) -#endif /** * \internal GPPortInfoList: @@ -95,7 +76,8 @@ struct _GPPortInfoList { */ const char* gp_port_message_codeset (const char *codeset) { - return bind_textdomain_codeset (GETTEXT_PACKAGE, codeset); + return bind_textdomain_codeset (GETTEXT_PACKAGE_LIBGPHOTO2_PORT, + codeset); } /** @@ -117,7 +99,7 @@ gp_port_info_list_new (GPPortInfoList **list) * We put this in here because everybody needs to call this function * before accessing ports... */ - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE_LIBGPHOTO2_PORT, LOCALEDIR); C_MEM (*list = calloc (1, sizeof (GPPortInfoList))); diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c index 52a5dd989..f7770bede 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c @@ -33,19 +33,7 @@ #include <gphoto2/gphoto2-port-result.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" #ifndef DISABLE_DEBUGGING /** diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c index 8b0c19eb6..855da69d9 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c @@ -21,24 +21,8 @@ #include "config.h" #include <gphoto2/gphoto2-port-result.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" + /** * gp_port_result_as_string: diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port.c b/libgphoto2_port/libgphoto2_port/gphoto2-port.c index 9687e7ffe..b5ed5f073 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port.c @@ -40,20 +40,7 @@ #include "libgphoto2_port/gphoto2-port-info.h" -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -# define ngettext(String1,String2,Count) ((Count==1)?String1:String2) -#endif +#include "libgphoto2_port/i18n.h" #define CHECK_RESULT(result) {int r=(result); if (r<0) return (r);} #define CHECK_SUPP(p,t,o) {if (!(o)) {gp_port_set_error ((p), _("The operation '%s' is not supported by this device"), (t)); return (GP_ERROR_NOT_SUPPORTED);}} diff --git a/libgphoto2_port/libgphoto2_port/i18n.h b/libgphoto2_port/libgphoto2_port/i18n.h new file mode 100644 index 000000000..3d8c7cf17 --- /dev/null +++ b/libgphoto2_port/libgphoto2_port/i18n.h @@ -0,0 +1,27 @@ +#ifndef LIBGPHOTO2_PORT_I18N_H +#define LIBGPHOTO2_PORT_I18N_H + +#include "config.h" + +#ifdef ENABLE_NLS +# include <libintl.h> +# undef _ +# define _(String) dgettext (GETTEXT_PACKAGE_LIBGPHOTO2_PORT, String) +# ifdef gettext_noop +# define N_(String) gettext_noop (String) +# else +# define N_(String) (String) +# endif +#else +# define N_(String) (String) +# define _(String) (String) +# define bind_textdomain_codeset(Domain, codeset) (codeset) +# define bindtextdomain(Domain, Directory) (Domain) +# define dcgettext(Domain, Message, Type) (Message) +# define dgettext(Domain, Message) (Message) +# define gettext(String) (String) +# define ngettext(String1, String2, Count) ((Count==1)?String1:String2) +# define textdomain(String) (String) +#endif + +#endif /* !defined(LIBGPHOTO2_PORT_I18N_H) */ diff --git a/libgphoto2_port/libusb1/libusb1.c b/libgphoto2_port/libusb1/libusb1.c index 134285586..0ba60de65 100644 --- a/libgphoto2_port/libusb1/libusb1.c +++ b/libgphoto2_port/libusb1/libusb1.c @@ -36,24 +36,8 @@ #include <gphoto2/gphoto2-port-result.h> #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" + #define C_GP(RESULT) do {\ int _r=(RESULT);\ diff --git a/libgphoto2_port/ptpip/ptpip.c b/libgphoto2_port/ptpip/ptpip.c index b21eef42c..ff9df9da5 100644 --- a/libgphoto2_port/ptpip/ptpip.c +++ b/libgphoto2_port/ptpip/ptpip.c @@ -40,24 +40,8 @@ #include <gphoto2/gphoto2-port-result.h> #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" + #define CHECK(result) {int r=(result); if (r<0) return (r);} diff --git a/libgphoto2_port/serial/unix.c b/libgphoto2_port/serial/unix.c index 8207acfcc..d751ed4d2 100644 --- a/libgphoto2_port/serial/unix.c +++ b/libgphoto2_port/serial/unix.c @@ -77,24 +77,8 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-port.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" + #define CHECK(result) {int r=(result); if (r<0) return (r);} diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c index f0eddb426..3cd91fa67 100644 --- a/libgphoto2_port/usb/libusb.c +++ b/libgphoto2_port/usb/libusb.c @@ -44,24 +44,8 @@ #include <gphoto2/gphoto2-port-result.h> #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" + #define CHECK(result) {int r=(result); if (r<0) return (r);} diff --git a/libgphoto2_port/usbdiskdirect/linux.c b/libgphoto2_port/usbdiskdirect/linux.c index a62cc5280..1c37fdf51 100644 --- a/libgphoto2_port/usbdiskdirect/linux.c +++ b/libgphoto2_port/usbdiskdirect/linux.c @@ -44,24 +44,8 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-port.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" + /* From Linux asm/fcntl.h */ #ifndef O_DIRECT diff --git a/libgphoto2_port/usbscsi/linux.c b/libgphoto2_port/usbscsi/linux.c index d3098d9fe..7667127bb 100644 --- a/libgphoto2_port/usbscsi/linux.c +++ b/libgphoto2_port/usbscsi/linux.c @@ -64,24 +64,8 @@ #include <gphoto2/gphoto2-port-log.h> #include <gphoto2/gphoto2-port.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" + #define CHECK(result) {int r=(result); if (r<0) return (r);} diff --git a/libgphoto2_port/vusb/vcamera.c b/libgphoto2_port/vusb/vcamera.c index 536e09b72..8f18e7404 100644 --- a/libgphoto2_port/vusb/vcamera.c +++ b/libgphoto2_port/vusb/vcamera.c @@ -44,24 +44,8 @@ #include <gphoto2/gphoto2-port-result.h> #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" + #define CHECK(result) {int r=(result); if (r<0) return (r);} diff --git a/libgphoto2_port/vusb/vusb.c b/libgphoto2_port/vusb/vusb.c index 4aa678f92..e6025cadb 100644 --- a/libgphoto2_port/vusb/vusb.c +++ b/libgphoto2_port/vusb/vusb.c @@ -38,24 +38,8 @@ #include <gphoto2/gphoto2-port-result.h> #include <gphoto2/gphoto2-port-log.h> -#ifdef ENABLE_NLS -# include <libintl.h> -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define N_(String) (String) -#endif +#include "libgphoto2_port/i18n.h" + #define CHECK(result) {int r=(result); if (r<0) return (r);} |