[haiku-commits] r34973 - haiku/trunk/src/apps/mail

  • From: jonas@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 9 Jan 2010 18:04:25 +0100 (CET)

Author: kirilla
Date: 2010-01-09 18:04:25 +0100 (Sat, 09 Jan 2010)
New Revision: 34973
Changeset: http://dev.haiku-os.org/changeset/34973/haiku
Ticket: http://dev.haiku-os.org/ticket/5169

Modified:
   haiku/trunk/src/apps/mail/Content.cpp
   haiku/trunk/src/apps/mail/Enclosures.cpp
   haiku/trunk/src/apps/mail/Enclosures.h
   haiku/trunk/src/apps/mail/Header.cpp
   haiku/trunk/src/apps/mail/MailApp.cpp
   haiku/trunk/src/apps/mail/MailWindow.cpp
   haiku/trunk/src/apps/mail/Prefs.cpp
   haiku/trunk/src/apps/mail/Signature.cpp
Log:
Sentence-cased GUI strings, adapted from patch by Humdinger in #5169.

Modified: haiku/trunk/src/apps/mail/Content.cpp
===================================================================
--- haiku/trunk/src/apps/mail/Content.cpp       2010-01-09 15:26:15 UTC (rev 
34972)
+++ haiku/trunk/src/apps/mail/Content.cpp       2010-01-09 17:04:25 UTC (rev 
34973)
@@ -882,9 +882,9 @@
        //
        fEnclosureMenu = new BPopUpMenu("Enclosure", false, false);
        fEnclosureMenu->SetFont(&menuFont);
