Ticket #5169: case-apps-UPDATED.diff

File case-apps-UPDATED.diff, 290.9 KB (added by humdinger, 10 years ago)

Updated case-apps.diff

Line 
1Index: src/apps/icon-o-matic/gui/PathListView.cpp
2===================================================================
3--- src/apps/icon-o-matic/gui/PathListView.cpp (Revision 34761)
4+++ src/apps/icon-o-matic/gui/PathListView.cpp (Arbeitskopie)
5@@ -1,5 +1,5 @@
6 /*
7- * Copyright 2006, Haiku.
8+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
9 * Distributed under the terms of the MIT License.
10 *
11 * Authors:
12@@ -729,17 +729,17 @@
13 return;
14
15 fAddMI = new BMenuItem("Add", new BMessage(MSG_ADD));
16- fAddRectMI = new BMenuItem("Add Rect", new BMessage(MSG_ADD_RECT));
17- fAddCircleMI = new BMenuItem("Add Circle"/*B_UTF8_ELLIPSIS*/,
18+ fAddRectMI = new BMenuItem("Add rect", new BMessage(MSG_ADD_RECT));
19+ fAddCircleMI = new BMenuItem("Add circle"/*B_UTF8_ELLIPSIS*/,
20 new BMessage(MSG_ADD_CIRCLE));
21-// fAddArcMI = new BMenuItem("Add Arc"B_UTF8_ELLIPSIS,
22+// fAddArcMI = new BMenuItem("Add arc"B_UTF8_ELLIPSIS,
23 // new BMessage(MSG_ADD_ARC));
24 fDuplicateMI = new BMenuItem("Duplicate", new BMessage(MSG_DUPLICATE));
25 fReverseMI = new BMenuItem("Reverse", new BMessage(MSG_REVERSE));
26- fCleanUpMI = new BMenuItem("Clean Up", new BMessage(MSG_CLEAN_UP));
27- fRotateIndicesRightMI = new BMenuItem("Rotate Indices Right",
28+ fCleanUpMI = new BMenuItem("Clean up", new BMessage(MSG_CLEAN_UP));
29+ fRotateIndicesRightMI = new BMenuItem("Rotate indices right",
30 new BMessage(MSG_ROTATE_INDICES_CCW), 'R');
31- fRotateIndicesLeftMI = new BMenuItem("Rotate Indices Left",
32+ fRotateIndicesLeftMI = new BMenuItem("Rotate indices left",
33 new BMessage(MSG_ROTATE_INDICES_CW), 'R', B_SHIFT_KEY);
34 fRemoveMI = new BMenuItem("Remove", new BMessage(MSG_REMOVE));
35
36Index: src/apps/icon-o-matic/gui/ShapeListView.cpp
37===================================================================
38--- src/apps/icon-o-matic/gui/ShapeListView.cpp (Revision 34761)
39+++ src/apps/icon-o-matic/gui/ShapeListView.cpp (Arbeitskopie)
40@@ -1,5 +1,5 @@
41 /*
42- * Copyright 2006-2007, Haiku Inc. All rights reserved.
43+ * Copyright 2006-2009, Haiku Inc. All rights reserved.
44 * Distributed under the terms of the MIT License.
45 *
46 * Authors:
47@@ -423,25 +423,25 @@
48 return;
49
50 BMessage* message = new BMessage(MSG_ADD_SHAPE);
51- fAddEmptyMI = new BMenuItem("Add Empty", message);
52+ fAddEmptyMI = new BMenuItem("Add empty", message);
53
54 message = new BMessage(MSG_ADD_SHAPE);
55 message->AddBool("path", true);
56- fAddWidthPathMI = new BMenuItem("Add With Path", message);
57+ fAddWidthPathMI = new BMenuItem("Add with path", message);
58
59 message = new BMessage(MSG_ADD_SHAPE);
60 message->AddBool("style", true);
61- fAddWidthStyleMI = new BMenuItem("Add With Style", message);
62+ fAddWidthStyleMI = new BMenuItem("Add with style", message);
63
64 message = new BMessage(MSG_ADD_SHAPE);
65 message->AddBool("path", true);
66 message->AddBool("style", true);
67- fAddWidthPathAndStyleMI = new BMenuItem("Add With Path & Style", message);
68+ fAddWidthPathAndStyleMI = new BMenuItem("Add with path & style", message);
69
70 fDuplicateMI = new BMenuItem("Duplicate", new BMessage(MSG_DUPLICATE));
71- fResetTransformationMI = new BMenuItem("Reset Transformation",
72+ fResetTransformationMI = new BMenuItem("Reset transformation",
73 new BMessage(MSG_RESET_TRANSFORMATION));
74- fFreezeTransformationMI = new BMenuItem("Freeze Transformation",
75+ fFreezeTransformationMI = new BMenuItem("Freeze transformation",
76 new BMessage(MSG_FREEZE_TRANSFORMATION));
77
78 fRemoveMI = new BMenuItem("Remove", new BMessage(MSG_REMOVE));
79Index: src/apps/icon-o-matic/gui/StyleListView.cpp
80===================================================================
81--- src/apps/icon-o-matic/gui/StyleListView.cpp (Revision 34761)
82+++ src/apps/icon-o-matic/gui/StyleListView.cpp (Arbeitskopie)
83@@ -1,5 +1,5 @@
84 /*
85- * Copyright 2006, Haiku.
86+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
87 * Distributed under the terms of the MIT License.
88 *
89 * Authors:
90@@ -600,7 +600,7 @@
91 fDuplicateMI = new BMenuItem("Duplicate", new BMessage(MSG_DUPLICATE));
92 fMenu->AddItem(fDuplicateMI);
93
94- fResetTransformationMI = new BMenuItem("Reset Transformation",
95+ fResetTransformationMI = new BMenuItem("Reset transformation",
96 new BMessage(MSG_RESET_TRANSFORMATION));
97 fMenu->AddItem(fResetTransformationMI);
98
99Index: src/apps/icon-o-matic/gui/TransformerListView.cpp
100===================================================================
101--- src/apps/icon-o-matic/gui/TransformerListView.cpp (Revision 34761)
102+++ src/apps/icon-o-matic/gui/TransformerListView.cpp (Arbeitskopie)
103@@ -1,5 +1,5 @@
104 /*
105- * Copyright 2006, Haiku.
106+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
107 * Distributed under the terms of the MIT License.
108 *
109 * Authors:
110@@ -129,7 +129,7 @@
111
112 // display helpful messages
113 const char* message1 = "Click on a shape above";
114- const char* message2 = "to attach Transformers.";
115+ const char* message2 = "to attach transformers.";
116
117 SetHighColor(tint_color(LowColor(), B_DARKEN_2_TINT));
118 font_height fh;
119Index: src/apps/icon-o-matic/gui/StyleView.cpp
120===================================================================
121--- src/apps/icon-o-matic/gui/StyleView.cpp (Revision 34761)
122+++ src/apps/icon-o-matic/gui/StyleView.cpp (Arbeitskopie)
123@@ -1,5 +1,5 @@
124 /*
125- * Copyright 2006, Haiku. All rights reserved.
126+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
127 * Distributed under the terms of the MIT License.
128 *
129 * Authors:
130@@ -74,14 +74,14 @@
131 BGridLayout* layout = new BGridLayout(5, 5);
132 SetLayout(layout);
133
134- fStyleType = new BMenuField( "Style Type", menu, NULL);
135+ fStyleType = new BMenuField( "Style type: ", menu, NULL);
136
137 #else
138 frame.OffsetTo(B_ORIGIN);
139 frame.InsetBy(5, 5);
140 frame.bottom = frame.top + 15;
141
142- fStyleType = new BMenuField(frame, "style type", "Style Type",
143+ fStyleType = new BMenuField(frame, "style type", "Style type",
144 menu, true);
145 AddChild(fStyleType);
146
147@@ -110,7 +110,7 @@
148 menu->AddItem(new BMenuItem("Conic", message));
149
150 #if __HAIKU__
151- fGradientType = new BMenuField("Gradient Type", menu, NULL);
152+ fGradientType = new BMenuField("Gradient type: ", menu, NULL);
153 fGradientControl = new GradientControl(new BMessage(MSG_SET_COLOR), this);
154
155 layout->AddItem(BSpaceLayoutItem::CreateVerticalStrut(3), 0, 0, 4);
156@@ -129,7 +129,7 @@
157
158 #else // !__HAIKU__
159 frame.OffsetBy(0, fStyleType->Frame().Height() + 6);
160- fGradientType = new BMenuField(frame, "gradient type", "Gradient Type",
161+ fGradientType = new BMenuField(frame, "gradient type", "Gradient type",
162 menu, true);
163 AddChild(fGradientType);
164
165Index: src/apps/icon-o-matic/MainWindow.cpp
166===================================================================
167--- src/apps/icon-o-matic/MainWindow.cpp (Revision 34761)
168+++ src/apps/icon-o-matic/MainWindow.cpp (Arbeitskopie)
169@@ -263,19 +263,19 @@
170 commands[1] = pathCommand;
171 commands[2] = shapeCommand;
172 command = new CompoundCommand(commands, 3,
173- "Add Shape With Path & Style", 0);
174+ "Add shape with path & style", 0);
175 } else if (styleCommand) {
176 Command** commands = new Command*[2];
177 commands[0] = styleCommand;
178 commands[1] = shapeCommand;
179 command = new CompoundCommand(commands, 2,
180- "Add Shape With Style", 0);
181+ "Add shape with style", 0);
182 } else {
183 Command** commands = new Command*[2];
184 commands[0] = pathCommand;
185 commands[1] = shapeCommand;
186 command = new CompoundCommand(commands, 2,
187- "Add Shape With Path", 0);
188+ "Add shape with path", 0);
189 }
190 } else {
191 command = shapeCommand;
192@@ -1027,12 +1027,12 @@
193 fileMenu->AddSeparatorItem();
194 fileMenu->AddItem(new BMenuItem("Save",
195 new BMessage(MSG_SAVE), 'S'));
196- fileMenu->AddItem(new BMenuItem("Save As"B_UTF8_ELLIPSIS,
197+ fileMenu->AddItem(new BMenuItem("Save as"B_UTF8_ELLIPSIS,
198 new BMessage(MSG_SAVE_AS), 'S', B_SHIFT_KEY));
199 fileMenu->AddSeparatorItem();
200 fileMenu->AddItem(new BMenuItem("Export",
201 new BMessage(MSG_EXPORT), 'P'));
202- fileMenu->AddItem(new BMenuItem("Export As"B_UTF8_ELLIPSIS,
203+ fileMenu->AddItem(new BMenuItem("Export as"B_UTF8_ELLIPSIS,
204 new BMessage(MSG_EXPORT_AS), 'P', B_SHIFT_KEY));
205 fileMenu->AddSeparatorItem();
206 fileMenu->AddItem(new BMenuItem("Quit",
207@@ -1052,7 +1052,7 @@
208 editMenu->AddItem(fRedoMI);
209
210 // Settings
211- BMenu* filterModeMenu = new BMenu("Snap to Grid");
212+ BMenu* filterModeMenu = new BMenu("Snap to grid");
213 BMessage* message = new BMessage(MSG_MOUSE_FILTER_MODE);
214 message->AddInt32("mode", SNAPPING_OFF);
215 filterModeMenu->AddItem(new BMenuItem("Off", message, '4'));
216Index: src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp
217===================================================================
218--- src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp (Revision 34761)
219+++ src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp (Arbeitskopie)
220@@ -1,5 +1,5 @@
221 /*
222- * Copyright 2006, Haiku. All rights reserved.
223+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
224 * Distributed under the terms of the MIT License.
225 *
226 * Authors:
227@@ -68,10 +68,10 @@
228 } catch(agg::svg::exception& e) {
229 char error[1024];
230 sprintf(error, "Failed to open the file '%s' as "
231- "an SVG Document.\n\n"
232+ "an SVG document.\n\n"
233 "Error: %s", ref->name, e.msg());
234 BAlert* alert = new BAlert("load error",
235- error, "Ok", NULL, NULL,
236+ error, "OK", NULL, NULL,
237 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
238 alert->Go(NULL);
239 ret = B_ERROR;
240Index: src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp
241===================================================================
242--- src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp (Revision 34761)
243+++ src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp (Arbeitskopie)
244@@ -1,5 +1,5 @@
245 /*
246- * Copyright 2008, Haiku. All rights reserved.
247+ * Copyright 2008-2009, Haiku, Inc. All rights reserved.
248 * Distributed under the terms of the MIT License.
249 *
250 * Authors:
251@@ -248,7 +248,7 @@
252 BString str(text);
253 if (str.Length() > 50) {
254 BAlert* alert = new BAlert("too big",
255- "The text you are trying to import is quite long, are you sure ?",
256+ "The text you are trying to import is quite long, are you sure?",
257 "Yes", "No", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
258 if (alert->Go())
259 return B_CANCELED;
260Index: src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp
261===================================================================
262--- src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp (Revision 34761)
263+++ src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp (Arbeitskopie)
264@@ -1,5 +1,5 @@
265 /*
266- * Copyright 2002-2006, Stephan Aßmus <superstippi@gmx.de>
267+ * Copyright 2002-2009, Stephan Aßmus <superstippi@gmx.de>
268 * All rights reserved. Distributed under the terms of the MIT license.
269 *
270 */
271@@ -43,12 +43,12 @@
272 fMessage(message),
273 fTarget(target)
274 {
275- SetTitle("Pick Color");
276+ SetTitle("Pick a color");
277
278 fColorPickerView = new ColorPickerView("color picker", color, mode);
279
280 #if LIB_LAYOUT
281- MButton* defaultButton = new MButton("Ok", new BMessage(MSG_DONE), this);
282+ MButton* defaultButton = new MButton("OK", new BMessage(MSG_DONE), this);
283
284 // interface layout
285 BView* topView = new VGroup (
286@@ -68,7 +68,7 @@
287 );
288 #else // LIB_LAYOUT
289 frame = BRect(0, 0, 40, 15);
290- BButton* defaultButton = new BButton(frame, "ok button", "Ok",
291+ BButton* defaultButton = new BButton(frame, "ok button", "OK",
292 new BMessage(MSG_DONE),
293 B_FOLLOW_RIGHT | B_FOLLOW_TOP);
294 defaultButton->ResizeToPreferred();
295Index: src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp
296===================================================================
297--- src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp (Revision 34761)
298+++ src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp (Arbeitskopie)
299@@ -1,5 +1,5 @@
300 /*
301- * Copyright 2006-2007, Haiku Inc. All rights reserved.
302+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
303 * Distributed under the terms of the MIT License.
304 *
305 * Authors:
306@@ -321,7 +321,7 @@
307 fSelectM->AddItem(fSelectAllMI);
308 fSelectNoneMI = new BMenuItem("None", new BMessage(MSG_SELECT_NONE));
309 fSelectM->AddItem(fSelectNoneMI);
310- fInvertSelectionMI = new BMenuItem("Invert Selection", new BMessage(MSG_INVERT_SELECTION));
311+ fInvertSelectionMI = new BMenuItem("Invert selection", new BMessage(MSG_INVERT_SELECTION));
312 fSelectM->AddItem(fInvertSelectionMI);
313 fSelectM->SetTargetForItems(this);
314
315@@ -728,8 +728,8 @@
316 fPasteMI->SetEnabled(clipboardHasData);
317 // LanguageManager* m = LanguageManager::Default();
318 if (IsEditingMultipleObjects())
319-// fPasteMI->SetLabel(m->GetString(MULTI_PASTE, "Multi Paste"));
320- fPasteMI->SetLabel("Multi Paste");
321+// fPasteMI->SetLabel(m->GetString(MULTI_PASTE, "Multi paste"));
322+ fPasteMI->SetLabel("Multi paste");
323 else
324 // fPasteMI->SetLabel(m->GetString(PASTE, "Paste"));
325 fPasteMI->SetLabel("Paste");
326Index: src/apps/glteapot/TeapotWindow.cpp
327===================================================================
328--- src/apps/glteapot/TeapotWindow.cpp (Revision 34761)
329+++ src/apps/glteapot/TeapotWindow.cpp (Arbeitskopie)
330@@ -1,5 +1,6 @@
331 /*
332 Copyright 1999, Be Incorporated. All Rights Reserved.
333+ Copyright 2009, Haiku Inc.
334 This file may be used under the terms of the Be Sample Code License.
335 */
336
337@@ -50,7 +51,7 @@
338 menu->AddItem(item = new BMenuItem("Perspective", new BMessage(kMsgPerspective)));
339 item->SetTarget(fObjectView);
340 item->SetMarked(false);
341- menu->AddItem(item = new BMenuItem("FPS Display", new BMessage(kMsgFPS)));
342+ menu->AddItem(item = new BMenuItem("FPS display", new BMessage(kMsgFPS)));
343 item->SetTarget(fObjectView);
344 item->SetMarked(true);
345 menu->AddItem(item = new BMenuItem("Filled polygons", new BMessage(kMsgFilled)));
346Index: src/apps/aboutsystem/AboutSystem.cpp
347===================================================================
348--- src/apps/aboutsystem/AboutSystem.cpp (Revision 34761)
349+++ src/apps/aboutsystem/AboutSystem.cpp (Arbeitskopie)
350@@ -174,7 +174,7 @@
351
352
353 AboutWindow::AboutWindow()
354- : BWindow(BRect(0, 0, 500, 300), "About This System", B_TITLED_WINDOW,
355+ : BWindow(BRect(0, 0, 500, 300), "About this system", B_TITLED_WINDOW,
356 B_AUTO_UPDATE_SIZE_LIMITS | B_NOT_ZOOMABLE)
357 {
358 SetLayout(new BGroupLayout(B_VERTICAL));
359@@ -447,7 +447,7 @@
360 .Add(_CreateLabel("kernellabel", "Kernel:"))
361 .Add(kernelView)
362 .AddStrut(offset)
363- .Add(_CreateLabel("uptimelabel", "Time Running:"))
364+ .Add(_CreateLabel("uptimelabel", "Time running:"))
365 .Add(fUptimeView)
366 .SetInsets(5, 5, 5, 5)
367 .End()
368@@ -481,7 +481,7 @@
369 {
370 BRect r(92, 26, 105, 31);
371 if (r.Contains(point)) {
372- printf("Easter Egg\n");
373+ printf("Easter egg\n");
374 PickRandomHaiku();
375 }
376
377@@ -728,7 +728,7 @@
378 font.SetFace(B_BOLD_FACE | B_ITALIC_FACE);
379
380 fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
381- fCreditsView->Insert("Current Maintainers:\n");
382+ fCreditsView->Insert("Current maintainers:\n");
383
384 fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
385 fCreditsView->Insert(
386@@ -772,7 +772,7 @@
387 "\n");
388
389 fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
390- fCreditsView->Insert("Past Maintainers:\n");
391+ fCreditsView->Insert("Past maintainers:\n");
392
393 fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
394 fCreditsView->Insert(
395@@ -799,7 +799,7 @@
396 "\n");
397
398 fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
399- fCreditsView->Insert("Website, Marketing & Documentation:\n");
400+ fCreditsView->Insert("Website, marketing & documentation:\n");
401
402 fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
403 fCreditsView->Insert(
404@@ -924,7 +924,7 @@
405 fCreditsView->Insert("\nGerman\n\n");
406 fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
407 fCreditsView->Insert(
408- "Colin Gunther\n"
409+ "Colin Günther\n"
410 "svend\n"
411 "leszek\n"
412 );
413@@ -972,14 +972,14 @@
414 );
415
416 fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
417- fCreditsView->Insert("Special Thanks To:\n");
418+ fCreditsView->Insert("Special thanks to:\n");
419
420 fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
421 fCreditsView->Insert("Travis Geiselbrecht (and his NewOS kernel)\n");
422 fCreditsView->Insert("Michael Phipps (project founder)\n\n");
423- fCreditsView->Insert("The Haiku-Ports Team\n");
424- fCreditsView->Insert("The Haikuware Team and their Bounty Program\n");
425- fCreditsView->Insert("The BeGeistert Team\n\n");
426+ fCreditsView->Insert("The Haiku-Ports team\n");
427+ fCreditsView->Insert("The Haikuware team and their bounty program\n");
428+ fCreditsView->Insert("The BeGeistert team\n\n");
429 fCreditsView->Insert("... and the many community members making "
430 "donations!\n\n");
431
432@@ -1023,7 +1023,7 @@
433
434 // FreeBSD copyrights
435 AddCopyrightEntry("The FreeBSD Project",
436- "Contains software from the FreeBSD Project, "
437+ "Contains software from the FreeBSD Pproject, "
438 "released under the BSD licence:\n"
439 "cal, ftpd, ping, telnet, "
440 "telnetd, traceroute\n"
441@@ -1073,7 +1073,7 @@
442 // Mesa3D (http://www.mesa3d.org) copyrights
443 _AddPackageCredit(PackageCredit("Mesa")
444 .SetCopyright(COPYRIGHT_STRING "1999-2006 Brian Paul. "
445- "Mesa3D project. All rights reserved.")
446+ "Mesa3D Project. All rights reserved.")
447 .SetURL("http://www.mesa3d.org"));
448 // TODO: License!
449
450Index: src/apps/codycam/CodyCam.cpp
451===================================================================
452--- src/apps/codycam/CodyCam.cpp (Revision 34761)
453+++ src/apps/codycam/CodyCam.cpp (Arbeitskopie)
454@@ -216,7 +216,7 @@
455 }
456
457 case msg_about:
458- (new BAlert("About CodyCam", "CodyCam\n\nThe Original BeOS WebCam",
459+ (new BAlert("About CodyCam", "CodyCam\n\nThe original BeOS webcam",
460 "Close"))->Go();
461 break;
462
463@@ -241,14 +241,14 @@
464 /* find the media roster */
465 fMediaRoster = BMediaRoster::Roster(&status);
466 if (status != B_OK) {
467- ErrorAlert("Can't find the media roster", status, fWindow);
468+ ErrorAlert("Cannot find the media roster.", status, fWindow);
469 return status;
470 }
471
472 /* find the time source */
473 status = fMediaRoster->GetTimeSource(&fTimeSourceNode);
474 if (status != B_OK) {
475- ErrorAlert("Can't get a time source", status, fWindow);
476+ ErrorAlert("Cannot get a time source.", status, fWindow);
477 return status;
478 }
479
480@@ -256,7 +256,7 @@
481 INFO("CodyCam acquiring VideoInput node\n");
482 status = fMediaRoster->GetVideoInput(&fProducerNode);
483 if (status != B_OK) {
484- ErrorAlert("Can't find a video source. You need a webcam to use CodyCam.", status, fWindow);
485+ ErrorAlert("Cannot find a video source. You need a webcam to use CodyCam.", status, fWindow);
486 return status;
487 }
488
489@@ -264,14 +264,14 @@
490 fVideoConsumer = new VideoConsumer("CodyCam", ((VideoWindow*)fWindow)->VideoView(),
491 ((VideoWindow*)fWindow)->StatusLine(), NULL, 0);
492 if (!fVideoConsumer) {
493- ErrorAlert("Can't create a video window", B_ERROR, fWindow);
494+ ErrorAlert("Cannot create a video window.", B_ERROR, fWindow);
495 return B_ERROR;
496 }
497
498 /* register the node */
499 status = fMediaRoster->RegisterNode(fVideoConsumer);
500 if (status != B_OK) {
501- ErrorAlert("Can't register the video window", status, fWindow);
502+ ErrorAlert("Cannot register the video window.", status, fWindow);
503 return status;
504 }
505 fPort = fVideoConsumer->ControlPort();
506@@ -282,7 +282,7 @@
507 B_MEDIA_RAW_VIDEO);
508 if (status != B_OK || cnt < 1) {
509 status = B_RESOURCE_UNAVAILABLE;
510- ErrorAlert("Can't find an available video stream", status, fWindow);
511+ ErrorAlert("Cannot find an available video stream.", status, fWindow);
512 return status;
513 }
514
515@@ -292,7 +292,7 @@
516 &cnt, B_MEDIA_RAW_VIDEO);
517 if (status != B_OK || cnt < 1) {
518 status = B_RESOURCE_UNAVAILABLE;
519- ErrorAlert("Can't find an available connection to the video window", status, fWindow);
520+ ErrorAlert("Cannot find an available connection to the video window.", status, fWindow);
521 return status;
522 }
523
524@@ -307,7 +307,7 @@
525 status = fMediaRoster->Connect(fProducerOut.source, fConsumerIn.destination,
526 &format, &fProducerOut, &fConsumerIn);
527 if (status != B_OK) {
528- ErrorAlert("Can't connect the video source to the video window", status);
529+ ErrorAlert("Cannot connect the video source to the video window.", status);
530 return status;
531 }
532
533@@ -315,13 +315,13 @@
534 /* set time sources */
535 status = fMediaRoster->SetTimeSourceFor(fProducerNode.node, fTimeSourceNode.node);
536 if (status != B_OK) {
537- ErrorAlert("Can't set the timesource for the video source", status);
538+ ErrorAlert("Cannot set the time source for the video source.", status);
539 return status;
540 }
541
542 status = fMediaRoster->SetTimeSourceFor(fVideoConsumer->ID(), fTimeSourceNode.node);
543 if (status != B_OK) {
544- ErrorAlert("Can't set the timesource for the video window", status);
545+ ErrorAlert("Cannot set the time source for the video window.", status);
546 return status;
547 }
548
549@@ -334,7 +334,7 @@
550 bigtime_t initLatency = 0;
551 status = fMediaRoster->GetInitialLatencyFor(fProducerNode, &initLatency);
552 if (status < B_OK) {
553- ErrorAlert("error getting initial latency for fCaptureNode", status);
554+ ErrorAlert("Error getting initial latency for fCaptureNode.", status);
555 return status;
556 }
557
558@@ -350,13 +350,13 @@
559 status = fMediaRoster->StartTimeSource(fTimeSourceNode, real);
560 if (status != B_OK) {
561 timeSource->Release();
562- ErrorAlert("cannot start time source!", status);
563+ ErrorAlert("Cannot start time source!", status);
564 return status;
565 }
566 status = fMediaRoster->SeekTimeSource(fTimeSourceNode, 0, real);
567 if (status != B_OK) {
568 timeSource->Release();
569- ErrorAlert("cannot seek time source!", status);
570+ ErrorAlert("Cannot seek time source!", status);
571 return status;
572 }
573 }
574@@ -367,12 +367,12 @@
575 /* start the nodes */
576 status = fMediaRoster->StartNode(fProducerNode, perf);
577 if (status != B_OK) {
578- ErrorAlert("Can't start the video source", status);
579+ ErrorAlert("Cannot start the video source.", status);
580 return status;
581 }
582 status = fMediaRoster->StartNode(fVideoConsumer->Node(), perf);
583 if (status != B_OK) {
584- ErrorAlert("Can't start the video window", status);
585+ ErrorAlert("Cannot start the video window.", status);
586 return status;
587 }
588
589@@ -438,23 +438,23 @@
590 BMenuItem* menuItem;
591 BMenu* menu = new BMenu("File");
592
593- menuItem = new BMenuItem("Video Preferences", new BMessage(msg_video), 'P');
594+ menuItem = new BMenuItem("Video settings", new BMessage(msg_video), 'P');
595 menuItem->SetTarget(be_app);
596 menu->AddItem(menuItem);
597
598 menu->AddSeparatorItem();
599
600- menuItem = new BMenuItem("Start Video", new BMessage(msg_start), 'A');
601+ menuItem = new BMenuItem("Start video", new BMessage(msg_start), 'A');
602 menuItem->SetTarget(be_app);
603 menu->AddItem(menuItem);
604
605- menuItem = new BMenuItem("Stop Video", new BMessage(msg_stop), 'O');
606+ menuItem = new BMenuItem("Stop video", new BMessage(msg_stop), 'O');
607 menuItem->SetTarget(be_app);
608 menu->AddItem(menuItem);
609
610 menu->AddSeparatorItem();
611
612- menuItem = new BMenuItem("About Codycam", new BMessage(msg_about), 'B');
613+ menuItem = new BMenuItem("About Codycam" B_UTF8_ELLIPSIS, new BMessage(msg_about), 'B');
614 menuItem->SetTarget(be_app);
615 menu->AddItem(menuItem);
616
617@@ -676,8 +676,8 @@
618 && fImageFormatMenu->FindItem(fImageFormatSettings->Value()) != NULL) {
619 fImageFormatMenu->FindItem(
620 fImageFormatSettings->Value())->SetMarked(true);
621- } else if (fImageFormatMenu->FindItem("JPEG Image") != NULL)
622- fImageFormatMenu->FindItem("JPEG Image")->SetMarked(true);
623+ } else if (fImageFormatMenu->FindItem("JPEG image") != NULL)
624+ fImageFormatMenu->FindItem("JPEG image")->SetMarked(true);
625 else if (fImageFormatMenu->FindItem("JPEG image") != NULL)
626 fImageFormatMenu->FindItem("JPEG image")->SetMarked(true);
627 else
628@@ -846,7 +846,7 @@
629 fFilenameSetting = new StringValueSetting("StillImageFilename",
630 "codycam.jpg", "still image filename expected", "");
631 fImageFormatSettings = new StringValueSetting("ImageFileFormat",
632- "JPEG Image", "image file format expected", "");
633+ "JPEG image", "image file format expected", "");
634 fCaptureRateSetting = new EnumeratedStringValueSetting("CaptureRate",
635 "Every 5 minutes", kCaptureRate, "capture rate expected",
636 "unrecognized capture rate specified");
637@@ -902,7 +902,7 @@
638
639
640 ControlWindow::ControlWindow(const BRect& frame, BView* controls, media_node node)
641- : BWindow(frame, "Video Preferences", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
642+ : BWindow(frame, "Video settings", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
643 {
644 fView = controls;
645 fNode = node;
646Index: src/apps/workspaces/Workspaces.cpp
647===================================================================
648--- src/apps/workspaces/Workspaces.cpp (Revision 34761)
649+++ src/apps/workspaces/Workspaces.cpp (Arbeitskopie)
650@@ -1,5 +1,5 @@
651 /*
652- * Copyright 2002-2008, Haiku, Inc.
653+ * Copyright 2002-2009, Haiku, Inc. All rights reserved.
654 * Copyright 2002, François Revol, revol@free.fr.
655 * This file is distributed under the terms of the MIT License.
656 *
657@@ -391,7 +391,7 @@
658 "written by François Revol, Axel Dörfler, and Matt Madia.\n\n"
659 "Copyright 2002-2008, Haiku.\n\n"
660 "Send windows behind using the Option key. "
661- "Move windows to front using the Control key.\n", "Ok");
662+ "Move windows to front using the Control key.\n", "OK");
663 BTextView *view = alert->TextView();
664 BFont font;
665
666@@ -537,7 +537,7 @@
667 menu->SetFont(be_plain_font);
668
669 // TODO: alternatively change the count here directly?
670- BMenuItem* changeItem = new BMenuItem("Change Workspace Count"
671+ BMenuItem* changeItem = new BMenuItem("Change workspace count"
672 B_UTF8_ELLIPSIS, new BMessage(kMsgChangeCount));
673 menu->AddItem(changeItem);
674
675@@ -546,28 +546,28 @@
676 BMenuItem* item;
677
678 menu->AddSeparatorItem();
679- menu->AddItem(item = new BMenuItem("Show Window Title",
680+ menu->AddItem(item = new BMenuItem("Show window title",
681 new BMessage(kMsgToggleTitle)));
682 if (window->Look() == B_TITLED_WINDOW_LOOK)
683 item->SetMarked(true);
684- menu->AddItem(item = new BMenuItem("Show Window Border",
685+ menu->AddItem(item = new BMenuItem("Show window border",
686 new BMessage(kMsgToggleBorder)));
687 if (window->Look() == B_TITLED_WINDOW_LOOK
688 || window->Look() == B_MODAL_WINDOW_LOOK)
689 item->SetMarked(true);
690
691 menu->AddSeparatorItem();
692- menu->AddItem(item = new BMenuItem("Always On Top",
693+ menu->AddItem(item = new BMenuItem("Always on top",
694 new BMessage(kMsgToggleAlwaysOnTop)));
695 if (window->Feel() == B_FLOATING_ALL_WINDOW_FEEL)
696 item->SetMarked(true);
697- menu->AddItem(item = new BMenuItem("Auto Raise",
698+ menu->AddItem(item = new BMenuItem("Auto-raise",
699 new BMessage(kMsgToggleAutoRaise)));
700 if (window->IsAutoRaising())
701 item->SetMarked(true);
702
703 menu->AddSeparatorItem();
704- menu->AddItem(new BMenuItem("About" B_UTF8_ELLIPSIS,
705+ menu->AddItem(new BMenuItem("About Workspaces" B_UTF8_ELLIPSIS,
706 new BMessage(B_ABOUT_REQUESTED)));
707 menu->AddItem(new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED)));
708 menu->SetTargetForItems(window);
709Index: src/apps/diskprobe/ProbeView.cpp
710===================================================================
711--- src/apps/diskprobe/ProbeView.cpp (Revision 34761)
712+++ src/apps/diskprobe/ProbeView.cpp (Arbeitskopie)
713@@ -519,7 +519,7 @@
714 if (editor.IsAttribute()) {
715 top += 3;
716 stringView = new BStringView(BRect(50, top, frame.right, top + 15),
717- B_EMPTY_STRING, "Attribute Type: ");
718+ B_EMPTY_STRING, "Attribute type: ");
719 stringView->SetFont(&boldFont);
720 stringView->ResizeToPreferred();
721 AddChild(stringView);
722@@ -590,8 +590,8 @@
723 rect.left = rect.right + 4;
724 rect.right = frame.right;
725 stringView = new BStringView(rect, B_EMPTY_STRING, editor.IsAttribute()
726- ? "Attribute Offset: " : editor.IsDevice()
727- ? "Device Offset: " : "File Offset: ");
728+ ? "Attribute offset: " : editor.IsDevice()
729+ ? "Device offset: " : "File offset: ");
730 stringView->SetFont(&boldFont);
731 stringView->ResizeToPreferred();
732 AddChild(stringView);
733@@ -1092,7 +1092,7 @@
734 // If the user had to wait more than 8 seconds for the result,
735 // we are trying to please him with a requester...
736 (new BAlert("DiskProbe request",
737- "Could not find search string.", "Ok", NULL, NULL,
738+ "Could not find search string.", "OK", NULL, NULL,
739 B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL);
740 } else
741 beep();
742@@ -1119,7 +1119,7 @@
743
744 fTypeEditorView = GetTypeEditorAt(index, Frame(), editor);
745 if (fTypeEditorView == NULL) {
746- AddChild(new BStringView(Bounds(), "Type Editor",
747+ AddChild(new BStringView(Bounds(), "Type editor",
748 "Type editor not supported", B_FOLLOW_NONE));
749 } else
750 AddChild(fTypeEditorView);
751@@ -1323,7 +1323,7 @@
752 ProbeView::AddPrintMenuItems(BMenu* menu, int32 index)
753 {
754 BMenuItem *item;
755- menu->AddItem(item = new BMenuItem("Page Setup" B_UTF8_ELLIPSIS,
756+ menu->AddItem(item = new BMenuItem("Page setup" B_UTF8_ELLIPSIS,
757 new BMessage(kMsgPageSetup)), index++);
758 item->SetTarget(this);
759 menu->AddItem(item = new BMenuItem("Print" B_UTF8_ELLIPSIS,
760@@ -1427,14 +1427,14 @@
761 'V'));
762 fPasteMenuItem->SetTarget(NULL, Window());
763 _CheckClipboard();
764- menu->AddItem(item = new BMenuItem("Select All", new BMessage(B_SELECT_ALL),
765+ menu->AddItem(item = new BMenuItem("Select all", new BMessage(B_SELECT_ALL),
766 'A'));
767 item->SetTarget(NULL, Window());
768 menu->AddSeparatorItem();
769 menu->AddItem(item = new BMenuItem("Find" B_UTF8_ELLIPSIS,
770 new BMessage(kMsgOpenFindWindow), 'F'));
771 item->SetTarget(this);
772- menu->AddItem(fFindAgainMenuItem = new BMenuItem("Find Again",
773+ menu->AddItem(fFindAgainMenuItem = new BMenuItem("Find again",
774 new BMessage(kMsgFind), 'G'));
775 fFindAgainMenuItem->SetEnabled(false);
776 fFindAgainMenuItem->SetTarget(this);
777@@ -1546,7 +1546,7 @@
778
779 // Font Size
780
781- subMenu = new BMenu("Font Size");
782+ subMenu = new BMenu("Font size");
783 subMenu->SetRadioMode(true);
784 const int32 fontSizes[] = {9, 10, 11, 12, 13, 14, 18, 24, 36, 48};
785 int32 fontSize = int32(fDataView->FontSize() + 0.5);
786@@ -1841,7 +1841,7 @@
787 strerror(status));
788
789 (new BAlert("DiskProbe request",
790- buffer, "Ok", NULL, NULL,
791+ buffer, "OK", NULL, NULL,
792 B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL);
793
794 return status;
795@@ -1857,7 +1857,7 @@
796 return true;
797
798 int32 chosen = (new BAlert("DiskProbe request",
799- "Save changes before closing?", "Don't Save", "Cancel", "Save",
800+ "Save changes before closing?", "Don't save", "Cancel", "Save",
801 B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
802
803 if (chosen == 0)
804Index: src/apps/diskprobe/FileWindow.cpp
805===================================================================
806--- src/apps/diskprobe/FileWindow.cpp (Revision 34761)
807+++ src/apps/diskprobe/FileWindow.cpp (Arbeitskopie)
808@@ -1,5 +1,5 @@
809 /*
810- * Copyright 2004-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
811+ * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
812 * Distributed under the terms of the MIT License.
813 */
814
815@@ -50,12 +50,12 @@
816 menu->AddItem(new BMenuItem("New" B_UTF8_ELLIPSIS,
817 new BMessage(kMsgOpenOpenWindow), 'N', B_COMMAND_KEY));
818
819- BMenu *devicesMenu = new BMenu("Open Device");
820+ BMenu *devicesMenu = new BMenu("Open device");
821 OpenWindow::CollectDevices(devicesMenu);
822 devicesMenu->SetTargetForItems(be_app);
823 menu->AddItem(new BMenuItem(devicesMenu));
824
825- BMenu *recentsMenu = BRecentFilesList::NewFileListMenu("Open File" B_UTF8_ELLIPSIS,
826+ BMenu *recentsMenu = BRecentFilesList::NewFileListMenu("Open file" B_UTF8_ELLIPSIS,
827 NULL, NULL, be_app, 10, false, NULL, kSignature);
828 BMenuItem *item;
829 menu->AddItem(item = new BMenuItem(recentsMenu, new BMessage(kMsgOpenFilePanel)));
830Index: src/apps/diskprobe/TypeEditors.cpp
831===================================================================
832--- src/apps/diskprobe/TypeEditors.cpp (Revision 34761)
833+++ src/apps/diskprobe/TypeEditors.cpp (Arbeitskopie)
834@@ -1,5 +1,5 @@
835 /*
836- * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
837+ * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
838 * Distributed under the terms of the MIT License.
839 */
840
841@@ -191,7 +191,7 @@
842
843
844 StringEditor::StringEditor(BRect rect, DataEditor& editor)
845- : TypeEditorView(rect, "String Editor", B_FOLLOW_ALL, 0, editor)
846+ : TypeEditorView(rect, "String editor", B_FOLLOW_ALL, 0, editor)
847 {
848 SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
849
850@@ -275,12 +275,12 @@
851
852
853 MimeTypeEditor::MimeTypeEditor(BRect rect, DataEditor& editor)
854- : TypeEditorView(rect, "MIME Type Editor", B_FOLLOW_LEFT_RIGHT, 0, editor)
855+ : TypeEditorView(rect, "MIME type editor", B_FOLLOW_LEFT_RIGHT, 0, editor)
856 {
857 SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
858
859 fTextControl = new BTextControl(rect.InsetByCopy(5, 5), B_EMPTY_STRING,
860- "MIME Type:", NULL, new BMessage(kMsgValueChanged), B_FOLLOW_ALL);
861+ "MIME type:", NULL, new BMessage(kMsgValueChanged), B_FOLLOW_ALL);
862 fTextControl->SetDivider(StringWidth(fTextControl->Label()) + 8);
863
864 float width, height;
865@@ -366,7 +366,7 @@
866
867
868 NumberEditor::NumberEditor(BRect rect, DataEditor &editor)
869- : TypeEditorView(rect, "Number Editor", B_FOLLOW_LEFT_RIGHT, 0, editor)
870+ : TypeEditorView(rect, "Number editor", B_FOLLOW_LEFT_RIGHT, 0, editor)
871 {
872 SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
873
874@@ -593,33 +593,33 @@
875 {
876 switch (fEditor.Type()) {
877 case B_INT8_TYPE:
878- return "8 Bit Signed Value:";
879+ return "8 bit signed value:";
880 case B_UINT8_TYPE:
881- return "8 Bit Unsigned Value:";
882+ return "8 bit unsigned value:";
883 case B_INT16_TYPE:
884- return "16 Bit Signed Value:";
885+ return "16 bit signed value:";
886 case B_UINT16_TYPE:
887- return "16 Bit Unsigned Value:";
888+ return "16 bit unsigned value:";
889 case B_INT32_TYPE:
890- return "32 Bit Signed Value:";
891+ return "32 bit signed value:";
892 case B_UINT32_TYPE:
893- return "32 Bit Unsigned Value:";
894+ return "32 bit unsigned value:";
895 case B_INT64_TYPE:
896- return "64 Bit Signed Value:";
897+ return "64 bit signed value:";
898 case B_UINT64_TYPE:
899- return "64 Bit Unsigned Value:";
900+ return "64 bit unsigned value:";
901 case B_FLOAT_TYPE:
902- return "Floating-Point Value:";
903+ return "Floating-point value:";
904 case B_DOUBLE_TYPE:
905- return "Double Precision Floating-Point Value:";
906+ return "Double precision floating-point value:";
907 case B_SSIZE_T_TYPE:
908- return "32 Bit Size or Status:";
909+ return "32 bit size or status:";
910 case B_SIZE_T_TYPE:
911- return "32 Bit Unsigned Size:";
912+ return "32 bit unsigned size:";
913 case B_OFF_T_TYPE:
914- return "64 Bit Signed Offset:";
915+ return "64 bit signed offset:";
916 case B_POINTER_TYPE:
917- return "32 Bit Unsigned Pointer:";
918+ return "32 bit unsigned pointer:";
919 default:
920 return "Number:";
921 }
922@@ -742,7 +742,7 @@
923
924
925 BooleanEditor::BooleanEditor(BRect rect, DataEditor &editor)
926- : TypeEditorView(rect, "Boolean Editor", B_FOLLOW_NONE, 0, editor)
927+ : TypeEditorView(rect, "Boolean editor", B_FOLLOW_NONE, 0, editor)
928 {
929 SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
930
931@@ -755,7 +755,7 @@
932 message->AddInt8("value", 1);
933
934 BMenuField *menuField = new BMenuField(rect.InsetByCopy(5, 5),
935- B_EMPTY_STRING, "Boolean Value:", menu, B_FOLLOW_LEFT_RIGHT);
936+ B_EMPTY_STRING, "Boolean value:", menu, B_FOLLOW_LEFT_RIGHT);
937 menuField->SetDivider(StringWidth(menuField->Label()) + 8);
938 menuField->ResizeToPreferred();
939 ResizeTo(menuField->Bounds().Width() + 10,
940@@ -839,7 +839,7 @@
941
942
943 ImageView::ImageView(BRect rect, DataEditor &editor)
944- : TypeEditorView(rect, "Image View", B_FOLLOW_NONE, B_WILL_DRAW, editor),
945+ : TypeEditorView(rect, "Image view", B_FOLLOW_NONE, B_WILL_DRAW, editor),
946 fBitmap(NULL),
947 fScaleSlider(NULL)
948 {
949@@ -848,7 +848,7 @@
950 || editor.Type() == B_VECTOR_ICON_TYPE
951 #endif
952 )
953- SetName("Icon View");
954+ SetName("Icon view");
955
956 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
957 if (editor.Type() == B_VECTOR_ICON_TYPE) {
958@@ -1020,7 +1020,7 @@
959
960 if (fBitmap != NULL) {
961 char buffer[256];
962- const char *type = "Unknown Type";
963+ const char *type = "Unknown type";
964 switch (fEditor.Type()) {
965 case B_MINI_ICON_TYPE:
966 case B_LARGE_ICON_TYPE:
967@@ -1030,10 +1030,10 @@
968 type = "Icon";
969 break;
970 case B_PNG_FORMAT:
971- type = "PNG Format";
972+ type = "PNG format";
973 break;
974 case B_MESSAGE_TYPE:
975- type = "Flattened Bitmap";
976+ type = "Flattened bitmap";
977 break;
978 default:
979 break;
980@@ -1042,29 +1042,29 @@
981 switch (fBitmap->ColorSpace()) {
982 case B_GRAY1:
983 case B_GRAY8:
984- colorSpace = "Gray Scale";
985+ colorSpace = "Grayscale";
986 break;
987 case B_CMAP8:
988- colorSpace = "8 Bit Palette";
989+ colorSpace = "8 bit palette";
990 break;
991 case B_RGB32:
992 case B_RGBA32:
993 case B_RGB32_BIG:
994 case B_RGBA32_BIG:
995- colorSpace = "32 Bit";
996+ colorSpace = "32 bit";
997 break;
998 case B_RGB15:
999 case B_RGBA15:
1000 case B_RGB15_BIG:
1001 case B_RGBA15_BIG:
1002- colorSpace = "15 Bit";
1003+ colorSpace = "15 bit";
1004 break;
1005 case B_RGB16:
1006 case B_RGB16_BIG:
1007- colorSpace = "16 Bit";
1008+ colorSpace = "16 bit";
1009 break;
1010 default:
1011- colorSpace = "Unknown Format";
1012+ colorSpace = "Unknown format";
1013 break;
1014 }
1015 snprintf(buffer, sizeof(buffer), "%s, %g x %g, %s", type,
1016Index: src/apps/diskprobe/DiskProbe.cpp
1017===================================================================
1018--- src/apps/diskprobe/DiskProbe.cpp (Revision 34761)
1019+++ src/apps/diskprobe/DiskProbe.cpp (Arbeitskopie)
1020@@ -1,5 +1,5 @@
1021 /*
1022- * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
1023+ * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
1024 * Distributed under the terms of the MIT License.
1025 */
1026
1027@@ -346,7 +346,7 @@
1028 ref.name, strerror(status));
1029
1030 (new BAlert("DiskProbe request",
1031- buffer, "Ok", NULL, NULL,
1032+ buffer, "OK", NULL, NULL,
1033 B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
1034 }
1035 }
1036@@ -465,7 +465,7 @@
1037 BAlert *alert = new BAlert("about", "DiskProbe\n"
1038 "\twritten by Axel Dörfler\n"
1039 "\tCopyright 2004-2007, Haiku.\n\n"
1040- "original Be version by Robert Polic\n", "Ok");
1041+ "Original Be version by Robert Polic\n", "OK");
1042 BTextView *view = alert->TextView();
1043 BFont font;
1044
1045Index: src/apps/diskprobe/OpenWindow.cpp
1046===================================================================
1047--- src/apps/diskprobe/OpenWindow.cpp (Revision 34761)
1048+++ src/apps/diskprobe/OpenWindow.cpp (Arbeitskopie)
1049@@ -35,13 +35,13 @@
1050 if (BMenuItem *item = fDevicesMenu->ItemAt(0))
1051 item->SetMarked(true);
1052
1053- BMenuField *field = new BMenuField("Examine Device:", fDevicesMenu, NULL);
1054+ BMenuField *field = new BMenuField("Examine device:", fDevicesMenu, NULL);
1055
1056- BButton *probeDeviceButton = new BButton("device", "Probe Device",
1057+ BButton *probeDeviceButton = new BButton("device", "Probe device",
1058 new BMessage(kMsgProbeDevice));
1059 probeDeviceButton->MakeDefault(true);
1060
1061- BButton *probeFileButton = new BButton("file", "Probe File" B_UTF8_ELLIPSIS,
1062+ BButton *probeFileButton = new BButton("file", "Probe file" B_UTF8_ELLIPSIS,
1063 new BMessage(kMsgProbeFile));
1064
1065 BButton *cancelButton = new BButton("cancel", "Cancel",
1066Index: src/apps/diskprobe/AttributeWindow.cpp
1067===================================================================
1068--- src/apps/diskprobe/AttributeWindow.cpp (Revision 34761)
1069+++ src/apps/diskprobe/AttributeWindow.cpp (Arbeitskopie)
1070@@ -1,5 +1,5 @@
1071 /*
1072- * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
1073+ * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
1074 * Distributed under the terms of the MIT License.
1075 */
1076
1077@@ -53,7 +53,7 @@
1078 {
1079 ContainerView()->MoveBy(-ContainerView()->Frame().left,
1080 TabHeight() + 1 - ContainerView()->Frame().top);
1081- fNoEditorView = new BStringView(ContainerView()->Bounds(), "Type Editor",
1082+ fNoEditorView = new BStringView(ContainerView()->Bounds(), "Type editor",
1083 "No type editor available", B_FOLLOW_NONE);
1084 fNoEditorView->ResizeToPreferred();
1085 fNoEditorView->SetAlignment(B_ALIGN_CENTER);
1086@@ -128,7 +128,7 @@
1087
1088 fRawTab = CountTabs();
1089
1090- view = new BView(BRect(0, 0, 5, 5), "Raw Editor", B_FOLLOW_NONE, 0);
1091+ view = new BView(BRect(0, 0, 5, 5), "Raw editor", B_FOLLOW_NONE, 0);
1092 view->SetViewColor(ViewColor());
1093 AddTab(view);
1094 }
1095@@ -208,7 +208,7 @@
1096 BMenu *menu = new BMenu("Attribute");
1097
1098 // the ProbeView save menu items will be inserted here
1099- menu->AddItem(new BMenuItem("Remove from File", new BMessage(kMsgRemoveAttribute)));
1100+ menu->AddItem(new BMenuItem("Remove from file", new BMessage(kMsgRemoveAttribute)));
1101 menu->AddSeparatorItem();
1102
1103 // the ProbeView print menu items will be inserted here
1104Index: src/apps/processcontroller/KernelMemoryBarMenuItem.cpp
1105===================================================================
1106--- src/apps/processcontroller/KernelMemoryBarMenuItem.cpp (Revision 34761)
1107+++ src/apps/processcontroller/KernelMemoryBarMenuItem.cpp (Arbeitskopie)
1108@@ -1,6 +1,7 @@
1109 /*
1110 ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved.
1111 Copyright (C) 2004 beunited.org
1112+ Copyright (C) 2009 Haiku, Inc. All rights reserved.
1113
1114 This library is free software; you can redistribute it and/or
1115 modify it under the terms of the GNU Lesser General Public
1116@@ -28,7 +29,7 @@
1117
1118
1119 KernelMemoryBarMenuItem::KernelMemoryBarMenuItem(system_info& systemInfo)
1120- : BMenuItem("System Resources & Caches" B_UTF8_ELLIPSIS, NULL)
1121+ : BMenuItem("System resources & caches" B_UTF8_ELLIPSIS, NULL)
1122 {
1123 fLastSum = -1;
1124 fGrenze1 = -1;
1125Index: src/apps/processcontroller/PriorityMenu.cpp
1126===================================================================
1127--- src/apps/processcontroller/PriorityMenu.cpp (Revision 34761)
1128+++ src/apps/processcontroller/PriorityMenu.cpp (Arbeitskopie)
1129@@ -1,7 +1,8 @@
1130 /*
1131 ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved.
1132 Copyright (C) 2004 beunited.org
1133-
1134+ Copyright (C) 2009 Haiku, Inc. All rights reserved.
1135+
1136 This library is free software; you can redistribute it and/or
1137 modify it under the terms of the GNU Lesser General Public
1138 License as published by the Free Software Foundation; either
1139@@ -54,14 +55,14 @@
1140
1141 static PriorityRec priorities[] = {
1142 {"Idle", 0},
1143- {"Lowest Active", 1},
1144+ {"Lowest active", 1},
1145 {"Low", 5},
1146 {"Normal", 10},
1147 {"Display", 15},
1148- {"Urgent Display", 20},
1149- {"Real Time Display", 100},
1150+ {"Urgent display", 20},
1151+ {"Real-time display", 100},
1152 {"Urgent", 110},
1153- {"Real Time", 120},
1154+ {"Real-time", 120},
1155 {"", -1}
1156 };
1157
1158@@ -88,7 +89,7 @@
1159 message = new BMessage('PrTh');
1160 message->AddInt32("thread", fThreadID);
1161 message->AddInt32("priority", priority->priority);
1162- sprintf(name, "%s Priority [%d]", priority->name, (int)priority->priority);
1163+ sprintf(name, "%s priority [%d]", priority->name, (int)priority->priority);
1164 item = new BMenuItem(name, message);
1165 item->SetTarget(gPCView);
1166 if (fPriority == priority->priority)
1167Index: src/apps/processcontroller/NoiseBarMenuItem.cpp
1168===================================================================
1169--- src/apps/processcontroller/NoiseBarMenuItem.cpp (Revision 34761)
1170+++ src/apps/processcontroller/NoiseBarMenuItem.cpp (Arbeitskopie)
1171@@ -1,7 +1,8 @@
1172 /*
1173 ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved.
1174 Copyright (C) 2004 beunited.org
1175-
1176+ Copyright (C) 2009 Haiku, Inc. All rights reserved.
1177+
1178 This library is free software; you can redistribute it and/or
1179 modify it under the terms of the GNU Lesser General Public
1180 License as published by the Free Software Foundation; either
1181@@ -25,7 +26,7 @@
1182
1183
1184 NoiseBarMenuItem::NoiseBarMenuItem()
1185- : BMenuItem("Gone Teams" B_UTF8_ELLIPSIS, NULL)
1186+ : BMenuItem("Gone teams" B_UTF8_ELLIPSIS, NULL)
1187 {
1188 fBusyWaiting = -1;
1189 fLost = -1;
1190Index: src/apps/processcontroller/ProcessController.cpp
1191===================================================================
1192--- src/apps/processcontroller/ProcessController.cpp (Revision 34761)
1193+++ src/apps/processcontroller/ProcessController.cpp (Arbeitskopie)
1194@@ -1,7 +1,7 @@
1195 /*
1196 ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved.
1197 Copyright (C) 2004 beunited.org
1198- Copyright (c) 2006 Haiku, Inc. All Rights Reserved.
1199+ Copyright (c) 2006-2009 Haiku, Inc. All rights reserved.
1200
1201 This library is free software; you can redistribute it and/or
1202 modify it under the terms of the GNU Lesser General Public
1203@@ -258,7 +258,7 @@
1204 if (get_team_info(team, &infos.team_info) == B_OK) {
1205 get_team_name_and_icon(infos);
1206 sprintf(question, "Do you really want to kill the team \"%s\"?", infos.team_name);
1207- alert = new BAlert("", question, "Cancel", "Yes, Kill this Team!", NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
1208+ alert = new BAlert("", question, "Cancel", "Yes, kill this team!", NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
1209 alert->SetShortcut(0, B_ESCAPE);
1210 if (alert->Go())
1211 kill_team(team);
1212@@ -275,7 +275,7 @@
1213 if (get_thread_info(thread, &thinfo) == B_OK) {
1214 #if DEBUG_THREADS
1215 sprintf(question, "What do you want to do with the thread \"%s\"?", thinfo.name);
1216- alert = new BAlert("", question, "Cancel", "Debug this Thread!", "Kill this thread!", B_WIDTH_AS_USUAL, B_STOP_ALERT);
1217+ alert = new BAlert("", question, "Cancel", "Debug this thread!", "Kill this thread!", B_WIDTH_AS_USUAL, B_STOP_ALERT);
1218 #define KILL 2
1219 #else
1220 sprintf(question, "Are you sure you want to kill the thread \"%s\"?", thinfo.name);
1221@@ -374,7 +374,7 @@
1222 BAlert *alert = new BAlert("about", "ProcessController\n\n"
1223 "Copyright 1997-2001,\n"
1224 "Georges-Edouard Berenger.\n\n"
1225- "Copyright " B_UTF8_COPYRIGHT " 2007 Haiku, Inc.\n", "Close");
1226+ "Copyright " B_UTF8_COPYRIGHT " 2007 Haiku, Inc.\n", "OK");
1227 BTextView *view = alert->TextView();
1228 BFont font;
1229
1230@@ -636,12 +636,12 @@
1231 popup->SetFont(be_plain_font);
1232
1233 // Quit section
1234- BMenu* QuitPopup = new QuitMenu("Quit an Application", infos, systemInfo.used_teams);
1235+ BMenu* QuitPopup = new QuitMenu("Quit an application", infos, systemInfo.used_teams);
1236 QuitPopup->SetFont(be_plain_font);
1237 popup->AddItem(QuitPopup);
1238
1239 // Memory Usage section
1240- MemoryBarMenu* MemoryPopup = new MemoryBarMenu("Memory Usage", infos, systemInfo);
1241+ MemoryBarMenu* MemoryPopup = new MemoryBarMenu("Memory usage", infos, systemInfo);
1242 int commitedMemory = int(systemInfo.used_pages * B_PAGE_SIZE / 1024);
1243 for (m = 0; m < systemInfo.used_teams; m++) {
1244 if (infos[m].team_info.team >= 0) {
1245@@ -654,7 +654,7 @@
1246 addtopbottom(MemoryPopup);
1247
1248 // CPU Load section
1249- TeamBarMenu* CPUPopup = new TeamBarMenu("Threads and CPU Usage", infos, systemInfo.used_teams);
1250+ TeamBarMenu* CPUPopup = new TeamBarMenu("Threads and CPU usage", infos, systemInfo.used_teams);
1251 for (m = 0; m < systemInfo.used_teams; m++) {
1252 if (infos[m].team_info.team >= 0) {
1253 ThreadBarMenu* TeamPopup = new ThreadBarMenu(infos[m].team_name, infos[m].team_info.team, infos[m].team_info.thread_count);
1254Index: src/apps/devices/DevicesApplication.cpp
1255===================================================================
1256--- src/apps/devices/DevicesApplication.cpp (Revision 34761)
1257+++ src/apps/devices/DevicesApplication.cpp (Arbeitskopie)
1258@@ -56,7 +56,7 @@
1259 "\tBased on listdev by Jérôme Duval\n"
1260 "\tand the previous Devices preference\n"
1261 "\tby Jérôme Duval and Sikosis\n"
1262- "\tCopyright 2009, Haiku Inc.\n", "Ok");
1263+ "\tCopyright 2009, Haiku Inc.\n", "OK");
1264 BTextView* view = alert->TextView();
1265 BFont font;
1266
1267Index: src/apps/devices/DevicesView.cpp
1268===================================================================
1269--- src/apps/devices/DevicesView.cpp (Revision 34761)
1270+++ src/apps/devices/DevicesView.cpp (Arbeitskopie)
1271@@ -32,11 +32,11 @@
1272 BMenuBar* menuBar = new BMenuBar("menu");
1273 BMenu* menu = new BMenu("Devices");
1274 BMenuItem* item;
1275- menu->AddItem(new BMenuItem("Refresh Devices", new BMessage(kMsgRefresh), 'R'));
1276- menu->AddItem(item = new BMenuItem("Report Compatibility",
1277+ menu->AddItem(new BMenuItem("Refresh devices", new BMessage(kMsgRefresh), 'R'));
1278+ menu->AddItem(item = new BMenuItem("Report compatibility",
1279 new BMessage(kMsgReportCompatibility)));
1280 item->SetEnabled(false);
1281- menu->AddItem(item = new BMenuItem("Generate System Information",
1282+ menu->AddItem(item = new BMenuItem("Generate system information",
1283 new BMessage(kMsgGenerateSysInfo)));
1284 item->SetEnabled(false);
1285 menu->AddSeparatorItem();
1286@@ -60,9 +60,9 @@
1287 // why? Bug? In scrollview or in outlinelistview?
1288
1289 BPopUpMenu* orderByPopupMenu = new BPopUpMenu("orderByMenu");
1290- BMenuItem* byCategory = new BMenuItem("category",
1291+ BMenuItem* byCategory = new BMenuItem("Category",
1292 new BMessage(kMsgOrderCategory));
1293- BMenuItem* byConnection = new BMenuItem("connection",
1294+ BMenuItem* byConnection = new BMenuItem("Connection",
1295 new BMessage(kMsgOrderConnection));
1296 byCategory->SetMarked(true);
1297 fOrderBy = byCategory->IsMarked() ? ORDER_BY_CATEGORY :
1298@@ -76,7 +76,7 @@
1299 fBasicTab = new BTab();
1300 fBasicView = new PropertyListPlain("basicView");
1301 fTabView->AddTab(fBasicView, fBasicTab);
1302- fBasicTab->SetLabel("Basic Information");
1303+ fBasicTab->SetLabel("Basic information");
1304
1305 fDeviceTypeTab = new BTab();
1306 fBusView = new PropertyListPlain("busView");
1307@@ -286,14 +286,14 @@
1308 // PCI bus
1309 if (attributes[i].fName == "device/pretty name"
1310 && attributes[i].fValue == "PCI") {
1311- newDevice = new Device(parent, BUS_PCI, CAT_BUS, "PCI Bus");
1312+ newDevice = new Device(parent, BUS_PCI, CAT_BUS, "PCI bus");
1313 break;
1314 }
1315
1316 // ISA bus
1317 if (attributes[i].fName == "device/bus"
1318 && attributes[i].fValue == "isa") {
1319- newDevice = new Device(parent, BUS_ISA, CAT_BUS, "ISA Bus");
1320+ newDevice = new Device(parent, BUS_ISA, CAT_BUS, "ISA bus");
1321 break;
1322 }
1323
1324@@ -306,7 +306,7 @@
1325 }
1326
1327 if (newDevice == NULL) {
1328- newDevice = new Device(parent, BUS_NONE, CAT_NONE, "Unknown Device");
1329+ newDevice = new Device(parent, BUS_NONE, CAT_NONE, "Unknown device");
1330 }
1331
1332 // Add its attributes to the device, initialize it and add to the list.
1333Index: src/apps/devices/DevicePCI.cpp
1334===================================================================
1335--- src/apps/devices/DevicePCI.cpp (Revision 34761)
1336+++ src/apps/devices/DevicePCI.cpp (Arbeitskopie)
1337@@ -74,7 +74,7 @@
1338 const char *venFull;
1339 get_vendor_info(fVendorId, &venShort, &venFull);
1340 if (!venShort && !venFull) {
1341- ManufacturerName << "Unkown";
1342+ ManufacturerName << "Unknown";
1343 } else if (venShort && venFull) {
1344 ManufacturerName << venFull << "(" << venShort << ")";
1345 } else {
1346@@ -98,7 +98,7 @@
1347 SetAttribute("Manufacturer", ManufacturerName);
1348 SetAttribute("Driver used", "Not implemented");
1349 SetAttribute("Device paths", "Not implemented");
1350- SetAttribute("Class Info", classInfo);
1351+ SetAttribute("Class info", classInfo);
1352 fCategory = (Category)fClassBaseId;
1353 BString outlineName;
1354 outlineName << ManufacturerName << " " << DeviceName;
1355Index: src/apps/launchbox/PadView.cpp
1356===================================================================
1357--- src/apps/launchbox/PadView.cpp (Revision 34761)
1358+++ src/apps/launchbox/PadView.cpp (Arbeitskopie)
1359@@ -320,7 +320,7 @@
1360 // add button
1361 BMessage* message = new BMessage(MSG_ADD_SLOT);
1362 message->AddPointer("be:source", (void*)nearestButton);
1363- BMenuItem* item = new BMenuItem("Add Button Here", message);
1364+ BMenuItem* item = new BMenuItem("Add button here", message);
1365 item->SetTarget(window);
1366 menu->AddItem(item);
1367 // button options
1368@@ -328,20 +328,20 @@
1369 // clear button
1370 message = new BMessage(MSG_CLEAR_SLOT);
1371 message->AddPointer("be:source", (void*)button);
1372- item = new BMenuItem("Clear Button", message);
1373+ item = new BMenuItem("Clear button", message);
1374 item->SetTarget(window);
1375 menu->AddItem(item);
1376 // remove button
1377 message = new BMessage(MSG_REMOVE_SLOT);
1378 message->AddPointer("be:source", (void*)button);
1379- item = new BMenuItem("Remove Button", message);
1380+ item = new BMenuItem("Remove button", message);
1381 item->SetTarget(window);
1382 menu->AddItem(item);
1383 // set button description
1384 if (button->Ref()) {
1385 message = new BMessage(MSG_SET_DESCRIPTION);
1386 message->AddPointer("be:source", (void*)button);
1387- item = new BMenuItem("Set Description"B_UTF8_ELLIPSIS, message);
1388+ item = new BMenuItem("Set description"B_UTF8_ELLIPSIS, message);
1389 item->SetTarget(window);
1390 menu->AddItem(item);
1391 }
1392@@ -353,9 +353,9 @@
1393
1394 const char* toggleLayoutLabel;
1395 if (fButtonLayout->Orientation() == B_HORIZONTAL)
1396- toggleLayoutLabel = "Vertical Layout";
1397+ toggleLayoutLabel = "Vertical layout";
1398 else
1399- toggleLayoutLabel = "Horizontal Layout";
1400+ toggleLayoutLabel = "Horizontal layout";
1401 item = new BMenuItem(toggleLayoutLabel, new BMessage(MSG_TOGGLE_LAYOUT));
1402 item->SetTarget(this);
1403 settingsM->AddItem(item);
1404@@ -374,24 +374,24 @@
1405 }
1406 settingsM->AddItem(iconSizeM);
1407
1408- item = new BMenuItem("Ignore Double-click",
1409+ item = new BMenuItem("Ignore double-click",
1410 new BMessage(MSG_SET_IGNORE_DOUBLECLICK));
1411 item->SetTarget(this);
1412 item->SetMarked(IgnoreDoubleClick());
1413 settingsM->AddItem(item);
1414
1415 uint32 what = window->Look() == B_BORDERED_WINDOW_LOOK ? MSG_SHOW_BORDER : MSG_HIDE_BORDER;
1416- item = new BMenuItem("Show Window Border", new BMessage(what));
1417+ item = new BMenuItem("Show window border", new BMessage(what));
1418 item->SetTarget(window);
1419 item->SetMarked(what == MSG_HIDE_BORDER);
1420 settingsM->AddItem(item);
1421
1422- item = new BMenuItem("Auto Raise", new BMessage(MSG_TOGGLE_AUTORAISE));
1423+ item = new BMenuItem("Auto-raise", new BMessage(MSG_TOGGLE_AUTORAISE));
1424 item->SetTarget(window);
1425 item->SetMarked(window->AutoRaise());
1426 settingsM->AddItem(item);
1427
1428- item = new BMenuItem("Show On All Workspaces", new BMessage(MSG_SHOW_ON_ALL_WORKSPACES));
1429+ item = new BMenuItem("Show on all workspaces", new BMessage(MSG_SHOW_ON_ALL_WORKSPACES));
1430 item->SetTarget(window);
1431 item->SetMarked(window->ShowOnAllWorkspaces());
1432 settingsM->AddItem(item);
1433Index: src/apps/launchbox/NamePanel.cpp
1434===================================================================
1435--- src/apps/launchbox/NamePanel.cpp (Revision 34761)
1436+++ src/apps/launchbox/NamePanel.cpp (Arbeitskopie)
1437@@ -30,7 +30,7 @@
1438 fTarget(target),
1439 fMessage(message)
1440 {
1441- BButton* defaultButton = new BButton("Ok", new BMessage(MSG_PANEL_OK));
1442+ BButton* defaultButton = new BButton("OK", new BMessage(MSG_PANEL_OK));
1443 BButton* cancelButton = new BButton("Cancel",
1444 new BMessage(MSG_PANEL_CANCEL));
1445 fNameTC = new BTextControl(label, text, NULL);
1446Index: src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp
1447===================================================================
1448--- src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp (Revision 34761)
1449+++ src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp (Arbeitskopie)
1450@@ -129,7 +129,7 @@
1451 ref.name, strerror(status));
1452
1453 (new BAlert("Debugger request",
1454- buffer, "Ok", NULL, NULL,
1455+ buffer, "OK", NULL, NULL,
1456 B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
1457 }
1458 }
1459@@ -219,7 +219,7 @@
1460 {
1461 BAlert *alert = new BAlert("about", "Debugger\n"
1462 "\twritten by Philippe Houdoin\n"
1463- "\tCopyright 2009, Haiku Inc.\n", "Ok");
1464+ "\tCopyright 2009, Haiku Inc.\n", "OK");
1465 BTextView *view = alert->TextView();
1466 BFont font;
1467
1468Index: src/apps/mandelbrot/Mandelbrot.cpp
1469===================================================================
1470--- src/apps/mandelbrot/Mandelbrot.cpp (Revision 34761)
1471+++ src/apps/mandelbrot/Mandelbrot.cpp (Arbeitskopie)
1472@@ -1,5 +1,7 @@
1473 /*
1474 Copyright 1993-1999, Be Incorporated. All Rights Reserved.
1475+ Copyright 2009, Haiku, Inc. All rights reserved.
1476+
1477 This file may be used under the terms of the Be Sample Code License.
1478 */
1479
1480@@ -56,10 +58,10 @@
1481 menuBar->AddItem(menu);
1482
1483 menu = new BMenu("Palette");
1484- menu->AddItem(new BMenuItem("Palette1", new BMessage(P1)));
1485- menu->AddItem(new BMenuItem("Palette2", new BMessage(P2)));
1486- menu->AddItem(item = new BMenuItem("Palette3", new BMessage(P3)));
1487- menu->AddItem(new BMenuItem("Palette4", new BMessage(P4)));
1488+ menu->AddItem(new BMenuItem("Palette 1", new BMessage(P1)));
1489+ menu->AddItem(new BMenuItem("Palette 2", new BMessage(P2)));
1490+ menu->AddItem(item = new BMenuItem("Palette 3", new BMessage(P3)));
1491+ menu->AddItem(new BMenuItem("Palette 4", new BMessage(P4)));
1492 menuBar->AddItem(menu);
1493
1494 item->SetMarked(true);
1495Index: src/apps/haiku3d/App.cpp
1496===================================================================
1497--- src/apps/haiku3d/App.cpp (Revision 34761)
1498+++ src/apps/haiku3d/App.cpp (Arbeitskopie)
1499@@ -39,7 +39,7 @@
1500 App::AboutRequested()
1501 {
1502 BAlert* alert;
1503- alert = new BAlert("About", "A little 3d demo", "ok");
1504+ alert = new BAlert("About", "A little 3d demo", "OK");
1505 alert->Go(NULL);
1506 }
1507
1508Index: src/apps/3dmov/GLMovStrings.h
1509===================================================================
1510--- src/apps/3dmov/GLMovStrings.h (Revision 34761)
1511+++ src/apps/3dmov/GLMovStrings.h (Arbeitskopie)
1512@@ -1,5 +1,5 @@
1513 /*
1514- * Copyright 2004-2007, Haiku Inc. All rights reserved.
1515+ * Copyright 2004-2009, Haiku Inc. All rights reserved.
1516 * Distributed under the terms of the MIT License.
1517 *
1518 * Authors:
1519@@ -10,7 +10,7 @@
1520 #define _GLMOVSTRINGS_H
1521
1522 #define STR_ABOUT_TEXT "3DMov reloaded.\n\n Demonstrates OpenGL and the Media Kit."
1523-#define STR_OK "Ok"
1524+#define STR_OK "OK"
1525
1526 #define STR_MENU "File" //not really related.... "Object" ?
1527
1528Index: src/apps/magnify/Magnify.cpp
1529===================================================================
1530--- src/apps/magnify/Magnify.cpp (Revision 34761)
1531+++ src/apps/magnify/Magnify.cpp (Arbeitskopie)
1532@@ -1,5 +1,5 @@
1533 /*
1534- * Copyright 2002-2008, Haiku, Inc. All Rights Reserved.
1535+ * Copyright 2002-2009, Haiku, Inc. All Rights Reserved.
1536 * Distributed under the terms of the MIT License.
1537 *
1538 * Updated by Sikosis (beos@gravity24hr.com)
1539@@ -132,40 +132,40 @@
1540 menu->AddItem(menuItem);
1541 menu->AddSeparatorItem();
1542
1543- menuItem = new BMenuItem("Save Image", new BMessage(msg_save),'S');
1544+ menuItem = new BMenuItem("Save image", new BMessage(msg_save),'S');
1545 menu->AddItem(menuItem);
1546-// menuItem = new BMenuItem("Save Selection", new BMessage(msg_save),'S');
1547+// menuItem = new BMenuItem("Save selection", new BMessage(msg_save),'S');
1548 // menu->AddItem(menuItem);
1549- menuItem = new BMenuItem("Copy Image", new BMessage(msg_copy_image),'C');
1550+ menuItem = new BMenuItem("Copy image", new BMessage(msg_copy_image),'C');
1551 menu->AddItem(menuItem);
1552 menu->AddSeparatorItem();
1553
1554- menuItem = new BMenuItem("Hide/Show Info", new BMessage(msg_show_info),'T');
1555+ menuItem = new BMenuItem("Hide/Show info", new BMessage(msg_show_info),'T');
1556 menu->AddItem(menuItem);
1557- menuItem = new BMenuItem("Add a Crosshair", new BMessage(msg_add_cross_hair),'H');
1558+ menuItem = new BMenuItem("Add a crosshair", new BMessage(msg_add_cross_hair),'H');
1559 menu->AddItem(menuItem);
1560- menuItem = new BMenuItem("Remove a Crosshair", new BMessage(msg_remove_cross_hair), 'H',
1561+ menuItem = new BMenuItem("Remove a crosshair", new BMessage(msg_remove_cross_hair), 'H',
1562 B_SHIFT_KEY);
1563 menu->AddItem(menuItem);
1564- menuItem = new BMenuItem("Hide/Show Grid", new BMessage(msg_toggle_grid),'G');
1565+ menuItem = new BMenuItem("Hide/Show grid", new BMessage(msg_toggle_grid),'G');
1566 menu->AddItem(menuItem);
1567 menu->AddSeparatorItem();
1568
1569 menuItem = new BMenuItem("Freeze/Unfreeze image", new BMessage(msg_freeze),'F');
1570 menu->AddItem(menuItem);
1571- menuItem = new BMenuItem("Stick Coordinates", new BMessage(msg_stick), 'I');
1572+ menuItem = new BMenuItem("Stick coordinates", new BMessage(msg_stick), 'I');
1573 menu->AddItem(menuItem);
1574 menu->AddSeparatorItem();
1575
1576- menuItem = new BMenuItem("Make Square", new BMessage(msg_make_square),'/');
1577+ menuItem = new BMenuItem("Make square", new BMessage(msg_make_square),'/');
1578 menu->AddItem(menuItem);
1579- menuItem = new BMenuItem("Decrease Window Size", new BMessage(msg_shrink),'-');
1580+ menuItem = new BMenuItem("Decrease window size", new BMessage(msg_shrink),'-');
1581 menu->AddItem(menuItem);
1582- menuItem = new BMenuItem("Increase Window Size", new BMessage(msg_grow),'+');
1583+ menuItem = new BMenuItem("Increase window size", new BMessage(msg_grow),'+');
1584 menu->AddItem(menuItem);
1585- menuItem = new BMenuItem("Decrease Pixel Size", new BMessage(msg_shrink_pixel),',');
1586+ menuItem = new BMenuItem("Decrease pixel size", new BMessage(msg_shrink_pixel),',');
1587 menu->AddItem(menuItem);
1588- menuItem = new BMenuItem("Increase Pixel Size", new BMessage(msg_grow_pixel),'.');
1589+ menuItem = new BMenuItem("Increase pixel size", new BMessage(msg_grow_pixel),'.');
1590 menu->AddItem(menuItem);
1591 }
1592
1593@@ -771,7 +771,7 @@
1594 TWindow::ShowHelp()
1595 {
1596 BRect r(0, 0, 375, 240);
1597- BWindow* w = new BWindow(r, "Magnify Help", B_TITLED_WINDOW,
1598+ BWindow* w = new BWindow(r, "Magnify help", B_TITLED_WINDOW,
1599 B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE);
1600
1601 r.right -= B_V_SCROLL_BAR_WIDTH;
1602@@ -810,7 +810,7 @@
1603 text->Insert(" freeze - freezes/unfreezes magnification of whatever the\n");
1604 text->Insert(" cursor is currently over\n");
1605 text->Insert("\n\n");
1606- text->Insert("Sizing & Resizing:\n");
1607+ text->Insert("Sizing/Resizing:\n");
1608 text->Insert(" make square - sets the width and the height to the larger\n");
1609 text->Insert(" of the two making a square image\n");
1610 text->Insert(" increase/decrease window size - grows or shrinks the window\n");
1611@@ -1013,31 +1013,31 @@
1612 if (fMainWindow)
1613 state = fMainWindow->IsActive();
1614
1615- BMenuItem* menuItem = FindItem("Hide/Show Info");
1616+ BMenuItem* menuItem = FindItem("Hide/Show info");
1617 if (menuItem)
1618 menuItem->SetEnabled(state);
1619- menuItem = FindItem("Add a Crosshair");
1620+ menuItem = FindItem("Add a crosshair");
1621 if (menuItem)
1622 menuItem->SetEnabled(state);
1623- menuItem = FindItem("Remove a Crosshair");
1624+ menuItem = FindItem("Remove a crosshair");
1625 if (menuItem)
1626 menuItem->SetEnabled(state);
1627- menuItem = FindItem("Hide/Show Grid");
1628+ menuItem = FindItem("Hide/Show grid");
1629 if (menuItem)
1630 menuItem->SetEnabled(state);
1631- menuItem = FindItem("Make Square");
1632+ menuItem = FindItem("Make square");
1633 if (menuItem)
1634 menuItem->SetEnabled(state);
1635- menuItem = FindItem("Decrease Window Size");
1636+ menuItem = FindItem("Decrease window size");
1637 if (menuItem)
1638 menuItem->SetEnabled(state);
1639- menuItem = FindItem("Increase Window Size");
1640+ menuItem = FindItem("Increase window size");
1641 if (menuItem)
1642 menuItem->SetEnabled(state);
1643- menuItem = FindItem("Decrease Pixel Size");
1644+ menuItem = FindItem("Decrease pixel size");
1645 if (menuItem)
1646 menuItem->SetEnabled(state);
1647- menuItem = FindItem("Increase Pixel Size");
1648+ menuItem = FindItem("Increase pixel size");
1649 if (menuItem)
1650 menuItem->SetEnabled(state);
1651
1652Index: src/apps/drivesetup/PartitionList.cpp
1653===================================================================
1654--- src/apps/drivesetup/PartitionList.cpp (Revision 34761)
1655+++ src/apps/drivesetup/PartitionList.cpp (Arbeitskopie)
1656@@ -249,11 +249,11 @@
1657 {
1658 AddColumn(new PartitionColumn("Device", 150, 50, 500,
1659 B_TRUNCATE_MIDDLE), kDeviceColumn);
1660- AddColumn(new PartitionColumn("Filesystem", 100, 50, 500,
1661+ AddColumn(new PartitionColumn("File system", 100, 50, 500,
1662 B_TRUNCATE_MIDDLE), kFilesystemColumn);
1663- AddColumn(new PartitionColumn("Volume Name", 130, 50, 500,
1664+ AddColumn(new PartitionColumn("Volume name", 130, 50, 500,
1665 B_TRUNCATE_MIDDLE), kVolumeNameColumn);
1666- AddColumn(new PartitionColumn("Mounted At", 100, 50, 500,
1667+ AddColumn(new PartitionColumn("Mounted at", 100, 50, 500,
1668 B_TRUNCATE_MIDDLE), kMountedAtColumn);
1669 AddColumn(new PartitionColumn("Size", 100, 50, 500,
1670 B_TRUNCATE_END, B_ALIGN_RIGHT), kSizeColumn);
1671Index: src/apps/drivesetup/MainWindow.cpp
1672===================================================================
1673--- src/apps/drivesetup/MainWindow.cpp (Revision 34761)
1674+++ src/apps/drivesetup/MainWindow.cpp (Arbeitskopie)
1675@@ -164,7 +164,7 @@
1676 fFormatMI = new BMenuItem("Format (not implemented)",
1677 new BMessage(MSG_FORMAT));
1678 fEjectMI = new BMenuItem("Eject", new BMessage(MSG_EJECT), 'E');
1679- fSurfaceTestMI = new BMenuItem("Surface Test (not implemented)",
1680+ fSurfaceTestMI = new BMenuItem("Surface test (not implemented)",
1681 new BMessage(MSG_SURFACE_TEST));
1682 fRescanMI = new BMenuItem("Rescan", new BMessage(MSG_RESCAN));
1683
1684@@ -174,7 +174,7 @@
1685
1686 fMountMI = new BMenuItem("Mount", new BMessage(MSG_MOUNT), 'M');
1687 fUnmountMI = new BMenuItem("Unmount", new BMessage(MSG_UNMOUNT), 'U');
1688- fMountAllMI = new BMenuItem("Mount All",
1689+ fMountAllMI = new BMenuItem("Mount all",
1690 new BMessage(MSG_MOUNT_ALL), 'M', B_SHIFT_KEY);
1691
1692 // Disk menu
1693@@ -622,7 +622,7 @@
1694 sprintf(message, "%s\n\nError: %s", helper.String(), strerror(error));
1695 }
1696
1697- BAlert* alert = new BAlert("error", message, "Ok", NULL, NULL,
1698+ BAlert* alert = new BAlert("error", message, "OK", NULL, NULL,
1699 B_WIDTH_FROM_WIDEST, error < B_OK ? B_STOP_ALERT : B_INFO_ALERT);
1700 alert->Go(NULL);
1701 }
1702@@ -642,7 +642,7 @@
1703
1704 BPartition* partition = disk->FindDescendant(selectedPartition);
1705 if (!partition) {
1706- _DisplayPartitionError("Unable to find the selected partition by id.");
1707+ _DisplayPartitionError("Unable to find the selected partition by ID.");
1708 return;
1709 }
1710
1711@@ -673,7 +673,7 @@
1712
1713 BPartition* partition = disk->FindDescendant(selectedPartition);
1714 if (!partition) {
1715- _DisplayPartitionError("Unable to find the selected partition by id.");
1716+ _DisplayPartitionError("Unable to find the selected partition by ID.");
1717 return;
1718 }
1719
1720@@ -757,7 +757,7 @@
1721
1722 BPartition* partition = disk->FindDescendant(selectedPartition);
1723 if (!partition) {
1724- _DisplayPartitionError("Unable to find the selected partition by id.");
1725+ _DisplayPartitionError("Unable to find the selected partition by ID.");
1726 return;
1727 }
1728
1729@@ -862,9 +862,9 @@
1730 message << "All data on the partition";
1731 if (previousName.Length() > 0)
1732 message << " \"" << previousName << "\"";
1733- message << " will be irrevertably lost if you do so!";
1734+ message << " will be irretrievably lost if you do so!";
1735 alert = new BAlert("final notice", message.String(),
1736- "Write Changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
1737+ "Write changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
1738 choice = alert->Go();
1739
1740 if (choice == 1)
1741@@ -873,7 +873,7 @@
1742 // commit
1743 ret = modificationPreparer.CommitModifications();
1744
1745- // The partition pointer is toast now! Use the partition id to
1746+ // The partition pointer is toast now! Use the partition ID to
1747 // retrieve it again.
1748 partition = disk->FindDescendant(selectedPartition);
1749
1750@@ -969,9 +969,9 @@
1751 BString message = "Are you sure you want to write the changes back to "
1752 "disk now?\n\n";
1753 message << "All data on the partition";
1754- message << " will be irrevertably lost if you do so!";
1755+ message << " will be irretrievably lost if you do so!";
1756 BAlert* alert = new BAlert("final notice", message.String(),
1757- "Write Changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
1758+ "Write changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
1759 int32 choice = alert->Go();
1760
1761 if (choice == 1)
1762@@ -1018,7 +1018,7 @@
1763
1764 BPartition* partition = disk->FindDescendant(selectedPartition);
1765 if (!partition) {
1766- _DisplayPartitionError("Unable to find the selected partition by id.");
1767+ _DisplayPartitionError("Unable to find the selected partition by ID.");
1768 return;
1769 }
1770
1771@@ -1045,9 +1045,9 @@
1772 // Warn the user one more time...
1773 BString message = "Are you sure you want to delete the selected ";
1774 message << "partition?\n\nAll data on the partition";
1775- message << " will be irrevertably lost if you do so!";
1776+ message << " will be irretrievably lost if you do so!";
1777 BAlert* alert = new BAlert("final notice", message.String(),
1778- "Delete Partition", "Cancel", NULL, B_WIDTH_FROM_WIDEST,
1779+ "Delete partition", "Cancel", NULL, B_WIDTH_FROM_WIDEST,
1780 B_WARNING_ALERT);
1781 int32 choice = alert->Go();
1782
1783Index: src/apps/drivesetup/CreateParamsPanel.cpp
1784===================================================================
1785--- src/apps/drivesetup/CreateParamsPanel.cpp (Revision 34761)
1786+++ src/apps/drivesetup/CreateParamsPanel.cpp (Arbeitskopie)
1787@@ -218,11 +218,11 @@
1788 off_t size)
1789 {
1790 // Setup the controls
1791- fSizeSlider = new SizeSlider("Slider", "Partition Size", NULL, offset,
1792+ fSizeSlider = new SizeSlider("Slider", "Partition size:", NULL, offset,
1793 offset + size);
1794 fSizeSlider->SetPosition(1.0);
1795
1796- fNameTextControl = new BTextControl("Name Control", "Partition Name",
1797+ fNameTextControl = new BTextControl("Name Control", "Partition name:",
1798 "", NULL);
1799 if (!parent->SupportsChildName())
1800 fNameTextControl->SetEnabled(false);
1801@@ -242,7 +242,7 @@
1802 item->SetMarked(true);
1803 }
1804
1805- fTypeMenuField = new BMenuField("Partition Type", fTypePopUpMenu, NULL);
1806+ fTypeMenuField = new BMenuField("Partition type:", fTypePopUpMenu, NULL);
1807
1808 fOKButton = new BButton("Create", new BMessage(MSG_OK));
1809 fCancelButton = new BButton("Cancel", new BMessage(MSG_CANCEL));
1810Index: src/apps/autoraise/AutoRaiseIcon.cpp
1811===================================================================
1812--- src/apps/autoraise/AutoRaiseIcon.cpp (Revision 34761)
1813+++ src/apps/autoraise/AutoRaiseIcon.cpp (Arbeitskopie)
1814@@ -171,7 +171,7 @@
1815 AddSeparatorItem();
1816 // AddItem(new BMenuItem("Settings...", new BMessage(OPEN_SETTINGS)));
1817
1818- AddItem(new BMenuItem("About "APP_NAME, new BMessage(B_ABOUT_REQUESTED)));
1819+ AddItem(new BMenuItem("About "APP_NAME B_UTF8_ELLIPSIS, new BMessage(B_ABOUT_REQUESTED)));
1820 AddItem(new BMenuItem("Remove from tray", new BMessage(REMOVE_FROM_TRAY)));
1821
1822 SetTargetForItems(tv);
1823@@ -543,7 +543,7 @@
1824 break;
1825 }
1826 case B_ABOUT_REQUESTED:
1827- alert = new BAlert("about box", "AutoRaise, (c) 2002, mmu_man\nEnjoy :-)", "Ok", NULL, NULL,
1828+ alert = new BAlert("about box", "AutoRaise, (c) 2002, mmu_man\nEnjoy :-)", "OK", NULL, NULL,
1829 B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_INFO_ALERT);
1830 alert->SetShortcut(0, B_ENTER);
1831 alert->Go(NULL); // use asynchronous version
1832Index: src/apps/autoraise/AutoRaiseApp.cpp
1833===================================================================
1834--- src/apps/autoraise/AutoRaiseApp.cpp (Revision 34761)
1835+++ src/apps/autoraise/AutoRaiseApp.cpp (Arbeitskopie)
1836@@ -67,7 +67,7 @@
1837 if (!_directToDeskbar)
1838 {
1839 printf("\nUsage: " APP_NAME " [options]\n\t--deskbar\twill not open window, will just put " APP_NAME " into tray\n\t--persist will put " APP_NAME " into tray such that it remains between bootings\n");
1840- BAlert *alert = new BAlert("usage box", APP_NAME ", (c) 2002, mmu_man\nUsage: " APP_NAME " [options]\n\t--deskbar\twill not open window, will just put " APP_NAME " into tray\n\t--persist will put "APP_NAME" into tray such that it remains between bootings\n", "Ok", NULL, NULL,
1841+ BAlert *alert = new BAlert("usage box", APP_NAME ", (c) 2002, mmu_man\nUsage: " APP_NAME " [options]\n\t--deskbar\twill not open window, will just put " APP_NAME " into tray\n\t--persist will put "APP_NAME" into tray such that it remains between bootings\n", "OK", NULL, NULL,
1842 B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_INFO_ALERT);
1843 alert->SetShortcut(0, B_ENTER);
1844 alert->Go();
1845Index: src/apps/mediaplayer/MainWin.cpp
1846===================================================================
1847--- src/apps/mediaplayer/MainWin.cpp (Revision 34761)
1848+++ src/apps/mediaplayer/MainWin.cpp (Arbeitskopie)
1849@@ -1071,7 +1071,7 @@
1850 fPlaylistMenu = new BMenu("Playlist"B_UTF8_ELLIPSIS);
1851 fAudioMenu = new BMenu("Audio");
1852 fVideoMenu = new BMenu("Video");
1853- fVideoAspectMenu = new BMenu("Aspect Ratio");
1854+ fVideoAspectMenu = new BMenu("Aspect ratio");
1855 fSettingsMenu = new BMenu("Settings");
1856 fAudioTrackMenu = new BMenu("Track");
1857 fVideoTrackMenu = new BMenu("Track");
1858@@ -1081,7 +1081,7 @@
1859 fMenuBar->AddItem(fVideoMenu);
1860 fMenuBar->AddItem(fSettingsMenu);
1861
1862- fFileMenu->AddItem(new BMenuItem("New Player"B_UTF8_ELLIPSIS,
1863+ fFileMenu->AddItem(new BMenuItem("New player"B_UTF8_ELLIPSIS,
1864 new BMessage(M_FILE_NEWPLAYER), 'N'));
1865 fFileMenu->AddSeparatorItem();
1866
1867@@ -1090,12 +1090,12 @@
1868 // Add recent files
1869 BRecentFilesList recentFiles(10, false, NULL, kAppSig);
1870 BMenuItem *item = new BMenuItem(recentFiles.NewFileListMenu(
1871- "Open File"B_UTF8_ELLIPSIS, new BMessage(B_REFS_RECEIVED),
1872+ "Open file"B_UTF8_ELLIPSIS, new BMessage(B_REFS_RECEIVED),
1873 NULL, this, 10, false, NULL, 0, kAppSig), new BMessage(M_FILE_OPEN));
1874 item->SetShortcut('O', 0);
1875 fFileMenu->AddItem(item);
1876
1877- fFileMenu->AddItem(new BMenuItem("File Info"B_UTF8_ELLIPSIS,
1878+ fFileMenu->AddItem(new BMenuItem("File info"B_UTF8_ELLIPSIS,
1879 new BMessage(M_FILE_INFO), 'I'));
1880 fFileMenu->AddItem(fPlaylistMenu);
1881 fPlaylistMenu->Superitem()->SetShortcut('P', B_COMMAND_KEY);
1882@@ -1136,7 +1136,7 @@
1883
1884 fVideoMenu->AddSeparatorItem();
1885
1886- fVideoMenu->AddItem(new BMenuItem("Full Screen",
1887+ fVideoMenu->AddItem(new BMenuItem("Full screen",
1888 new BMessage(M_TOGGLE_FULLSCREEN), 'F'));
1889
1890 fVideoMenu->AddSeparatorItem();
1891@@ -1144,10 +1144,10 @@
1892 _SetupVideoAspectItems(fVideoAspectMenu);
1893 fVideoMenu->AddItem(fVideoAspectMenu);
1894
1895- fNoInterfaceMenuItem = new BMenuItem("No Interface",
1896+ fNoInterfaceMenuItem = new BMenuItem("No interface",
1897 new BMessage(M_TOGGLE_NO_INTERFACE), 'B');
1898 fSettingsMenu->AddItem(fNoInterfaceMenuItem);
1899- fSettingsMenu->AddItem(new BMenuItem("Always on Top",
1900+ fSettingsMenu->AddItem(new BMenuItem("Always on top",
1901 new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T'));
1902 fSettingsMenu->AddSeparatorItem();
1903 item = new BMenuItem("Settings"B_UTF8_ELLIPSIS,
1904@@ -1176,12 +1176,12 @@
1905 // "Stream Settings" and "16 : 9" if the stream settings happen to
1906 // be "16 : 9".
1907
1908- menu->AddItem(item = new BMenuItem("Stream Settings",
1909+ menu->AddItem(item = new BMenuItem("Stream settings",
1910 new BMessage(M_ASPECT_SAME_AS_SOURCE)));
1911 item->SetMarked(widthAspect == fWidthAspect
1912 && heightAspect == fHeightAspect);
1913
1914- menu->AddItem(item = new BMenuItem("No Aspect Correction",
1915+ menu->AddItem(item = new BMenuItem("No aspect correction",
1916 new BMessage(M_ASPECT_NO_DISTORTION)));
1917 item->SetMarked(width == fWidthAspect && height == fHeightAspect);
1918
1919@@ -1546,18 +1546,18 @@
1920 printf("Show context menu\n");
1921 BPopUpMenu *menu = new BPopUpMenu("context menu", false, false);
1922 BMenuItem *item;
1923- menu->AddItem(item = new BMenuItem("Full Screen",
1924+ menu->AddItem(item = new BMenuItem("Full screen",
1925 new BMessage(M_TOGGLE_FULLSCREEN), 'F'));
1926 item->SetMarked(fIsFullscreen);
1927 item->SetEnabled(fHasVideo);
1928
1929- BMenu* aspectSubMenu = new BMenu("Aspect Ratio");
1930+ BMenu* aspectSubMenu = new BMenu("Aspect ratio");
1931 _SetupVideoAspectItems(aspectSubMenu);
1932 aspectSubMenu->SetTargetForItems(this);
1933 menu->AddItem(item = new BMenuItem(aspectSubMenu));
1934 item->SetEnabled(fHasVideo);
1935
1936- menu->AddItem(item = new BMenuItem("No Interface",
1937+ menu->AddItem(item = new BMenuItem("No interface",
1938 new BMessage(M_TOGGLE_NO_INTERFACE), 'B'));
1939 item->SetMarked(fNoInterface);
1940 item->SetEnabled(fHasVideo);
1941@@ -1565,8 +1565,8 @@
1942 menu->AddSeparatorItem();
1943
1944 // Add track selector menus
1945- BMenu* audioTrackMenu = new BMenu("Audio Track");
1946- BMenu* videoTrackMenu = new BMenu("Video Track");
1947+ BMenu* audioTrackMenu = new BMenu("Audio track");
1948+ BMenu* videoTrackMenu = new BMenu("Video track");
1949 _SetupTrackMenus(audioTrackMenu, videoTrackMenu);
1950
1951 audioTrackMenu->SetTargetForItems(this);
1952Index: src/apps/mediaplayer/InfoWin.cpp
1953===================================================================
1954--- src/apps/mediaplayer/InfoWin.cpp (Revision 34761)
1955+++ src/apps/mediaplayer/InfoWin.cpp (Arbeitskopie)
1956@@ -1,7 +1,7 @@
1957 /*
1958 * InfoWin.cpp - Media Player for the Haiku Operating System
1959 *
1960- * Copyright (C) 2006 Marcus Overhagen <marcus@overhagen.de>
1961+ * Copyright (C) 2006-2009 Marcus Overhagen <marcus@overhagen.de>
1962 *
1963 * This program is free software; you can redistribute it and/or
1964 * modify it under the terms of the GNU General Public License
1965@@ -415,7 +415,7 @@
1966 fContentsView->Insert(s.String());
1967 // TODO: demux/video/audio/... perfs (Kb/s)
1968
1969- fLabelsView->Insert("Display Mode\n");
1970+ fLabelsView->Insert("Display mode\n");
1971 if (fController->IsOverlayActive())
1972 fContentsView->Insert("Overlay\n");
1973 else
1974Index: src/apps/mediaplayer/settings/SettingsWindow.cpp
1975===================================================================
1976--- src/apps/mediaplayer/settings/SettingsWindow.cpp (Revision 34761)
1977+++ src/apps/mediaplayer/settings/SettingsWindow.cpp (Arbeitskopie)
1978@@ -1,5 +1,5 @@
1979 /*
1980- * Copyright 2008, Haiku. All rights reserved.
1981+ * Copyright 2008-2009, Haiku, Inc. All rights reserved.
1982 * Distributed under the terms of the MIT License.
1983 *
1984 * Authors:
1985@@ -46,7 +46,7 @@
1986 #define BUTTONHEIGHT 20
1987
1988 SettingsWindow::SettingsWindow(BRect frame)
1989- : BWindow(frame, "MediaPlayer Settings", B_FLOATING_WINDOW_LOOK,
1990+ : BWindow(frame, "MediaPlayer settings", B_FLOATING_WINDOW_LOOK,
1991 B_FLOATING_APP_WINDOW_FEEL,
1992 B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE
1993 #ifdef __HAIKU__
1994@@ -115,7 +115,7 @@
1995 BButton* cancelButton = new BButton("cancel", "Cancel",
1996 new BMessage(M_SETTINGS_CANCEL));
1997
1998- BButton* okButton = new BButton("ok", "Ok",
1999+ BButton* okButton = new BButton("ok", "OK",
2000 new BMessage(M_SETTINGS_SAVE));
2001 okButton->MakeDefault(true);
2002
2003Index: src/apps/mediaplayer/media_node_framework/NodeManager.cpp
2004===================================================================
2005--- src/apps/mediaplayer/media_node_framework/NodeManager.cpp (Revision 34761)
2006+++ src/apps/mediaplayer/media_node_framework/NodeManager.cpp (Arbeitskopie)
2007@@ -1,6 +1,6 @@
2008 /*
2009- * Copyright (c) 2000-2008, Ingo Weinhold <ingo_weinhold@gmx.de>,
2010- * Copyright (c) 2000-2008, Stephan Aßmus <superstippi@gmx.de>,
2011+ * Copyright (c) 2000-2009, Ingo Weinhold <ingo_weinhold@gmx.de>,
2012+ * Copyright (c) 2000-2009, Stephan Aßmus <superstippi@gmx.de>,
2013 * All Rights Reserved. Distributed under the terms of the MIT license.
2014 */
2015 #include "NodeManager.h"
2016@@ -315,7 +315,7 @@
2017 bool useOverlays)
2018 {
2019 // create the video producer node
2020- fVideoProducer = new VideoProducer(NULL, "MediaPlayer Video Out", 0,
2021+ fVideoProducer = new VideoProducer(NULL, "MediaPlayer video out", 0,
2022 this, fVideoSupplier);
2023
2024 // register the producer node
2025@@ -331,7 +331,7 @@
2026 fVideoConnection.producer = fVideoProducer->Node();
2027
2028 // create the video consumer node
2029- fVideoConsumer = new VideoConsumer("MediaPlayer Video In", NULL, 0, this,
2030+ fVideoConsumer = new VideoConsumer("MediaPlayer video in", NULL, 0, this,
2031 fVideoTarget);
2032
2033 // register the consumer node
2034@@ -448,7 +448,7 @@
2035 status_t
2036 NodeManager::_SetUpAudioNodes(float audioFrameRate, uint32 audioChannels)
2037 {
2038- fAudioProducer = new AudioProducer("MediaPlayer Audio Out", fAudioSupplier);
2039+ fAudioProducer = new AudioProducer("MediaPlayer audio out", fAudioSupplier);
2040 fAudioProducer->SetPeakListener(fPeakListener);
2041 fStatus = fMediaRoster->RegisterNode(fAudioProducer);
2042 if (fStatus != B_OK) {
2043Index: src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp
2044===================================================================
2045--- src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp (Revision 34761)
2046+++ src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp (Arbeitskopie)
2047@@ -44,7 +44,7 @@
2048 fNewCount = temp.CountItems();
2049 if (fNewCount <= 0) {
2050 BAlert* alert = new BAlert("Nothing to Play", "None of the files "
2051- "you wanted to play appear to be media files.", "Ok");
2052+ "you wanted to play appear to be media files.", "OK");
2053 alert->Go(NULL);
2054 return;
2055 }
2056Index: src/apps/mediaplayer/playlist/PlaylistWindow.cpp
2057===================================================================
2058--- src/apps/mediaplayer/playlist/PlaylistWindow.cpp (Revision 34761)
2059+++ src/apps/mediaplayer/playlist/PlaylistWindow.cpp (Arbeitskopie)
2060@@ -228,7 +228,7 @@
2061 menuBar->AddItem(fileMenu);
2062 fileMenu->AddItem(new BMenuItem("Open"B_UTF8_ELLIPSIS,
2063 new BMessage(M_PLAYLIST_OPEN), 'O'));
2064- fileMenu->AddItem(new BMenuItem("Save As"B_UTF8_ELLIPSIS,
2065+ fileMenu->AddItem(new BMenuItem("Save as"B_UTF8_ELLIPSIS,
2066 new BMessage(M_PLAYLIST_SAVE_AS), 'S', B_SHIFT_KEY));
2067 // fileMenu->AddItem(new BMenuItem("Save",
2068 // new BMessage(M_PLAYLIST_SAVE), 'S'));
2069@@ -249,9 +249,9 @@
2070 editMenu->AddSeparatorItem();
2071 editMenu->AddItem(new BMenuItem("Remove (Del)",
2072 new BMessage(M_PLAYLIST_REMOVE)/*, B_DELETE, 0*/));
2073- editMenu->AddItem(new BMenuItem("Remove and Put into Trash",
2074+ editMenu->AddItem(new BMenuItem("Remove and put into Trash",
2075 new BMessage(M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH), 'T'));
2076- editMenu->AddItem(new BMenuItem("Remove All",
2077+ editMenu->AddItem(new BMenuItem("Remove all",
2078 new BMessage(M_PLAYLIST_EMPTY), 'N'));
2079
2080 menuBar->AddItem(editMenu);
2081@@ -292,7 +292,7 @@
2082 static void
2083 display_save_alert(const char* message)
2084 {
2085- BAlert* alert = new BAlert("Save Error", message, "Ok", NULL, NULL,
2086+ BAlert* alert = new BAlert("Save error", message, "OK", NULL, NULL,
2087 B_WIDTH_AS_USUAL, B_STOP_ALERT);
2088 alert->Go(NULL);
2089 }
2090@@ -315,7 +315,7 @@
2091 if (message->FindRef("directory", &ref) != B_OK
2092 || message->FindString("name", &name) != B_OK) {
2093 display_save_alert("Internal error (malformed message). "
2094- "Saving the Playlist failed.");
2095+ "Saving the playlist failed.");
2096 return;
2097 }
2098
2099@@ -328,7 +328,7 @@
2100 || origPath.Append(name) != B_OK
2101 || tempPath.Append(tempName.String()) != B_OK) {
2102 display_save_alert("Internal error (out of memory). "
2103- "Saving the Playlist failed.");
2104+ "Saving the playlist failed.");
2105 return;
2106 }
2107
2108@@ -336,7 +336,7 @@
2109 BEntry tempEntry(tempPath.Path());
2110 if (origEntry.InitCheck() != B_OK || tempEntry.InitCheck() != B_OK) {
2111 display_save_alert("Internal error (out of memory). "
2112- "Saving the Playlist failed.");
2113+ "Saving the playlist failed.");
2114 return;
2115 }
2116
2117@@ -393,7 +393,7 @@
2118 AutoLocker<Playlist> lock(fPlaylist);
2119 if (!lock.IsLocked()) {
2120 display_save_alert("Internal error (locking failed). "
2121- "Saving the Playlist failed.");
2122+ "Saving the playlist failed.");
2123 return;
2124 }
2125
2126Index: src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp
2127===================================================================
2128--- src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp (Revision 34761)
2129+++ src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp (Arbeitskopie)
2130@@ -109,10 +109,10 @@
2131 message << "All ";
2132 else
2133 message << "Some ";
2134- message << "files could not be moved into the Trash.\n\n";
2135+ message << "files could not be moved into Trash.\n\n";
2136 message << "Error: " << strerror(moveError);
2137 (new BAlert("Move Into Trash Error", message.String(),
2138- "Ok", NULL, NULL, B_WIDTH_AS_USUAL,
2139+ "OK", NULL, NULL, B_WIDTH_AS_USUAL,
2140 B_WARNING_ALERT))->Go(NULL);
2141 }
2142 }
2143Index: src/apps/mediaplayer/MainApp.cpp
2144===================================================================
2145--- src/apps/mediaplayer/MainApp.cpp (Revision 34761)
2146+++ src/apps/mediaplayer/MainApp.cpp (Arbeitskopie)
2147@@ -2,7 +2,7 @@
2148 * MainApp.cpp - Media Player for the Haiku Operating System
2149 *
2150 * Copyright (C) 2006 Marcus Overhagen <marcus@overhagen.de>
2151- * Copyright (C) 2008 Stephan Aßmus <superstippi@gmx.de> (MIT Ok)
2152+ * Copyright (C) 2009 Stephan Aßmus <superstippi@gmx.de> (MIT Ok)
2153 *
2154 * This program is free software; you can redistribute it and/or
2155 * modify it under the terms of the GNU General Public License
2156@@ -80,8 +80,8 @@
2157
2158 if (!fMediaServerRunning || !fMediaAddOnServerRunning) {
2159 BAlert* alert = new BAlert("start_media_server",
2160- "It appears the Media Server is not running.\n"
2161- "Would you like to start it ?", "Quit", "Start Media Server", NULL,
2162+ "It appears the media server is not running.\n"
2163+ "Would you like to start it ?", "Quit", "Start media server", NULL,
2164 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
2165 if (alert->Go() == 0) {
2166 PostMessage(B_QUIT_REQUESTED);
2167@@ -344,7 +344,7 @@
2168 void
2169 MainApp::AboutRequested()
2170 {
2171- BAlert* alert = new BAlert("about", NAME"\n\n Written by Marcus Overhagen "
2172+ BAlert* alert = new BAlert("about", NAME"\n\nWritten by Marcus Overhagen "
2173 ", Stephan Aßmus and Frederik Modéen", "Thanks");
2174 alert->SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
2175 // Make sure it is on top of any player windows that may have the
2176@@ -586,7 +586,7 @@
2177 }
2178
2179 // set descriptions
2180- ret = mime.SetShortDescription("MediaPlayer Playlist");
2181+ ret = mime.SetShortDescription("MediaPlayer playlist");
2182 if (ret != B_OK) {
2183 fprintf(stderr, "Could not set short description of mime type: %s\n",
2184 strerror(ret));
2185Index: src/apps/networkstatus/NetworkStatusView.cpp
2186===================================================================
2187--- src/apps/networkstatus/NetworkStatusView.cpp (Revision 34761)
2188+++ src/apps/networkstatus/NetworkStatusView.cpp (Arbeitskopie)
2189@@ -1,5 +1,5 @@
2190 /*
2191- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
2192+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
2193 * Distributed under the terms of the MIT License.
2194 *
2195 * Authors:
2196@@ -43,7 +43,7 @@
2197
2198 static const char *kStatusDescriptions[] = {
2199 "Unknown",
2200- "No Link",
2201+ "No link",
2202 "No stateful configuration",
2203 "Configuring",
2204 "Ready"
2205@@ -346,7 +346,7 @@
2206 text += address;
2207 }
2208
2209- BAlert* alert = new BAlert(name, text.String(), "Ok");
2210+ BAlert* alert = new BAlert(name, text.String(), "OK");
2211 BTextView* view = alert->TextView();
2212 BFont font;
2213
2214@@ -382,7 +382,7 @@
2215 menu->AddSeparatorItem();
2216 //menu->AddItem(new BMenuItem("About NetworkStatus" B_UTF8_ELLIPSIS,
2217 // new BMessage(B_ABOUT_REQUESTED)));
2218- menu->AddItem(new BMenuItem("Open Networks Preferences" B_UTF8_ELLIPSIS,
2219+ menu->AddItem(new BMenuItem("Open network preferences" B_UTF8_ELLIPSIS,
2220 new BMessage(kMsgOpenNetworkPreferences)));
2221
2222 if (fInDeskbar)
2223@@ -399,7 +399,7 @@
2224 {
2225 BAlert* alert = new BAlert("about", "NetworkStatus\n"
2226 "\twritten by Axel Dörfler and Hugo Santos\n"
2227- "\tCopyright 2007, Haiku, Inc.\n", "Ok");
2228+ "\tCopyright 2007, Haiku, Inc.\n", "OK");
2229 BTextView *view = alert->TextView();
2230 BFont font;
2231
2232@@ -512,11 +512,11 @@
2233 {
2234 status_t status = be_roster->Launch("application/x-vnd.Haiku-Network");
2235 if (status != B_OK && status != B_ALREADY_RUNNING) {
2236- BString errorMessage("Launching the Network preflet failed.\n\n"
2237+ BString errorMessage("Launching the network preflet failed.\n\n"
2238 "Error: ");
2239 errorMessage << strerror(status);
2240 BAlert* alert = new BAlert("launch error", errorMessage.String(),
2241- "Ok");
2242+ "OK");
2243
2244 // asynchronous alert in order to not block replicant host application
2245 alert->Go(NULL);
2246Index: src/apps/midiplayer/MidiPlayerWindow.cpp
2247===================================================================
2248--- src/apps/midiplayer/MidiPlayerWindow.cpp (Revision 34761)
2249+++ src/apps/midiplayer/MidiPlayerWindow.cpp (Arbeitskopie)
2250@@ -1,5 +1,6 @@
2251 /*
2252- * Copyright (c) 2004 Matthijs Hollemans
2253+ * Copyright (c) 2004, Matthijs Hollemans
2254+ * Copyright (c) 2009, Haiku, Inc. All rights reserved.
2255 *
2256 * Permission is hereby granted, free of charge, to any person obtaining a
2257 * copy of this software and associated documentation files (the "Software"),
2258@@ -192,7 +193,7 @@
2259
2260 inputPopUp->AddItem(inputOff);
2261
2262- inputMenu = new BMenuField("Live Input:", inputPopUp, NULL);
2263+ inputMenu = new BMenuField("Live input:", inputPopUp, NULL);
2264 }
2265
2266 //------------------------------------------------------------------------------
2267@@ -211,7 +212,7 @@
2268 "Garage", new BMessage(MSG_REVERB_GARAGE));
2269
2270 reverbIgor = new BMenuItem(
2271- "Igor's Lab", new BMessage(MSG_REVERB_IGOR));
2272+ "Igor's lab", new BMessage(MSG_REVERB_IGOR));
2273
2274 reverbCavern = new BMenuItem(
2275 "Cavern", new BMessage(MSG_REVERB_CAVERN));
2276@@ -397,7 +398,7 @@
2277 scopeView->Invalidate();
2278
2279 (new BAlert(
2280- NULL, "Could not load song", "Okay", NULL, NULL,
2281+ NULL, "Could not load song", "OK", NULL, NULL,
2282 B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
2283 }
2284 }
2285Index: src/apps/activitymonitor/ActivityMonitor.cpp
2286===================================================================
2287--- src/apps/activitymonitor/ActivityMonitor.cpp (Revision 34761)
2288+++ src/apps/activitymonitor/ActivityMonitor.cpp (Arbeitskopie)
2289@@ -1,5 +1,5 @@
2290 /*
2291- * Copyright 2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
2292+ * Copyright 2008-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
2293 * Distributed under the terms of the MIT License.
2294 */
2295
2296@@ -63,7 +63,7 @@
2297 {
2298 BAlert *alert = new BAlert("about", "ActivityMonitor\n"
2299 "\twritten by Axel Dörfler\n"
2300- "\tCopyright 2008, Haiku Inc.\n", "Ok");
2301+ "\tCopyright 2008, Haiku Inc.\n", "OK");
2302 BTextView *view = alert->TextView();
2303 BFont font;
2304
2305Index: src/apps/activitymonitor/ActivityWindow.cpp
2306===================================================================
2307--- src/apps/activitymonitor/ActivityWindow.cpp (Revision 34761)
2308+++ src/apps/activitymonitor/ActivityWindow.cpp (Arbeitskopie)
2309@@ -116,7 +116,7 @@
2310 BMenu* menu = new BMenu("File");
2311 BMenuItem* item;
2312
2313- menu->AddItem(new BMenuItem("Add View", new BMessage(kMsgAddView)));
2314+ menu->AddItem(new BMenuItem("Add graph", new BMessage(kMsgAddView)));
2315 menu->AddSeparatorItem();
2316
2317 menu->AddItem(item = new BMenuItem("About ActivityMonitor" B_UTF8_ELLIPSIS,
2318Index: src/apps/activitymonitor/ActivityView.cpp
2319===================================================================
2320--- src/apps/activitymonitor/ActivityView.cpp (Revision 34761)
2321+++ src/apps/activitymonitor/ActivityView.cpp (Arbeitskopie)
2322@@ -978,7 +978,7 @@
2323 BPopUpMenu *menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
2324 menu->SetFont(be_plain_font);
2325
2326- BMenu* additionalMenu = new BMenu("Additional Items");
2327+ BMenu* additionalMenu = new BMenu("Additional items");
2328 additionalMenu->SetFont(be_plain_font);
2329
2330 SystemInfo info;
2331@@ -1005,7 +1005,7 @@
2332
2333 menu->AddItem(new BMenuItem(additionalMenu));
2334 menu->AddSeparatorItem();
2335- menu->AddItem(new BMenuItem(fShowLegend ? "Hide Legend" : "Show Legend",
2336+ menu->AddItem(new BMenuItem(fShowLegend ? "Hide legend" : "Show legend",
2337 new BMessage(kMsgToggleLegend)));
2338
2339 menu->SetTargetForItems(this);
2340@@ -1016,7 +1016,7 @@
2341 menu->AddSeparatorItem();
2342 BMessage* message = new BMessage(kMsgRemoveView);
2343 message->AddPointer("view", this);
2344- menu->AddItem(item = new BMenuItem("Remove View", message));
2345+ menu->AddItem(item = new BMenuItem("Remove graph", message));
2346 item->SetTarget(window);
2347 }
2348
2349Index: src/apps/activitymonitor/SettingsWindow.cpp
2350===================================================================
2351--- src/apps/activitymonitor/SettingsWindow.cpp (Revision 34761)
2352+++ src/apps/activitymonitor/SettingsWindow.cpp (Arbeitskopie)
2353@@ -70,9 +70,9 @@
2354
2355 bigtime_t interval = kUpdateIntervals[level];
2356 if ((interval % 1000) == 0)
2357- snprintf(fText, sizeof(fText), "%lld secs", interval / 1000);
2358+ snprintf(fText, sizeof(fText), "%lld sec.", interval / 1000);
2359 else
2360- snprintf(fText, sizeof(fText), "%lld msecs", interval);
2361+ snprintf(fText, sizeof(fText), "%lld ms", interval);
2362
2363 return fText;
2364 }
2365Index: src/apps/activitymonitor/DataSource.cpp
2366===================================================================
2367--- src/apps/activitymonitor/DataSource.cpp (revision 34729)
2368+++ src/apps/activitymonitor/DataSource.cpp (working copy)
2369@@ -329,7 +329,7 @@
2370 const char*
2371 UsedMemoryDataSource::Label() const
2372 {
2373- return "Used Memory";
2374+ return "Used memory";
2375 }
2376
2377
2378@@ -378,7 +378,7 @@
2379 const char*
2380 CachedMemoryDataSource::Label() const
2381 {
2382- return "Cached Memory";
2383+ return "Cached memory";
2384 }
2385
2386
2387@@ -430,7 +430,7 @@
2388 const char*
2389 SwapSpaceDataSource::Label() const
2390 {
2391- return "Swap Space";
2392+ return "Swap space";
2393 }
2394
2395
2396@@ -485,14 +485,14 @@
2397 const char*
2398 BlockCacheDataSource::Label() const
2399 {
2400- return "Block Cache Memory";
2401+ return "Block cache memory";
2402 }
2403
2404
2405 const char*
2406 BlockCacheDataSource::ShortLabel() const
2407 {
2408- return "Block Cache";
2409+ return "Block cache";
2410 }
2411
2412
2413@@ -727,7 +727,7 @@
2414 const char*
2415 RunningAppsDataSource::Label() const
2416 {
2417- return "Running Applications";
2418+ return "Running applications";
2419 }
2420
2421
2422@@ -839,7 +839,7 @@
2423 const char*
2424 CPUUsageDataSource::Name() const
2425 {
2426- return "CPU Usage";
2427+ return "CPU usage";
2428 }
2429
2430
2431@@ -873,7 +873,7 @@
2432 fLabel << " " << cpu;
2433
2434 fShortLabel = fLabel;
2435- fLabel << " Usage";
2436+ fLabel << " usage";
2437
2438 const rgb_color kColors[] = {
2439 // TODO: find some better defaults...
2440@@ -963,7 +963,7 @@
2441 const char*
2442 CPUCombinedUsageDataSource::Label() const
2443 {
2444- return "CPU Usage";
2445+ return "CPU usage";
2446 }
2447
2448
2449@@ -977,7 +977,7 @@
2450 const char*
2451 CPUCombinedUsageDataSource::Name() const
2452 {
2453- return "CPU Usage (combined)";
2454+ return "CPU usage (combined)";
2455 }
2456
2457
2458@@ -1061,21 +1061,21 @@
2459 const char*
2460 PageFaultsDataSource::Label() const
2461 {
2462- return "Page Faults";
2463+ return "Page faults";
2464 }
2465
2466
2467 const char*
2468 PageFaultsDataSource::ShortLabel() const
2469 {
2470- return "P-Faults";
2471+ return "P-faults";
2472 }
2473
2474
2475 const char*
2476 PageFaultsDataSource::Name() const
2477 {
2478- return "Page Faults";
2479+ return "Page faults";
2480 }
2481
2482
2483@@ -1176,7 +1176,7 @@
2484 const char*
2485 NetworkUsageDataSource::Name() const
2486 {
2487- return fIn ? "Network Receive" : "Network Send";
2488+ return fIn ? "Network receive" : "Network send";
2489 }
2490
2491
2492@@ -1246,7 +1246,7 @@
2493 const char*
2494 ClipboardSizeDataSource::Label() const
2495 {
2496- return fText ? "Text Clipboard Size" : "Raw Clipboard Size";
2497+ return fText ? "Text clipboard size" : "Raw clipboard size";
2498 }
2499
2500
2501@@ -1300,7 +1300,7 @@
2502 const char*
2503 MediaNodesDataSource::Label() const
2504 {
2505- return "Media Nodes";
2506+ return "Media nodes";
2507 }
2508Index: src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp
2509===================================================================
2510--- src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp (Revision 34761)
2511+++ src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp (Arbeitskopie)
2512@@ -911,14 +911,14 @@
2513 BMenuItem *item;
2514 BMessage *message = new BMessage(M_LAYOUT_CHANGED);
2515 message->AddInt32("layout", M_ICON_VIEW);
2516- menu->AddItem(item = new BMenuItem("Icon View", message));
2517+ menu->AddItem(item = new BMenuItem("Icon view", message));
2518 if (m_layout == M_ICON_VIEW)
2519 {
2520 item->SetMarked(true);
2521 }
2522 message = new BMessage(M_LAYOUT_CHANGED);
2523 message->AddInt32("layout", M_MINI_ICON_VIEW);
2524- menu->AddItem(item = new BMenuItem("Mini Icon View", message));
2525+ menu->AddItem(item = new BMenuItem("Mini icon view", message));
2526 if (m_layout == M_MINI_ICON_VIEW)
2527 {
2528 item->SetMarked(true);
2529@@ -926,10 +926,10 @@
2530 menu->AddSeparatorItem();
2531
2532 // add 'CleanUp' command
2533- menu->AddItem(new BMenuItem("Clean Up", new BMessage(M_CLEANUP_REQUESTED), 'K'));
2534+ menu->AddItem(new BMenuItem("Clean up", new BMessage(M_CLEANUP_REQUESTED), 'K'));
2535
2536 // add 'Select All' command
2537- menu->AddItem(new BMenuItem("Select All", new BMessage(M_SELECT_ALL), 'A'));
2538+ menu->AddItem(new BMenuItem("Select all", new BMessage(M_SELECT_ALL), 'A'));
2539
2540 menu->SetTargetForItems(this);
2541 ConvertToScreen(&point);
2542@@ -955,7 +955,7 @@
2543 BMessenger messenger(0, Window());
2544 if (!messenger.IsValid()
2545 || (messenger.SendMessage(&message) != B_OK)) {
2546- BAlert *alert = new BAlert("Error", text.String(), "Ok", 0, 0,
2547+ BAlert *alert = new BAlert("Error", text.String(), "OK", 0, 0,
2548 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
2549 alert->Go();
2550 }
2551@@ -1500,21 +1500,21 @@
2552 NodeRef* videoIn = manager->videoInputNode();
2553 if (videoIn)
2554 {
2555- group = manager->createGroup("Video Input");
2556+ group = manager->createGroup("Video input");
2557 group->setRunMode(BMediaNode::B_RECORDING);
2558 group->addNode(videoIn);
2559 }
2560 NodeRef* audioIn = manager->audioInputNode();
2561 if (audioIn)
2562 {
2563- group = manager->createGroup("Audio Input");
2564+ group = manager->createGroup("Audio input");
2565 group->setRunMode(BMediaNode::B_RECORDING);
2566 group->addNode(audioIn);
2567 }
2568 NodeRef* videoOut = manager->videoOutputNode();
2569 if (videoOut)
2570 {
2571- group = manager->createGroup("Video Output");
2572+ group = manager->createGroup("Video output");
2573 group->addNode(videoOut);
2574 }
2575 }
2576Index: src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp
2577===================================================================
2578--- src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp (Revision 34761)
2579+++ src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp (Arbeitskopie)
2580@@ -533,7 +533,7 @@
2581
2582 // add the "Tweak Parameters" item
2583 message = new BMessage(MediaRoutingView::M_NODE_TWEAK_PARAMETERS);
2584- menu->AddItem(item = new BMenuItem("Tweak Parameters", message, 'P'));
2585+ menu->AddItem(item = new BMenuItem("Tweak parameters", message, 'P'));
2586 if (!(ref->kind() & B_CONTROLLABLE))
2587 {
2588 item->SetEnabled(false);
2589@@ -541,7 +541,7 @@
2590
2591 message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
2592 message->AddInt32("nodeID", ref->id());
2593- menu->AddItem(new BMenuItem("Get Info", message, 'I'));
2594+ menu->AddItem(new BMenuItem("Get info", message, 'I'));
2595 menu->AddSeparatorItem();
2596
2597 menu->AddItem(item = new BMenuItem("Release", new BMessage(MediaRoutingView::M_DELETE_SELECTION), 'T'));
2598@@ -562,7 +562,7 @@
2599 }
2600
2601 // add the "Run Mode" sub menu
2602- BMenu *subMenu = new BMenu("Run Mode");
2603+ BMenu *subMenu = new BMenu("Run mode");
2604 subMenu->SetFont(be_plain_font);
2605 for (uint32 runMode = 1; runMode <= BMediaNode::B_RECORDING; runMode++)
2606 {
2607@@ -604,12 +604,12 @@
2608 message = new BMessage(MediaRoutingView::M_NODE_START_TIME_SOURCE);
2609 message->AddInt32("nodeID", ref->id());
2610 subMenu->AddItem(new BMenuItem(
2611- "Start Time Source",
2612+ "Start time source",
2613 message));
2614 message = new BMessage(MediaRoutingView::M_NODE_START_TIME_SOURCE);
2615 message->AddInt32("nodeID", ref->id());
2616 subMenu->AddItem(new BMenuItem(
2617- "Stop Time Source",
2618+ "Stop time source",
2619 message));
2620 }
2621 // [c.lenz 24dec99] support for BControllable::StartControlPanel()
2622@@ -631,7 +631,7 @@
2623 subMenu->AddSeparatorItem();
2624 subMenu->AddItem(
2625 new BMenuItem(
2626- isLocked ? "Unlock Group" : "Lock Group", message));
2627+ isLocked ? "Unlock group" : "Lock group", message));
2628 }
2629
2630 if (subMenu->CountItems() > 0)
2631Index: src/apps/cortex/MediaRoutingView/MediaWire.cpp
2632===================================================================
2633--- src/apps/cortex/MediaRoutingView/MediaWire.cpp (Revision 34761)
2634+++ src/apps/cortex/MediaRoutingView/MediaWire.cpp (Arbeitskopie)
2635@@ -291,7 +291,7 @@
2636 BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
2637 message->AddData("connection", B_RAW_TYPE,
2638 reinterpret_cast<const void *>(&output), sizeof(output));
2639- menu->AddItem(item = new BMenuItem("Get Info", message, 'I'));
2640+ menu->AddItem(item = new BMenuItem("Get info", message, 'I'));
2641
2642 // add the "Disconnect" item
2643 menu->AddItem(item = new BMenuItem("Disconnect", new BMessage(MediaRoutingView::M_DELETE_SELECTION), 'T'));
2644Index: src/apps/cortex/MediaRoutingView/MediaJack.cpp
2645===================================================================
2646--- src/apps/cortex/MediaRoutingView/MediaJack.cpp (Revision 34761)
2647+++ src/apps/cortex/MediaRoutingView/MediaJack.cpp (Arbeitskopie)
2648@@ -718,7 +718,7 @@
2649 BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
2650 message->AddData("input", B_RAW_TYPE,
2651 reinterpret_cast<const void *>(&input), sizeof(input));
2652- menu->AddItem(item = new BMenuItem("Get Info", message));
2653+ menu->AddItem(item = new BMenuItem("Get info", message));
2654 }
2655 else if (isOutput())
2656 {
2657@@ -727,7 +727,7 @@
2658 BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
2659 message->AddData("output", B_RAW_TYPE,
2660 reinterpret_cast<const void *>(&output), sizeof(output));
2661- menu->AddItem(item = new BMenuItem("Get Info", message));
2662+ menu->AddItem(item = new BMenuItem("Get info", message));
2663 }
2664
2665 menu->SetTargetForItems(view());
2666Index: src/apps/cortex/InfoView/DormantNodeInfoView.cpp
2667===================================================================
2668--- src/apps/cortex/InfoView/DormantNodeInfoView.cpp (Revision 34761)
2669+++ src/apps/cortex/InfoView/DormantNodeInfoView.cpp (Arbeitskopie)
2670@@ -22,7 +22,7 @@
2671
2672 DormantNodeInfoView::DormantNodeInfoView(
2673 const dormant_node_info &info)
2674- : InfoView(info.name, "Dormant Media Node",
2675+ : InfoView(info.name, "Dormant media node",
2676 new MediaIcon(info, B_LARGE_ICON)),
2677 m_addOnID(info.addon),
2678 m_flavorID(info.flavor_id)
2679@@ -59,9 +59,9 @@
2680 addField("Kinds", MediaString::getStringFor(static_cast<node_kind>(flavorInfo.kinds)));
2681
2682 // add "Flavor Flags" field
2683- addField("Flavor Flags", "?");
2684+ addField("Flavor flags", "?");
2685
2686- // add "Max Instances" field
2687+ // add "Max. instances" field
2688 if (flavorInfo.possible_count > 0)
2689 {
2690 s = "";
2691@@ -71,18 +71,18 @@
2692 {
2693 s = "Any number";
2694 }
2695- addField("Max Instances", s);
2696+ addField("Max. instances", s);
2697
2698 // add "Input Formats" field
2699 if (flavorInfo.in_format_count > 0)
2700 {
2701 if (flavorInfo.in_format_count == 1)
2702 {
2703- addField("Input Format", MediaString::getStringFor(flavorInfo.in_formats[0], false));
2704+ addField("Input format", MediaString::getStringFor(flavorInfo.in_formats[0], false));
2705 }
2706 else
2707 {
2708- addField("Input Formats", "");
2709+ addField("Input formats", "");
2710 for (int32 i = 0; i < flavorInfo.in_format_count; i++)
2711 {
2712 s = "";
2713@@ -97,11 +97,11 @@
2714 {
2715 if (flavorInfo.out_format_count == 1)
2716 {
2717- addField("Output Format", MediaString::getStringFor(flavorInfo.out_formats[0], false));
2718+ addField("Output format", MediaString::getStringFor(flavorInfo.out_formats[0], false));
2719 }
2720 else
2721 {
2722- addField("Output Formats", "");
2723+ addField("Output formats", "");
2724 for (int32 i = 0; i < flavorInfo.out_format_count; i++)
2725 {
2726 s = "";
2727Index: src/apps/cortex/InfoView/EndPointInfoView.cpp
2728===================================================================
2729--- src/apps/cortex/InfoView/EndPointInfoView.cpp (Revision 34761)
2730+++ src/apps/cortex/InfoView/EndPointInfoView.cpp (Arbeitskopie)
2731@@ -18,7 +18,7 @@
2732
2733 EndPointInfoView::EndPointInfoView(
2734 const media_input &input)
2735- : InfoView(input.name, "Media Input", 0),
2736+ : InfoView(input.name, "Media input", 0),
2737 m_output(false),
2738 m_port(input.destination.port),
2739 m_id(input.destination.id) {
2740@@ -37,14 +37,14 @@
2741 addField("", "");
2742
2743 // add "Media Type" field
2744- addField("Media Type", MediaString::getStringFor(input.format.type));
2745+ addField("Media type", MediaString::getStringFor(input.format.type));
2746
2747 _addFormatFields(input.format);
2748 }
2749
2750 EndPointInfoView::EndPointInfoView(
2751 const media_output &output)
2752- : InfoView(output.name, "Media Output", 0),
2753+ : InfoView(output.name, "Media output", 0),
2754 m_output(true),
2755 m_port(output.source.port),
2756 m_id(output.source.id) {
2757@@ -63,7 +63,7 @@
2758 addField("", "");
2759
2760 // add "Media Type" field
2761- addField("Media Type", MediaString::getStringFor(output.format.type));
2762+ addField("Media type", MediaString::getStringFor(output.format.type));
2763
2764 _addFormatFields(output.format);
2765 }
2766@@ -117,22 +117,22 @@
2767 addField("Format", s);
2768 // add "Sample Rate" field
2769 s = MediaString::forAudioFrameRate(format.u.raw_audio.frame_rate);
2770- addField("Sample Rate", s);
2771+ addField("Sample rate", s);
2772 // add "Channels" field
2773 s = MediaString::forAudioChannelCount(format.u.raw_audio.channel_count);
2774 addField("Channels", s);
2775 // add "Channel Mask" field
2776 s = MediaString::forAudioChannelMask(format.u.raw_audio.channel_mask);
2777- addField("Channel Mask", s);
2778+ addField("Channel mask", s);
2779 // add "Matrix Mask" field
2780 s = MediaString::forAudioMatrixMask(format.u.raw_audio.matrix_mask);
2781- addField("Matrix Mask", s);
2782+ addField("Matrix mask", s);
2783 // add the "Byte Order" field
2784 s = MediaString::forAudioByteOrder(format.u.raw_audio.byte_order);
2785- addField("Byte Order", s);
2786+ addField("Byte order", s);
2787 // add the "Buffer Size" field
2788 s = MediaString::forAudioBufferSize(format.u.raw_audio.buffer_size);
2789- addField("Buffer Size", s);
2790+ addField("Buffer size", s);
2791 break;
2792 }
2793 case B_MEDIA_RAW_VIDEO: {
2794@@ -149,18 +149,18 @@
2795 // add the "Field Rate" field
2796 s = MediaString::forVideoFieldRate(format.u.raw_video.field_rate,
2797 format.u.raw_video.interlace);
2798- addField("Field Rate", s);
2799+ addField("Field rate", s);
2800 // add the "Orientation" field
2801 s = MediaString::forVideoOrientation(format.u.raw_video.orientation);
2802 addField("Orientation", s);
2803 // add the "Aspect Ratio" field
2804 s = MediaString::forVideoAspectRatio(format.u.raw_video.pixel_width_aspect,
2805 format.u.raw_video.pixel_height_aspect);
2806- addField("Aspect Ratio", s);
2807+ addField("Aspect ratio", s);
2808 // add the "Active Lines" field
2809 s = MediaString::forVideoActiveLines(format.u.raw_video.first_active,
2810 format.u.raw_video.last_active);
2811- addField("Active Lines", s);
2812+ addField("Active lines", s);
2813 // add the "Offset" field
2814 s = MediaString::forVideoOffset(format.u.raw_video.display.pixel_offset,
2815 format.u.raw_video.display.line_offset);
2816@@ -173,10 +173,10 @@
2817 BString s;
2818 // add the "Bit Rate" field
2819 s = MediaString::forAudioBitRate(format.u.encoded_audio.bit_rate);
2820- addField("Bit Rate", s);
2821+ addField("Bit rate", s);
2822 // add the "Frame Size" field
2823 s = MediaString::forAudioFrameSize(format.u.encoded_audio.frame_size);
2824- addField("Frame Size", s);
2825+ addField("Frame size", s);
2826 break;
2827 }
2828 case B_MEDIA_ENCODED_VIDEO: {
2829@@ -186,10 +186,10 @@
2830 // add the "Bit Rate" field
2831 s = MediaString::forVideoBitRate(format.u.encoded_video.avg_bit_rate,
2832 format.u.encoded_video.max_bit_rate);
2833- addField("Bit Rate", s);
2834+ addField("Bit rate", s);
2835 // add the "Frame Size" field
2836 s = MediaString::forVideoFrameSize(format.u.encoded_video.frame_size);
2837- addField("Frame Size", s);
2838+ addField("Frame size", s);
2839 // add the "History" field
2840 s = MediaString::forVideoHistory(format.u.encoded_video.forward_history,
2841 format.u.encoded_video.backward_history);
2842@@ -206,11 +206,11 @@
2843 // add the "Bit Rate" field
2844 s = MediaString::forMultistreamBitRate(format.u.multistream.avg_bit_rate,
2845 format.u.multistream.max_bit_rate);
2846- addField("Bit Rate", s);
2847+ addField("Bit rate", s);
2848 // add the "Chunk Size" field
2849 s = MediaString::forMultistreamChunkSize(format.u.multistream.avg_chunk_size,
2850 format.u.multistream.max_chunk_size);
2851- addField("Chunk Size", s);
2852+ addField("Chunk size", s);
2853 // add the "Flags" field
2854 s = MediaString::forMultistreamFlags(format.u.multistream.flags);
2855 addField("Flags", s);
2856Index: src/apps/cortex/TransportView/TransportView.cpp
2857===================================================================
2858--- src/apps/cortex/TransportView/TransportView.cpp (Revision 34761)
2859+++ src/apps/cortex/TransportView/TransportView.cpp (Arbeitskopie)
2860@@ -525,16 +525,16 @@
2861
2862 const char _run_mode_strings[][20] = {
2863 "Offline",
2864- "Decrease Precision",
2865- "Increase Latency",
2866- "Drop Data",
2867+ "Decrease precision",
2868+ "Increase latency",
2869+ "Drop data",
2870 "Recording"
2871 };
2872 const int _run_modes = 5;
2873
2874 //const char _time_source_strings[][20] = {
2875-// "DAC Time Source",
2876-// "System Clock"
2877+// "DAC time source",
2878+// "System clock"
2879 //};
2880 //const int _time_sources = 2;
2881
2882@@ -564,7 +564,7 @@
2883 m_runModeView = new BMenuField(
2884 BRect(),
2885 "runModeView",
2886- "Run Mode:",
2887+ "Run mode:",
2888 new BPopUpMenu("runModeMenu"));
2889 _populateRunModeMenu(
2890 m_runModeView->Menu());
2891@@ -573,7 +573,7 @@
2892 m_timeSourceView = new BMenuField(
2893 BRect(),
2894 "timeSourceView",
2895- "Time Source:",
2896+ "Time source:",
2897 new BPopUpMenu("timeSourceMenu"));
2898 _populateTimeSourceMenu(
2899 m_timeSourceView->Menu());
2900@@ -706,7 +706,7 @@
2901 &dacTimeSource,
2902 sizeof(media_node));
2903 i = new BMenuItem(
2904- "DAC Time Source",
2905+ "DAC time source",
2906 m);
2907 menu->AddItem(i);
2908 _addGroupTarget(i);
2909@@ -721,7 +721,7 @@
2910 &systemTimeSource,
2911 sizeof(media_node));
2912 i = new BMenuItem(
2913- "System Clock",
2914+ "System clock",
2915 m);
2916 menu->AddItem(i);
2917 _addGroupTarget(i);
2918Index: src/apps/cortex/RouteApp/RouteAppNodeManager.cpp
2919===================================================================
2920--- src/apps/cortex/RouteApp/RouteAppNodeManager.cpp (Revision 34761)
2921+++ src/apps/cortex/RouteApp/RouteAppNodeManager.cpp (Arbeitskopie)
2922@@ -164,7 +164,7 @@
2923 if(ts->Node() != systemClock)
2924 {
2925 g->setTimeSource(ts->Node());
2926- logMsg.AddString("line", "Synced to System Clock");
2927+ logMsg.AddString("line", "Synced to system clock");
2928 }
2929 ts->Release();
2930 }
2931@@ -249,7 +249,7 @@
2932 logMsg.AddString("line", line);
2933
2934 NodeGroup *group = 0;
2935- BString groupName = "Untitled Group ";
2936+ BString groupName = "Untitled group ";
2937 if(_canGroup(producer) && _canGroup(consumer))
2938 {
2939 if (producer->group() && consumer->group() &&
2940Index: src/apps/cortex/RouteApp/RouteWindow.cpp
2941===================================================================
2942--- src/apps/cortex/RouteApp/RouteWindow.cpp (Revision 34761)
2943+++ src/apps/cortex/RouteApp/RouteWindow.cpp (Arbeitskopie)
2944@@ -78,7 +78,7 @@
2945 item->SetTarget(be_app);
2946 pFileMenu->AddItem(item);
2947 pFileMenu->AddItem(new BSeparatorItem());
2948- item = new BMenuItem("Save Nodes" B_UTF8_ELLIPSIS,
2949+ item = new BMenuItem("Save nodes" B_UTF8_ELLIPSIS,
2950 new BMessage(RouteApp::M_SHOW_SAVE_PANEL), 'S');
2951 item->SetTarget(be_app);
2952 pFileMenu->AddItem(item);
2953@@ -137,19 +137,19 @@
2954 // construct the Window menu
2955 BMenu* windowMenu = new BMenu("Window");
2956 m_transportWindowItem = new BMenuItem(
2957- "Show Transport",
2958+ "Show transport",
2959 new BMessage(M_TOGGLE_TRANSPORT_WINDOW));
2960 windowMenu->AddItem(m_transportWindowItem);
2961
2962 m_dormantNodeWindowItem = new BMenuItem(
2963- "Show Add-Ons",
2964+ "Show add-ons",
2965 new BMessage(M_TOGGLE_DORMANT_NODE_WINDOW));
2966 windowMenu->AddItem(m_dormantNodeWindowItem);
2967
2968 windowMenu->AddItem(new BSeparatorItem());
2969
2970 m_pullPalettesItem = new BMenuItem(
2971- "Pull Palettes",
2972+ "Pull palettes",
2973 new BMessage(M_TOGGLE_PULLING_PALETTES));
2974 windowMenu->AddItem(m_pullPalettesItem);
2975
2976@@ -341,7 +341,7 @@
2977 //
2978 switch (pMsg->what) {
2979 case B_ABOUT_REQUESTED:
2980- (new BAlert("About", g_aboutText, "Ok"))->Go();
2981+ (new BAlert("About", g_aboutText, "OK"))->Go();
2982 break;
2983
2984 case MediaRoutingView::M_GROUP_SELECTED:
2985Index: src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp
2986===================================================================
2987--- src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp (Revision 34761)
2988+++ src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp (Arbeitskopie)
2989@@ -34,7 +34,7 @@
2990
2991 DormantNodeWindow::DormantNodeWindow(
2992 BWindow* parent)
2993- : BWindow(s_initFrame, "Media Add-Ons",
2994+ : BWindow(s_initFrame, "Media add-ons",
2995 B_FLOATING_WINDOW_LOOK,
2996 B_FLOATING_SUBSET_WINDOW_FEEL,
2997 B_WILL_ACCEPT_FIRST_CLICK|B_AVOID_FOCUS|B_ASYNCHRONOUS_CONTROLS),
2998Index: src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp
2999===================================================================
3000--- src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp (Revision 34761)
3001+++ src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp (Arbeitskopie)
3002@@ -236,7 +236,7 @@
3003
3004 // Add the "Get Info" item
3005 BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
3006- menu->AddItem(new BMenuItem("Get Info", message));
3007+ menu->AddItem(new BMenuItem("Get info", message));
3008
3009 menu->SetTargetForItems(owner);
3010 owner->ConvertToScreen(&point);
3011Index: src/apps/cortex/addons/AudioAdapter/AudioAdapterParams.cpp
3012===================================================================
3013--- src/apps/cortex/addons/AudioAdapter/AudioAdapterParams.cpp (Revision 34761)
3014+++ src/apps/cortex/addons/AudioAdapter/AudioAdapterParams.cpp (Arbeitskopie)
3015@@ -90,7 +90,7 @@
3016 param = inputGroup->MakeDiscreteParameter(
3017 P_INPUT_FORMAT,
3018 B_MEDIA_NO_TYPE,
3019- "Sample Format",
3020+ "Sample format:",
3021 B_GENERIC);
3022 param->AddItem(
3023 0,
3024@@ -111,7 +111,7 @@
3025 param = inputGroup->MakeDiscreteParameter(
3026 P_INPUT_CHANNEL_COUNT,
3027 B_MEDIA_NO_TYPE,
3028- "Channels",
3029+ "Channels:",
3030 B_GENERIC);
3031 param->AddItem(
3032 0,
3033@@ -137,7 +137,7 @@
3034 param = outputGroup->MakeDiscreteParameter(
3035 P_OUTPUT_FORMAT,
3036 B_MEDIA_NO_TYPE,
3037- "Sample Format",
3038+ "Sample format:",
3039 B_GENERIC);
3040 param->AddItem(
3041 0,
3042@@ -158,7 +158,7 @@
3043 param = outputGroup->MakeDiscreteParameter(
3044 P_OUTPUT_CHANNEL_COUNT,
3045 B_MEDIA_NO_TYPE,
3046- "Channels",
3047+ "Channels:",
3048 B_GENERIC);
3049 param->AddItem(
3050 0,
3051Index: src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp
3052===================================================================
3053--- src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp (Revision 34761)
3054+++ src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp (Arbeitskopie)
3055@@ -28,22 +28,22 @@
3056 BParameterWeb* web = new BParameterWeb;
3057
3058 BParameterGroup* mainGroup = web->MakeGroup("LoggingConsumer Parameters");
3059- BParameterGroup* group = mainGroup->MakeGroup("Latency Control");
3060+ BParameterGroup* group = mainGroup->MakeGroup("Latency control");
3061 BParameter* nullParam = group->MakeNullParameter(INPUT_NULL_PARAM, B_MEDIA_NO_TYPE, "Latency", B_GENERIC);
3062 BParameter* latencyParam = group->MakeContinuousParameter(LATENCY_PARAM, B_MEDIA_NO_TYPE, "",
3063- B_GAIN, "msec", 5, 100, 5);
3064+ B_GAIN, "ms", 5, 100, 5);
3065 nullParam->AddOutput(latencyParam);
3066 latencyParam->AddInput(nullParam);
3067
3068- group = mainGroup->MakeGroup("CPU Percentage");
3069- nullParam = group->MakeNullParameter(CPU_NULL_PARAM, B_MEDIA_NO_TYPE, "CPU Spin Percentage", B_GENERIC);
3070+ group = mainGroup->MakeGroup("CPU percentage");
3071+ nullParam = group->MakeNullParameter(CPU_NULL_PARAM, B_MEDIA_NO_TYPE, "CPU spin percentage", B_GENERIC);
3072 BContinuousParameter* cpuParam = group->MakeContinuousParameter(CPU_SPIN_PARAM, B_MEDIA_NO_TYPE, "",
3073 B_GAIN, "percent", 5, 80, 5);
3074 nullParam->AddOutput(cpuParam);
3075 cpuParam->AddInput(nullParam);
3076
3077 group = mainGroup->MakeGroup("Priority");
3078- nullParam = group->MakeNullParameter(PRIO_NULL_PARAM, B_MEDIA_NO_TYPE, "Thread Priority", B_GENERIC);
3079+ nullParam = group->MakeNullParameter(PRIO_NULL_PARAM, B_MEDIA_NO_TYPE, "Thread priority", B_GENERIC);
3080 BDiscreteParameter* prioParam = group->MakeDiscreteParameter(PRIORITY_PARAM, B_MEDIA_NO_TYPE, "", B_GENERIC);
3081 prioParam->AddItem(5, "B_LOW_PRIORITY");
3082 prioParam->AddItem(10, "B_NORMAL_PRIORITY");
3083Index: src/apps/cortex/addons/common/MediaNodeControlApp.cpp
3084===================================================================
3085--- src/apps/cortex/addons/common/MediaNodeControlApp.cpp (Revision 34761)
3086+++ src/apps/cortex/addons/common/MediaNodeControlApp.cpp (Arbeitskopie)
3087@@ -53,7 +53,7 @@
3088 sprintf(buffer,
3089 "MediaNodeControlApp: couldn't find node (%ld):\n%s\n",
3090 nodeID, strerror(err));
3091- (new BAlert("error", buffer, "Ok"))->Go();
3092+ (new BAlert("error", buffer, "OK"))->Go();
3093 return;
3094 }
3095
3096@@ -65,7 +65,7 @@
3097 sprintf(buffer,
3098 "MediaNodeControlApp: couldn't get node info (%ld):\n%s\n",
3099 nodeID, strerror(err));
3100- (new BAlert("error", buffer, "Ok"))->Go();
3101+ (new BAlert("error", buffer, "OK"))->Go();
3102 return;
3103 }
3104
3105@@ -80,7 +80,7 @@
3106 sprintf(buffer,
3107 "MediaNodeControlApp: no parameters for node (%ld):\n%s\n",
3108 nodeID, strerror(err));
3109- (new BAlert("error", buffer, "Ok"))->Go();
3110+ (new BAlert("error", buffer, "OK"))->Go();
3111 return;
3112 }
3113
3114Index: src/apps/cortex/addons/Flanger/FlangerNode.cpp
3115===================================================================
3116--- src/apps/cortex/addons/Flanger/FlangerNode.cpp (Revision 34761)
3117+++ src/apps/cortex/addons/Flanger/FlangerNode.cpp (Arbeitskopie)
3118@@ -1228,11 +1228,11 @@
3119 BParameterGroup* g;
3120
3121 // mix ratio
3122- g = pTopGroup->MakeGroup("Mix Ratio");
3123+ g = pTopGroup->MakeGroup("Mix ratio");
3124 label = g->MakeNullParameter(
3125 P_MIX_RATIO_LABEL,
3126 B_MEDIA_NO_TYPE,
3127- "Mix Ratio",
3128+ "Mix ratio",
3129 B_GENERIC);
3130
3131 value = g->MakeContinuousParameter(
3132@@ -1244,11 +1244,11 @@
3133 value->AddInput(label);
3134
3135 // sweep rate
3136- g = pTopGroup->MakeGroup("Sweep Rate");
3137+ g = pTopGroup->MakeGroup("Sweep rate");
3138 label = g->MakeNullParameter(
3139 P_SWEEP_RATE_LABEL,
3140 B_MEDIA_NO_TYPE,
3141- "Sweep Rate",
3142+ "Sweep rate",
3143 B_GENERIC);
3144
3145 value = g->MakeContinuousParameter(
3146@@ -1271,7 +1271,7 @@
3147 P_DELAY,
3148 B_MEDIA_NO_TYPE,
3149 "",
3150- B_GAIN, "msec", 0.1, s_fMaxDelay/2.0, 0.1);
3151+ B_GAIN, "ms", 0.1, s_fMaxDelay/2.0, 0.1);
3152 label->AddOutput(value);
3153 value->AddInput(label);
3154
3155@@ -1287,7 +1287,7 @@
3156 P_DEPTH,
3157 B_MEDIA_NO_TYPE,
3158 "",
3159- B_GAIN, "msec", 1.0, s_fMaxDelay/4.0, 0.1);
3160+ B_GAIN, "ms", 1.0, s_fMaxDelay/4.0, 0.1);
3161 label->AddOutput(value);
3162 value->AddInput(label);
3163
3164Index: src/apps/cortex/ParameterView/ParameterWindow.cpp
3165===================================================================
3166--- src/apps/cortex/ParameterView/ParameterWindow.cpp (Revision 34761)
3167+++ src/apps/cortex/ParameterView/ParameterWindow.cpp (Arbeitskopie)
3168@@ -61,7 +61,7 @@
3169 BMenuBar *menuBar = new BMenuBar(Bounds(), "ParameterWindow MenuBar");
3170
3171 BMenu *menu = new BMenu("Window");
3172- menu->AddItem(new BMenuItem("Start Control Panel",
3173+ menu->AddItem(new BMenuItem("Start control panel",
3174 new BMessage(M_START_CONTROL_PANEL),
3175 'P', B_COMMAND_KEY | B_SHIFT_KEY));
3176 menu->AddSeparatorItem();
3177Index: src/apps/cortex/support/MediaString.cpp
3178===================================================================
3179--- src/apps/cortex/support/MediaString.cpp (Revision 34761)
3180+++ src/apps/cortex/support/MediaString.cpp (Arbeitskopie)
3181@@ -26,30 +26,30 @@
3182
3183 if (kinds & B_BUFFER_PRODUCER) {
3184 if (first) {
3185- list = "Buffer Producer";
3186+ list = "Buffer producer";
3187 first = false;
3188 }
3189 }
3190 if (kinds & B_BUFFER_CONSUMER) {
3191 if (first) {
3192- list = "Buffer Consumer";
3193+ list = "Buffer consumer";
3194 first = false;
3195 }
3196 else {
3197 if (last != "")
3198 list << ", " << last;
3199- last = "Buffer Consumer";
3200+ last = "Buffer consumer";
3201 }
3202 }
3203 if (kinds & B_TIME_SOURCE) {
3204 if (first) {
3205- list = "Time Source";
3206+ list = "Time source";
3207 first = false;
3208 }
3209 else {
3210 if (last != "")
3211 list << ", " << last;
3212- last = "Time Source";
3213+ last = "Time source";
3214 }
3215 }
3216 if (kinds & B_CONTROLLABLE) {
3217@@ -65,57 +65,57 @@
3218 }
3219 if (kinds & B_FILE_INTERFACE) {
3220 if (first) {
3221- list = "File Interface";
3222+ list = "File interface";
3223 first = false;
3224 }
3225 else {
3226 if (last != "")
3227 list << ", " << last;
3228- last = "File Interface";
3229+ last = "File interface";
3230 }
3231 }
3232 if (kinds & B_ENTITY_INTERFACE) {
3233 if (first) {
3234- list = "Entity Interface";
3235+ list = "Entity interface";
3236 first = false;
3237 }
3238 else {
3239 if (last != "")
3240 list << ", " << last;
3241- last = "Entity Interface";
3242+ last = "Entity interface";
3243 }
3244 }
3245 if (kinds & B_PHYSICAL_INPUT) {
3246 if (first) {
3247- list = "Physical Input";
3248+ list = "Physical input";
3249 first = false;
3250 }
3251 else {
3252 if (last != "")
3253 list << ", " << last;
3254- last = "Physical Input";
3255+ last = "Physical input";
3256 }
3257 }
3258 if (kinds & B_PHYSICAL_OUTPUT) {
3259 if (first) {
3260- list = "Physical Output";
3261+ list = "Physical output";
3262 first = false;
3263 }
3264 else {
3265 if (last != "")
3266 list << ", " << last;
3267- last = "Physical Output";
3268+ last = "Physical output";
3269 }
3270 }
3271 if (kinds & B_SYSTEM_MIXER) {
3272 if (first) {
3273- list = "System Mixer";
3274+ list = "System mixer";
3275 first = false;
3276 }
3277 else {
3278 if (last != "")
3279 list << ", " << last;
3280- last = "System Mixer";
3281+ last = "System mixer";
3282 }
3283 }
3284
3285@@ -133,9 +133,9 @@
3286 switch (runMode) {
3287 case BMediaNode::B_OFFLINE: return "Offline";
3288 case BMediaNode::B_RECORDING: return "Recording";
3289- case BMediaNode::B_DECREASE_PRECISION: return "Decrease Precision";
3290- case BMediaNode::B_INCREASE_LATENCY: return "Increase Latency";
3291- case BMediaNode::B_DROP_DATA: return "Drop Data";
3292+ case BMediaNode::B_DECREASE_PRECISION: return "Decrease precision";
3293+ case BMediaNode::B_INCREASE_LATENCY: return "Increase latency";
3294+ case BMediaNode::B_DROP_DATA: return "Drop data";
3295 default: return "(unknown run mode)";
3296 }
3297 }
3298@@ -150,24 +150,24 @@
3299 D_METHOD(("MediaString::getStringFor(media_type)\n"));
3300
3301 switch (type) {
3302- case B_MEDIA_NO_TYPE: return "Typeless Media";
3303- case B_MEDIA_UNKNOWN_TYPE: return "Unknown Media Type";
3304- case B_MEDIA_RAW_AUDIO: return "Raw Audio";
3305- case B_MEDIA_RAW_VIDEO: return "Raw Video";
3306+ case B_MEDIA_NO_TYPE: return "Typeless media";
3307+ case B_MEDIA_UNKNOWN_TYPE: return "Unknown media type";
3308+ case B_MEDIA_RAW_AUDIO: return "Raw audio";
3309+ case B_MEDIA_RAW_VIDEO: return "Raw video";
3310 case B_MEDIA_VBL: return "Raw data from VBL area";
3311 case B_MEDIA_TIMECODE: return "Timecode";
3312 case B_MEDIA_MIDI: return "MIDI";
3313 case B_MEDIA_TEXT: return "Text";
3314 case B_MEDIA_HTML: return "HTML";
3315- case B_MEDIA_MULTISTREAM: return "Multistream Media";
3316+ case B_MEDIA_MULTISTREAM: return "Multistream media";
3317 case B_MEDIA_PARAMETERS: return "Parameters";
3318- case B_MEDIA_ENCODED_AUDIO: return "Encoded Audio";
3319- case B_MEDIA_ENCODED_VIDEO: return "Encoded Video";
3320+ case B_MEDIA_ENCODED_AUDIO: return "Encoded audio";
3321+ case B_MEDIA_ENCODED_VIDEO: return "Encoded video";
3322 default: {
3323 if (type >= B_MEDIA_PRIVATE)
3324- return "Private Be Media Type";
3325+ return "Private Be media type";
3326 if (type >= B_MEDIA_FIRST_USER_TYPE)
3327- return "User-defined Media Type";
3328+ return "User-defined media type";
3329 }
3330 }
3331 return "Unknown Media Type";
3332@@ -179,15 +179,15 @@
3333 D_METHOD(("MediaString::getStringFor(media_format_family)\n"));
3334
3335 switch (family) {
3336- case B_ANY_FORMAT_FAMILY: return "Any Format Family";
3337- case B_BEOS_FORMAT_FAMILY: return "BeOS Format Family";
3338- case B_QUICKTIME_FORMAT_FAMILY: return "QuickTime Format Family";
3339- case B_AVI_FORMAT_FAMILY: return "AVI Format Family";
3340- case B_ASF_FORMAT_FAMILY: return "ASF Format Family";
3341- case B_MPEG_FORMAT_FAMILY: return "MPEG Format Family";
3342- case B_WAV_FORMAT_FAMILY: return "WAV Format Family";
3343- case B_AIFF_FORMAT_FAMILY: return "AIFF Format Family";
3344- default: return "Miscellaneous Format Family";
3345+ case B_ANY_FORMAT_FAMILY: return "Any format family";
3346+ case B_BEOS_FORMAT_FAMILY: return "BeOS format family";
3347+ case B_QUICKTIME_FORMAT_FAMILY: return "QuickTime format family";
3348+ case B_AVI_FORMAT_FAMILY: return "AVI format family";
3349+ case B_ASF_FORMAT_FAMILY: return "ASF format family";
3350+ case B_MPEG_FORMAT_FAMILY: return "MPEG format family";
3351+ case B_WAV_FORMAT_FAMILY: return "WAV format family";
3352+ case B_AIFF_FORMAT_FAMILY: return "AIFF format family";
3353+ default: return "Miscellaneous format family";
3354 }
3355 }
3356
3357@@ -460,7 +460,7 @@
3358 s << "Port " << source.port << ", ID " << source.id;
3359 }
3360 else {
3361- s = "(None)";
3362+ s = "(none)";
3363 }
3364 return s;
3365 }
3366@@ -476,7 +476,7 @@
3367 s << "Port " << destination.port << ", ID " << destination.id;
3368 }
3369 else {
3370- s = "(None)";
3371+ s = "(none)";
3372 }
3373 return s;
3374 }
3375@@ -497,13 +497,13 @@
3376
3377 switch (format) {
3378 case media_raw_audio_format::B_AUDIO_UCHAR: {
3379- return "8 bit Integer";
3380+ return "8 bit integer";
3381 }
3382 case media_raw_audio_format::B_AUDIO_SHORT: {
3383- return "16 bit Integer";
3384+ return "16 bit integer";
3385 }
3386 case media_raw_audio_format::B_AUDIO_FLOAT: {
3387- return "32 bit Float";
3388+ return "32 bit float";
3389 }
3390 case media_raw_audio_format::B_AUDIO_INT: {
3391 BString s = "";
3392@@ -511,7 +511,7 @@
3393 s << validBits << " bit ";
3394 else
3395 s << "32 bit ";
3396- s << "Integer";
3397+ s << "integer";
3398 return s;
3399 }
3400 default: {
3401@@ -569,10 +569,10 @@
3402
3403 switch (byteOrder) {
3404 case B_MEDIA_BIG_ENDIAN: {
3405- return "Big Endian";
3406+ return "Big endian";
3407 }
3408 case B_MEDIA_LITTLE_ENDIAN: {
3409- return "Little Endian";
3410+ return "Little endian";
3411 }
3412 default: {
3413 return "(unknown byte order)";
3414@@ -642,156 +642,156 @@
3415 }
3416 if (channelMask & B_CHANNEL_REARLEFT) {
3417 if (first) {
3418- list = "Rear-Left";
3419+ list = "Rear-left";
3420 first = false;
3421 }
3422 else {
3423 if (last != "")
3424 list << ", " << last;
3425- last = "Rear-Left";
3426+ last = "Rear-left";
3427 }
3428 }
3429 if (channelMask & B_CHANNEL_REARRIGHT) {
3430 if (first) {
3431- list = "Rear-Right";
3432+ list = "Rear-right";
3433 first = false;
3434 }
3435 else {
3436 if (last != "")
3437 list << ", " << last;
3438- last = "Rear-Right";
3439+ last = "Rear-right";
3440 }
3441 }
3442 if (channelMask & B_CHANNEL_FRONT_LEFT_CENTER) {
3443 if (first) {
3444- list = "Front-Left-Center";
3445+ list = "Front-left-center";
3446 first = false;
3447 }
3448 else {
3449 if (last != "")
3450 list << ", " << last;
3451- last = "Front-Left-Center";
3452+ last = "Front-left-center";
3453 }
3454 }
3455 if (channelMask & B_CHANNEL_FRONT_RIGHT_CENTER) {
3456 if (first) {
3457- list = "Front-Right-Center";
3458+ list = "Front-right-center";
3459 first = false;
3460 }
3461 else {
3462 if (last != "")
3463 list << ", " << last;
3464- last = "Front-Right-Center";
3465+ last = "Front-right-center";
3466 }
3467 }
3468 if (channelMask & B_CHANNEL_BACK_CENTER) {
3469 if (first) {
3470- list = "Back-Center";
3471+ list = "Back-center";
3472 first = false;
3473 }
3474 else {
3475 if (last != "")
3476 list << ", " << last;
3477- last = "Back-Center";
3478+ last = "Back-center";
3479 }
3480 }
3481 if (channelMask & B_CHANNEL_SIDE_LEFT) {
3482 if (first) {
3483- list = "Side-Left";
3484+ list = "Side-left";
3485 first = false;
3486 }
3487 else {
3488 if (last != "")
3489 list << ", " << last;
3490- last = "Side-Left";
3491+ last = "Side-left";
3492 }
3493 }
3494 if (channelMask & B_CHANNEL_SIDE_RIGHT) {
3495 if (first) {
3496- list = "Side-Right";
3497+ list = "Side-right";
3498 first = false;
3499 }
3500 else {
3501 if (last != "")
3502 list << ", " << last;
3503- last = "Side-Right";
3504+ last = "Side-right";
3505 }
3506 }
3507 if (channelMask & B_CHANNEL_TOP_CENTER) {
3508 if (first) {
3509- list = "Top-Center";
3510+ list = "Top-center";
3511 first = false;
3512 }
3513 else {
3514 if (last != "")
3515 list << ", " << last;
3516- last = "Top-Center";
3517+ last = "Top-center";
3518 }
3519 }
3520 if (channelMask & B_CHANNEL_TOP_FRONT_LEFT) {
3521 if (first) {
3522- list = "Top-Front-Left";
3523+ list = "Top-Front-left";
3524 first = false;
3525 }
3526 else {
3527 if (last != "")
3528 list << ", " << last;
3529- last = "Top-Front-Left";
3530+ last = "Top-Front-left";
3531 }
3532 }
3533 if (channelMask & B_CHANNEL_TOP_FRONT_CENTER) {
3534 if (first) {
3535- list = "Top-Front-Center";
3536+ list = "Top-Front-center";
3537 first = false;
3538 }
3539 else {
3540 if (last != "")
3541 list << ", " << last;
3542- last = "Top-Front-Center";
3543+ last = "Top-Front-center";
3544 }
3545 }
3546 if (channelMask & B_CHANNEL_TOP_FRONT_RIGHT) {
3547 if (first) {
3548- list = "Top-Front-Right";
3549+ list = "Top-Front-right";
3550 first = false;
3551 }
3552 else {
3553 if (last != "")
3554 list << ", " << last;
3555- last = "Top-Front-Right";
3556+ last = "Top-Front-right";
3557 }
3558 }
3559 if (channelMask & B_CHANNEL_TOP_BACK_LEFT) {
3560 if (first) {
3561- list = "Top-Back-Left";
3562+ list = "Top-Back-left";
3563 first = false;
3564 }
3565 else {
3566 if (last != "")
3567 list << ", " << last;
3568- last = "Top-Back-Left";
3569+ last = "Top-Back-left";
3570 }
3571 }
3572 if (channelMask & B_CHANNEL_TOP_BACK_CENTER) {
3573 if (first) {
3574- list = "Top-Back-Center";
3575+ list = "Top-Back-center";
3576 first = false;
3577 }
3578 else {
3579 if (last != "")
3580 list << ", " << last;
3581- last = "Top-Back-Center";
3582+ last = "Top-Back-center";
3583 }
3584 }
3585 if (channelMask & B_CHANNEL_TOP_BACK_RIGHT) {
3586 if (first) {
3587- list = "Top-Back-Right";
3588+ list = "Top-Back-right";
3589 first = false;
3590 }
3591 else {
3592 if (last != "")
3593 list << ", " << last;
3594- last = "Top-Back-Right";
3595+ last = "Top-Back-right";
3596 }
3597 }
3598 if (last != "") {
3599@@ -876,8 +876,8 @@
3600 case B_RGB15_BIG: return "15 bit RGB";
3601 case B_RGBA15:
3602 case B_RGBA15_BIG: return "15 bit RGBA";
3603- case B_CMAP8: return "8 bit Color-Index";
3604- case B_GRAY8: return "8 bit Grayscale-Index";
3605+ case B_CMAP8: return "8 bit color-index";
3606+ case B_GRAY8: return "8 bit grayscale-index";
3607 case B_GRAY1: return "Monochrome";
3608 case B_YUV422: return "YUV422";
3609 case B_YUV411: return "YUV411";
3610@@ -942,7 +942,7 @@
3611
3612 BString s = "";
3613 if (interlace == 1) {
3614- s << "Non-Interlaced ";
3615+ s << "Non-interlaced ";
3616 }
3617 else {
3618 s << "Interlaced ";
3619@@ -970,10 +970,10 @@
3620
3621 switch (orientation) {
3622 case B_VIDEO_TOP_LEFT_RIGHT: {
3623- return "Top to Bottom, Left to Right";
3624+ return "Top to bottom, left to right";
3625 }
3626 case B_VIDEO_BOTTOM_LEFT_RIGHT: {
3627- return "Bottom to Top, Left to Right";
3628+ return "Bottom to top, left to right";
3629 }
3630 default: {
3631 return "(unkown video orientation)";
3632@@ -1129,7 +1129,7 @@
3633 }
3634
3635 switch (format) {
3636- case media_multistream_format::B_VID: return "BeOS Video";
3637+ case media_multistream_format::B_VID: return "BeOS video";
3638 case media_multistream_format::B_AVI: return "AVI";
3639 case media_multistream_format::B_MPEG1: return "MPEG1";
3640 case media_multistream_format::B_MPEG2: return "MPEG2";
3641Index: src/apps/expander/ExpanderWindow.cpp
3642===================================================================
3643--- src/apps/expander/ExpanderWindow.cpp (Revision 34761)
3644+++ src/apps/expander/ExpanderWindow.cpp (Arbeitskopie)
3645@@ -1,5 +1,5 @@
3646 /*
3647- * Copyright 2004-2006, Jérôme DUVAL. All rights reserved.
3648+ * Copyright 2004-2009, Jérôme DUVAL. All rights reserved.
3649 * Distributed under the terms of the MIT License.
3650 */
3651
3652@@ -55,12 +55,12 @@
3653 menu->AddItem(item = new BMenuItem("About Expander" B_UTF8_ELLIPSIS, new BMessage(B_ABOUT_REQUESTED)));
3654 item->SetTarget(be_app_messenger);
3655 menu->AddSeparatorItem();
3656- menu->AddItem(fSourceItem = new BMenuItem("Set Source" B_UTF8_ELLIPSIS, new BMessage(MSG_SOURCE), 'O'));
3657- menu->AddItem(fDestItem = new BMenuItem("Set Destination" B_UTF8_ELLIPSIS, new BMessage(MSG_DEST), 'D'));
3658+ menu->AddItem(fSourceItem = new BMenuItem("Set source" B_UTF8_ELLIPSIS, new BMessage(MSG_SOURCE), 'O'));
3659+ menu->AddItem(fDestItem = new BMenuItem("Set destination" B_UTF8_ELLIPSIS, new BMessage(MSG_DEST), 'D'));
3660 menu->AddSeparatorItem();
3661 menu->AddItem(fExpandItem = new BMenuItem("Expand", new BMessage(MSG_EXPAND), 'E'));
3662 fExpandItem->SetEnabled(false);
3663- menu->AddItem(fShowItem = new BMenuItem("Show Contents", new BMessage(MSG_SHOW), 'L'));
3664+ menu->AddItem(fShowItem = new BMenuItem("Show contents", new BMessage(MSG_SHOW), 'L'));
3665 fShowItem->SetEnabled(false);
3666 menu->AddSeparatorItem();
3667 menu->AddItem(fStopItem = new BMenuItem("Stop", new BMessage(MSG_STOP), 'K'));
3668@@ -69,9 +69,9 @@
3669 menu->AddItem(new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED), 'W'));
3670 fBar->AddItem(menu);
3671
3672- menu = new BMenu("Edit");
3673- menu->AddItem(fPreferencesItem = new BMenuItem("Preferences" B_UTF8_ELLIPSIS,
3674- new BMessage(MSG_PREFERENCES), 'P'));
3675+ menu = new BMenu("Settings");
3676+ menu->AddItem(fPreferencesItem = new BMenuItem("Settings" B_UTF8_ELLIPSIS,
3677+ new BMessage(MSG_PREFERENCES), 'S'));
3678 fBar->AddItem(menu);
3679 AddChild(fBar);
3680
3681@@ -125,7 +125,7 @@
3682 topView->AddChild(fDestText);
3683
3684 rect.OffsetBy(0, fSourceButton->Bounds().Height() + 4 + offset);
3685- fShowContents = new BCheckBox(rect, "showContents", "Show Contents",
3686+ fShowContents = new BCheckBox(rect, "showContents", "Show contents",
3687 new BMessage(MSG_SHOWCONTENTS), B_FOLLOW_RIGHT | B_FOLLOW_TOP);
3688 fShowContents->ResizeToPreferred();
3689 fShowContents->MoveTo(Bounds().right - 8 - fShowContents->Bounds().Width(),
3690@@ -186,13 +186,13 @@
3691 BVolume volume;
3692 if (!entry.Exists()) {
3693 BAlert *alert = new BAlert("destAlert", "The destination"
3694- " directory does not exist.", "Cancel", NULL, NULL,
3695+ " folder does not exist.", "Cancel", NULL, NULL,
3696 B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
3697 alert->Go();
3698 return false;
3699 } else if (!entry.IsDirectory()) {
3700 (new BAlert("destAlert", "The destination"
3701- " is not a directory.", "Cancel", NULL, NULL,
3702+ " is not a folder.", "Cancel", NULL, NULL,
3703 B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT))->Go();
3704 return false;
3705 } else if (entry.GetVolume(&volume) != B_OK || volume.IsReadOnly()) {
3706@@ -299,7 +299,7 @@
3707 case MSG_SHOWCONTENTS:
3708 // change menu item label
3709 fShowItem->SetLabel(fShowContents->Value() == B_CONTROL_OFF
3710- ? "Show Contents" : "Hide Contents");
3711+ ? "Show contents" : "Hide contents");
3712
3713 if (fShowContents->Value() == B_CONTROL_OFF) {
3714 if (fListingStarted)
3715@@ -508,7 +508,7 @@
3716
3717 BEntry destEntry(fDestText->Text(), true);
3718 if (!destEntry.Exists()) {
3719- BAlert *alert = new BAlert("destAlert", "The directory was either moved, renamed or not\n"
3720+ BAlert *alert = new BAlert("destAlert", "The folder was either moved, renamed or not\n"
3721 "supported.",
3722 "Cancel", NULL, NULL,
3723 B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
3724@@ -620,7 +620,7 @@
3725 fDestItem->SetEnabled(false);
3726 fExpandItem->SetEnabled(false);
3727 fShowItem->SetEnabled(true);
3728- fShowItem->SetLabel("Hide Contents");
3729+ fShowItem->SetLabel("Hide contents");
3730 fStopItem->SetEnabled(false);
3731 fPreferencesItem->SetEnabled(false);
3732
3733Index: src/apps/expander/ExpanderApp.cpp
3734===================================================================
3735--- src/apps/expander/ExpanderApp.cpp (Revision 34761)
3736+++ src/apps/expander/ExpanderApp.cpp (Arbeitskopie)
3737@@ -1,5 +1,5 @@
3738 /*
3739- * Copyright 2004-2006, Jérôme DUVAL. All rights reserved.
3740+ * Copyright 2004-2009, Jérôme DUVAL. All rights reserved.
3741 * Distributed under the terms of the MIT License.
3742 */
3743
3744@@ -29,7 +29,7 @@
3745 "\twritten by Jérôme Duval\n"
3746 "\tCopyright 2004-2006, Haiku Inc.\n\n"
3747 "original Be version by \n"
3748- "Dominic, Hiroshi, Peter, Pavel and Robert\n", "Ok");
3749+ "Dominic, Hiroshi, Peter, Pavel and Robert\n", "OK");
3750 BTextView *view = alert->TextView();
3751 BFont font;
3752
3753Index: src/apps/expander/ExpanderPreferences.cpp
3754===================================================================
3755--- src/apps/expander/ExpanderPreferences.cpp (Revision 34761)
3756+++ src/apps/expander/ExpanderPreferences.cpp (Arbeitskopie)
3757@@ -1,5 +1,5 @@
3758 /*
3759- * Copyright 2004-2006, Jérôme DUVAL. All rights reserved.
3760+ * Copyright 2004-2009, Jérôme DUVAL. All rights reserved.
3761 * Distributed under the terms of the MIT License.
3762 */
3763
3764@@ -34,7 +34,7 @@
3765 rect.right -= 22;
3766 BBox *box = new BBox(rect, "background", B_FOLLOW_NONE,
3767 B_WILL_DRAW | B_FRAME_EVENTS, B_FANCY_BORDER);
3768- box->SetLabel("Expander Preferences");
3769+ box->SetLabel("Expander settings");
3770 background->AddChild(box);
3771
3772 float maxWidth = box->Bounds().right;
3773@@ -72,7 +72,7 @@
3774
3775 frameRect = stringView->Frame();
3776 frameRect.top = fCloseWindow->Frame().bottom + 10;
3777- stringView = new BStringView(frameRect, "destinationFolder", "Destination Folder:",
3778+ stringView = new BStringView(frameRect, "destinationFolder", "Destination folder:",
3779 B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW);
3780 stringView->ResizeToPreferred();
3781 if (stringView->Frame().right > maxWidth)
3782Index: src/apps/mediaconverter/Strings.h
3783===================================================================
3784--- src/apps/mediaconverter/Strings.h (Revision 34761)
3785+++ src/apps/mediaconverter/Strings.h (Arbeitskopie)
3786@@ -1,6 +1,6 @@
3787 // Copyright 1999, Be Incorporated. All Rights Reserved.
3788 // Copyright 2000-2004, Jun Suzuki. All Rights Reserved.
3789-// Copyright 2007, Stephan Aßmus. All Rights Reserved.
3790+// Copyright 2007-2009, Stephan Aßmus. All Rights Reserved.
3791 // This file may be used under the terms of the Be Sample Code License.
3792 #ifndef STRINGS_H
3793 #define STRINGS_H
3794@@ -26,14 +26,14 @@
3795 #define SOURCE_BOX_LABEL _T("Source files")
3796 #define INFO_BOX_LABEL _T("File details")
3797 #define OUTPUT_BOX_LABEL _T("Output format")
3798-#define FORMAT_LABEL _T("File format")
3799-#define VIDEO_LABEL _T("Video encoding")
3800-#define AUDIO_LABEL _T("Audio encoding")
3801+#define FORMAT_LABEL _T("File format:")
3802+#define VIDEO_LABEL _T("Video encoding:")
3803+#define AUDIO_LABEL _T("Audio encoding:")
3804 //
3805-#define OUTPUT_FOLDER_LABEL _T("Output Folder")
3806+#define OUTPUT_FOLDER_LABEL _T("Output folder")
3807 #define PREVIEW_BUTTON_LABEL _T("Preview")
3808-#define START_LABEL _T("Start mSec ")
3809-#define END_LABEL _T("End mSec ")
3810+#define START_LABEL _T("Start [ms]: ")
3811+#define END_LABEL _T("End [ms]: ")
3812 //
3813 #define FORMAT_MENU_LABEL _T("Format")
3814 #define VIDEO_MENU_LABEL _T("Video")
3815@@ -43,8 +43,8 @@
3816 #define AUDIO_INFO_LABEL _T("Audio:")
3817 #define CONVERT_LABEL _T("Convert")
3818 #define CANCEL_LABEL _T("Cancel")
3819-#define VIDEO_QUALITY_LABEL _T("Video quality %3d%%")
3820-#define AUDIO_QUALITY_LABEL _T("Audio quality %3d%%")
3821+#define VIDEO_QUALITY_LABEL _T("Video quality: %3d%%")
3822+#define AUDIO_QUALITY_LABEL _T("Audio quality: %3d%%")
3823 #define SLIDER_LOW_LABEL _T("Low")
3824 #define SLIDER_HIGH_LABEL _T("High")
3825 #define NONE_LABEL _T("None available")
3826@@ -54,14 +54,14 @@
3827 #define OK_LABEL _T("OK")
3828 #define CONV_COMPLETE_LABEL _T("Conversion completed")
3829 #define CONV_CANCEL_LABEL _T("Conversion cancelled")
3830-#define SELECT_DIR_LABEL _T("Select This Directory")
3831+#define SELECT_DIR_LABEL _T("Select this folder")
3832 #define SELECT_LABEL _T("Select")
3833 #define SAVE_DIR_LABEL _T("MediaConverter+:SaveDirectory")
3834 #define NO_FILE_LABEL _T("No file selected")
3835 //
3836 #define FILE_MENU_LABEL _T("File")
3837 #define OPEN_MENU_LABEL _T("Open")
3838-#define ABOUT_MENU_LABEL _T("About")
3839+#define ABOUT_MENU_LABEL _T("About MediaConverter")
3840 #define QUIT_MENU_LABEL _T("Quit")
3841
3842 #define WRITE_AUDIO_STRING _T("Writing audio track:")
3843@@ -86,7 +86,7 @@
3844 #define ERROR_READ_AUDIO_STRING _T("Error read audio frame ")
3845 #define ERROR_LOAD_STRING _T("Error loading file")
3846
3847-#define ENCODER_PARAMETERS _T("Encoder Parameters")
3848+#define ENCODER_PARAMETERS _T("Encoder parameters")
3849
3850
3851 #endif // STRINGS_H
3852Index: src/apps/mediaconverter/MediaConverterWindow.cpp
3853===================================================================
3854--- src/apps/mediaconverter/MediaConverterWindow.cpp (Revision 34761)
3855+++ src/apps/mediaconverter/MediaConverterWindow.cpp (Arbeitskopie)
3856@@ -1,6 +1,6 @@
3857 // Copyright 1999, Be Incorporated. All Rights Reserved.
3858 // Copyright 2000-2004, Jun Suzuki. All Rights Reserved.
3859-// Copyright 2007, Stephan Aßmus. All Rights Reserved.
3860+// Copyright 2007-2009, Stephan Aßmus. All Rights Reserved.
3861 // This file may be used under the terms of the Be Sample Code License.
3862 #include "MediaConverterWindow.h"
3863
3864@@ -602,7 +602,7 @@
3865 format.u.raw_audio = media_raw_audio_format::wildcard;
3866 while (get_next_encoder(&cookie, mf_format, &format, &outfmt, &codec_info) == B_OK) {
3867 if (separator) {
3868- menu->AddItem(new BMenuItem("No Audio",
3869+ menu->AddItem(new BMenuItem("No audio",
3870 new BMessage(AUDIO_CODEC_SELECT_MESSAGE)));
3871 menu->AddSeparatorItem();
3872 separator = false;
3873@@ -656,7 +656,7 @@
3874 cookie = 0;
3875 while (get_next_encoder(&cookie, mf_format, &format, &outfmt, &codec_info) == B_OK) {
3876 if (separator) {
3877- menu->AddItem(new BMenuItem("No Video",
3878+ menu->AddItem(new BMenuItem("No video",
3879 new BMessage(VIDEO_CODEC_SELECT_MESSAGE)));
3880 menu->AddSeparatorItem();
3881 separator = false;
3882Index: src/apps/mediaconverter/languages/MediaConverter.itIT
3883===================================================================
3884--- src/apps/mediaconverter/languages/MediaConverter.itIT (Revision 34761)
3885+++ src/apps/mediaconverter/languages/MediaConverter.itIT (Arbeitskopie)
3886@@ -8,10 +8,10 @@
3887 "File format" "Formato del file"
3888 "Video encoding" "Codifica video"
3889 "Audio encoding" "Codifica audio"
3890-"Output Folder" "Cartella di destinazione"
3891+"Output folder" "Cartella di destinazione"
3892 "Preview" "Anteprima"
3893-"Start mSec " "Inizio mSec"
3894-"End mSec " "Fine mSec"
3895+"Start [ms] " "Inizio mSec"
3896+"End [ms] " "Fine mSec"
3897 "Format" "Formato"
3898 "Video" "Video"
3899 "Audio" "Audio"
3900@@ -33,13 +33,13 @@
3901 "Cancelling" "Interruzione"
3902 "OK" "OK"
3903 "No file selected" "Nessun file selezionato"
3904-"Select This Directory" "Seleziona questa directory"
3905+"Select this folder" "Seleziona questa directory"
3906 "Select" "Seleziona"
3907 "MediaConverter+:SaveDirectory" "MediaConverter+:Directory di salvataggio"
3908 "Output file" "File di output"
3909 "created" "creato"
3910-"Audio-Quality doesn't support" "Audio-Quality non supportata"
3911-"Video-Quality doesn't support" "Video-Quality non supportata"
3912+"Audio quality doesn't support" "Audio quality non supportata"
3913+"Video quality doesn't support" "Video quality non supportata"
3914 "Writing audio track:" "Scrittura traccia audio in corso:"
3915 "Writing video track:" "Scrittura traccia video in corso:"
3916 "Error launching: " "Errore lanciando: "
3917Index: src/apps/mediaconverter/languages/MediaConverter.frFR
3918===================================================================
3919--- src/apps/mediaconverter/languages/MediaConverter.frFR (Revision 34761)
3920+++ src/apps/mediaconverter/languages/MediaConverter.frFR (Arbeitskopie)
3921@@ -8,10 +8,10 @@
3922 "File format" "Format du fichier"
3923 "Video encoding" "Codage Vidéo"
3924 "Audio encoding" "Codage Audio"
3925-"Output Folder" "Dossier de sortie"
3926+"Output folder" "Dossier de sortie"
3927 "Preview" "Prévue"
3928-"Start mSec " "Début (mSec)"
3929-"End mSec " "FIn (mSec)"
3930+"Start [ms] " "Début (mSec)"
3931+"End [ms] " "FIn (mSec)"
3932 "Format" "Format"
3933 "Video" "Vidéo"
3934 "Audio" "Audio"
3935@@ -22,8 +22,8 @@
3936 "Cancel" "Annuler"
3937 "Low" "Faible"
3938 "High" "Haute"
3939-"Video quality %3d%%" "QualitéVidéo %3d%%"
3940-"Audio quality %3d%%" "QualitéAudio %3d%%"
3941+"Video quality %3d%%" "Qualité vidéo %3d%%"
3942+"Audio quality %3d%%" "Qualité audio %3d%%"
3943 "Drop media files onto this window" "Jeter les fichiers media dans cette fenêtre"
3944 "None available" "Non disponible"
3945 "Converting" "Conversion en cours"
3946@@ -33,13 +33,13 @@
3947 "Cancelling" "Annulation en cours"
3948 "OK" "Ok"
3949 "No file selected" "Aucun fichier sélectionné"
3950-"Select This Directory" "Choisir ce dossier"
3951+"Select this folder" "Choisir ce dossier"
3952 "Select" "Sélectionner"
3953 "MediaConverter+:SaveDirectory" "MediaConverter+:DossierSauvegarde"
3954 "Output file" "Fichier cible"
3955 "created" "créé"
3956-"AudioQuality doesn't support" "Qualité Audio non supportée"
3957-"VideoQuality doesn't support" "Qualité Vidéo non supportée"
3958+"Audio quality doesn't support" "Qualité audio non supportée"
3959+"Video quality doesn't support" "Qualité vidéo non supportée"
3960 "Writing audio track:" "Ecriture de la piste audio:"
3961 "Writing video track:" "Ecriture de la piste vidéo:"
3962 "Error launching: " "Erreur de lancement : "
3963Index: src/apps/mediaconverter/languages/MediaConverter.jaJP
3964===================================================================
3965--- src/apps/mediaconverter/languages/MediaConverter.jaJP (Revision 34761)
3966+++ src/apps/mediaconverter/languages/MediaConverter.jaJP (Arbeitskopie)
3967@@ -8,10 +8,10 @@
3968 "File format" "ファイル形式"
3969 "Video encoding" "映像エンコード形式"
3970 "Audio encoding" "音声エンコード形式"
3971-"Output Folder" "出力フォルダ"
3972+"Output folder" "出力フォルダ"
3973 "Preview" "プレビュー"
3974-"Start mSec " "開始 mSec"
3975-"End mSec " "終了 mSec"
3976+"Start [ms] " "開始 mSec"
3977+"End [ms] " "終了 mSec"
3978 "Format" "形式"
3979 "Video" "映像"
3980 "Audio" "音声"
3981@@ -33,13 +33,13 @@
3982 "Cancelling" "中止しています"
3983 "OK" "了解"
3984 "No file selected" "ファイル未選択"
3985-"Select This Directory" "現在のディレクトリを選択"
3986+"Select this folder" "現在のディレクトリを選択"
3987 "Select" "選択"
3988 "MediaConverter+:SaveDirectory" "MediaConverter+:保存先のディレクトリ"
3989 "Output file" "出力ファイル"
3990 "created" "生成"
3991-"AudioQuality doesn't support" "音質調整機能なし"
3992-"VideoQuality doesn't support" "画質調整機能なし"
3993+"Audio quality doesn't support" "音質調整機能なし"
3994+"Video quality doesn't support" "画質調整機能なし"
3995 "Writing audio track:" "音声トラック書き込み中:"
3996 "Writing video track:" "映像トラック書き込み中:"
3997 "Error launching: " "起動エラー : "
3998Index: src/apps/login/LoginView.cpp
3999===================================================================
4000--- src/apps/login/LoginView.cpp (Revision 34761)
4001+++ src/apps/login/LoginView.cpp (Arbeitskopie)
4002@@ -1,5 +1,5 @@
4003 /*
4004- * Copyright 2008, François Revol, <revol@free.fr>. All rights reserved.
4005+ * Copyright 2008-2009, François Revol, <revol@free.fr>. All rights reserved.
4006 * Distributed under the terms of the MIT License.
4007 */
4008 #include <ScrollView.h>
4009@@ -57,18 +57,18 @@
4010
4011 r.Set(LW + 30, Bounds().top + CSEP,
4012 Bounds().right - CSEP, Bounds().top + CSEP + CSEP);
4013- fLoginControl = new BTextControl(r, "login", "login:", "",
4014+ fLoginControl = new BTextControl(r, "login", "Login:", "",
4015 new BMessage(kLoginEdited));
4016 AddChild(fLoginControl);
4017
4018 r.OffsetBySelf(0, CSEP + CSEP);
4019- fPasswordControl = new BTextControl(r, "password", "password:", "",
4020+ fPasswordControl = new BTextControl(r, "password", "Password:", "",
4021 new BMessage(kPasswordEdited));
4022 fPasswordControl->TextView()->HideTyping(true);
4023 AddChild(fPasswordControl);
4024
4025 r.OffsetBySelf(0, CSEP + CSEP);
4026- fHidePasswordCheckBox = new BCheckBox(r, "hidepw", "Hide Password",
4027+ fHidePasswordCheckBox = new BCheckBox(r, "hidepw", "Hide password",
4028 new BMessage(kHidePassword));
4029 fHidePasswordCheckBox->SetValue(1);
4030 AddChild(fHidePasswordCheckBox);
4031@@ -93,7 +93,7 @@
4032
4033 buttonRect.OffsetToSelf(Bounds().Width() - CSEP - buttonWidth,
4034 Bounds().Height() - CSEP - BH);
4035- fLoginButton = new BButton(buttonRect, "ok", "Ok",
4036+ fLoginButton = new BButton(buttonRect, "ok", "OK",
4037 new BMessage(kAttemptLogin));
4038 AddChild(fLoginButton);
4039
4040Index: src/apps/login/LoginApp.cpp
4041===================================================================
4042--- src/apps/login/LoginApp.cpp (Revision 34761)
4043+++ src/apps/login/LoginApp.cpp (Arbeitskopie)
4044@@ -1,5 +1,5 @@
4045 /*
4046- * Copyright 2008, François Revol, <revol@free.fr>. All rights reserved.
4047+ * Copyright 2008-2009, François Revol, <revol@free.fr>. All rights reserved.
4048 * Distributed under the terms of the MIT License.
4049 */
4050
4051@@ -48,10 +48,10 @@
4052
4053 if (fEditShelfMode) {
4054 (new BAlert("Info", "You can customize the desktop shown "
4055- "behind the Login app by dropping replicants onto it.\n"
4056+ "behind the Login application by dropping replicants onto it.\n"
4057 "\n"
4058 "When you are finished just quit the application (Alt-Q).",
4059- "Ok"))->Go(NULL);
4060+ "OK"))->Go(NULL);
4061 } else {
4062 BRect frame(0, 0, 400, 150);
4063 frame.OffsetBySelf(screen.Frame().Width()/2 - frame.Width()/2,
4064@@ -89,12 +89,12 @@
4065 if (error < B_OK) {
4066 BString msg("Error: ");
4067 msg << strerror(error);
4068- (new BAlert("Error", msg.String(), "Ok"))->Go();
4069+ (new BAlert("Error", msg.String(), "OK"))->Go();
4070 }
4071 break;
4072 }
4073 case kSuspendAction:
4074- (new BAlert("Error", "Unimplemented", "Ok"))->Go();
4075+ (new BAlert("Error", "Unimplemented", "OK"))->Go();
4076 break;
4077 #endif
4078 default:
4079@@ -118,7 +118,7 @@
4080 printf("Login application for Haiku\nUsage:\n");
4081 printf("%s [--nonmodal] [--edit]\n", argv[0]);
4082 printf("--nonmodal Do not make the window modal\n");
4083- printf("--edit Launch in Shelf editting mode to "
4084+ printf("--edit Launch in shelf editting mode to "
4085 "allow customizing the desktop.\n");
4086 // just return to the shell
4087 exit((arg == "--help") ? 0 : 1);
4088Index: src/apps/packageinstaller/PackageInfo.cpp
4089===================================================================
4090--- src/apps/packageinstaller/PackageInfo.cpp (Revision 34761)
4091+++ src/apps/packageinstaller/PackageInfo.cpp (Arbeitskopie)
4092@@ -1057,7 +1057,7 @@
4093 BAlert *warning = new BAlert(T("filesize_wrong"),
4094 T("There seems to be a filesize mismatch in the package file. "
4095 "The package might be corrupted or have been modified after its "
4096- "creation. Do you still wish to continue?"), T("Yes"), T("No"), NULL,
4097+ "creation. Do you still wish to continue?"), T("Continue"), T("Abort"), NULL,
4098 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4099 selection = warning->Go();
4100
4101Index: src/apps/packageinstaller/PackageWindow.cpp
4102===================================================================
4103--- src/apps/packageinstaller/PackageWindow.cpp (Revision 34761)
4104+++ src/apps/packageinstaller/PackageWindow.cpp (Arbeitskopie)
4105@@ -1,5 +1,5 @@
4106 /*
4107- * Copyright (c) 2007, Haiku, Inc.
4108+ * Copyright (c) 2007-2009, Haiku, Inc.
4109 * Distributed under the terms of the MIT license.
4110 *
4111 * Author:
4112@@ -18,7 +18,7 @@
4113
4114
4115 PackageWindow::PackageWindow(const entry_ref *ref)
4116- : BWindow(BRect(100, 100, 600, 300), T("Package Installer"), B_TITLED_WINDOW,
4117+ : BWindow(BRect(100, 100, 600, 300), T("PackageInstaller"), B_TITLED_WINDOW,
4118 B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
4119 {
4120 //SetLayout(new BGroupLayout(B_HORIZONTAL));
4121Index: src/apps/packageinstaller/main.cpp
4122===================================================================
4123--- src/apps/packageinstaller/main.cpp (Revision 34761)
4124+++ src/apps/packageinstaller/main.cpp (Arbeitskopie)
4125@@ -1,5 +1,5 @@
4126 /*
4127- * Copyright (c) 2007, Haiku, Inc.
4128+ * Copyright (c) 2007-2009, Haiku, Inc. All rights reserved.
4129 * Distributed under the terms of the MIT license.
4130 *
4131 * Author:
4132@@ -139,7 +139,7 @@
4133 "BeOS legacy .pkg file installer for Haiku.\n\n"
4134 "Copyright 2007,\nŁukasz 'Sil2100' Zemczak\n\n"
4135 "Copyright (c) 2007 Haiku, Inc. \n",
4136- "Close");
4137+ "OK");
4138
4139 BTextView *view = about->TextView();
4140 BFont font;
4141Index: src/apps/packageinstaller/PackageView.cpp
4142===================================================================
4143--- src/apps/packageinstaller/PackageView.cpp (Revision 34761)
4144+++ src/apps/packageinstaller/PackageView.cpp (Arbeitskopie)
4145@@ -266,7 +266,7 @@
4146 BAlert *reinstall = new BAlert("reinstall",
4147 T("The given package seems to be already installed on your system. "
4148 "Would you like to uninstall the existing one and continue the "
4149- "installation?"), T("Yes"), T("No"));
4150+ "installation?"), T("Continue"), T("Abort"));
4151
4152 if (reinstall->Go() == 0) {
4153 // Uninstall the package
4154@@ -301,7 +301,7 @@
4155 return err;
4156 }
4157
4158- fStatusWindow->StageStep(1, "Installing files and directories");
4159+ fStatusWindow->StageStep(1, "Installing files and folders");
4160
4161 // Install files and directories
4162 PackageItem *iter;
4163@@ -570,11 +570,11 @@
4164 BString alertString = T("The ");
4165
4166 alertString << item.ItemKind() << T(" named \'") << path.Leaf() << "\' ";
4167- alertString << T("already exists in the given path. Should the "
4168- "existing file be replaced with the one from this package?");
4169-
4170+ alertString << T("already exists in the given path.\nReplace the file with "
4171+ "the one from this package or skip it?");
4172+
4173 BAlert *alert = new BAlert(T("file_exists"), alertString.String(),
4174- T("Yes"), T("No"), T("Abort"));
4175+ T("Replace"), T("Skip"), T("Abort"));
4176
4177 choice = alert->Go();
4178 switch (choice) {
4179@@ -590,8 +590,8 @@
4180
4181 if (fItemExistsPolicy == P_EXISTS_NONE) {
4182 // TODO: Maybe add 'No, but ask again' type of choice as well?
4183- alertString = T("Should this decision be remembered and all "
4184- "existing files encountered in the future be ");
4185+ alertString = T("Do you want to remember this decision for the rest of "
4186+ "this installation?\nAll existing files will be ");
4187 alertString << ((choice == P_EXISTS_OVERWRITE)
4188 ? T("replaced?") : T("skipped?"));
4189
4190Index: src/apps/text_search/GrepWindow.cpp
4191===================================================================
4192--- src/apps/text_search/GrepWindow.cpp (Revision 34761)
4193+++ src/apps/text_search/GrepWindow.cpp (Arbeitskopie)
4194@@ -1,5 +1,6 @@
4195 /*
4196- * Copyright (c) 1998-2007 Matthijs Hollemans
4197+ * Copyright (c) 1998-2007, Matthijs Hollemans
4198+ * Copyright (c) 2009, Haiku, Inc. All rights reserved.
4199 *
4200 * Permission is hereby granted, free of charge, to any person obtaining a
4201 * copy of this software and associated documentation files (the "Software"),
4202@@ -416,21 +417,21 @@
4203
4204 fFileMenu = new BMenu(_T("File"));
4205 fActionMenu = new BMenu(_T("Actions"));
4206- fPreferencesMenu = new BMenu(_T("Preferences"));
4207+ fPreferencesMenu = new BMenu(_T("Settings"));
4208 fHistoryMenu = new BMenu(_T("History"));
4209 fEncodingMenu = new BMenu(_T("Encoding"));
4210
4211 fNew = new BMenuItem(
4212- _T("New Window"), new BMessage(MSG_NEW_WINDOW), 'N');
4213+ _T("New window"), new BMessage(MSG_NEW_WINDOW), 'N');
4214
4215 fOpen = new BMenuItem(
4216- _T("Set Which Files to Search"), new BMessage(MSG_OPEN_PANEL), 'F');
4217+ _T("Set which files to search"), new BMessage(MSG_OPEN_PANEL), 'F');
4218
4219 fClose = new BMenuItem(
4220 _T("Close"), new BMessage(B_QUIT_REQUESTED), 'W');
4221
4222 fAbout = new BMenuItem(
4223- _T("About"), new BMessage(B_ABOUT_REQUESTED));
4224+ _T("About TextSearch" B_UTF8_ELLIPSIS), new BMessage(B_ABOUT_REQUESTED));
4225
4226 fQuit = new BMenuItem(
4227 _T("Quit"), new BMessage(MSG_QUIT_NOW), 'Q');
4228@@ -439,31 +440,31 @@
4229 _T("Search"), new BMessage(MSG_START_CANCEL), 'S');
4230
4231 fSelectAll = new BMenuItem(
4232- _T("Select All"), new BMessage(MSG_SELECT_ALL), 'A');
4233+ _T("Select all"), new BMessage(MSG_SELECT_ALL), 'A');
4234
4235 fTrimSelection = new BMenuItem(
4236- _T("Trim to Selection"), new BMessage(MSG_TRIM_SELECTION), 'T');
4237+ _T("Trim to selection"), new BMessage(MSG_TRIM_SELECTION), 'T');
4238
4239 fOpenSelection = new BMenuItem(
4240- _T("Open Selection"), new BMessage(MSG_OPEN_SELECTION), 'O');
4241+ _T("Open selection"), new BMessage(MSG_OPEN_SELECTION), 'O');
4242
4243 fSelectInTracker = new BMenuItem(
4244- _T("Show Files in Tracker"), new BMessage(MSG_SELECT_IN_TRACKER), 'K');
4245+ _T("Show files in Tracker"), new BMessage(MSG_SELECT_IN_TRACKER), 'K');
4246
4247 fCopyText = new BMenuItem(
4248- _T("Copy Text to Clipboard"), new BMessage(MSG_COPY_TEXT), 'B');
4249+ _T("Copy text to clipboard"), new BMessage(MSG_COPY_TEXT), 'B');
4250
4251 fRecurseLinks = new BMenuItem(
4252 _T("Follow symbolic links"), new BMessage(MSG_RECURSE_LINKS));
4253
4254 fRecurseDirs = new BMenuItem(
4255- _T("Look in sub-directories"), new BMessage(MSG_RECURSE_DIRS));
4256+ _T("Look in sub-folders"), new BMessage(MSG_RECURSE_DIRS));
4257
4258 fSkipDotDirs = new BMenuItem(
4259- _T("Skip sub-directories starting with a dot"), new BMessage(MSG_SKIP_DOT_DIRS));
4260+ _T("Skip sub-folders starting with a dot"), new BMessage(MSG_SKIP_DOT_DIRS));
4261
4262 fCaseSensitive = new BMenuItem(
4263- _T("Case sensitive"), new BMessage(MSG_CASE_SENSITIVE));
4264+ _T("Case-sensitive"), new BMessage(MSG_CASE_SENSITIVE));
4265
4266 fEscapeText = new BMenuItem(
4267 _T("Escape search text"), new BMessage(MSG_ESCAPE_TEXT));
4268@@ -475,7 +476,7 @@
4269 _T("Open files in Pe"), new BMessage(MSG_INVOKE_PE));
4270
4271 fShowLinesMenuitem = new BMenuItem(
4272- _T("Show Lines"), new BMessage(MSG_MENU_SHOW_LINES), 'L');
4273+ _T("Show lines"), new BMessage(MSG_MENU_SHOW_LINES), 'L');
4274 fShowLinesMenuitem->SetMarked(true);
4275
4276 fUTF8 = new BMenuItem("UTF8", new BMessage('utf8'));
4277@@ -561,7 +562,7 @@
4278 fButton->SetEnabled(false);
4279
4280 fShowLinesCheckbox = new BCheckBox(
4281- BRect(0, 0, 1, 1), "ShowLines", _T("Show Lines"),
4282+ BRect(0, 0, 1, 1), "ShowLines", _T("Show lines"),
4283 new BMessage(MSG_CHECKBOX_SHOW_LINES), B_FOLLOW_LEFT);
4284
4285 fShowLinesCheckbox->SetValue(B_CONTROL_ON);
4286@@ -1284,7 +1285,7 @@
4287 text << "\n";
4288 text << _T("The unselected files will be removed from the list.");
4289 text << "\n";
4290- BAlert* alert = new BAlert(NULL, text.String(), _T("Okay"), NULL, NULL,
4291+ BAlert* alert = new BAlert(NULL, text.String(), _T("OK"), NULL, NULL,
4292 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4293 alert->Go(NULL);
4294 return;
4295@@ -1377,7 +1378,7 @@
4296 BAlert* alert = new BAlert("Info",
4297 _T("Please select the files you wish to have selected for you in "
4298 "Tracker."),
4299- _T("Okay"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4300+ _T("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4301 alert->Go(NULL);
4302 return;
4303 }
4304@@ -1438,9 +1439,8 @@
4305
4306 if (!_AreAllFoldersOpenInTracker(&folderList)) {
4307 BAlert* alert = new BAlert(NULL,
4308- _T(APP_NAME " couldn't open one or more folders, and it's very "
4309- "sorry about it."),
4310- _T("Forgive and forget!"), NULL, NULL, B_WIDTH_AS_USUAL,
4311+ _T(APP_NAME " couldn't open one or more folders,"),
4312+ _T("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
4313 B_STOP_ALERT);
4314 alert->Go(NULL);
4315 goto out;
4316@@ -1478,7 +1478,7 @@
4317 "Oliver Tappe, Jonas Sundström, Luc Schrijvers and momoziro.");
4318 text << "\n";
4319
4320- BAlert* alert = new BAlert("TextSearch", text.String(), _T("Ok"), NULL,
4321+ BAlert* alert = new BAlert("TextSearch", text.String(), _T("OK"), NULL,
4322 NULL, B_WIDTH_AS_USUAL, B_INFO_ALERT);
4323
4324 BTextView* view = alert->TextView();
4325Index: src/apps/stylededit/StyledEditWindow.cpp
4326===================================================================
4327--- src/apps/stylededit/StyledEditWindow.cpp (Revision 34761)
4328+++ src/apps/stylededit/StyledEditWindow.cpp (Arbeitskopie)
4329@@ -139,17 +139,17 @@
4330
4331 menu->AddItem(fSaveItem = new BMenuItem("Save", new BMessage(MENU_SAVE), 'S'));
4332 fSaveItem->SetEnabled(false);
4333- menu->AddItem(menuItem = new BMenuItem("Save As" B_UTF8_ELLIPSIS, new BMessage(MENU_SAVEAS)));
4334+ menu->AddItem(menuItem = new BMenuItem("Save as" B_UTF8_ELLIPSIS, new BMessage(MENU_SAVEAS)));
4335 menuItem->SetShortcut('S',B_SHIFT_KEY);
4336 menuItem->SetEnabled(true);
4337
4338- menu->AddItem(fRevertItem = new BMenuItem("Revert to Saved" B_UTF8_ELLIPSIS,
4339+ menu->AddItem(fRevertItem = new BMenuItem("Revert to saved" B_UTF8_ELLIPSIS,
4340 new BMessage(MENU_REVERT)));
4341 fRevertItem->SetEnabled(false);
4342 menu->AddItem(menuItem = new BMenuItem("Close", new BMessage(MENU_CLOSE), 'W'));
4343
4344 menu->AddSeparatorItem();
4345- menu->AddItem(menuItem = new BMenuItem("Page Setup" B_UTF8_ELLIPSIS, new BMessage(MENU_PAGESETUP)));
4346+ menu->AddItem(menuItem = new BMenuItem("Page setup" B_UTF8_ELLIPSIS, new BMessage(MENU_PAGESETUP)));
4347 menu->AddItem(menuItem = new BMenuItem("Print" B_UTF8_ELLIPSIS, new BMessage(MENU_PRINT), 'P'));
4348
4349 menu->AddSeparatorItem();
4350@@ -159,7 +159,7 @@
4351 menu = new BMenu("Edit");
4352 fMenuBar->AddItem(menu);
4353
4354- menu->AddItem(fUndoItem = new BMenuItem("Can't Undo", new BMessage(B_UNDO), 'Z'));
4355+ menu->AddItem(fUndoItem = new BMenuItem("Can't undo", new BMessage(B_UNDO), 'Z'));
4356 fUndoItem->SetEnabled(false);
4357
4358 menu->AddSeparatorItem();
4359@@ -178,17 +178,17 @@
4360 fClearItem->SetTarget(fTextView);
4361
4362 menu->AddSeparatorItem();
4363- menu->AddItem(menuItem = new BMenuItem("Select All", new BMessage(B_SELECT_ALL), 'A'));
4364+ menu->AddItem(menuItem = new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A'));
4365 menuItem->SetTarget(fTextView);
4366
4367 menu->AddSeparatorItem();
4368 menu->AddItem(menuItem = new BMenuItem("Find" B_UTF8_ELLIPSIS, new BMessage(MENU_FIND),'F'));
4369- menu->AddItem(fFindAgainItem= new BMenuItem("Find Again",new BMessage(MENU_FIND_AGAIN),'G'));
4370+ menu->AddItem(fFindAgainItem= new BMenuItem("Find again",new BMessage(MENU_FIND_AGAIN),'G'));
4371 fFindAgainItem->SetEnabled(false);
4372
4373- menu->AddItem(menuItem = new BMenuItem("Find Selection", new BMessage(MENU_FIND_SELECTION),'H'));
4374+ menu->AddItem(menuItem = new BMenuItem("Find selection", new BMessage(MENU_FIND_SELECTION),'H'));
4375 menu->AddItem(menuItem = new BMenuItem("Replace" B_UTF8_ELLIPSIS, new BMessage(MENU_REPLACE),'R'));
4376- menu->AddItem(fReplaceSameItem = new BMenuItem("Replace Same", new BMessage(MENU_REPLACE_SAME),'T'));
4377+ menu->AddItem(fReplaceSameItem = new BMenuItem("Replace same", new BMessage(MENU_REPLACE_SAME),'T'));
4378 fReplaceSameItem->SetEnabled(false);
4379
4380 // Add the "Font"-menu:
4381@@ -269,7 +269,7 @@
4382 subMenu->AddItem(fAlignCenter = new BMenuItem("Center", new BMessage(ALIGN_CENTER)));
4383 subMenu->AddItem(fAlignRight = new BMenuItem("Right", new BMessage(ALIGN_RIGHT)));
4384 menu->AddItem(subMenu);
4385- menu->AddItem(fWrapItem = new BMenuItem("Wrap Lines", new BMessage(WRAP_LINES)));
4386+ menu->AddItem(fWrapItem = new BMenuItem("Wrap lines", new BMessage(WRAP_LINES)));
4387 fWrapItem->SetMarked(true);
4388
4389 fSavePanel = NULL;
4390@@ -542,7 +542,7 @@
4391 // set mode
4392 fCanUndo = false;
4393 fCanRedo = true;
4394- fUndoItem->SetLabel("Redo Typing");
4395+ fUndoItem->SetLabel("Redo typing");
4396 fUndoItem->SetEnabled(true);
4397 fUndoFlag = false;
4398 } else {
4399@@ -562,7 +562,7 @@
4400 // set mode
4401 fCanUndo = true;
4402 fCanRedo = false;
4403- fUndoItem->SetLabel("Undo Typing");
4404+ fUndoItem->SetLabel("Undo typing");
4405 fUndoItem->SetEnabled(true);
4406 fRedoFlag = false;
4407 }
4408@@ -744,7 +744,7 @@
4409
4410 BString alertText("Save changes to the document \"");
4411 alertText<< Title() <<"\"? ";
4412- int32 index = _ShowAlert(alertText, "Cancel", "Don't Save", "Save",
4413+ int32 index = _ShowAlert(alertText, "Cancel", "Don't save", "Save",
4414 B_WARNING_ALERT);
4415
4416 if (index == 0)
4417@@ -988,7 +988,7 @@
4418 return;
4419
4420 // clear undo modes
4421- fUndoItem->SetLabel("Can't Undo");
4422+ fUndoItem->SetLabel("Can't undo");
4423 fUndoItem->SetEnabled(false);
4424 fUndoFlag = false;
4425 fCanUndo = false;
4426Index: src/apps/stylededit/ReplaceWindow.cpp
4427===================================================================
4428--- src/apps/stylededit/ReplaceWindow.cpp (Revision 34761)
4429+++ src/apps/stylededit/ReplaceWindow.cpp (Arbeitskopie)
4430@@ -1,5 +1,5 @@
4431 /*
4432- * Copyright 2002-2006, Haiku, Inc. All Rights Reserved.
4433+ * Copyright 2002-2009, Haiku, Inc. All rights reserved.
4434 * Distributed under the terms of the MIT License.
4435 *
4436 * Authors:
4437@@ -61,7 +61,7 @@
4438 fUIchange = false;
4439
4440 fReplaceView->AddChild(fReplaceAllButton = new BButton(BRect(10, 150, 98, 166),
4441- "", "Replace All", new BMessage(MSG_REPLACE_ALL), B_FOLLOW_LEFT | B_FOLLOW_TOP,
4442+ "", "Replace all", new BMessage(MSG_REPLACE_ALL), B_FOLLOW_LEFT | B_FOLLOW_TOP,
4443 B_WILL_DRAW | B_NAVIGABLE));
4444 fReplaceView->AddChild(fCancelButton = new BButton(BRect(141, 150, 211, 166),
4445 "", "Cancel", new BMessage(B_QUIT_REQUESTED), B_FOLLOW_LEFT | B_FOLLOW_TOP,
4446Index: src/apps/sudoku/SudokuWindow.cpp
4447===================================================================
4448--- src/apps/sudoku/SudokuWindow.cpp (Revision 34761)
4449+++ src/apps/sudoku/SudokuWindow.cpp (Arbeitskopie)
4450@@ -1,5 +1,5 @@
4451 /*
4452- * Copyright 2007-2008, Axel Dörfler, axeld@pinc-software.de.
4453+ * Copyright 2007-2009, Axel Dörfler, axeld@pinc-software.de.
4454 * Distributed under the terms of the MIT License.
4455 */
4456
4457@@ -182,10 +182,10 @@
4458 // "File" menu
4459 BMenu* menu = new BMenu("File");
4460 menu->AddItem(new BMenuItem("New", new BMessage(kMsgNew)));
4461- menu->AddItem(new BMenuItem("Start Again", new BMessage(kMsgStartAgain)));
4462+ menu->AddItem(new BMenuItem("Start again", new BMessage(kMsgStartAgain)));
4463 menu->AddSeparatorItem();
4464 BMenu* recentsMenu = BRecentFilesList::NewFileListMenu(
4465- "Open File" B_UTF8_ELLIPSIS, NULL, NULL, this, 10, false, NULL,
4466+ "Open file" B_UTF8_ELLIPSIS, NULL, NULL, this, 10, false, NULL,
4467 kSignature);
4468 BMenuItem *item;
4469 menu->AddItem(item = new BMenuItem(recentsMenu,
4470@@ -202,7 +202,7 @@
4471
4472 menu->AddSeparatorItem();
4473
4474- subMenu = new BMenu("Export As" B_UTF8_ELLIPSIS);
4475+ subMenu = new BMenu("Export as" B_UTF8_ELLIPSIS);
4476 BMessage *msg;
4477 msg = new BMessage(kMsgExportAs);
4478 msg->AddInt32("as", kExportAsText);
4479@@ -233,11 +233,11 @@
4480
4481 // "View" menu
4482 menu = new BMenu("View");
4483- menu->AddItem(item = new BMenuItem("Mark Invalid Values",
4484+ menu->AddItem(item = new BMenuItem("Mark invalid values",
4485 new BMessage(kMsgMarkInvalid)));
4486 if (fSudokuView->HintFlags() & kMarkInvalid)
4487 item->SetMarked(true);
4488- menu->AddItem(item = new BMenuItem("Mark Valid Hints",
4489+ menu->AddItem(item = new BMenuItem("Mark valid hints",
4490 new BMessage(kMsgMarkValidHints)));
4491 if (fSudokuView->HintFlags() & kMarkValidHints)
4492 item->SetMarked(true);
4493@@ -253,14 +253,14 @@
4494 fRedoItem->SetEnabled(false);
4495 menu->AddSeparatorItem();
4496
4497- menu->AddItem(new BMenuItem("Snapshot Current", new BMessage(kMsgStoreState)));
4498- menu->AddItem(fRestoreStateItem = new BMenuItem("Restore Snapshot",
4499+ menu->AddItem(new BMenuItem("Snapshot current", new BMessage(kMsgStoreState)));
4500+ menu->AddItem(fRestoreStateItem = new BMenuItem("Restore snapshot",
4501 new BMessage(kMsgRestoreState)));
4502 fRestoreStateItem->SetEnabled(fStoredState != NULL);
4503 menu->AddSeparatorItem();
4504
4505 menu->AddItem(new BMenuItem("Solve", new BMessage(kMsgSolveSudoku)));
4506- menu->AddItem(new BMenuItem("Solve Single Field",
4507+ menu->AddItem(new BMenuItem("Solve single field",
4508 new BMessage(kMsgSolveSingle)));
4509 menu->SetTargetForItems(fSudokuView);
4510 menuBar->AddItem(menu);
4511@@ -386,7 +386,7 @@
4512 }
4513
4514 (new BAlert("Sudoku request",
4515- buffer, "Ok", NULL, NULL,
4516+ buffer, "OK", NULL, NULL,
4517 B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
4518 }
4519 }
4520@@ -528,7 +528,7 @@
4521
4522 case kMsgSudokuSolved:
4523 (new BAlert("Sudoku request",
4524- "Sudoku solved - congratulations!", "Ok", NULL, NULL,
4525+ "Sudoku solved - congratulations!", "OK", NULL, NULL,
4526 B_WIDTH_AS_USUAL, B_IDEA_ALERT))->Go();
4527 break;
4528
4529Index: src/apps/sudoku/Sudoku.cpp
4530===================================================================
4531--- src/apps/sudoku/Sudoku.cpp (Revision 34761)
4532+++ src/apps/sudoku/Sudoku.cpp (Arbeitskopie)
4533@@ -1,5 +1,5 @@
4534 /*
4535- * Copyright 2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
4536+ * Copyright 2007-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
4537 * Distributed under the terms of the MIT License.
4538 */
4539
4540@@ -63,7 +63,7 @@
4541 {
4542 BAlert *alert = new BAlert("about", "Sudoku\n"
4543 "\twritten by Axel Dörfler\n"
4544- "\tCopyright 2007, Haiku Inc.\n", "Ok");
4545+ "\tCopyright 2007, Haiku Inc.\n", "OK");
4546 BTextView *view = alert->TextView();
4547 BFont font;
4548
4549Index: src/apps/sudoku/ProgressWindow.cpp
4550===================================================================
4551--- src/apps/sudoku/ProgressWindow.cpp (Revision 34761)
4552+++ src/apps/sudoku/ProgressWindow.cpp (Arbeitskopie)
4553@@ -1,5 +1,5 @@
4554 /*
4555- * Copyright 2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
4556+ * Copyright 2007-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
4557 * Distributed under the terms of the MIT License.
4558 */
4559
4560@@ -20,7 +20,7 @@
4561
4562 ProgressWindow::ProgressWindow(BWindow* referenceWindow,
4563 BMessage* abortMessage)
4564- : BWindow(BRect(0, 0, 250, 100), "Progress Monitor",
4565+ : BWindow(BRect(0, 0, 250, 100), "Progress monitor",
4566 B_MODAL_WINDOW_LOOK, B_FLOATING_APP_WINDOW_FEEL,
4567 B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS),
4568 fRunner(NULL)
4569Index: src/apps/terminal/TermWindow.cpp
4570===================================================================
4571--- src/apps/terminal/TermWindow.cpp (Revision 34761)
4572+++ src/apps/terminal/TermWindow.cpp (Arbeitskopie)
4573@@ -1,5 +1,5 @@
4574 /*
4575- * Copyright 2007 Haiku, Inc.
4576+ * Copyright 2007-2009 Haiku, Inc. All rights reserved.
4577 * Copyright (c) 2004 Daniel Furrer <assimil8or@users.sourceforge.net>
4578 * Copyright (c) 2003-2004 Kian Duffy <myob@users.sourceforge.net>
4579 * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
4580@@ -253,7 +253,7 @@
4581 BMenu *
4582 TermWindow::_MakeEncodingMenu()
4583 {
4584- BMenu *menu = new (std::nothrow) BMenu("Text Encoding");
4585+ BMenu *menu = new (std::nothrow) BMenu("Text encoding");
4586 if (menu == NULL)
4587 return NULL;
4588
4589@@ -285,19 +285,19 @@
4590 fFilemenu = new BMenu("Terminal");
4591 fFilemenu->AddItem(new BMenuItem("Switch Terminals",
4592 new BMessage(MENU_SWITCH_TERM), B_TAB));
4593- fFilemenu->AddItem(new BMenuItem("New Terminal" B_UTF8_ELLIPSIS,
4594+ fFilemenu->AddItem(new BMenuItem("New Terminal",
4595 new BMessage(MENU_NEW_TERM), 'N'));
4596- fFilemenu->AddItem(new BMenuItem("New Tab", new BMessage(kNewTab), 'T'));
4597+ fFilemenu->AddItem(new BMenuItem("New tab", new BMessage(kNewTab), 'T'));
4598
4599 fFilemenu->AddSeparatorItem();
4600- fFilemenu->AddItem(new BMenuItem("Page Setup" B_UTF8_ELLIPSIS,
4601+ fFilemenu->AddItem(new BMenuItem("Page setup" B_UTF8_ELLIPSIS,
4602 new BMessage(MENU_PAGE_SETUP)));
4603 fFilemenu->AddItem(new BMenuItem("Print", new BMessage(MENU_PRINT),'P'));
4604 fFilemenu->AddSeparatorItem();
4605 fFilemenu->AddItem(new BMenuItem("About Terminal" B_UTF8_ELLIPSIS,
4606 new BMessage(B_ABOUT_REQUESTED)));
4607 fFilemenu->AddSeparatorItem();
4608- fFilemenu->AddItem(new BMenuItem("Close Active Tab",
4609+ fFilemenu->AddItem(new BMenuItem("Close active tab",
4610 new BMessage(kCloseView), 'W', B_SHIFT_KEY));
4611 fFilemenu->AddItem(new BMenuItem("Quit",
4612 new BMessage(B_QUIT_REQUESTED), 'Q'));
4613@@ -308,18 +308,18 @@
4614 fEditmenu->AddItem(new BMenuItem("Copy", new BMessage(B_COPY),'C'));
4615 fEditmenu->AddItem(new BMenuItem("Paste", new BMessage(B_PASTE),'V'));
4616 fEditmenu->AddSeparatorItem();
4617- fEditmenu->AddItem(new BMenuItem("Select All",
4618+ fEditmenu->AddItem(new BMenuItem("Select all",
4619 new BMessage(B_SELECT_ALL), 'A'));
4620- fEditmenu->AddItem(new BMenuItem("Clear All",
4621+ fEditmenu->AddItem(new BMenuItem("Clear all",
4622 new BMessage(MENU_CLEAR_ALL), 'L'));
4623 fEditmenu->AddSeparatorItem();
4624 fEditmenu->AddItem(new BMenuItem("Find" B_UTF8_ELLIPSIS,
4625 new BMessage(MENU_FIND_STRING),'F'));
4626- fFindPreviousMenuItem = new BMenuItem("Find Previous",
4627+ fFindPreviousMenuItem = new BMenuItem("Find previous",
4628 new BMessage(MENU_FIND_PREVIOUS), 'G', B_SHIFT_KEY);
4629 fEditmenu->AddItem(fFindPreviousMenuItem);
4630 fFindPreviousMenuItem->SetEnabled(false);
4631- fFindNextMenuItem = new BMenuItem("Find Next",
4632+ fFindNextMenuItem = new BMenuItem("Find next",
4633 new BMessage(MENU_FIND_NEXT), 'G');
4634 fEditmenu->AddItem(fFindNextMenuItem);
4635 fFindNextMenuItem->SetEnabled(false);
4636@@ -332,7 +332,7 @@
4637
4638 fEncodingmenu = _MakeEncodingMenu();
4639
4640- fSizeMenu = new BMenu("Text Size");
4641+ fSizeMenu = new BMenu("Text size");
4642
4643 fIncreaseFontSizeMenuItem = new BMenuItem("Increase",
4644 new BMessage(kIncreaseFontSize), '+', B_COMMAND_KEY);
4645@@ -347,7 +347,7 @@
4646 fHelpmenu->AddItem(fEncodingmenu);
4647 fHelpmenu->AddItem(fSizeMenu);
4648 fHelpmenu->AddSeparatorItem();
4649- fHelpmenu->AddItem(new BMenuItem("Preferences" B_UTF8_ELLIPSIS,
4650+ fHelpmenu->AddItem(new BMenuItem("Settings" B_UTF8_ELLIPSIS,
4651 new BMessage(MENU_PREF_OPEN)));
4652 fHelpmenu->AddSeparatorItem();
4653 fHelpmenu->AddItem(new BMenuItem("Save as default",
4654@@ -452,7 +452,7 @@
4655 if (fFindString.Length() == 0) {
4656 const char* errorMsg = !fFindSelection
4657 ? "No search string was entered." : "Nothing is selected.";
4658- BAlert* alert = new BAlert("Find failed", errorMsg, "Ok", NULL,
4659+ BAlert* alert = new BAlert("Find failed", errorMsg, "OK", NULL,
4660 NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4661
4662 alert->Go();
4663@@ -467,7 +467,7 @@
4664 findresult = _ActiveTermView()->Find(fFindString, fForwardSearch, fMatchCase, fMatchWord);
4665
4666 if (!findresult) {
4667- BAlert *alert = new BAlert("Find failed", "Text not found.", "Ok", NULL,
4668+ BAlert *alert = new BAlert("Find failed", "Text not found.", "OK", NULL,
4669 NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4670 alert->SetShortcut(0, B_ESCAPE);
4671 alert->Go();
4672@@ -488,7 +488,7 @@
4673 (message->what == MENU_FIND_NEXT) == fForwardSearch,
4674 fMatchCase, fMatchWord);
4675 if (!findresult) {
4676- BAlert *alert = new BAlert("find failed", "Not Found.", "Okay",
4677+ BAlert *alert = new BAlert("Find failed", "Not found.", "OK",
4678 NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4679 alert->SetShortcut(0, B_ESCAPE);
4680 alert->Go();
4681@@ -976,7 +976,7 @@
4682 BMenu*
4683 TermWindow::_MakeWindowSizeMenu()
4684 {
4685- BMenu *menu = new (std::nothrow) BMenu("Window Size");
4686+ BMenu *menu = new (std::nothrow) BMenu("Window size");
4687 if (menu == NULL)
4688 return NULL;
4689
4690@@ -1000,7 +1000,7 @@
4691 }
4692
4693 menu->AddSeparatorItem();
4694- menu->AddItem(new BMenuItem("Fullscreen", new BMessage(FULLSCREEN),
4695+ menu->AddItem(new BMenuItem("Full screen", new BMessage(FULLSCREEN),
4696 B_ENTER));
4697
4698 return menu;
4699Index: src/apps/terminal/TermView.cpp
4700===================================================================
4701--- src/apps/terminal/TermView.cpp (Revision 34761)
4702+++ src/apps/terminal/TermView.cpp (Arbeitskopie)
4703@@ -1794,11 +1794,11 @@
4704 cpMessage->what = kSecondaryMouseDropAction;
4705 cpMessage->AddInt8("action", kCopyFiles);
4706
4707- BMenuItem* insertItem = new BMenuItem("Insert Path", insertMessage);
4708- BMenuItem* cdItem = new BMenuItem("Change Directory", cdMessage);
4709- BMenuItem* lnItem = new BMenuItem("Create Link Here", lnMessage);
4710- BMenuItem* mvItem = new BMenuItem("Move Here", mvMessage);
4711- BMenuItem* cpItem = new BMenuItem("Copy Here", cpMessage);
4712+ BMenuItem* insertItem = new BMenuItem("Insert path", insertMessage);
4713+ BMenuItem* cdItem = new BMenuItem("Change directory", cdMessage);
4714+ BMenuItem* lnItem = new BMenuItem("Create link here", lnMessage);
4715+ BMenuItem* mvItem = new BMenuItem("Move here", mvMessage);
4716+ BMenuItem* cpItem = new BMenuItem("Copy here", cpMessage);
4717 BMenuItem* chItem = new BMenuItem("Cancel", NULL);
4718
4719 // if the refs point to different directorys disable the cd menu item
4720@@ -2740,7 +2740,7 @@
4721 "Terminal\n\n"
4722 "written by Kazuho Okui and Takashi Murai\n"
4723 "updated by Kian Duffy and others\n\n"
4724- "Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku.\n", "Ok");
4725+ "Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku.\n", "OK");
4726 if (alert != NULL)
4727 alert->Go();
4728 }
4729Index: src/apps/terminal/PrefWindow.cpp
4730===================================================================
4731--- src/apps/terminal/PrefWindow.cpp (Revision 34761)
4732+++ src/apps/terminal/PrefWindow.cpp (Arbeitskopie)
4733@@ -1,5 +1,5 @@
4734 /*
4735- * Copyright 2007-2008, Haiku, Inc.
4736+ * Copyright 2007-2009, Haiku, Inc. All rights reserved.
4737 * Copyright 2003-2004 Kian Duffy, myob@users.sourceforge.net
4738 * Parts Copyright 1998-1999 Kazuho Okui and Takashi Murai.
4739 * All rights reserved. Distributed under the terms of the MIT license.
4740@@ -23,7 +23,7 @@
4741
4742
4743 PrefWindow::PrefWindow(const BMessenger &messenger)
4744- : BWindow(BRect(0, 0, 375, 185), "Terminal Preferences",
4745+ : BWindow(BRect(0, 0, 375, 185), "Terminal settings",
4746 B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
4747 B_NOT_RESIZABLE|B_NOT_ZOOMABLE|B_AUTO_UPDATE_SIZE_LIMITS),
4748 fPreviousPref(new PrefHandler(PrefHandler::Default())),
4749@@ -37,7 +37,7 @@
4750 .Add(new AppearancePrefView("Appearance", fTerminalMessenger))
4751 .AddGroup(B_HORIZONTAL)
4752 .Add(fSaveAsFileButton = new BButton("savebutton",
4753- "Save to File" B_UTF8_ELLIPSIS,
4754+ "Save to file" B_UTF8_ELLIPSIS,
4755 new BMessage(MSG_SAVEAS_PRESSED), B_WILL_DRAW))
4756 .AddGlue()
4757 .Add(fRevertButton = new BButton("revertbutton",
4758@@ -79,8 +79,8 @@
4759 if (!fDirty)
4760 return true;
4761
4762- BAlert *alert = new BAlert("", "Save changes to this preference panel?",
4763- "Cancel", "Don't Save", "Save",
4764+ BAlert *alert = new BAlert("", "Save changes to this settings panel?",
4765+ "Cancel", "Don't save", "Save",
4766 B_WIDTH_AS_USUAL, B_OFFSET_SPACING,
4767 B_WARNING_ALERT);
4768 alert->SetShortcut(0, B_ESCAPE);
4769Index: src/apps/terminal/Shell.cpp
4770===================================================================
4771--- src/apps/terminal/Shell.cpp (Revision 34761)
4772+++ src/apps/terminal/Shell.cpp (Arbeitskopie)
4773@@ -1,5 +1,5 @@
4774 /*
4775- * Copyright 2007 Haiku, inc.
4776+ * Copyright 2007-2009 Haiku, Inc. All rights reserved.
4777 * Copyright (c) 2003-4 Kian Duffy <myob@users.sourceforge.net>
4778 * Copyright (c) 2004 Daniel Furrer <assimil8or@users.sourceforge.net>
4779 * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
4780@@ -504,7 +504,7 @@
4781 const char *spawnAlertMessage = "alert --stop "
4782 "'Cannot execute \"%s\":\n"
4783 "\t%s' "
4784- "'Use Default Shell' 'Abort'";
4785+ "'Use default shell' 'Abort'";
4786 char errorMessage[256];
4787 snprintf(errorMessage, sizeof(errorMessage), spawnAlertMessage, argv[0], strerror(errno));
4788
4789Index: src/apps/terminal/SmartTabView.cpp
4790===================================================================
4791--- src/apps/terminal/SmartTabView.cpp (Revision 34761)
4792+++ src/apps/terminal/SmartTabView.cpp (Arbeitskopie)
4793@@ -76,7 +76,7 @@
4794 message->AddInt32("index", tabIndex);
4795
4796 BPopUpMenu* popUpMenu = new BPopUpMenu("tab menu");
4797- popUpMenu->AddItem(new BMenuItem("Close Tab", message));
4798+ popUpMenu->AddItem(new BMenuItem("Close tab", message));
4799 popUpMenu->SetAsyncAutoDestruct(true);
4800 popUpMenu->SetTargetForItems(BMessenger(this));
4801 popUpMenu->Go(ConvertToScreen(point), true, true, true);
4802Index: src/apps/terminal/FindWindow.cpp
4803===================================================================
4804--- src/apps/terminal/FindWindow.cpp (Revision 34761)
4805+++ src/apps/terminal/FindWindow.cpp (Arbeitskopie)
4806@@ -1,5 +1,5 @@
4807 /*
4808- * Copyright 2007, Haiku, Inc.
4809+ * Copyright 2007-2009, Haiku, Inc. All rights reserved.
4810 * Copyright 2003-2004 Kian Duffy, myob@users.sourceforge.net
4811 * Parts Copyright 1998-1999 Kazuho Okui and Takashi Murai.
4812 * All rights reserved. Distributed under the terms of the MIT license.
4813@@ -39,18 +39,18 @@
4814
4815 BView *layoutView = BGroupLayoutBuilder(B_VERTICAL, 10)
4816 .SetInsets(5, 5, 5, 5)
4817- .Add(fTextRadio = new BRadioButton("fTextRadio", "Use Text: ",
4818+ .Add(fTextRadio = new BRadioButton("fTextRadio", "Use text: ",
4819 NULL))
4820 .Add(fFindLabel = new BTextControl("fFindLabel", "", "", NULL))
4821 .Add(fSelectionRadio = new BRadioButton("fSelectionRadio",
4822- "Use Selection", NULL))
4823+ "Use selection", NULL))
4824 .Add(separator)
4825 .Add(fForwardSearchBox = new BCheckBox("fForwardSearchBox",
4826- "Search Forward", NULL))
4827+ "Search forward", NULL))
4828 .Add(fMatchCaseBox = new BCheckBox("fMatchCaseBox",
4829- "Match Case", NULL))
4830+ "Match case", NULL))
4831 .Add(fMatchWordBox = new BCheckBox("fMatchWordBox",
4832- "Match Word", NULL))
4833+ "Match word", NULL))
4834 .Add(fFindButton = new BButton("fFindButton", "Find",
4835 new BMessage(MSG_FIND)))
4836 .End();
4837Index: src/apps/terminal/TermApp.cpp
4838===================================================================
4839--- src/apps/terminal/TermApp.cpp (Revision 34761)
4840+++ src/apps/terminal/TermApp.cpp (Arbeitskopie)
4841@@ -1,5 +1,5 @@
4842 /*
4843- * Copyright 2001-2008, Haiku.
4844+ * Copyright 2001-2009, Haiku.
4845 * Copyright (c) 2003-2004 Kian Duffy <myob@users.sourceforge.net>
4846 * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
4847 *
4848@@ -114,7 +114,7 @@
4849 // TODO: This alert does never show up.
4850 if (status < B_OK) {
4851 (new BAlert("alert", "Terminal couldn't start the shell. Sorry.",
4852- "ok", NULL, NULL, B_WIDTH_FROM_LABEL,
4853+ "OK", NULL, NULL, B_WIDTH_FROM_LABEL,
4854 B_INFO_ALERT))->Go(NULL);
4855 PostMessage(B_QUIT_REQUESTED);
4856 return;
4857Index: src/apps/terminal/TermConst.h
4858===================================================================
4859--- src/apps/terminal/TermConst.h (Revision 34761)
4860+++ src/apps/terminal/TermConst.h (Arbeitskopie)
4861@@ -100,34 +100,34 @@
4862
4863 const char* const PREF_TEXT_FORE_COLOR = "Text";
4864 const char* const PREF_TEXT_BACK_COLOR = "Background";
4865-const char* const PREF_SELECT_FORE_COLOR = "Selected Text";
4866-const char* const PREF_SELECT_BACK_COLOR = "Selected Background";
4867-const char* const PREF_CURSOR_FORE_COLOR = "Cursor Text";
4868-const char* const PREF_CURSOR_BACK_COLOR = "Cursor Background";
4869+const char* const PREF_SELECT_FORE_COLOR = "Selected text";
4870+const char* const PREF_SELECT_BACK_COLOR = "Selected background";
4871+const char* const PREF_CURSOR_FORE_COLOR = "Cursor text";
4872+const char* const PREF_CURSOR_BACK_COLOR = "Cursor background";
4873
4874-const char* const PREF_IM_FORE_COLOR = "IM Foreground Color";
4875-const char* const PREF_IM_BACK_COLOR = "IM Background Color";
4876-const char* const PREF_IM_SELECT_COLOR = "IM Selection Color";
4877+const char* const PREF_IM_FORE_COLOR = "IM foreground color";
4878+const char* const PREF_IM_BACK_COLOR = "IM background color";
4879+const char* const PREF_IM_SELECT_COLOR = "IM selection color";
4880
4881-const char* const PREF_ANSI_BLACK_COLOR = "ANSI Black Color";
4882-const char* const PREF_ANSI_RED_COLOR = "ANSI Red Color";
4883-const char* const PREF_ANSI_GREEN_COLOR = "ANSI Green Color";
4884-const char* const PREF_ANSI_YELLOW_COLOR = "ANSI Yellow Color";
4885-const char* const PREF_ANSI_BLUE_COLOR = "ANSI Blue Color";
4886-const char* const PREF_ANSI_MAGENTA_COLOR = "ANSI Magenta Color";
4887-const char* const PREF_ANSI_CYAN_COLOR = "ANSI Cyan Color";
4888-const char* const PREF_ANSI_WHITE_COLOR = "ANSI White Color";
4889+const char* const PREF_ANSI_BLACK_COLOR = "ANSI black color";
4890+const char* const PREF_ANSI_RED_COLOR = "ANSI red color";
4891+const char* const PREF_ANSI_GREEN_COLOR = "ANSI green color";
4892+const char* const PREF_ANSI_YELLOW_COLOR = "ANSI yellow color";
4893+const char* const PREF_ANSI_BLUE_COLOR = "ANSI blue color";
4894+const char* const PREF_ANSI_MAGENTA_COLOR = "ANSI magenta color";
4895+const char* const PREF_ANSI_CYAN_COLOR = "ANSI cyan color";
4896+const char* const PREF_ANSI_WHITE_COLOR = "ANSI white color";
4897
4898-const char* const PREF_HISTORY_SIZE = "History Size";
4899-const char* const PREF_CURSOR_BLINKING = "Cursor Blinking Rate";
4900+const char* const PREF_HISTORY_SIZE = "History size";
4901+const char* const PREF_CURSOR_BLINKING = "Cursor blinking rate";
4902
4903-const char* const PREF_IM_AWARE = "Input Method Aware";
4904+const char* const PREF_IM_AWARE = "Input method aware";
4905
4906 const char* const PREF_COLS = "Cols";
4907 const char* const PREF_ROWS = "Rows";
4908 const char* const PREF_SHELL = "Shell";
4909
4910-const char* const PREF_TEXT_ENCODING = "Text Encoding";
4911+const char* const PREF_TEXT_ENCODING = "Text encoding";
4912 const char* const PREF_GUI_LANGUAGE = "Language";
4913
4914 // Color type
4915Index: src/apps/soundrecorder/SoundListView.cpp
4916===================================================================
4917--- src/apps/soundrecorder/SoundListView.cpp (Revision 34761)
4918+++ src/apps/soundrecorder/SoundListView.cpp (Arbeitskopie)
4919@@ -1,5 +1,5 @@
4920 /*
4921- * Copyright 2005, Jérôme Duval. All rights reserved.
4922+ * Copyright 2005-2009, Jérôme Duval. All rights reserved.
4923 * Distributed under the terms of the MIT License.
4924 *
4925 * Inspired by SoundCapture from Be newsletter (Media Kit Basics: Consumers and Producers)
4926@@ -36,12 +36,12 @@
4927 SetFont(&font);
4928 font_height height;
4929 font.GetHeight(&height);
4930- float width = font.StringWidth("Drop Files Here");
4931+ float width = font.StringWidth("Drop files here");
4932
4933 BPoint pt;
4934 pt.x = (Bounds().Width() - width) / 2;
4935 pt.y = (Bounds().Height() + height.ascent + height.descent)/ 2;
4936- DrawString("Drop Files Here", pt);
4937+ DrawString("Drop files here", pt);
4938 }
4939 BListView::Draw(updateRect);
4940 }
4941Index: src/apps/soundrecorder/RecorderWindow.cpp
4942===================================================================
4943--- src/apps/soundrecorder/RecorderWindow.cpp (Revision 34761)
4944+++ src/apps/soundrecorder/RecorderWindow.cpp (Arbeitskopie)
4945@@ -1,5 +1,5 @@
4946 /*
4947- * Copyright 2005, Jérôme Duval. All rights reserved.
4948+ * Copyright 2005-2009, Jérôme Duval. All rights reserved.
4949 * Distributed under the terms of the MIT License.
4950 *
4951 * Inspired by SoundCapture from Be newsletter (Media Kit Basics:
4952@@ -379,14 +379,14 @@
4953 r.InsetBy(10, 8);
4954 r.top -= 1;
4955 fFileInfoBox = new BBox(r, "fileinfo", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
4956- fFileInfoBox->SetLabel("File Info");
4957+ fFileInfoBox->SetLabel("File info");
4958
4959 r = fFileInfoBox->Bounds();
4960 r.left = 8;
4961 r.top = 13;
4962 r.bottom = r.top + 15;
4963 r.right -= 10;
4964- fFilename = new BStringView(r, "filename", "File Name:");
4965+ fFilename = new BStringView(r, "filename", "File name:");
4966 fFileInfoBox->AddChild(fFilename);
4967 r.top += 13;
4968 r.bottom = r.top + 15;
4969@@ -402,11 +402,11 @@
4970 fFileInfoBox->AddChild(fChannels);
4971 r.top += 13;
4972 r.bottom = r.top + 15;
4973- fSampleSize = new BStringView(r, "samplesize", "Sample Size:");
4974+ fSampleSize = new BStringView(r, "samplesize", "Sample size:");
4975 fFileInfoBox->AddChild(fSampleSize);
4976 r.top += 13;
4977 r.bottom = r.top + 15;
4978- fSampleRate = new BStringView(r, "samplerate", "Sample Rate:");
4979+ fSampleRate = new BStringView(r, "samplerate", "Sample rate:");
4980 fFileInfoBox->AddChild(fSampleRate);
4981 r.top += 13;
4982 r.bottom = r.top + 15;
4983@@ -429,7 +429,7 @@
4984 WINDOW((stderr, "dropped %ld inputs\n", real_count - max_input_count));
4985 real_count = max_input_count;
4986 }
4987- char selected_name[B_MEDIA_NAME_LENGTH] = "Default Input";
4988+ char selected_name[B_MEDIA_NAME_LENGTH] = "Default input";
4989 BMessage * msg;
4990 BMenuItem * item;
4991 for (int i = 0; i < real_count; i++) {
4992@@ -1093,7 +1093,7 @@
4993 if (!updateDisplay)
4994 return B_OK;
4995
4996- BString filename = "File Name: ";
4997+ BString filename = "File name: ";
4998 filename << ref.name;
4999 fFilename->SetText(filename.String());
5000
5001@@ -1111,9 +1111,9 @@
5002 }
5003 BString channels = "Channels: ";
5004 channels << fPlayFormat.u.raw_audio.channel_count;
5005- BString samplesize = "Sample Size: ";
5006+ BString samplesize = "Sample size: ";
5007 samplesize << 8 * (fPlayFormat.u.raw_audio.format & 0xf) << " bits";
5008- BString samplerate = "Sample Rate: ";
5009+ BString samplerate = "Sample rate: ";
5010 samplerate << (int)fPlayFormat.u.raw_audio.frame_rate;
5011 BString durationString = "Duration: ";
5012 bigtime_t duration = fPlayTrack->Duration();
5013@@ -1302,7 +1302,7 @@
5014 }
5015
5016 if (countBad > 0 && countGood == 0)
5017- (new BAlert("Nothing to Play", "None of the files appear to be "
5018+ (new BAlert("Nothing to play", "None of the files appear to be "
5019 "audio files", "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
5020 else if (countGood > 0) {
5021 if (countBad > 0)
5022Index: src/apps/gradients/GradientsWindow.cpp
5023===================================================================
5024--- src/apps/gradients/GradientsWindow.cpp (Revision 34761)
5025+++ src/apps/gradients/GradientsWindow.cpp (Arbeitskopie)
5026@@ -18,7 +18,7 @@
5027 fGradientsMenu = new BPopUpMenu("gradientsType");
5028 fLinearItem = new BMenuItem("Linear", new BMessage(MSG_LINEAR));
5029 fRadialItem = new BMenuItem("Radial", new BMessage(MSG_RADIAL));
5030- fRadialFocusItem = new BMenuItem("Radial Focus",
5031+ fRadialFocusItem = new BMenuItem("Radial focus",
5032 new BMessage(MSG_RADIAL_FOCUS));
5033
5034 fDiamondItem = new BMenuItem("Diamond", new BMessage(MSG_DIAMOND));
5035Index: src/apps/mail/Signature.cpp
5036===================================================================
5037--- src/apps/mail/Signature.cpp (Revision 34761)
5038+++ src/apps/mail/Signature.cpp (Arbeitskopie)
5039@@ -4,6 +4,7 @@
5040 Terms and Conditions
5041
5042 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5043+Copyright (c) 2009, Haiku, Inc.
5044
5045 Permission is hereby granted, free of charge, to any person obtaining a copy of
5046 this software and associated documentation files (the "Software"), to deal in
5047@@ -92,7 +93,7 @@
5048 menu->AddItem(fPaste = new BMenuItem(MDR_DIALECT_CHOICE ("Paste","V) 貼り付け"), new BMessage(B_PASTE), 'V'));
5049 fPaste->SetTarget(NULL, this);
5050 menu->AddSeparatorItem();
5051- menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE ("Select All","A) 全文選択"), new BMessage(M_SELECT), 'A'));
5052+ menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE ("Select all","A) 全文選択"), new BMessage(M_SELECT), 'A'));
5053 item->SetTarget(NULL, this);
5054 menu_bar->AddItem(menu);
5055
5056@@ -285,7 +286,7 @@
5057 beep();
5058 BAlert *alert = new BAlert("",
5059 MDR_DIALECT_CHOICE ("Save changes to this signature?","変更した署名を保存しますか?"),
5060- MDR_DIALECT_CHOICE ("Don't Save","保存しない"),
5061+ MDR_DIALECT_CHOICE ("Don't save","保存しない"),
5062 MDR_DIALECT_CHOICE ("Cancel","中止"),
5063 MDR_DIALECT_CHOICE ("Save","保存する"),
5064 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
5065Index: src/apps/mail/Enclosures.h
5066===================================================================
5067--- src/apps/mail/Enclosures.h (Revision 34761)
5068+++ src/apps/mail/Enclosures.h (Arbeitskopie)
5069@@ -4,6 +4,7 @@
5070 Terms and Conditions
5071
5072 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5073+Copyright (c) 2009, Haiku, Inc. All rights reserved.
5074
5075 Permission is hereby granted, free of charge, to any person obtaining a copy of
5076 this software and associated documentation files (the "Software"), to deal in
5077@@ -56,7 +57,7 @@
5078
5079 #define ENCLOSURES_HEIGHT 65
5080
5081-#define ENCLOSE_TEXT "Enclosures:"
5082+#define ENCLOSE_TEXT "Attachments:"
5083 #define ENCLOSE_TEXT_H 7
5084 #define ENCLOSE_TEXT_V 3
5085 #define ENCLOSE_FIELD_V 3
5086Index: src/apps/mail/MailWindow.cpp
5087===================================================================
5088--- src/apps/mail/MailWindow.cpp (Revision 34761)
5089+++ src/apps/mail/MailWindow.cpp (Arbeitskopie)
5090@@ -4,6 +4,7 @@
5091 Terms and Conditions
5092
5093 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5094+Copyright (c) 2009, Haiku, Inc. All rights reserved.
5095
5096 Permission is hereby granted, free of charge, to any person obtaining a copy of
5097 this software and associated documentation files (the "Software"), to deal in
5098@@ -91,29 +92,29 @@
5099
5100 const char *kUndoStrings[] = {
5101 MDR_DIALECT_CHOICE ("Undo","Z) 取り消し"),
5102- MDR_DIALECT_CHOICE ("Undo Typing","Z) 取り消し(入力)"),
5103- MDR_DIALECT_CHOICE ("Undo Cut","Z) 取り消し(切り取り)"),
5104- MDR_DIALECT_CHOICE ("Undo Paste","Z) 取り消し(貼り付け)"),
5105- MDR_DIALECT_CHOICE ("Undo Clear","Z) 取り消し(消去)"),
5106- MDR_DIALECT_CHOICE ("Undo Drop","Z) 取り消し(ドロップ)")
5107+ MDR_DIALECT_CHOICE ("Undo typing","Z) 取り消し(入力)"),
5108+ MDR_DIALECT_CHOICE ("Undo cut","Z) 取り消し(切り取り)"),
5109+ MDR_DIALECT_CHOICE ("Undo paste","Z) 取り消し(貼り付け)"),
5110+ MDR_DIALECT_CHOICE ("Undo clear","Z) 取り消し(消去)"),
5111+ MDR_DIALECT_CHOICE ("Undo drop","Z) 取り消し(ドロップ)")
5112 };
5113
5114 const char *kRedoStrings[] = {
5115 MDR_DIALECT_CHOICE ("Redo", "Z) やり直し"),
5116- MDR_DIALECT_CHOICE ("Redo Typing", "Z) やり直し(入力)"),
5117- MDR_DIALECT_CHOICE ("Redo Cut", "Z) やり直し(切り取り)"),
5118- MDR_DIALECT_CHOICE ("Redo Paste", "Z) やり直し(貼り付け)"),
5119- MDR_DIALECT_CHOICE ("Redo Clear", "Z) やり直し(消去)"),
5120- MDR_DIALECT_CHOICE ("Redo Drop", "Z) やり直し(ドロップ)")
5121+ MDR_DIALECT_CHOICE ("Redo typing", "Z) やり直し(入力)"),
5122+ MDR_DIALECT_CHOICE ("Redo cut", "Z) やり直し(切り取り)"),
5123+ MDR_DIALECT_CHOICE ("Redo paste", "Z) やり直し(貼り付け)"),
5124+ MDR_DIALECT_CHOICE ("Redo clear", "Z) やり直し(消去)"),
5125+ MDR_DIALECT_CHOICE ("Redo drop", "Z) やり直し(ドロップ)")
5126 };
5127
5128
5129 // Text for both the main menu and the pop-up menu.
5130 static const char *kSpamMenuItemTextArray[] = {
5131- "Mark as Spam and Move to Trash", // M_TRAIN_SPAM_AND_DELETE
5132- "Mark as Spam", // M_TRAIN_SPAM
5133- "Unmark this Message", // M_UNTRAIN
5134- "Mark as Genuine" // M_TRAIN_GENUINE
5135+ "Mark as spam and move to trash", // M_TRAIN_SPAM_AND_DELETE
5136+ "Mark as spam", // M_TRAIN_SPAM
5137+ "Unmark this message", // M_UNTRAIN
5138+ "Mark as genuine" // M_TRAIN_GENUINE
5139 };
5140
5141 static const uint32 kMsgQuitAndKeepAllStatus = 'Casm';
5142@@ -200,7 +201,7 @@
5143 msg = new BMessage(M_NEW);
5144 msg->AddInt32("type", M_NEW);
5145 menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE (
5146- "New Mail Message", "N) 新規メッセージ作成"), msg, 'N'));
5147+ "New mail message", "N) 新規メッセージ作成"), msg, 'N'));
5148 item->SetTarget(be_app);
5149
5150 // Cheap hack - only show the drafts menu when composing messages. Insert
5151@@ -216,7 +217,7 @@
5152
5153 if (!fIncoming) {
5154 QueryMenu *queryMenu;
5155- queryMenu = new QueryMenu(MDR_DIALECT_CHOICE ("Open Draft", "O) ドラフトを開く"), false);
5156+ queryMenu = new QueryMenu(MDR_DIALECT_CHOICE ("Open draft", "O) ドラフトを開く"), false);
5157 queryMenu->SetTargetForItems(be_app);
5158
5159 queryMenu->SetPredicate("MAIL:draft==1");
5160@@ -225,7 +226,7 @@
5161
5162 if (!fIncoming || resending) {
5163 menu->AddItem(fSendLater = new BMenuItem(
5164- MDR_DIALECT_CHOICE ("Save as Draft", "S)ドラフトとして保存"),
5165+ MDR_DIALECT_CHOICE ("Save as draft", "S)ドラフトとして保存"),
5166 new BMessage(M_SAVE_AS_DRAFT), 'S'));
5167 }
5168
5169@@ -259,7 +260,7 @@
5170 AddShortcut('W', B_COMMAND_KEY | B_SHIFT_KEY, new BMessage(M_CLOSE_SAME));
5171 }
5172
5173- subMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Move to Trash",
5174+ subMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Move to trash",
5175 "T) 削除"), new BMessage(M_DELETE), 'T', B_CONTROL_KEY));
5176 AddShortcut('T', B_SHIFT_KEY | B_COMMAND_KEY, new BMessage(M_DELETE_NEXT));
5177
5178@@ -290,7 +291,7 @@
5179
5180 menu->AddSeparatorItem();
5181 menu->AddItem(fPrint = new BMenuItem(
5182- MDR_DIALECT_CHOICE ("Page Setup", "G) ページ設定") B_UTF8_ELLIPSIS,
5183+ MDR_DIALECT_CHOICE ("Page setup", "G) ページ設定") B_UTF8_ELLIPSIS,
5184 new BMessage(M_PRINT_SETUP)));
5185 menu->AddItem(fPrint = new BMenuItem(
5186 MDR_DIALECT_CHOICE ("Print", "P) 印刷") B_UTF8_ELLIPSIS,
5187@@ -324,22 +325,22 @@
5188 menu->AddItem(fPaste = new BMenuItem(MDR_DIALECT_CHOICE ("Paste","V) 貼り付け"), new BMessage(B_PASTE), 'V'));
5189 fPaste->SetTarget(NULL, this);
5190 menu->AddSeparatorItem();
5191- menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE ("Select All", "A) 全文選択"), new BMessage(M_SELECT), 'A'));
5192+ menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE ("Select all", "A) 全文選択"), new BMessage(M_SELECT), 'A'));
5193 menu->AddSeparatorItem();
5194 item->SetTarget(NULL, this);
5195 menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Find", "F) 検索") B_UTF8_ELLIPSIS, new BMessage(M_FIND), 'F'));
5196- menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Find Again", "G) 次を検索"), new BMessage(M_FIND_AGAIN), 'G'));
5197+ menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Find again", "G) 次を検索"), new BMessage(M_FIND_AGAIN), 'G'));
5198 if (!fIncoming) {
5199 menu->AddSeparatorItem();
5200 menu->AddItem(fQuote =new BMenuItem(
5201 MDR_DIALECT_CHOICE ("Quote","Q) 引用符をつける"),
5202 new BMessage(M_QUOTE), B_RIGHT_ARROW));
5203 menu->AddItem(fRemoveQuote = new BMenuItem(
5204- MDR_DIALECT_CHOICE ("Remove Quote","R) 引用符を削除"),
5205+ MDR_DIALECT_CHOICE ("Remove quote","R) 引用符を削除"),
5206 new BMessage(M_REMOVE_QUOTE), B_LEFT_ARROW));
5207 menu->AddSeparatorItem();
5208 fSpelling = new BMenuItem(
5209- MDR_DIALECT_CHOICE ("Check Spelling","H) スペルチェック"),
5210+ MDR_DIALECT_CHOICE ("Check spelling","H) スペルチェック"),
5211 new BMessage( M_CHECK_SPELLING ), ';' );
5212 menu->AddItem(fSpelling);
5213 if (fApp->StartWithSpellCheckOn())
5214@@ -347,7 +348,7 @@
5215 }
5216 menu->AddSeparatorItem();
5217 menu->AddItem(item = new BMenuItem(
5218- MDR_DIALECT_CHOICE ("Preferences","P) Mailの設定") B_UTF8_ELLIPSIS,
5219+ MDR_DIALECT_CHOICE ("Settings","P) Mailの設定") B_UTF8_ELLIPSIS,
5220 new BMessage(M_PREFS),','));
5221 item->SetTarget(be_app);
5222 fMenuBar->AddItem(menu);
5223@@ -360,8 +361,8 @@
5224
5225 if (!resending && fIncoming) {
5226 menu = new BMenu("View");
5227- menu->AddItem(fHeader = new BMenuItem(MDR_DIALECT_CHOICE ("Show Header","H) ヘッダーを表示"), new BMessage(M_HEADER), 'H'));
5228- menu->AddItem(fRaw = new BMenuItem(MDR_DIALECT_CHOICE ("Show Raw Message"," メッセージを生で表示"), new BMessage(M_RAW)));
5229+ menu->AddItem(fHeader = new BMenuItem(MDR_DIALECT_CHOICE ("Show header","H) ヘッダーを表示"), new BMessage(M_HEADER), 'H'));
5230+ menu->AddItem(fRaw = new BMenuItem(MDR_DIALECT_CHOICE ("Show raw message"," メッセージを生で表示"), new BMessage(M_RAW)));
5231 fMenuBar->AddItem(menu);
5232 }
5233
5234@@ -372,29 +373,29 @@
5235 if (!resending && fIncoming) {
5236 BMenuItem *menuItem;
5237 menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply","R) 返信"), new BMessage(M_REPLY),'R'));
5238- menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to Sender","S) 送信者に返信"), new BMessage(M_REPLY_TO_SENDER),'R',B_OPTION_KEY));
5239- menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to All","P) 全員に返信"), new BMessage(M_REPLY_ALL), 'R', B_SHIFT_KEY));
5240+ menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to sender","S) 送信者に返信"), new BMessage(M_REPLY_TO_SENDER),'R',B_OPTION_KEY));
5241+ menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to all","P) 全員に返信"), new BMessage(M_REPLY_ALL), 'R', B_SHIFT_KEY));
5242
5243 menu->AddSeparatorItem();
5244
5245 menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Forward","J) 転送"), new BMessage(M_FORWARD), 'J'));
5246- menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Forward without Attachments","The opposite: F) 添付ファイルを含めて転送"), new BMessage(M_FORWARD_WITHOUT_ATTACHMENTS)));
5247+ menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Forward without attachments","The opposite: F) 添付ファイルを含めて転送"), new BMessage(M_FORWARD_WITHOUT_ATTACHMENTS)));
5248 menu->AddItem(menuItem = new BMenuItem(MDR_DIALECT_CHOICE ("Resend"," 再送信"), new BMessage(M_RESEND)));
5249- menu->AddItem(menuItem = new BMenuItem(MDR_DIALECT_CHOICE ("Copy to New","D) 新規メッセージへコピー"), new BMessage(M_COPY_TO_NEW), 'D'));
5250+ menu->AddItem(menuItem = new BMenuItem(MDR_DIALECT_CHOICE ("Copy to new","D) 新規メッセージへコピー"), new BMessage(M_COPY_TO_NEW), 'D'));
5251
5252 menu->AddSeparatorItem();
5253- fDeleteNext = new BMenuItem(MDR_DIALECT_CHOICE ("Move to Trash","T) 削除"), new BMessage(M_DELETE_NEXT), 'T');
5254+ fDeleteNext = new BMenuItem(MDR_DIALECT_CHOICE ("Move to trash","T) 削除"), new BMessage(M_DELETE_NEXT), 'T');
5255 menu->AddItem(fDeleteNext);
5256 menu->AddSeparatorItem();
5257
5258- fPrevMsg = new BMenuItem(MDR_DIALECT_CHOICE ("Previous Message","B) 前のメッセージ"), new BMessage(M_PREVMSG),
5259+ fPrevMsg = new BMenuItem(MDR_DIALECT_CHOICE ("Previous message","B) 前のメッセージ"), new BMessage(M_PREVMSG),
5260 B_UP_ARROW);
5261 menu->AddItem(fPrevMsg);
5262- fNextMsg = new BMenuItem(MDR_DIALECT_CHOICE ("Next Message","N) 次のメッセージ"), new BMessage(M_NEXTMSG),
5263+ fNextMsg = new BMenuItem(MDR_DIALECT_CHOICE ("Next message","N) 次のメッセージ"), new BMessage(M_NEXTMSG),
5264 B_DOWN_ARROW);
5265 menu->AddItem(fNextMsg);
5266 menu->AddSeparatorItem();
5267- fSaveAddrMenu = subMenu = new BMenu(MDR_DIALECT_CHOICE ("Save Address", " アドレスを保存"));
5268+ fSaveAddrMenu = subMenu = new BMenu(MDR_DIALECT_CHOICE ("Save address", " アドレスを保存"));
5269
5270 // create the list of addresses
5271
5272@@ -436,36 +437,36 @@
5273
5274 if (fApp->ShowSpamGUI()) {
5275 menu = new BMenu("Spam Filtering");
5276- menu->AddItem(new BMenuItem("Mark as Spam and Move to Trash",
5277+ menu->AddItem(new BMenuItem("Mark as Spam and move to trash",
5278 new BMessage(M_TRAIN_SPAM_AND_DELETE), 'K'));
5279 menu->AddItem(new BMenuItem("Mark as Spam",
5280 new BMessage(M_TRAIN_SPAM), 'K', B_OPTION_KEY));
5281 menu->AddSeparatorItem();
5282- menu->AddItem(new BMenuItem("Unmark this Message",
5283+ menu->AddItem(new BMenuItem("Unmark this message",
5284 new BMessage(M_UNTRAIN)));
5285 menu->AddSeparatorItem();
5286- menu->AddItem(new BMenuItem("Mark as Genuine",
5287+ menu->AddItem(new BMenuItem("Mark as genuine",
5288 new BMessage(M_TRAIN_GENUINE), 'K', B_SHIFT_KEY));
5289 fMenuBar->AddItem(menu);
5290 }
5291 } else {
5292 menu->AddItem(fSendNow = new BMenuItem(
5293- MDR_DIALECT_CHOICE ("Send Message", "M) メッセージを送信"),
5294+ MDR_DIALECT_CHOICE ("Send message", "M) メッセージを送信"),
5295 new BMessage(M_SEND_NOW), 'M'));
5296
5297 if (!fIncoming) {
5298 menu->AddSeparatorItem();
5299 fSignature = new TMenu(
5300- MDR_DIALECT_CHOICE ("Add Signature", "D) 署名を追加"),
5301+ MDR_DIALECT_CHOICE ("Add signature", "D) 署名を追加"),
5302 INDEX_SIGNATURE, M_SIGNATURE);
5303 menu->AddItem(new BMenuItem(fSignature));
5304 menu->AddItem(item = new BMenuItem(
5305- MDR_DIALECT_CHOICE ("Edit Signatures","S) 署名の編集") B_UTF8_ELLIPSIS,
5306+ MDR_DIALECT_CHOICE ("Edit signatures","S) 署名の編集") B_UTF8_ELLIPSIS,
5307 new BMessage(M_EDIT_SIGNATURE)));
5308 item->SetTarget(be_app);
5309 menu->AddSeparatorItem();
5310- menu->AddItem(fAdd = new BMenuItem(MDR_DIALECT_CHOICE ("Add Enclosure","E) 追加")B_UTF8_ELLIPSIS, new BMessage(M_ADD), 'E'));
5311- menu->AddItem(fRemove = new BMenuItem(MDR_DIALECT_CHOICE ("Remove Enclosure","T) 削除"), new BMessage(M_REMOVE), 'T'));
5312+ menu->AddItem(fAdd = new BMenuItem(MDR_DIALECT_CHOICE ("Add attachment","E) 追加")B_UTF8_ELLIPSIS, new BMessage(M_ADD), 'E'));
5313+ menu->AddItem(fRemove = new BMenuItem(MDR_DIALECT_CHOICE ("Remove attachment","T) 削除"), new BMessage(M_REMOVE), 'T'));
5314 }
5315 fMenuBar->AddItem(menu);
5316 }
5317@@ -998,7 +999,7 @@
5318 uint32 buttons;
5319 if (msg->FindInt32("buttons", (int32 *)&buttons) == B_OK
5320 && buttons == B_SECONDARY_MOUSE_BUTTON) {
5321- BPopUpMenu menu("Spam Actions", false, false);
5322+ BPopUpMenu menu("Spam actions", false, false);
5323 for (int i = 0; i < 4; i++)
5324 menu.AddItem(new BMenuItem(kSpamMenuItemTextArray[i], new BMessage(M_TRAIN_SPAM_AND_DELETE + i)));
5325
5326@@ -1035,10 +1036,10 @@
5327 uint32 buttons;
5328 if (msg->FindInt32("buttons", (int32 *)&buttons) == B_OK
5329 && buttons == B_SECONDARY_MOUSE_BUTTON) {
5330- BPopUpMenu menu("Reply To", false, false);
5331+ BPopUpMenu menu("Reply to", false, false);
5332 menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply","R) 返信"),new BMessage(M_REPLY)));
5333- menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to Sender","S) 送信者に返信"),new BMessage(M_REPLY_TO_SENDER)));
5334- menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to All","P) 全員に返信"),new BMessage(M_REPLY_ALL)));
5335+ menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to sender","S) 送信者に返信"),new BMessage(M_REPLY_TO_SENDER)));
5336+ menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to all","P) 全員に返信"),new BMessage(M_REPLY_ALL)));
5337
5338 BPoint where;
5339 msg->FindPoint("where", &where);
5340@@ -1061,7 +1062,7 @@
5341 BPopUpMenu menu("Forward", false, false);
5342 menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Forward", "J) 転送"),
5343 new BMessage(M_FORWARD)));
5344- menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Forward without Attachments",
5345+ menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Forward without attachments",
5346 "The opposite: F) 添付ファイルを含む転送"),
5347 new BMessage(M_FORWARD_WITHOUT_ATTACHMENTS)));
5348
5349@@ -1364,7 +1365,7 @@
5350 {
5351 TMenu *menu;
5352 BMenuItem *item;
5353- menu = new TMenu( "Add Signature", INDEX_SIGNATURE, M_SIGNATURE, true );
5354+ menu = new TMenu( "Add signature", INDEX_SIGNATURE, M_SIGNATURE, true );
5355
5356 BPoint where;
5357 bool open_anyway = true;
5358@@ -1541,7 +1542,7 @@
5359 BAlert* alert = new BAlert("helpful message",
5360 "Put your favorite e-mail queries and query "
5361 "templates in this folder.",
5362- "Ok", NULL, NULL, B_WIDTH_AS_USUAL, B_IDEA_ALERT);
5363+ "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_IDEA_ALERT);
5364 alert->Go(NULL);
5365 }
5366
5367@@ -1634,7 +1635,7 @@
5368 MDR_DIALECT_CHOICE (
5369 "Do you wish to save this message as a draft before closing?",
5370 "閉じる前に保存しますか?"),
5371- MDR_DIALECT_CHOICE ("Don't Save","保存しない"),
5372+ MDR_DIALECT_CHOICE ("Don't save","保存しない"),
5373 MDR_DIALECT_CHOICE ("Cancel","中止"),
5374 MDR_DIALECT_CHOICE ("Save","保存"),
5375 B_WIDTH_AS_USUAL, B_OFFSET_SPACING,
5376@@ -2004,7 +2005,7 @@
5377 void
5378 TMailWindow::Reply(entry_ref *ref, TMailWindow *window, uint32 type)
5379 {
5380- const char *notImplementedString = "<Not Yet Implemented>";
5381+ const char *notImplementedString = "<Not yet implemented>";
5382
5383 fRepliedMail = *ref;
5384 SetOriginatingWindow(window);
5385@@ -2420,8 +2421,8 @@
5386 "The message is queued and will be sent when the mail_daemon is started.",
5387 "mail_daemon が開始されていません "
5388 "このメッセージは処理待ちとなり、mail_daemon 開始後に処理されます"),
5389- MDR_DIALECT_CHOICE ("Start Now","ただちに開始する"),
5390- MDR_DIALECT_CHOICE ("Ok","了解")))->Go();
5391+ MDR_DIALECT_CHOICE ("Start now","ただちに開始する"),
5392+ MDR_DIALECT_CHOICE ("OK","了解")))->Go();
5393
5394 if (start == 0) {
5395 result = be_roster->Launch("application/x-vnd.Be-POST");
5396@@ -2453,7 +2454,7 @@
5397
5398 if (result != B_NO_ERROR && result != B_MAIL_NO_DAEMON) {
5399 beep();
5400- (new BAlert("", errorMessage, "Ok"))->Go();
5401+ (new BAlert("", errorMessage, "OK"))->Go();
5402 }
5403 if (close)
5404 PostMessage(B_QUIT_REQUESTED);
5405@@ -2956,7 +2957,7 @@
5406 delete item;
5407 }
5408
5409- fQueryMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Edit Queries" B_UTF8_ELLIPSIS,"???" B_UTF8_ELLIPSIS),
5410+ fQueryMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Edit queries" B_UTF8_ELLIPSIS,"???" B_UTF8_ELLIPSIS),
5411 new BMessage(M_EDIT_QUERIES), 'E', B_SHIFT_KEY));
5412
5413 bool queryItemsAdded = false;
5414Index: src/apps/mail/Content.cpp
5415===================================================================
5416--- src/apps/mail/Content.cpp (Revision 34761)
5417+++ src/apps/mail/Content.cpp (Arbeitskopie)
5418@@ -4,6 +4,7 @@
5419 Terms and Conditions
5420
5421 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5422+Copyright (c) 2009, Haiku, Inc.
5423
5424 Permission is hereby granted, free of charge, to any person obtaining a copy of
5425 this software and associated documentation files (the "Software"), to deal in
5426@@ -885,8 +886,8 @@
5427 //
5428 fEnclosureMenu = new BPopUpMenu("Enclosure", false, false);
5429 fEnclosureMenu->SetFont(&menuFont);
5430- fEnclosureMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Save Enclosure", "添付ファイルを保存") B_UTF8_ELLIPSIS,new BMessage(M_SAVE)));
5431- fEnclosureMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Open Enclosure", "添付ファイルを開く"), new BMessage(M_OPEN)));
5432+ fEnclosureMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Save attachment", "添付ファイルを保存") B_UTF8_ELLIPSIS,new BMessage(M_SAVE)));
5433+ fEnclosureMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Open attachment", "添付ファイルを開く"), new BMessage(M_OPEN)));
5434
5435 //
5436 // Hyperlink pop up menu
5437@@ -894,10 +895,10 @@
5438 fLinkMenu = new BPopUpMenu("Link", false, false);
5439 fLinkMenu->SetFont(&menuFont);
5440 fLinkMenu->AddItem(new BMenuItem(
5441- MDR_DIALECT_CHOICE ("Open This Link", "リンク先を開く"),
5442+ MDR_DIALECT_CHOICE ("Open this link", "リンク先を開く"),
5443 new BMessage(M_OPEN)));
5444 fLinkMenu->AddItem(new BMenuItem(
5445- MDR_DIALECT_CHOICE ("Copy Link Location", "リンク先をコピー"),
5446+ MDR_DIALECT_CHOICE ("Copy link location", "リンク先をコピー"),
5447 new BMessage(M_COPY)));
5448
5449 SetDoesUndo(true);
5450@@ -1544,7 +1545,7 @@
5451 delete string;
5452 }
5453 } else {
5454- (menuItem = new BMenuItem("No Matches", NULL))->SetEnabled(false);
5455+ (menuItem = new BMenuItem("No matches", NULL))->SetEnabled(false);
5456 menu.AddItem(menuItem);
5457 }
5458
5459@@ -2044,7 +2045,7 @@
5460 if (result != B_NO_ERROR) {
5461 beep();
5462 MDR_DIALECT_CHOICE(
5463- (new BAlert("", "An error occurred trying to save the enclosure.", "Sorry"))->Go();,
5464+ (new BAlert("", "An error occurred trying to save the attachment.", "Sorry"))->Go();,
5465 (new BAlert("", "添付ファイルを保存するときにエラーが発生しました", "了解"))->Go();
5466 )
5467 }
5468@@ -2290,7 +2291,7 @@
5469
5470 enclosure->type = TYPE_ENCLOSURE;
5471
5472- const char *name = "\n<Enclosure: could not handle>\n";
5473+ const char *name = "\n<Attachment: could not handle>\n";
5474
5475 fView->GetSelection(&enclosure->text_start, &enclosure->text_end);
5476 enclosure->text_start++;
5477@@ -2335,7 +2336,7 @@
5478 if (type.GetShortDescription(typeDescription) != B_OK)
5479 strcpy(typeDescription, type.Type() ? type.Type() : B_EMPTY_STRING);
5480
5481- name = "\n<Enclosure: ";
5482+ name = "\n<Attachment: ";
5483 name << enclosure->name << " (Type: " << typeDescription << ")>\n";
5484
5485 fView->GetSelection(&enclosure->text_start, &enclosure->text_end);
5486@@ -3285,7 +3286,7 @@
5487 } else {
5488 ::beep();
5489 (new BAlert("",
5490- MDR_DIALECT_CHOICE("Inconsistency occurred in the Undo/Redo buffer.",
5491+ MDR_DIALECT_CHOICE("Inconsistency occurred in the undo/redo buffer.",
5492 "Undo/Redoバッファに矛盾が発生しました!"), "OK"))->Go();
5493 }
5494 break;
5495@@ -3331,7 +3332,7 @@
5496 case K_REPLACED:
5497 ::beep();
5498 (new BAlert("",
5499- MDR_DIALECT_CHOICE("Inconsistency occurred in the Undo/Redo buffer.",
5500+ MDR_DIALECT_CHOICE("Inconsistency occurred in the undo/redo buffer.",
5501 "Undo/Redoバッファに矛盾が発生しました!"), "OK"))->Go();
5502 break;
5503 }
5504Index: src/apps/mail/Prefs.cpp
5505===================================================================
5506--- src/apps/mail/Prefs.cpp (Revision 34761)
5507+++ src/apps/mail/Prefs.cpp (Arbeitskopie)
5508@@ -4,6 +4,7 @@
5509 Terms and Conditions
5510
5511 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5512+Copyright (c) 2009, Haiku, Inc.
5513
5514 Permission is hereby granted, free of charge, to any person obtaining a copy of
5515 this software and associated documentation files (the "Software"), to deal in
5516@@ -69,22 +70,22 @@
5517
5518 #define FONT_TEXT MDR_DIALECT_CHOICE ("Font:", "フォント:")
5519 #define SIZE_TEXT MDR_DIALECT_CHOICE ("Size:", "サイズ:")
5520-#define LEVEL_TEXT MDR_DIALECT_CHOICE ("User Level:", "ユーザーレベル:")
5521-#define WRAP_TEXT MDR_DIALECT_CHOICE ("Text Wrapping:", "テキスト・ラップ:")
5522-#define ATTACH_ATTRIBUTES_TEXT MDR_DIALECT_CHOICE ("Attach Attributes:", "ファイル属性情報:")
5523-#define QUOTES_TEXT MDR_DIALECT_CHOICE ("Colored Quotes:", "引用部分の着色:")
5524-#define ACCOUNT_TEXT MDR_DIALECT_CHOICE ("Default Account:", "標準アカウント:")
5525-#define REPLYTO_TEXT MDR_DIALECT_CHOICE ("Reply Account:", "返信用アカウント:")
5526-#define REPLYTO_USE_DEFAULT_TEXT MDR_DIALECT_CHOICE ("Use Default Account", "標準アカウントを使う")
5527-#define REPLYTO_FROM_MAIL_TEXT MDR_DIALECT_CHOICE ("Account From Mail", "メールのアカウントを使う")
5528-#define REPLY_PREAMBLE_TEXT MDR_DIALECT_CHOICE ("Reply Preamble:", "返信へ追加:")
5529-#define SIGNATURE_TEXT MDR_DIALECT_CHOICE ("Auto Signature:", "自動署名:")
5530+#define LEVEL_TEXT MDR_DIALECT_CHOICE ("User level:", "ユーザーレベル:")
5531+#define WRAP_TEXT MDR_DIALECT_CHOICE ("Text wrapping:", "テキスト・ラップ:")
5532+#define ATTACH_ATTRIBUTES_TEXT MDR_DIALECT_CHOICE ("Attach attributes:", "ファイル属性情報:")
5533+#define QUOTES_TEXT MDR_DIALECT_CHOICE ("Colored quotes:", "引用部分の着色:")
5534+#define ACCOUNT_TEXT MDR_DIALECT_CHOICE ("Default account:", "標準アカウント:")
5535+#define REPLYTO_TEXT MDR_DIALECT_CHOICE ("Reply account:", "返信用アカウント:")
5536+#define REPLYTO_USE_DEFAULT_TEXT MDR_DIALECT_CHOICE ("Use default account", "標準アカウントを使う")
5537+#define REPLYTO_FROM_MAIL_TEXT MDR_DIALECT_CHOICE ("Account from mail", "メールのアカウントを使う")
5538+#define REPLY_PREAMBLE_TEXT MDR_DIALECT_CHOICE ("Reply preamble:", "返信へ追加:")
5539+#define SIGNATURE_TEXT MDR_DIALECT_CHOICE ("Auto signature:", "自動署名:")
5540 #define ENCODING_TEXT MDR_DIALECT_CHOICE ("Encoding:", "エンコード形式:")
5541-#define WARN_UNENCODABLE_TEXT MDR_DIALECT_CHOICE ("Warn Unencodable:", "警告: エンコードできません")
5542-#define SPELL_CHECK_START_ON_TEXT MDR_DIALECT_CHOICE ("Initial Spell Check Mode:", "編集時スペルチェック:")
5543+#define WARN_UNENCODABLE_TEXT MDR_DIALECT_CHOICE ("Warn unencodable:", "警告: エンコードできません")
5544+#define SPELL_CHECK_START_ON_TEXT MDR_DIALECT_CHOICE ("Initial spell check mode:", "編集時スペルチェック:")
5545 #define AUTO_MARK_READ_TEXT MDR_DIALECT_CHOICE ("Automatically mark mail as read:", "Automatically mark mail as read:")
5546
5547-#define BUTTONBAR_TEXT MDR_DIALECT_CHOICE ("Button Bar:", "ボタンバー:")
5548+#define BUTTONBAR_TEXT MDR_DIALECT_CHOICE ("Button bar:", "ボタンバー:")
5549
5550 #define OK_BUTTON_X1 (PREF_WIDTH - BUTTON_WIDTH - 6)
5551 #define OK_BUTTON_X2 (OK_BUTTON_X1 + BUTTON_WIDTH)
5552@@ -102,15 +103,15 @@
5553 P_ACCOUNT, P_REPLYTO, P_REPLY_PREAMBLE,
5554 P_COLORED_QUOTES, P_MARK_READ};
5555
5556-#define ICON_LABEL_TEXT MDR_DIALECT_CHOICE ("Show Icons & Labels", "アイコンとラベル")
5557-#define ICON_TEXT MDR_DIALECT_CHOICE ("Show Icons Only", "アイコンのみ")
5558+#define ICON_LABEL_TEXT MDR_DIALECT_CHOICE ("Show icons & labels", "アイコンとラベル")
5559+#define ICON_TEXT MDR_DIALECT_CHOICE ("Show icons only", "アイコンのみ")
5560 #define HIDE_TEXT MDR_DIALECT_CHOICE ("Hide", "隠す")
5561
5562
5563 extern BPoint prefs_window;
5564
5565-#define ATTRIBUTE_ON_TEXT MDR_DIALECT_CHOICE ("Include BeOS Attributes in Attachments", "BeOSの属性を付ける")
5566-#define ATTRIBUTE_OFF_TEXT MDR_DIALECT_CHOICE ("No BeOS Attributes, just Plain Data", "BeOSの属性を付けない(データのみ)")
5567+#define ATTRIBUTE_ON_TEXT MDR_DIALECT_CHOICE ("Include Haiku attributes in attachments", "Haikuの属性を付ける")
5568+#define ATTRIBUTE_OFF_TEXT MDR_DIALECT_CHOICE ("No Haiku attributes, just plain data", "Haikuの属性を付けない(データのみ)")
5569
5570 //#pragma mark -
5571
5572@@ -140,11 +141,11 @@
5573 bool* spellCheckStartOn, bool* autoMarkRead, uint8* buttonBar)
5574 :
5575 #if USE_LAYOUT_MANAGEMENT
5576- BWindow(rect, MDR_DIALECT_CHOICE ("Mail Preferences", "Mailの設定"),
5577+ BWindow(rect, MDR_DIALECT_CHOICE ("Mail settings", "Mailの設定"),
5578 B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
5579 | B_AUTO_UPDATE_SIZE_LIMITS),
5580 #else
5581- BWindow(rect, MDR_DIALECT_CHOICE ("Mail Preferences", "Mailの設定"),
5582+ BWindow(rect, MDR_DIALECT_CHOICE ("Mail settings", "Mailの設定"),
5583 B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
5584 #endif
5585
5586@@ -205,7 +206,7 @@
5587 interfaceLayout->AlignLayoutWith(mailLayout, B_HORIZONTAL);
5588
5589 BBox* interfaceBox = new BBox(B_FANCY_BORDER, interfaceView);
5590- interfaceBox->SetLabel(MDR_DIALECT_CHOICE ("User Interface",
5591+ interfaceBox->SetLabel(MDR_DIALECT_CHOICE ("User interface",
5592 "ユーザーインターフェース"));
5593 BBox* mailBox = new BBox(B_FANCY_BORDER, mailView);
5594 mailBox->SetLabel(MDR_DIALECT_CHOICE ("Mailing", "メール関係"));
5595@@ -335,7 +336,7 @@
5596
5597 r.Set(8, 4, Bounds().right - 8, 4 + 6 * (height + ITEM_SPACE));
5598 BBox* interfaceBox = new BBox(r , NULL,B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP);
5599- interfaceBox->SetLabel(MDR_DIALECT_CHOICE ("User Interface",
5600+ interfaceBox->SetLabel(MDR_DIALECT_CHOICE ("User interface",
5601 "ユーザーインターフェース"));
5602 view->AddChild(interfaceBox);
5603
5604Index: src/apps/mail/Enclosures.cpp
5605===================================================================
5606--- src/apps/mail/Enclosures.cpp (Revision 34761)
5607+++ src/apps/mail/Enclosures.cpp (Arbeitskopie)
5608@@ -4,6 +4,7 @@
5609 Terms and Conditions
5610
5611 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5612+Copyright (c) 2009, Haiku, Inc. All rights reserved.
5613
5614 Permission is hereby granted, free of charge, to any person obtaining a copy of
5615 this software and associated documentation files (the "Software"), to deal in
5616@@ -137,7 +138,7 @@
5617
5618 BRect r;
5619 r.left = ENCLOSE_TEXT_H + font.StringWidth(
5620- MDR_DIALECT_CHOICE ("Enclosures: ","添付ファイル")) + 5;
5621+ MDR_DIALECT_CHOICE ("Attachments: ","添付ファイル")) + 5;
5622 r.top = ENCLOSE_FIELD_V;
5623 r.right = wind_rect.right - wind_rect.left - B_V_SCROLL_BAR_WIDTH - 9;
5624 r.bottom = Frame().Height() - 8;
5625@@ -224,7 +225,7 @@
5626 window->Mail()->RemoveComponent(item->Component());
5627
5628 (new BAlert("", MDR_DIALECT_CHOICE (
5629- "Removing enclosures from a forwarded mail is not yet implemented!\n"
5630+ "Removing attachments from a forwarded mail is not yet implemented!\n"
5631 "It will not yet work correctly.",
5632 "転送メールから添付ファイルを削除する機能はまだ実装されていません。"),
5633 MDR_DIALECT_CHOICE ("OK","了解")))->Go();
5634@@ -278,9 +279,9 @@
5635 {
5636 beep();
5637 (new BAlert("", MDR_DIALECT_CHOICE (
5638- "Only files can be added as enclosures.",
5639+ "Only files can be added as attachments.",
5640 "添付できるのは、ファイルのみです。"),
5641- MDR_DIALECT_CHOICE ("Ok","了解")))->Go();
5642+ MDR_DIALECT_CHOICE ("OK","了解")))->Go();
5643 }
5644 }
5645 break;
5646@@ -425,10 +426,10 @@
5647 BPopUpMenu menu("enclosure", false, false);
5648 menu.SetFont(&font);
5649 menu.AddItem(new BMenuItem(
5650- MDR_DIALECT_CHOICE ("Open Enclosure","添付ファイルを開く"),
5651+ MDR_DIALECT_CHOICE ("Open attachment","添付ファイルを開く"),
5652 new BMessage(LIST_INVOKED)));
5653 menu.AddItem(new BMenuItem(
5654- MDR_DIALECT_CHOICE ("Remove Enclosure","添付ファイルを削除"),
5655+ MDR_DIALECT_CHOICE ("Remove attachment","添付ファイルを削除"),
5656 new BMessage(M_REMOVE)));
5657
5658 BPoint menuStart = ConvertToScreen(point);
5659@@ -562,6 +563,6 @@
5660 owner->SetDrawingMode(B_OP_COPY);
5661 }
5662 } else
5663- owner->DrawString("<missing enclosure>");
5664+ owner->DrawString("<missing attachment>");
5665 }
5666
5667Index: src/apps/mail/MailApp.cpp
5668===================================================================
5669--- src/apps/mail/MailApp.cpp (Revision 34761)
5670+++ src/apps/mail/MailApp.cpp (Arbeitskopie)
5671@@ -4,6 +4,7 @@
5672 Terms and Conditions
5673
5674 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5675+Copyright (c) 2009, Haiku, Inc. All rights reserved.
5676
5677 Permission is hereby granted, free of charge, to any person obtaining a copy of
5678 this software and associated documentation files (the "Software"), to deal in
5679@@ -150,7 +151,7 @@
5680 BAlert *alert = new BAlert("about", "Mail\n\n"
5681 "written by Robert Polic\n"
5682 "enhanced by the Dr. Zoidberg crew\n\n"
5683- "Copyright 2007, Haiku.\n", "Ok");
5684+ "Copyright 2007, Haiku.\n", "OK");
5685 BTextView *view = alert->TextView();
5686 BFont font;
5687
5688Index: src/apps/mail/Header.cpp
5689===================================================================
5690--- src/apps/mail/Header.cpp (Revision 34761)
5691+++ src/apps/mail/Header.cpp (Arbeitskopie)
5692@@ -4,6 +4,7 @@
5693 Terms and Conditions
5694
5695 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5696+Copyright (c) 2009, Haiku, Inc. All rights reserved.
5697
5698 Permission is hereby granted, free of charge, to any person obtaining a copy of
5699 this software and associated documentation files (the "Software"), to deal in
5700@@ -153,7 +154,7 @@
5701 BMessage* msg;
5702
5703 float x = StringWidth( /* The longest title string in the header area */
5704- MDR_DIALECT_CHOICE ("Enclosures: ","添付ファイル:")) + 9;
5705+ MDR_DIALECT_CHOICE ("Attachments: ","添付ファイル:")) + 9;
5706 float y = TO_FIELD_V;
5707
5708 BMenuBar* dummy = new BMenuBar(BRect(0, 0, 100, 15), "Dummy");
5709Index: src/apps/showimage/PrintOptionsWindow.cpp
5710===================================================================
5711--- src/apps/showimage/PrintOptionsWindow.cpp (Revision 34761)
5712+++ src/apps/showimage/PrintOptionsWindow.cpp (Arbeitskopie)
5713@@ -71,7 +71,7 @@
5714 PrintOptionsWindow::PrintOptionsWindow(BPoint at, PrintOptions *options,
5715 BWindow* listener)
5716 :
5717- BWindow(BRect(at.x, at.y, at.x + 300, at.y + 200), "Print Options",
5718+ BWindow(BRect(at.x, at.y, at.x + 300, at.y + 200), "Print options",
5719 B_TITLED_WINDOW_LOOK, B_MODAL_SUBSET_WINDOW_FEEL,
5720 B_NOT_ZOOMABLE | B_NOT_RESIZABLE),
5721 fPrintOptions(options),
5722@@ -143,10 +143,10 @@
5723 B_PLAIN_BORDER);
5724 AddChild(panel);
5725
5726- AddRadioButton(panel, at, "fit_to_page", "Fit Image to Page",
5727+ AddRadioButton(panel, at, "fit_to_page", "Fit image to page",
5728 kMsgFitToPageSelected, op == PrintOptions::kFitToPage);
5729 textAt = at;
5730- rb = AddRadioButton(panel, at, "zoom_factor", "Zoom Factor in %: ",
5731+ rb = AddRadioButton(panel, at, "zoom_factor", "Zoom factor in %: ",
5732 kMsgZoomFactorSelected, op == PrintOptions::kZoomFactor);
5733 textAt.x = rb->Bounds().right + 5;
5734 fZoomFactor = AddTextControl(panel, textAt, "zoom_factor_text", "",
5735@@ -160,7 +160,7 @@
5736 0, kMsgDPIChanged);
5737
5738 rb = AddRadioButton(panel, at, "width_and_height",
5739- "Resize To (in 1/72 Inches):", kMsgWidthAndHeightSelected,
5740+ "Resize to (in 1/72 inches):", kMsgWidthAndHeightSelected,
5741 op == PrintOptions::kWidth || op == PrintOptions::kHeight);
5742 at.x += 15;
5743 textAt = at;
5744@@ -179,7 +179,7 @@
5745
5746 at.y += 10;
5747 rect.OffsetBy(at);
5748- button = new BButton(rect, "job setup", "Job Setup",
5749+ button = new BButton(rect, "job setup", "Job setup",
5750 new BMessage(kMsgJobSetup));
5751 panel->AddChild(button);
5752 button->ResizeToPreferred();
5753Index: src/apps/showimage/ResizerWindow.cpp
5754===================================================================
5755--- src/apps/showimage/ResizerWindow.cpp (Revision 34761)
5756+++ src/apps/showimage/ResizerWindow.cpp (Arbeitskopie)
5757@@ -28,7 +28,7 @@
5758
5759 static const char* kWidthLabel = "Width:";
5760 static const char* kHeightLabel = "Height:";
5761-static const char* kKeepAspectRatioLabel = "Keep Original Proportions";
5762+static const char* kKeepAspectRatioLabel = "Keep original proportions";
5763 static const char* kApplyLabel = "Apply";
5764
5765 static const float kLineDistance = 5;
5766Index: src/apps/showimage/ShowImageWindow.cpp
5767===================================================================
5768--- src/apps/showimage/ShowImageWindow.cpp (Revision 34761)
5769+++ src/apps/showimage/ShowImageWindow.cpp (Arbeitskopie)
5770@@ -247,9 +247,9 @@
5771 void
5772 ShowImageWindow::_BuildViewMenu(BMenu *menu, bool popupMenu)
5773 {
5774- _AddItemMenu(menu, "Slide Show", MSG_SLIDE_SHOW, 0, 0, this);
5775+ _AddItemMenu(menu, "Slide show", MSG_SLIDE_SHOW, 0, 0, this);
5776 _MarkMenuItem(menu, MSG_SLIDE_SHOW, fImageView->SlideShowStarted());
5777- BMenu* delayMenu = new BMenu("Slide Delay");
5778+ BMenu* delayMenu = new BMenu("Slide delay");
5779 if (fSlideShowDelay == NULL)
5780 fSlideShowDelay = delayMenu;
5781
5782@@ -258,38 +258,38 @@
5783 // if slide show delay is too short! (Especially if loading the image
5784 // takes as long as or longer than the slide show delay). Should load
5785 // in background thread!
5786- _AddDelayItem(delayMenu, "Three Seconds", 3);
5787- _AddDelayItem(delayMenu, "Four Second", 4);
5788- _AddDelayItem(delayMenu, "Five Seconds", 5);
5789- _AddDelayItem(delayMenu, "Six Seconds", 6);
5790- _AddDelayItem(delayMenu, "Seven Seconds", 7);
5791- _AddDelayItem(delayMenu, "Eight Seconds", 8);
5792- _AddDelayItem(delayMenu, "Nine Seconds", 9);
5793- _AddDelayItem(delayMenu, "Ten Seconds", 10);
5794- _AddDelayItem(delayMenu, "Twenty Seconds", 20);
5795+ _AddDelayItem(delayMenu, "3 seconds", 3);
5796+ _AddDelayItem(delayMenu, "4 seconds", 4);
5797+ _AddDelayItem(delayMenu, "5 seconds", 5);
5798+ _AddDelayItem(delayMenu, "6 seconds", 6);
5799+ _AddDelayItem(delayMenu, "7 seconds", 7);
5800+ _AddDelayItem(delayMenu, "8 seconds", 8);
5801+ _AddDelayItem(delayMenu, "9 seconds", 9);
5802+ _AddDelayItem(delayMenu, "10 seconds", 10);
5803+ _AddDelayItem(delayMenu, "20 seconds", 20);
5804 menu->AddItem(delayMenu);
5805
5806 menu->AddSeparatorItem();
5807
5808- _AddItemMenu(menu, "Original Size", MSG_ORIGINAL_SIZE, '1', 0, this);
5809- _AddItemMenu(menu, "Zoom In", MSG_ZOOM_IN, '+', 0, this);
5810- _AddItemMenu(menu, "Zoom Out", MSG_ZOOM_OUT, '-', 0, this);
5811+ _AddItemMenu(menu, "Original size", MSG_ORIGINAL_SIZE, '1', 0, this);
5812+ _AddItemMenu(menu, "Zoom in", MSG_ZOOM_IN, '+', 0, this);
5813+ _AddItemMenu(menu, "Zoom out", MSG_ZOOM_OUT, '-', 0, this);
5814
5815 menu->AddSeparatorItem();
5816
5817- _AddItemMenu(menu, "High-Quality Zooming", MSG_SCALE_BILINEAR, 0, 0, this);
5818+ _AddItemMenu(menu, "High-quality zooming", MSG_SCALE_BILINEAR, 0, 0, this);
5819
5820 menu->AddSeparatorItem();
5821
5822- _AddItemMenu(menu, "Shrink to Window", MSG_SHRINK_TO_WINDOW, 0, 0, this);
5823- _AddItemMenu(menu, "Zoom to Window", MSG_ZOOM_TO_WINDOW, 0, 0, this);
5824+ _AddItemMenu(menu, "Shrink to window", MSG_SHRINK_TO_WINDOW, 0, 0, this);
5825+ _AddItemMenu(menu, "Zoom to window", MSG_ZOOM_TO_WINDOW, 0, 0, this);
5826
5827 menu->AddSeparatorItem();
5828
5829- _AddItemMenu(menu, "Full Screen", MSG_FULL_SCREEN, B_ENTER, 0, this);
5830+ _AddItemMenu(menu, "Full screen", MSG_FULL_SCREEN, B_ENTER, 0, this);
5831 _MarkMenuItem(menu, MSG_FULL_SCREEN, fFullScreen);
5832
5833- _AddItemMenu(menu, "Show Caption in Full Screen Mode", MSG_SHOW_CAPTION, 0,
5834+ _AddItemMenu(menu, "Show caption in full screen mode", MSG_SHOW_CAPTION, 0,
5835 0, this);
5836 _MarkMenuItem(menu, MSG_SHOW_CAPTION, fShowCaption);
5837
5838@@ -309,7 +309,7 @@
5839
5840 if (popupMenu) {
5841 menu->AddSeparatorItem();
5842- _AddItemMenu(menu, "Use as Background", MSG_DESKTOP_BACKGROUND, 0, 0,
5843+ _AddItemMenu(menu, "Use as background" B_UTF8_ELLIPSIS, MSG_DESKTOP_BACKGROUND, 0, 0,
5844 this);
5845 }
5846 }
5847@@ -326,14 +326,14 @@
5848 fOpenMenu->Superitem()->SetTarget(be_app);
5849 fOpenMenu->Superitem()->SetShortcut('O', 0);
5850 menu->AddSeparatorItem();
5851- BMenu *pmenuSaveAs = new BMenu("Save As" B_UTF8_ELLIPSIS, B_ITEMS_IN_COLUMN);
5852+ BMenu *pmenuSaveAs = new BMenu("Save as" B_UTF8_ELLIPSIS, B_ITEMS_IN_COLUMN);
5853 BTranslationUtils::AddTranslationItems(pmenuSaveAs, B_TRANSLATOR_BITMAP);
5854 // Fill Save As submenu with all types that can be converted
5855 // to from the Be bitmap image format
5856 menu->AddItem(pmenuSaveAs);
5857 _AddItemMenu(menu, "Close", B_QUIT_REQUESTED, 'W', 0, this);
5858 menu->AddSeparatorItem();
5859- _AddItemMenu(menu, "Page Setup" B_UTF8_ELLIPSIS, MSG_PAGE_SETUP, 0, 0, this);
5860+ _AddItemMenu(menu, "Page setup" B_UTF8_ELLIPSIS, MSG_PAGE_SETUP, 0, 0, this);
5861 _AddItemMenu(menu, "Print" B_UTF8_ELLIPSIS, MSG_PREPARE_PRINT, 'P', 0, this);
5862 menu->AddSeparatorItem();
5863 _AddItemMenu(menu, "About ShowImage" B_UTF8_ELLIPSIS, B_ABOUT_REQUESTED, 0, 0,
5864@@ -350,36 +350,36 @@
5865 _AddItemMenu(menu, "Paste", B_PASTE, 'V', 0, this, false);
5866 _AddItemMenu(menu, "Clear", MSG_CLEAR_SELECT, 0, 0, this, false);
5867 menu->AddSeparatorItem();
5868- _AddItemMenu(menu, "Select All", MSG_SELECT_ALL, 'A', 0, this);
5869+ _AddItemMenu(menu, "Select all", MSG_SELECT_ALL, 'A', 0, this);
5870 bar->AddItem(menu);
5871
5872 menu = fBrowseMenu = new BMenu("Browse");
5873- _AddItemMenu(menu, "First Page", MSG_PAGE_FIRST, B_LEFT_ARROW, B_SHIFT_KEY, this);
5874- _AddItemMenu(menu, "Last Page", MSG_PAGE_LAST, B_RIGHT_ARROW, B_SHIFT_KEY, this);
5875- _AddItemMenu(menu, "Previous Page", MSG_PAGE_PREV, B_LEFT_ARROW, 0, this);
5876- _AddItemMenu(menu, "Next Page", MSG_PAGE_NEXT, B_RIGHT_ARROW, 0, this);
5877- fGoToPageMenu = new BMenu("Go to Page");
5878+ _AddItemMenu(menu, "First page", MSG_PAGE_FIRST, B_LEFT_ARROW, B_SHIFT_KEY, this);
5879+ _AddItemMenu(menu, "Last page", MSG_PAGE_LAST, B_RIGHT_ARROW, B_SHIFT_KEY, this);
5880+ _AddItemMenu(menu, "Previous page", MSG_PAGE_PREV, B_LEFT_ARROW, 0, this);
5881+ _AddItemMenu(menu, "Next page", MSG_PAGE_NEXT, B_RIGHT_ARROW, 0, this);
5882+ fGoToPageMenu = new BMenu("Go to page");
5883 fGoToPageMenu->SetRadioMode(true);
5884 menu->AddItem(fGoToPageMenu);
5885 menu->AddSeparatorItem();
5886- _AddItemMenu(menu, "Previous File", MSG_FILE_PREV, B_UP_ARROW, 0, this);
5887- _AddItemMenu(menu, "Next File", MSG_FILE_NEXT, B_DOWN_ARROW, 0, this);
5888+ _AddItemMenu(menu, "Previous file", MSG_FILE_PREV, B_UP_ARROW, 0, this);
5889+ _AddItemMenu(menu, "Next file", MSG_FILE_NEXT, B_DOWN_ARROW, 0, this);
5890 bar->AddItem(menu);
5891
5892 menu = new BMenu("Image");
5893- _AddItemMenu(menu, "Rotate Clockwise", MSG_ROTATE_90, 'R', 0, this);
5894- _AddItemMenu(menu, "Rotate Counterclockwise", MSG_ROTATE_270, 'R', B_SHIFT_KEY, this);
5895+ _AddItemMenu(menu, "Rotate clockwise", MSG_ROTATE_90, 'R', 0, this);
5896+ _AddItemMenu(menu, "Rotate counterclockwise", MSG_ROTATE_270, 'R', B_SHIFT_KEY, this);
5897 menu->AddSeparatorItem();
5898- _AddItemMenu(menu, "Flip Left to Right", MSG_FLIP_LEFT_TO_RIGHT, 0, 0, this);
5899- _AddItemMenu(menu, "Flip Top to Bottom", MSG_FLIP_TOP_TO_BOTTOM, 0, 0, this);
5900+ _AddItemMenu(menu, "Flip left to right", MSG_FLIP_LEFT_TO_RIGHT, 0, 0, this);
5901+ _AddItemMenu(menu, "Flip top to bottom", MSG_FLIP_TOP_TO_BOTTOM, 0, 0, this);
5902 menu->AddSeparatorItem();
5903- _AddItemMenu(menu, "Invert Colors", MSG_INVERT, 0, 0, this);
5904+ _AddItemMenu(menu, "Invert colors", MSG_INVERT, 0, 0, this);
5905 menu->AddSeparatorItem();
5906 fResizeItem = _AddItemMenu(menu, "Resize" B_UTF8_ELLIPSIS,
5907 MSG_OPEN_RESIZER_WINDOW, 0, 0, this);
5908 bar->AddItem(menu);
5909 menu->AddSeparatorItem();
5910- _AddItemMenu(menu, "Use as Background", MSG_DESKTOP_BACKGROUND, 0, 0,
5911+ _AddItemMenu(menu, "Use as background" B_UTF8_ELLIPSIS, MSG_DESKTOP_BACKGROUND, 0, 0,
5912 this);
5913 }
5914
5915Index: src/apps/showimage/ShowImageView.cpp
5916===================================================================
5917--- src/apps/showimage/ShowImageView.cpp (Revision 34761)
5918+++ src/apps/showimage/ShowImageView.cpp (Arbeitskopie)
5919@@ -1261,7 +1261,7 @@
5920 // If loop terminated because of a break, there was an error
5921 BString errText;
5922 errText << "Sorry, the file '" << name << "' could not be written.";
5923- BAlert *palert = new BAlert(NULL, errText.String(), "Ok");
5924+ BAlert *palert = new BAlert(NULL, errText.String(), "OK");
5925 palert->Go();
5926 }
5927
5928Index: src/apps/showimage/ProgressWindow.cpp
5929===================================================================
5930--- src/apps/showimage/ProgressWindow.cpp (Revision 34761)
5931+++ src/apps/showimage/ProgressWindow.cpp (Arbeitskopie)
5932@@ -21,7 +21,7 @@
5933
5934 ProgressWindow::ProgressWindow(BWindow* referenceWindow, bool center)
5935 :
5936- BWindow(BRect(0, 0, 250, 100), "Progress Monitor",
5937+ BWindow(BRect(0, 0, 250, 100), "Progress monitor",
5938 B_MODAL_WINDOW_LOOK, B_FLOATING_APP_WINDOW_FEEL,
5939 B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS),
5940 fRunner(NULL)
5941Index: src/apps/people/PeopleApp.cpp
5942===================================================================
5943--- src/apps/people/PeopleApp.cpp (Revision 34761)
5944+++ src/apps/people/PeopleApp.cpp (Arbeitskopie)
5945@@ -1,5 +1,5 @@
5946 /*
5947- * Copyright 2005 - 2008, Haiku, Inc.
5948+ * Copyright 2005-2009, Haiku, Inc. All rights reserved.
5949 * Distributed under the terms of the MIT license.
5950 *
5951 * Authors:
5952@@ -29,7 +29,7 @@
5953
5954
5955 struct people_field gFields[] = {
5956- { "META:name", 120, "Contact Name" },
5957+ { "META:name", 120, "Contact name" },
5958 { "META:nickname", 120, "Nickname" },
5959 { "META:company", 120, "Company" },
5960 { "META:address", 120, "Address" },
5961@@ -37,8 +37,8 @@
5962 { "META:state", 50, "State" },
5963 { "META:zip", 50, "Zip" },
5964 { "META:country", 120, "Country" },
5965- { "META:hphone", 90, "Home Phone" },
5966- { "META:wphone", 90, "Work Phone" },
5967+ { "META:hphone", 90, "Home phone" },
5968+ { "META:wphone", 90, "Work phone" },
5969 { "META:fax", 90, "Fax" },
5970 { "META:email", 120, "E-mail" },
5971 { "META:url", 120, "URL" },
5972@@ -140,7 +140,7 @@
5973 void
5974 TPeopleApp::AboutRequested(void)
5975 {
5976- (new BAlert("", "...by Robert Polic", "Big Deal"))->Go();
5977+ (new BAlert("", "...by Robert Polic", "OK"))->Go();
5978 }
5979
5980
5981@@ -230,7 +230,7 @@
5982 {
5983 TPeopleWindow *window;
5984
5985- window = new TPeopleWindow(fPosition, "New Person", ref);
5986+ window = new TPeopleWindow(fPosition, "New person", ref);
5987 window->Show();
5988 fWindowCount++;
5989 fPosition.OffsetBy(20, 20);
5990Index: src/apps/people/PeopleWindow.cpp
5991===================================================================
5992--- src/apps/people/PeopleWindow.cpp (Revision 34761)
5993+++ src/apps/people/PeopleWindow.cpp (Arbeitskopie)
5994@@ -7,6 +7,7 @@
5995 //--------------------------------------------------------------------
5996 /*
5997 Copyright 1999, Be Incorporated. All Rights Reserved.
5998+ Copyright 2009, Haiku, Inc. All rights reserved.
5999 This file may be used under the terms of the Be Sample Code License.
6000 */
6001
6002@@ -42,13 +43,13 @@
6003 BRect rect(0, 0, 32767, 15);
6004 BMenuBar* menuBar = new BMenuBar(rect, "");
6005 menu = new BMenu("File");
6006- menu->AddItem(item = new BMenuItem("New Person" B_UTF8_ELLIPSIS, new BMessage(M_NEW), 'N'));
6007+ menu->AddItem(item = new BMenuItem("New person" B_UTF8_ELLIPSIS, new BMessage(M_NEW), 'N'));
6008 item->SetTarget(NULL, be_app);
6009 menu->AddItem(new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED), 'W'));
6010 menu->AddSeparatorItem();
6011 menu->AddItem(fSave = new BMenuItem("Save", new BMessage(M_SAVE), 'S'));
6012 fSave->SetEnabled(FALSE);
6013- menu->AddItem(new BMenuItem("Save As"B_UTF8_ELLIPSIS, new BMessage(M_SAVE_AS)));
6014+ menu->AddItem(new BMenuItem("Save as"B_UTF8_ELLIPSIS, new BMessage(M_SAVE_AS)));
6015 menu->AddItem(fRevert = new BMenuItem("Revert", new BMessage(M_REVERT), 'R'));
6016 fRevert->SetEnabled(FALSE);
6017 menu->AddSeparatorItem();
6018@@ -68,7 +69,7 @@
6019 fCopy->SetTarget(NULL, this);
6020 menu->AddItem(fPaste = new BMenuItem("Paste", new BMessage(B_PASTE), 'V'));
6021 fPaste->SetTarget(NULL, this);
6022- menu->AddItem(item = new BMenuItem("Select All", new BMessage(M_SELECT), 'A'));
6023+ menu->AddItem(item = new BMenuItem("Select all", new BMessage(M_SELECT), 'A'));
6024 item->SetTarget(NULL, this);
6025 menuBar->AddItem(menu);
6026 AddChild(menuBar);
6027Index: src/apps/pulse/MiniPulseView.cpp
6028===================================================================
6029--- src/apps/pulse/MiniPulseView.cpp (Revision 34761)
6030+++ src/apps/pulse/MiniPulseView.cpp (Arbeitskopie)
6031@@ -5,6 +5,7 @@
6032 // Written by: Arve Hjonnevag and Daniel Switkin
6033 //
6034 // Copyright 1999, Be Incorporated
6035+// Copyright 2009, Haiku, Inc. All rights reserved.
6036 //
6037 //****************************************************************************************
6038
6039@@ -15,9 +16,9 @@
6040 MiniPulseView::MiniPulseView(BRect rect, const char *name, Prefs *prefs) :
6041 PulseView(rect, name) {
6042
6043- mode1->SetLabel("Normal Mode");
6044+ mode1->SetLabel("Normal mode");
6045 mode1->SetMessage(new BMessage(PV_NORMAL_MODE));
6046- mode2->SetLabel("Deskbar Mode");
6047+ mode2->SetLabel("Deskbar mode");
6048 mode2->SetMessage(new BMessage(PV_DESKBAR_MODE));
6049 quit = new BMenuItem("Quit", new BMessage(PV_QUIT), 0, 0);
6050 popupmenu->AddSeparatorItem();
6051Index: src/apps/pulse/ConfigView.cpp
6052===================================================================
6053--- src/apps/pulse/ConfigView.cpp (Revision 34761)
6054+++ src/apps/pulse/ConfigView.cpp (Arbeitskopie)
6055@@ -1,5 +1,5 @@
6056 /*
6057- * Copyright 2002-2006 Haiku, Inc. All Rights Reserved.
6058+ * Copyright 2002-2009 Haiku, Inc. All rights reserved.
6059 * Distributed under the terms of the MIT license.
6060 *
6061 * Copyright 1999, Be Incorporated. All Rights Reserved.
6062@@ -61,7 +61,7 @@
6063 fActiveButton = fIdleButton = fFrameButton = NULL;
6064 fIconWidthControl = NULL;
6065
6066- SetLabel("Bar Colors");
6067+ SetLabel("Bar colors");
6068
6069 font_height fontHeight;
6070 be_bold_font->GetHeight(&fontHeight);
6071Index: src/apps/pulse/PrefsWindow.cpp
6072===================================================================
6073--- src/apps/pulse/PrefsWindow.cpp (Revision 34761)
6074+++ src/apps/pulse/PrefsWindow.cpp (Arbeitskopie)
6075@@ -1,5 +1,5 @@
6076 /*
6077- * Copyright 2002-2006 Haiku, Inc. All Rights Reserved.
6078+ * Copyright 2002-2009 Haiku, Inc. All rights reserved.
6079 * Distributed under the terms of the MIT license.
6080 *
6081 * Copyright 1999, Be Incorporated. All Rights Reserved.
6082@@ -43,15 +43,15 @@
6083 BRect rect = fTabView->ContainerView()->Bounds();
6084 rect.InsetBy(5, 5);
6085
6086- ConfigView *normalView = new ConfigView(rect, "Normal Mode",
6087+ ConfigView *normalView = new ConfigView(rect, "Normal mode",
6088 PRV_NORMAL_CHANGE_COLOR, fTarget, prefs);
6089 fTabView->AddTab(normalView);
6090
6091- ConfigView *miniView = new ConfigView(rect, "Mini Mode", PRV_MINI_CHANGE_COLOR,
6092+ ConfigView *miniView = new ConfigView(rect, "Mini mode", PRV_MINI_CHANGE_COLOR,
6093 fTarget, prefs);
6094 fTabView->AddTab(miniView);
6095
6096- ConfigView *deskbarView = new ConfigView(rect, "Deskbar Mode", PRV_DESKBAR_CHANGE_COLOR,
6097+ ConfigView *deskbarView = new ConfigView(rect, "Deskbar mode", PRV_DESKBAR_CHANGE_COLOR,
6098 fTarget, prefs);
6099 fTabView->AddTab(deskbarView);
6100
6101@@ -102,7 +102,7 @@
6102 Hide();
6103
6104 fTabView->Select(2);
6105- ConfigView *deskbar = (ConfigView *)FindView("Deskbar Mode");
6106+ ConfigView *deskbar = (ConfigView *)FindView("Deskbar mode");
6107 deskbar->UpdateDeskbarIconWidth();
6108
6109 PostMessage(B_QUIT_REQUESTED);
6110Index: src/apps/pulse/DeskbarPulseView.cpp
6111===================================================================
6112--- src/apps/pulse/DeskbarPulseView.cpp (Revision 34761)
6113+++ src/apps/pulse/DeskbarPulseView.cpp (Arbeitskopie)
6114@@ -5,6 +5,7 @@
6115 // Written by: Daniel Switkin
6116 //
6117 // Copyright 1999, Be Incorporated
6118+// Copyright 2009, Haiku, Inc. All rights reserved.
6119 //
6120 //****************************************************************************************
6121
6122@@ -26,9 +27,9 @@
6123 }
6124
6125 DeskbarPulseView::DeskbarPulseView(BMessage *message) : MiniPulseView(message) {
6126- mode1->SetLabel("Normal Mode");
6127+ mode1->SetLabel("Normal mode");
6128 mode1->SetMessage(new BMessage(PV_NORMAL_MODE));
6129- mode2->SetLabel("Mini Mode");
6130+ mode2->SetLabel("Mini mode");
6131 mode2->SetMessage(new BMessage(PV_MINI_MODE));
6132 quit = new BMenuItem("Quit", new BMessage(PV_QUIT), 0, 0);
6133 popupmenu->AddSeparatorItem();
6134@@ -113,7 +114,7 @@
6135 prefswindow->Activate(true);
6136 break;
6137 }
6138- prefswindow = new PrefsWindow(prefs->prefs_window_rect, "Pulse Preferences",
6139+ prefswindow = new PrefsWindow(prefs->prefs_window_rect, "Pulse Settings",
6140 new BMessenger(this), prefs);
6141 prefswindow->Show();
6142 break;
6143Index: src/apps/pulse/PulseWindow.cpp
6144===================================================================
6145--- src/apps/pulse/PulseWindow.cpp (Revision 34761)
6146+++ src/apps/pulse/PulseWindow.cpp (Arbeitskopie)
6147@@ -5,6 +5,7 @@
6148 // Written by: Daniel Switkin
6149 //
6150 // Copyright 1999, Be Incorporated
6151+// Copyright 2009, Haiku, Inc. All rights reserved.
6152 //
6153 //****************************************************************************************
6154
6155@@ -89,7 +90,7 @@
6156 // Otherwise launch a new preferences window
6157 PulseApp *pulseapp = (PulseApp *)be_app;
6158 fPrefsWindow = new PrefsWindow(pulseapp->prefs->prefs_window_rect,
6159- "Pulse Preferences", new BMessenger(this), pulseapp->prefs);
6160+ "Pulse settings", new BMessenger(this), pulseapp->prefs);
6161 fPrefsWindow->Show();
6162 break;
6163 }
6164Index: src/apps/pulse/PulseView.cpp
6165===================================================================
6166--- src/apps/pulse/PulseView.cpp (Revision 34761)
6167+++ src/apps/pulse/PulseView.cpp (Arbeitskopie)
6168@@ -5,6 +5,7 @@
6169 // Written by: David Ramsey and Daniel Switkin
6170 //
6171 // Copyright 1999, Be Incorporated
6172+// Copyright 2009, Haiku, Inc. All rights reserved.
6173 //
6174 //****************************************************************************************
6175
6176@@ -50,7 +51,7 @@
6177 popupmenu->SetFont(be_plain_font);
6178 mode1 = new BMenuItem("", NULL, 0, 0);
6179 mode2 = new BMenuItem("", NULL, 0, 0);
6180- preferences = new BMenuItem("Preferences" B_UTF8_ELLIPSIS, new BMessage(PV_PREFERENCES), 0, 0);
6181+ preferences = new BMenuItem("Settings" B_UTF8_ELLIPSIS, new BMessage(PV_PREFERENCES), 0, 0);
6182 about = new BMenuItem("About Pulse" B_UTF8_ELLIPSIS, new BMessage(PV_ABOUT), 0, 0);
6183
6184 popupmenu->AddItem(mode1);
6185Index: src/apps/pulse/NormalPulseView.cpp
6186===================================================================
6187--- src/apps/pulse/NormalPulseView.cpp (Revision 34761)
6188+++ src/apps/pulse/NormalPulseView.cpp (Arbeitskopie)
6189@@ -5,6 +5,7 @@
6190 // Written by: Daniel Switkin
6191 //
6192 // Copyright 1999, Be Incorporated
6193+// Copyright 2009, Haiku, Inc. All rights reserved.
6194 //
6195 //****************************************************************************************
6196
6197@@ -50,9 +51,9 @@
6198 SetViewColor(color);
6199 SetLowColor(color);
6200
6201- mode1->SetLabel("Mini Mode");
6202+ mode1->SetLabel("Mini mode");
6203 mode1->SetMessage(new BMessage(PV_MINI_MODE));
6204- mode2->SetLabel("Deskbar Mode");
6205+ mode2->SetLabel("Deskbar mode");
6206 mode2->SetMessage(new BMessage(PV_DESKBAR_MODE));
6207
6208 DetermineVendorAndProcessor();
6209@@ -69,7 +70,7 @@
6210 BRect r(PROGRESS_MLEFT, PROGRESS_MTOP + ITEM_OFFSET * x,
6211 PROGRESS_MLEFT + ProgressBar::PROGRESS_WIDTH,
6212 PROGRESS_MTOP + ITEM_OFFSET * x + ProgressBar::PROGRESS_HEIGHT);
6213- fProgressBars[x] = new ProgressBar(r, "CPU Progress Bar");
6214+ fProgressBars[x] = new ProgressBar(r, "CPU progress bar");
6215 AddChild(fProgressBars[x]);
6216
6217 r.Set(CPUBUTTON_MLEFT, CPUBUTTON_MTOP + ITEM_OFFSET * x,
6218Index: src/apps/tv/MainWin.cpp
6219===================================================================
6220--- src/apps/tv/MainWin.cpp (Revision 34761)
6221+++ src/apps/tv/MainWin.cpp (Arbeitskopie)
6222@@ -1,5 +1,5 @@
6223 /*
6224- * Copyright (c) 2004-2007 Marcus Overhagen <marcus@overhagen.de>
6225+ * Copyright (c) 2004-2009 Marcus Overhagen <marcus@overhagen.de>
6226 *
6227 * Permission is hereby granted, free of charge, to any person
6228 * obtaining a copy of this software and associated documentation
6229@@ -165,8 +165,8 @@
6230 fFileMenu->AddItem(new BMenuItem("Quit", new BMessage(M_FILE_QUIT), 'Q', B_COMMAND_KEY));
6231
6232 /*
6233- fChannelMenu->AddItem(new BMenuItem("Next Channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY));
6234- fChannelMenu->AddItem(new BMenuItem("Previous Channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY));
6235+ fChannelMenu->AddItem(new BMenuItem("Next channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY));
6236+ fChannelMenu->AddItem(new BMenuItem("Previous channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY));
6237 fChannelMenu->AddSeparatorItem();
6238 fChannelMenu->AddItem(new BMenuItem("RTL", new BMessage(M_DUMMY), '0', B_COMMAND_KEY));
6239 fChannelMenu->AddItem(new BMenuItem("Pro7", new BMessage(M_DUMMY), '1', B_COMMAND_KEY));
6240@@ -177,14 +177,14 @@
6241 */
6242
6243 fSettingsMenu->AddItem(new BMenuItem("Scale to native size", new BMessage(M_SCALE_TO_NATIVE_SIZE), 'N', B_COMMAND_KEY));
6244- fSettingsMenu->AddItem(new BMenuItem("Full Screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F', B_COMMAND_KEY));
6245+ fSettingsMenu->AddItem(new BMenuItem("Full screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F', B_COMMAND_KEY));
6246 fSettingsMenu->AddSeparatorItem();
6247- fSettingsMenu->AddItem(new BMenuItem("No Menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY));
6248- fSettingsMenu->AddItem(new BMenuItem("No Border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY));
6249- fSettingsMenu->AddItem(new BMenuItem("Always on Top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY));
6250- fSettingsMenu->AddItem(new BMenuItem("Keep Aspect Ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY));
6251+ fSettingsMenu->AddItem(new BMenuItem("No menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY));
6252+ fSettingsMenu->AddItem(new BMenuItem("No border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY));
6253+ fSettingsMenu->AddItem(new BMenuItem("Always on top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY));
6254+ fSettingsMenu->AddItem(new BMenuItem("Keep aspect ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY));
6255 fSettingsMenu->AddSeparatorItem();
6256- fSettingsMenu->AddItem(new BMenuItem("Preferences"B_UTF8_ELLIPSIS, new BMessage(M_PREFERENCES), 'P', B_COMMAND_KEY));
6257+ fSettingsMenu->AddItem(new BMenuItem("Settings"B_UTF8_ELLIPSIS, new BMessage(M_PREFERENCES), 'P', B_COMMAND_KEY));
6258
6259 fDebugMenu->AddItem(new BMenuItem("pixel aspect ratio 1.00000:1", new BMessage(M_ASPECT_100000_1)));
6260 fDebugMenu->AddItem(new BMenuItem("pixel aspect ratio 1.06666:1", new BMessage(M_ASPECT_106666_1)));
6261@@ -235,8 +235,8 @@
6262 if (channels == 0) {
6263 fChannelMenu->AddItem(new BMenuItem("None", new BMessage(M_DUMMY)));
6264 } else {
6265- fChannelMenu->AddItem(new BMenuItem("Next Channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY));
6266- fChannelMenu->AddItem(new BMenuItem("Previous Channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY));
6267+ fChannelMenu->AddItem(new BMenuItem("Next channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY));
6268+ fChannelMenu->AddItem(new BMenuItem("Previous channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY));
6269 fChannelMenu->AddSeparatorItem();
6270 }
6271
6272@@ -481,13 +481,13 @@
6273 menu->AddItem(item = new BMenuItem("Full Screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F', B_COMMAND_KEY));
6274 item->SetMarked(fIsFullscreen);
6275 menu->AddSeparatorItem();
6276- menu->AddItem(item = new BMenuItem("No Menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY));
6277+ menu->AddItem(item = new BMenuItem("No menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY));
6278 item->SetMarked(fNoMenu);
6279- menu->AddItem(item = new BMenuItem("No Border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY));
6280+ menu->AddItem(item = new BMenuItem("No border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY));
6281 item->SetMarked(fNoBorder);
6282- menu->AddItem(item = new BMenuItem("Always on Top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY));
6283+ menu->AddItem(item = new BMenuItem("Always on top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY));
6284 item->SetMarked(fAlwaysOnTop);
6285- menu->AddItem(item = new BMenuItem("Keep Aspect Ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY));
6286+ menu->AddItem(item = new BMenuItem("Keep aspect ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY));
6287 item->SetMarked(fKeepAspectRatio);
6288 menu->AddSeparatorItem();
6289 menu->AddItem(new BMenuItem("About " NAME B_UTF8_ELLIPSIS, new BMessage(M_FILE_ABOUT)));
6290@@ -1109,7 +1109,7 @@
6291 #if TIME_BOMB_ACTIVE
6292 "\n\n" INFO2
6293 #endif
6294- "\n\nCopyright "COPYRIGHT"\n\nVersion "VERSION"\n\nRevision "REVISION"\n\nBuild "BUILD, "Thanks");
6295+ "\n\nCopyright "COPYRIGHT"\nVersion "VERSION"\nRevision "REVISION"\nBuild "BUILD, "OK");
6296 if (fAlwaysOnTop) {
6297 ToggleAlwaysOnTop();
6298 alert->Go();
6299Index: src/apps/charactermap/CharacterWindow.cpp
6300===================================================================
6301--- src/apps/charactermap/CharacterWindow.cpp (Revision 34761)
6302+++ src/apps/charactermap/CharacterWindow.cpp (Arbeitskopie)
6303@@ -184,7 +184,7 @@
6304 BScrollView* characterScroller = new BScrollView("characterScroller",
6305 fCharacterView, 0, false, true);
6306
6307- fFontSizeSlider = new FontSizeSlider("fontSizeSlider", "Font Size:",
6308+ fFontSizeSlider = new FontSizeSlider("fontSizeSlider", "Font size:",
6309 new BMessage(kMsgFontSizeChanged), kMinFontSize, kMaxFontSize);
6310 fFontSizeSlider->SetValue(fontSize);
6311
6312@@ -223,12 +223,12 @@
6313 menuBar->AddItem(menu);
6314
6315 menu = new BMenu("View");
6316- menu->AddItem(item = new BMenuItem("Show Private Blocks",
6317+ menu->AddItem(item = new BMenuItem("Show private blocks",
6318 new BMessage(kMsgPrivateBlocks)));
6319 item->SetMarked(fCharacterView->IsShowingPrivateBlocks());
6320 // TODO: this feature is not yet supported by Haiku!
6321 #if 0
6322- menu->AddItem(item = new BMenuItem("Only Show Blocks Contained in Font",
6323+ menu->AddItem(item = new BMenuItem("Only show blocks contained in font",
6324 new BMessage(kMsgContainedBlocks)));
6325 item->SetMarked(fCharacterView->IsShowingContainedBlocksOnly());
6326 #endif
6327Index: src/apps/charactermap/UnicodeBlocks.cpp
6328===================================================================
6329--- src/apps/charactermap/UnicodeBlocks.cpp (Revision 34761)
6330+++ src/apps/charactermap/UnicodeBlocks.cpp (Arbeitskopie)
6331@@ -11,25 +11,25 @@
6332
6333 const struct unicode_block_entry kUnicodeBlocks[] = {
6334 {"Basic Latin", 0x0000, 0x007f, false, B_BASIC_LATIN_BLOCK},
6335- {"Latin-1 Supplement", 0x0080, 0x00ff, false, B_LATIN1_SUPPLEMENT_BLOCK},
6336- {"Latin Extended A", 0x0100, 0x017f, false, B_LATIN_EXTENDED_A_BLOCK},
6337- {"Latin Extended B", 0x0180, 0x024f, false, B_LATIN_EXTENDED_B_BLOCK},
6338- {"IPA Extensions", 0x0250, 0x02af, false, B_IPA_EXTENSIONS_BLOCK},
6339- {"Spacing Modifier Letters", 0x02b0, 0x02ff, false,
6340+ {"Latin-1 supplement", 0x0080, 0x00ff, false, B_LATIN1_SUPPLEMENT_BLOCK},
6341+ {"Latin extended A", 0x0100, 0x017f, false, B_LATIN_EXTENDED_A_BLOCK},
6342+ {"Latin extended B", 0x0180, 0x024f, false, B_LATIN_EXTENDED_B_BLOCK},
6343+ {"IPA extensions", 0x0250, 0x02af, false, B_IPA_EXTENSIONS_BLOCK},
6344+ {"Spacing modifier letters", 0x02b0, 0x02ff, false,
6345 B_SPACING_MODIFIER_LETTERS_BLOCK},
6346- {"Combining Diacritical Marks", 0x0300, 0x036f, false,
6347+ {"Combining diacritical marks", 0x0300, 0x036f, false,
6348 B_COMBINING_DIACRITICAL_MARKS_BLOCK},
6349 {"Greek and Coptic", 0x0370, 0x03ff, false,
6350 B_BASIC_GREEK_BLOCK | B_GREEK_SYMBOLS_AND_COPTIC_BLOCK},
6351 {"Cyrillic", 0x0400, 0x04ff, false, B_CYRILLIC_BLOCK},
6352- {"Cyrillic Supplement", 0x0500, 0x052f, false, B_CYRILLIC_BLOCK},
6353+ {"Cyrillic supplement", 0x0500, 0x052f, false, B_CYRILLIC_BLOCK},
6354 {"Armenian", 0x0530, 0x058f, false, B_ARMENIAN_BLOCK},
6355 {"Hebrew", 0x0590, 0x05ff, false,
6356 B_BASIC_HEBREW_BLOCK | B_HEBREW_EXTENDED_BLOCK},
6357 {"Arabic", 0x0600, 0x06ff, false,
6358 B_BASIC_ARABIC_BLOCK | B_ARABIC_EXTENDED_BLOCK},
6359 {"Syriac", 0x0700, 0x074f, false, kNoBlock},
6360- {"Arabic Supplement", 0x0750, 0x077f, false, kNoBlock},
6361+ {"Arabic supplement", 0x0750, 0x077f, false, kNoBlock},
6362 {"Thaana", 0x0780, 0x07bf, false, kNoBlock},
6363 {"N'Ko", 0x07c0, 0x07ff, false, kNoBlock},
6364 {"Devanagari", 0x0900, 0x097f, false, B_DEVANAGARI_BLOCK},
6365@@ -50,9 +50,9 @@
6366 {"Hangul Jamo", 0x1100, 0x11ff, false, kNoBlock},
6367 // TODO!
6368 {"Ethiopic", 0x1200, 0x137f, false, kNoBlock},
6369- {"Ethiopic Supplement", 0x1380, 0x139f, false, kNoBlock},
6370+ {"Ethiopic supplement", 0x1380, 0x139f, false, kNoBlock},
6371 {"Cherokee", 0x13a0, 0x13ff, false, kNoBlock},
6372- {"Unified Canadian Aboriginal Syllabics", 0x1400, 0x167f, false, kNoBlock},
6373+ {"Unified Canadian Aboriginal syllabics", 0x1400, 0x167f, false, kNoBlock},
6374 {"Ogham", 0x1680, 0x169f, false, kNoBlock},
6375 {"Runic", 0x16a0, 0x16ff, false, kNoBlock},
6376 {"Tagalog", 0x1700, 0x171f, false, kNoBlock},
6377@@ -64,131 +64,131 @@
6378 {"Limbu", 0x1900, 0x194f, false, kNoBlock},
6379 {"Tai Le", 0x1950, 0x197f, false, kNoBlock},
6380 {"New Tai Lue", 0x1980, 0x19df, false, kNoBlock},
6381- {"Khmer Symbols", 0x19e0, 0x19ff, false, kNoBlock},
6382+ {"Khmer symbols", 0x19e0, 0x19ff, false, kNoBlock},
6383 {"Buginese", 0x1a00, 0x1a1f, false, kNoBlock},
6384 {"Balinese", 0x1b00, 0x1b7f, false, kNoBlock},
6385 {"Sundanese", 0x1b80, 0x1bbf, false, kNoBlock},
6386 {"Lepcha", 0x1c00, 0x1c4f, false, kNoBlock},
6387 {"Ol Chiki", 0x1c50, 0x1c7f, false, kNoBlock},
6388- {"Phonetic Extensions", 0x1d00, 0x1d7f, false, kNoBlock},
6389- {"Phonetic Extensions Supplement", 0x1d80, 0x1dbf, false, kNoBlock},
6390- {"Combining Diacritical Marks Supplement", 0x1dc0, 0x1dff, false, kNoBlock},
6391- {"Latin Extended Additional", 0x1e00, 0x1eff, false, kNoBlock},
6392- {"Greek Extended", 0x1f00, 0x1fff, false, kNoBlock},
6393- {"General Punctuation", 0x2000, 0x206f, false, kNoBlock},
6394- {"Superscripts and Subscripts", 0x2070, 0x209f, false, kNoBlock},
6395- {"Currency Symbols", 0x20a0, 0x20cf, false, kNoBlock},
6396- {"Combining Diacritical Marks for Symbols", 0x20d0, 0x20ff, false,
6397+ {"Phonetic extensions", 0x1d00, 0x1d7f, false, kNoBlock},
6398+ {"Phonetic extensions supplement", 0x1d80, 0x1dbf, false, kNoBlock},
6399+ {"Combining diacritical marks supplement", 0x1dc0, 0x1dff, false, kNoBlock},
6400+ {"Latin extended additional", 0x1e00, 0x1eff, false, kNoBlock},
6401+ {"Greek extended", 0x1f00, 0x1fff, false, kNoBlock},
6402+ {"General punctuation", 0x2000, 0x206f, false, kNoBlock},
6403+ {"Superscripts and subscripts", 0x2070, 0x209f, false, kNoBlock},
6404+ {"Currency symbols", 0x20a0, 0x20cf, false, kNoBlock},
6405+ {"Combining diacritical marks for symbols", 0x20d0, 0x20ff, false,
6406 kNoBlock},
6407- {"Letterlike Symbols", 0x2100, 0x214f, false, kNoBlock},
6408- {"Number Forms", 0x2150, 0x218f, false, kNoBlock},
6409+ {"Letterlike symbols", 0x2100, 0x214f, false, kNoBlock},
6410+ {"Number forms", 0x2150, 0x218f, false, kNoBlock},
6411 {"Arrows", 0x2190, 0x21ff, false, kNoBlock},
6412- {"Mathematical Operators", 0x2200, 0x22ff, false, kNoBlock},
6413- {"Miscellaneous Technical", 0x2300, 0x23ff, false, kNoBlock},
6414- {"Control Pictures", 0x2400, 0x243f, false, kNoBlock},
6415- {"Optical Character Recognition", 0x2440, 0x245f, false, kNoBlock},
6416- {"Enclosed Alphanumerics", 0x2460, 0x24ff, false, kNoBlock},
6417- {"Box Drawing", 0x2500, 0x257f, false, kNoBlock},
6418- {"Block Elements", 0x2580, 0x259f, false, kNoBlock},
6419- {"Geometric Shapes", 0x25a0, 0x25ff, false, kNoBlock},
6420- {"Miscellaneous Symbols", 0x2600, 0x26ff, false, kNoBlock},
6421+ {"Mathematical operators", 0x2200, 0x22ff, false, kNoBlock},
6422+ {"Miscellaneous technical", 0x2300, 0x23ff, false, kNoBlock},
6423+ {"Control pictures", 0x2400, 0x243f, false, kNoBlock},
6424+ {"Optical character recognition", 0x2440, 0x245f, false, kNoBlock},
6425+ {"Enclosed alphanumerics", 0x2460, 0x24ff, false, kNoBlock},
6426+ {"Box drawing", 0x2500, 0x257f, false, kNoBlock},
6427+ {"Block elements", 0x2580, 0x259f, false, kNoBlock},
6428+ {"Geometric shapes", 0x25a0, 0x25ff, false, kNoBlock},
6429+ {"Miscellaneous symbols", 0x2600, 0x26ff, false, kNoBlock},
6430 {"Dingbats", 0x2700, 0x27bf, false, kNoBlock},
6431- {"Miscellaneous Mathematical Symbols A", 0x27c0, 0x27ef, false, kNoBlock},
6432- {"Supplemental Arrows A", 0x27f0, 0x27ff, false, kNoBlock},
6433- {"Braille Patterns", 0x2800, 0x28ff, false, kNoBlock},
6434- {"Supplemental Arrows B", 0x2900, 0x297f, false, kNoBlock},
6435- {"Miscellaneous Mathematical Symbols B", 0x2980, 0x29ff, false, kNoBlock},
6436- {"Supplemental Mathematical Operators", 0x2a00, 0x2aff, false, kNoBlock},
6437- {"Miscellaneous Symbols And Arrows", 0x2b00, 0x2bff, false, kNoBlock},
6438+ {"Miscellaneous mathematical symbols A", 0x27c0, 0x27ef, false, kNoBlock},
6439+ {"Supplemental arrows A", 0x27f0, 0x27ff, false, kNoBlock},
6440+ {"Braille patterns", 0x2800, 0x28ff, false, kNoBlock},
6441+ {"Supplemental arrows B", 0x2900, 0x297f, false, kNoBlock},
6442+ {"Miscellaneous mathematical symbols B", 0x2980, 0x29ff, false, kNoBlock},
6443+ {"Supplemental mathematical operators", 0x2a00, 0x2aff, false, kNoBlock},
6444+ {"Miscellaneous symbols and arrows", 0x2b00, 0x2bff, false, kNoBlock},
6445 {"Glagotic", 0x2c00, 0x2c5f, false, kNoBlock},
6446- {"Latin Extended C", 0x2c60, 0x2c7f, false, kNoBlock},
6447+ {"Latin extended C", 0x2c60, 0x2c7f, false, kNoBlock},
6448 {"Coptic", 0x2c80, 0x2cff, false, kNoBlock},
6449- {"Georgian Supplement", 0x2d00, 0x2d2f, false, kNoBlock},
6450+ {"Georgian supplement", 0x2d00, 0x2d2f, false, kNoBlock},
6451 {"Tifinagh", 0x2d30, 0x2d7f, false, kNoBlock},
6452- {"Ethiopic Extended", 0x2d80, 0x2ddf, false, kNoBlock},
6453- {"Cyrillic Extended A", 0x2de0, 0x2dff, false, kNoBlock},
6454- {"Supplement Punctuation", 0x2e00, 0x2e7f, false, kNoBlock},
6455- {"CJK Radicals Supplement", 0x2e80, 0x2eff, false, kNoBlock},
6456- {"Kangxi Radicals", 0x2f00, 0x2fdf, false, kNoBlock},
6457- {"Ideographic Description Characters", 0x2ff0, 0x2fff, false, kNoBlock},
6458- {"CJK Symbols and Punctuation", 0x3000, 0x303f, false, kNoBlock},
6459+ {"Ethiopic extended", 0x2d80, 0x2ddf, false, kNoBlock},
6460+ {"Cyrillic extended A", 0x2de0, 0x2dff, false, kNoBlock},
6461+ {"Supplement punctuation", 0x2e00, 0x2e7f, false, kNoBlock},
6462+ {"CJK radicals supplement", 0x2e80, 0x2eff, false, kNoBlock},
6463+ {"Kangxi radicals", 0x2f00, 0x2fdf, false, kNoBlock},
6464+ {"Ideographic description characters", 0x2ff0, 0x2fff, false, kNoBlock},
6465+ {"CJK symbols and punctuation", 0x3000, 0x303f, false, kNoBlock},
6466 {"Hiragana", 0x3040, 0x309f, false, kNoBlock},
6467 {"Katakana", 0x30a0, 0x30ff, false, kNoBlock},
6468 {"Bopomofo", 0x3100, 0x312f, false, kNoBlock},
6469- {"Hangul Compatibility Jamo", 0x3130, 0x318f, false, kNoBlock},
6470+ {"Hangul compatibility Jamo", 0x3130, 0x318f, false, kNoBlock},
6471 {"Kanbun", 0x3190, 0x319f, false, kNoBlock},
6472- {"Bopomofo Extended", 0x31a0, 0x31bf, false, kNoBlock},
6473- {"CJK Strokes", 0x31c0, 0x31ef, false, kNoBlock},
6474- {"Katakana Phonetic Extensions", 0x31f0, 0x31ff, false, kNoBlock},
6475- {"Enclosed CJK Letters and Months", 0x3200, 0x32ff, false, kNoBlock},
6476- {"CJK Compatibility", 0x3300, 0x33ff, false, kNoBlock},
6477- {"CJK Unified Ideographs Extension A", 0x3400, 0x4dbf, false, kNoBlock},
6478- {"Yijing Hexagram Symbols", 0x4dc0, 0x4dff, false, kNoBlock},
6479- {"CJK Unified Ideographs", 0x4e00, 0x9fff, false, kNoBlock},
6480- {"Yi Syllables", 0xa000, 0xa48f, false, kNoBlock},
6481+ {"Bopomofo extended", 0x31a0, 0x31bf, false, kNoBlock},
6482+ {"CJK strokes", 0x31c0, 0x31ef, false, kNoBlock},
6483+ {"Katakana phonetic extensions", 0x31f0, 0x31ff, false, kNoBlock},
6484+ {"Enclosed CJK letters and months", 0x3200, 0x32ff, false, kNoBlock},
6485+ {"CJK compatibility", 0x3300, 0x33ff, false, kNoBlock},
6486+ {"CJK unified ideographs extension A", 0x3400, 0x4dbf, false, kNoBlock},
6487+ {"Yijing hexagram symbols", 0x4dc0, 0x4dff, false, kNoBlock},
6488+ {"CJK unified ideographs", 0x4e00, 0x9fff, false, kNoBlock},
6489+ {"Yi syllables", 0xa000, 0xa48f, false, kNoBlock},
6490 {"Yi Radicals", 0xa490, 0xa4cf, false, kNoBlock},
6491 {"Vai", 0xa500, 0xa63f, false, kNoBlock},
6492- {"Cyrillic Extended B", 0xa640, 0xa69f, false, kNoBlock},
6493- {"Modifier Tone Letters", 0xa700, 0xa71f, false, kNoBlock},
6494- {"Latin Extended D", 0xa720, 0xa7ff, false, kNoBlock},
6495+ {"Cyrillic extended B", 0xa640, 0xa69f, false, kNoBlock},
6496+ {"Modifier tone letters", 0xa700, 0xa71f, false, kNoBlock},
6497+ {"Latin extended D", 0xa720, 0xa7ff, false, kNoBlock},
6498 {"Syloti Nagri", 0xa800, 0xa82f, false, kNoBlock},
6499 {"Phags-pa", 0xa840, 0xa87f, false, kNoBlock},
6500 {"Saurashtra", 0xa880, 0xa8df, false, kNoBlock},
6501 {"Kayah Li", 0xa900, 0xa92f, false, kNoBlock},
6502 {"Rejang", 0xa930, 0xa95f, false, kNoBlock},
6503 {"Cham", 0xaa00, 0xaa5f, false, kNoBlock},
6504- {"Hangul Syllables", 0xac00, 0xd7af, false, kNoBlock},
6505-// {"High Surrogates", 0xd800, 0xdb7f, false, kNoBlock},
6506-// {"High Private Use Surrogates", 0xdb80, 0xdbff, false, kNoBlock},
6507-// {"Low Surrogates", 0xdc00, 0xdfff, false, kNoBlock},
6508- {"Private Use Area", 0xe000, 0xf8ff, true, kNoBlock},
6509- {"CJK Compatibility Ideographs", 0xf900, 0xfaff, false, kNoBlock},
6510- {"Alphabetic Presentation Forms", 0xfb00, 0xfb4f, false, kNoBlock},
6511- {"Arabic Presentation Forms A", 0xfb50, 0xfdff, false, kNoBlock},
6512- {"Variation Selectors", 0xfe00, 0xfe0f, false, kNoBlock},
6513- {"Vertical Forms", 0xfe10, 0xfe1f, false, kNoBlock},
6514- {"Combining Half Marks", 0xfe20, 0xfe2f, false, kNoBlock},
6515- {"CJK Compatibility Forms", 0xfe30, 0xfe4f, false, kNoBlock},
6516- {"Small Form Variants", 0xfe50, 0xfe6f, false, kNoBlock},
6517- {"Arabic Presentation Forms B", 0xfe70, 0xfeff, false, kNoBlock},
6518- {"Halfwidth and Fullwidth Forms", 0xff00, 0xffef, false, kNoBlock},
6519+ {"Hangul syllables", 0xac00, 0xd7af, false, kNoBlock},
6520+// {"High surrogates", 0xd800, 0xdb7f, false, kNoBlock},
6521+// {"High private use surrogates", 0xdb80, 0xdbff, false, kNoBlock},
6522+// {"Low surrogates", 0xdc00, 0xdfff, false, kNoBlock},
6523+ {"Private use area", 0xe000, 0xf8ff, true, kNoBlock},
6524+ {"CJK compatibility ideographs", 0xf900, 0xfaff, false, kNoBlock},
6525+ {"Alphabetic presentation forms", 0xfb00, 0xfb4f, false, kNoBlock},
6526+ {"Arabic presentation forms A", 0xfb50, 0xfdff, false, kNoBlock},
6527+ {"Variation selectors", 0xfe00, 0xfe0f, false, kNoBlock},
6528+ {"Vertical forms", 0xfe10, 0xfe1f, false, kNoBlock},
6529+ {"Combining half marks", 0xfe20, 0xfe2f, false, kNoBlock},
6530+ {"CJK compatibility forms", 0xfe30, 0xfe4f, false, kNoBlock},
6531+ {"Small form variants", 0xfe50, 0xfe6f, false, kNoBlock},
6532+ {"Arabic presentation forms B", 0xfe70, 0xfeff, false, kNoBlock},
6533+ {"Halfwidth and fullwidth forms", 0xff00, 0xffef, false, kNoBlock},
6534 {"Specials", 0xfff0, 0xffff, false, kNoBlock},
6535- {"Linear B Syllabary", 0x010000, 0x01007f, false, kNoBlock},
6536- {"Linear B Ideograms", 0x010080, 0x0100ff, false, kNoBlock},
6537- {"Aegean Numbers", 0x010100, 0x01013f, false, kNoBlock},
6538- {"Ancient Greek Numbers", 0x010140, 0x01018f, false, kNoBlock},
6539- {"Ancient Symbols", 0x010190, 0x0101cf, false, kNoBlock},
6540- {"Phaistos Disc", 0x0101d0, 0x0101ff, false, kNoBlock},
6541+ {"Linear B syllabary", 0x010000, 0x01007f, false, kNoBlock},
6542+ {"Linear B ideograms", 0x010080, 0x0100ff, false, kNoBlock},
6543+ {"Aegean numbers", 0x010100, 0x01013f, false, kNoBlock},
6544+ {"Ancient Greek numbers", 0x010140, 0x01018f, false, kNoBlock},
6545+ {"Ancient smbols", 0x010190, 0x0101cf, false, kNoBlock},
6546+ {"Phaistos disc", 0x0101d0, 0x0101ff, false, kNoBlock},
6547 {"Lycian", 0x010280, 0x01029f, false, kNoBlock},
6548 {"Carian", 0x0102a0, 0x0102df, false, kNoBlock},
6549- {"Old Italic", 0x010300, 0x01032f, false, kNoBlock},
6550+ {"Old italic", 0x010300, 0x01032f, false, kNoBlock},
6551 {"Gothic", 0x010330, 0x01034f, false, kNoBlock},
6552 {"Ugaritic", 0x010380, 0x01039f, false, kNoBlock},
6553 {"Old Persian", 0x0103a0, 0x0103df, false, kNoBlock},
6554 {"Deseret", 0x010400, 0x01044f, false, kNoBlock},
6555 {"Shavian", 0x010450, 0x01047f, false, kNoBlock},
6556 {"Osmanya", 0x010480, 0x0104af, false, kNoBlock},
6557- {"Cypriot Syllabary", 0x010800, 0x01083f, false, kNoBlock},
6558+ {"Cypriot syllabary", 0x010800, 0x01083f, false, kNoBlock},
6559 {"Phoenician", 0x010900, 0x01091f, false, kNoBlock},
6560 {"Lydian", 0x010920, 0x01093f, false, kNoBlock},
6561 {"Kharoshthi", 0x010a00, 0x010a5f, false, kNoBlock},
6562 {"Cuneiform", 0x012000, 0x0123ff, false, kNoBlock},
6563- {"Cuneiform Numbers and Punctuation", 0x012400, 0x01247f, false, kNoBlock},
6564- {"Byzantine Musical Symbols", 0x01d000, 0x01d0ff, false, kNoBlock},
6565- {"Muscial Symbols", 0x01d100, 0x01d1ff, false, kNoBlock},
6566- {"Ancient Greek Musical Notation", 0x01d200, 0x01d24f, false, kNoBlock},
6567- {"Tai Xuan Jing Symbols", 0x01d300, 0x01d35f, false, kNoBlock},
6568- {"Counting Rod Numerals", 0x01d360, 0x01d37f, false, kNoBlock},
6569- {"Mathematical Alphanumeric Symbols", 0x01d400, 0x01d7ff, false, kNoBlock},
6570- {"Mahjong Tiles", 0x01f000, 0x01f02f, false, kNoBlock},
6571- {"Domino Tiles", 0x01f030, 0x01f09f, false, kNoBlock},
6572- {"CJK Unified Ideographs Extension B", 0x020000, 0x02a6df, false, kNoBlock},
6573- {"CJK Compatibility Ideographs Supplement", 0x02f800, 0x02fa1f, false,
6574+ {"Cuneiform numbers and punctuation", 0x012400, 0x01247f, false, kNoBlock},
6575+ {"Byzantine musical symbols", 0x01d000, 0x01d0ff, false, kNoBlock},
6576+ {"Muscial symbols", 0x01d100, 0x01d1ff, false, kNoBlock},
6577+ {"Ancient Greek musical notation", 0x01d200, 0x01d24f, false, kNoBlock},
6578+ {"Tai Xuan Jing symbols", 0x01d300, 0x01d35f, false, kNoBlock},
6579+ {"Counting rod numerals", 0x01d360, 0x01d37f, false, kNoBlock},
6580+ {"Mathematical alphanumeric symbols", 0x01d400, 0x01d7ff, false, kNoBlock},
6581+ {"Mahjong tiles", 0x01f000, 0x01f02f, false, kNoBlock},
6582+ {"Domino tiles", 0x01f030, 0x01f09f, false, kNoBlock},
6583+ {"CJK unified ideographs extension B", 0x020000, 0x02a6df, false, kNoBlock},
6584+ {"CJK compatibility ideographs Supplement", 0x02f800, 0x02fa1f, false,
6585 kNoBlock},
6586 {"Tags", 0x0e0000, 0x0e007f, false, kNoBlock},
6587- {"Variation Selectors Supplement", 0x0e0100, 0x0e01ef, false, kNoBlock},
6588- {"Supplementary Private Use Area A", 0x0f0000, 0x0fffff, true, kNoBlock},
6589- {"Supplementary Private Use Area B", 0x100000, 0x10ffff, true, kNoBlock},
6590+ {"Variation selectors supplement", 0x0e0100, 0x0e01ef, false, kNoBlock},
6591+ {"Supplementary private use area A", 0x0f0000, 0x0fffff, true, kNoBlock},
6592+ {"Supplementary private use area B", 0x100000, 0x10ffff, true, kNoBlock},
6593 };
6594
6595 const uint32 kNumUnicodeBlocks
6596Index: src/apps/charactermap/CharacterView.cpp
6597===================================================================
6598--- src/apps/charactermap/CharacterView.cpp (Revision 34761)
6599+++ src/apps/charactermap/CharacterView.cpp (Arbeitskopie)
6600@@ -250,11 +250,11 @@
6601
6602 BMessage* message = new BMessage(B_COPY);
6603 message->AddInt32("character", fCurrentCharacter);
6604- menu->AddItem(new BMenuItem("Copy Character", message, 'C'));
6605+ menu->AddItem(new BMenuItem("Copy character", message, 'C'));
6606
6607 message = new BMessage(kMsgCopyAsEscapedString);
6608 message->AddInt32("character", fCurrentCharacter);
6609- menu->AddItem(new BMenuItem("Copy As Escaped Byte String",
6610+ menu->AddItem(new BMenuItem("Copy as escaped byte string",
6611 message, 'C', B_SHIFT_KEY));
6612
6613 menu->SetTargetForItems(this);
6614Index: src/apps/charactermap/CharacterMap.cpp
6615===================================================================
6616--- src/apps/charactermap/CharacterMap.cpp (Revision 34761)
6617+++ src/apps/charactermap/CharacterMap.cpp (Arbeitskopie)
6618@@ -56,7 +56,7 @@
6619 {
6620 BAlert *alert = new BAlert("about", "CharacterMap\n"
6621 "\twritten by Axel Dörfler\n"
6622- "\tCopyright 2009, Haiku Inc.\n", "Ok");
6623+ "\tCopyright 2009, Haiku Inc.\n", "OK");
6624 BTextView *view = alert->TextView();
6625 BFont font;
6626
6627Index: src/apps/installer/InstallerApp.cpp
6628===================================================================
6629--- src/apps/installer/InstallerApp.cpp (Revision 34761)
6630+++ src/apps/installer/InstallerApp.cpp (Arbeitskopie)
6631@@ -52,7 +52,7 @@
6632 "1) If you are installing Haiku onto real hardware (not inside an emulator) "
6633 "it is recommended that you have already prepared a hard disk partition. The "
6634 "Installer and the DriveSetup tool offer to initialize existing partitions "
6635-"with the Haiku native filesystem, but the options to change the actual "
6636+"with the Haiku native file system, but the options to change the actual "
6637 "partition layout may not have been tested on a sufficiently great variety of "
6638 "computer installations so we do not recommend using it.\n"
6639 "If you have not created a partition yet, simply reboot, create the partition "
6640@@ -130,7 +130,7 @@
6641 {
6642 BAlert *alert = new BAlert("about", "Installer\n"
6643 "\twritten by Jérôme Duval\n"
6644- "\tCopyright 2005, Haiku.\n\n", "Ok");
6645+ "\tCopyright 2005, Haiku.\n\n", "OK");
6646 BTextView *view = alert->TextView();
6647 BFont font;
6648
6649Index: src/apps/installer/WorkerThread.cpp
6650===================================================================
6651--- src/apps/installer/WorkerThread.cpp (Revision 34761)
6652+++ src/apps/installer/WorkerThread.cpp (Arbeitskopie)
6653@@ -392,7 +392,7 @@
6654 "merged, whereas files and links that exist on both the source "
6655 "and target volume will be overwritten with the source volume "
6656 "version.",
6657- "Install Anyway", "Cancel", 0,
6658+ "Install anyway", "Cancel", 0,
6659 B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0)) {
6660 // TODO: Would be cool to offer the option here to clean additional
6661 // folders at the user's choice (like /boot/common and /boot/develop).
6662Index: src/apps/installer/InstallerWindow.cpp
6663===================================================================
6664--- src/apps/installer/InstallerWindow.cpp (Revision 34761)
6665+++ src/apps/installer/InstallerWindow.cpp (Arbeitskopie)
6666@@ -173,8 +173,8 @@
6667 fDestMenuField->SetAlignment(B_ALIGN_RIGHT);
6668
6669 fPackagesSwitch = new PaneSwitch("options_button");
6670- fPackagesSwitch->SetLabels("Hide Optional Packages",
6671- "Show Optional Packages");
6672+ fPackagesSwitch->SetLabels("Hide optional packages",
6673+ "Show optional packages");
6674 fPackagesSwitch->SetMessage(new BMessage(SHOW_BOTTOM_MESSAGE));
6675 fPackagesSwitch->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED,
6676 B_SIZE_UNSET));
6677@@ -193,7 +193,7 @@
6678 fSizeView->SetExplicitAlignment(
6679 BAlignment(B_ALIGN_RIGHT, B_ALIGN_MIDDLE));
6680
6681- fProgressBar = new BStatusBar("progress", "Install Progress: ");
6682+ fProgressBar = new BStatusBar("progress", "Install progress: ");
6683 fProgressBar->SetMaxValue(100.0);
6684
6685 fBeginButton = new BButton("begin_button", "Begin",
6686@@ -205,7 +205,7 @@
6687 "Set up partitions" B_UTF8_ELLIPSIS, new BMessage(SETUP_MESSAGE));
6688
6689 fMakeBootableButton = new BButton("makebootable_button",
6690- "Write Boot Sector", new BMessage(MSG_WRITE_BOOT_SECTOR));
6691+ "Write boot sector", new BMessage(MSG_WRITE_BOOT_SECTOR));
6692 fMakeBootableButton->SetEnabled(false);
6693
6694 SetLayout(new BGroupLayout(B_HORIZONTAL));
6695@@ -305,7 +305,7 @@
6696 snprintf(errorMessage, sizeof(errorMessage), "An error was "
6697 "encountered and the installation was not completed:\n\n"
6698 "Error: %s", strerror(error));
6699- (new BAlert("error", errorMessage, "Ok"))->Go();
6700+ (new BAlert("error", errorMessage, "OK"))->Go();
6701 }
6702
6703 _DisableInterface(false);
6704@@ -383,8 +383,8 @@
6705 {
6706 (new BAlert("use drive setup", "No partitions have been found that "
6707 "are suitable for installation. Please set up partitions and "
6708- "initialize at least one partition with the Be File System." ,
6709- "Ok"))->Go();
6710+ "initialize at least one partition with the Be file system." ,
6711+ "OK"))->Go();
6712 }
6713 case MSG_STATUS_MESSAGE:
6714 {
6715@@ -482,7 +482,7 @@
6716 if (fDriveSetupLaunched) {
6717 (new BAlert("driveSetup",
6718 "Please close the DriveSetup window before closing the "
6719- "Installer window.", "Ok"))->Go();
6720+ "Installer window.", "OK"))->Go();
6721 return false;
6722 }
6723 _QuitCopyEngine(false);
6724@@ -522,7 +522,7 @@
6725 if (entry.GetRef(&ref) != B_OK || be_roster->Launch(&ref) != B_OK) {
6726 BAlert* alert = new BAlert("error", "DriveSetup, the application "
6727 "to configure disk partitions, could not be launched.",
6728- "Ok");
6729+ "OK");
6730 alert->Go();
6731 }
6732 }
6733@@ -599,7 +599,7 @@
6734 if (fDestMenu->CountItems() == 0)
6735 label = "<none>";
6736 else
6737- label = "Please Choose Target";
6738+ label = "Please choose target";
6739 }
6740 fDestMenuField->MenuItem()->SetLabel(label.String());
6741
6742@@ -624,7 +624,7 @@
6743 fBeginButton->SetEnabled(srcItem && dstItem);
6744
6745 // adjust "Write Boot Sector" button
6746- label = "Write Boot Sector";
6747+ label = "Write boot sector";
6748 if (dstItem)
6749 label << " to \'" <<dstItem->Name() << '\'';
6750 fMakeBootableButton->SetEnabled(dstItem);
6751Index: src/apps/bootman/BootManager.cpp
6752===================================================================
6753--- src/apps/bootman/BootManager.cpp (Revision 34761)
6754+++ src/apps/bootman/BootManager.cpp (Arbeitskopie)
6755@@ -1,5 +1,5 @@
6756 /*
6757- * Copyright 2008, Haiku, Inc. All rights reserved.
6758+ * Copyright 2008-2009, Haiku, Inc. All rights reserved.
6759 * Distributed under the terms of the MIT License.
6760 *
6761 * Authors:
6762@@ -46,7 +46,7 @@
6763 {
6764 BAlert *alert = new BAlert("about", "Haiku Boot Manager\n\n"
6765 "\twritten by Michael Pfeiffer\n"
6766- "\tCopyright 2008, Haiku Inc.\n", "Ok");
6767+ "\tCopyright 2008, Haiku Inc.\n", "OK");
6768 BTextView *view = alert->TextView();
6769 BFont font;
6770
6771Index: src/apps/bootman/EntryPage.cpp
6772===================================================================
6773--- src/apps/bootman/EntryPage.cpp (Revision 34761)
6774+++ src/apps/bootman/EntryPage.cpp (Arbeitskopie)
6775@@ -1,5 +1,5 @@
6776 /*
6777- * Copyright 2008, Haiku, Inc. All rights reserved.
6778+ * Copyright 2008-2009, Haiku, Inc. All rights reserved.
6779 * Distributed under the terms of the MIT License.
6780 *
6781 * Authors:
6782@@ -60,7 +60,7 @@
6783 textRect.left = fInstall->Frame().right + kTextDistance;
6784
6785 fInstallText = CreateDescription(textRect, "installText",
6786- "Install Boot Menu\n\n"
6787+ "Install boot menu\n\n"
6788 "Choose this option to install a boot menu, "
6789 "allowing you to select which operating "
6790 "system to boot when you turn on your "
6791@@ -75,7 +75,7 @@
6792 fUninstall->ResizeToPreferred();
6793
6794 fUninstallText = CreateDescription(textRect, "uninstallText",
6795- "Uninstall Boot Menu\n\n"
6796+ "Uninstall boot menu\n\n"
6797 "Choose this option to remove the boot menu "
6798 "previously installed by this program.\n"
6799 );
6800Index: src/apps/bootman/BootManagerController.cpp
6801===================================================================
6802--- src/apps/bootman/BootManagerController.cpp (Revision 34761)
6803+++ src/apps/bootman/BootManagerController.cpp (Arbeitskopie)
6804@@ -1,5 +1,5 @@
6805 /*
6806- * Copyright 2008, Haiku, Inc. All rights reserved.
6807+ * Copyright 2008-2009, Haiku, Inc. All rights reserved.
6808 * Distributed under the terms of the MIT License.
6809 *
6810 * Authors:
6811@@ -162,7 +162,7 @@
6812 BootManagerController::_WriteBootMenu()
6813 {
6814 BAlert* alert = new BAlert("confirm", "About to write the boot menu "
6815- "to disk. Are you sure you want to continue?", "Write Boot Menu", "Back",
6816+ "to disk. Are you sure you want to continue?", "Write boot menu", "Back",
6817 NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
6818
6819 if (alert->Go() == 1)
6820@@ -269,13 +269,13 @@
6821
6822 if (fReadPartitionsStatus == kErrorBootSectorTooSmall)
6823 description <<
6824- "Partition Table Not Compatible\n\n"
6825+ "Partition table not compatible\n\n"
6826 "The partition table of the first hard disk is not compatible "
6827 "with Boot Manager.\n"
6828 "Boot Manager needs 2 KB available space before the first partition.";
6829 else
6830 description <<
6831- "Error Reading Partition Table\n\n"
6832+ "Error reading partition table\n\n"
6833 "Boot Manager is unable to read the partition table!";
6834
6835 return new DescriptionPage(frame, "errorEntry", description.String(), true);
6836@@ -313,12 +313,12 @@
6837
6838 if (fSaveMBRStatus == B_OK) {
6839 description <<
6840- "Old Master Boot Record Saved\n\n"
6841+ "Old Master Boot Record saved\n\n"
6842 "The old Master Boot Record was successfully save to "
6843 << file << ".\n";
6844 } else {
6845 description <<
6846- "Old Master Boot Record Saved Failure\n\n"
6847+ "Old Master Boot Record saved failure\n\n"
6848 "The old Master Boot Record could not be saved to "
6849 << file << ".\n";
6850 }
6851@@ -364,11 +364,11 @@
6852 const char* description;
6853
6854 if (fWriteBootMenuStatus == B_OK) {
6855- description = "Installation Boot Menu Completed\n\n"
6856+ description = "Installation of boot menu completed\n\n"
6857 "The boot manager has been successfully installed "
6858 "on your system.";
6859 } else {
6860- description = "Installation Boot Menu Failed\n\n"
6861+ description = "Installation of boot menu failed\n\n"
6862 "An error occured writing the boot menu. The Master Boot Record "
6863 "might be destroyed, you should restore the MBR now!";
6864 }
6865@@ -404,13 +404,13 @@
6866
6867 if (fRestoreMBRStatus == B_OK) {
6868 description <<
6869- "Uninstallation Boot Menu Completed\n\n"
6870+ "Uninstallation of boot menu completed\n\n"
6871 "The Master Boot Record of the boot device "
6872 "(" << disk << ") has been successfully restored from "
6873 << file << ".";
6874 } else {
6875 description <<
6876- "Uninstallation Boot Menu Failed\n\n"
6877+ "Uninstallation of boot menu failed\n\n"
6878 "The Master Boot Record could not be restored!";
6879 }
6880
6881Index: src/apps/powerstatus/ExtendedInfoWindow.cpp
6882===================================================================
6883--- src/apps/powerstatus/ExtendedInfoWindow.cpp (Revision 34761)
6884+++ src/apps/powerstatus/ExtendedInfoWindow.cpp (Arbeitskopie)
6885@@ -132,7 +132,7 @@
6886 else if (fBatteryInfo.state & BATTERY_DISCHARGING)
6887 fontString->string = "Battery discharging";
6888 else if (fBatteryInfo.state & BATTERY_CRITICAL_STATE)
6889- fontString->string = "Empty Battery Slot";
6890+ fontString->string = "Empty battery slot";
6891 else
6892 fontString->string = "Battery unused";
6893
6894@@ -143,13 +143,13 @@
6895 _AddToStringList(fontString);
6896
6897 fontString = new FontString;
6898- fontString->string = "Last full Charge: ";
6899+ fontString->string = "Last full charge: ";
6900 fontString->string << fBatteryInfo.full_capacity;
6901 fontString->string << powerUnit;
6902 _AddToStringList(fontString);
6903
6904 fontString = new FontString;
6905- fontString->string = "Current Rate: ";
6906+ fontString->string = "Current rate: ";
6907 fontString->string << fBatteryInfo.current_rate;
6908 fontString->string << rateUnit;
6909 _AddToStringList(fontString);
6910@@ -159,7 +159,7 @@
6911 _AddToStringList(fontString);
6912
6913 fontString = new FontString;
6914- fontString->string = "Design Capacity: ";
6915+ fontString->string = "Design capacity: ";
6916 fontString->string << fBatteryExtendedInfo.design_capacity;
6917 fontString->string << powerUnit;
6918 _AddToStringList(fontString);
6919@@ -175,37 +175,37 @@
6920 _AddToStringList(fontString);
6921
6922 fontString = new FontString;
6923- fontString->string = "Design Voltage: ";
6924+ fontString->string = "Design voltage: ";
6925 fontString->string << fBatteryExtendedInfo.design_voltage;
6926 fontString->string << " mV";
6927 _AddToStringList(fontString);
6928
6929 fontString = new FontString;
6930- fontString->string = "Design Capacity Warning: ";
6931+ fontString->string = "Design capacity warning: ";
6932 fontString->string << fBatteryExtendedInfo.design_capacity_warning;
6933 fontString->string << powerUnit;
6934 _AddToStringList(fontString);
6935
6936 fontString = new FontString;
6937- fontString->string = "Design Capacity low Warning: ";
6938+ fontString->string = "Design capacity low warning: ";
6939 fontString->string << fBatteryExtendedInfo.design_capacity_low;
6940 fontString->string << powerUnit;
6941 _AddToStringList(fontString);
6942
6943 fontString = new FontString;
6944- fontString->string = "Capacity Granularity 1: ";
6945+ fontString->string = "Capacity granularity 1: ";
6946 fontString->string << fBatteryExtendedInfo.capacity_granularity_1;
6947 fontString->string << powerUnit;
6948 _AddToStringList(fontString);
6949
6950 fontString = new FontString;
6951- fontString->string = "Capacity Granularity 2: ";
6952+ fontString->string = "Capacity granularity 2: ";
6953 fontString->string << fBatteryExtendedInfo.capacity_granularity_2;
6954 fontString->string << powerUnit;
6955 _AddToStringList(fontString);
6956
6957 fontString = new FontString;
6958- fontString->string = "Model Number: ";
6959+ fontString->string = "Model number: ";
6960 fontString->string << fBatteryExtendedInfo.model_number;
6961 _AddToStringList(fontString);
6962
6963@@ -220,7 +220,7 @@
6964 _AddToStringList(fontString);
6965
6966 fontString = new FontString;
6967- fontString->string = "OEM Info: ";
6968+ fontString->string = "OEM info: ";
6969 fontString->string += fBatteryExtendedInfo.oem_info;
6970 _AddToStringList(fontString);
6971
6972@@ -325,7 +325,7 @@
6973
6974 ExtendedInfoWindow::ExtendedInfoWindow(PowerStatusDriverInterface* interface)
6975 :
6976- BWindow(BRect(100, 150, 500, 500), "Extended Battery Info", B_TITLED_WINDOW,
6977+ BWindow(BRect(100, 150, 500, 500), "Extended battery info", B_TITLED_WINDOW,
6978 B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AVOID_FRONT |
6979 B_ASYNCHRONOUS_CONTROLS),
6980 fDriverInterface(interface),
6981@@ -344,8 +344,8 @@
6982
6983 BRect rect = Bounds();
6984 rect.InsetBy(5, 5);
6985- BBox *infoBox = new BBox(rect, "Power Status Box");
6986- infoBox->SetLabel("Battery Info");
6987+ BBox *infoBox = new BBox(rect, "Power status box");
6988+ infoBox->SetLabel("Battery info");
6989 BGroupLayout* infoLayout = new BGroupLayout(B_HORIZONTAL);
6990 infoLayout->SetInsets(10, infoBox->TopBorderOffset() * 2 + 10, 10, 10);
6991 infoLayout->SetSpacing(10);
6992Index: src/apps/powerstatus/PowerStatusView.cpp
6993===================================================================
6994--- src/apps/powerstatus/PowerStatusView.cpp (Revision 34761)
6995+++ src/apps/powerstatus/PowerStatusView.cpp (Arbeitskopie)
6996@@ -570,19 +570,19 @@
6997 menu->SetFont(be_plain_font);
6998
6999 BMenuItem* item;
7000- menu->AddItem(item = new BMenuItem("Show Text Label",
7001+ menu->AddItem(item = new BMenuItem("Show text label",
7002 new BMessage(kMsgToggleLabel)));
7003 if (fShowLabel)
7004 item->SetMarked(true);
7005- menu->AddItem(item = new BMenuItem("Show Status Icon",
7006+ menu->AddItem(item = new BMenuItem("Show status icon",
7007 new BMessage(kMsgToggleStatusIcon)));
7008 if (fShowStatusIcon)
7009 item->SetMarked(true);
7010- menu->AddItem(new BMenuItem(!fShowTime ? "Show Time" : "Show Percent",
7011+ menu->AddItem(new BMenuItem(!fShowTime ? "Show time" : "Show percent",
7012 new BMessage(kMsgToggleTime)));
7013
7014 menu->AddSeparatorItem();
7015- menu->AddItem(new BMenuItem("Battery Info" B_UTF8_ELLIPSIS,
7016+ menu->AddItem(new BMenuItem("Battery info" B_UTF8_ELLIPSIS,
7017 new BMessage(kMsgToggleExtInfo)));
7018
7019 menu->AddSeparatorItem();
7020@@ -601,7 +601,7 @@
7021 {
7022 BAlert* alert = new BAlert("about", "PowerStatus\n"
7023 "written by Axel Dörfler, Clemens Zeidler\n"
7024- "Copyright 2006, Haiku, Inc.\n", "Ok");
7025+ "Copyright 2006, Haiku, Inc.\n", "OK");
7026 BTextView *view = alert->TextView();
7027 BFont font;
7028
7029Index: src/apps/webwatch/WatchView.cpp
7030===================================================================
7031--- src/apps/webwatch/WatchView.cpp (Revision 34761)
7032+++ src/apps/webwatch/WatchView.cpp (Arbeitskopie)
7033@@ -1,5 +1,6 @@
7034 /*
7035- * Copyright (c) 1999-2003 Matthijs Hollemans
7036+ * Copyright (c) 1999-2003, Matthijs Hollemans
7037+ * Copyright (c) 2009, Haiku, Inc. All rights reserved.
7038 *
7039 * Permission is hereby granted, free of charge, to any person obtaining a
7040 * copy of this software and associated documentation files (the "Software"),
7041@@ -151,11 +152,11 @@
7042 (new BAlert(
7043 NULL,
7044 "WebWatch " VERSION
7045- "\nAn Internet Time clock for your Deskbar\n\n"
7046+ "\nAn internet time clock for your Deskbar\n\n"
7047 "Created by Matthijs Hollemans\n"
7048 "mahlzeit@users.sourceforge.net\n\n"
7049 "Thanks to Jason Parks for his help.\n",
7050- "Okay"))->Go(NULL);
7051+ "OK"))->Go(NULL);
7052 }
7053
7054 ////////////////////////////////////////////////////////////////////////////////
7055Index: src/apps/deskcalc/CalcView.cpp
7056===================================================================
7057--- src/apps/deskcalc/CalcView.cpp (Revision 34761)
7058+++ src/apps/deskcalc/CalcView.cpp (Arbeitskopie)
7059@@ -1,5 +1,5 @@
7060 /*
7061- * Copyright 2006 Haiku, Inc. All Rights Reserved.
7062+ * Copyright 2006-2009 Haiku, Inc. All rights reserved.
7063 * Copyright 1997, 1998 R3 Software Ltd. All Rights Reserved.
7064 * Distributed under the terms of the MIT License.
7065 *
7066@@ -687,7 +687,7 @@
7067 "written by Timothy Wayper,\nStephan Aßmus and Ingo Weinhold\n\n"
7068 B_UTF8_COPYRIGHT"1997, 1998 R3 Software Ltd.\n"
7069 B_UTF8_COPYRIGHT"2006-2009 Haiku, Inc.\n\n"
7070- "All Rights Reserved.", "Cool");
7071+ "All Rights Reserved.", "OK");
7072 alert->Go(NULL);
7073 }
7074
7075@@ -1098,13 +1098,13 @@
7076 CalcView::_CreatePopUpMenu()
7077 {
7078 // construct items
7079- fAutoNumlockItem = new BMenuItem("Enable Num Lock on start up",
7080+ fAutoNumlockItem = new BMenuItem("Enable Num Lock on startup",
7081 new BMessage(MSG_OPTIONS_AUTO_NUM_LOCK));
7082 fAudioFeedbackItem = new BMenuItem("Audio Feedback",
7083 new BMessage(MSG_OPTIONS_AUDIO_FEEDBACK));
7084- fShowKeypadItem = new BMenuItem("Show Keypad",
7085+ fShowKeypadItem = new BMenuItem("Show keypad",
7086 new BMessage(MSG_OPTIONS_SHOW_KEYPAD));
7087- fAboutItem = new BMenuItem("About DeskCalc",
7088+ fAboutItem = new BMenuItem("About DeskCalc" B_UTF8_ELLIPSIS,
7089 new BMessage(B_ABOUT_REQUESTED));
7090
7091 // apply current settings
7092Index: src/apps/fontdemo/ControlView.cpp
7093===================================================================
7094--- src/apps/fontdemo/ControlView.cpp (Revision 34761)
7095+++ src/apps/fontdemo/ControlView.cpp (Arbeitskopie)
7096@@ -1,5 +1,5 @@
7097 /*
7098- * Copyright 2006, Haiku, Inc. All Rights Reserved.
7099+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
7100 * Distributed under the terms of the MIT License.
7101 *
7102 * Authors:
7103@@ -108,7 +108,7 @@
7104 AddChild(fOutlineSlider);
7105
7106 rect.OffsetBy(0.0, offsetX);
7107- fAliasingCheckBox = new BCheckBox(rect, "Aliasing", "Anti-aliased text",
7108+ fAliasingCheckBox = new BCheckBox(rect, "Aliasing", "Antialiased text",
7109 new BMessage(ALIASING_MSG));
7110 fAliasingCheckBox->SetValue(B_CONTROL_ON);
7111 AddChild(fAliasingCheckBox);
7112@@ -164,7 +164,7 @@
7113 AddChild(fBoundingboxesCheckBox);
7114
7115 rect.OffsetBy(0.0, 22.0);
7116- fCyclingFontButton = new BButton(rect, "Cyclefonts", "Cycle Fonts",
7117+ fCyclingFontButton = new BButton(rect, "Cyclefonts", "Cycle fonts",
7118 new BMessage(CYCLING_FONTS_MSG));
7119 AddChild(fCyclingFontButton);
7120
7121@@ -302,7 +302,7 @@
7122
7123 case CYCLING_FONTS_MSG:
7124 {
7125- fCyclingFontButton->SetLabel(fCycleFonts ? "Cycle Fonts" : "Stop Cycling");
7126+ fCyclingFontButton->SetLabel(fCycleFonts ? "Cycle fonts" : "Stop cycling");
7127 fCycleFonts = !fCycleFonts;
7128
7129 if (fCycleFonts) {
7130Index: src/apps/deskbar/BeMenu.cpp
7131===================================================================
7132--- src/apps/deskbar/BeMenu.cpp (Revision 34761)
7133+++ src/apps/deskbar/BeMenu.cpp (Arbeitskopie)
7134@@ -4,6 +4,7 @@
7135 Terms and Conditions
7136
7137 Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
7138+Copyright (c) 2009, Haiku, Inc. All rights reserved.
7139
7140 Permission is hereby granted, free of charge, to any person obtaining a copy of
7141 this software and associated documentation files (the "Software"), to deal in
7142@@ -149,8 +150,8 @@
7143
7144 TrackingHookData* data = fBarView->GetTrackingHookData();
7145 if (fAddState == kAddingRecents) {
7146- const char* recentTitle[] = {"Recent Documents", "Recent Folders",
7147- "Recent Applications"};
7148+ const char* recentTitle[] = {"Recent documents", "Recent folders",
7149+ "Recent applications"};
7150 const int recentType[] = {kRecentDocuments, kRecentFolders,
7151 kRecentApplications};
7152 const int recentTypes = 3;
7153@@ -225,7 +226,7 @@
7154 #ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
7155 "About Haiku"
7156 #else
7157- "About This System"
7158+ "About this system"
7159 #endif
7160 B_UTF8_ELLIPSIS, new BMessage(kShowSplash));
7161 item->SetEnabled(!dragging);
7162@@ -240,7 +241,7 @@
7163 item->SetEnabled(!dragging);
7164 AddItem(item);
7165
7166- item = new BMenuItem("Show Replicants", new BMessage(kToggleDraggers));
7167+ item = new BMenuItem("Show replicants", new BMessage(kToggleDraggers));
7168 item->SetEnabled(!dragging);
7169 item->SetMarked(BDragger::AreDraggersDrawn());
7170 AddItem(item);
7171@@ -251,7 +252,7 @@
7172 AddItem(mountMenu);
7173 #endif
7174
7175- item = new BMenuItem("Deskbar Preferences" B_UTF8_ELLIPSIS,
7176+ item = new BMenuItem("Deskbar preferences" B_UTF8_ELLIPSIS,
7177 new BMessage(kConfigShow));
7178 item->SetTarget(be_app);
7179 AddItem(item);
7180@@ -260,7 +261,7 @@
7181
7182 BMenu* shutdownMenu = new BMenu("Shutdown" B_UTF8_ELLIPSIS);
7183
7184- item = new BMenuItem("Restart System", new BMessage(kRebootSystem));
7185+ item = new BMenuItem("Restart system", new BMessage(kRebootSystem));
7186 item->SetEnabled(!dragging);
7187 shutdownMenu->AddItem(item);
7188
7189@@ -272,7 +273,7 @@
7190 }
7191 #endif
7192
7193- item = new BMenuItem("Power Off", new BMessage(kShutdownSystem));
7194+ item = new BMenuItem("Power off", new BMessage(kShutdownSystem));
7195 item->SetEnabled(!dragging);
7196 shutdownMenu->AddItem(item);
7197 shutdownMenu->SetFont(be_plain_font);
7198Index: src/apps/deskbar/TimeView.cpp
7199===================================================================
7200--- src/apps/deskbar/TimeView.cpp (Revision 34761)
7201+++ src/apps/deskbar/TimeView.cpp (Arbeitskopie)
7202@@ -4,6 +4,7 @@
7203 Terms and Conditions
7204
7205 Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
7206+Copyright (c) 2009, Haiku, Inc. All rights reserved.
7207
7208 Permission is hereby granted, free of charge, to any person obtaining a copy of
7209 this software and associated documentation files (the "Software"), to deal in
7210@@ -558,14 +559,14 @@
7211 menu->SetFont(be_plain_font);
7212 BMenuItem* item;
7213
7214- item = new BMenuItem("Change Time" B_UTF8_ELLIPSIS,
7215+ item = new BMenuItem("Change time" B_UTF8_ELLIPSIS,
7216 new BMessage(kChangeClock));
7217 menu->AddItem(item);
7218
7219- item = new BMenuItem("Hide Time", new BMessage('time'));
7220+ item = new BMenuItem("Hide time", new BMessage('time'));
7221 menu->AddItem(item);
7222
7223- item = new BMenuItem("Show Calendar" B_UTF8_ELLIPSIS,
7224+ item = new BMenuItem("Show calendar" B_UTF8_ELLIPSIS,
7225 new BMessage(kShowCalendar));
7226 menu->AddItem(item);
7227
7228Index: src/apps/deskbar/WindowMenu.cpp
7229===================================================================
7230--- src/apps/deskbar/WindowMenu.cpp (Revision 34761)
7231+++ src/apps/deskbar/WindowMenu.cpp (Arbeitskopie)
7232@@ -4,6 +4,7 @@
7233 Terms and Conditions
7234
7235 Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
7236+Copyright (c) 2009, Haiku, Inc.
7237
7238 Permission is hereby granted, free of charge, to any person obtaining a copy of
7239 this software and associated documentation files (the "Software"), to deal in
7240@@ -173,7 +174,7 @@
7241 int32 itemCount = CountItems() + parentMenuItems;
7242 if (itemCount < 1) {
7243 TWindowMenuItem* noWindowsItem =
7244- new TWindowMenuItem("No Windows", -1, false, false);
7245+ new TWindowMenuItem("No windows", -1, false, false);
7246
7247 noWindowsItem->SetEnabled(false);
7248
7249@@ -183,7 +184,7 @@
7250 // it. (but we only add this option if the application is not Tracker.)
7251 if (fApplicationSignature.ICompare(kTrackerSignature) != 0) {
7252 AddSeparatorItem();
7253- AddItem(new TShowHideMenuItem("Quit Application", fTeam,
7254+ AddItem(new TShowHideMenuItem("Quit application", fTeam,
7255 B_QUIT_REQUESTED));
7256 }
7257 } else {
7258@@ -191,11 +192,11 @@
7259 // to the menu
7260 if (!dragging) {
7261 TShowHideMenuItem* hide =
7262- new TShowHideMenuItem("Hide All", fTeam, B_MINIMIZE_WINDOW);
7263+ new TShowHideMenuItem("Hide all", fTeam, B_MINIMIZE_WINDOW);
7264 TShowHideMenuItem* show =
7265- new TShowHideMenuItem("Show All", fTeam, B_BRING_TO_FRONT);
7266+ new TShowHideMenuItem("Show all", fTeam, B_BRING_TO_FRONT);
7267 TShowHideMenuItem* close =
7268- new TShowHideMenuItem("Close All", fTeam, B_QUIT_REQUESTED);
7269+ new TShowHideMenuItem("Close all", fTeam, B_QUIT_REQUESTED);
7270
7271 if (miniCount == itemCount)
7272 hide->SetEnabled(false);
7273Index: src/apps/deskbar/PreferencesWindow.cpp
7274===================================================================
7275--- src/apps/deskbar/PreferencesWindow.cpp (Revision 34761)
7276+++ src/apps/deskbar/PreferencesWindow.cpp (Arbeitskopie)
7277@@ -24,15 +24,15 @@
7278
7279 PreferencesWindow::PreferencesWindow(BRect frame)
7280 :
7281- BWindow(frame, "Deskbar Preferences", B_TITLED_WINDOW,
7282+ BWindow(frame, "Deskbar preferences", B_TITLED_WINDOW,
7283 B_NOT_RESIZABLE | B_AUTO_UPDATE_SIZE_LIMITS | B_NOT_ZOOMABLE)
7284 {
7285 // Controls
7286- fMenuRecentDocuments = new BCheckBox("Recent Documents:",
7287+ fMenuRecentDocuments = new BCheckBox("Recent documents:",
7288 new BMessage(kUpdateRecentCounts));
7289- fMenuRecentApplications = new BCheckBox("Recent Applications:",
7290+ fMenuRecentApplications = new BCheckBox("Recent applications:",
7291 new BMessage(kUpdateRecentCounts));
7292- fMenuRecentFolders = new BCheckBox("Recent Folders:",
7293+ fMenuRecentFolders = new BCheckBox("Recent folders:",
7294 new BMessage(kUpdateRecentCounts));
7295
7296 fMenuRecentDocumentCount = new BTextControl(NULL, NULL,
7297@@ -42,23 +42,23 @@
7298 fMenuRecentFolderCount = new BTextControl(NULL, NULL,
7299 new BMessage(kUpdateRecentCounts));
7300
7301- fAppsSort = new BCheckBox("Sort Running Applications",
7302+ fAppsSort = new BCheckBox("Sort running applications",
7303 new BMessage(kSortRunningApps));
7304- fAppsSortTrackerFirst = new BCheckBox("Tracker Always First",
7305+ fAppsSortTrackerFirst = new BCheckBox("Tracker always first",
7306 new BMessage(kTrackerFirst));
7307- fAppsShowExpanders = new BCheckBox("Show Application Expander",
7308+ fAppsShowExpanders = new BCheckBox("Show application expander",
7309 new BMessage(kSuperExpando));
7310- fAppsExpandNew = new BCheckBox("Expand New Applications",
7311+ fAppsExpandNew = new BCheckBox("Expand new applications",
7312 new BMessage(kExpandNewTeams));
7313
7314- fClock24Hours = new BCheckBox("24 Hour Clock", new BMessage(kMilTime));
7315- fClockSeconds = new BCheckBox("Show Seconds",
7316+ fClock24Hours = new BCheckBox("24 hour clock", new BMessage(kMilTime));
7317+ fClockSeconds = new BCheckBox("Show seconds",
7318 new BMessage(kShowSeconds));
7319- fClockEuropeanDate = new BCheckBox("European Date",
7320+ fClockEuropeanDate = new BCheckBox("European date",
7321 new BMessage(kEuroDate));
7322- fClockFullDate = new BCheckBox("Full Date", new BMessage(kFullDate));
7323+ fClockFullDate = new BCheckBox("Full date", new BMessage(kFullDate));
7324
7325- fWindowAlwaysOnTop = new BCheckBox("Always On Top",
7326+ fWindowAlwaysOnTop = new BCheckBox("Always on top",
7327 new BMessage(kAlwaysTop));
7328 fWindowAutoRaise = new BCheckBox("Auto-raise", new BMessage(kAutoRaise));
7329
7330@@ -183,7 +183,7 @@
7331 .Add(fMenuRecentApplicationCount)
7332 .End()
7333 .End()
7334- .Add(new BButton("Edit Menu" B_UTF8_ELLIPSIS,
7335+ .Add(new BButton("Edit menu" B_UTF8_ELLIPSIS,
7336 new BMessage(kEditMenuInTracker)))
7337 .SetInsets(10, 10, 10, 10)
7338 .End()
7339Index: src/apps/poorman/PoorManWindow.cpp
7340===================================================================
7341--- src/apps/poorman/PoorManWindow.cpp (Revision 34761)
7342+++ src/apps/poorman/PoorManWindow.cpp (Arbeitskopie)
7343@@ -229,14 +229,14 @@
7344 saveConsoleFilePanel->Show();
7345 break;
7346 case MSG_FILE_PANEL_SAVE_CONSOLE:
7347- printf("FilePanel: Save Console\n");
7348+ printf("FilePanel: Save console\n");
7349 SaveConsole(message, false);
7350 break;
7351 case MSG_MENU_FILE_SAVE_SELECTION:
7352 saveConsoleSelectionFilePanel->Show();
7353 break;
7354 case MSG_FILE_PANEL_SAVE_CONSOLE_SELECTION:
7355- printf("FilePanel: Save Console Selection\n");
7356+ printf("FilePanel: Save console selection\n");
7357 SaveConsole(message, true);
7358 break;
7359 case MSG_FILE_PANEL_SELECT_WEB_DIR:
7360Index: src/apps/poorman/constants.cpp
7361===================================================================
7362--- src/apps/poorman/constants.cpp (Revision 34761)
7363+++ src/apps/poorman/constants.cpp (Arbeitskopie)
7364@@ -6,27 +6,24 @@
7365 // PoorMan Window
7366 extern const char* STR_APP_SIG
7367 = "application/x-vnd.Haiku.PoorMan";
7368- char* STR_APP_NAME
7369+char* STR_APP_NAME
7370 = "PoorMan";
7371 extern const char* STR_ERR_WEB_DIR
7372- = "You have not yet selected the folder you want PoorMan "
7373- "to publish on the Web. PoorMan can create a "
7374- "\"public_html\" folder in your home folder or you can select "
7375- "one of your own folders to publish.\n\n"
7376- "Do you wish to select a folder to publish on the Web?";
7377+ = "Please choose the folder to publish on the web.\n\n"
7378+ "You can have PoorMan create a default \"public_html\" in your home folder.\n"
7379+ "Or you select one of your own folders instead.";
7380 extern const char* STR_ERR_CANT_START
7381- = "Can't Start the Server";
7382+ = "Can't start the server";
7383 extern const char* STR_DIR_CREATED
7384- = "A default Web folder has been created for you "
7385- "at \"/boot/home/public_html.\"\nMake sure an HTML "
7386- "document named \"index.html\" is in that folder.";
7387-
7388+ = "A default web folder has been created "
7389+ "at \"/boot/home/public_html.\"\nMake sure there is a HTML "
7390+ "file named \"index.html\" in that folder.";
7391 extern const char* STR_MNU_FILE
7392 = "File";
7393 extern const char* STR_MNU_FILE_SAVE_AS
7394- = "Save Console As" B_UTF8_ELLIPSIS;
7395+ = "Save console as" B_UTF8_ELLIPSIS;
7396 extern const char* STR_MNU_FILE_SAVE_SELECTION
7397- = "Save Console Selections As" B_UTF8_ELLIPSIS;
7398+ = "Save console selections as" B_UTF8_ELLIPSIS;
7399 extern const char* STR_MNU_FILE_ABOUT
7400 = "About PoorMan" B_UTF8_ELLIPSIS;
7401 extern const char* STR_MNU_FILE_QUIT
7402@@ -36,80 +33,80 @@
7403 extern const char* STR_MNU_EDIT_COPY
7404 = "Copy";
7405 extern const char* STR_MNU_EDIT_SELECT_ALL
7406- = "Select All";
7407+ = "Select all";
7408 extern const char* STR_MNU_EDIT_PREF
7409 = "Settings" B_UTF8_ELLIPSIS;
7410 extern const char* STR_MNU_CTRL
7411 = "Controls";
7412 extern const char* STR_MNU_CTRL_RUN_SERVER
7413- = "Run Server";
7414+ = "Run server";
7415 extern const char* STR_MNU_CTRL_CLEAR_HIT_COUNTER
7416- = "Clear Hit Counter";
7417+ = "Clear hit counter";
7418 extern const char* STR_MNU_CTRL_CLEAR_CONSOLE
7419- = "Clear Console Log";
7420+ = "Clear console log";
7421 extern const char* STR_MNU_CTRL_CLEAR_LOG_FILE
7422- = "Clear Log File";
7423+ = "Clear log file";
7424
7425 extern const char* STR_FILEPANEL_SAVE_CONSOLE
7426- = "Save Log Console";
7427+ = "Save log console";
7428 extern const char* STR_FILEPANEL_SAVE_CONSOLE_SELECTION
7429- = "Save Log Console Selection";
7430+ = "Save log console selection";
7431 extern const char* STR_TXT_VIEW
7432- = "Logging View";
7433+ = "Logging view";
7434
7435 // ------------------------------------------------------
7436 // Preferences Window
7437 char* STR_WIN_NAME_PREF
7438- = "PoorMan Settings";
7439+ = "PoorMan settings";
7440
7441 extern const char* STR_SETTINGS_FILE_NAME
7442- = "PoorMan Settings";
7443+ = "PoorMan settings";
7444 extern const char* STR_SETTINGS_NEW_FILE_NAME
7445- = "OBOS PoorMan Settings";
7446+ = "OBOS PoorMan settings";
7447 extern const char* STR_DEFAULT_WEB_DIRECTORY
7448 = "/boot/home/public_html";
7449 extern const char* STR_TAB_SITE
7450 = "Site";
7451 extern const char* STR_BBX_LOCATION
7452- = "Web Site Location";
7453+ = "Website location";
7454 extern const char* STR_TXT_DIRECTORY
7455- = "Web Folder:";
7456+ = "Web folder:";
7457 extern const char* STR_BTN_DIRECTORY
7458- = "Select Web Folder";
7459+ = "Select web folder";
7460 extern const char* STR_TXT_INDEX
7461- = "Start Page:";
7462+ = "Start page:";
7463 extern const char* STR_BBX_OPTIONS
7464- = "Web Site Options";
7465+ = "Website options";
7466 extern const char* STR_CBX_DIR_LIST
7467 = "Send file listing if there's no start page";
7468 extern const char* STR_CBX_DIR_LIST_LABEL
7469 = "Send file listing if there's no start page";
7470 extern const char* STR_FILEPANEL_SELECT_WEB_DIR
7471- = "Select Web Folder";
7472+ = "Select web folder";
7473
7474 extern const char* STR_TAB_LOGGING
7475 = "Logging";
7476 extern const char* STR_BBX_CONSOLE_LOGGING
7477- = "Console Logging";
7478+ = "Console logging";
7479 extern const char* STR_CBX_LOG_CONSOLE
7480- = "Log to Console";
7481+ = "Log to console";
7482 extern const char* STR_BBX_FILE_LOGGING
7483- = "File Logging";
7484+ = "File logging";
7485 extern const char* STR_CBX_LOG_FILE
7486- = "Log to File";
7487+ = "Log to file";
7488 extern const char* STR_TXT_LOG_FILE_NAME
7489- = "Log File Name:";
7490+ = "Log file name:";
7491 extern const char* STR_BTN_CREATE_LOG_FILE
7492- = "Create Log File";
7493+ = "Create log file";
7494 extern const char* STR_FILEPANEL_CREATE_LOG_FILE
7495- = "Create Poor Man Log";
7496+ = "Create PoorMan log";
7497
7498 extern const char* STR_TAB_ADVANCED
7499 = "Advanced";
7500 extern const char* STR_BBX_CONNECTION
7501- = "Connections Options";
7502+ = "Connections";
7503 extern const char* STR_SLD_LABEL
7504- = "Max. Simultaneous Connections:";
7505+ = "Max. simultaneous connections:";
7506 char* STR_SLD_STATUS_LABEL
7507 = "connections";
7508
7509@@ -127,7 +124,7 @@
7510 extern const char* STR_ABOUT_BUTTON
7511 = "OK";
7512 extern const char* STR_ABOUT_DESC
7513- = "Poor Man's Web Server\n"
7514+ = "Poor Man's web server\n"
7515 "Copyright " B_UTF8_COPYRIGHT " 2004-2009 Haiku\n"
7516 "All rights reserved.\n\n"
7517 "Written by: Philip Harrison, Ma Jie";
7518Index: src/apps/poorman/PoorManAdvancedView.cpp
7519===================================================================
7520--- src/apps/poorman/PoorManAdvancedView.cpp (Revision 34761)
7521+++ src/apps/poorman/PoorManAdvancedView.cpp (Arbeitskopie)
7522@@ -28,7 +28,7 @@
7523 maxRect.right -= 7.0;
7524 maxRect.bottom -= 118.0;
7525
7526- BBox * connectionOptions = new BBox(maxRect, "Connection Options");
7527+ BBox * connectionOptions = new BBox(maxRect, "Connections");
7528 connectionOptions->SetLabel(STR_BBX_CONNECTION);
7529 AddChild(connectionOptions);
7530
7531Index: src/apps/screenshot/ScreenshotWindow.cpp
7532===================================================================
7533--- src/apps/screenshot/ScreenshotWindow.cpp (Revision 34761)
7534+++ src/apps/screenshot/ScreenshotWindow.cpp (Arbeitskopie)
7535@@ -1,5 +1,5 @@
7536 /*
7537- * Copyright Karsten Heimrich, host.haiku@gmx.de. All rights reserved.
7538+ * Copyright 2009 Karsten Heimrich, host.haiku@gmx.de. All rights reserved.
7539 * Distributed under the terms of the MIT License.
7540 *
7541 * Authors:
7542@@ -89,7 +89,7 @@
7543 bool includeMouse, bool grabActiveWindow, bool showConfigWindow,
7544 bool saveScreenshotSilent, int32 imageFileType, int32 translator)
7545 :
7546- BWindow(BRect(0, 0, 200.0, 100.0), "Take Screenshot", B_TITLED_WINDOW,
7547+ BWindow(BRect(0, 0, 200.0, 100.0), "Retake screenshot", B_TITLED_WINDOW,
7548 B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_QUIT_ON_WINDOW_CLOSE |
7549 B_AVOID_FRONT | B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE),
7550 fDelayControl(NULL),
7551@@ -155,7 +155,7 @@
7552 BCardLayout* layout = dynamic_cast<BCardLayout*> (GetLayout());
7553 if (layout)
7554 layout->SetVisibleItem(1L);
7555- SetTitle("Save Screenshot");
7556+ SetTitle("Save screenshot");
7557 break;
7558 }
7559
7560@@ -314,10 +314,10 @@
7561 BBox* divider = new BBox(B_FANCY_BORDER, NULL);
7562 divider->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, 1));
7563
7564- fBackToSave = new BButton("", "Back to save", new BMessage(kBackToSave));
7565+ fBackToSave = new BButton("", "Back to saving", new BMessage(kBackToSave));
7566 fBackToSave->SetEnabled(false);
7567
7568- fTakeScreenshot = new BButton("", "Take Screenshot",
7569+ fTakeScreenshot = new BButton("", "Take screenshot",
7570 new BMessage(kTakeScreenshot));
7571
7572 layout->AddView(0, BGroupLayoutBuilder(B_VERTICAL)
7573@@ -553,7 +553,7 @@
7574 if (layout)
7575 layout->SetVisibleItem(1L);
7576
7577- SetTitle("Save Screenshot");
7578+ SetTitle("Save screenshot");
7579 }
7580
7581
7582Index: src/apps/pairs/PairsView.cpp
7583===================================================================
7584--- src/apps/pairs/PairsView.cpp (Revision 34761)
7585+++ src/apps/pairs/PairsView.cpp (Arbeitskopie)
7586@@ -1,5 +1,5 @@
7587 /*
7588- * Copyright 2008, Ralf Schülke, teammaui@web.de. All rights reserved.
7589+ * Copyright 2008-2009, Ralf Schülke, teammaui@web.de. All rights reserved.
7590 * Distributed under the terms of the MIT License.
7591 */
7592
7593@@ -158,7 +158,7 @@
7594 if (fCard[i] == NULL) {
7595 BAlert* alert = new BAlert("fatal", "Pairs did not find enough "
7596 "vector icons in the system, it needs at least eight.",
7597- "Oh!", NULL, NULL, B_WIDTH_FROM_WIDEST, B_STOP_ALERT);
7598+ "OK", NULL, NULL, B_WIDTH_FROM_WIDEST, B_STOP_ALERT);
7599 alert->Go();
7600 exit(1);
7601 }