Merge branch 'work/i18n-improvements'

MainWindow/AutoStackImages.cpp

@@ -78,11 +78,10 @@ AutoStackImages::AutoStackImages(QWidget *parent, const DB::FileNameList &list)
     lay1->addWidget(containerContinuous);
     QHBoxLayout *hlayContinuous = new QHBoxLayout(containerContinuous);
 
-    //FIXME: This is hard to translate because of the split sentence. It is better
-    //to use a single sentence here like "Stack images that are (were?) shot
-    //within this time:" and use the spin method setSuffix() to set the "seconds".
-    //Also: Would minutes not be a more sane time unit here? (schwarzer)
-    m_continuousShooting = new QCheckBox(i18nc("The whole sentence should read: *Stack images that are shot within x seconds of each other*. So images that are shot in one burst are automatically stacked together. (This sentence is before the x.)", "Stack images that are shot within"));
+    // Would minutes not be a more sane time unit here? (schwarzer)
+    // jzarl: this feature is used to group "burst" images - usually they are taken within a few seconds.
+    // a typical value would be somewhere between 2 and 20 seconds
+    m_continuousShooting = new QCheckBox(i18nc("Label for a QSpinbox that selects a number of seconds.", "Stack images created within the following time-frame:"));
     m_continuousShooting->setChecked(false);
     hlayContinuous->addWidget(m_continuousShooting);
 
@@ -90,11 +89,9 @@ AutoStackImages::AutoStackImages(QWidget *parent, const DB::FileNameList &list)
     m_continuousThreshold->setRange(1, 999);
     m_continuousThreshold->setSingleStep(1);
     m_continuousThreshold->setValue(2);
+    m_continuousThreshold->setSuffix(i18nc("Unit suffix on a QSpinBox; note the space at the beginning.", " seconds"));
     hlayContinuous->addWidget(m_continuousThreshold);
 
-    QLabel *sec = new QLabel(i18nc("The whole sentence should read: *Stack images that are shot within x seconds of each other*. (This being the text after x.)", "seconds"), containerContinuous);
-    hlayContinuous->addWidget(sec);
-
     QGroupBox *grpOptions = new QGroupBox(i18n("AutoStacking Options"));
     QVBoxLayout *grpLayOptions = new QVBoxLayout(grpOptions);
     lay1->addWidget(grpOptions);