Fix various typos and inconsistencies in strings

DiskProbe, DriveSetup, Icon-O-Matic, Installer, Login,
PackageInstaller, Screenshot, Translation Inspector, BootManager,
CharacterMap, CodyCam, BPrintJob

DiskUsage: removed useless translation, used only for layouting purposes

Thanks to KapiX for spotting these problems.

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);
 

src/apps/charactermap/UnicodeBlocks.cpp

@@ -187,7 +187,7 @@ const struct unicode_block_entry kUnicodeBlocks[] = {
 	{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},
+	{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},

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"));
 	}

src/apps/diskprobe/ProbeView.cpp

@@ -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;
@@ -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());

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];

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;
 	}

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,15 +247,15 @@ 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_WIDTH_AS_USUAL, B_WARNING_ALERT);
@@ -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++) {

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();
 		}

src/apps/login/LoginApp.cpp

@@ -33,7 +33,8 @@ const char *kLoginAppSig = "application/x-vnd.Haiku-Login";
 
 
 LoginApp::LoginApp()
-	: BApplication(kLoginAppSig),
+	:
+	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);

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 "
@@ -371,7 +371,7 @@ PackageView::ItemExists(PackageItem& item, BPath& path, int32& policy)
 					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:

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'));
 }
 

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;
 	}

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"),