[haiku-commits] r36251 - in haiku/trunk: data/catalogs/preferences data/catalogs/preferences/mail src/preferences/mail
- From: pulkomandy@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 14 Apr 2010 12:43:33 +0200 (CEST)
Author: pulkomandy
Date: 2010-04-14 12:43:33 +0200 (Wed, 14 Apr 2010)
New Revision: 36251
Changeset: http://dev.haiku-os.org/changeset/36251/haiku
Added:
haiku/trunk/data/catalogs/preferences/mail/
haiku/trunk/data/catalogs/preferences/mail/fr.catkeys
Modified:
haiku/trunk/src/preferences/mail/Account.cpp
haiku/trunk/src/preferences/mail/ConfigViews.cpp
haiku/trunk/src/preferences/mail/ConfigWindow.cpp
haiku/trunk/src/preferences/mail/Jamfile
haiku/trunk/src/preferences/mail/main.cpp
Log:
Localize mail preferences.
Added: haiku/trunk/data/catalogs/preferences/mail/fr.catkeys
===================================================================
--- haiku/trunk/data/catalogs/preferences/mail/fr.catkeys
(rev 0)
+++ haiku/trunk/data/catalogs/preferences/mail/fr.catkeys 2010-04-14
10:43:33 UTC (rev 36251)
@@ -0,0 +1,52 @@
+1 french x-vnd.Haiku-Mail 1679872636
+Select account type Config Views Choisir le type de compte
+Mail checking Config Window Vérification du courrier
+Settings Config Window Réglages
+Only when dial-up is connected Config Window Seulement si le modem
est en ligne
+While sending and receiving Config Window Pendant l'envoi et la
réception
+days Config Window jours
+Start mail services on startup Config Window Démarrer les services
mail automatiquement
+Receive mail only Config Views Réception seulement
+Account name: Config Views Nom du compte :
+OK Config Views Ok
+The filter could not be moved. Deleting filter. Config Views
Impossible de déplacer le filtre. Suppression du filtre.
+Revert Config Window Défaire
+Accounts Config Window Comptes
+Remove Config Window Enlever
+New mail notification Account Notification de nouveau message
+Account type: Config Views Type de compte :
+Send mail only Config Views Envoi seulement
+E-mail Account E-mail
+Unnamed Account Sans nom
+Send and receive mail Config Views Envoi et réception
+Real name: Config Views Nom réel :
+ · Outgoing Account · Sortant
+Return address: Config Views Adresse de réponse :
+ · E-mail filters Account · Filtres E-mail
+ · Incoming Account · Entrant
+Remove Config Views Supprimer
+Could not create inbound chain. Account Impossible de créer la
chaîne entrante.
+Incoming mail filters Config Views Filtres de courier entrant
+Account settings Config Views Réglages du compte
+OK Account Ok
+Could not create outbound chain. Account Impossible de créer la
chaîne sortante.
+Outbox Account Boîte d'envoi
+Inbox Account Boîte de réception
+Add filter Config Views Ajouter un filtre
+Outgoing mail filters Config Views Filtres de courrier sortant
+Miscellaneous Config Window Autres
+Show connection status window: Config Window Montrer la fenêtre
d'état de la connexion :
+While sending Config Window Pendant l'envoi
+Schedule outgoing mail when dial-up is disconnected Config Window
Planifier l'envoi de messages quand le modem est déconnecté
+hours Config Window heures
+Add Config Window Ajouter
+\nThe general settings couldn't be reverted.\n\nError retrieving general
settings:\n%s\n Config Window \nLes réglages généraux n'ont pas
pu être restaurés.\n\nErreur de lecture des réglages originaux :\n%s\n
+Edit mailbox menu… Config Window Editer le menu boîte à lettres…
+Check every Config Window Vérifier tous les
+Never Config Window Jamais
+never Config Window jamais
+minutes Config Window minutes
+Error retrieving general settings: %s\n Config Window Erreur
de chargement des réglages principaux : %s\n
+Apply Config Window Appliquer
+Always Config Window Toujours
+\n\nCreate a new account with the Add button.\n\nRemove an account with the
Remove button on the selected item.\n\nSelect an item in the list to change its
settings. Config Window \n\nCréez un nouveau compte avec le bouton
Ajouter.\n\nSupprimez un compte avec le bouton Supprimer sur le compte
sélectionné.\n\nSélectionnez un compte pour changer ses réglages.
Modified: haiku/trunk/src/preferences/mail/Account.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/Account.cpp 2010-04-14 09:44:15 UTC
(rev 36250)
+++ haiku/trunk/src/preferences/mail/Account.cpp 2010-04-14 10:43:33 UTC
(rev 36251)
@@ -22,11 +22,17 @@
#include <Entry.h>
#include <Path.h>
+#include <Catalog.h>
+#include <Locale.h>
+
#include <MailSettings.h>
#include <stdio.h>
#include <MDRLanguage.h>
+#undef TR_CONTEXT
+#define TR_CONTEXT "Account"
+
static BList gAccounts;
static BListView *gListView;
static BView *gConfigView;
@@ -98,12 +104,12 @@
if (fSettings)
label << fSettings->Name();
else
- label << MDR_DIALECT_CHOICE ("Unnamed","名称未定");
+ label << TR("Unnamed");
fAccountItem = new AccountItem(label.String(),this,ACCOUNT_ITEM);
- fInboundItem = new AccountItem(MDR_DIALECT_CHOICE (" · Incoming","
- 受信"),this,INBOUND_ITEM);
- fOutboundItem = new AccountItem(MDR_DIALECT_CHOICE (" · Outgoing","
- 送信"),this,OUTBOUND_ITEM);
- fFilterItem = new AccountItem(MDR_DIALECT_CHOICE (" · E-mail
filters"," - フィルタ"),this,FILTER_ITEM);
+ fInboundItem = new AccountItem(TR (" · Incoming"),this,INBOUND_ITEM);
+ fOutboundItem = new AccountItem(TR (" ·
Outgoing"),this,OUTBOUND_ITEM);
+ fFilterItem = new AccountItem(TR (" · E-mail
filters"),this,FILTER_ITEM);
}
@@ -254,9 +260,9 @@
if (!(fInbound = NewMailChain()))
{
(new BAlert(
- MDR_DIALECT_CHOICE ("E-mail","メール"),
- MDR_DIALECT_CHOICE ("Could not create inbound
chain.","受信チェーンは作成できませんでした。"),
- MDR_DIALECT_CHOICE ("OK","了解")))->Go();
+ TR ("E-mail"),
+ TR ("Could not create inbound chain."),
+ TR ("OK")))->Go();
return;
}
fInbound->SetChainDirection(inbound);
@@ -294,11 +300,11 @@
// New Mail Notification
path = addOnPath;
path.Append(kSystemFilterAddOnPath);
- path.Append(MDR_DIALECT_CHOICE ("New mail notification", "着信通知方法"));
+ path.Append(TR ("New mail notification"));
if (!BEntry(path.Path()).Exists()) {
find_directory(B_BEOS_ADDONS_DIRECTORY,&path);
path.Append(kSystemFilterAddOnPath);
- path.Append(MDR_DIALECT_CHOICE ("New mail notification",
"着信通知方法"));
+ path.Append(TR ("New mail notification"));
}
BEntry(path.Path()).GetRef(&ref);
fInbound->AddFilter(msg,ref);
@@ -306,11 +312,11 @@
// Inbox
path = addOnPath;
path.Append(kSystemFilterAddOnPath);
- path.Append(MDR_DIALECT_CHOICE ("Inbox", "受信箱"));
+ path.Append(TR ("Inbox"));
if (!BEntry(path.Path()).Exists()) {
find_directory(B_BEOS_ADDONS_DIRECTORY,&path);
path.Append(kSystemFilterAddOnPath);
- path.Append(MDR_DIALECT_CHOICE ("Inbox", "受信箱"));
+ path.Append(TR ("Inbox"));
}
BEntry(path.Path()).GetRef(&ref);
fInbound->AddFilter(msg,ref);
@@ -326,9 +332,9 @@
if (!(fOutbound = NewMailChain()))
{
(new BAlert(
- MDR_DIALECT_CHOICE ("E-mail","メール"),
- MDR_DIALECT_CHOICE ("Could not create outbound
chain.","送信チェーンは作成できませんでした。"),
- MDR_DIALECT_CHOICE ("OK","了解")))->Go();
+ TR ("E-mail"),
+ TR ("Could not create outbound chain."),
+ TR ("OK")))->Go();
return;
}
fOutbound->SetChainDirection(outbound);
@@ -341,11 +347,11 @@
path = addOnPath;
path.Append(kSystemFilterAddOnPath);
- path.Append(MDR_DIALECT_CHOICE ("Outbox", "送信箱"));
+ path.Append(TR ("Outbox"));
if (!BEntry(path.Path()).Exists()) {
find_directory(B_BEOS_ADDONS_DIRECTORY,&path);
path.Append(kSystemFilterAddOnPath);
- path.Append(MDR_DIALECT_CHOICE ("Outbox", "送信箱"));
+ path.Append(TR ("Outbox"));
}
BEntry(path.Path()).GetRef(&ref);
fOutbound->AddFilter(msg,ref);
Modified: haiku/trunk/src/preferences/mail/ConfigViews.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/ConfigViews.cpp 2010-04-14 09:44:15 UTC
(rev 36250)
+++ haiku/trunk/src/preferences/mail/ConfigViews.cpp 2010-04-14 10:43:33 UTC
(rev 36251)
@@ -23,12 +23,20 @@
#include <FindDirectory.h>
#include <Directory.h>
+#include <Catalog.h>
+#include <Locale.h>
+
#include <string.h>
#include <MailSettings.h>
#include <MDRLanguage.h>
+
+#undef TR_CONTEXT
+#define TR_CONTEXT "Config Views"
+
+
// AccountConfigView
const uint32 kMsgAccountTypeChanged = 'atch';
const uint32 kMsgAccountNameChanged = 'anmc';
@@ -49,7 +57,7 @@
: BBox(rect),
fAccount(account)
{
- SetLabel(MDR_DIALECT_CHOICE ("Account settings","アカウント設定"));
+ SetLabel(TR ("Account settings"));
rect = Bounds().InsetByCopy(8,8);
rect.top += 10;
@@ -64,26 +72,26 @@
rect = view->Bounds();
rect.bottom = height + 5;
- float labelWidth = view->StringWidth(MDR_DIALECT_CHOICE ("Account
name:","アカウント名：")) + 6;
+ float labelWidth = view->StringWidth(TR ("Account name:")) + 6;
- view->AddChild(fNameControl = new
BTextControl(rect,NULL,MDR_DIALECT_CHOICE ("Account name:","アカウント名："),NULL,new
BMessage(kMsgAccountNameChanged)));
+ view->AddChild(fNameControl = new BTextControl(rect,NULL,TR ("Account
name:"),NULL,new BMessage(kMsgAccountNameChanged)));
fNameControl->SetDivider(labelWidth);
- view->AddChild(fRealNameControl = new
BTextControl(rect,NULL,MDR_DIALECT_CHOICE ("Real name:","名前 ："),NULL,NULL));
+ view->AddChild(fRealNameControl = new BTextControl(rect,NULL,TR ("Real
name:"),NULL,NULL));
fRealNameControl->SetDivider(labelWidth);
- view->AddChild(fReturnAddressControl = new
BTextControl(rect,NULL,MDR_DIALECT_CHOICE ("Return
address:","返信アドレス："),NULL,NULL));
+ view->AddChild(fReturnAddressControl = new BTextControl(rect,NULL,TR
("Return address:"),NULL,NULL));
fReturnAddressControl->SetDivider(labelWidth);
// control->TextView()->HideTyping(true);
BPopUpMenu *chainsPopUp = new BPopUpMenu(B_EMPTY_STRING);
const char *chainModes[] = {
- MDR_DIALECT_CHOICE ("Receive mail only","受信のみ"),
- MDR_DIALECT_CHOICE ("Send mail only","送信のみ"),
- MDR_DIALECT_CHOICE ("Send and receive mail","送受信")};
+ TR ("Receive mail only"),
+ TR ("Send mail only"),
+ TR ("Send and receive mail")};
BMenuItem *item;
for (int32 i = 0;i < 3;i++)
chainsPopUp->AddItem(item = new BMenuItem(chainModes[i],new
BMessage(kMsgAccountTypeChanged)));
- fTypeField = new BMenuField(rect,NULL,MDR_DIALECT_CHOICE ("Account
type:","用途 ："),chainsPopUp);
+ fTypeField = new BMenuField(rect,NULL,TR ("Account type:"),chainsPopUp);
fTypeField->SetDivider(labelWidth + 3);
view->AddChild(fTypeField);
@@ -148,7 +156,7 @@
{
if (BMenuItem *item = fTypeField->Menu()->FindMarked())
item->SetMarked(false);
- fTypeField->Menu()->Superitem()->SetLabel(MDR_DIALECT_CHOICE
("Select account type","用途を選択してください"));
+ fTypeField->Menu()->Superitem()->SetLabel(TR ("Select account
type"));
fNameControl->SetEnabled(false);
fRealNameControl->SetEnabled(false);
@@ -539,13 +547,13 @@
BMessage *msg;
if ((fChain = fAccount->Inbound()))
{
- menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE
("Incoming mail filters","受信フィルタ"),msg = new BMessage(kMsgChainSelected)));
+ menu->AddItem(item = new BMenuItem(TR ("Incoming mail
filters"),msg = new BMessage(kMsgChainSelected)));
msg->AddPointer("chain",fChain);
item->SetMarked(true);
}
if (BMailChain *chain = fAccount->Outbound())
{
- menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE
("Outgoing mail filters","送信フィルタ"),msg = new BMessage(kMsgChainSelected)));
+ menu->AddItem(item = new BMenuItem(TR ("Outgoing mail
filters"),msg = new BMessage(kMsgChainSelected)));
msg->AddPointer("chain",chain);
if (fChain == NULL)
{
@@ -575,18 +583,18 @@
fListView->SetSelectionMessage(new BMessage(kMsgFilterSelected));
rect.top = rect.bottom + 8; rect.bottom = rect.top + height;
- BRect sizeRect = rect; sizeRect.right = sizeRect.left + 30 +
fChainsField->StringWidth(MDR_DIALECT_CHOICE ("Add filter","フィルタの追加"));
+ BRect sizeRect = rect; sizeRect.right = sizeRect.left + 30 +
fChainsField->StringWidth(TR ("Add filter"));
- menu = new BPopUpMenu(MDR_DIALECT_CHOICE ("Add filter","フィルタの追加"));
+ menu = new BPopUpMenu(TR ("Add filter"));
menu->SetRadioMode(false);
fAddField = new BMenuField(rect,NULL,NULL,menu);
fAddField->ResizeToPreferred();
AddChild(fAddField);
- sizeRect.left = sizeRect.right + 5; sizeRect.right = sizeRect.left
+ 30 + fChainsField->StringWidth(MDR_DIALECT_CHOICE ("Remove","削除"));
+ sizeRect.left = sizeRect.right + 5; sizeRect.right = sizeRect.left
+ 30 + fChainsField->StringWidth(TR ("Remove"));
sizeRect.top--;
- AddChild(fRemoveButton = new BButton(sizeRect,NULL,MDR_DIALECT_CHOICE
("Remove","削除"),new BMessage(kMsgRemoveFilter),B_FOLLOW_BOTTOM));
+ AddChild(fRemoveButton = new BButton(sizeRect,NULL,TR ("Remove"),new
BMessage(kMsgRemoveFilter),B_FOLLOW_BOTTOM));
ResizeTo(Bounds().Width(),sizeRect.bottom + 10);
SetTo(fChain);
@@ -813,9 +821,9 @@
if (fChain->AddFilter(to,settings,ref) < B_OK)
{
- (new BAlert("E-mail",MDR_DIALECT_CHOICE
(
- "The filter could not be moved.
Deleting filter.",
- "フィルタが削除された為、移動できません"),"OK"))->Go();
+ (new BAlert("E-mail",TR (
+ "The filter could not be moved.
Deleting filter."
+ ),TR("OK")))->Go();
// the filter view belongs to the moved
filter
if (fFilterView && fFilterView->fIndex
== -1)
Modified: haiku/trunk/src/preferences/mail/ConfigWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/ConfigWindow.cpp 2010-04-14 09:44:15 UTC
(rev 36250)
+++ haiku/trunk/src/preferences/mail/ConfigWindow.cpp 2010-04-14 10:43:33 UTC
(rev 36251)
@@ -39,6 +39,9 @@
#include <FindDirectory.h>
#include <Path.h>
+#include <Catalog.h>
+#include <Locale.h>
+
#include <MailSettings.h>
#include <new>
@@ -47,6 +50,11 @@
#include <MDRLanguage.h>
+
+#undef TR_CONTEXT
+#define TR_CONTEXT "Config Window"
+
+
using std::nothrow;
// define if you want to have an apply button
@@ -264,7 +272,7 @@
BView *view;
rect = tabView->Bounds(); rect.bottom -= tabView->TabHeight() + 4;
tabView->AddTab(view = new BView(rect,NULL,B_FOLLOW_ALL,0));
- tabView->TabAt(0)->SetLabel(MDR_DIALECT_CHOICE ("Accounts","アカウント"));
+ tabView->TabAt(0)->SetLabel(TR ("Accounts"));
view->SetViewColor(top->ViewColor());
// accounts listview
@@ -278,13 +286,13 @@
rect.top = rect.bottom + 8; rect.bottom = rect.top + height;
BRect sizeRect = rect;
- sizeRect.right = sizeRect.left + 30 +
view->StringWidth(MDR_DIALECT_CHOICE ("Add","追加"));
- view->AddChild(new BButton(sizeRect,NULL,MDR_DIALECT_CHOICE
("Add","追加"),
+ sizeRect.right = sizeRect.left + 30 + view->StringWidth(TR ("Add"));
+ view->AddChild(new BButton(sizeRect,NULL,TR ("Add"),
new BMessage(kMsgAddAccount),B_FOLLOW_BOTTOM));
sizeRect.left = sizeRect.right+3;
- sizeRect.right = sizeRect.left + 30 +
view->StringWidth(MDR_DIALECT_CHOICE ("Remove","削除"));
- view->AddChild(fRemoveButton = new
BButton(sizeRect,NULL,MDR_DIALECT_CHOICE ("Remove","削除"),
+ sizeRect.right = sizeRect.left + 30 + view->StringWidth(TR ("Remove"));
+ view->AddChild(fRemoveButton = new BButton(sizeRect,NULL,TR ("Remove"),
new BMessage(kMsgRemoveAccount),B_FOLLOW_BOTTOM));
// accounts config view
@@ -299,30 +307,30 @@
rect = tabView->Bounds(); rect.bottom -= tabView->TabHeight() + 4;
tabView->AddTab(view = new CenterContainer(rect));
- tabView->TabAt(1)->SetLabel(MDR_DIALECT_CHOICE ("Settings","一般"));
+ tabView->TabAt(1)->SetLabel(TR ("Settings"));
rect = view->Bounds().InsetByCopy(8,8);
rect.right -= 1; rect.bottom = rect.top + height * 5 + 15;
BBox *box = new BBox(rect);
- box->SetLabel(MDR_DIALECT_CHOICE ("Mail checking","メールチェック間隔"));
+ box->SetLabel(TR ("Mail checking"));
view->AddChild(box);
rect = box->Bounds().InsetByCopy(8,8);
rect.top += 7; rect.bottom = rect.top + height + 5;
BRect tile = rect.OffsetByCopy(0,1);
- int32 labelWidth = (int32)view->StringWidth(MDR_DIALECT_CHOICE ("Check
every","メールチェック間隔："))+6;
+ int32 labelWidth = (int32)view->StringWidth(TR ("Check every"))+6;
tile.right = 80 + labelWidth;
- fIntervalControl = new BTextControl(tile,"time",MDR_DIALECT_CHOICE
("Check every","メールチェック間隔："),
+ fIntervalControl = new BTextControl(tile,"time",TR ("Check every"),
NULL,NULL);
fIntervalControl->SetDivider(labelWidth);
box->AddChild(fIntervalControl);
BPopUpMenu *frequencyPopUp = new BPopUpMenu(B_EMPTY_STRING);
const char *frequencyStrings[] = {
- MDR_DIALECT_CHOICE ("never","チェックしない"),
- MDR_DIALECT_CHOICE ("minutes","分毎チェック"),
- MDR_DIALECT_CHOICE ("hours","時間毎チェック"),
- MDR_DIALECT_CHOICE ("days","日間毎チェック")};
+ TR ("never"),
+ TR ("minutes"),
+ TR ("hours"),
+ TR ("days")};
BMenuItem *item;
for (int32 i = 0;i < 4;i++)
{
@@ -338,27 +346,27 @@
rect.OffsetBy(0,height + 9); rect.bottom -= 2;
fPPPActiveCheckBox = new BCheckBox(rect,"ppp active",
- MDR_DIALECT_CHOICE ("Only when dial-up is
connected","PPP接続中時のみ"), NULL);
+ TR ("Only when dial-up is connected"), NULL);
box->AddChild(fPPPActiveCheckBox);
rect.OffsetBy(0,height + 9); rect.bottom -= 2;
fPPPActiveSendCheckBox = new BCheckBox(rect,"ppp activesend",
- MDR_DIALECT_CHOICE ("Schedule outgoing mail when dial-up is
disconnected","PPP切断時、送信メールを送信箱に入れる"), NULL);
+ TR ("Schedule outgoing mail when dial-up is disconnected"),
NULL);
box->AddChild(fPPPActiveSendCheckBox);
// Miscellaneous settings box
rect = box->Frame(); rect.bottom = rect.top + 3*height + 30;
box = new BBox(rect);
- box->SetLabel(MDR_DIALECT_CHOICE ("Miscellaneous","その他の設定"));
+ box->SetLabel(TR ("Miscellaneous"));
view->AddChild(box);
BPopUpMenu *statusPopUp = new BPopUpMenu(B_EMPTY_STRING);
const char *statusModes[] = {
- MDR_DIALECT_CHOICE ("Never","表示しない"),
- MDR_DIALECT_CHOICE ("While sending","送信時"),
- MDR_DIALECT_CHOICE ("While sending and receiving","送受信時"),
- MDR_DIALECT_CHOICE ("Always","常に表示")};
+ TR ("Never"),
+ TR ("While sending"),
+ TR ("While sending and receiving"),
+ TR ("Always")};
BMessage *msg;
for (int32 i = 0;i < 4;i++)
{
@@ -371,9 +379,9 @@
rect.top += 7;
rect.bottom = rect.top + height + 5;
labelWidth = (int32)view->StringWidth(
- MDR_DIALECT_CHOICE ("Show connection status
window:","ステータスの表示：")) + 8;
+ TR ("Show connection status window:")) + 8;
fStatusModeField = new BMenuField(rect,"show status",
- MDR_DIALECT_CHOICE ("Show connection status
window:","ステータスの表示："),
+ TR ("Show connection status window:"),
statusPopUp);
fStatusModeField->SetDivider(labelWidth);
box->AddChild(fStatusModeField);
@@ -381,7 +389,7 @@
rect = fStatusModeField->Frame();;
rect.OffsetBy(0, rect.Height() + 10);
BButton *button = new BButton(rect,B_EMPTY_STRING,
- MDR_DIALECT_CHOICE ("Edit mailbox menu…","メニューリンクの設定"),
+ TR ("Edit mailbox menu…"),
msg = new BMessage(B_REFS_RECEIVED));
button->ResizeToPreferred();
box->AddChild(button);
@@ -402,7 +410,7 @@
rect = button->Frame();
rect.OffsetBy(rect.Width() + 30,0);
fAutoStartCheckBox = new BCheckBox(rect,"start daemon",
- MDR_DIALECT_CHOICE ("Start mail services on startup","Mail
Servicesを自動起動"),NULL);
+ TR ("Start mail services on startup"),NULL);
fAutoStartCheckBox->ResizeToPreferred();
box->AddChild(fAutoStartCheckBox);
@@ -413,7 +421,7 @@
rect = tabView->Frame();
rect.top = rect.bottom + 5; rect.bottom = rect.top + height + 5;
BButton *saveButton = new BButton(rect,"apply",
- MDR_DIALECT_CHOICE ("Apply","適用"),
+ TR ("Apply"),
new BMessage(kMsgSaveSettings));
float w,h;
saveButton->GetPreferredSize(&w,&h);
@@ -422,7 +430,7 @@
top->AddChild(saveButton);
BButton *revertButton = new BButton(rect,"revert",
- MDR_DIALECT_CHOICE ("Revert","復元"),
+ TR ("Revert"),
new BMessage(kMsgRevertSettings));
revertButton->GetPreferredSize(&w,&h);
revertButton->ResizeTo(w,h);
@@ -487,12 +495,10 @@
text->SetViewColor(fConfigView->Parent()->ViewColor());
text->SetAlignment(B_ALIGN_CENTER);
text->SetText(
- MDR_DIALECT_CHOICE ("\n\nCreate a new account with the Add
button.\n\n"
+ TR ("\n\nCreate a new account with the Add button.\n\n"
"Remove an account with the Remove button on the selected
item.\n\n"
- "Select an item in the list to change its settings.",
- "\n\nアカウントの新規作成は\"追加\"ボタンを\n使います。"
- "\n\nアカウント自体またはアカウントの\n送受信設定を削除するには\n項目を選択して\"削除\"ボタンを使います。"
- "\n\nアカウント内容の変更は、\nマウスで項目をクリックしてください。"));
+ "Select an item in the list to change its settings."
+ ));
rect = text->Bounds();
text->ResizeTo(rect.Width(), text->TextHeight(0, 42));
text->SetTextRect(rect);
@@ -519,8 +525,8 @@
// move own window
MoveTo(settings.ConfigWindowFrame().LeftTop());
} else {
- fprintf(stderr, MDR_DIALECT_CHOICE("Error retrieving general
settings: %s\n",
- "一般設定の収得に失敗： %s\n"), strerror(status));
+ fprintf(stderr, TR("Error retrieving general settings: %s\n"
+ ), strerror(status));
}
BScreen screen(this);
@@ -746,9 +752,8 @@
{
char text[256];
sprintf(text,
- MDR_DIALECT_CHOICE ("\nThe general settings couldn't be
reverted.\n\n"
- "Error retrieving general settings:\n%s\n",
- "\n一般設定を戻せませんでした。\n\n一般設定収得エラー：\n%s\n"),
+ TR ("\nThe general settings couldn't be reverted.\n\n"
+ "Error retrieving general settings:\n%s\n"),
strerror(status));
(new
BAlert("Error",text,"OK",NULL,NULL,B_WIDTH_AS_USUAL,B_WARNING_ALERT))->Go();
}
Modified: haiku/trunk/src/preferences/mail/Jamfile
===================================================================
--- haiku/trunk/src/preferences/mail/Jamfile 2010-04-14 09:44:15 UTC (rev
36250)
+++ haiku/trunk/src/preferences/mail/Jamfile 2010-04-14 10:43:33 UTC (rev
36251)
@@ -46,10 +46,17 @@
Preference E-mail
: $(sources)
: be libmail.so $(HAIKU_NETWORK_LIBS) $(TARGET_NETAPI_LIB)
- $(HAIKU_OPENSSL_LIBS) $(TARGET_LIBSUPC++)
+ $(HAIKU_OPENSSL_LIBS) $(TARGET_LIBSUPC++) liblocale.so
: e-mail.rdef
;
+DoCatalogs E-mail
+ : x-vnd.Haiku-Mail
+ : Account.cpp
+ ConfigViews.cpp
+ ConfigWindow.cpp
+;
+
Package haiku-maildaemon-cvs :
E-mail :
boot beos preferences
Modified: haiku/trunk/src/preferences/mail/main.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/main.cpp 2010-04-14 09:44:15 UTC (rev
36250)
+++ haiku/trunk/src/preferences/mail/main.cpp 2010-04-14 10:43:33 UTC (rev
36251)
@@ -7,18 +7,25 @@
#include "ConfigWindow.h"
#include <Application.h>
+#include <Catalog.h>
+#include <Locale.h>
+class BCatalog;
+
class MailConfigApp : public BApplication {
public:
MailConfigApp();
~MailConfigApp();
+ private:
+ BCatalog fCatalog;
};
MailConfigApp::MailConfigApp()
: BApplication("application/x-vnd.Haiku-Mail")
{
+ be_locale->GetAppCatalog(&fCatalog);
(new ConfigWindow())->Show();
}
Other related posts:
- » [haiku-commits] r36251 - in haiku/trunk: data/catalogs/preferences data/catalogs/preferences/mail src/preferences/mail - pulkomandy
