[Kst] branches/kst/hfi_calib/kst

[George Staikos]

SVN commit 547514 by staikos:

merge 547512,547513


 M  +1 -1      configure.in.in  
 M  +4 -0      src/extdate/kstextdatetime.cpp  


--- branches/kst/hfi_calib/kst/configure.in.in #547513:547514
@@ -243,7 +243,7 @@
       #include <kdeversion.h>
     ],
     [
-      #if KDE_VERSION < ((3<<16) | (2<<8) | (0))
+      #if KDE_VERSION < ((3<<16) | (2<<8) | (2))
          KDE_choke me
       #endif
     ],
--- branches/kst/hfi_calib/kst/src/extdate/kstextdatetime.cpp #547513:547514
@@ -46,6 +46,10 @@
 uint ExtDate::m_monthLength[] = {31, 28, 31, 30,  31,  30,  31,  31,  30,  31,  30,  31};
 uint ExtDate::m_monthOrigin[] = { 0, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
 
+#ifndef I18N_NOOP2
+#define I18N_NOOP2(x, y) I18N_NOOP(y)
+#endif
+
 const char* const ExtDate::m_shortMonthNames[12] = {
 	I18N_NOOP("Jan"), I18N_NOOP("Feb"), I18N_NOOP("Mar"), I18N_NOOP("Apr"), I18N_NOOP2("Short form may", "May"), I18N_NOOP("Jun"),
 	I18N_NOOP("Jul"), I18N_NOOP("Aug"), I18N_NOOP("Sep"), I18N_NOOP("Oct"), I18N_NOOP("Nov"), I18N_NOOP("Dec")