Ticket #7116: mediaconverter-localization-update.patch
File mediaconverter-localization-update.patch, 11.1 KB (added by , 13 years ago) |
---|
-
src/apps/mediaconverter/MediaConverterWindow.cpp
110 110 111 111 MediaConverterWindow::MediaConverterWindow(BRect frame) 112 112 : 113 BWindow(frame, "MediaConverter", B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, 114 B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS), 113 BWindow(frame, B_TRANSLATE("MediaConverter"), B_TITLED_WINDOW_LOOK, 114 B_NORMAL_WINDOW_FEEL, B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS | 115 B_AUTO_UPDATE_SIZE_LIMITS), 115 116 fVideoQuality(75), 116 117 fAudioQuality(75), 117 118 fSaveFilePanel(NULL), … … 385 386 case DISP_ABOUT_MESSAGE: 386 387 { 387 388 BString title(B_TRANSLATE("About" B_UTF8_ELLIPSIS)); 388 (new BAlert(title, 389 "MediaConverter\n" 390 VERSION"\n" 391 B_UTF8_COPYRIGHT" 1999, Be Incorporated.\n" 392 B_UTF8_COPYRIGHT" 2000-2004 Jun Suzuki\n" 393 B_UTF8_COPYRIGHT" 2007 Stephan Aßmus\n" 394 B_UTF8_COPYRIGHT" 2010 Haiku, Inc.", 389 BString str1(B_TRANSLATE_COMMENT("MediaConverter\n" 390 "%1\n" 391 "%2 1999, Be Incorporated.\n" 392 "%3 2000-2004 Jun Suzuki\n" 393 "%4 2007 Stephan Aßmus\n" 394 "%5 2010 Haiku, Inc.", 395 "%1 is replaced by the version number, %2, %3, %4, and %5 " 396 "are replaced by the Copyright mark")); 397 str1.ReplaceFirst("%1", VERSION); 398 str1.ReplaceFirst("%2", B_UTF8_COPYRIGHT); 399 str1.ReplaceFirst("%3", B_UTF8_COPYRIGHT); 400 str1.ReplaceFirst("%4", B_UTF8_COPYRIGHT); 401 str1.ReplaceFirst("%5", B_UTF8_COPYRIGHT); 402 (new BAlert(title, str1.String(), 395 403 B_TRANSLATE("OK")))->Go(); 396 404 break; 397 405 } … … 437 445 438 446 if (status != B_OK && status != B_ALREADY_RUNNING) { 439 447 BString errorString; 440 errorString << B_TRANSLATE("Error launching: ") <<448 errorString << B_TRANSLATE("Error launching:") << " " << 441 449 strerror(status); 442 450 (new BAlert("", errorString.String(), 443 451 B_TRANSLATE("OK")))->Go(); … … 876 884 B_TRANSLATE("High")); 877 885 } 878 886 887 BString str2("%1: "); 888 str2.ReplaceFirst("%1", B_TRANSLATE("Start [ms]")); 889 BString str3("%2: "); 890 str3.ReplaceFirst("%2", B_TRANSLATE("End [ms]")); 879 891 if (fStartDurationTC != NULL) 880 fStartDurationTC->SetLabel( B_TRANSLATE("Start [ms]: "));892 fStartDurationTC->SetLabel(str2.String()); 881 893 882 894 if (fEndDurationTC != NULL) 883 fEndDurationTC->SetLabel( B_TRANSLATE("End [ms]: "));895 fEndDurationTC->SetLabel(str3.String()); 884 896 885 897 if (fFormatMenu != NULL) 886 898 fFormatMenu->SetLabel(B_TRANSLATE("File format:")); -
src/apps/mediaconverter/MediaConverterApp.cpp
131 131 if (errors) { 132 132 BString alertText; 133 133 if (errors > 1) { 134 alertText = B_TRANSLATE (134 alertText = B_TRANSLATE_COMMENT( 135 135 "%amountOfFiles files were not recognized" 136 " as supported media files:"); 136 " as supported media files:", 137 "Do not translate word %amountOfFiles"); 137 138 BString amount; 138 139 amount << errors; 139 140 alertText.ReplaceAll("%amountOfFiles", amount); … … 141 142 else 142 143 { 143 144 alertText = B_TRANSLATE( 144 " 1 file were not recognized assupported media file:");145 "The file were not recognized as a supported media file:"); 145 146 } 146 147 alertText << "\n" << errorFiles; 147 148 BAlert* alert = new BAlert((errors > 1) ? 148 149 B_TRANSLATE("Error loading files") : 149 B_TRANSLATE("Error loading file"),150 B_TRANSLATE("Error loading a file"), 150 151 alertText.String(), B_TRANSLATE("Continue") , NULL, NULL, 151 152 B_WIDTH_AS_USUAL, B_STOP_ALERT); 152 153 alert->Go(); … … 288 289 outFile = new BMediaFile(&outRef, fileFormat); 289 290 290 291 BString tmp( 291 B_TRANSLATE("Output file '%filename' created")); 292 B_TRANSLATE_COMMENT("Output file '%filename' " 293 "created", "Do not translate word %filename")); 292 294 tmp.ReplaceAll("%filename", name); 293 295 name = tmp; 294 296 } else { … … 315 317 } else { 316 318 srcIndex++; 317 319 BString error( 318 B_TRANSLATE("Error converting '%filename'")); 320 B_TRANSLATE_COMMENT("Error converting " 321 "'%filename'", "Do not translate word %filename")); 319 322 error.ReplaceAll("%filename", inRef.name); 320 323 fWin->SetStatusMessage(error.String()); 321 324 } … … 416 419 inVidTrack->DecodedFormat(&outVidFormat); 417 420 418 421 if (rvf->display.format == B_RGBA32) { 419 printf( "fixing color space (B_RGBA32 -> B_RGB32)");422 printf(B_TRANSLATE("fixing color space (B_RGBA32 -> B_RGB32)")); 420 423 rvf->display.format = B_RGB32; 421 424 } 422 425 // Transfer the display aspect ratio. … … 475 478 } 476 479 477 480 if (!outVidTrack && !outAudTrack) { 478 printf("MediaConverterApp::_ConvertFile() - no tracks found!\n"); 481 printf(B_TRANSLATE("MediaConverterApp::_ConvertFile() - no tracks " 482 "found!\n")); 479 483 ret = B_ERROR; 480 484 } 481 485 482 486 if (fCancel) { 483 487 // don't have any video or audio tracks here, or cancelled 484 printf("MediaConverterApp::_ConvertFile() - user canceld before transcoding\n"); 488 printf(B_TRANSLATE("MediaConverterApp::_ConvertFile() - user canceled " 489 "before transcoding\n")); 485 490 ret = B_CANCELED; 486 491 } 487 492 … … 527 532 for (int64 i = start; (i <= end) && !fCancel; i += framesRead) { 528 533 if ((ret = inVidTrack->ReadFrames(videoBuffer, &framesRead, 529 534 &mh)) != B_OK) { 530 fprintf(stderr, "Error reading video frame %Ld: %s\n", i, 531 strerror(ret)); 532 status.SetTo(B_TRANSLATE("Error read video frame ")); 535 BString str1("%1 "); 536 str1.ReplaceFirst("%1", B_TRANSLATE("Error reading video frame")); 537 fprintf(stderr, 538 B_TRANSLATE("Error reading video frame %Ld: %s\n"), i, 539 strerror(ret)); 540 status.SetTo(str1.String()); 533 541 status << i; 534 542 SetStatusMessage(status.String()); 535 543 … … 538 546 //printf("writing frame %lld\n", i); 539 547 if ((ret = outVidTrack->WriteFrames(videoBuffer, framesRead, 540 548 mh.u.encoded_video.field_flags)) != B_OK) { 541 fprintf(stderr, "Error writing video frame %Ld: %s\n", i, 542 strerror(ret)); 543 status.SetTo(B_TRANSLATE("Error writing video frame ")); 549 BString str2("%2 "); 550 str2.ReplaceFirst("%2", B_TRANSLATE("Error writing video frame")); 551 fprintf(stderr, 552 B_TRANSLATE("Error writing video frame %Ld: %s\n"), i, 553 strerror(ret)); 554 status.SetTo(str2.String()); 544 555 status << i; 545 556 SetStatusMessage(status.String()); 546 557 break; … … 585 596 for (int64 i = start; (i <= end) && !fCancel; i += framesRead) { 586 597 if ((ret = inAudTrack->ReadFrames(audioBuffer, &framesRead, 587 598 &mh)) != B_OK) { 588 fprintf(stderr, "Error reading audio frames: %s\n", strerror(ret)); 589 status.SetTo(B_TRANSLATE("Error read audio frame ")); 599 BString str3("%3 "); 600 str3.ReplaceFirst("%3", 601 B_TRANSLATE("Error reading audio frame")); 602 fprintf(stderr, 603 B_TRANSLATE("Error reading audio frames: %s\n"), 604 strerror(ret)); 605 status.SetTo(str3.String()); 590 606 status << i; 591 607 SetStatusMessage(status.String()); 592 608 break; 593 609 } 594 //printf( "writing audio frames %lld\n", i);610 //printf(B_TRANSLATE("writing audio frames %lld\n"), i); 595 611 if ((ret = outAudTrack->WriteFrames(audioBuffer, 596 612 framesRead)) != B_OK) { 597 fprintf(stderr, "Error writing audio frames: %s\n", 613 BString str4("%4 "); 614 str4.ReplaceFirst("%4", B_TRANSLATE("Error writing audio frame")); 615 fprintf(stderr, 616 B_TRANSLATE("Error writing audio frames: %s\n"), 598 617 strerror(ret)); 599 status.SetTo( B_TRANSLATE("Error writing audio frame "));618 status.SetTo(str4.String()); 600 619 status << i; 601 620 SetStatusMessage(status.String()); 602 621 break; -
src/apps/mediaconverter/Jamfile
13 13 : be media tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++) 14 14 : MediaConverter.rdef 15 15 ; 16 17 DoCatalogs MediaConverter : 18 x-vnd.Haiku-MediaConverter 19 : 20 MediaFileInfoView.cpp 21 MediaFileInfo.cpp 22 MediaEncoderWindow.cpp 23 MediaConverterWindow.cpp 24 MediaConverterApp.cpp 25 ; -
src/apps/mediaconverter/MediaFileInfo.cpp
7 7 8 8 #include "MediaFileInfo.h" 9 9 10 #include <Catalog.h> 10 11 #include <MediaTrack.h> 12 #include <stdio.h> 11 13 14 #undef B_TRANSLATE_CONTEXT 15 #define B_TRANSLATE_CONTEXT "MediaFileInfo" 12 16 13 17 MediaFileInfo::MediaFileInfo(BMediaFile* file) 14 18 { … … 63 67 video.format << codecInfo.pretty_name; 64 68 videoDuration = track->Duration(); 65 69 videoFrames = track->CountFrames(); 70 71 char str0[128]; 72 snprintf(str0, sizeof(str0), 73 B_TRANSLATE("%ld x %ld %ld fps / %lld frames"), 74 (int32)format.Width(), (int32)format.Height(), 75 (int32)(rvf->field_rate / rvf->interlace), videoFrames); 66 76 67 video.details << (int32)format.Width() << "x" 68 << (int32)format.Height() << " " 69 << (int32)(rvf->field_rate / rvf->interlace) 70 << " fps / " << videoFrames << " frames"; 77 video.details << (const char*)str0; 71 78 72 79 videoDone = true; 73 80 … … 81 88 media_raw_audio_format *raf = &(format.u.raw_audio); 82 89 char bytesPerSample = (char)(raf->format & 0xf); 83 90 if (bytesPerSample == 1) { 84 audio.details << "8 bit";91 audio.details << B_TRANSLATE("8 bit") << " "; 85 92 } else if (bytesPerSample == 2) { 86 audio.details << "16 bit";93 audio.details << B_TRANSLATE("16 bit") << " "; 87 94 } else { 88 audio.details << bytesPerSample << "byte "; 95 audio.details << bytesPerSample << B_TRANSLATE("byte") 96 << " "; 89 97 } 90 98 91 99 ret = track->GetCodecInfo(&codecInfo); … … 96 104 audioDuration = track->Duration(); 97 105 audioFrames = track->CountFrames(); 98 106 99 audio.details << (float)(raf->frame_rate / 1000.0f) << " kHz";100 107 if (raf->channel_count == 1) { 101 audio.details << " mono / "; 108 char str1[128]; 109 snprintf(str1, sizeof(str1), 110 B_TRANSLATE("%2.f kHz mono / %lld frames"), 111 (float)(raf->frame_rate / 1000.0f), audioFrames); 112 audio.details << (const char *)str1; 102 113 } else if (raf->channel_count == 2) { 103 audio.details << " stereo / "; 114 char str2[128]; 115 snprintf(str2, sizeof(str2), 116 B_TRANSLATE("%2.f kHz stereo / %lld frames"), 117 (float)(raf->frame_rate / 1000.0f), audioFrames); 118 audio.details << (const char *)str2; 104 119 } else { 105 audio.details << (int32)raf->channel_count 106 << " channel / " ; 120 char str3[128]; 121 snprintf(str3, sizeof(str3), 122 B_TRANSLATE("%ld channel / %lld frames"), 123 (int32)raf->channel_count, audioFrames); 124 audio.details << (const char *)str3; 107 125 } 108 audio.details << audioFrames << " frames";109 126 audioDone = true; 110 127 } 111 128 ret = file->ReleaseTrack(track); … … 116 133 117 134 useconds = MAX(audioDuration, videoDuration); 118 135 duration << (int32)(useconds / 1000000) 119 << " seconds";136 << B_TRANSLATE(" seconds"); 120 137 121 138 return B_OK; 122 139 }