diff --git a/src/add-ons/translators/psd/ConfigView.cpp b/src/add-ons/translators/psd/ConfigView.cpp index f95b41da35..92512f7524 100644 --- a/src/add-ons/translators/psd/ConfigView.cpp +++ b/src/add-ons/translators/psd/ConfigView.cpp @@ -4,21 +4,25 @@ */ #include "ConfigView.h" -#include "PSDTranslator.h" -#include -#include +#include #include -#include #include +#include +#include +#include #include #include "PSDLoader.h" +#include "PSDTranslator.h" + +#undef B_TRANSLATION_CONTEXT +#define B_TRANSLATION_CONTEXT "PSDConfig" ConfigView::ConfigView(TranslatorSettings *settings) - : BGroupView("PSDTranslator Settings", B_VERTICAL, 0) + : BGroupView(B_TRANSLATE("PSDTranslator Settings"), B_VERTICAL, 0) { fSettings = settings; @@ -27,31 +31,33 @@ ConfigView::ConfigView(TranslatorSettings *settings) uint32 currentCompression = fSettings->SetGetInt32(PSD_SETTING_COMPRESSION); - _AddItemToMenu(compressionPopupMenu, "Uncompressed", + _AddItemToMenu(compressionPopupMenu, B_TRANSLATE("Uncompressed"), MSG_COMPRESSION_CHANGED, PSD_COMPRESSED_RAW, currentCompression); - _AddItemToMenu(compressionPopupMenu, "RLE", + _AddItemToMenu(compressionPopupMenu, B_TRANSLATE("RLE"), MSG_COMPRESSION_CHANGED, PSD_COMPRESSED_RLE, currentCompression); fCompressionField = new BMenuField("compression", - "Compression: ", compressionPopupMenu); + B_TRANSLATE("Compression: "), compressionPopupMenu); BPopUpMenu* versionPopupMenu = new BPopUpMenu("popup_version"); uint32 currentVersion = fSettings->SetGetInt32(PSD_SETTING_VERSION); - _AddItemToMenu(versionPopupMenu, "Photoshop Document (PSD File)", - MSG_VERSION_CHANGED, PSD_FILE, currentVersion); - _AddItemToMenu(versionPopupMenu, "Photoshop Big Document (PSB File)", - MSG_VERSION_CHANGED, PSB_FILE, currentVersion); + _AddItemToMenu(versionPopupMenu, + B_TRANSLATE("Photoshop Document (PSD File)"), MSG_VERSION_CHANGED, + PSD_FILE, currentVersion); + _AddItemToMenu(versionPopupMenu, + B_TRANSLATE("Photoshop Big Document (PSB File)"), MSG_VERSION_CHANGED, + PSB_FILE, currentVersion); fVersionField = new BMenuField("version", - "Format: ", versionPopupMenu); + B_TRANSLATE("Format: "), versionPopupMenu); BAlignment leftAlignment(B_ALIGN_LEFT, B_ALIGN_VERTICAL_UNSET); BStringView *stringView = new BStringView("title", - "Photoshop image translator"); + B_TRANSLATE("Photoshop image translator")); stringView->SetFont(be_bold_font); stringView->SetExplicitAlignment(leftAlignment); AddChild(stringView); @@ -60,7 +66,7 @@ ConfigView::ConfigView(TranslatorSettings *settings) AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing)); char version[256]; - sprintf(version, "Version %d.%d.%d, %s", + sprintf(version, B_TRANSLATE("Version %d.%d.%d, %s"), int(B_TRANSLATION_MAJOR_VERSION(PSD_TRANSLATOR_VERSION)), int(B_TRANSLATION_MINOR_VERSION(PSD_TRANSLATOR_VERSION)), int(B_TRANSLATION_REVISION_VERSION(PSD_TRANSLATOR_VERSION)), diff --git a/src/add-ons/translators/psd/PSDLoader.cpp b/src/add-ons/translators/psd/PSDLoader.cpp index 3759c01222..439f439db6 100644 --- a/src/add-ons/translators/psd/PSDLoader.cpp +++ b/src/add-ons/translators/psd/PSDLoader.cpp @@ -5,8 +5,14 @@ #include "PSDLoader.h" + +#include + #include "BaseTranslator.h" +#undef B_TRANSLATION_CONTEXT +#define B_TRANSLATION_CONTEXT "PSDLoader" + PSDLoader::PSDLoader(BPositionIO *src) { @@ -107,21 +113,21 @@ PSDLoader::ColorFormatName(void) { switch (fColorFormat) { case PSD_COLOR_MODE_BITS: - return "Bitmap"; + return B_TRANSLATE("Bitmap"); case PSD_COLOR_MODE_GRAYSCALE: - return "Grayscale"; + return B_TRANSLATE("Grayscale"); case PSD_COLOR_MODE_INDEXED: - return "Indexed"; + return B_TRANSLATE("Indexed"); case PSD_COLOR_MODE_RGB: - return fChannels > 3 ? "RGBA" : "RGB"; + return fChannels > 3 ? B_TRANSLATE("RGBA") : B_TRANSLATE("RGB"); case PSD_COLOR_MODE_CMYK: - return "CMYK"; + return B_TRANSLATE("CMYK"); case PSD_COLOR_MODE_MULTICHANNEL: - return "Multichannel"; + return B_TRANSLATE("Multichannel"); case PSD_COLOR_MODE_LAB: - return "Lab"; + return B_TRANSLATE("Lab"); case PSD_COLOR_MODE_DUOTONE: - return "Duotone"; + return B_TRANSLATE("Duotone"); } return ""; } diff --git a/src/add-ons/translators/psd/PSDTranslator.cpp b/src/add-ons/translators/psd/PSDTranslator.cpp index 061bfb6c26..46fc92fd56 100644 --- a/src/add-ons/translators/psd/PSDTranslator.cpp +++ b/src/add-ons/translators/psd/PSDTranslator.cpp @@ -4,15 +4,21 @@ */ -#include +#include "PSDTranslator.h" + #include +#include #include +#include + #include "ConfigView.h" -#include "PSDTranslator.h" #include "PSDLoader.h" #include "PSDWriter.h" +#undef B_TRANSLATION_CONTEXT +#define B_TRANSLATION_CONTEXT "PSDTranslator" + const char *kDocumentCount = "/documentCount"; const char *kDocumentIndex = "/documentIndex"; @@ -74,8 +80,8 @@ const uint32 kNumDefaultSettings = sizeof(sDefaultSettings) PSDTranslator::PSDTranslator() - : BaseTranslator(kPSDName, - "Photoshop image translator", + : BaseTranslator(B_TRANSLATE(kPSDName), + B_TRANSLATE("Photoshop image translator"), PSD_TRANSLATOR_VERSION, sInputFormats, kNumInputFormats, sOutputFormats, kNumOutputFormats, @@ -109,9 +115,9 @@ PSDTranslator::DerivedIdentify(BPositionIO *stream, info->group = B_TRANSLATOR_BITMAP; info->quality = PSD_IN_QUALITY; info->capability = PSD_IN_CAPABILITY; - BString name(kPSDName); - name << " (" << psdFile.ColorFormatName() << ")"; - strcpy(info->name, name.String()); + snprintf(info->name, sizeof(info->name), + B_TRANSLATE(kPSDName " (%s)"), + psdFile.ColorFormatName().String()); strcpy(info->MIME, kPSDMimeType); return B_OK;