diff --git a/src/ExportManager.h b/src/ExportManager.h --- a/src/ExportManager.h +++ b/src/ExportManager.h @@ -28,6 +28,8 @@ #include #include +#include + #include "PlatformBackends/ImageGrabber.h" class QTemporaryDir; @@ -69,7 +71,7 @@ void setGrabMode(const ImageGrabber::GrabMode &grabMode); QString formatFilename(const QString &nameTemplate); - static const QMap filenamePlaceholders; + static const QMap filenamePlaceholders; Q_SIGNALS: diff --git a/src/ExportManager.cpp b/src/ExportManager.cpp --- a/src/ExportManager.cpp +++ b/src/ExportManager.cpp @@ -32,7 +32,6 @@ #include #include -#include #include #include #include @@ -519,35 +518,35 @@ return; } -const QMap ExportManager::filenamePlaceholders { - {QStringLiteral("%Y"), I18N_NOOP2( +const QMap ExportManager::filenamePlaceholders { + {QStringLiteral("%Y"), ki18nc( "A placeholder in the user configurable filename will replaced by the specified value", "Year (4 digit)")}, - {QStringLiteral("%y"), I18N_NOOP2( + {QStringLiteral("%y"), ki18nc( "A placeholder in the user configurable filename will replaced by the specified value", "Year (2 digit)")}, - {QStringLiteral("%M"), I18N_NOOP2( + {QStringLiteral("%M"), ki18nc( "A placeholder in the user configurable filename will replaced by the specified value", "Month")}, - {QStringLiteral("%D"), I18N_NOOP2( + {QStringLiteral("%D"), ki18nc( "A placeholder in the user configurable filename will replaced by the specified value", "Day")}, - {QStringLiteral("%H"), I18N_NOOP2( + {QStringLiteral("%H"), ki18nc( "A placeholder in the user configurable filename will replaced by the specified value", "Hour")}, - {QStringLiteral("%m"), I18N_NOOP2( + {QStringLiteral("%m"), ki18nc( "A placeholder in the user configurable filename will replaced by the specified value", "Minute")}, - {QStringLiteral("%S"), I18N_NOOP2( + {QStringLiteral("%S"), ki18nc( "A placeholder in the user configurable filename will replaced by the specified value", "Second")}, - {QStringLiteral("%T"), I18N_NOOP2( + {QStringLiteral("%T"), ki18nc( "A placeholder in the user configurable filename will replaced by the specified value", "Window Title")}, - {QStringLiteral("%d"), I18N_NOOP2( + {QStringLiteral("%d"), ki18nc( "A placeholder in the user configurable filename will replaced by the specified value", "Sequential numbering")}, - {QStringLiteral("%Nd"), I18N_NOOP2( + {QStringLiteral("%Nd"), ki18nc( "A placeholder in the user configurable filename will replaced by the specified value", "Sequential numbering, padded out to N digits")}, }; diff --git a/src/Gui/SettingsDialog/SaveOptionsPage.cpp b/src/Gui/SettingsDialog/SaveOptionsPage.cpp --- a/src/Gui/SettingsDialog/SaveOptionsPage.cpp +++ b/src/Gui/SettingsDialog/SaveOptionsPage.cpp @@ -131,9 +131,8 @@ ); for (auto option = ExportManager::filenamePlaceholders.cbegin(); option != ExportManager::filenamePlaceholders.cend(); ++option) { - helpText += QStringLiteral("%1: %2
").arg( - option.key(), - i18nc("A placeholder in the user configurable filename will replaced by the specified value", option.value())); + helpText += QStringLiteral("%1: %2
").arg(option.key(), + option.value().toString()); } helpText += QStringLiteral("/: ") + i18n("To save to a sub-folder"); helpText += QStringLiteral("");