From 3292b90274c44e1485bdb127e31bbbcf80938a6a Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sat, 2 May 2015 10:48:08 +0200 Subject: [PATCH] Unify version output ("v" vs "Version", sentence casing. --- src/add-ons/translators/gif/GIFView.cpp | 2 +- src/add-ons/translators/jpeg/JPEGTranslator.cpp | 9 ++++++--- src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp | 5 +++-- src/add-ons/translators/ppm/PPMTranslator.cpp | 2 +- src/add-ons/translators/psd/ConfigView.cpp | 4 ++-- src/add-ons/translators/tga/TGAView.cpp | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/add-ons/translators/gif/GIFView.cpp b/src/add-ons/translators/gif/GIFView.cpp index 416777166a..e26bc2d520 100644 --- a/src/add-ons/translators/gif/GIFView.cpp +++ b/src/add-ons/translators/gif/GIFView.cpp @@ -56,7 +56,7 @@ GIFView::GIFView(TranslatorSettings* settings) char version_string[100]; snprintf(version_string, sizeof(version_string), - B_TRANSLATE("v%d.%d.%d, %s"), + B_TRANSLATE("Version %d.%d.%d, %s"), int(B_TRANSLATION_MAJOR_VERSION(GIF_TRANSLATOR_VERSION)), int(B_TRANSLATION_MINOR_VERSION(GIF_TRANSLATOR_VERSION)), int(B_TRANSLATION_REVISION_VERSION(GIF_TRANSLATOR_VERSION)), diff --git a/src/add-ons/translators/jpeg/JPEGTranslator.cpp b/src/add-ons/translators/jpeg/JPEGTranslator.cpp index a951c294df..21ec873fb7 100644 --- a/src/add-ons/translators/jpeg/JPEGTranslator.cpp +++ b/src/add-ons/translators/jpeg/JPEGTranslator.cpp @@ -671,9 +671,12 @@ TranslatorAboutView::TranslatorAboutView(const char* name) title->SetFont(be_bold_font); title->SetExplicitAlignment(labelAlignment); - char versionString[16]; - sprintf(versionString, "v%d.%d.%d", (int)(sTranslatorVersion >> 8), - (int)((sTranslatorVersion >> 4) & 0xf), (int)(sTranslatorVersion & 0xf)); + char versionString[100]; + snprintf(versionString, sizeof(versionString), + B_TRANSLATE("Version %d.%d.%d"), + (int)(sTranslatorVersion >> 8), + (int)((sTranslatorVersion >> 4) & 0xf), + (int)(sTranslatorVersion & 0xf)); BStringView* version = new BStringView("Version", versionString); version->SetExplicitAlignment(labelAlignment); diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp index cf3ec783d8..9d3f3d00a7 100644 --- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp +++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp @@ -713,8 +713,9 @@ TranslatorAboutView::TranslatorAboutView(const char* name) title->SetFont(be_bold_font); title->SetExplicitAlignment(labelAlignment); - char versionString[16]; - sprintf(versionString, "v%d.%d.%d", + char versionString[100]; + snprintf(versionString, sizeof(versionString), + B_TRANSLATE("Version %d.%d.%d"), static_cast(sTranslatorVersion >> 8), static_cast((sTranslatorVersion >> 4) & 0xf), static_cast(sTranslatorVersion & 0xf)); diff --git a/src/add-ons/translators/ppm/PPMTranslator.cpp b/src/add-ons/translators/ppm/PPMTranslator.cpp index bdb546ca0a..b81f384f6f 100644 --- a/src/add-ons/translators/ppm/PPMTranslator.cpp +++ b/src/add-ons/translators/ppm/PPMTranslator.cpp @@ -507,7 +507,7 @@ public: "bits big-endian"), CSMessage(B_RGBA15_BIG))); fMenu->AddItem(new BMenuItem(B_TRANSLATE("RGB 5:6:5 16 bits " "big-endian"), CSMessage(B_RGB16))); - fField = new BMenuField(B_TRANSLATE("Input Color Space:"), + fField = new BMenuField(B_TRANSLATE("Input color space:"), fMenu); fField->SetViewColor(ViewColor()); SelectColorSpace(g_settings.out_space); diff --git a/src/add-ons/translators/psd/ConfigView.cpp b/src/add-ons/translators/psd/ConfigView.cpp index ff28ad0c3e..e380d46137 100644 --- a/src/add-ons/translators/psd/ConfigView.cpp +++ b/src/add-ons/translators/psd/ConfigView.cpp @@ -45,10 +45,10 @@ ConfigView::ConfigView(TranslatorSettings *settings) fSettings->SetGetInt32(PSD_SETTING_VERSION); _AddItemToMenu(versionPopupMenu, - B_TRANSLATE("Photoshop Document (PSD File)"), MSG_VERSION_CHANGED, + B_TRANSLATE("Photoshop Document (PSD file)"), MSG_VERSION_CHANGED, PSD_FILE, currentVersion); _AddItemToMenu(versionPopupMenu, - B_TRANSLATE("Photoshop Big Document (PSB File)"), MSG_VERSION_CHANGED, + B_TRANSLATE("Photoshop Big Document (PSB file)"), MSG_VERSION_CHANGED, PSB_FILE, currentVersion); fVersionField = new BMenuField("version", diff --git a/src/add-ons/translators/tga/TGAView.cpp b/src/add-ons/translators/tga/TGAView.cpp index 0f2ea195a0..6caf8bebf0 100644 --- a/src/add-ons/translators/tga/TGAView.cpp +++ b/src/add-ons/translators/tga/TGAView.cpp @@ -68,7 +68,7 @@ TGAView::TGAView(const char *name, uint32 flags, TranslatorSettings *settings) fpchkIgnoreAlpha->SetValue(val); fpchkIgnoreAlpha->SetViewColor(ViewColor()); - fpchkRLE = new BCheckBox(B_TRANSLATE("Save with RLE Compression"), + fpchkRLE = new BCheckBox(B_TRANSLATE("Save with RLE compression"), new BMessage(CHANGE_RLE)); val = (fSettings->SetGetBool(TGA_SETTING_RLE)) ? 1 : 0; fpchkRLE->SetValue(val);