[Kde-imaging] Fwd: KDE/kdegraphics/libs

[Gilles Caulier]

Andi,

I think Andrius is not registered to mailing list. Forward you message
in private mail...

Gilles

2009/9/24 Andi Clemens <andi.clemens at gmx.net>:
> This doesn't work, i18ncp can not be used without a quantity parameter
> (ksane_option.cpp:291,292,296)
>
> Andi
>
>
> ---------- Message transféré ----------
> From: "Andrius Štikonas" <stikonas at gmail.com>
> To: kde-commits at kde.org
> Date: Thu, 24 Sep 2009 07:17:33 +0000
> Subject: KDE/kdegraphics/libs
> SVN commit 1027422 by stikonas:
>
> i18n: Add context info and plurals to i18n where necessary.
>
>  M  +9 -9      libkdcraw/libkdcraw/dcrawsettingswidget.cpp
>  M  +3 -3      libksane/libksane/options/ksane_opt_combo.cpp
>  M  +6 -6      libksane/libksane/options/ksane_option.cpp
>
>
> --- trunk/KDE/kdegraphics/libs/libkdcraw/libkdcraw/dcrawsettingswidget.cpp #1027421:1027422
> @@ -461,9 +461,9 @@
>
>     d->inputColorSpaceLabel     = new QLabel(i18n("Camera Profile:"), d->colormanSettings);
>     d->inputColorSpaceComboBox  = new RComboBox(d->colormanSettings);
> -    d->inputColorSpaceComboBox->insertItem(RawDecodingSettings::NOINPUTCS,     i18n("None"));
> -    d->inputColorSpaceComboBox->insertItem(RawDecodingSettings::EMBEDDED,      i18n("Embedded"));
> -    d->inputColorSpaceComboBox->insertItem(RawDecodingSettings::CUSTOMINPUTCS, i18n("Custom"));
> +    d->inputColorSpaceComboBox->insertItem(RawDecodingSettings::NOINPUTCS,     i18nc("Camera Profile", "None"));
> +    d->inputColorSpaceComboBox->insertItem(RawDecodingSettings::EMBEDDED,      i18nc("Camera Profile", "Embedded"));
> +    d->inputColorSpaceComboBox->insertItem(RawDecodingSettings::CUSTOMINPUTCS, i18nc("Camera Profile", "Custom"));
>     d->inputColorSpaceComboBox->setDefaultIndex(RawDecodingSettings::NOINPUTCS);
>     d->inputColorSpaceComboBox->setWhatsThis(i18n("<p><b>Camera Profile</b><p>"
>                 "Select here the input color space used to decode RAW data.<p>"
> @@ -477,12 +477,12 @@
>
>     d->outputColorSpaceLabel    = new QLabel(i18n("Workspace:"), d->colormanSettings);
>     d->outputColorSpaceComboBox = new RComboBox( d->colormanSettings );
> -    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::RAWCOLOR,       i18n("Raw (no profile)"));
> -    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::SRGB,           i18n("sRGB"));
> -    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::ADOBERGB,       i18n("Adobe RGB"));
> -    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::WIDEGAMMUT,     i18n("Wide Gamut"));
> -    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::PROPHOTO,       i18n("Pro-Photo"));
> -    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::CUSTOMOUTPUTCS, i18n("Custom"));
> +    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::RAWCOLOR,       i18nc("Workspace", "Raw (no profile)"));
> +    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::SRGB,           i18nc("Workspace", "sRGB"));
> +    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::ADOBERGB,       i18nc("Workspace", "Adobe RGB"));
> +    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::WIDEGAMMUT,     i18nc("Workspace", "Wide Gamut"));
> +    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::PROPHOTO,       i18nc("Workspace", "Pro-Photo"));
> +    d->outputColorSpaceComboBox->insertItem(RawDecodingSettings::CUSTOMOUTPUTCS, i18nc("Workspace", "Custom"));
>     d->outputColorSpaceComboBox->setDefaultIndex(RawDecodingSettings::SRGB);
>     d->outputColorSpaceComboBox->setWhatsThis(i18n("<p><b>Workspace</b><p>"
>                 "Select here the output color space used to decode RAW data.<p>"
> --- trunk/KDE/kdegraphics/libs/libksane/libksane/options/ksane_opt_combo.cpp #1027421:1027422
> @@ -166,12 +166,12 @@
>     switch(m_optDesc->unit)
>     {
>         case SANE_UNIT_NONE:        break;
> -        case SANE_UNIT_PIXEL:       return i18nc("Parameter and Unit","%1 Pixels", fval);
> -        case SANE_UNIT_BIT:         return i18nc("Parameter and Unit","%1 Bits", fval);
> +        case SANE_UNIT_PIXEL:       return i18ncp("Parameter and Unit","%1 Pixel", "%1 Pixels", fval);
> +        case SANE_UNIT_BIT:         return i18ncp("Parameter and Unit","%1 Bit","%1 Bits", fval);
>         case SANE_UNIT_MM:          return i18nc("Parameter and Unit","%1 mm", fval);
>         case SANE_UNIT_DPI:         return i18nc("Parameter and Unit","%1 DPI", fval);
>         case SANE_UNIT_PERCENT:     return i18nc("Parameter and Unit","%1 %", fval);
> -        case SANE_UNIT_MICROSECOND: return i18nc("Parameter and Unit","%1 usec", fval);
> +        case SANE_UNIT_MICROSECOND: return i18ncp("Parameter and Unit","%1 usec","%1 usec", fval);
>     }
>     return QString::number(fval, 'F', 4);
>  }
> --- trunk/KDE/kdegraphics/libs/libksane/libksane/options/ksane_option.cpp #1027421:1027422
> @@ -288,12 +288,12 @@
>     switch(m_optDesc->unit)
>     {
>         case SANE_UNIT_NONE:        return QString("");
> -        case SANE_UNIT_PIXEL:       return i18nc("SpinBox parameter unit"," Pixels");
> -        case SANE_UNIT_BIT:         return i18nc("SpinBox parameter unit"," Bits");
> -        case SANE_UNIT_MM:          return i18nc("SpinBox parameter unit"," mm");
> -        case SANE_UNIT_DPI:         return i18nc("SpinBox parameter unit"," DPI");
> -        case SANE_UNIT_PERCENT:     return i18nc("SpinBox parameter unit"," %");
> -        case SANE_UNIT_MICROSECOND: return i18nc("SpinBox parameter unit"," usec");
> +        case SANE_UNIT_PIXEL:       return i18ncp("SpinBox parameter unit", " Pixel", " Pixels");
> +        case SANE_UNIT_BIT:         return i18ncp("SpinBox parameter unit", " Bit", " Bits");
> +        case SANE_UNIT_MM:          return i18nc("SpinBox parameter unit", " mm");
> +        case SANE_UNIT_DPI:         return i18nc("SpinBox parameter unit", " DPI");
> +        case SANE_UNIT_PERCENT:     return i18nc("SpinBox parameter unit", " %");
> +        case SANE_UNIT_MICROSECOND: return i18ncp("SpinBox parameter unit", " usec", " usec");
>     }
>     return QString("");
>  }
>
> _______________________________________________
> Kde-imaging mailing list
> Kde-imaging at kde.org
> https://mail.kde.org/mailman/listinfo/kde-imaging
>
>