From f8a1135cbb665f2d254e948c223ccc26cb8f6a77 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 27 Oct 2009 21:08:00 +0000 Subject: [PATCH] Localized MEdia preflet and translated it to french. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33799 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- data/catalogs/preferences/media/fr.catkeys | 34 +++++ src/preferences/media/Jamfile | 9 +- src/preferences/media/Media.cpp | 11 +- src/preferences/media/Media.h | 3 + src/preferences/media/MediaViews.cpp | 53 +++++--- src/preferences/media/MediaWindow.cpp | 148 +++++++++++---------- 6 files changed, 164 insertions(+), 94 deletions(-) create mode 100644 data/catalogs/preferences/media/fr.catkeys diff --git a/data/catalogs/preferences/media/fr.catkeys b/data/catalogs/preferences/media/fr.catkeys new file mode 100644 index 0000000000..77bad7f77a --- /dev/null +++ b/data/catalogs/preferences/media/fr.catkeys @@ -0,0 +1,34 @@ +1 english x-vnd.Haiku-Media 1721947718 +Show Volume Control on Deskbar Media views Afficher le contrôle de volume dans la Deskbar +Audio Input: Media views Audio Input: +Restarting Media Services\nStarting Media Server…\n Media Window Redémarrage des services media\nDémarrage du serveur media…\n +Video Input: Media views Entrée vidéo: +Waiting for media_server to quit. Media Window Attente de la fin du serveur media. +Defaults Media views Défauts +Stopping Media Server… Media Window Arrêt du serveur media… +Video Output: Media views Sortie vidéo: +Enable Real-Time Audio Media views Activer l'audio temps réel +Quit Media Window Quitter +OK Media Window Ok +Enabling Real-Time Video allows system to perform video operations as fast and smoothly as possible. It achieves optimum performance by using more RAM.\n\nOnly enable this feature if you need the lowest latency possible. Media views Activer la vidéo temps réel permet au système d'effectuer les opérations vidéo aussi rapidement et fluidement que possible. Ceci est fait en utilisant plus de mémoire.\n\nN'activez cette option que si vous avez besoin de la latence la plus faible possible. +Default Nodes Media views Noeuds par défaut +Starting Media Server… Media Window Démarrage du serveur média… +Restart the Media Server to apply changes. Media views Redémarrez le serveur media pour appliquer les changements. +Done Shutting Down. Media Window Arrêt terminé. +Cleaning Up. Media Window Nettoyage. +Telling media_addon_server to quit. Media Window Demande au serveur add-on media de quitter. +Enable Real-Time Video Media views Activer la vidéo temps réel +This hardware has no controls. Media Window Ce matériel n'a pas de contrôles. +Restarting Media Services\nShutting down Media Server\n Media Window Redémarrage des services média\nArrêt du serveur média\n +Audio Output: Media views Sortie audio: +Start Media Server Media Window Démarrer le serveur media +Audio Settings Media Window Réglages audio +Could not connect to the Media Server.\nWould you like to start it ? Media Window Impossible de se connecter au serveur media.\nVoulez-vous le démarrer ? +Ready For Use… Media Window Prêt à servir… +Real-Time Media views Tems réel +Restart Media Services Media views Redémarrer les services media +Enabling Real-time Audio allows system to record and play audio as fast as possible. It achieves this performance by using more CPU and RAM.\n\nOnly enable this feature if you need the lowest latency possible. Media views Activer le son temps réel permet au système d'enregistrer et lire le son aussi rapidement que possible. Ceci utilise plus de mémoire et de temps processeur.\n\nN'activez cette option que si vous avez besoin de la latence la plus faible possible. +Couldn't remove Volume control in Deskbar: %s\n Media Window Impossible d'enlever le contrôle du volume de la Deskbar : %s\n +Couldn't add Volume control in Deskbar: %s\n Media Window Impossible d'ajouter le contrôle du volume dans la Deskbar: %s\n +Media Media Window Media +Channel: Media views Canal : diff --git a/src/preferences/media/Jamfile b/src/preferences/media/Jamfile index 5d9af292d0..d683fed37a 100644 --- a/src/preferences/media/Jamfile +++ b/src/preferences/media/Jamfile @@ -15,7 +15,14 @@ Preference Media : MediaViews.cpp MediaListItem.cpp MediaAlert.cpp - : media be $(TARGET_LIBSUPC++) + : media be liblocale.so $(TARGET_LIBSUPC++) : media.rdef ; +DoCatalogs Media + : x-vnd.Haiku-Media + : MediaViews.cpp + MediaWindow.cpp + : en.catalog + : fr.catkeys + ; diff --git a/src/preferences/media/Media.cpp b/src/preferences/media/Media.cpp index 87269ab37c..2b3204a417 100644 --- a/src/preferences/media/Media.cpp +++ b/src/preferences/media/Media.cpp @@ -10,17 +10,22 @@ #include "Media.h" -#include -#include -#include #include +#include +#include +#include +#include +#include + Media::Media() : BApplication("application/x-vnd.Haiku-Media") { BRect rect(32,64,637,462); + be_locale->GetAppCatalog(&fCatalog); + BPath path; if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) { path.Append(SETTINGS_FILE); diff --git a/src/preferences/media/Media.h b/src/preferences/media/Media.h index cfb8a61dbc..bc928b8d7d 100644 --- a/src/preferences/media/Media.h +++ b/src/preferences/media/Media.h @@ -13,6 +13,8 @@ #include "MediaWindow.h" #include +#include +#include class Media : public BApplication { @@ -25,6 +27,7 @@ class Media : public BApplication { private: MediaWindow* fWindow; + BCatalog fCatalog; }; #endif // MEDIA_H diff --git a/src/preferences/media/MediaViews.cpp b/src/preferences/media/MediaViews.cpp index 4a1bd6280f..0b535bf28c 100644 --- a/src/preferences/media/MediaViews.cpp +++ b/src/preferences/media/MediaViews.cpp @@ -15,22 +15,27 @@ // Includes -------------------------------------------------------------------------------------------------- // +#include + #include #include -#include -#include -#include +#include #include #include -#include +#include +#include #include +#include +#include +#include +#include #include #include -#include -#include #include "MediaViews.h" +#define TR_CONTEXT "Media views" + BarView::BarView() : BView ("barView", B_WILL_DRAW ), fDisplay(true) @@ -63,7 +68,7 @@ SettingsView::SettingsView (bool isVideo) SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); BBox *defaultsBox = new BBox("defaults"); - defaultsBox->SetLabel(fIsVideo ? "Default Nodes" : "Defaults"); + defaultsBox->SetLabel(fIsVideo ? TR("Default Nodes") : TR("Defaults")); // create the default box BGroupLayout* defaultBoxLayout = new BGroupLayout(B_VERTICAL, 5); @@ -76,17 +81,18 @@ SettingsView::SettingsView (bool isVideo) defaultsBox->GetLayout()->AddView(inputField); defaultsBox->GetLayout()->AddView(outputField); - float divider = StringWidth(fIsVideo ? "Video Output:" : "Audio Output:") + 5; + float divider = StringWidth(fIsVideo ? TR("Video Output:") + : TR("Audio Output:")) + 5; fMenu1 = new BPopUpMenu(""); fMenu1->SetLabelFromMarked(true); BMenuField *menuField1 = new BMenuField("menuField1", - fIsVideo ? "Video Input:" : "Audio Input:", fMenu1, NULL); + fIsVideo ? TR("Video Input:") : TR("Audio Input:"), fMenu1, NULL); menuField1->SetDivider(divider); fMenu2 = new BPopUpMenu(""); fMenu2->SetLabelFromMarked(true); BMenuField *menuField2 = new BMenuField("menuField2", - fIsVideo ? "Video Output:" : "Audio Output:", fMenu2, NULL); + fIsVideo ? TR("Video Output:") : TR("Audio Output:"), fMenu2, NULL); menuField2->SetDivider(divider); inputField->GroupLayout()->AddView(menuField1); @@ -97,26 +103,26 @@ SettingsView::SettingsView (bool isVideo) fMenu3 = new BPopUpMenu(""); fMenu3->SetLabelFromMarked(true); menuField3 = new BMenuField("menuField3", - "Channel:", fMenu3, NULL); + TR("Channel:"), fMenu3, NULL); outputField->GroupLayout()->AddView(menuField3); - menuField3->SetDivider(StringWidth("Channel:")+5); + menuField3->SetDivider(StringWidth(TR("Channel:"))+5); } rgb_color red_color = {222, 32, 33}; - fRestartView = new BStringView("restartStringView", - "Restart the Media Server to apply changes."); + fRestartView = new BStringView("restartStringView", + TR("Restart the Media Server to apply changes.")); fRestartView->SetHighColor(red_color); defaultsBox->AddChild(fRestartView); fRestartView->Hide(); // create the realtime box BBox *realtimeBox = new BBox("realtime"); - realtimeBox->SetLabel("Real-Time"); + realtimeBox->SetLabel(TR("Real-Time")); BMessage *message = new BMessage(ML_ENABLE_REAL_TIME); message->AddBool("isVideo", fIsVideo); fRealtimeCheckBox = new BCheckBox("realtimeCheckBox", - fIsVideo ? "Enable Real-Time Video" : "Enable Real-Time Audio", + fIsVideo ? TR("Enable Real-Time Video") : TR("Enable Real-Time Audio"), message); uint32 flags; @@ -125,10 +131,13 @@ SettingsView::SettingsView (bool isVideo) fRealtimeCheckBox->SetValue(B_CONTROL_ON); BTextView *textView = new BTextView("stringView"); - textView->Insert(fIsVideo ? "Enabling Real-Time Video allows system to perform video operations as fast and smoothly as possible. It achieves optimum performance by using more RAM." - "\n\nOnly enable this feature if you need the lowest latency possible." - : "Enabling Real-time Audio allows system to record and play audio as fast as possible. It achieves this performance by using more CPU and RAM." - "\n\nOnly enable this feature if you need the lowest latency possible."); + textView->Insert(fIsVideo ? TR("Enabling Real-Time Video allows system to " + "perform video operations as fast and smoothly as possible. It " + "achieves optimum performance by using more RAM." + "\n\nOnly enable this feature if you need the lowest latency possible.") + : TR("Enabling Real-time Audio allows system to record and play audio " + "as fast as possible. It achieves this performance by using more CPU and RAM." + "\n\nOnly enable this feature if you need the lowest latency possible.")); textView->MakeEditable(false); textView->MakeSelectable(false); textView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); @@ -144,11 +153,11 @@ SettingsView::SettingsView (bool isVideo) // create the bottom line: volumen in deskbar checkbox and restart button BGroupView* bottomView = new BGroupView(B_HORIZONTAL); BButton *restartButton = new BButton("restartButton", - "Restart Media Services", new BMessage(ML_RESTART_MEDIA_SERVER)); + TR("Restart Media Services"), new BMessage(ML_RESTART_MEDIA_SERVER)); if (!fIsVideo) { fVolumeCheckBox = new BCheckBox("volumeCheckBox", - "Show Volume Control on Deskbar", new BMessage(ML_SHOW_VOLUME_CONTROL)); + TR("Show Volume Control on Deskbar"), new BMessage(ML_SHOW_VOLUME_CONTROL)); bottomView->GroupLayout()->AddView(fVolumeCheckBox); if (BDeskbar().HasItem("MediaReplicant")) fVolumeCheckBox->SetValue(B_CONTROL_ON); diff --git a/src/preferences/media/MediaWindow.cpp b/src/preferences/media/MediaWindow.cpp index 7fe37f6036..7227b5ce99 100644 --- a/src/preferences/media/MediaWindow.cpp +++ b/src/preferences/media/MediaWindow.cpp @@ -7,35 +7,41 @@ */ +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include +#include +#include #include +#include +#include +#include #include "MediaWindow.h" // Images #include "iconfile.h" +#define TR_CONTEXT "Media Window" + const uint32 ML_SELECTED_NODE = 'MlSN'; const uint32 ML_INIT_MEDIA = 'MlIM'; // MediaWindow - Constructor -MediaWindow::MediaWindow(BRect frame) -: BWindow (frame, "Media", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS), +MediaWindow::MediaWindow(BRect frame) +: BWindow (frame, TR("Media"), B_TITLED_WINDOW, + B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS), fCurrentNode(NULL), fParamWeb(NULL), fAlert(NULL), @@ -55,13 +61,13 @@ MediaWindow::InitCheck() // MediaWindow - Destructor MediaWindow::~MediaWindow() { - for (int i=0; i(fAudioOutputs.ItemAt(i)); - for (int i=0; i(fAudioInputs.ItemAt(i)); - for (int i=0; i(fVideoOutputs.ItemAt(i)); - for (int i=0; i(fVideoInputs.ItemAt(i)); BMediaRoster *roster = BMediaRoster::Roster(); @@ -71,7 +77,8 @@ MediaWindow::~MediaWindow() char buffer[512]; BRect rect = Frame(); PRINT_OBJECT(rect); - sprintf(buffer, "# MediaPrefs Settings\n rect = %i,%i,%i,%i\n", int(rect.left), int(rect.top), int(rect.right), int(rect.bottom)); + sprintf(buffer, "# MediaPrefs Settings\n rect = %i,%i,%i,%i\n", + int(rect.left), int(rect.top), int(rect.right), int(rect.bottom)); BPath path; if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) { @@ -98,16 +105,17 @@ MediaWindow::FindNodes(media_type type, uint64 kind, BList &list) format1 = &format; else if (kind & B_PHYSICAL_INPUT) format2 = &format; - else + else return; - if (roster->GetDormantNodes(node_info, &node_info_count, format1, format2, NULL, kind)!=B_OK) { + if (roster->GetDormantNodes(node_info, &node_info_count, format1, format2, + NULL, kind)!=B_OK) { fprintf(stderr, "error\n"); return; } - for (int32 i=0; iname, node_info[i].name); @@ -121,9 +129,11 @@ MediaWindow::FindNodes(media_type type, uint64 kind, BList &list) MediaListItem * MediaWindow::FindMediaListItem(dormant_node_info *info) { - for (int32 j=0; jCountItems(); j++) { - MediaListItem *item = static_cast(fListView->ItemAt(j)); - if (item->fInfo && item->fInfo->addon == info->addon && item->fInfo->flavor_id == info->flavor_id) { + for (int32 j = 0; jCountItems(); j++) { + MediaListItem *item + = static_cast(fListView->ItemAt(j)); + if (item->fInfo && item->fInfo->addon == info->addon + && item->fInfo->flavor_id == info->flavor_id) { return item; break; } @@ -135,8 +145,9 @@ MediaWindow::FindMediaListItem(dormant_node_info *info) void MediaWindow::AddNodes(BList &list, bool isVideo) { - for (int32 i=0; i(list.ItemAt(i)); + for (int32 i = 0; i(list.ItemAt(i)); if (!FindMediaListItem(info)) fListView->AddItem(new MediaListItem(info, 1, isVideo, &fIcons)); } @@ -144,31 +155,31 @@ MediaWindow::AddNodes(BList &list, bool isVideo) // MediaWindow::InitWindow -- Initialization Commands here -void +void MediaWindow::InitWindow(void) { // Bitmaps BRect iconRect(0, 0, 15, 15); BBitmap *icon = new BBitmap(iconRect, B_CMAP8); - icon->SetBits(kDevicesBits, kDevicesWidth*kDevicesHeight, 0, + icon->SetBits(kDevicesBits, kDevicesWidth * kDevicesHeight, 0, kDevicesColorSpace); fIcons.AddItem(icon); icon = new BBitmap(iconRect, B_CMAP8); - icon->SetBits(kMixerBits, kMixerWidth*kMixerHeight, 0, + icon->SetBits(kMixerBits, kMixerWidth * kMixerHeight, 0, kMixerColorSpace); fIcons.AddItem(icon); icon = new BBitmap(iconRect, B_CMAP8); - icon->SetBits(kMicBits, kMicWidth*kMicHeight, 0, kMicColorSpace); + icon->SetBits(kMicBits, kMicWidth * kMicHeight, 0, kMicColorSpace); fIcons.AddItem(icon); icon = new BBitmap(iconRect, B_CMAP8); - icon->SetBits(kSpeakerBits, kSpeakerWidth*kSpeakerHeight, 0, + icon->SetBits(kSpeakerBits, kSpeakerWidth * kSpeakerHeight, 0, kSpeakerColorSpace); fIcons.AddItem(icon); icon = new BBitmap(iconRect, B_CMAP8); - icon->SetBits(kCamBits, kCamWidth*kCamHeight, 0, kCamColorSpace); + icon->SetBits(kCamBits, kCamWidth * kCamHeight, 0, kCamColorSpace); fIcons.AddItem(icon); icon = new BBitmap(iconRect, B_CMAP8); - icon->SetBits(kTVBits, kTVWidth*kTVHeight, 0, kTVColorSpace); + icon->SetBits(kTVBits, kTVWidth * kTVHeight, 0, kTVColorSpace); fIcons.AddItem(icon); const float scrollWidth = 9 * be_plain_font->Size() + 30; @@ -183,19 +194,19 @@ MediaWindow::InitWindow(void) scrollView->SetExplicitMaxSize(BSize(scrollWidth, B_SIZE_UNSET)); // Create the Views - fBox = new BBox("background", B_WILL_DRAW | B_FRAME_EVENTS, + fBox = new BBox("background", B_WILL_DRAW | B_FRAME_EVENTS, B_PLAIN_BORDER); SetLayout(new BGroupLayout(B_HORIZONTAL)); GetLayout()->AddView(fBox); // StringViews - rgb_color titleFontColor = { 0,0,0,0 }; + rgb_color titleFontColor = { 0, 0, 0, 0 }; fTitleView = new BStringView("AudioSettings", - "Audio Settings", B_WILL_DRAW); + TR("Audio Settings"), B_WILL_DRAW); fTitleView->SetFont(be_bold_font); fTitleView->SetHighColor(titleFontColor); - fContentView = new BBox("contentView", B_WILL_DRAW | B_FRAME_EVENTS, + fContentView = new BBox("contentView", B_WILL_DRAW | B_FRAME_EVENTS, B_NO_BORDER); fAudioView = new SettingsView(false); @@ -242,15 +253,16 @@ MediaWindow::InitMedia(bool first) BMediaRoster *roster = BMediaRoster::Roster(&err); if (first && err != B_OK) { - BAlert *alert = new BAlert("start_media_server", - "Could not connect to the Media Server.\n" - "Would you like to start it ?", "Quit", "Start Media Server", NULL, + BAlert *alert = new BAlert("start_media_server", + TR("Could not connect to the Media Server.\n" + "Would you like to start it ?"), TR("Quit"), + TR("Start Media Server"), NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); if (alert->Go()==0) return B_ERROR; - fAlert = new MediaAlert(BRect(0, 0, 300, 60), - "restart_alert", "Restarting Media Services\nStarting Media Server" B_UTF8_ELLIPSIS "\n"); + fAlert = new MediaAlert(BRect(0, 0, 300, 60), + "restart_alert", TR("Restarting Media Services\nStarting Media Server" B_UTF8_ELLIPSIS "\n")); fAlert->Show(); Show(); @@ -267,7 +279,7 @@ MediaWindow::InitMedia(bool first) if ((!first || (first && err) ) && fAlert) { BAutolock locker(fAlert); if (locker.IsLocked()) - fAlert->TextView()->SetText("Ready For Use" B_UTF8_ELLIPSIS); + fAlert->TextView()->SetText(TR("Ready For Use" B_UTF8_ELLIPSIS)); } void *listItem; @@ -393,7 +405,7 @@ MediaWindow::QuitRequested() // MediaWindow::FrameResized -- When the main frame is resized fix up the other views -void +void MediaWindow::FrameResized (float width, float height) { // This makes sure our SideBar colours down to the bottom when resized @@ -403,10 +415,10 @@ MediaWindow::FrameResized (float width, float height) // ---------------------------------------------------------------------------------------------------------- // // ErrorAlert -- Displays a BAlert Box with a Custom Error or Debug Message -void +void ErrorAlert(char* errorMessage) { printf("%s\n", errorMessage); - BAlert *alert = new BAlert("BAlert", errorMessage, "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); + BAlert *alert = new BAlert("BAlert", errorMessage, TR("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); alert->Go(); exit(1); } @@ -414,7 +426,7 @@ ErrorAlert(char* errorMessage) { // MediaWindow::MessageReceived -- receives messages -void +void MediaWindow::MessageReceived (BMessage *message) { switch(message->what) @@ -435,7 +447,7 @@ MediaWindow::MessageReceived (BMessage *message) if (fAudioView->fRestartView->IsHidden()) fAudioView->fRestartView->Show(); - } else + } else fprintf(stderr, "Settings2Item not found\n"); } break; @@ -472,9 +484,9 @@ MediaWindow::MessageReceived (BMessage *message) } MediaListItem *oldListItem = NULL; - for (int32 j=0; jCountItems(); j++) { + for (int32 j = 0; jCountItems(); j++) { oldListItem = static_cast(fListView->ItemAt(j)); - if (oldListItem->fInfo && oldListItem->IsVideo() == isVideo + if (oldListItem->fInfo && oldListItem->IsVideo() == isVideo && oldListItem->IsDefault(isInput)) break; } @@ -486,13 +498,13 @@ MediaWindow::MessageReceived (BMessage *message) MediaListItem *listItem = FindMediaListItem(item->fInfo); if (listItem) { listItem->SetDefault(true, isInput); - } else + } else fprintf(stderr, "MediaListItem not found\n"); fListView->Invalidate(); if (settingsView->fRestartView->IsHidden()) settingsView->fRestartView->Show(); - } else + } else fprintf(stderr, "SettingsItem not found\n"); } break; @@ -518,13 +530,13 @@ MediaWindow::MessageReceived (BMessage *message) status = deskbar.AddItem(&ref, &id); if (status != B_OK) { - fprintf(stderr, "Couldn't add Volume control in Deskbar: %s\n", + fprintf(stderr, TR("Couldn't add Volume control in Deskbar: %s\n"), strerror(status)); } } else { status_t status = deskbar.RemoveItem("MediaReplicant"); if (status != B_OK) { - fprintf(stderr, "Couldn't remove Volume control in Deskbar: %s\n", + fprintf(stderr, TR("Couldn't remove Volume control in Deskbar: %s\n"), strerror(status)); } } @@ -602,7 +614,7 @@ MediaWindow::MessageReceived (BMessage *message) fParamWeb = NULL; BRect bounds = fContentView->Bounds(); BStringView* stringView = new BStringView(bounds, - "noControls", "This hardware has no controls.", B_FOLLOW_V_CENTER | B_FOLLOW_H_CENTER); + "noControls", TR("This hardware has no controls."), B_FOLLOW_V_CENTER | B_FOLLOW_H_CENTER); stringView->ResizeToPreferred(); fContentView->AddChild(stringView); stringView->MoveBy((bounds.Width()-stringView->Bounds().Width())/2, @@ -625,7 +637,7 @@ MediaWindow::MessageReceived (BMessage *message) && (strcmp(mimeSig, "application/x-vnd.Be.addon-host")==0 || strcmp(mimeSig, "application/x-vnd.Be.media-server")==0)) { fAlert->Lock(); - fAlert->TextView()->SetText("Starting Media Server" B_UTF8_ELLIPSIS); + fAlert->TextView()->SetText(TR("Starting Media Server" B_UTF8_ELLIPSIS)); fAlert->Unlock(); } } @@ -656,7 +668,7 @@ MediaWindow::RestartMediaServices(void *data) { MediaWindow *window = (MediaWindow *)data; window->fAlert = new MediaAlert(BRect(0, 0, 300, 60), - "restart_alert", "Restarting Media Services\nShutting down Media Server\n"); + "restart_alert", TR("Restarting Media Services\nShutting down Media Server\n")); window->fAlert->Show(); @@ -665,7 +677,7 @@ MediaWindow::RestartMediaServices(void *data) { BAutolock locker(window->fAlert); if (locker.IsLocked()) - window->fAlert->TextView()->SetText("Starting Media Server" B_UTF8_ELLIPSIS); + window->fAlert->TextView()->SetText(TR("Starting Media Server" B_UTF8_ELLIPSIS)); } launch_media_server(); @@ -677,22 +689,22 @@ MediaWindow::UpdateProgress(int stage, const char * message, void * cookie) { MediaAlert *alert = static_cast(cookie); PRINT(("stage : %i\n", stage)); - const char *string = "Unknown stage"; + const char *string = "Unknown stage"; switch (stage) { case 10: - string = "Stopping Media Server" B_UTF8_ELLIPSIS; + string = TR("Stopping Media Server" B_UTF8_ELLIPSIS); break; case 20: - string = "Telling media_addon_server to quit."; + string = TR("Telling media_addon_server to quit."); break; case 40: - string = "Waiting for media_server to quit."; + string = TR("Waiting for media_server to quit."); break; case 70: - string = "Cleaning Up."; + string = TR("Cleaning Up."); break; case 100: - string = "Done Shutting Down."; + string = TR("Done Shutting Down."); break; }