-       fEnclosureMenu->AddItem(new BMenuItem(TR("Save Enclosure" 
B_UTF8_ELLIPSIS),
+       fEnclosureMenu->AddItem(new BMenuItem(TR("Save attachment" 
B_UTF8_ELLIPSIS),
                new BMessage(M_SAVE)));
-       fEnclosureMenu->AddItem(new BMenuItem(TR("Open Enclosure"),
+       fEnclosureMenu->AddItem(new BMenuItem(TR("Open attachment"),
                new BMessage(M_OPEN)));
 
        //
@@ -892,9 +892,9 @@
        //
        fLinkMenu = new BPopUpMenu("Link", false, false);
        fLinkMenu->SetFont(&menuFont);
-       fLinkMenu->AddItem(new BMenuItem(TR("Open This Link"),
+       fLinkMenu->AddItem(new BMenuItem(TR("Open this link"),
                new BMessage(M_OPEN)));
-       fLinkMenu->AddItem(new BMenuItem(TR("Copy Link Location"),
+       fLinkMenu->AddItem(new BMenuItem(TR("Copy link location"),
                new BMessage(M_COPY)));
 
        SetDoesUndo(true);
@@ -1541,7 +1541,7 @@
                                                delete string;
                                        }
                                } else {
-                                       (menuItem = new BMenuItem("No Matches", 
NULL))->SetEnabled(false);
+                                       (menuItem = new BMenuItem("No matches", 
NULL))->SetEnabled(false);
                                        menu.AddItem(menuItem);
                                }
 
@@ -2039,7 +2039,7 @@
 
        if (result != B_NO_ERROR) {
                beep();
-               (new BAlert("", TR("An error occurred trying to save the 
enclosure."),
+               (new BAlert("", TR("An error occurred trying to save the 
attachment."),
                        TR("Sorry")))->Go();
        }
 
@@ -2284,7 +2284,7 @@
 
                        enclosure->type = TYPE_ENCLOSURE;
 
-                       const char *name = "\n<Enclosure: could not handle>\n";
+                       const char *name = "\n<Attachment: could not handle>\n";
 
                        fView->GetSelection(&enclosure->text_start, 
&enclosure->text_end);
                        enclosure->text_start++;
@@ -3279,7 +3279,7 @@
                                } else {
                                        ::beep();
                                        (new BAlert("",
-                                               TR("Inconsistency occurred in 
the Undo/Redo buffer."),
+                                               TR("Inconsistency occurred in 
the undo/redo buffer."),
                                                TR("OK")))->Go();
                                }
                                break;
@@ -3325,7 +3325,7 @@
                        case K_REPLACED:
                                ::beep();
                                (new BAlert("",
-                                       TR("Inconsistency occurred in the 
Undo/Redo buffer."),
+                                       TR("Inconsistency occurred in the 
undo/redo buffer."),
                                        TR("OK")))->Go();
                                break;
                }
@@ -3334,3 +3334,4 @@
                fUndoBuffer.On();
        }
 }
+

Modified: haiku/trunk/src/apps/mail/Enclosures.cpp
===================================================================
--- haiku/trunk/src/apps/mail/Enclosures.cpp    2010-01-09 15:26:15 UTC (rev 
34972)
+++ haiku/trunk/src/apps/mail/Enclosures.cpp    2010-01-09 17:04:25 UTC (rev 
34973)
@@ -139,7 +139,7 @@
 
        BRect r;
        r.left = ENCLOSE_TEXT_H + font.StringWidth(
-               TR("Enclosures: ")) + 5;
+               TR("Attachments: ")) + 5;
        r.top = ENCLOSE_FIELD_V;
        r.right = wind_rect.right - wind_rect.left - B_V_SCROLL_BAR_WIDTH - 9;
        r.bottom = Frame().Height() - 8;
@@ -225,7 +225,7 @@
                                                
window->Mail()->RemoveComponent(item->Component());
 
                                        (new BAlert("", TR(
-                                               "Removing enclosures from a 
forwarded mail is not yet "
+                                               "Removing attachments from a 
forwarded mail is not yet "
                                                "implemented!\nIt will not yet 
work correctly."),
                                                TR("OK")))->Go();
                                }
@@ -278,8 +278,8 @@
                                {
                                        beep();
                                        (new BAlert("",
-                                               TR("Only files can be added as 
enclosures."),
-                                               TR("Ok")))->Go();
+                                               TR("Only files can be added as 
attachments."),
+                                               TR("OK")))->Go();
                                }
                        }
                        break;
@@ -305,7 +305,7 @@
                                        {
                                                if (opcode == B_ENTRY_REMOVED)
                                                {
-                                                       // don't hide the 
<missing enclosure> item
+                                                       // don't hide the 
<missing attachment> item
 
                                                        
//fList->RemoveItem(index);
                                                        //
@@ -423,9 +423,9 @@
 
                BPopUpMenu menu("enclosure", false, false);
                menu.SetFont(&font);
-               menu.AddItem(new BMenuItem(TR("Open Enclosure"),
+               menu.AddItem(new BMenuItem(TR("Open attachment"),
                        new BMessage(LIST_INVOKED)));
-               menu.AddItem(new BMenuItem(TR("Remove Enclosure"),
+               menu.AddItem(new BMenuItem(TR("Remove attachment"),
                        new BMessage(M_REMOVE)));
 
                BPoint menuStart = ConvertToScreen(point);
@@ -559,6 +559,6 @@
                        owner->SetDrawingMode(B_OP_COPY);
                }
        } else
-               owner->DrawString("<missing enclosure>");
+               owner->DrawString("<missing attachment>");
 }
 

Modified: haiku/trunk/src/apps/mail/Enclosures.h
===================================================================
--- haiku/trunk/src/apps/mail/Enclosures.h      2010-01-09 15:26:15 UTC (rev 
34972)
+++ haiku/trunk/src/apps/mail/Enclosures.h      2010-01-09 17:04:25 UTC (rev 
34973)
@@ -56,7 +56,7 @@
 
 #define ENCLOSURES_HEIGHT       65
 
-#define ENCLOSE_TEXT           "Enclosures:"
+#define ENCLOSE_TEXT           "Attachments:"
 #define ENCLOSE_TEXT_H          7
 #define ENCLOSE_TEXT_V          3
 #define ENCLOSE_FIELD_V                 3

Modified: haiku/trunk/src/apps/mail/Header.cpp
===================================================================
--- haiku/trunk/src/apps/mail/Header.cpp        2010-01-09 15:26:15 UTC (rev 
34972)
+++ haiku/trunk/src/apps/mail/Header.cpp        2010-01-09 17:04:25 UTC (rev 
34973)
@@ -156,7 +156,7 @@
        BMessage* msg;
 
        float x = StringWidth( /* The longest title string in the header area */
-               TR("Enclosures: ")) + 9;
+               TR("Attachments: ")) + 9;
        float y = TO_FIELD_V;
 
        BMenuBar* dummy = new BMenuBar(BRect(0, 0, 100, 15), "Dummy");

Modified: haiku/trunk/src/apps/mail/MailApp.cpp
===================================================================
--- haiku/trunk/src/apps/mail/MailApp.cpp       2010-01-09 15:26:15 UTC (rev 
34972)
+++ haiku/trunk/src/apps/mail/MailApp.cpp       2010-01-09 17:04:25 UTC (rev 
34973)
@@ -149,10 +149,11 @@
 void
 TMailApp::AboutRequested()
 {
-       BAlert *alert = new BAlert("about", "Mail\n\n"
-               "written by Robert Polic\n"
-               "enhanced by the Dr. Zoidberg crew\n\n"
-               "Copyright 2007, Haiku.\n", "Ok");
+       BAlert *alert = new BAlert("about", TR("Mail\n\n"
+               "Written by Robert Polic.\n"
+               "Enhanced by the Dr. Zoidberg crew.\n\n"
+               "Copyright 1991-2001, Be Incorporated.\n"
+               "Copyright 2005-2010 Haiku, Inc.\n"), "OK");
        BTextView *view = alert->TextView();
        BFont font;
 

Modified: haiku/trunk/src/apps/mail/MailWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mail/MailWindow.cpp    2010-01-09 15:26:15 UTC (rev 
34972)
+++ haiku/trunk/src/apps/mail/MailWindow.cpp    2010-01-09 17:04:25 UTC (rev 
34973)
@@ -95,29 +95,29 @@
 
 const char *kUndoStrings[] = {
        MDR_DIALECT_CHOICE ("Undo","Z) 取り消し"),
-       MDR_DIALECT_CHOICE ("Undo Typing","Z) 取り消し(入力)"),
-       MDR_DIALECT_CHOICE ("Undo Cut","Z) 取り消し(切り取り)"),
-       MDR_DIALECT_CHOICE ("Undo Paste","Z) 取り消し(貼り付け)"),
-       MDR_DIALECT_CHOICE ("Undo Clear","Z) 取り消し(消去)"),
-       MDR_DIALECT_CHOICE ("Undo Drop","Z) 取り消し(ドロップ)")
+       MDR_DIALECT_CHOICE ("Undo typing","Z) 取り消し(入力)"),
+       MDR_DIALECT_CHOICE ("Undo cut","Z) 取り消し(切り取り)"),
+       MDR_DIALECT_CHOICE ("Undo paste","Z) 取り消し(貼り付け)"),
+       MDR_DIALECT_CHOICE ("Undo clear","Z) 取り消し(消去)"),
+       MDR_DIALECT_CHOICE ("Undo drop","Z) 取り消し(ドロップ)")
 };
 
 const char *kRedoStrings[] = {
        MDR_DIALECT_CHOICE ("Redo", "Z) やり直し"),
-       MDR_DIALECT_CHOICE ("Redo Typing", "Z) やり直し(入力)"),
-       MDR_DIALECT_CHOICE ("Redo Cut", "Z) やり直し(切り取り)"),
-       MDR_DIALECT_CHOICE ("Redo Paste", "Z) やり直し(貼り付け)"),
-       MDR_DIALECT_CHOICE ("Redo Clear", "Z) やり直し(消去)"),
-       MDR_DIALECT_CHOICE ("Redo Drop", "Z) やり直し(ドロップ)")
+       MDR_DIALECT_CHOICE ("Redo typing", "Z) やり直し(入力)"),
+       MDR_DIALECT_CHOICE ("Redo cut", "Z) やり直し(切り取り)"),
+       MDR_DIALECT_CHOICE ("Redo paste", "Z) やり直し(貼り付け)"),
+       MDR_DIALECT_CHOICE ("Redo clear", "Z) やり直し(消去)"),
+       MDR_DIALECT_CHOICE ("Redo drop", "Z) やり直し(ドロップ)")
 };
 
 
 // Text for both the main menu and the pop-up menu.
 static const char *kSpamMenuItemTextArray[] = {
-       "Mark as Spam and Move to Trash",               // 
M_TRAIN_SPAM_AND_DELETE
-       "Mark as Spam",                                                 // 
M_TRAIN_SPAM
-       "Unmark this Message",                                  // M_UNTRAIN
-       "Mark as Genuine"                                               // 
M_TRAIN_GENUINE
+       "Mark as spam and move to trash",               // 
M_TRAIN_SPAM_AND_DELETE
+       "Mark as spam",                                                 // 
M_TRAIN_SPAM
+       "Unmark this message",                                  // M_UNTRAIN
+       "Mark as genuine"                                               // 
M_TRAIN_GENUINE
 };
 
 static const uint32 kMsgQuitAndKeepAllStatus = 'Casm';
@@ -203,7 +203,7 @@
 
        msg = new BMessage(M_NEW);
        msg->AddInt32("type", M_NEW);
-       menu->AddItem(item = new BMenuItem(TR("New Mail Message"), msg, 'N'));
+       menu->AddItem(item = new BMenuItem(TR("New mail message"), msg, 'N'));
        item->SetTarget(be_app);
 
        // Cheap hack - only show the drafts menu when composing messages.  
Insert
@@ -219,7 +219,7 @@
 
        if (!fIncoming) {
                QueryMenu *queryMenu;
-               queryMenu = new QueryMenu(TR("Open Draft"), false);
+               queryMenu = new QueryMenu(TR("Open draft"), false);
                queryMenu->SetTargetForItems(be_app);
 
                queryMenu->SetPredicate("MAIL:draft==1");
@@ -227,7 +227,7 @@
        }
 
        if (!fIncoming || resending) {
-               menu->AddItem(fSendLater = new BMenuItem(TR("Save as Draft"),
+               menu->AddItem(fSendLater = new BMenuItem(TR("Save as draft"),
                        new BMessage(M_SAVE_AS_DRAFT), 'S'));
        }
 
@@ -259,7 +259,7 @@
                        AddShortcut('W', B_COMMAND_KEY | B_SHIFT_KEY, new 
BMessage(M_CLOSE_SAME));
                }
 
-               subMenu->AddItem(new BMenuItem(TR("Move to Trash"),
+               subMenu->AddItem(new BMenuItem(TR("Move to trash"),
                        new BMessage(M_DELETE), 'T', B_CONTROL_KEY));
                AddShortcut('T', B_SHIFT_KEY|B_COMMAND_KEY,
                        new BMessage(M_DELETE_NEXT));
@@ -289,7 +289,7 @@
        }
 
        menu->AddSeparatorItem();
-       menu->AddItem(fPrint = new BMenuItem(TR("Page Setup" B_UTF8_ELLIPSIS),
+       menu->AddItem(fPrint = new BMenuItem(TR("Page setup" B_UTF8_ELLIPSIS),
                new BMessage(M_PRINT_SETUP)));
        menu->AddItem(fPrint = new BMenuItem(TR("Print" B_UTF8_ELLIPSIS),
                new BMessage(M_PRINT), 'P'));
@@ -324,22 +324,22 @@
                'V'));
        fPaste->SetTarget(NULL, this);
        menu->AddSeparatorItem();
-       menu->AddItem(item = new BMenuItem(TR("Select All"), new 
BMessage(M_SELECT),
+       menu->AddItem(item = new BMenuItem(TR("Select all"), new 
BMessage(M_SELECT),
                'A'));
        menu->AddSeparatorItem();
        item->SetTarget(NULL, this);
        menu->AddItem(new BMenuItem(TR("Find" B_UTF8_ELLIPSIS),
                new BMessage(M_FIND), 'F'));
-       menu->AddItem(new BMenuItem(TR("Find Again"), new 
BMessage(M_FIND_AGAIN),
+       menu->AddItem(new BMenuItem(TR("Find again"), new 
BMessage(M_FIND_AGAIN),
                'G'));
        if (!fIncoming) {
                menu->AddSeparatorItem();
                menu->AddItem(fQuote =new BMenuItem(TR("Quote"),
                        new BMessage(M_QUOTE), B_RIGHT_ARROW));
-               menu->AddItem(fRemoveQuote = new BMenuItem(TR("Remove Quote"),
+               menu->AddItem(fRemoveQuote = new BMenuItem(TR("Remove quote"),
                        new BMessage(M_REMOVE_QUOTE), B_LEFT_ARROW));
                menu->AddSeparatorItem();
-               fSpelling = new BMenuItem(TR("Check Spelling"),
+               fSpelling = new BMenuItem(TR("Check spelling"),
                        new BMessage(M_CHECK_SPELLING), ';');
                menu->AddItem(fSpelling);
                if (fApp->StartWithSpellCheckOn())
@@ -360,9 +360,9 @@
 
        if (!resending && fIncoming) {
                menu = new BMenu("View");
-               menu->AddItem(fHeader = new BMenuItem(TR("Show Header"),
+               menu->AddItem(fHeader = new BMenuItem(TR("Show header"),
                        new BMessage(M_HEADER), 'H'));
-               menu->AddItem(fRaw = new BMenuItem(TR("Show Raw Message"),
+               menu->AddItem(fRaw = new BMenuItem(TR("Show raw message"),
                        new BMessage(M_RAW)));
                fMenuBar->AddItem(menu);
        }
@@ -374,36 +374,36 @@
        if (!resending && fIncoming) {
                BMenuItem *menuItem;
                menu->AddItem(new BMenuItem(TR("Reply"), new 
BMessage(M_REPLY),'R'));
-               menu->AddItem(new BMenuItem(TR("Reply to Sender"),
+               menu->AddItem(new BMenuItem(TR("Reply to sender"),
                        new BMessage(M_REPLY_TO_SENDER),'R',B_OPTION_KEY));
-               menu->AddItem(new BMenuItem(TR("Reply to All"),
+               menu->AddItem(new BMenuItem(TR("Reply to all"),
                        new BMessage(M_REPLY_ALL), 'R', B_SHIFT_KEY));
 
                menu->AddSeparatorItem();
 
                menu->AddItem(new BMenuItem(TR("Forward"), new 
BMessage(M_FORWARD),
                        'J'));
-               menu->AddItem(new BMenuItem(TR("Forward without Attachments"),
+               menu->AddItem(new BMenuItem(TR("Forward without attachments"),
                        new BMessage(M_FORWARD_WITHOUT_ATTACHMENTS)));
                menu->AddItem(menuItem = new BMenuItem(TR("Resend"),
                        new BMessage(M_RESEND)));
-               menu->AddItem(menuItem = new BMenuItem(TR("Copy to New"),
+               menu->AddItem(menuItem = new BMenuItem(TR("Copy to new"),
                        new BMessage(M_COPY_TO_NEW), 'D'));
 
                menu->AddSeparatorItem();
-               fDeleteNext = new BMenuItem(TR("Move to Trash"),
+               fDeleteNext = new BMenuItem(TR("Move to trash"),
                        new BMessage(M_DELETE_NEXT), 'T');
                menu->AddItem(fDeleteNext);
                menu->AddSeparatorItem();
 
-               fPrevMsg = new BMenuItem(TR("Previous Message"),
+               fPrevMsg = new BMenuItem(TR("Previous message"),
                        new BMessage(M_PREVMSG), B_UP_ARROW);
                menu->AddItem(fPrevMsg);
-               fNextMsg = new BMenuItem(TR("Next Message"), new 
BMessage(M_NEXTMSG),
+               fNextMsg = new BMenuItem(TR("Next message"), new 
BMessage(M_NEXTMSG),
                  B_DOWN_ARROW);
                menu->AddItem(fNextMsg);
                menu->AddSeparatorItem();
-               fSaveAddrMenu = subMenu = new BMenu(TR("Save Address"));
+               fSaveAddrMenu = subMenu = new BMenu(TR("Save address"));
 
                // create the list of addresses
 
@@ -444,37 +444,37 @@
                // Spam Menu
 
                if (fApp->ShowSpamGUI()) {
-                       menu = new BMenu("Spam Filtering");
-                       menu->AddItem(new BMenuItem("Mark as Spam and Move to 
Trash",
+                       menu = new BMenu("Spam filtering");
+                       menu->AddItem(new BMenuItem("Mark as spam and move to 
trash",
                                new BMessage(M_TRAIN_SPAM_AND_DELETE), 'K'));
-                       menu->AddItem(new BMenuItem("Mark as Spam",
+                       menu->AddItem(new BMenuItem("Mark as spam",
                                new BMessage(M_TRAIN_SPAM), 'K', B_OPTION_KEY));
                        menu->AddSeparatorItem();
-                       menu->AddItem(new BMenuItem("Unmark this Message",
+                       menu->AddItem(new BMenuItem("Unmark this message",
                                new BMessage(M_UNTRAIN)));
                        menu->AddSeparatorItem();
-                       menu->AddItem(new BMenuItem("Mark as Genuine",
+                       menu->AddItem(new BMenuItem("Mark as genuine",
                                new BMessage(M_TRAIN_GENUINE), 'K', 
B_SHIFT_KEY));
                        fMenuBar->AddItem(menu);
                }
        } else {
-               menu->AddItem(fSendNow = new BMenuItem(TR("Send Message"),
+               menu->AddItem(fSendNow = new BMenuItem(TR("Send message"),
                        new BMessage(M_SEND_NOW), 'M'));
 
                if (!fIncoming) {
                        menu->AddSeparatorItem();
-                       fSignature = new TMenu(TR("Add Signature"), 
INDEX_SIGNATURE,
+                       fSignature = new TMenu(TR("Add signature"), 
INDEX_SIGNATURE,
                                M_SIGNATURE);
                        menu->AddItem(new BMenuItem(fSignature));
                        menu->AddItem(item = new BMenuItem(
-                               TR("Edit Signatures" B_UTF8_ELLIPSIS),
+                               TR("Edit signatures" B_UTF8_ELLIPSIS),
                                new BMessage(M_EDIT_SIGNATURE)));
                        item->SetTarget(be_app);
                        menu->AddSeparatorItem();
                        menu->AddItem(fAdd = new BMenuItem(TR(
-                                       "Add Enclosure" B_UTF8_ELLIPSIS),
+                                       "Add enclosure" B_UTF8_ELLIPSIS),
                                new BMessage(M_ADD), 'E'));
-                       menu->AddItem(fRemove = new BMenuItem(TR("Remove 
Enclosure"),
+                       menu->AddItem(fRemove = new BMenuItem(TR("Remove 
enclosure"),
                                new BMessage(M_REMOVE), 'T'));
                }
                fMenuBar->AddItem(menu);
@@ -1038,9 +1038,9 @@
                                && buttons == B_SECONDARY_MOUSE_BUTTON) {
                                BPopUpMenu menu("Reply To", false, false);
                                menu.AddItem(new BMenuItem(TR("Reply"),new 
BMessage(M_REPLY)));
-                               menu.AddItem(new BMenuItem(TR("Reply to 
Sender"),
+                               menu.AddItem(new BMenuItem(TR("Reply to 
sender"),
                                        new BMessage(M_REPLY_TO_SENDER)));
-                               menu.AddItem(new BMenuItem(TR("Reply to All"),
+                               menu.AddItem(new BMenuItem(TR("Reply to all"),
                                        new BMessage(M_REPLY_ALL)));
 
                                BPoint where;
@@ -1064,7 +1064,7 @@
                                BPopUpMenu menu("Forward", false, false);
                                menu.AddItem(new BMenuItem(TR("Forward"),
                                        new BMessage(M_FORWARD)));
-                               menu.AddItem(new BMenuItem(TR("Forward without 
Attachments"),
+                               menu.AddItem(new BMenuItem(TR("Forward without 
attachments"),
                                        new 
BMessage(M_FORWARD_WITHOUT_ATTACHMENTS)));
 
                                BPoint where;
@@ -1122,8 +1122,8 @@
                                                tracker.SendMessage(&msg);
                                        } else {
                                                (new BAlert("",
-                                                       TR("Need tracker to 
move items to trash"),
-                                                       TR("sorry")))->Go();
+                                                       TR("Need Tracker to 
move items to trash"),
+                                                       TR("Sorry")))->Go();
                                        }
                                }
                        } else {
@@ -1541,7 +1541,7 @@
                                BAlert* alert = new BAlert("helpful message",
                                        "Put your favorite e-mail queries and 
query "
                                        "templates in this folder.",
-                                       "Ok", NULL, NULL, B_WIDTH_AS_USUAL, 
B_IDEA_ALERT);
+                                       "OK", NULL, NULL, B_WIDTH_AS_USUAL, 
B_IDEA_ALERT);
                                alert->Go(NULL);
                        }
 
@@ -1628,7 +1628,7 @@
                        BAlert *alert = new BAlert("",
                                TR("Do you wish to save this message as a draft 
before closing?"
                                        ),
-                               TR("Don't Save"), TR("Cancel"), TR("Save"),
+                               TR("Don't save"), TR("Cancel"), TR("Save"),
                                B_WIDTH_AS_USUAL, B_OFFSET_SPACING, 
B_WARNING_ALERT);
                        alert->SetShortcut(0,'d');
                        alert->SetShortcut(1,B_ESCAPE);
@@ -2257,13 +2257,16 @@
                                if (count > 0) {
                                        int32 userAnswer;
                                        BString messageString;
-                                       messageString << TR("Your main text 
contains ") << count <<
-                                               TR(" unencodable characters.  
Perhaps a different "
-                                               "character set would work 
better?  Hit Send to send it "
+                                       BString countString;
+                                       countString << count;
+                                       messageString << TR("Your main text 
contains %ld"
+                                               " unencodable characters. 
Perhaps a different "
+                                               "character set would work 
better? Hit Send to send it "
                                                "anyway "
                                                "(a substitute character will 
be used in place of "
                                                "the unencodable ones), or 
choose Cancel to go back "
                                                "and try fixing it up.");
+                                       messageString.ReplaceFirst("%ld", 
countString);
                                        userAnswer = (new BAlert("Question", 
messageString.String(),
                                                TR("Send"),
                                                TR("Cancel"),
@@ -2378,7 +2381,7 @@
        }
 
        bool close = false;
-       char errorMessage[256];
+       BString errorMessage;
 
        switch (result) {
                case B_OK:
@@ -2400,15 +2403,16 @@
                        int32 start = (new BAlert("no daemon",
                                TR("The mail_daemon is not running. The message 
is queued and "
                                "will be sent when the mail_daemon is 
started."),
-                               TR("Start Now"), TR("Ok")))->Go();
+                               TR("Start now"), TR("OK")))->Go();
 
                        if (start == 0) {
                                result = 
be_roster->Launch("application/x-vnd.Be-POST");
                                if (result == B_OK)
                                        BMailDaemon::SendQueuedMail();
                                else {
-                                       sprintf(errorMessage,"The mail_daemon 
could not be started:\n\t%s",
-                                               strerror(result));
+                                       errorMessage
+                                               << TR("The mail_daemon could 
not be started:\n\t")
+                                               << strerror(result);
                                }
                        }
                        break;
@@ -2425,14 +2429,14 @@
 //                     break;
 
                default:
-                       sprintf(errorMessage, "An error occurred trying to send 
mail:\n\t%s",
-                               strerror(result));
+                       errorMessage << "An error occurred trying to send 
mail:\n\t"
+                               << strerror(result);
                        break;
        }
 
        if (result != B_NO_ERROR && result != B_MAIL_NO_DAEMON) {
                beep();
-               (new BAlert("", errorMessage, "Ok"))->Go();
+               (new BAlert("", errorMessage.String(), TR("OK")))->Go();
        }
        if (close)
                PostMessage(B_QUIT_REQUESTED);
@@ -2935,7 +2939,7 @@
                delete item;
        }
 
-       fQueryMenu->AddItem(new BMenuItem(TR("Edit Queries" B_UTF8_ELLIPSIS),
+       fQueryMenu->AddItem(new BMenuItem(TR("Edit queries" B_UTF8_ELLIPSIS),
                new BMessage(M_EDIT_QUERIES), 'E', B_SHIFT_KEY));
 
        bool queryItemsAdded = false;

Modified: haiku/trunk/src/apps/mail/Prefs.cpp
===================================================================
--- haiku/trunk/src/apps/mail/Prefs.cpp 2010-01-09 15:26:15 UTC (rev 34972)
+++ haiku/trunk/src/apps/mail/Prefs.cpp 2010-01-09 17:04:25 UTC (rev 34973)
@@ -113,11 +113,11 @@
        bool* spellCheckStartOn, bool* autoMarkRead, uint8* buttonBar)
        :
 #if USE_LAYOUT_MANAGEMENT
-       BWindow(rect, TR("Mail Preferences"),
+       BWindow(rect, TR("Mail preferences"),
                B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
                        | B_AUTO_UPDATE_SIZE_LIMITS),
 #else
-       BWindow(rect, TR("Mail Preferences"),
+       BWindow(rect, TR("Mail preferences"),
                B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
 #endif
 
@@ -178,7 +178,7 @@
        interfaceLayout->AlignLayoutWith(mailLayout, B_HORIZONTAL);
 
        BBox* interfaceBox = new BBox(B_FANCY_BORDER, interfaceView);
-       interfaceBox->SetLabel(TR("User Interface"));
+       interfaceBox->SetLabel(TR("User interface"));
        BBox* mailBox = new BBox(B_FANCY_BORDER, mailView);
        mailBox->SetLabel(TR("Mailing"));
 
@@ -198,7 +198,7 @@
        int32 layoutRow = 0;
 
        fButtonBarMenu = _BuildButtonBarMenu(*buttonBar);
-       menu = new BMenuField("bar", TR("Button Bar:"), fButtonBarMenu, NULL);
+       menu = new BMenuField("bar", TR("Button bar:"), fButtonBarMenu, NULL);
        add_menu_to_layout(menu, interfaceLayout, layoutRow);
 
        fFontMenu = _BuildFontMenu(font);
@@ -210,12 +210,12 @@
        add_menu_to_layout(menu, interfaceLayout, layoutRow);
 
        fColoredQuotesMenu = _BuildColoredQuotesMenu(fColoredQuotes);
-       menu = new BMenuField("cquotes", TR("Colored Quotes:"), 
fColoredQuotesMenu,
+       menu = new BMenuField("cquotes", TR("Colored quotes:"), 
fColoredQuotesMenu,
                NULL);
        add_menu_to_layout(menu, interfaceLayout, layoutRow);
 
        fSpellCheckStartOnMenu = 
_BuildSpellCheckStartOnMenu(fSpellCheckStartOn);
-       menu = new BMenuField("spellCheckStartOn", TR("Initial Spell Check 
Mode:"),
+       menu = new BMenuField("spellCheckStartOn", TR("Initial spell check 
mode:"),
                fSpellCheckStartOnMenu, NULL);
        add_menu_to_layout(menu, interfaceLayout, layoutRow);
 
@@ -228,17 +228,17 @@
        layoutRow = 0;
 
        fAccountMenu = _BuildAccountMenu(fAccount);
-       menu = new BMenuField("account", TR("Default Account:"), fAccountMenu,
+       menu = new BMenuField("account", TR("Default account:"), fAccountMenu,
                NULL);
        add_menu_to_layout(menu, mailLayout, layoutRow);
 
        fReplyToMenu = _BuildReplyToMenu(fReplyTo);
-       menu = new BMenuField("replyTo", TR("Reply Account:"), fReplyToMenu, 
NULL);
+       menu = new BMenuField("replyTo", TR("Reply account:"), fReplyToMenu, 
NULL);
        add_menu_to_layout(menu, mailLayout, layoutRow);
 
        // Mail Contents
 
-       fReplyPreamble = new BTextControl("replytext", TR("Reply Preamble:"),
+       fReplyPreamble = new BTextControl("replytext", TR("Reply preamble:"),
                *preamble, new BMessage(P_REPLY_PREAMBLE));
        fReplyPreamble->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
 
@@ -253,7 +253,7 @@
        layoutRow++;
 
        fSignatureMenu = _BuildSignatureMenu(*sig);
-       menu = new BMenuField("sig", TR("Auto Signature:"), fSignatureMenu, 
NULL);
+       menu = new BMenuField("sig", TR("Auto signature:"), fSignatureMenu, 
NULL);
        add_menu_to_layout(menu, mailLayout, layoutRow);
 
        fEncodingMenu = _BuildEncodingMenu(fEncoding);
@@ -261,7 +261,7 @@
        add_menu_to_layout(menu, mailLayout, layoutRow);
 
        fWarnUnencodableMenu = _BuildWarnUnencodableMenu(fWarnUnencodable);
-       menu = new BMenuField("warnUnencodable", TR("Warn Unencodable:"),
+       menu = new BMenuField("warnUnencodable", TR("Warn unencodable:"),
                fWarnUnencodableMenu, NULL);
        add_menu_to_layout(menu, mailLayout, layoutRow);
 
@@ -270,7 +270,7 @@
        add_menu_to_layout(menu, mailLayout, layoutRow);
        
        fAttachAttributesMenu = _BuildAttachAttributesMenu(*attachAttributes);
-       menu = new BMenuField("attachAttributes", TR("Attach Attributes:"),
+       menu = new BMenuField("attachAttributes", TR("Attach attributes:"),
                fAttachAttributesMenu, NULL);
        add_menu_to_layout(menu, mailLayout, layoutRow);
 
@@ -302,14 +302,14 @@
        view->GetFontHeight(&fontHeight);
        int32 height = (int32)(fontHeight.ascent + fontHeight.descent
                + fontHeight.leading) + 6;
-       int32 labelWidth = (int32)view->StringWidth(TR("Initial Spell Check 
Mode:"))
+       int32 labelWidth = (int32)view->StringWidth(TR("Initial spell check 
mode:"))
                + SEPARATOR_MARGIN;
 
        // group boxes
 
        r.Set(8, 4, Bounds().right - 8, 4 + 6 * (height + ITEM_SPACE));
        BBox* interfaceBox = new BBox(r , NULL,B_FOLLOW_LEFT_RIGHT | 
B_FOLLOW_TOP);
-       interfaceBox->SetLabel(TR("User Interface"));
+       interfaceBox->SetLabel(TR("User interface"));
        view->AddChild(interfaceBox);
 
        r.top = r.bottom + 8;
@@ -347,7 +347,7 @@
        r.top = height; 
        r.bottom = r.top + height - 3;
        fButtonBarMenu = _BuildButtonBarMenu(*buttonBar);
-       menu = new BMenuField(r, "bar", TR("Button Bar:"), fButtonBarMenu,
+       menu = new BMenuField(r, "bar", TR("Button bar:"), fButtonBarMenu,
                B_FOLLOW_ALL, B_WILL_DRAW | B_NAVIGABLE | B_NAVIGABLE_JUMP);
        menu->SetDivider(labelWidth);
        menu->SetAlignment(B_ALIGN_RIGHT);
@@ -371,7 +371,7 @@
 
        r.OffsetBy(0, height + ITEM_SPACE);
        fColoredQuotesMenu = _BuildColoredQuotesMenu(fColoredQuotes);
-       menu = new BMenuField(r, "cquotes", TR("Colored Quotes:"),
+       menu = new BMenuField(r, "cquotes", TR("Colored quotes:"),
                fColoredQuotesMenu,     B_FOLLOW_ALL,
                B_WILL_DRAW | B_NAVIGABLE | B_NAVIGABLE_JUMP);
        menu->SetDivider(labelWidth);
@@ -381,7 +381,7 @@
        r.OffsetBy(0, height + ITEM_SPACE);
        fSpellCheckStartOnMenu = 
_BuildSpellCheckStartOnMenu(fSpellCheckStartOn);
        menu = new BMenuField(r, "spellCheckStartOn",
-               TR("Initial Spell Check Mode:"), fSpellCheckStartOnMenu, 
B_FOLLOW_ALL,
+               TR("Initial spell check mode:"), fSpellCheckStartOnMenu, 
B_FOLLOW_ALL,
                B_WILL_DRAW | B_NAVIGABLE | B_NAVIGABLE_JUMP);
        menu->SetDivider(labelWidth);
        menu->SetAlignment(B_ALIGN_RIGHT);
@@ -403,7 +403,7 @@
        r.top = height;
        r.bottom = r.top + height - 3;
        fAccountMenu = _BuildAccountMenu(fAccount);
-       menu = new BMenuField(r, "account", TR("Default Account:"), 
fAccountMenu,
+       menu = new BMenuField(r, "account", TR("Default account:"), 
fAccountMenu,
                B_FOLLOW_ALL, B_WILL_DRAW | B_NAVIGABLE | B_NAVIGABLE_JUMP);
        menu->SetDivider(labelWidth);
        menu->SetAlignment(B_ALIGN_RIGHT);
@@ -411,7 +411,7 @@
 
        r.OffsetBy(0, height + ITEM_SPACE);
        fReplyToMenu = _BuildReplyToMenu(fReplyTo);
-       menu = new BMenuField(r, "replyTo", TR("Reply Account:"), fReplyToMenu,
+       menu = new BMenuField(r, "replyTo", TR("Reply account:"), fReplyToMenu,
                B_FOLLOW_ALL, B_WILL_DRAW | B_NAVIGABLE | B_NAVIGABLE_JUMP);
        menu->SetDivider(labelWidth);
        menu->SetAlignment(B_ALIGN_RIGHT);
@@ -421,7 +421,7 @@
 
        r.OffsetBy(0, height + ITEM_SPACE);
        r.right -= 25;
-       fReplyPreamble = new BTextControl(r, "replytext", TR("Reply Preamble:"),
+       fReplyPreamble = new BTextControl(r, "replytext", TR("Reply preamble:"),
                *preamble, new BMessage(P_REPLY_PREAMBLE), B_FOLLOW_ALL,
                B_WILL_DRAW | B_NAVIGABLE);
        fReplyPreamble->SetDivider(labelWidth);
@@ -441,7 +441,7 @@
        
        r.OffsetBy(0, height + ITEM_SPACE);
        fSignatureMenu = _BuildSignatureMenu(*sig);
-       menu = new BMenuField(r, "sig", TR("Auto Signature:"), fSignatureMenu,
+       menu = new BMenuField(r, "sig", TR("Auto signature:"), fSignatureMenu,
                B_FOLLOW_ALL, B_WILL_DRAW | B_NAVIGABLE | B_NAVIGABLE_JUMP);
        menu->SetDivider(labelWidth);
        menu->SetAlignment(B_ALIGN_RIGHT);
@@ -457,7 +457,7 @@
 
        r.OffsetBy(0, height + ITEM_SPACE);
        fWarnUnencodableMenu = _BuildWarnUnencodableMenu(fWarnUnencodable);
-       menu = new BMenuField(r, "warnUnencodable", TR("Warn Unencodable:"),
+       menu = new BMenuField(r, "warnUnencodable", TR("Warn unencodable:"),
                fWarnUnencodableMenu, B_FOLLOW_ALL,
                B_WILL_DRAW | B_NAVIGABLE | B_NAVIGABLE_JUMP);
        menu->SetDivider(labelWidth);
@@ -474,7 +474,7 @@
        
        r.OffsetBy(0, height + ITEM_SPACE);
        fAttachAttributesMenu = _BuildAttachAttributesMenu(*attachAttributes);
-       menu = new BMenuField(r, "attachAttributes", TR("Attach Attributes:"),
+       menu = new BMenuField(r, "attachAttributes", TR("Attach attributes:"),
                fAttachAttributesMenu, B_FOLLOW_ALL,
                B_WILL_DRAW | B_NAVIGABLE | B_NAVIGABLE_JUMP);
        menu->SetDivider(labelWidth);
@@ -584,7 +584,7 @@
                                }
 
                                strcpy(label,fReplyTo == ACCOUNT_USE_DEFAULT
-                                       ? TR("Use Default Account") : 
TR("Account From Mail"));
+                                       ? TR("Use default account") : 
TR("Account from mail"));
                                if ((item = fReplyToMenu->FindItem(label)) != 
NULL)
                                        item->SetMarked(true);
 
@@ -593,8 +593,8 @@
                                        item->SetMarked(true);
 
                                strcpy(label, fAttachAttributes
-                                       ? TR("Include BeOS Attributes in 
Attachments")
-                                       : TR("No BeOS Attributes, just Plain 
Data"));
+                                       ? TR("Include BeOS attributes in 
attachments")
+                                       : TR("No BeOS attributes, just plain 
data"));
                                if ((item = 
fAttachAttributesMenu->FindItem(label)) != NULL)
                                        item->SetMarked(true);
 
@@ -861,13 +861,13 @@
 
        BMenuItem* item;
        BMessage* msg;
-       menu->AddItem(item = new BMenuItem(TR("Use Default Account"),
+       menu->AddItem(item = new BMenuItem(TR("Use default account"),
                msg = new BMessage(P_REPLYTO)));
        msg->AddInt32("replyTo", ACCOUNT_USE_DEFAULT);
        if (account == ACCOUNT_USE_DEFAULT)
                item->SetMarked(true);
 
-       menu->AddItem(item = new BMenuItem(TR("Account From Mail"),
+       menu->AddItem(item = new BMenuItem(TR("Account from mail"),
                msg = new BMessage(P_REPLYTO)));
        msg->AddInt32("replyTo", ACCOUNT_FROM_MAIL);
        if (account == ACCOUNT_FROM_MAIL)
@@ -1022,14 +1022,14 @@
        msg = new BMessage(P_ATTACH_ATTRIBUTES);
        msg->AddBool("attachAttributes", true);
        menu->AddItem(item = new BMenuItem(
-               TR("Include BeOS Attributes in Attachments"), msg));
+               TR("Include BeOS attributes in attachments"), msg));
        if (attachAttributes)
                item->SetMarked(true);
 
        msg = new BMessage(P_ATTACH_ATTRIBUTES);
        msg->AddInt32("attachAttributes", false);
        menu->AddItem(item = new BMenuItem(
-               TR("No BeOS Attributes, just Plain Data"), msg));
+               TR("No BeOS attributes, just plain data"), msg));
        if (!attachAttributes)
                item->SetMarked(true);
 
@@ -1115,13 +1115,13 @@
 
        msg = new BMessage(P_BUTTON_BAR);
        msg->AddInt8("bar", 1);
-       menu->AddItem(item = new BMenuItem(TR("Show Icons & Labels"), msg));
+       menu->AddItem(item = new BMenuItem(TR("Show icons & labels"), msg));
        if (show & 1)
                item->SetMarked(true);
 
        msg = new BMessage(P_BUTTON_BAR);
        msg->AddInt8("bar", 2);
-       menu->AddItem(item = new BMenuItem(TR("Show Icons Only"), msg));
+       menu->AddItem(item = new BMenuItem(TR("Show icons only"), msg));
        if (show & 2)
                item->SetMarked(true);
 

Modified: haiku/trunk/src/apps/mail/Signature.cpp
===================================================================
--- haiku/trunk/src/apps/mail/Signature.cpp     2010-01-09 15:26:15 UTC (rev 
34972)
+++ haiku/trunk/src/apps/mail/Signature.cpp     2010-01-09 17:04:25 UTC (rev 
34973)
@@ -92,7 +92,7 @@
                'V'));
        fPaste->SetTarget(NULL, this);
        menu->AddSeparatorItem();
-       menu->AddItem(item = new BMenuItem(TR("Select All"), new 
BMessage(M_SELECT),
+       menu->AddItem(item = new BMenuItem(TR("Select all"), new 
BMessage(M_SELECT),
                'A'));
        item->SetTarget(NULL, this);
        menu_bar->AddItem(menu);
@@ -281,7 +281,7 @@
        if (IsDirty()) {
                beep();
                BAlert *alert = new BAlert("", TR("Save changes to this 
signature?"),
-                       TR("Don't Save"), TR("Cancel"), TR("Save"),
+                       TR("Don't save"), TR("Cancel"), TR("Save"),
                        B_WIDTH_AS_USUAL, B_WARNING_ALERT);
                alert->SetShortcut(0, 'd');
                alert->SetShortcut(1, B_ESCAPE);


Other related posts:

  • » [haiku-commits] r34973 - haiku/trunk/src/apps/mail - jonas