From 213a7c81d0d10f96a06c0a9ab3f261c63d4ddeb9 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 24 Dec 2009 14:24:56 +0000 Subject: [PATCH] Internationalize OpenGL preferences git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34766 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- data/catalogs/preferences/opengl/fr.catkeys | 26 ++++++++++++++ src/preferences/opengl/CapabilitiesView.cpp | 39 ++++++++++++--------- src/preferences/opengl/ExtensionsList.cpp | 7 +++- src/preferences/opengl/ExtensionsView.cpp | 7 +++- src/preferences/opengl/InfoView.cpp | 17 +++++---- src/preferences/opengl/Jamfile | 13 ++++++- 6 files changed, 83 insertions(+), 26 deletions(-) create mode 100644 data/catalogs/preferences/opengl/fr.catkeys diff --git a/data/catalogs/preferences/opengl/fr.catkeys b/data/catalogs/preferences/opengl/fr.catkeys new file mode 100644 index 0000000000..1bbca59c7b --- /dev/null +++ b/data/catalogs/preferences/opengl/fr.catkeys @@ -0,0 +1,26 @@ +1 french x-vnd.Haiku-OpenGL 899836772 +List stack size: Capabilities Taille de la pile de listes : +Information InfoView Informations +Max. clipping planes: Capabilities Nombre de plans de clipping : +Max. texture units: Capabilities Nombre d'unités de texture : +Renderer name: InfoView Nom du Renderer : +Vendor name: InfoView Nom du vendeur : +Attributes stack size: Capabilities Taille de la pile d'attributs : +OpenGL version: InfoView Version d'OpenGL : +Name stack size: Capabilities Taille de la pile de noms : +Auxiliary buffer(s): Capabilities Tampon(s) auxilliaire(s) : +Max. recommended vertex elements: Capabilities Nombre d'éléments de vertex recommandé : +GLU version: InfoView Version de GLU : +Model stack size: Capabilities Taille de la pile de modèles : +Projection stack size: Capabilities Taille de la pile de projection : +Max. lights: Capabilities Éclairage maximum : +Max. 2D texture size: Capabilities Taille des textures 2D : +Max. convolution: Capabilities Convolution maximale : +GLUT API version: InfoView Version de l'API GLUT: +Texture stack size: Capabilities Taille de la pile des textures : +Max. evaluators equation order: Capabilities Ordre maximal des évaluateurs d'équations : +Max. 3D texture size: Capabilities Taille des textures 3D : +Capabilities Capabilities Capacités +Max. recommended index elements: Capabilities Nombre maxi d'éléments d'index : +Available Extensions Disponible +Extensions Extensions Extensions diff --git a/src/preferences/opengl/CapabilitiesView.cpp b/src/preferences/opengl/CapabilitiesView.cpp index 29850dc520..b11dcfce58 100644 --- a/src/preferences/opengl/CapabilitiesView.cpp +++ b/src/preferences/opengl/CapabilitiesView.cpp @@ -8,8 +8,10 @@ #include "CapabilitiesView.h" +#include #include #include +#include #include #include #include @@ -19,6 +21,9 @@ #include +#define TR_CONTEXT "Capabilities" + + void AddStringView(BView* view, const char* viewName, const char* name, const char* value, bool spacer) @@ -58,7 +63,7 @@ AddStringView(BView* view, const char* viewName, const char* name, CapabilitiesView::CapabilitiesView() - : BView("Capabilities", 0, NULL) + : BView(TR("Capabilities"), 0, NULL) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetLayout(new BGroupLayout(B_VERTICAL)); @@ -108,82 +113,82 @@ CapabilitiesView::CapabilitiesView() rootView->SetLayout(new BGroupLayout(B_VERTICAL)); tempString << (int32) buffers; - AddStringView(rootView, "Buffers", "Auxiliary buffer(s):", + AddStringView(rootView, "Buffers", TR("Auxiliary buffer(s):"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) modelStack; - AddStringView(rootView, "ModelStack", "Model stack size:", + AddStringView(rootView, "ModelStack", TR("Model stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) projectionStack; - AddStringView(rootView, "ProjectionStack", "Projection stack size:", + AddStringView(rootView, "ProjectionStack", TR("Projection stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) textureStack; - AddStringView(rootView, "TextureStack", "Texture stack size:", + AddStringView(rootView, "TextureStack", TR("Texture stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) nameStack; - AddStringView(rootView, "NameStack", "Name stack size:", + AddStringView(rootView, "NameStack", TR("Name stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) listStack; - AddStringView(rootView, "ListStack", "List stack size:", + AddStringView(rootView, "ListStack", TR("List stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) attribStack; - AddStringView(rootView, "AttribStack", "Attributes stack size:", + AddStringView(rootView, "AttribStack", TR("Attributes stack size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) maxTex3d; - AddStringView(rootView, "MaxTex3D", "Max. 3D texture size:", + AddStringView(rootView, "MaxTex3D", TR("Max. 3D texture size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) maxTex2d; - AddStringView(rootView, "MaxTex2D", "Max. 2D texture size:", + AddStringView(rootView, "MaxTex2D", TR("Max. 2D texture size:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) textureUnits; - AddStringView(rootView, "MaxTexUnits", "Max. texture units:", + AddStringView(rootView, "MaxTexUnits", TR("Max. texture units:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) lights; - AddStringView(rootView, "MaxLights", "Max. lights:", + AddStringView(rootView, "MaxLights", TR("Max. lights:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) clippingPlanes; - AddStringView(rootView, "MaxClippingPlanes", "Max. clipping planes:", + AddStringView(rootView, "MaxClippingPlanes", TR("Max. clipping planes:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) maxPoly; - AddStringView(rootView, "MaxPoly", "Max. evaluators equation order:", + AddStringView(rootView, "MaxPoly", TR("Max. evaluators equation order:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) convolutionWidth << "x" << convolutionHeight; - AddStringView(rootView, "MaxConvultion", "Max. convolution:", + AddStringView(rootView, "MaxConvultion", TR("Max. convolution:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) maxIndex; - AddStringView(rootView, "MaxIndex", "Max. recommended index elements:", + AddStringView(rootView, "MaxIndex", TR("Max. recommended index elements:"), tempString.String(), true); tempString.SetTo(""); tempString << (int32) maxVertex; - AddStringView(rootView, "MaxVertex", "Max. recommended vertex elements:", + AddStringView(rootView, "MaxVertex", TR("Max. recommended vertex elements:"), tempString.String(), true); AddChild(BGroupLayoutBuilder(B_VERTICAL) diff --git a/src/preferences/opengl/ExtensionsList.cpp b/src/preferences/opengl/ExtensionsList.cpp index d7a6b428dc..b0f5e8ac1c 100644 --- a/src/preferences/opengl/ExtensionsList.cpp +++ b/src/preferences/opengl/ExtensionsList.cpp @@ -8,10 +8,15 @@ #include "ExtensionsList.h" +#include #include +#include #include +#define TR_CONTEXT "Extensions" + + ExtensionRow::ExtensionRow(const char* extensionName) : BRow(), fExtensionName(extensionName) @@ -29,7 +34,7 @@ ExtensionRow::~ExtensionRow() ExtensionsList::ExtensionsList() : BColumnListView("ExtensionsList", B_FOLLOW_ALL) { - BStringColumn* column = new BStringColumn("Available", 280, 280, 280, + BStringColumn* column = new BStringColumn(TR("Available"), 280, 280, 280, B_TRUNCATE_MIDDLE); AddColumn(column, 0); SetSortingEnabled(true); diff --git a/src/preferences/opengl/ExtensionsView.cpp b/src/preferences/opengl/ExtensionsView.cpp index d72a673c2f..77086b3175 100644 --- a/src/preferences/opengl/ExtensionsView.cpp +++ b/src/preferences/opengl/ExtensionsView.cpp @@ -8,8 +8,10 @@ #include "ExtensionsView.h" #include "ExtensionsList.h" +#include #include #include +#include #include #include #include @@ -17,8 +19,11 @@ #include +#define TR_CONTEXT "Extensions" + + ExtensionsView::ExtensionsView() - : BView("Extensions", 0, NULL) + : BView(TR("Extensions"), 0, NULL) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetLayout(new BGroupLayout(B_VERTICAL)); diff --git a/src/preferences/opengl/InfoView.cpp b/src/preferences/opengl/InfoView.cpp index c1c386d180..d84753fd2d 100644 --- a/src/preferences/opengl/InfoView.cpp +++ b/src/preferences/opengl/InfoView.cpp @@ -8,8 +8,10 @@ #include "InfoView.h" +#include #include #include +#include #include #include #include @@ -19,8 +21,11 @@ #include +#define TR_CONTEXT "InfoView" + + InfoView::InfoView() - : BView("Information", 0, NULL) + : BView(TR("Information"), 0, NULL) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetLayout(new BGroupLayout(B_VERTICAL)); @@ -28,23 +33,23 @@ InfoView::InfoView() BRect dummyRect(0, 0, 0, 0); BStringView *version = new BStringView(dummyRect, "Version", - "OpenGL version:", B_FOLLOW_NONE); + TR("OpenGL version:"), B_FOLLOW_NONE); BStringView *versionValue = new BStringView(dummyRect, "VersionVal", (const char*)glGetString(GL_VERSION), B_FOLLOW_NONE); BStringView *vendor = new BStringView(dummyRect, "Vendor", - "Vendor name:", B_FOLLOW_NONE); + TR("Vendor name:"), B_FOLLOW_NONE); BStringView *vendorValue = new BStringView(dummyRect, "VendorVal", (const char*)glGetString(GL_VENDOR), B_FOLLOW_NONE); BStringView *renderer = new BStringView(dummyRect, "Renderer", - "Renderer name:", B_FOLLOW_NONE); + TR("Renderer name:"), B_FOLLOW_NONE); BStringView *rendererValue = new BStringView(dummyRect, "RendererVal", (const char*)glGetString(GL_RENDERER), B_FOLLOW_NONE); BStringView *gluVersion = new BStringView(dummyRect, "GLUVersion", - "GLU version:", B_FOLLOW_NONE); + TR("GLU version:"), B_FOLLOW_NONE); BStringView *gluVersionValue = new BStringView(dummyRect, "GLUVersionVal", (const char*)gluGetString(GLU_VERSION), B_FOLLOW_NONE); BStringView *glutVersion = new BStringView(dummyRect, "GLUTVersion", - "GLUT API version:", B_FOLLOW_NONE); + TR("GLUT API version:"), B_FOLLOW_NONE); BString glutApiVer; glutApiVer << (int32)GLUT_API_VERSION; BStringView *glutVersionValue = new BStringView(dummyRect, "GLUTVersionVal", diff --git a/src/preferences/opengl/Jamfile b/src/preferences/opengl/Jamfile index c7c1bf7cbe..69f64c61b8 100644 --- a/src/preferences/opengl/Jamfile +++ b/src/preferences/opengl/Jamfile @@ -11,7 +11,18 @@ Preference OpenGL : ExtensionsView.cpp InfoView.cpp LogoView.cpp - : be GL translation libcolumnlistview.a $(TARGET_LIBSUPC++) + : be GL translation libcolumnlistview.a liblocale.so $(TARGET_LIBSUPC++) : OpenGL.rdef ; +DoCatalogs OpenGL : + x-vnd.Haiku-OpenGL + : + CapabilitiesView.cpp + ExtensionsList.cpp + ExtensionsView.cpp + InfoView.cpp + : en.catalog + : fr.catkeys + ; +