diff --git a/src/apps/bootmanager/BootManagerController.cpp b/src/apps/bootmanager/BootManagerController.cpp index 4899983cce..ab1c92acae 100644 --- a/src/apps/bootmanager/BootManagerController.cpp +++ b/src/apps/bootmanager/BootManagerController.cpp @@ -358,10 +358,11 @@ BootManagerController::_CreateMBRSavedPage() << B_TRANSLATE("The old Master Boot Record was successfully " "saved to %s.") << "\n"; } else { - description << B_TRANSLATE_COMMENT("Old Master Boot Record Saved " + description << B_TRANSLATE_COMMENT("Old Master Boot Record backup " "failure", "Title") << "\n" << B_TRANSLATE("The old Master Boot Record could not be saved " - "to %s") << "\n"; + "to %s. You can continue the installation but there will be no " + "way to uninstall the boot menu.") << "\n"; } description.ReplaceFirst("%s", file); diff --git a/src/apps/charactermap/UnicodeBlocks.cpp b/src/apps/charactermap/UnicodeBlocks.cpp index a387949c71..e165ac94be 100644 --- a/src/apps/charactermap/UnicodeBlocks.cpp +++ b/src/apps/charactermap/UnicodeBlocks.cpp @@ -16,7 +16,7 @@ const unicode_block kNoBlock; const struct unicode_block_entry kUnicodeBlocks[] = { {B_TRANSLATE("Basic Latin"), 0x0000, 0x007f, false, B_BASIC_LATIN_BLOCK}, {B_TRANSLATE("Latin-1 supplement"), 0x0080, 0x00ff, false, - B_LATIN1_SUPPLEMENT_BLOCK}, + B_LATIN1_SUPPLEMENT_BLOCK}, {B_TRANSLATE("Latin extended A"), 0x0100, 0x017f, false, B_LATIN_EXTENDED_A_BLOCK}, {B_TRANSLATE("Latin extended B"), 0x0180, 0x024f, false, @@ -31,7 +31,7 @@ const struct unicode_block_entry kUnicodeBlocks[] = { B_BASIC_GREEK_BLOCK | B_GREEK_SYMBOLS_AND_COPTIC_BLOCK}, {B_TRANSLATE("Cyrillic"), 0x0400, 0x04ff, false, B_CYRILLIC_BLOCK}, {B_TRANSLATE("Cyrillic supplement"), 0x0500, 0x052f, false, - B_CYRILLIC_BLOCK}, + B_CYRILLIC_BLOCK}, {B_TRANSLATE("Armenian"), 0x0530, 0x058f, false, B_ARMENIAN_BLOCK}, {B_TRANSLATE("Hebrew"), 0x0590, 0x05ff, false, B_BASIC_HEBREW_BLOCK | B_HEBREW_EXTENDED_BLOCK}, @@ -82,18 +82,18 @@ const struct unicode_block_entry kUnicodeBlocks[] = { {B_TRANSLATE("Ol Chiki"), 0x1c50, 0x1c7f, false, kNoBlock}, {B_TRANSLATE("Phonetic extensions"), 0x1d00, 0x1d7f, false, kNoBlock}, {B_TRANSLATE("Phonetic extensions supplement"), - 0x1d80, 0x1dbf, false, kNoBlock}, + 0x1d80, 0x1dbf, false, kNoBlock}, {B_TRANSLATE("Combining diacritical marks supplement"), 0x1dc0, 0x1dff, false, kNoBlock}, {B_TRANSLATE("Latin extended additional"), - 0x1e00, 0x1eff, false, kNoBlock}, + 0x1e00, 0x1eff, false, kNoBlock}, {B_TRANSLATE("Greek extended"), 0x1f00, 0x1fff, false, kNoBlock}, {B_TRANSLATE("General punctuation"), 0x2000, 0x206f, false, kNoBlock}, {B_TRANSLATE("Superscripts and subscripts"), - 0x2070, 0x209f, false, kNoBlock}, + 0x2070, 0x209f, false, kNoBlock}, {B_TRANSLATE("Currency symbols"), 0x20a0, 0x20cf, false, kNoBlock}, {B_TRANSLATE("Combining diacritical marks for symbols"), - 0x20d0, 0x20ff, false, kNoBlock}, + 0x20d0, 0x20ff, false, kNoBlock}, {B_TRANSLATE("Letterlike symbols"), 0x2100, 0x214f, false, kNoBlock}, {B_TRANSLATE("Number forms"), 0x2150, 0x218f, false, kNoBlock}, {B_TRANSLATE("Arrows"), 0x2190, 0x21ff, false, kNoBlock}, @@ -101,7 +101,7 @@ const struct unicode_block_entry kUnicodeBlocks[] = { {B_TRANSLATE("Miscellaneous technical"), 0x2300, 0x23ff, false, kNoBlock}, {B_TRANSLATE("Control pictures"), 0x2400, 0x243f, false, kNoBlock}, {B_TRANSLATE("Optical character recognition"), - 0x2440, 0x245f, false, kNoBlock}, + 0x2440, 0x245f, false, kNoBlock}, {B_TRANSLATE("Enclosed alphanumerics"), 0x2460, 0x24ff, false, kNoBlock}, {B_TRANSLATE("Box drawing"), 0x2500, 0x257f, false, kNoBlock}, {B_TRANSLATE("Block elements"), 0x2580, 0x259f, false, kNoBlock}, @@ -109,16 +109,16 @@ const struct unicode_block_entry kUnicodeBlocks[] = { {B_TRANSLATE("Miscellaneous symbols"), 0x2600, 0x26ff, false, kNoBlock}, {B_TRANSLATE("Dingbats"), 0x2700, 0x27bf, false, kNoBlock}, {B_TRANSLATE("Miscellaneous mathematical symbols A"), - 0x27c0, 0x27ef, false, kNoBlock}, + 0x27c0, 0x27ef, false, kNoBlock}, {B_TRANSLATE("Supplemental arrows A"), 0x27f0, 0x27ff, false, kNoBlock}, {B_TRANSLATE("Braille patterns"), 0x2800, 0x28ff, false, kNoBlock}, {B_TRANSLATE("Supplemental arrows B"), 0x2900, 0x297f, false, kNoBlock}, {B_TRANSLATE("Miscellaneous mathematical symbols B"), - 0x2980, 0x29ff, false, kNoBlock}, + 0x2980, 0x29ff, false, kNoBlock}, {B_TRANSLATE("Supplemental mathematical operators"), - 0x2a00, 0x2aff, false, kNoBlock}, + 0x2a00, 0x2aff, false, kNoBlock}, {B_TRANSLATE("Miscellaneous symbols and arrows"), - 0x2b00, 0x2bff, false, kNoBlock}, + 0x2b00, 0x2bff, false, kNoBlock}, {B_TRANSLATE("Glagotic"), 0x2c00, 0x2c5f, false, kNoBlock}, {B_TRANSLATE("Latin extended C"), 0x2c60, 0x2c7f, false, kNoBlock}, {B_TRANSLATE("Coptic"), 0x2c80, 0x2cff, false, kNoBlock}, @@ -130,9 +130,9 @@ const struct unicode_block_entry kUnicodeBlocks[] = { {B_TRANSLATE("CJK radicals supplement"), 0x2e80, 0x2eff, false, kNoBlock}, {B_TRANSLATE("Kangxi radicals"), 0x2f00, 0x2fdf, false, kNoBlock}, {B_TRANSLATE("Ideographic description characters"), - 0x2ff0, 0x2fff, false, kNoBlock}, + 0x2ff0, 0x2fff, false, kNoBlock}, {B_TRANSLATE("CJK symbols and punctuation"), - 0x3000, 0x303f, false, kNoBlock}, + 0x3000, 0x303f, false, kNoBlock}, {B_TRANSLATE("Hiragana"), 0x3040, 0x309f, false, kNoBlock}, {B_TRANSLATE("Katakana"), 0x30a0, 0x30ff, false, kNoBlock}, {B_TRANSLATE("Bopomofo"), 0x3100, 0x312f, false, kNoBlock}, @@ -141,12 +141,12 @@ const struct unicode_block_entry kUnicodeBlocks[] = { {B_TRANSLATE("Bopomofo extended"), 0x31a0, 0x31bf, false, kNoBlock}, {B_TRANSLATE("CJK strokes"), 0x31c0, 0x31ef, false, kNoBlock}, {B_TRANSLATE("Katakana phonetic extensions"), - 0x31f0, 0x31ff, false, kNoBlock}, - {B_TRANSLATE("Enclosed CJK letters and months"), - 0x2ff0, 0x2fff, false, kNoBlock}, + 0x31f0, 0x31ff, false, kNoBlock}, + {B_TRANSLATE("Enclosed CJK letters and months"), + 0x2ff0, 0x2fff, false, kNoBlock}, {B_TRANSLATE("CJK compatibility"), 0x3300, 0x33ff, false, kNoBlock}, {B_TRANSLATE("CJK unified ideographs extension A"), - 0x3400, 0x4dbf, false, kNoBlock}, + 0x3400, 0x4dbf, false, kNoBlock}, {B_TRANSLATE("Yijing hexagram symbols"), 0x4dc0, 0x4dff, false, kNoBlock}, {B_TRANSLATE("CJK unified ideographs"), 0x4e00, 0x9fff, false, kNoBlock}, {B_TRANSLATE("Yi syllables"), 0xa000, 0xa48f, false, kNoBlock}, @@ -167,27 +167,27 @@ const struct unicode_block_entry kUnicodeBlocks[] = { // {B_TRANSLATE("Low surrogates"), 0xdc00, 0xdfff, false, kNoBlock}, {B_TRANSLATE("Private use area"), 0xe000, 0xf8ff, true, kNoBlock}, {B_TRANSLATE("CJK compatibility ideographs"), - 0xf900, 0xfaff, false, kNoBlock}, + 0xf900, 0xfaff, false, kNoBlock}, {B_TRANSLATE("Alphabetic presentation forms"), 0xfb00, 0xfb4f, false, kNoBlock}, {B_TRANSLATE("Arabic presentation forms A"), - 0xfb50, 0xfdff, false, kNoBlock}, + 0xfb50, 0xfdff, false, kNoBlock}, {B_TRANSLATE("Variation selectors"), 0xfe00, 0xfe0f, false, kNoBlock}, {B_TRANSLATE("Vertical forms"), 0xfe10, 0xfe1f, false, kNoBlock}, {B_TRANSLATE("Combining half marks"), 0xfe20, 0xfe2f, false, kNoBlock}, {B_TRANSLATE("CJK compatibility forms"), 0xfe30, 0xfe4f, false, kNoBlock}, {B_TRANSLATE("Small form variants"), 0xfe50, 0xfe6f, false, kNoBlock}, {B_TRANSLATE("Arabic presentation forms B"), - 0xfe70, 0xfeff, false, kNoBlock}, + 0xfe70, 0xfeff, false, kNoBlock}, {B_TRANSLATE("Halfwidth and fullwidth forms"), - 0xff00, 0xffef, false, kNoBlock}, + 0xff00, 0xffef, false, kNoBlock}, {B_TRANSLATE("Specials"), 0xfff0, 0xffff, false, kNoBlock}, {B_TRANSLATE("Linear B syllabary"), 0x010000, 0x01007f, false, kNoBlock}, {B_TRANSLATE("Linear B ideograms"), 0x010080, 0x0100ff, false, kNoBlock}, {B_TRANSLATE("Aegean numbers"), 0x010100, 0x01013f, false, kNoBlock}, {B_TRANSLATE("Ancient Greek numbers"), - 0x010140, 0x01018f, false, kNoBlock}, - {B_TRANSLATE("Ancient smbols"), 0x010190, 0x0101cf, false, kNoBlock}, + 0x010140, 0x01018f, false, kNoBlock}, + {B_TRANSLATE("Ancient symbols"), 0x010190, 0x0101cf, false, kNoBlock}, {B_TRANSLATE("Phaistos disc"), 0x0101d0, 0x0101ff, false, kNoBlock}, {B_TRANSLATE("Lycian"), 0x010280, 0x01029f, false, kNoBlock}, {B_TRANSLATE("Carian"), 0x0102a0, 0x0102df, false, kNoBlock}, @@ -204,31 +204,31 @@ const struct unicode_block_entry kUnicodeBlocks[] = { {B_TRANSLATE("Kharoshthi"), 0x010a00, 0x010a5f, false, kNoBlock}, {B_TRANSLATE("Cuneiform"), 0x012000, 0x0123ff, false, kNoBlock}, {B_TRANSLATE("Cuneiform numbers and punctuation"), - 0x012400, 0x01247f, false, kNoBlock}, + 0x012400, 0x01247f, false, kNoBlock}, {B_TRANSLATE("Byzantine musical symbols"), - 0x01d000, 0x01d0ff, false, kNoBlock}, + 0x01d000, 0x01d0ff, false, kNoBlock}, {B_TRANSLATE("Musical symbols"), 0x01d100, 0x01d1ff, false, kNoBlock}, {B_TRANSLATE("Ancient Greek musical notation"), - 0x01d200, 0x01d24f, false, kNoBlock}, + 0x01d200, 0x01d24f, false, kNoBlock}, {B_TRANSLATE("Tai Xuan Jing symbols"), - 0x01d300, 0x01d35f, false, kNoBlock}, + 0x01d300, 0x01d35f, false, kNoBlock}, {B_TRANSLATE("Counting rod numerals"), - 0x01d360, 0x01d37f, false, kNoBlock}, + 0x01d360, 0x01d37f, false, kNoBlock}, {B_TRANSLATE("Mathematical alphanumeric symbols"), - 0x01d400, 0x01d7ff, false, kNoBlock}, + 0x01d400, 0x01d7ff, false, kNoBlock}, {B_TRANSLATE("Mahjong tiles"), 0x01f000, 0x01f02f, false, kNoBlock}, {B_TRANSLATE("Domino tiles"), 0x01f030, 0x01f09f, false, kNoBlock}, {B_TRANSLATE("CJK unified ideographs extension B"), - 0x020000, 0x02a6df, false, kNoBlock}, + 0x020000, 0x02a6df, false, kNoBlock}, {B_TRANSLATE("CJK compatibility ideographs Supplement"), - 0x02f800, 0x02fa1f, false, kNoBlock}, + 0x02f800, 0x02fa1f, false, kNoBlock}, {B_TRANSLATE("Tags"), 0x0e0000, 0x0e007f, false, kNoBlock}, {B_TRANSLATE("Variation selectors supplement"), - 0x0e0100, 0x0e01ef, false, kNoBlock}, + 0x0e0100, 0x0e01ef, false, kNoBlock}, {B_TRANSLATE("Supplementary private use area A"), - 0x0f0000, 0x0fffff, true, kNoBlock}, + 0x0f0000, 0x0fffff, true, kNoBlock}, {B_TRANSLATE("Supplementary private use area B"), - 0x100000, 0x10ffff, true, kNoBlock}, + 0x100000, 0x10ffff, true, kNoBlock}, }; const uint32 kNumUnicodeBlocks diff --git a/src/apps/codycam/VideoConsumer.cpp b/src/apps/codycam/VideoConsumer.cpp index 55618e0972..4411d60098 100644 --- a/src/apps/codycam/VideoConsumer.cpp +++ b/src/apps/codycam/VideoConsumer.cpp @@ -721,7 +721,7 @@ VideoConsumer::FtpSave(char* filename) if (ftp->ChangeDir((string)fDirectoryText)) { // cd to the desired directory - UpdateFtpStatus(B_TRANSLATE("Transmitting" B_UTF8_ELLIPSIS)); + UpdateFtpStatus(B_TRANSLATE("Upload" B_UTF8_ELLIPSIS)); if (ftp->PutFile((string)filename, (string)"temp")) { // send the file to the server @@ -741,14 +741,11 @@ VideoConsumer::FtpSave(char* filename) UpdateFtpStatus(s); delete ftp; return B_OK; - } - else + } else UpdateFtpStatus(B_TRANSLATE("Rename failed")); - } - else - UpdateFtpStatus(B_TRANSLATE("File transmission failed")); - } - else + } else + UpdateFtpStatus(B_TRANSLATE("File upload failed")); + } else UpdateFtpStatus(B_TRANSLATE("Couldn't find requested directory on " "server")); } diff --git a/src/apps/diskprobe/ProbeView.cpp b/src/apps/diskprobe/ProbeView.cpp index 5e2503104b..e0a7a4ca08 100644 --- a/src/apps/diskprobe/ProbeView.cpp +++ b/src/apps/diskprobe/ProbeView.cpp @@ -498,9 +498,9 @@ HeaderView::HeaderView(const entry_ref *ref, DataEditor &editor) BStringView *stringView = new BStringView( B_EMPTY_STRING, editor.IsAttribute() - ? B_TRANSLATE("Attribute: ") - : editor.IsDevice() - ? B_TRANSLATE("Device: ") + ? B_TRANSLATE("Attribute: ") + : editor.IsDevice() + ? B_TRANSLATE("Device: ") : B_TRANSLATE("File: ")); stringView->SetFont(&boldFont); line->AddChild(stringView); @@ -536,7 +536,7 @@ HeaderView::HeaderView(const entry_ref *ref, DataEditor &editor) } else fTypeControl = NULL; - fStopButton = new BButton(B_EMPTY_STRING, + fStopButton = new BButton(B_EMPTY_STRING, B_TRANSLATE("Stop"), new BMessage(kMsgStopFind)); fStopButton->SetFont(&plainFont); fStopButton->Hide(); @@ -1129,7 +1129,9 @@ ProbeView::ProbeView(entry_ref *ref, const char *attribute, fTypeView(NULL), fLastSearch(NULL) { - SetLayout(new BGroupLayout(B_VERTICAL, 0)); + BGroupLayout* layout = new BGroupLayout(B_VERTICAL, 0); + SetLayout(layout); + layout->SetInsets(-1, -1, -1, -1); fEditor.SetTo(*ref, attribute); int32 baseType = kHexBase; @@ -1426,7 +1428,7 @@ ProbeView::AttachedToWindow() "and 'BlockSize'")); message = new BMessage(kMsgBaseType); message->AddInt32("base_type", kDecimalBase); - subMenu->AddItem(item = new BMenuItem(B_TRANSLATE_COMMENT("Decimal", + subMenu->AddItem(item = new BMenuItem(B_TRANSLATE_COMMENT("Decimal", "A menu item, as short as possible, noun is recommended if it is " "shorter than adjective."), message, 'D')); item->SetTarget(this); @@ -1435,7 +1437,7 @@ ProbeView::AttachedToWindow() message = new BMessage(kMsgBaseType); message->AddInt32("base_type", kHexBase); - subMenu->AddItem(item = new BMenuItem(B_TRANSLATE_COMMENT("Hex", + subMenu->AddItem(item = new BMenuItem(B_TRANSLATE_COMMENT("Hex", "A menu item, as short as possible, noun is recommended if it is " "shorter than adjective."), message, 'H')); item->SetTarget(this); @@ -1447,9 +1449,8 @@ ProbeView::AttachedToWindow() // Block Size - subMenu = new BMenu(B_TRANSLATE_COMMENT("BlockSize", "A menu item, a " - "shortened form from 'block size'. This is in the same menu window" - "than 'Base' and 'Font size'")); + subMenu = new BMenu(B_TRANSLATE_COMMENT("Block size", "Menu item. " + "This is in the same menu window than 'Base' and 'Font size'")); subMenu->SetRadioMode(true); const uint32 blockSizes[] = {512, 1024, 2048}; for (uint32 i = 0; i < sizeof(blockSizes) / sizeof(blockSizes[0]); i++) { @@ -1466,7 +1467,8 @@ ProbeView::AttachedToWindow() if (subMenu->FindMarked() == NULL) { // if the device has some weird block size, we'll add it here, too char buffer[32]; - snprintf(buffer, sizeof(buffer), B_TRANSLATE("%ld (native)"), fEditor.BlockSize()); + snprintf(buffer, sizeof(buffer), B_TRANSLATE("%ld (native)"), + fEditor.BlockSize()); subMenu->AddItem(item = new BMenuItem(buffer, message = new BMessage(kMsgBlockSize))); message->AddInt32("block_size", fEditor.BlockSize()); diff --git a/src/apps/diskusage/StatusView.cpp b/src/apps/diskusage/StatusView.cpp index 9f01ea2145..0aa817f7f7 100644 --- a/src/apps/diskusage/StatusView.cpp +++ b/src/apps/diskusage/StatusView.cpp @@ -40,9 +40,9 @@ StatusView::StatusView() SetLowColor(kPieBGColor); fSizeView = new BStringView(NULL, kEmptyStr); - fSizeView->SetExplicitMinSize(BSize(StringWidth(B_TRANSLATE("9999.99 GB")), + fSizeView->SetExplicitMinSize(BSize(StringWidth("9999.99 GiB"), B_SIZE_UNSET)); - fSizeView->SetExplicitMaxSize(BSize(StringWidth(B_TRANSLATE("9999.99 GB")), + fSizeView->SetExplicitMaxSize(BSize(StringWidth("9999.99 GiB"), B_SIZE_UNSET)); char testLabel[256]; diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp index 94b611537f..046ccf2d61 100644 --- a/src/apps/drivesetup/MainWindow.cpp +++ b/src/apps/drivesetup/MainWindow.cpp @@ -957,7 +957,7 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id selectedPartition, char message[512]; if (!found) { - snprintf(message, sizeof(message), B_TRANSLATE("Disk system \"%s\"\" " + snprintf(message, sizeof(message), B_TRANSLATE("Disk system \"%s\" " "not found!")); _DisplayPartitionError(message); return; @@ -966,7 +966,7 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id selectedPartition, if (diskSystem.IsFileSystem()) { if (disk->ID() == selectedPartition) { snprintf(message, sizeof(message), B_TRANSLATE("Are you sure you " - "want to format a raw disk? (most people initialize the disk " + "want to format a raw disk? (Most people initialize the disk " "with a partitioning system first) You will be asked " "again before changes are written to the disk.")); } else if (partition->ContentName() @@ -1145,7 +1145,7 @@ MainWindow::_Create(BDiskDevice* disk, partition_id selectedPartition) BPartitioningInfo partitioningInfo; status_t error = parent->GetPartitioningInfo(&partitioningInfo); if (error != B_OK) { - _DisplayPartitionError(B_TRANSLATE("Could not aquire partitioning " + _DisplayPartitionError(B_TRANSLATE("Could not acquire partitioning " "information.")); return; } diff --git a/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp b/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp index eaa9902265..b525503572 100644 --- a/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp +++ b/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp @@ -239,6 +239,7 @@ StyledTextImporter::Import(Icon* icon, const entry_ref* ref) return _Import(icon, (const char *)mio.Buffer(), NULL); } + // _Import status_t StyledTextImporter::_Import(Icon* icon, const char *text, text_run_array *runs) @@ -246,17 +247,17 @@ StyledTextImporter::_Import(Icon* icon, const char *text, text_run_array *runs) CALLED(); status_t ret = Init(icon); if (ret < B_OK) { - printf("StyledTextImporter::Import() - " - "Init() error: %s\n", strerror(ret)); + printf("StyledTextImporter::Import() - Init() error: %s\n", + strerror(ret)); return ret; } BString str(text); if (str.Length() > 50) { - BAlert* alert = new BAlert(B_TRANSLATE("too big"), - B_TRANSLATE("The text you are trying to import is quite long," + BAlert* alert = new BAlert(B_TRANSLATE("Text too long"), + B_TRANSLATE("The text you are trying to import is quite long, " "are you sure?"), - B_TRANSLATE("Yes"), B_TRANSLATE("No"), NULL, + B_TRANSLATE("Yes"), B_TRANSLATE("No"), NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); if (alert->Go()) return B_CANCELED; @@ -277,7 +278,7 @@ StyledTextImporter::_Import(Icon* icon, const char *text, text_run_array *runs) run = &runs->runs[0]; int32 len = str.Length(); int32 chars = str.CountChars(); - BPoint origin(0,0); + BPoint origin(0, 0); BPoint offset(origin); for (int32 i = 0, c = 0; i < len && c < chars; c++) { diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp index 39d3d78311..60ec2aa5e8 100644 --- a/src/apps/installer/InstallerWindow.cpp +++ b/src/apps/installer/InstallerWindow.cpp @@ -700,9 +700,11 @@ InstallerWindow::_LaunchBootManager() BEntry entry(path.Path()); entry_ref ref; if (entry.GetRef(&ref) != B_OK || be_roster->Launch(&ref) != B_OK) { - BAlert* alert = new BAlert("error", B_TRANSLATE("BootManager, the " - "application to configure the Haiku boot menu, could not be " - "launched."), B_TRANSLATE("OK")); + BAlert* alert = new BAlert( + B_TRANSLATE("Failed to launch Boot Manager"), + B_TRANSLATE("Boot Manager, the application to configure the " + "Haiku boot menu, could not be launched."), + B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->Go(); } diff --git a/src/apps/login/LoginApp.cpp b/src/apps/login/LoginApp.cpp index 6945f6d555..ade6df8405 100644 --- a/src/apps/login/LoginApp.cpp +++ b/src/apps/login/LoginApp.cpp @@ -33,9 +33,10 @@ const char *kLoginAppSig = "application/x-vnd.Haiku-Login"; LoginApp::LoginApp() - : BApplication(kLoginAppSig), - fEditShelfMode(false), - fModalMode(true) + : + BApplication(kLoginAppSig), + fEditShelfMode(false), + fModalMode(true) { } @@ -51,11 +52,10 @@ LoginApp::ReadyToRun() BScreen screen; if (fEditShelfMode) { - BAlert* alert = new BAlert(B_TRANSLATE("Info"), B_TRANSLATE("You can customize the " - "desktop shown behind the Login application by dropping replicants" - " onto it.\n" - "\n" - "When you are finished just quit the application (Alt-Q)."), + BAlert* alert = new BAlert(B_TRANSLATE("Info"), B_TRANSLATE("You can " + "customize the desktop shown behind the Login application by " + "dropping replicants onto it.\n\n" + "When you are finished just quit the application (Cmd-Q)."), B_TRANSLATE("OK")); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->Go(NULL); diff --git a/src/apps/packageinstaller/PackageView.cpp b/src/apps/packageinstaller/PackageView.cpp index dc1411f27c..09ec9fa183 100644 --- a/src/apps/packageinstaller/PackageView.cpp +++ b/src/apps/packageinstaller/PackageView.cpp @@ -353,7 +353,7 @@ PackageView::ItemExists(PackageItem& item, BPath& path, int32& policy) case P_EXISTS_NONE: { const char* formatString; - switch (item.ItemKind()){ + switch (item.ItemKind()) { case P_KIND_SCRIPT: formatString = B_TRANSLATE("The script named \'%s\' " "already exits in the given path.\nReplace the script " @@ -368,10 +368,10 @@ PackageView::ItemExists(PackageItem& item, BPath& path, int32& policy) formatString = B_TRANSLATE("The directory named \'%s\' " "already exits in the given path.\nReplace the " "directory with one from this package or skip it?"); - break; + break; case P_KIND_SYM_LINK: formatString = B_TRANSLATE("The symbolic link named \'%s\' " - "already exists in the give path.\nReplace the link " + "already exists in the given path.\nReplace the link " "with the one from this package or skip it?"); break; default: @@ -390,7 +390,7 @@ PackageView::ItemExists(PackageItem& item, BPath& path, int32& policy) B_TRANSLATE("Skip"), B_TRANSLATE("Abort")); alert->SetShortcut(2, B_ESCAPE); - + choice = alert->Go(); switch (choice) { case 0: diff --git a/src/apps/screenshot/ScreenshotWindow.cpp b/src/apps/screenshot/ScreenshotWindow.cpp index dc3764a6eb..5e2ccbbbda 100644 --- a/src/apps/screenshot/ScreenshotWindow.cpp +++ b/src/apps/screenshot/ScreenshotWindow.cpp @@ -514,7 +514,8 @@ ScreenshotWindow::_SetupOutputPathMenu(const BMessage& settings) } fOutputPathMenu->AddItem(new BSeparatorItem()); - fOutputPathMenu->AddItem(new BMenuItem(B_TRANSLATE("Choose folder..."), + fOutputPathMenu->AddItem(new BMenuItem( + B_TRANSLATE("Choose folder" B_UTF8_ELLIPSIS), new BMessage(kChooseLocation), 'F')); } diff --git a/src/kits/interface/PrintJob.cpp b/src/kits/interface/PrintJob.cpp index fe8b234777..0a5ad29f7c 100644 --- a/src/kits/interface/PrintJob.cpp +++ b/src/kits/interface/PrintJob.cpp @@ -294,7 +294,7 @@ BPrintJob::CommitJob() return; if (fSpoolFileHeader.page_count == 0) { - ShowError(B_TRANSLATE("No Pages to print!")); + ShowError(B_TRANSLATE("No pages to print!")); CancelJob(); return; } diff --git a/src/tools/translation/inspector/ImageWindow.cpp b/src/tools/translation/inspector/ImageWindow.cpp index 531b3e5b0d..3ab8f73df7 100644 --- a/src/tools/translation/inspector/ImageWindow.cpp +++ b/src/tools/translation/inspector/ImageWindow.cpp @@ -52,10 +52,10 @@ ImageWindow::ImageWindow(BRect rect, const char *name) BMenuBar *pbar = new BMenuBar(rctbar, "MenuBar"); BMenu *pmnufile = new BMenu(B_TRANSLATE("File")); - BMenuItem *pitmopen = new BMenuItem(B_TRANSLATE("Open..."), + BMenuItem *pitmopen = new BMenuItem(B_TRANSLATE("Open" B_UTF8_ELLIPSIS), new BMessage(M_OPEN_IMAGE), 'O', 0); - BMenuItem *pitmsave = new BMenuItem(B_TRANSLATE("Save..."), + BMenuItem *pitmsave = new BMenuItem(B_TRANSLATE("Save" B_UTF8_ELLIPSIS), new BMessage(M_SAVE_IMAGE), 'S', 0); BMenuItem *pitmquit = new BMenuItem(B_TRANSLATE("Quit"),