diff --git a/src/preferences/appearance/APRView.cpp b/src/preferences/appearance/APRView.cpp index 5578083940..c24e6a32e8 100644 --- a/src/preferences/appearance/APRView.cpp +++ b/src/preferences/appearance/APRView.cpp @@ -10,10 +10,12 @@ #include "APRView.h" #include +#include #include #include #include #include +#include #include #include #include @@ -27,6 +29,8 @@ #include "ColorSet.h" +#define TR_CONTEXT "Colors tab" + #define COLOR_DROPPED 'cldp' #define DECORATOR_CHANGED 'dcch' @@ -80,7 +84,7 @@ APRView::APRView(const char *name, uint32 flags) for (int32 i = 0; i < color_description_count(); i++) { const ColorDescription& description = *get_color_description(i); - const char* text = description.text; + const char* text = TR(description.text); color_which which = description.which; fAttrList->AddItem(new ColorWhichItem(text, which)); } diff --git a/src/preferences/appearance/APRWindow.cpp b/src/preferences/appearance/APRWindow.cpp index e0878e8014..7851e61eb0 100644 --- a/src/preferences/appearance/APRWindow.cpp +++ b/src/preferences/appearance/APRWindow.cpp @@ -39,8 +39,8 @@ APRWindow::APRWindow(BRect frame) BTabView* tabView = new BTabView("tabview", B_WIDTH_FROM_LABEL); - fAntialiasingSettings = new AntialiasingSettingsView("Antialiasing"); - fColorsView = new APRView("Colors", B_WILL_DRAW); + fAntialiasingSettings = new AntialiasingSettingsView(TR("Antialiasing")); + fColorsView = new APRView(TR("Colors"), B_WILL_DRAW); tabView->AddTab(fColorsView); tabView->AddTab(fAntialiasingSettings); diff --git a/src/preferences/appearance/AntialiasingSettingsView.cpp b/src/preferences/appearance/AntialiasingSettingsView.cpp index 37409ab718..548447d351 100644 --- a/src/preferences/appearance/AntialiasingSettingsView.cpp +++ b/src/preferences/appearance/AntialiasingSettingsView.cpp @@ -85,20 +85,20 @@ AntialiasingSettingsView::AntialiasingSettingsView(const char* name) // antialiasing menu _BuildAntialiasingMenu(); fAntialiasingMenuField = new BMenuField("antialiasing", - "Anti-aliasing type:", fAntialiasingMenu, NULL); + TR("Anti-aliasing type:"), fAntialiasingMenu, NULL); // "average weight" in subpixel filtering fAverageWeightControl = new BSlider("averageWeightControl", - "Reduce colored edges filter strength:", + TR("Reduce colored edges filter strength:"), new BMessage(kMsgSetAverageWeight), 0, 255, B_HORIZONTAL); - fAverageWeightControl->SetLimitLabels("Off", "Strong"); + fAverageWeightControl->SetLimitLabels(TR("Off"), TR("Strong")); fAverageWeightControl->SetHashMarks(B_HASH_MARKS_BOTTOM); fAverageWeightControl->SetHashMarkCount(255 / 15); fAverageWeightControl->SetEnabled(false); // hinting menu _BuildHintingMenu(); - fHintingMenuField = new BMenuField("hinting", "Glyph hinting:", + fHintingMenuField = new BMenuField("hinting", TR("Glyph hinting:"), fHintingMenu, NULL); #ifdef DISABLE_HINTING_CONTROL @@ -116,11 +116,11 @@ AntialiasingSettingsView::AntialiasingSettingsView(const char* name) BTextView* subpixelAntialiasingDisabledLabel = new BTextView( textBounds, "unavailable label", textBounds, &infoFont, &infoColor, B_FOLLOW_NONE, B_WILL_DRAW | B_SUPPORTS_LAYOUT); - subpixelAntialiasingDisabledLabel->SetText("Subpixel based anti-aliasing " + subpixelAntialiasingDisabledLabel->SetText(TR("Subpixel based anti-aliasing " "in combination with glyph hinting is not available in this build of " "Haiku to avoid possible patent issues. To enable this feature, you " "have to build Haiku yourself and enable certain options in the " - "libfreetype configuration header."); + "libfreetype configuration header.")); subpixelAntialiasingDisabledLabel->SetViewColor( ui_color(B_PANEL_BACKGROUND_COLOR)); subpixelAntialiasingDisabledLabel->MakeEditable(false); @@ -227,7 +227,7 @@ AntialiasingSettingsView::MessageReceived(BMessage *msg) void AntialiasingSettingsView::_BuildAntialiasingMenu() { - fAntialiasingMenu = new BPopUpMenu("Antialiasing menu"); + fAntialiasingMenu = new BPopUpMenu(TR("Antialiasing menu")); BMessage* message = new BMessage(kMsgSetAntialiasing); message->AddBool("antialiasing", false); @@ -248,7 +248,7 @@ AntialiasingSettingsView::_BuildAntialiasingMenu() void AntialiasingSettingsView::_BuildHintingMenu() { - fHintingMenu = new BPopUpMenu("Hinting menu"); + fHintingMenu = new BPopUpMenu(TR("Hinting menu")); BMessage* message = new BMessage(kMsgSetHinting); message->AddInt8("hinting", HINTING_MODE_OFF); diff --git a/src/preferences/appearance/ColorSet.cpp b/src/preferences/appearance/ColorSet.cpp index 219daba3cd..c646481430 100644 --- a/src/preferences/appearance/ColorSet.cpp +++ b/src/preferences/appearance/ColorSet.cpp @@ -9,45 +9,49 @@ */ #include -#include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include #include #include "ColorSet.h" +#define TR_CONTEXT "Colors tab" static ColorDescription sColorDescriptionTable[] = { - { B_PANEL_BACKGROUND_COLOR, "Panel Background" }, - { B_PANEL_TEXT_COLOR, "Panel Text" }, - { B_DOCUMENT_BACKGROUND_COLOR, "Document Background" }, - { B_DOCUMENT_TEXT_COLOR, "Document Text" }, - { B_CONTROL_BACKGROUND_COLOR, "Control Background" }, - { B_CONTROL_TEXT_COLOR, "Control Text" }, - { B_CONTROL_BORDER_COLOR, "Control Border" }, - { B_CONTROL_HIGHLIGHT_COLOR, "Control Highlight" }, - { B_NAVIGATION_BASE_COLOR, "Navigation Base" }, - { B_NAVIGATION_PULSE_COLOR, "Navigation Pulse" }, - { B_SHINE_COLOR, "Shine" }, - { B_SHADOW_COLOR, "Shadow" }, - { B_MENU_BACKGROUND_COLOR, "Menu Background" }, - { B_MENU_SELECTED_BACKGROUND_COLOR, "Selected Menu Item Background" }, - { B_MENU_ITEM_TEXT_COLOR, "Menu Item Text" }, - { B_MENU_SELECTED_ITEM_TEXT_COLOR, "Selected Menu Item Text" }, - { B_MENU_SELECTED_BORDER_COLOR, "Selected Menu Item Border" }, - { B_TOOL_TIP_BACKGROUND_COLOR, "Tooltip Background" }, - { B_TOOL_TIP_TEXT_COLOR, "Tooltip Text" }, - { B_SUCCESS_COLOR, "Success" }, - { B_FAILURE_COLOR, "Failure" }, - { B_WINDOW_TAB_COLOR, "Window Tab" }, - { B_WINDOW_TEXT_COLOR, "Window Tab Text" }, - { B_WINDOW_INACTIVE_TAB_COLOR, "Inactive Window Tab" }, - { B_WINDOW_INACTIVE_TEXT_COLOR, "Inactive Window Tab Text" } + { B_PANEL_BACKGROUND_COLOR, TR_MARK("Panel Background") }, + { B_PANEL_TEXT_COLOR, TR_MARK("Panel Text") }, + { B_DOCUMENT_BACKGROUND_COLOR, TR_MARK("Document Background") }, + { B_DOCUMENT_TEXT_COLOR, TR_MARK("Document Text") }, + { B_CONTROL_BACKGROUND_COLOR, TR_MARK("Control Background") }, + { B_CONTROL_TEXT_COLOR, TR_MARK("Control Text") }, + { B_CONTROL_BORDER_COLOR, TR_MARK("Control Border") }, + { B_CONTROL_HIGHLIGHT_COLOR, TR_MARK("Control Highlight") }, + { B_NAVIGATION_BASE_COLOR, TR_MARK("Navigation Base") }, + { B_NAVIGATION_PULSE_COLOR, TR_MARK("Navigation Pulse") }, + { B_SHINE_COLOR, TR_MARK("Shine") }, + { B_SHADOW_COLOR, TR_MARK("Shadow") }, + { B_MENU_BACKGROUND_COLOR, TR_MARK("Menu Background") }, + { B_MENU_SELECTED_BACKGROUND_COLOR, TR_MARK("Selected Menu Item Background") }, + { B_MENU_ITEM_TEXT_COLOR, TR_MARK("Menu Item Text") }, + { B_MENU_SELECTED_ITEM_TEXT_COLOR, TR_MARK("Selected Menu Item Text") }, + { B_MENU_SELECTED_BORDER_COLOR, TR_MARK("Selected Menu Item Border") }, + { B_TOOL_TIP_BACKGROUND_COLOR, TR_MARK("Tooltip Background") }, + { B_TOOL_TIP_TEXT_COLOR, TR_MARK("Tooltip Text") }, + { B_SUCCESS_COLOR, TR_MARK("Success") }, + { B_FAILURE_COLOR, TR_MARK("Failure") }, + { B_WINDOW_TAB_COLOR, TR_MARK("Window Tab") }, + { B_WINDOW_TEXT_COLOR, TR_MARK("Window Tab Text") }, + { B_WINDOW_INACTIVE_TAB_COLOR, TR_MARK("Inactive Window Tab") }, + { B_WINDOW_INACTIVE_TEXT_COLOR, TR_MARK("Inactive Window Tab Text") } }; -const int32 sColorDescriptionCount = sizeof(sColorDescriptionTable) / sizeof(ColorDescription); +const int32 sColorDescriptionCount = sizeof(sColorDescriptionTable) + / sizeof(ColorDescription); const ColorDescription* get_color_description(int32 index) diff --git a/src/preferences/appearance/fr.catkeys b/src/preferences/appearance/fr.catkeys index a741807c42..6ba455433f 100644 --- a/src/preferences/appearance/fr.catkeys +++ b/src/preferences/appearance/fr.catkeys @@ -1,9 +1,43 @@ -1 french x-vnd.Haiku-Appearance 356716505 -On AntialiasingSettingsView Activé -Defaults APRWindow Défauts +1 french x-vnd.Haiku-Appearance 4000077587 +Navigation Pulse Colors tab Pulsation de navigation +Shadow Colors tab Ombre +On AntialiasingSettingsView Activé +Defaults APRWindow Défaut Grayscale AntialiasingSettingsView Niveaux de gris -Off AntialiasingSettingsView Désactivé -Revert APRWindow Défaire +Shine Colors tab Lumière +Off AntialiasingSettingsView Désactivé +Anti-aliasing type: AntialiasingSettingsView Type de lissage : +Success Colors tab Réussite +Inactive Window Tab Colors tab Onglet de fenêtre inactive +Failure Colors tab Échec +Hinting menu AntialiasingSettingsView Menu hinting +Control Border Colors tab Bordure de contrôle +Document Background Colors tab Arrière plan de document +Revert APRWindow Défaire +Selected Menu Item Border Colors tab Bordure d'entrée de menu sélectionnée +Selected Menu Item Text Colors tab Texte d'entrée de menu sélectionnée +Antialiasing APRWindow Lissage +Window Tab Text Colors tab Texte d'onglet de fenêtre +Tooltip Background Colors tab Arrière plan de bulle d'aide +Document Text Colors tab Texte de document +Navigation Base Colors tab Base de navigation +Menu Background Colors tab Arrière plan de menu Appearance APRWindow Apparence -Monospaced Fonts Only AntialiasingSettingsView Uniquement les polices à chasse fixe +Control Background Colors tab Arrière plan de contrôle +Colors APRWindow Couleurs +Panel Background Colors tab Arrière plan de panneau +Window Tab Colors tab Onglet de fenêtre +Reduce colored edges filter strength: AntialiasingSettingsView Intensité du filtre de réduction des bords de couleurs: +Subpixel based anti-aliasing in combination with glyph hinting is not available in this build of Haiku to avoid possible patent issues. To enable this feature, you have to build Haiku yourself and enable certain options in the libfreetype configuration header. AntialiasingSettingsView Le lissage sous-pixel n'est pas disponible en même temps que le hinting de glyphes dans cette version de Haiku afin d'éviter des problèmes de brevets logiciels. Pour activer cette fonctionnalité, vous devez compiler Haiku vous-même et activer certaines options dans l'en-tête de configuration de libfreetype. +Menu Item Text Colors tab Texte d'entrée de menu +Monospaced Fonts Only AntialiasingSettingsView Seulement les polices à chasse fixe LCD subpixel AntialiasingSettingsView Sous-pixel LCD +Inactive Window Tab Text Colors tab Texte d'onglet de fenêtre inactive +Strong AntialiasingSettingsView Important +Control Highlight Colors tab Mise en valeur de contrôle +Control Text Colors tab Texte de contrôle +Tooltip Text Colors tab Texte de bulle d'aide +Antialiasing menu AntialiasingSettingsView Menu Antialiasing +Selected Menu Item Background Colors tab Arrière plan d'entrée de menu sélectionnée +Glyph hinting: AntialiasingSettingsView Hinting de glyphes : +Panel Text Colors tab Texte de panneau