[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

- fix crash from previous commit (!plot -> plot)
- fix i18n


  M +15 -15    kstplotdefines.h   1.2
  M +3 -3      kstplotdialog_i.cpp   1.107


--- kdeextragear-2/kst/kst/kstplotdefines.h  #1.1:1.2
@@ -37,30 +37,30 @@ enum KstXAxisDisplay { X_AXIS_DISPLAY_YE
 
 struct XAxisInterpretation {
-  QString Label;
+  QString label;
   KstXAxisInterpretation type;
 };
 
 struct XAxisDisplay {
-  QString Label;
+  QString label;
   KstXAxisDisplay type;
 };
 
 const XAxisInterpretation XAxisInterpretations[] = {
-  { i18n("Julian Year"), X_AXIS_INTERP_YEAR },
-  { i18n("Standard C time"), X_AXIS_INTERP_CTIME },
-  { i18n("Julian Date", "JD"), X_AXIS_INTERP_JD },
-  { i18n("Modified Julian Date", "MJD"), X_AXIS_INTERP_MJD },
-  { i18n("Reduced Julian Date", "RJD"), X_AXIS_INTERP_RJD }
+  { I18N_NOOP("Julian Year"), X_AXIS_INTERP_YEAR },
+  { I18N_NOOP("Standard C time"), X_AXIS_INTERP_CTIME },
+  { I18N_NOOP2("Julian Date", "JD"), X_AXIS_INTERP_JD },
+  { I18N_NOOP2("Modified Julian Date", "MJD"), X_AXIS_INTERP_MJD },
+  { I18N_NOOP2("Reduced Julian Date", "RJD"), X_AXIS_INTERP_RJD }
 };          
 
 const XAxisDisplay XAxisDisplays[] = {
-  { i18n("Julian Year"), X_AXIS_DISPLAY_YEAR },
-  { i18n("YYYY/MM/DD HH:MM:SS.SS"), X_AXIS_DISPLAY_YYMMDDHHMMSS_SS },
-  { i18n("DD/MM/YYYY HH:MM:SS.SS"), X_AXIS_DISPLAY_DDMMYYHHMMSS_SS },
-  { i18n("<Qt Text Date> HH:MM:SS.SS"), X_AXIS_DISPLAY_QTTEXTDATEHHMMSS_SS },
-  { i18n("<Qt Local Date> HH:MM:SS.SS"), X_AXIS_DISPLAY_QTLOCALDATEHHMMSS_SS },
-  { i18n("Julian Date", "JD"), X_AXIS_DISPLAY_JD },
-  { i18n("Modified Julian Date", "MJD"), X_AXIS_DISPLAY_MJD },
-  { i18n("Reduced Julian Date", "RJD"), X_AXIS_DISPLAY_RJD }
+  { I18N_NOOP("Julian Year"), X_AXIS_DISPLAY_YEAR },
+  { I18N_NOOP("YYYY/MM/DD HH:MM:SS.SS"), X_AXIS_DISPLAY_YYMMDDHHMMSS_SS },
+  { I18N_NOOP("DD/MM/YYYY HH:MM:SS.SS"), X_AXIS_DISPLAY_DDMMYYHHMMSS_SS },
+  { I18N_NOOP("<Qt Text Date> HH:MM:SS.SS"), X_AXIS_DISPLAY_QTTEXTDATEHHMMSS_SS },
+  { I18N_NOOP("<Qt Local Date> HH:MM:SS.SS"), X_AXIS_DISPLAY_QTLOCALDATEHHMMSS_SS },
+  { I18N_NOOP2("Julian Date", "JD"), X_AXIS_DISPLAY_JD },
+  { I18N_NOOP2("Modified Julian Date", "MJD"), X_AXIS_DISPLAY_MJD },
+  { I18N_NOOP2("Reduced Julian Date", "RJD"), X_AXIS_DISPLAY_RJD }
 };
 

--- kdeextragear-2/kst/kst/kstplotdialog_i.cpp  #1.106:1.107
@@ -212,8 +212,8 @@ KstPlotDialogI::KstPlotDialogI(KstDoc *i
 
   for (i = 0; i < numXAxisInterpretations; i++) {
-    _comboBoxXInterpret->insertItem(XAxisInterpretations[i].Label);
+    _comboBoxXInterpret->insertItem(i18n(XAxisInterpretations[i].label));
   }
   for (i = 0; i < numXAxisDisplays; i++) {
-    _comboBoxXDisplay->insertItem(XAxisDisplays[i].Label);
+    _comboBoxXDisplay->insertItem(i18n(XAxisDisplays[i].label));
   }
   
@@ -343,5 +343,5 @@ void KstPlotDialogI::update(int new_inde
     KstViewObjectPtr obj = static_cast<KstViewWindow*>(c)->view()->findChild(Select->currentText());
     Kst2DPlotPtr plot = kst_cast<Kst2DPlot>(obj);
-    if (plot) {
+    if (!plot) {
       return;
     }