diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c index 27659af85..2870a926a 100644 --- a/camlibs/barbie/barbie.c +++ b/camlibs/barbie/barbie.c @@ -9,7 +9,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index 72af94c30..06b1c246c 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -41,7 +41,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/canon/library.c b/camlibs/canon/library.c index a9c106cc7..a050ce3eb 100644 --- a/camlibs/canon/library.c +++ b/camlibs/canon/library.c @@ -42,7 +42,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/canon/serial.c b/camlibs/canon/serial.c index 321a3ecaa..caa26979d 100644 --- a/camlibs/canon/serial.c +++ b/camlibs/canon/serial.c @@ -31,7 +31,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c index 54e646368..9d081d29e 100644 --- a/camlibs/canon/usb.c +++ b/camlibs/canon/usb.c @@ -25,7 +25,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/digita/digita.c b/camlibs/digita/digita.c index 2b4885fdf..a8bafcb08 100644 --- a/camlibs/digita/digita.c +++ b/camlibs/digita/digita.c @@ -42,7 +42,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/dimera/dimera3500.c b/camlibs/dimera/dimera3500.c index eb347c0f6..af236a933 100644 --- a/camlibs/dimera/dimera3500.c +++ b/camlibs/dimera/dimera3500.c @@ -21,6 +21,9 @@ * * History: * $Log$ + * Revision 1.46 2002/11/23 00:47:45 hun + * gettext stuff for Arnaud + * * Revision 1.45 2002/11/17 15:48:47 marcusmeissner * * dimera3500.c: fixed 64bit problems (using long* to int*). * @@ -171,7 +174,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/directory/directory.c b/camlibs/directory/directory.c index 1f6379c70..d0b473946 100644 --- a/camlibs/directory/directory.c +++ b/camlibs/directory/directory.c @@ -39,7 +39,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/fuji/fuji.c b/camlibs/fuji/fuji.c index 77861b81d..e888e3cd5 100644 --- a/camlibs/fuji/fuji.c +++ b/camlibs/fuji/fuji.c @@ -51,7 +51,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/fuji/library.c b/camlibs/fuji/library.c index d1eab0953..b8bc49a9c 100644 --- a/camlibs/fuji/library.c +++ b/camlibs/fuji/library.c @@ -34,7 +34,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/gsmart/gsmart.c b/camlibs/gsmart/gsmart.c index 7f4371839..ef53245c7 100644 --- a/camlibs/gsmart/gsmart.c +++ b/camlibs/gsmart/gsmart.c @@ -38,7 +38,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/gsmart/library.c b/camlibs/gsmart/library.c index abeff01a7..e8162f3cd 100644 --- a/camlibs/gsmart/library.c +++ b/camlibs/gsmart/library.c @@ -34,7 +34,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/jamcam/jamcam.c b/camlibs/jamcam/jamcam.c index ed1f95638..f94e51bc0 100644 --- a/camlibs/jamcam/jamcam.c +++ b/camlibs/jamcam/jamcam.c @@ -36,7 +36,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/jamcam/library.c b/camlibs/jamcam/library.c index 063c9f55e..685c07f8d 100644 --- a/camlibs/jamcam/library.c +++ b/camlibs/jamcam/library.c @@ -36,7 +36,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/jd11/jd11.c b/camlibs/jd11/jd11.c index 641894a78..c45c27ab7 100644 --- a/camlibs/jd11/jd11.c +++ b/camlibs/jd11/jd11.c @@ -30,7 +30,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/jd11/serial.c b/camlibs/jd11/serial.c index 4652bd295..b140247e2 100644 --- a/camlibs/jd11/serial.c +++ b/camlibs/jd11/serial.c @@ -36,7 +36,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/kodak/dc120/library.c b/camlibs/kodak/dc120/library.c index cb9288b21..aba619808 100644 --- a/camlibs/kodak/dc120/library.c +++ b/camlibs/kodak/dc120/library.c @@ -11,7 +11,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/kodak/dc210/library.c b/camlibs/kodak/dc210/library.c index 0cc9334db..33a441bd5 100644 --- a/camlibs/kodak/dc210/library.c +++ b/camlibs/kodak/dc210/library.c @@ -11,7 +11,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/kodak/dc240/dc240.c b/camlibs/kodak/dc240/dc240.c index 3e30f3524..73b9c7691 100644 --- a/camlibs/kodak/dc240/dc240.c +++ b/camlibs/kodak/dc240/dc240.c @@ -18,7 +18,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/kodak/dc240/library.c b/camlibs/kodak/dc240/library.c index 332390c21..ac6cbd337 100644 --- a/camlibs/kodak/dc240/library.c +++ b/camlibs/kodak/dc240/library.c @@ -22,7 +22,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/kodak/dc3200/dc3200.c b/camlibs/kodak/dc3200/dc3200.c index 12ebbbb75..a7e4f51e6 100644 --- a/camlibs/kodak/dc3200/dc3200.c +++ b/camlibs/kodak/dc3200/dc3200.c @@ -24,7 +24,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/kodak/dc3200/library.c b/camlibs/kodak/dc3200/library.c index 504511cc0..1b3dfdb93 100644 --- a/camlibs/kodak/dc3200/library.c +++ b/camlibs/kodak/dc3200/library.c @@ -28,7 +28,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/konica/konica.c b/camlibs/konica/konica.c index ad2879784..63f49dd74 100644 --- a/camlibs/konica/konica.c +++ b/camlibs/konica/konica.c @@ -33,7 +33,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/konica/library.c b/camlibs/konica/library.c index 489b85b7c..3884c5e96 100644 --- a/camlibs/konica/library.c +++ b/camlibs/konica/library.c @@ -33,7 +33,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/konica/lowlevel.c b/camlibs/konica/lowlevel.c index ac23b43a3..60166e29e 100644 --- a/camlibs/konica/lowlevel.c +++ b/camlibs/konica/lowlevel.c @@ -33,7 +33,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/largan/lmini/largan.c b/camlibs/largan/lmini/largan.c index f6893d493..e10e1417e 100644 --- a/camlibs/largan/lmini/largan.c +++ b/camlibs/largan/lmini/largan.c @@ -39,7 +39,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/mustek/core.c b/camlibs/mustek/core.c index eb56f3ca2..b86a89eee 100644 --- a/camlibs/mustek/core.c +++ b/camlibs/mustek/core.c @@ -33,7 +33,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/mustek/mdc800.c b/camlibs/mustek/mdc800.c index df607d6e8..fbaa1c2ae 100644 --- a/camlibs/mustek/mdc800.c +++ b/camlibs/mustek/mdc800.c @@ -29,7 +29,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/panasonic/coolshot/coolshot.c b/camlibs/panasonic/coolshot/coolshot.c index 4b4802c2f..1b184b5b3 100644 --- a/camlibs/panasonic/coolshot/coolshot.c +++ b/camlibs/panasonic/coolshot/coolshot.c @@ -34,7 +34,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/panasonic/coolshot/library.c b/camlibs/panasonic/coolshot/library.c index 10c9fa04e..82ba16a22 100644 --- a/camlibs/panasonic/coolshot/library.c +++ b/camlibs/panasonic/coolshot/library.c @@ -35,7 +35,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/panasonic/dc1000.c b/camlibs/panasonic/dc1000.c index 67c853e7a..4a96a8306 100644 --- a/camlibs/panasonic/dc1000.c +++ b/camlibs/panasonic/dc1000.c @@ -32,7 +32,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/panasonic/dc1580.c b/camlibs/panasonic/dc1580.c index e8ba8009d..4d672895c 100644 --- a/camlibs/panasonic/dc1580.c +++ b/camlibs/panasonic/dc1580.c @@ -35,7 +35,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/panasonic/l859/l859.c b/camlibs/panasonic/l859/l859.c index b5172fcd5..f3ca3ece6 100644 --- a/camlibs/panasonic/l859/l859.c +++ b/camlibs/panasonic/l859/l859.c @@ -27,7 +27,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/pccam600/library.c b/camlibs/pccam600/library.c index c8c7010ce..8eb27cea4 100644 --- a/camlibs/pccam600/library.c +++ b/camlibs/pccam600/library.c @@ -44,7 +44,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/pccam600/pccam600.c b/camlibs/pccam600/pccam600.c index a13ed73c3..5d8aceafa 100644 --- a/camlibs/pccam600/pccam600.c +++ b/camlibs/pccam600/pccam600.c @@ -41,7 +41,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/polaroid/pdc700.c b/camlibs/polaroid/pdc700.c index 2125c2d39..0a9e50064 100644 --- a/camlibs/polaroid/pdc700.c +++ b/camlibs/polaroid/pdc700.c @@ -31,7 +31,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/ptp/library.c b/camlibs/ptp/library.c index 510297391..7e809968c 100644 --- a/camlibs/ptp/library.c +++ b/camlibs/ptp/library.c @@ -29,7 +29,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/ptp/ptp.c b/camlibs/ptp/ptp.c index 25c29c3f8..9386e84bb 100644 --- a/camlibs/ptp/ptp.c +++ b/camlibs/ptp/ptp.c @@ -29,7 +29,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/ricoh/library.c b/camlibs/ricoh/library.c index 2d5465cee..f1808f7ce 100644 --- a/camlibs/ricoh/library.c +++ b/camlibs/ricoh/library.c @@ -34,7 +34,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/ricoh/ricoh.c b/camlibs/ricoh/ricoh.c index 63852c211..d035e492f 100644 --- a/camlibs/ricoh/ricoh.c +++ b/camlibs/ricoh/ricoh.c @@ -40,7 +40,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/samsung/samsung.c b/camlibs/samsung/samsung.c index bbf4134c1..d3d233df7 100644 --- a/camlibs/samsung/samsung.c +++ b/camlibs/samsung/samsung.c @@ -47,7 +47,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sierra/epson-desc.c b/camlibs/sierra/epson-desc.c index cb65f6590..35ae4a9d2 100644 --- a/camlibs/sierra/epson-desc.c +++ b/camlibs/sierra/epson-desc.c @@ -51,7 +51,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sierra/library.c b/camlibs/sierra/library.c index a3d153bf9..bf96ff4c0 100644 --- a/camlibs/sierra/library.c +++ b/camlibs/sierra/library.c @@ -36,7 +36,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sierra/nikon-desc.c b/camlibs/sierra/nikon-desc.c index b5d40f64e..600f615c7 100644 --- a/camlibs/sierra/nikon-desc.c +++ b/camlibs/sierra/nikon-desc.c @@ -49,7 +49,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sierra/olympus-desc.c b/camlibs/sierra/olympus-desc.c index 68f88a43f..95298b78f 100644 --- a/camlibs/sierra/olympus-desc.c +++ b/camlibs/sierra/olympus-desc.c @@ -51,7 +51,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sierra/sierra-desc.c b/camlibs/sierra/sierra-desc.c index c9d36014f..242d64e03 100644 --- a/camlibs/sierra/sierra-desc.c +++ b/camlibs/sierra/sierra-desc.c @@ -35,7 +35,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sierra/sierra.c b/camlibs/sierra/sierra.c index 3d905f28f..2c3cb6bf1 100644 --- a/camlibs/sierra/sierra.c +++ b/camlibs/sierra/sierra.c @@ -34,7 +34,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sipix/sipix.c b/camlibs/sipix/sipix.c index 90c30c077..1c11e639d 100644 --- a/camlibs/sipix/sipix.c +++ b/camlibs/sipix/sipix.c @@ -30,7 +30,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sipix/web2.c b/camlibs/sipix/web2.c index 149a4392f..495b9a37a 100644 --- a/camlibs/sipix/web2.c +++ b/camlibs/sipix/web2.c @@ -30,7 +30,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sipixblink/sipixblink.c b/camlibs/sipixblink/sipixblink.c index 7a0665f18..f3c96b108 100644 --- a/camlibs/sipixblink/sipixblink.c +++ b/camlibs/sipixblink/sipixblink.c @@ -30,7 +30,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sonydscf1/dsc_f1.c b/camlibs/sonydscf1/dsc_f1.c index 0680762c9..8d2837781 100644 --- a/camlibs/sonydscf1/dsc_f1.c +++ b/camlibs/sonydscf1/dsc_f1.c @@ -20,7 +20,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c index 5f1d5a466..bf415c590 100644 --- a/camlibs/sonydscf1/sonydscf1.c +++ b/camlibs/sonydscf1/sonydscf1.c @@ -9,7 +9,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/soundvision/soundvision.c b/camlibs/soundvision/soundvision.c index 66e2a51ce..db15142b1 100644 --- a/camlibs/soundvision/soundvision.c +++ b/camlibs/soundvision/soundvision.c @@ -25,7 +25,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/spca504_flash/library.c b/camlibs/spca504_flash/library.c index bded1ab2f..087c6a174 100644 --- a/camlibs/spca504_flash/library.c +++ b/camlibs/spca504_flash/library.c @@ -42,7 +42,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/stv0680/library.c b/camlibs/stv0680/library.c index 54d37da41..9319d41f3 100644 --- a/camlibs/stv0680/library.c +++ b/camlibs/stv0680/library.c @@ -38,7 +38,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/stv0680/stv0680.c b/camlibs/stv0680/stv0680.c index 12a615a84..10fd68c61 100644 --- a/camlibs/stv0680/stv0680.c +++ b/camlibs/stv0680/stv0680.c @@ -29,7 +29,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/sx330z/library.c b/camlibs/sx330z/library.c index a6340f81c..a5f0a06d7 100644 --- a/camlibs/sx330z/library.c +++ b/camlibs/sx330z/library.c @@ -32,7 +32,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/camlibs/template/template.c b/camlibs/template/template.c index a042c20db..da1a77f62 100644 --- a/camlibs/template/template.c +++ b/camlibs/template/template.c @@ -25,7 +25,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/libgphoto2/gphoto2-abilities-list.c b/libgphoto2/gphoto2-abilities-list.c index 0a4dc5139..837d702b3 100644 --- a/libgphoto2/gphoto2-abilities-list.c +++ b/libgphoto2/gphoto2-abilities-list.c @@ -36,7 +36,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c index 49a870e4c..c3e15223c 100644 --- a/libgphoto2/gphoto2-camera.c +++ b/libgphoto2/gphoto2-camera.c @@ -41,7 +41,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c index 531a3c840..e739d4523 100644 --- a/libgphoto2/gphoto2-filesys.c +++ b/libgphoto2/gphoto2-filesys.c @@ -53,7 +53,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/libgphoto2/gphoto2-result.c b/libgphoto2/gphoto2-result.c index 13bdfc99a..8f00a1b80 100644 --- a/libgphoto2/gphoto2-result.c +++ b/libgphoto2/gphoto2-result.c @@ -26,7 +26,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c index 021183e41..1195fac54 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c @@ -37,7 +37,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c index 67542d99e..cb2cc1c22 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c @@ -24,7 +24,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port.c b/libgphoto2_port/libgphoto2_port/gphoto2-port.c index cbe152829..9f0f2e07a 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port.c @@ -40,7 +40,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/libgphoto2_port/serial/unix.c b/libgphoto2_port/serial/unix.c index 66422e255..430a4cddc 100644 --- a/libgphoto2_port/serial/unix.c +++ b/libgphoto2_port/serial/unix.c @@ -76,7 +76,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c index b0c73af08..54cf085b1 100644 --- a/libgphoto2_port/usb/libusb.c +++ b/libgphoto2_port/usb/libusb.c @@ -41,7 +41,7 @@ #ifdef ENABLE_NLS # include # undef _ -# define _(String) dgettext (PACKAGE, String) +# define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else